Преглед изворни кода

fix(controller): 新增审核模式

xiansin пре 4 година
родитељ
комит
84bec944d5

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

xqd xqd xqd
@@ -25,8 +25,8 @@ class ShareConfigController extends AdminController
                     $shareConfig = ShareConfig::orderBy('id','asc')->first()->toArray();
                     $form->width(9, 2);
                     $form->text('id','ID')->value($shareConfig['id'])->readOnly();
-                    $form->text('member_price', '会员价格')->required();
-                    $form->text('origin_member_price', '会员原价')->required();
+                    $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->text('withdraw_discount','提现手续费,百分比')->value($shareConfig['withdraw_discount']);
@@ -43,6 +43,8 @@ class ShareConfigController extends AdminController
         $req = request()->post();
         $shareConfig = ShareConfig::orderBy('id','asc')->first();
         $shareConfig->price = $req['price'];
+        $shareConfig->member_price = $req['member_price'];
+        $shareConfig->origin_member_price = $req['origin_member_price'];
         $shareConfig->share_desc = $req['share_desc'];
         $shareConfig->withdraw_discount = $req['withdraw_discount'];
         $shareConfig->withdraw_desc = $req['withdraw_desc'];
@@ -65,6 +67,8 @@ class ShareConfigController extends AdminController
             $id = $form->getKey();
             $form->text('id', 'ID');
             $form->text('price','推荐奖励');
+            $form->text('member_price', '会员价格');
+            $form->text('origin_member_price', '会员原价');
             $form->text('share_desc','分销说明');
             $form->text('withdraw_discount','提现手续费,百分比');
             $form->text('withdraw_desc','提现说明');

+ 3 - 2
app/Http/Controllers/Api/SettingController.php

xqd
@@ -14,11 +14,12 @@ class SettingController extends Controller
         $shareConfig = ShareConfig::orderBy('id','asc')->first()->toArray();
         $setting = Setting::orderBy('id','asc')->first()->toArray();
         $data = [
-            'origin_member_price' => $setting['origin_member_price'],
-            'member_price' => $setting['member_price'],
+            'origin_member_price' => $shareConfig['origin_member_price'],
+            'member_price' => $shareConfig['member_price'],
             'service_wechat' => $setting['service_wechat'],
             'service_qrcode' => env('APP_URL').'/uploads/'.$setting['service_qrcode'],
             'open_share' => $shareConfig['is_open'],
+            'review_mode' => $setting['review_mode'],
         ];
         return out($data);
     }

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

xqd
@@ -73,7 +73,7 @@ class UserController extends Controller
     public function buy()
     {
         $user = auth('api')->user();
-        $shareConfig = Setting::first()->toArray();
+        $shareConfig = ShareConfig::first()->toArray();
 
         \DB::beginTransaction();
         $app = Factory::payment(config('wechat.payment.default'));