From 724d82cddc153f7d3779aa93db26a5d7c73ecc4c Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Thu, 23 Dec 2021 13:24:34 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E6=88=90?= =?UTF-8?q?=E9=95=BF=E5=80=BC=E4=B8=BA=E9=94=80=E5=94=AE=E5=80=BC=EF=BC=8C?= =?UTF-8?q?=E5=B9=B6=E6=B7=BB=E5=8A=A0=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E4=BD=99=E9=A2=9D=E5=92=8C=E7=A7=AF=E5=88=86=E5=8F=8D=E5=9B=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/ProductSkuController.php | 2 +- app/Admin/Controllers/ProductSpuController.php | 4 ++-- app/Admin/Renderable/ProductSkuTable.php | 2 +- app/Endpoint/Api/Http/Resources/ProduckSkuResource.php | 1 + app/Endpoint/Api/Http/Resources/UserInfoResource.php | 2 ++ app/Traits/SkuInfo.php | 3 ++- resources/lang/zh_CN/product-sku.php | 1 + resources/lang/zh_CN/product-spu.php | 1 + 8 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/Admin/Controllers/ProductSkuController.php b/app/Admin/Controllers/ProductSkuController.php index 428aa1aa..d2048307 100644 --- a/app/Admin/Controllers/ProductSkuController.php +++ b/app/Admin/Controllers/ProductSkuController.php @@ -120,7 +120,7 @@ class ProductSkuController extends AdminController } return bcmul($vipPrice, 100); }); - $form->number('growth_value')->min(0)->default(0); + $form->currency('sales_value')->symbol('@')->default(0); $form->divider(); $form->select('attr_group')->options(ProductGroup::all()->pluck('name', 'id')); $form->selectAttr('attrs')->listen('attr_group'); diff --git a/app/Admin/Controllers/ProductSpuController.php b/app/Admin/Controllers/ProductSpuController.php index 35108116..beff31c0 100644 --- a/app/Admin/Controllers/ProductSpuController.php +++ b/app/Admin/Controllers/ProductSpuController.php @@ -49,7 +49,7 @@ class ProductSpuController extends AdminController return '￥'.bcdiv($value, 100, 2); }); $grid->column('weight'); - $grid->column('growth_value'); + $grid->column('sales_value'); $grid->column('created_at')->sortable(); //排序 @@ -184,7 +184,7 @@ class ProductSpuController extends AdminController } return bcmul($vipPrice, 100); }); - $form->number('growth_value')->min(0)->default(0); + $form->currency('sales_value')->symbol('@')->default(0); $form->divider(); $form->select('attr_group')->options(ProductGroup::all()->pluck('name', 'id')); $form->selectAttr('attrs')->listen('attr_group'); diff --git a/app/Admin/Renderable/ProductSkuTable.php b/app/Admin/Renderable/ProductSkuTable.php index 25667e2f..e2a20925 100644 --- a/app/Admin/Renderable/ProductSkuTable.php +++ b/app/Admin/Renderable/ProductSkuTable.php @@ -65,7 +65,7 @@ class ProductSkuTable extends Grid return '￥'.bcdiv($value, 100, 2); }); $grid->column('weight'); - $grid->column('growth_value'); + $grid->column('sales_value'); $grid->column('stock'); $grid->column('sales'); $grid->column('verify_state') diff --git a/app/Endpoint/Api/Http/Resources/ProduckSkuResource.php b/app/Endpoint/Api/Http/Resources/ProduckSkuResource.php index d04c394d..83bcce77 100644 --- a/app/Endpoint/Api/Http/Resources/ProduckSkuResource.php +++ b/app/Endpoint/Api/Http/Resources/ProduckSkuResource.php @@ -33,6 +33,7 @@ class ProduckSkuResource extends JsonResource return $this->buynote?->content; }), 'growth_value' => (int) $this->growth_value, + 'sales_value' => (int) $this->sales_value, ]; } } diff --git a/app/Endpoint/Api/Http/Resources/UserInfoResource.php b/app/Endpoint/Api/Http/Resources/UserInfoResource.php index 3206d5b4..ee942d50 100644 --- a/app/Endpoint/Api/Http/Resources/UserInfoResource.php +++ b/app/Endpoint/Api/Http/Resources/UserInfoResource.php @@ -20,6 +20,8 @@ class UserInfoResource extends JsonResource 'gender' => (string) $this->gender, 'birthday' => (string) $this->birthday?->toDateString(), 'code' => (string) $this->code, + 'balance' => '1000.00', //todo 用户余额 + 'points' => (int) $this->points, ]; } } diff --git a/app/Traits/SkuInfo.php b/app/Traits/SkuInfo.php index 03b74808..eb2e900e 100644 --- a/app/Traits/SkuInfo.php +++ b/app/Traits/SkuInfo.php @@ -120,7 +120,8 @@ trait SkuInfo 'buynote_id' => $spu->buynote_id, 'shipping_template_id'=> $spu->shipping_template_id, 'verify_state' => 0, //默认为正常 - 'growth_value' => $spu->growth_value, + // 'growth_value' => $spu->growth_value, + 'sales_value' => $spu->sales_value, ]; } diff --git a/resources/lang/zh_CN/product-sku.php b/resources/lang/zh_CN/product-sku.php index 0731ea8c..26e4d9fb 100644 --- a/resources/lang/zh_CN/product-sku.php +++ b/resources/lang/zh_CN/product-sku.php @@ -39,6 +39,7 @@ return [ 'num'=>'赠送数量', 'limit'=>'限量', 'growth_value'=>'成长值', + 'sales_value'=>'销售值', ], 'options' => [ 'deny' => '删除失败', diff --git a/resources/lang/zh_CN/product-spu.php b/resources/lang/zh_CN/product-spu.php index c0f401ad..c1e33955 100644 --- a/resources/lang/zh_CN/product-spu.php +++ b/resources/lang/zh_CN/product-spu.php @@ -31,6 +31,7 @@ return [ 'verify_state'=>'状态', 'release_at'=>'上架时间', 'growth_value'=>'成长值', + 'sales_value'=>'销售值', ], 'options' => [ 'deny' => '删除失败',