feat: 优化订单等

server/app/Admin/Controllers/Market/UserRechargeRecordController.php

@@ -22,15 +22,30 @@ class UserRechargeRecordController extends AdminController
             $grid->model()->where('status',1)
                 ->orderByDesc('id');
             $grid->column('id')->sortable();
-            $grid->column('user.nickname','昵称');
-            $grid->column('combo.name','充值套餐');
-            $grid->column('price');
-            $grid->column('gift');
+            $grid->column('avatar','头像')->display(function () {
+                $str  = "";
+                $str .= "<div style='margin-right:10px;display: flex;align-items: center'>";
+                $str .= '<img data-action="preview-img" src="' . $this->user->avatar . '" style="height:50px;width:50px;cursor:pointer;margin-right:10px;" class="img img-thumbnail">';
+                $str .= '<div>';
+                $str .= '<p style="margin-bottom: 5px">' . $this->user->nickname . '</p>';
+                $str .= '<p style="margin-bottom: 0px">' . $this->user->mobile . '</p>';
+                $str .= "</div>";
+                $str .= "</div>";
+                return $str;
+            });
+            $grid->column('user.info.platform','所属平台')->using(config('global.platform'))->label('primary');
+            $grid->column('gold','收支情况')->display(function (){
+                return '+'.($this->gold + $this->gift);
+            })->label('success');
+            $grid->column('desc');
+            $grid->column('pay_id','订单号');
             $grid->column('created_at','充值时间');
 
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->panel();
                 $filter->like('user.nickname','昵称')->width(3);
+                $filter->like('pay_id','订单号')->width(3);
+                $filter->equal('user.info.platform','所属平台')->select(config('global.platform'))->width(3);
                 $filter->equal('combo.id','充值套餐')->select(function (){
                     return RechargeCombo::select(['id','name'])->get()->pluck('name','id')->toArray();
                 })->width(3);
@@ -38,6 +53,7 @@ class UserRechargeRecordController extends AdminController
 
             });
 
+            $grid->disableActions();
             $grid->disableDeleteButton();
             $grid->disableCreateButton();
             $grid->disableViewButton();

server/app/Admin/Controllers/Setting/SettingController.php

@@ -14,6 +14,8 @@ class SettingController extends AdminController
 {
     const TYPE_BASIC = 'basic'; // 基础设置
     const TYPE_TIPS = 'tips'; // 消息设置
+    const TYPE_GOLD = 'gold'; // 金币设置
+    const TYPE_ROLE = 'role'; // 会员权限
 
     protected $type = '';
 
@@ -39,10 +41,17 @@ class SettingController extends AdminController
                 $grid->column('contact')->editable();
             }elseif($this->type == self::TYPE_TIPS){
                 $grid->column('tips')->editable();
-            }else{
+            }elseif($this->type == self::TYPE_GOLD){
                 $grid->column('recharge_bg_img')->image('',150);;
                 $grid->column('recharge_button_txt');
                 $grid->column('recharge_desc');
+            }elseif($this->type == self::TYPE_ROLE){
+                $grid->column('vip_role')->radio(config('global.vip_role'));
+            }
+
+            if($this->type == self::TYPE_ROLE){
+                $grid->disableEditButton();
+                $grid->disableActions();
             }
 
             $grid->disableDeleteButton();
@@ -97,7 +106,7 @@ class SettingController extends AdminController
                 $form->text('contact')->minLength(11)->maxLength(11);
             }elseif($this->type == self::TYPE_TIPS){
                 $form->text('tips');
-            }else{
+            }elseif($this->type == self::TYPE_GOLD){
                 $form->image('recharge_bg_img')->saveFullUrl()
                     ->uniqueName()->autoUpload()
                     ->autoSave(false)
@@ -105,6 +114,8 @@ class SettingController extends AdminController
                     ->width(4);
                 $form->text('recharge_button_txt')->maxLength(10);
                 $form->textarea('recharge_desc');
+            } elseif($this->type == self::TYPE_ROLE){
+                $form->radio('vip_role',config('global.vip_role'));;
             }
 
             $form->disableViewButton();

server/app/Admin/routes.php

@@ -68,7 +68,8 @@ Route::group([
         // --金币 充值记录
         $router->resource('/recharge/records','UserRechargeRecordController');
     });
-
+    // 营销 --会员 权限设置
+    $router->resource('/market/member/role','Setting\\SettingController');
     //营销 --金币 基础设置
     $router->resource('/market/setting/gold','Setting\\SettingController');
 

server/app/Models/Setting.php

@@ -13,6 +13,7 @@ use Illuminate\Database\Eloquent\Model;
  * @property string $logo 小程序logo
  * @property string $contact 联系电话
  * @property string $tips 小程序提示
+ * @property int $vip_role 会员权限
  * @property int $is_watch_auto_pay 观看自动支付
  * @property string $recharge_bg_img 封面图
  * @property string $recharge_button_txt 按钮文案

server/config/global.php

@@ -11,4 +11,6 @@ return [
     'episode_opend' => ['已下架','销售中'],
     // 是否状态
     'bool_status' => ['否','是'],
+    // 会员权限
+    'vip_role' => [ 1 => '会员可查看所有视频', 2 => '会员只能查看指定视频']
 ];

server/resources/lang/zh/setting.php

@@ -3,12 +3,17 @@ return [
     'labels' => [
         'Setting' => '基础设置',
         'setting' => '基础设置',
+        'market' => '营销',
+        'member' => '会员',
+        'gold' => '金币-基础设置',
+        'role' => '权限',
     ],
     'fields' => [
         'name' => '小程序名称',
         'logo' => '小程序logo',
         'contact' => '联系电话',
         'tips' => '小程序提示',
+        'vip_role' => '会员权限',
         'is_watch_auto_pay' => '观看自动扣币',
         'recharge_bg_img' => '充值背景图',
         'recharge_button_txt' => '充值按钮文字',

server/resources/lang/zh/user-recharge-record.php

@@ -14,6 +14,7 @@ return [
         'gold' => '充值奖励金币',
         'gift' => '赠送金币',
         'pay_id' => '支付ID',
+        'desc' => '说明',
         'created_at' => '充值时间',
     ],
     'options' => [