Zhou Jianjia пре 4 година
родитељ
комит
5240e541e1

+ 2 - 2
app/Admin/Controllers/ShareConfigController.php

xqd
@@ -28,10 +28,10 @@ class ShareConfigController extends AdminController
                     $form->text('member_price', '会员价格')->value($shareConfig['member_price'])->required();
                     $form->text('origin_member_price', '会员原价')->value($shareConfig['origin_member_price'])->required();
                     $form->text('price','推荐奖励')->value($shareConfig['price'])->required();
-                    $form->text('share_desc','分销说明')->value($shareConfig['share_desc']);
+                    $form->textarea('share_desc','分销说明')->value($shareConfig['share_desc']);
                     $form->text('withdraw_discount','提现手续费,百分比')->value($shareConfig['withdraw_discount']);
                     $form->text('withdraw_desc','提现说明')->value($shareConfig['withdraw_desc']);
-                    $form->switch('is_open', '是否开启?')->default($shareConfig['is_open']);
+                    $form->textarea('is_open', '是否开启?')->default($shareConfig['is_open']);
                     $form->action('shareSetting/save');
                     $column->append(Box::make(trans('admin.edit'), $form));
                 });

+ 5 - 1
app/Http/Controllers/Api/UserController.php

xqd xqd
@@ -44,11 +44,12 @@ class UserController extends Controller
     public function overage()
     {
         $user = auth('api')->user();
-
+        $shareConfig = ShareConfig::first()->toArray();
         $user = User::where('id',$user['id'])->first()->toArray();
 
         return out([
             'overage' => $user['overage'],
+            'desc' => $shareConfig['share_desc']
         ]);
     }
 
@@ -168,6 +169,9 @@ class UserController extends Controller
         if(!$parent){
             return out();
         }
+        if($parent->id == $user->id){
+            return out();
+        }
 
         $user->parent_id = $parent->id;
         $user->become_child_at = Carbon::now()->toDateTimeString();