From 4f547b475a67cb147113022b3aba40471e53b503 Mon Sep 17 00:00:00 2001
From: Jing Li <lym125@gmail.com>
Date: Mon, 13 Nov 2023 11:36:58 +0800
Subject: [PATCH] Update

---
 app/Admin/Controllers/UserVipController.php | 11 ++++++-----
 app/Admin/Controllers/VipController.php     |  3 ++-
 resources/lang/zh_CN/user-vip.php           |  3 ++-
 resources/lang/zh_CN/vip.php                |  1 +
 4 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/app/Admin/Controllers/UserVipController.php b/app/Admin/Controllers/UserVipController.php
index 02df5f92..3f5a9bbd 100644
--- a/app/Admin/Controllers/UserVipController.php
+++ b/app/Admin/Controllers/UserVipController.php
@@ -5,8 +5,8 @@ namespace App\Admin\Controllers;
 use App\Models\{UserVip, Vip};
 use Dcat\Admin\Form;
 use Dcat\Admin\Grid;
-use Dcat\Admin\Show;
 use Dcat\Admin\Http\Controllers\AdminController;
+use Dcat\Admin\Show;
 
 class UserVipController extends AdminController
 {
@@ -18,7 +18,7 @@ class UserVipController extends AdminController
     protected function grid()
     {
         return Grid::make(UserVip::with(['user']), function (Grid $grid) {
-            
+
             $grid->model()->where('status', UserVip::STATUS_SUCCESS)->latest('created_at');
 
             $grid->column('user.phone');
@@ -27,11 +27,12 @@ class UserVipController extends AdminController
                 return data_get($v, 'text');
             });
             $grid->column('price');
+            $grid->column('points')->display(fn() => data_get($this->gift, 'points', 0));
             $grid->column('success_time');
             $grid->column('expired');
 
             $grid->disableViewButton(false);
-        
+
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->panel(false);
                 $filter->like('user.phone')->width(3);
@@ -59,7 +60,7 @@ class UserVipController extends AdminController
             $show->field('success_time');
             $show->field('expired');
             $show->field('gift', '赠品')->view('admin.vip.gift');
-            
+
             $show->field('pay.pay_sn', '订单号');
             $show->field('pay.pay_way', '支付方式')->as(function ($value) {
                 return $this->pay->pay_way->text();
@@ -85,7 +86,7 @@ class UserVipController extends AdminController
             $form->text('vip_id');
             $form->text('times');
             $form->text('success_time');
-        
+
             $form->display('created_at');
             $form->display('updated_at');
         });
diff --git a/app/Admin/Controllers/VipController.php b/app/Admin/Controllers/VipController.php
index d7e465bb..d97701a5 100644
--- a/app/Admin/Controllers/VipController.php
+++ b/app/Admin/Controllers/VipController.php
@@ -58,6 +58,7 @@ class VipController extends AdminController
                 return data_get($v, 'text');
             });
             $grid->column('price');
+            $grid->column('points')->display(fn() => data_get($this->gift, 'points', 0));
             $grid->column('sort')->editable();
             $grid->column('status')->switch();
 
@@ -124,7 +125,7 @@ class VipController extends AdminController
             $form->switch('status')->default(1);
             $form->textarea('description');
 
-            $form->number('points', '赠送积分')
+            $form->number('points')
                 ->min(0)
                 ->customFormat(fn () => data_get($this->gift, 'points'));
             $form->table('coupon', function ($table) {
diff --git a/resources/lang/zh_CN/user-vip.php b/resources/lang/zh_CN/user-vip.php
index 935b72b0..e6061ec4 100644
--- a/resources/lang/zh_CN/user-vip.php
+++ b/resources/lang/zh_CN/user-vip.php
@@ -1,4 +1,4 @@
-<?php 
+<?php
 return [
     'labels' => [
         'UserVip' => '购买记录',
@@ -15,6 +15,7 @@ return [
         'vip' => [
             'name' => '会员卡'
         ],
+        'points' => '赠送积分',
         'expired' => '会员有效期',
         'price' => '价格',
     ],
diff --git a/resources/lang/zh_CN/vip.php b/resources/lang/zh_CN/vip.php
index 8dcbf8f0..35b20cee 100644
--- a/resources/lang/zh_CN/vip.php
+++ b/resources/lang/zh_CN/vip.php
@@ -15,6 +15,7 @@ return [
         'status' => '状态',
         'description' => '描述',
         'coupon' => '优惠券',
+        'points' => '赠送积分',
     ],
     'options' => [
         'deny' => '删除失败',