Browse Source

feat(controller): 优化

xiansin 4 years ago
parent
commit
9c48f7d585

+ 49 - 0
app/Admin/Controllers/MemberSettingController.php

xqd
@@ -0,0 +1,49 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Models\ShareConfig;
+use Dcat\Admin\Form;
+use Dcat\Admin\Layout\Column;
+use Dcat\Admin\Layout\Content;
+use Dcat\Admin\Layout\Row;
+use Dcat\Admin\Http\Controllers\AdminController;
+use Dcat\Admin\Widgets\Box;
+use Dcat\Admin\Widgets\Form as WidgetForm;
+
+class MemberSettingController extends AdminController
+{
+
+    public function index(Content $content)
+    {
+
+        return $content
+            ->title(trans('member-setting.title'))
+            ->body(function (Row $row) {
+                $row->column(8, function (Column $column) {
+                    $form = new WidgetForm();
+                    $shareConfig = ShareConfig::orderBy('id','asc')->first()->toArray();
+                    $form->width(9, 2);
+                    $form->text('id','ID')->value($shareConfig['id'])->readOnly();
+                    $form->text('member_price', '会员价格')->value($shareConfig['member_price'])->required();
+                    $form->text('origin_member_price', '会员原价')->value($shareConfig['origin_member_price'])->required();
+                    $form->action('memberSetting/save');
+                    $column->append(Box::make(trans('admin.edit'), $form));
+                });
+            });
+    }
+
+    public function save()
+    {
+        $req = request()->post();
+        $shareConfig = ShareConfig::orderBy('id','asc')->first();
+        $shareConfig->member_price = $req['member_price'];
+        $shareConfig->origin_member_price = $req['origin_member_price'];
+        $shareConfig->save();
+        $form = new Form();
+        $response = $form->response();
+        return $response->success(__('admin.save_succeeded'));
+    }
+
+
+}

+ 4 - 10
app/Admin/Controllers/ShareConfigController.php

xqd xqd xqd
@@ -25,13 +25,11 @@ 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', '会员价格')->value($shareConfig['member_price'])->required();
-                    $form->text('origin_member_price', '会员原价')->value($shareConfig['origin_member_price'])->required();
                     $form->text('price','推荐奖励')->value($shareConfig['price'])->required();
                     $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->textarea('is_open', '是否开启?')->default($shareConfig['is_open']);
+                    $form->textarea('withdraw_desc','提现说明')->value($shareConfig['withdraw_desc']);
+                    $form->switch('is_open', '是否开启?')->default($shareConfig['is_open']);
                     $form->action('shareSetting/save');
                     $column->append(Box::make(trans('admin.edit'), $form));
                 });
@@ -43,8 +41,6 @@ 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'];
@@ -67,11 +63,9 @@ 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->textarea('share_desc','分销说明');
             $form->text('withdraw_discount','提现手续费,百分比');
-            $form->text('withdraw_desc','提现说明');
+            $form->textarea('withdraw_desc','提现说明');
             $form->switch('is_open', '是否开启?')->default(1);
 
         })->saved(function (Form $form, $result) {

+ 2 - 7
app/Admin/Controllers/UserController.php

xqd
@@ -77,19 +77,14 @@ class UserController extends AdminController
     protected function form()
     {
         return Form::make(new User(), function (Form $form) {
-            $form->model()->with(['parent']);
             $form->display('id');
             $form->display('nickname','昵称');
             $form->image('head_img')->disable();
-            $form->select('parent_id')->options(function () {
-                return User::selectOptions();
-            });
-            $form->display('parent.nickname','上级');
             $form->display('phone_num');
             $form->display('income');
             $form->switch('is_vip', '是否会员?')->default(1);
-            $form->image('share_qrcode')->image('',80,80);;
-            $form->display('become_vip_at')->disable();
+            $form->image('share_qrcode')->disable();
+            $form->display('become_vip_at');
             $form->display('become_child_at');
 
             $form->display('created_at');

+ 3 - 0
app/Admin/routes.php

xqd
@@ -23,4 +23,7 @@ Route::group([
     $router->resource('setting', 'SettingController');
     $router->put('setting', 'SettingController@setting');
 
+    $router->resource('memberSetting', 'MemberSettingController');
+    $router->post('memberSetting/save', 'MemberSettingController@save');
+
 });

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

xqd
@@ -49,7 +49,7 @@ class UserController extends Controller
 
         return out([
             'overage' => $user['overage'],
-            'desc' => $shareConfig['share_desc']
+            'desc' => $shareConfig['withdraw_desc']
         ]);
     }
 

+ 13 - 0
resources/lang/zh_CN/member-setting.php

xqd
@@ -0,0 +1,13 @@
+<?php
+return [
+    'title' => '会员设置',
+    'labels' => [
+        'MemberSetting' => '会员设置',
+        'memberSetting' => '会员设置',
+        'member-setting' => '会员设置',
+    ],
+    'fields' => [
+    ],
+    'options' => [
+    ],
+];