diff --git a/modules/Mall/Http/Controllers/Admin/ShopController.php b/modules/Mall/Http/Controllers/Admin/ShopController.php index 5a71e20..77cde90 100644 --- a/modules/Mall/Http/Controllers/Admin/ShopController.php +++ b/modules/Mall/Http/Controllers/Admin/ShopController.php @@ -60,7 +60,7 @@ class ShopController extends AdminController $grid->model()->withCount(['versions', 'staffers'])->with(['user.info']); $grid->column('name', '店铺名称'); - $grid->column('所属用户')->display(fn() => $this->user->username . '[' . $this->user->info->nickname . ']'); +// $grid->column('所属用户')->display(fn() => $this->user->username . '[' . $this->user->info->nickname . ']'); $grid->column('is_self', '类型') ->using([ 0 => '合作', diff --git a/modules/Mall/Http/Resources/Api/Order/OrderAreaCodeResource.php b/modules/Mall/Http/Resources/Api/Order/OrderAreaCodeResource.php new file mode 100644 index 0000000..9363382 --- /dev/null +++ b/modules/Mall/Http/Resources/Api/Order/OrderAreaCodeResource.php @@ -0,0 +1,30 @@ + $this->order_no, + 'amount' => $this->amount, + 'freight' => $this->freight, + 'total' => $this->total, + 'state' => [ + 'value' => $this->state, + 'text' => $this->state_text, + ], + 'can' => $this->getCanAction(), + 'items' => OrderItemResource::collection($this->items), + 'area_code' => new AreaCodeVerifyResource($this->areaCode), + 'remark' => (string) $this->remark, + 'created_at' => (string) $this->created_at, + ]; + } + +}