From 9574d293023ae185370540ace71650bf901a3c20 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Tue, 4 Jan 2022 18:11:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=94=AE=E5=90=8E=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B7=B3=E8=BD=AC=E8=AE=A2=E5=8D=95=E8=AF=A6?= =?UTF-8?q?=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Controllers/AfterSaleController.php | 7 ++++++- resources/lang/zh_CN/order.php | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/app/Admin/Controllers/AfterSaleController.php b/app/Admin/Controllers/AfterSaleController.php index 3e64212b..f1970f48 100644 --- a/app/Admin/Controllers/AfterSaleController.php +++ b/app/Admin/Controllers/AfterSaleController.php @@ -128,7 +128,12 @@ class AfterSaleController extends AdminController $column->row(Show::make($id, $builder, function (Show $show) { $show->field('id'); $show->field('sn'); - $show->field('order.sn'); + $show->field('order.sn')->unescape()->as(function ($value) { + if (Admin::user()->can('dcat.admin.orders.show')) { + return ''.$value.''; + } + return $value; + }); $show->field('user.phone'); $show->field('user.user_info.nickname'); $show->field('order_product.name'); diff --git a/resources/lang/zh_CN/order.php b/resources/lang/zh_CN/order.php index 4c4647e1..78aea1f1 100644 --- a/resources/lang/zh_CN/order.php +++ b/resources/lang/zh_CN/order.php @@ -48,7 +48,7 @@ return [ 'packages'=>'包裹内容', 'order_product_id' =>'商品', 'quantity'=>'数量', - 'remain_quantity'=>'剩余', + 'remain_quantity'=>'待发', 'tags'=>'标签', ],