feat: 优化分销结果不正确

mini/api/setting.js

@@ -30,10 +30,17 @@ export function homeColumn() {
   )
 }
 
+export function config() {
+  return request.get(
+    'setting/config'
+  )
+}
+
 export default {
   tabBar,
   navBar,
   banner,
   rechargeCombo,
-  homeColumn
+  homeColumn,
+  config
 }

mini/pages/episode/play.vue

@@ -42,6 +42,7 @@
                 zIndex: 0
               }"
               :show-play-btn="video.playBtn"
+              :show-center-play-btn="video.playBtn"
               :show-fullscreen-btn="video.fullscreenBtn"
               :controls="video.controls"
               :show-progress="video.progress"

mini/pages/sign/index.vue

@@ -75,6 +75,9 @@ export default {
             this.$u.toast(`签到成功，获取 ${res.data.award} 金币`)
             this.todaySign = true
             this.signDays += 1
+            this.$api.user.info().then(res => {
+              this.$store.dispatch('user/info', res.data)
+            })
           }
         })
       }

mini/setting.js

@@ -2,8 +2,8 @@
  * Created by JianJia.Zhou<jianjia.zhou> on 2022/3/18.
  */
 const IS_DEV = process.env.NODE_ENV === 'development'
-// const URL = 'https://zhangsiye.9026.com'
-const URL = 'https://t3.9026.com'
+const URL = 'https://zhangsiye.9026.com'
+// const URL = 'https://t3.9026.com'
 
 module.exports = {
   // 版本

server/app/Admin/Controllers/Episode/EpisodesListController.php

@@ -82,6 +82,7 @@ class EpisodesListController extends AdminController
     protected function grid()
     {
         return Grid::make(EpisodesList::with(['episode'])->where('episodes_id', $this->episode->id), function (Grid $grid) {
+            $grid->model()->orderBy('sort');
             //$grid->column('id');
             $grid->column('sort')->display(function (){
                 return '第'.$this->sort.'集';

server/app/Admin/Controllers/Share/ShareConfigController.php

@@ -59,7 +59,7 @@ class ShareConfigController extends AdminController
 
                     $form->decimal('withdraw_min','最少提现额度')->value($config->withdraw_min)->required()->width(3);
                     $form->decimal('withdraw_max','每日提现上限')->value($config->withdraw_max)->required()->width(3);
-                    $form->decimal('withdraw_discount','提现手续费')->value($config->withdraw_discount)->required()->width(3);
+                    $form->rate('withdraw_discount','提现手续费')->value($config->withdraw_discount)->required()->width(3);
                     $form->editor('withdraw_desc','提现说明')->value($config->withdraw_desc);
 
                     $form->action('share/setting/save');

server/app/Http/Controllers/V1/EpisodeController.php

@@ -278,7 +278,15 @@ class EpisodeController extends Controller
     public function detail($id)
     {
         $episodes = Episode::filterPlatform()->withCount(['userWatchRecord','userCollect','userFavorite','lists'])
-            ->with(['category:id,name','lists:id,episodes_id,sort,url,is_free,origin_price,sale_price'])
+            ->with([
+                'category:id,name',
+                'lists'=> function($query){
+                $query->select([
+                    'id','episodes_id','sort','url','is_free','origin_price','sale_price'
+                ])
+                    ->orderBy('sort');
+            }
+            ])
             ->where('is_opend', 1)
             ->where('id', $id)
             ->first();

server/app/Http/Controllers/V1/PayNoticeController.php

@@ -255,10 +255,10 @@ class PayNoticeController extends Controller
             $share->income = $income;
             $share->save();
 
-
-            $user->income = $user->income + $income;
-            $user->total_income = $user->total_income + $income;
-            $user->save();
+            $parent = User::find($user->parent_id);
+            $parent->income = $user->income + $income;
+            $parent->total_income = $user->total_income + $income;
+            $parent->save();
         }
     }
 }

server/二期SQL.sql

@@ -1,5 +1,4 @@
-use
-zhangsiye_db;
+use zhangsiye_db;
 alter table t_users
     add COLUMN `parent_id` int(11) NOT NULL DEFAULT 0 COMMENT '上级推荐用户' AFTER remember_token;
 alter table t_users