From c9164d7f89bad1a92849c4c0fe943ceb6d35aad9 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Wed, 15 Dec 2021 17:40:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=94=AE=E5=90=8E=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E4=BB=A5=E5=8F=8A=E8=A1=A5=E5=85=85=E8=B4=A7?= =?UTF-8?q?=E8=BF=90=E5=8D=95=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Admin/Actions/Grid/CreateOrderPackage.php | 44 ++ app/Admin/Actions/Grid/SkuGift.php | 2 +- app/Admin/Actions/Grid/SkuSyncSpu.php | 2 +- .../Actions/Show/AfterSaleShippingFail.php | 82 +++ app/Admin/Controllers/AfterSaleController.php | 7 + app/Admin/Controllers/OrderController.php | 160 +++++ .../Controllers/OrderPackageController.php | 19 +- .../Grid/Tools/Product/BatchSkuSyncSpu.php | 2 +- app/Admin/Forms/OrderPackage.php | 73 +++ app/Admin/Repositories/Order.php | 16 + app/Admin/routes.php | 10 +- app/Models/AfterSale.php | 1 + app/Services/AfterSaleService.php | 25 + ..._14_195244_create_order_packages_table.php | 3 + database/seeders/AdminMenuSeeder.php | 14 +- dcat_admin_ide_helper.php | 568 +++++++++--------- resources/lang/zh_CN/admin_message.php | 2 + resources/lang/zh_CN/order-package.php | 1 + resources/lang/zh_CN/order.php | 37 ++ 19 files changed, 778 insertions(+), 290 deletions(-) create mode 100644 app/Admin/Actions/Grid/CreateOrderPackage.php create mode 100644 app/Admin/Actions/Show/AfterSaleShippingFail.php create mode 100644 app/Admin/Controllers/OrderController.php create mode 100644 app/Admin/Forms/OrderPackage.php create mode 100644 app/Admin/Repositories/Order.php create mode 100644 resources/lang/zh_CN/order.php diff --git a/app/Admin/Actions/Grid/CreateOrderPackage.php b/app/Admin/Actions/Grid/CreateOrderPackage.php new file mode 100644 index 00000000..2e39346d --- /dev/null +++ b/app/Admin/Actions/Grid/CreateOrderPackage.php @@ -0,0 +1,44 @@ +'; + + public function title() + { + if ($this->title) { + return $this->title.' '.__('admin_message.actions.grid.craete_order_package'); + } + + return __('admin_message.actions.grid.create_order_package'); + } + + /** + * @param Model|Authenticatable|HasPermissions|null $user + * + * @return bool + */ + protected function authorize($user): bool + { + return $user->can('dcat.admin.product_sku_verifies.verify'); + } + + public function render() + { + $form = OrderPackage::make()->payload(['order_id'=>$this->getKey()]); + return Modal::make() + ->lg() + ->title($this->title()) + ->body($form) + ->button($this->title()); + } +} diff --git a/app/Admin/Actions/Grid/SkuGift.php b/app/Admin/Actions/Grid/SkuGift.php index 782e4d94..ab45ba83 100644 --- a/app/Admin/Actions/Grid/SkuGift.php +++ b/app/Admin/Actions/Grid/SkuGift.php @@ -11,7 +11,7 @@ class SkuGift extends RowAction /** * @return string */ - protected $title = ''; + protected $title = ''; public function title() { diff --git a/app/Admin/Actions/Grid/SkuSyncSpu.php b/app/Admin/Actions/Grid/SkuSyncSpu.php index 36399744..8658c53c 100644 --- a/app/Admin/Actions/Grid/SkuSyncSpu.php +++ b/app/Admin/Actions/Grid/SkuSyncSpu.php @@ -14,7 +14,7 @@ class SkuSyncSpu extends RowAction /** * @return string */ - protected $title = ''; + protected $title = ''; public function title() { diff --git a/app/Admin/Actions/Show/AfterSaleShippingFail.php b/app/Admin/Actions/Show/AfterSaleShippingFail.php new file mode 100644 index 00000000..86ac733f --- /dev/null +++ b/app/Admin/Actions/Show/AfterSaleShippingFail.php @@ -0,0 +1,82 @@ + 拒绝确认'; + + /** + * 按钮样式定义，默认 btn btn-white waves-effect + * + * @var string + */ + protected $style = 'btn btn-sm btn-danger'; + + /** + * 权限判断，如不需要可以删除此方法 + * + * @param Model|Authenticatable|HasPermissions|null $user + * + * @return bool + */ + protected function authorize($user): bool + { + return $user->can('dcat.admin.after_sales.shipping'); + } + + /** + * 处理请求，如果不需要接口处理，请直接删除这个方法 + * + * @param Request $request + * + * @return Response + */ + public function handle(Request $request) + { + // 获取主键 + $key = $this->getKey(); + + $afterSaleService = new AfterSaleService(); + try { + DB::beginTransaction(); + $afterSale = AfterSale::where('state', AfterSale::STATE_SHIPPING)->findOrFail($key); + $afterSaleService->shippingFail($afterSale); + DB::commit(); + } catch (Throwable $th) { + DB::rollBack(); + report($th); + return $this->response()->error('操作失败：'.$th->getMessage()); + } + + return $this->response() + ->success(__('admin.update_succeeded')) + ->refresh(); + } + + public function html() + { + return parent::html().'  '; + } + + /** + * 确认弹窗信息，如不需要可以删除此方法 + * + * @return string|array|void + */ + public function confirm() + { + return ['是否拒绝收货？', '该操作不可逆，确认后将退回客服审核。']; + } +} diff --git a/app/Admin/Controllers/AfterSaleController.php b/app/Admin/Controllers/AfterSaleController.php index 22e57e22..dc069b7b 100644 --- a/app/Admin/Controllers/AfterSaleController.php +++ b/app/Admin/Controllers/AfterSaleController.php @@ -5,6 +5,7 @@ namespace App\Admin\Controllers; use App\Admin\Actions\Show\AfterSaleFinance; use App\Admin\Actions\Show\AfterSaleFinanceShipping; use App\Admin\Actions\Show\AfterSaleShipping; +use App\Admin\Actions\Show\AfterSaleShippingFail; use App\Admin\Actions\Show\AfterSaleVerify; use App\Admin\Repositories\AfterSale; use App\Models\AfterSale as AfterSaleModel; @@ -111,6 +112,9 @@ class AfterSaleController extends AdminController return '￥'.bcdiv($amount, 100, 2); }); } + if (in_array($show->model()->type, [AfterSaleModel::TYPE_REFUND_AND_RETURN, AfterSaleModel::TYPE_CHANGE])) { + $show->field('tracking_number'); + } $show->field('type')->using([ AfterSaleModel::TYPE_REFUND_AND_RETURN => '退款退货', AfterSaleModel::TYPE_REFUND => '退款', @@ -144,6 +148,9 @@ class AfterSaleController extends AdminController $tools->append(new AfterSaleVerify()); } if ($show->model()->state == AfterSaleModel::STATE_SHIPPING) { + //拒绝确认收货 + $tools->append(new AfterSaleShippingFail()); + //同意确认收货 $tools->append(new AfterSaleShipping()); } if ($show->model()->state == AfterSaleModel::STATE_FINANCE) { diff --git a/app/Admin/Controllers/OrderController.php b/app/Admin/Controllers/OrderController.php new file mode 100644 index 00000000..83f23177 --- /dev/null +++ b/app/Admin/Controllers/OrderController.php @@ -0,0 +1,160 @@ +column('id')->sortable(); + $grid->column('sn'); + $grid->column('user.phone'); + // $grid->column('user_coupon_id'); + // $grid->column('coupon_discount_amount'); + $grid->column('products_total_amount'); + $grid->column('vip_discount_amount'); + $grid->column('coupon_discount_amount'); + $grid->column('reduced_amount'); + $grid->column('weight'); + $grid->column('shipping_fee'); + $grid->column('total_amount'); + // $grid->column('note'); + // $grid->column('remark'); + // $grid->column('pay_sn'); + $grid->column('pay_way'); + // $grid->column('pay_at'); + // $grid->column('consignee_name'); + // $grid->column('consignee_telephone'); + // $grid->column('consignee_zone'); + // $grid->column('consignee_address'); + $grid->column('status'); + // $grid->column('completed_at'); + $grid->column('created_at')->sortable(); + + $grid->actions(function (Grid\Displayers\Actions $actions) { + $actions->append(new CreateOrderPackage()); + }); + + $grid->filter(function (Grid\Filter $filter) { + $filter->equal('id'); + }); + }); + } + + /** + * Make a show builder. + * + * @param mixed $id + * + * @return Show + */ + protected function detail($id) + { + return Show::make($id, new Order(), function (Show $show) { + $show->field('id'); + $show->field('user_id'); + $show->field('sn'); + $show->field('user_coupon_id'); + $show->field('coupon_discount_amount'); + $show->field('vip_discount_amount'); + $show->field('reduced_amount'); + $show->field('shipping_fee'); + $show->field('products_total_amount'); + $show->field('total_amount'); + $show->field('weight'); + $show->field('note'); + $show->field('remark'); + $show->field('pay_sn'); + $show->field('pay_way'); + $show->field('pay_at'); + $show->field('consignee_name'); + $show->field('consignee_telephone'); + $show->field('consignee_zone'); + $show->field('consignee_address'); + $show->field('status'); + $show->field('completed_at'); + $show->field('created_at'); + $show->field('updated_at'); + }); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + return Form::make(new Order(), function (Form $form) { + $form->display('id'); + $form->text('user_id'); + $form->text('sn'); + $form->text('user_coupon_id'); + $form->text('coupon_discount_amount'); + $form->text('vip_discount_amount'); + $form->text('reduced_amount'); + $form->text('shipping_fee'); + $form->text('products_total_amount'); + $form->text('total_amount'); + $form->text('weight'); + $form->text('note'); + $form->text('remark'); + $form->text('pay_sn'); + $form->text('pay_way'); + $form->text('pay_at'); + $form->text('consignee_name'); + $form->text('consignee_telephone'); + $form->text('consignee_zone'); + $form->text('consignee_address'); + $form->text('status'); + $form->text('completed_at'); + + $form->display('created_at'); + $form->display('updated_at'); + }); + } + + public function orders(Request $request) + { + $sn = $request->input('q'); + + $query = OrderModel::select('id', 'sn as text'); + + if ($sn) { + $query->where('sn', 'like', "%$sn%"); + return $query->paginate(null); + } + + return response()->json($query->get()); + } + + public function orderProducts(Request $request) + { + $orderId = $request->input('q'); + + $query = OrderProduct::select('id', 'name as text'); + + if ($orderId) { + $query->where('order_id', $orderId); + } + + return response()->json($query->get()); + } +} diff --git a/app/Admin/Controllers/OrderPackageController.php b/app/Admin/Controllers/OrderPackageController.php index 6e1cca65..c799a1d8 100644 --- a/app/Admin/Controllers/OrderPackageController.php +++ b/app/Admin/Controllers/OrderPackageController.php @@ -4,6 +4,7 @@ namespace App\Admin\Controllers; use App\Admin\Repositories\OrderPackage; use App\Models\Order; +use Dcat\Admin\Admin; use Dcat\Admin\Form; use Dcat\Admin\Grid; use Dcat\Admin\Http\Controllers\AdminController; @@ -33,8 +34,24 @@ class OrderPackageController extends AdminController $grid->column('created_at')->sortable(); // $grid->column('updated_at'); + /** 操作 **/ + //新增 + // if (Admin::user()->can('dcat.admin.order_packages.create')) { + // $grid->disableCreateButton(false); + // $grid->enableDialogCreate(); + // } + //修改 + $grid->showQuickEditButton(Admin::user()->can('dcat.admin.order_packages.edit')); + //删除以及自定义操作 + $grid->actions(function (Grid\Displayers\Actions $actions) { + $actions->disableDelete(Admin::user()->cannot('dcat.admin.order_packages.destroy')); + }); + + /** 查询 **/ $grid->filter(function (Grid\Filter $filter) { - $filter->equal('id'); + $filter->panel(); + $filter->like('order.sn')->width(3); + $filter->like('sn')->width(3); }); }); } diff --git a/app/Admin/Extensions/Grid/Tools/Product/BatchSkuSyncSpu.php b/app/Admin/Extensions/Grid/Tools/Product/BatchSkuSyncSpu.php index 9ae13293..4762fd53 100644 --- a/app/Admin/Extensions/Grid/Tools/Product/BatchSkuSyncSpu.php +++ b/app/Admin/Extensions/Grid/Tools/Product/BatchSkuSyncSpu.php @@ -13,7 +13,7 @@ class BatchSkuSyncSpu extends BatchAction /** * @return string */ - protected $title = ''; + protected $title = ''; public function title() { diff --git a/app/Admin/Forms/OrderPackage.php b/app/Admin/Forms/OrderPackage.php new file mode 100644 index 00000000..71980a05 --- /dev/null +++ b/app/Admin/Forms/OrderPackage.php @@ -0,0 +1,73 @@ +can('dcat.admin.product_spus.add_sku'); + } + + /** + * Handle the form request. + * + * @param array $input + * + * @return mixed + */ + public function handle(array $input) + { + dd($input); + return $this->response() + ->success(__('admin.update_succeeded')) + ->refresh(); + } + + /** + * Build a form here. + */ + public function form() + { + $orderId = $this->payload['order_id'] ?? 0; + + $order = Order::findOrFail($orderId); + $this->hidden('order_id'); + + $this->text('shipping_company'); + $this->text('shipping_number'); + $this->hasMany('packages', function (Form $form) use ($order) { + $form->select('order_product_id')->options($order->products->pluck('name', 'id')); + $form->number('quantity')->min(0); + }); + + $this->disableResetButton(); + } + + /** + * The data of the form. + * + * @return array + */ + public function default() + { + return [ + // 'name' => 'John Doe', + // 'email' => 'John.Doe@gmail.com', + ]; + } +} diff --git a/app/Admin/Repositories/Order.php b/app/Admin/Repositories/Order.php new file mode 100644 index 00000000..4676dd29 --- /dev/null +++ b/app/Admin/Repositories/Order.php @@ -0,0 +1,16 @@ +resource('order-packages', 'OrderPackageController')->names('order_packages'); + $router->resource('orders', 'OrderController')->only([ + 'index', 'show', 'edit', 'update', + ]); + + $router->resource('order-packages', 'OrderPackageController')->only([ + 'index', 'show', 'edit', 'update', 'destroy', + ])->names('order_packages'); /** api接口 **/ $router->get('api/product-categories', 'ProductCategoryController@categories')->name('api.product_categories'); @@ -99,4 +105,6 @@ Route::group([ $router->get('api/product-skus', 'ProductSkuController@skus')->name('api.product_skus'); $router->get('api/coupons', 'CouponController@coupons')->name('api.coupons'); $router->get('api/coupone-send-tasks', 'CouponSendTaskController@tasks')->name('api.coupon_send_tasks'); + $router->get('api/orders', 'OrderController@orders')->name('api.orders'); + $router->get('api/order-products', 'OrderController@orderProducts')->name('api.order_products'); }); diff --git a/app/Models/AfterSale.php b/app/Models/AfterSale.php index 1261bab6..49b0273b 100644 --- a/app/Models/AfterSale.php +++ b/app/Models/AfterSale.php @@ -43,6 +43,7 @@ class AfterSale extends Model 'description', 'images', 'remarks', + 'tracking_number', ]; public function user() diff --git a/app/Services/AfterSaleService.php b/app/Services/AfterSaleService.php index 1ca7a64b..b5dc994a 100644 --- a/app/Services/AfterSaleService.php +++ b/app/Services/AfterSaleService.php @@ -217,6 +217,7 @@ class AfterSaleService public function agree(AfterSale $afterSale, array $params, $remarks = '用户已同意客服审核结果') { + dd($params); if ($this->isWaitAgree($afterSale)) { switch ($afterSale->type) { case AfterSale::TYPE_REFUND_AND_RETURN: @@ -257,6 +258,30 @@ class AfterSaleService } } + /** + * 物流拒绝确认收货 + * + * @param AfterSale $afterSale + * @param string $remarks + * @return void + */ + public function shippingFail(AfterSale $afterSale, $remarks ='物流收货未通过') + { + if ($this->isWaitShipping($afterSale)) { + $afterSale->update([ + 'state' => $afterSale::STATE_VERIFY, + 'remarks' => $remarks, + ]); + AfterSaleLog::create([ + 'after_sale_id' => $afterSale->id, + 'name' => '仓库审核', + 'desc' => $remarks, + ]); + } else { + throw new BizException('该售后订单状态异常'); + } + } + /** * 物流确认收货 * diff --git a/database/migrations/2021_12_14_195244_create_order_packages_table.php b/database/migrations/2021_12_14_195244_create_order_packages_table.php index 9c9f4720..1bb9f982 100644 --- a/database/migrations/2021_12_14_195244_create_order_packages_table.php +++ b/database/migrations/2021_12_14_195244_create_order_packages_table.php @@ -22,6 +22,9 @@ class CreateOrderPackagesTable extends Migration $table->string('consignee_address')->nullable()->comment('收货人详细地址'); $table->string('shipping_company')->nullable()->comment('快递公司'); $table->string('shipping_number')->nullable()->comment('快递单号'); + $table->unsignedTinyInteger('is_failed')->default(0)->comment('是否作废'); + $table->unsignedTinyInteger('status')->default(0)->comment('快递状态:0在途，1揽收，2疑难，3签收，4退签，5派件，6退回'); + $table->timestamp('inspected_at')->nullable()->comment('签收时间'); $table->string('remarks')->nullable()->comment('备注'); $table->timestamps(); }); diff --git a/database/seeders/AdminMenuSeeder.php b/database/seeders/AdminMenuSeeder.php index fb8c40af..786e29b2 100644 --- a/database/seeders/AdminMenuSeeder.php +++ b/database/seeders/AdminMenuSeeder.php @@ -146,6 +146,18 @@ class AdminMenuSeeder extends Seeder ], ], ], + [ + 'title' =>'订单管理', + 'icon' => 'fa fa-cubes', + 'uri' => '', + 'children' => [ + [ + 'title' => '订单列表', + 'icon' => '', + 'uri' => 'orders', + ], + ], + ], [ 'title' => '货运管理', 'icon' => 'fa fa-subway', @@ -160,7 +172,7 @@ class AdminMenuSeeder extends Seeder ], [ 'title' => '售后管理', - 'icon' => 'fa fa-cubes', + 'icon' => 'fa fa-question-circle', 'uri'=>'', 'children'=>[ [ diff --git a/dcat_admin_ide_helper.php b/dcat_admin_ide_helper.php index 66042d01..bc875136 100644 --- a/dcat_admin_ide_helper.php +++ b/dcat_admin_ide_helper.php @@ -11,69 +11,69 @@ namespace Dcat\Admin { use Illuminate\Support\Collection; /** + * @property Grid\Column|Collection created_at + * @property Grid\Column|Collection dimensions * @property Grid\Column|Collection id + * @property Grid\Column|Collection is_show * @property Grid\Column|Collection key * @property Grid\Column|Collection name - * @property Grid\Column|Collection dimensions - * @property Grid\Column|Collection is_show - * @property Grid\Column|Collection created_at * @property Grid\Column|Collection updated_at - * @property Grid\Column|Collection user_id - * @property Grid\Column|Collection zone_id - * @property Grid\Column|Collection consignee - * @property Grid\Column|Collection telephone - * @property Grid\Column|Collection zone * @property Grid\Column|Collection address + * @property Grid\Column|Collection consignee * @property Grid\Column|Collection is_default + * @property Grid\Column|Collection telephone + * @property Grid\Column|Collection user_id + * @property Grid\Column|Collection zone + * @property Grid\Column|Collection zone_id + * @property Grid\Column|Collection detail * @property Grid\Column|Collection type * @property Grid\Column|Collection version - * @property Grid\Column|Collection detail * @property Grid\Column|Collection is_enabled - * @property Grid\Column|Collection parent_id - * @property Grid\Column|Collection order - * @property Grid\Column|Collection icon - * @property Grid\Column|Collection uri * @property Grid\Column|Collection extension - * @property Grid\Column|Collection permission_id + * @property Grid\Column|Collection icon + * @property Grid\Column|Collection order + * @property Grid\Column|Collection parent_id + * @property Grid\Column|Collection uri * @property Grid\Column|Collection menu_id - * @property Grid\Column|Collection slug + * @property Grid\Column|Collection permission_id * @property Grid\Column|Collection http_method * @property Grid\Column|Collection http_path + * @property Grid\Column|Collection slug * @property Grid\Column|Collection role_id * @property Grid\Column|Collection value - * @property Grid\Column|Collection username - * @property Grid\Column|Collection password * @property Grid\Column|Collection avatar + * @property Grid\Column|Collection password * @property Grid\Column|Collection remember_token + * @property Grid\Column|Collection username * @property Grid\Column|Collection address_id * @property Grid\Column|Collection image - * @property Grid\Column|Collection sort - * @property Grid\Column|Collection jump_type * @property Grid\Column|Collection jump_link + * @property Grid\Column|Collection jump_type + * @property Grid\Column|Collection sort * @property Grid\Column|Collection after_sale_id * @property Grid\Column|Collection desc * @property Grid\Column|Collection images - * @property Grid\Column|Collection order_id - * @property Grid\Column|Collection sn - * @property Grid\Column|Collection order_product_id - * @property Grid\Column|Collection num * @property Grid\Column|Collection amount - * @property Grid\Column|Collection state + * @property Grid\Column|Collection num + * @property Grid\Column|Collection order_id + * @property Grid\Column|Collection order_product_id * @property Grid\Column|Collection remarks + * @property Grid\Column|Collection sn + * @property Grid\Column|Collection state * @property Grid\Column|Collection tracking_number - * @property Grid\Column|Collection is_recommend * @property Grid\Column|Collection _lft * @property Grid\Column|Collection _rgt + * @property Grid\Column|Collection is_recommend * @property Grid\Column|Collection article_id - * @property Grid\Column|Collection category_id * @property Grid\Column|Collection author_name - * @property Grid\Column|Collection subtitle - * @property Grid\Column|Collection cover + * @property Grid\Column|Collection category_id * @property Grid\Column|Collection content - * @property Grid\Column|Collection points + * @property Grid\Column|Collection cover * @property Grid\Column|Collection likes - * @property Grid\Column|Collection media_type * @property Grid\Column|Collection media_content + * @property Grid\Column|Collection media_type + * @property Grid\Column|Collection points + * @property Grid\Column|Collection subtitle * @property Grid\Column|Collection continue_click_times * @property Grid\Column|Collection last_click_at * @property Grid\Column|Collection coupon_id @@ -81,158 +81,158 @@ namespace Dcat\Admin { * @property Grid\Column|Collection status * @property Grid\Column|Collection administrator_id * @property Grid\Column|Collection task_id - * @property Grid\Column|Collection threshold * @property Grid\Column|Collection limit * @property Grid\Column|Collection sent - * @property Grid\Column|Collection use_day - * @property Grid\Column|Collection use_start_at - * @property Grid\Column|Collection use_end_at * @property Grid\Column|Collection stock - * @property Grid\Column|Collection uuid + * @property Grid\Column|Collection threshold + * @property Grid\Column|Collection use_day + * @property Grid\Column|Collection use_end_at + * @property Grid\Column|Collection use_start_at * @property Grid\Column|Collection connection - * @property Grid\Column|Collection queue - * @property Grid\Column|Collection payload * @property Grid\Column|Collection exception * @property Grid\Column|Collection failed_at + * @property Grid\Column|Collection payload + * @property Grid\Column|Collection queue + * @property Grid\Column|Collection uuid * @property Grid\Column|Collection message_id * @property Grid\Column|Collection ext * @property Grid\Column|Collection order_package_id * @property Grid\Column|Collection quantity + * @property Grid\Column|Collection consignee_address * @property Grid\Column|Collection consignee_name * @property Grid\Column|Collection consignee_telephone * @property Grid\Column|Collection consignee_zone - * @property Grid\Column|Collection consignee_address * @property Grid\Column|Collection shipping_company * @property Grid\Column|Collection shipping_number - * @property Grid\Column|Collection spu_id + * @property Grid\Column|Collection coupon_discount_amount + * @property Grid\Column|Collection reduced_amount + * @property Grid\Column|Collection sell_price * @property Grid\Column|Collection sku_id * @property Grid\Column|Collection specs - * @property Grid\Column|Collection weight - * @property Grid\Column|Collection sell_price - * @property Grid\Column|Collection vip_price - * @property Grid\Column|Collection coupon_discount_amount - * @property Grid\Column|Collection vip_discount_amount - * @property Grid\Column|Collection reduced_amount + * @property Grid\Column|Collection spu_id * @property Grid\Column|Collection total_amount - * @property Grid\Column|Collection user_coupon_id - * @property Grid\Column|Collection shipping_fee - * @property Grid\Column|Collection products_total_amount + * @property Grid\Column|Collection vip_discount_amount + * @property Grid\Column|Collection vip_price + * @property Grid\Column|Collection weight + * @property Grid\Column|Collection completed_at * @property Grid\Column|Collection note - * @property Grid\Column|Collection remark + * @property Grid\Column|Collection pay_at * @property Grid\Column|Collection pay_sn * @property Grid\Column|Collection pay_way - * @property Grid\Column|Collection pay_at - * @property Grid\Column|Collection completed_at - * @property Grid\Column|Collection tokenable_type - * @property Grid\Column|Collection tokenable_id - * @property Grid\Column|Collection token + * @property Grid\Column|Collection products_total_amount + * @property Grid\Column|Collection remark + * @property Grid\Column|Collection shipping_fee + * @property Grid\Column|Collection user_coupon_id * @property Grid\Column|Collection abilities * @property Grid\Column|Collection last_used_at + * @property Grid\Column|Collection token + * @property Grid\Column|Collection tokenable_id + * @property Grid\Column|Collection tokenable_type * @property Grid\Column|Collection old_points * @property Grid\Column|Collection gift_sku_id * @property Grid\Column|Collection attrs * @property Grid\Column|Collection part_id * @property Grid\Column|Collection applicant_id * @property Grid\Column|Collection reviewer_id - * @property Grid\Column|Collection market_price - * @property Grid\Column|Collection cost_price - * @property Grid\Column|Collection media - * @property Grid\Column|Collection sales - * @property Grid\Column|Collection release_at - * @property Grid\Column|Collection verify_state * @property Grid\Column|Collection buynote_id + * @property Grid\Column|Collection cost_price + * @property Grid\Column|Collection market_price + * @property Grid\Column|Collection media + * @property Grid\Column|Collection release_at + * @property Grid\Column|Collection sales * @property Grid\Column|Collection shipping_template_id + * @property Grid\Column|Collection verify_state * @property Grid\Column|Collection feature_id * @property Grid\Column|Collection items * @property Grid\Column|Collection view_date * @property Grid\Column|Collection rule_id - * @property Grid\Column|Collection template_id * @property Grid\Column|Collection info - * @property Grid\Column|Collection phone + * @property Grid\Column|Collection template_id * @property Grid\Column|Collection code - * @property Grid\Column|Collection is_use * @property Grid\Column|Collection expires_at - * @property Grid\Column|Collection coupon_name - * @property Grid\Column|Collection coupon_type - * @property Grid\Column|Collection coupon_threshold + * @property Grid\Column|Collection is_use + * @property Grid\Column|Collection phone * @property Grid\Column|Collection coupon_amount + * @property Grid\Column|Collection coupon_name + * @property Grid\Column|Collection coupon_threshold + * @property Grid\Column|Collection coupon_type + * @property Grid\Column|Collection birthday + * @property Grid\Column|Collection gender * @property Grid\Column|Collection inviter_id * @property Grid\Column|Collection nickname - * @property Grid\Column|Collection gender - * @property Grid\Column|Collection birthday - * @property Grid\Column|Collection vip_id * @property Grid\Column|Collection growth_value - * @property Grid\Column|Collection phone_verified_at + * @property Grid\Column|Collection vip_id * @property Grid\Column|Collection email * @property Grid\Column|Collection email_verified_at - * @property Grid\Column|Collection last_login_ip * @property Grid\Column|Collection last_login_at + * @property Grid\Column|Collection last_login_ip + * @property Grid\Column|Collection phone_verified_at * @property Grid\Column|Collection register_ip * @property Grid\Column|Collection status_remark * + * @method Grid\Column|Collection created_at(string $label = null) + * @method Grid\Column|Collection dimensions(string $label = null) * @method Grid\Column|Collection id(string $label = null) + * @method Grid\Column|Collection is_show(string $label = null) * @method Grid\Column|Collection key(string $label = null) * @method Grid\Column|Collection name(string $label = null) - * @method Grid\Column|Collection dimensions(string $label = null) - * @method Grid\Column|Collection is_show(string $label = null) - * @method Grid\Column|Collection created_at(string $label = null) * @method Grid\Column|Collection updated_at(string $label = null) - * @method Grid\Column|Collection user_id(string $label = null) - * @method Grid\Column|Collection zone_id(string $label = null) - * @method Grid\Column|Collection consignee(string $label = null) - * @method Grid\Column|Collection telephone(string $label = null) - * @method Grid\Column|Collection zone(string $label = null) * @method Grid\Column|Collection address(string $label = null) + * @method Grid\Column|Collection consignee(string $label = null) * @method Grid\Column|Collection is_default(string $label = null) + * @method Grid\Column|Collection telephone(string $label = null) + * @method Grid\Column|Collection user_id(string $label = null) + * @method Grid\Column|Collection zone(string $label = null) + * @method Grid\Column|Collection zone_id(string $label = null) + * @method Grid\Column|Collection detail(string $label = null) * @method Grid\Column|Collection type(string $label = null) * @method Grid\Column|Collection version(string $label = null) - * @method Grid\Column|Collection detail(string $label = null) * @method Grid\Column|Collection is_enabled(string $label = null) - * @method Grid\Column|Collection parent_id(string $label = null) - * @method Grid\Column|Collection order(string $label = null) - * @method Grid\Column|Collection icon(string $label = null) - * @method Grid\Column|Collection uri(string $label = null) * @method Grid\Column|Collection extension(string $label = null) - * @method Grid\Column|Collection permission_id(string $label = null) + * @method Grid\Column|Collection icon(string $label = null) + * @method Grid\Column|Collection order(string $label = null) + * @method Grid\Column|Collection parent_id(string $label = null) + * @method Grid\Column|Collection uri(string $label = null) * @method Grid\Column|Collection menu_id(string $label = null) - * @method Grid\Column|Collection slug(string $label = null) + * @method Grid\Column|Collection permission_id(string $label = null) * @method Grid\Column|Collection http_method(string $label = null) * @method Grid\Column|Collection http_path(string $label = null) + * @method Grid\Column|Collection slug(string $label = null) * @method Grid\Column|Collection role_id(string $label = null) * @method Grid\Column|Collection value(string $label = null) - * @method Grid\Column|Collection username(string $label = null) - * @method Grid\Column|Collection password(string $label = null) * @method Grid\Column|Collection avatar(string $label = null) + * @method Grid\Column|Collection password(string $label = null) * @method Grid\Column|Collection remember_token(string $label = null) + * @method Grid\Column|Collection username(string $label = null) * @method Grid\Column|Collection address_id(string $label = null) * @method Grid\Column|Collection image(string $label = null) - * @method Grid\Column|Collection sort(string $label = null) - * @method Grid\Column|Collection jump_type(string $label = null) * @method Grid\Column|Collection jump_link(string $label = null) + * @method Grid\Column|Collection jump_type(string $label = null) + * @method Grid\Column|Collection sort(string $label = null) * @method Grid\Column|Collection after_sale_id(string $label = null) * @method Grid\Column|Collection desc(string $label = null) * @method Grid\Column|Collection images(string $label = null) - * @method Grid\Column|Collection order_id(string $label = null) - * @method Grid\Column|Collection sn(string $label = null) - * @method Grid\Column|Collection order_product_id(string $label = null) - * @method Grid\Column|Collection num(string $label = null) * @method Grid\Column|Collection amount(string $label = null) - * @method Grid\Column|Collection state(string $label = null) + * @method Grid\Column|Collection num(string $label = null) + * @method Grid\Column|Collection order_id(string $label = null) + * @method Grid\Column|Collection order_product_id(string $label = null) * @method Grid\Column|Collection remarks(string $label = null) + * @method Grid\Column|Collection sn(string $label = null) + * @method Grid\Column|Collection state(string $label = null) * @method Grid\Column|Collection tracking_number(string $label = null) - * @method Grid\Column|Collection is_recommend(string $label = null) * @method Grid\Column|Collection _lft(string $label = null) * @method Grid\Column|Collection _rgt(string $label = null) + * @method Grid\Column|Collection is_recommend(string $label = null) * @method Grid\Column|Collection article_id(string $label = null) - * @method Grid\Column|Collection category_id(string $label = null) * @method Grid\Column|Collection author_name(string $label = null) - * @method Grid\Column|Collection subtitle(string $label = null) - * @method Grid\Column|Collection cover(string $label = null) + * @method Grid\Column|Collection category_id(string $label = null) * @method Grid\Column|Collection content(string $label = null) - * @method Grid\Column|Collection points(string $label = null) + * @method Grid\Column|Collection cover(string $label = null) * @method Grid\Column|Collection likes(string $label = null) - * @method Grid\Column|Collection media_type(string $label = null) * @method Grid\Column|Collection media_content(string $label = null) + * @method Grid\Column|Collection media_type(string $label = null) + * @method Grid\Column|Collection points(string $label = null) + * @method Grid\Column|Collection subtitle(string $label = null) * @method Grid\Column|Collection continue_click_times(string $label = null) * @method Grid\Column|Collection last_click_at(string $label = null) * @method Grid\Column|Collection coupon_id(string $label = null) @@ -240,92 +240,92 @@ namespace Dcat\Admin { * @method Grid\Column|Collection status(string $label = null) * @method Grid\Column|Collection administrator_id(string $label = null) * @method Grid\Column|Collection task_id(string $label = null) - * @method Grid\Column|Collection threshold(string $label = null) * @method Grid\Column|Collection limit(string $label = null) * @method Grid\Column|Collection sent(string $label = null) - * @method Grid\Column|Collection use_day(string $label = null) - * @method Grid\Column|Collection use_start_at(string $label = null) - * @method Grid\Column|Collection use_end_at(string $label = null) * @method Grid\Column|Collection stock(string $label = null) - * @method Grid\Column|Collection uuid(string $label = null) + * @method Grid\Column|Collection threshold(string $label = null) + * @method Grid\Column|Collection use_day(string $label = null) + * @method Grid\Column|Collection use_end_at(string $label = null) + * @method Grid\Column|Collection use_start_at(string $label = null) * @method Grid\Column|Collection connection(string $label = null) - * @method Grid\Column|Collection queue(string $label = null) - * @method Grid\Column|Collection payload(string $label = null) * @method Grid\Column|Collection exception(string $label = null) * @method Grid\Column|Collection failed_at(string $label = null) + * @method Grid\Column|Collection payload(string $label = null) + * @method Grid\Column|Collection queue(string $label = null) + * @method Grid\Column|Collection uuid(string $label = null) * @method Grid\Column|Collection message_id(string $label = null) * @method Grid\Column|Collection ext(string $label = null) * @method Grid\Column|Collection order_package_id(string $label = null) * @method Grid\Column|Collection quantity(string $label = null) + * @method Grid\Column|Collection consignee_address(string $label = null) * @method Grid\Column|Collection consignee_name(string $label = null) * @method Grid\Column|Collection consignee_telephone(string $label = null) * @method Grid\Column|Collection consignee_zone(string $label = null) - * @method Grid\Column|Collection consignee_address(string $label = null) * @method Grid\Column|Collection shipping_company(string $label = null) * @method Grid\Column|Collection shipping_number(string $label = null) - * @method Grid\Column|Collection spu_id(string $label = null) + * @method Grid\Column|Collection coupon_discount_amount(string $label = null) + * @method Grid\Column|Collection reduced_amount(string $label = null) + * @method Grid\Column|Collection sell_price(string $label = null) * @method Grid\Column|Collection sku_id(string $label = null) * @method Grid\Column|Collection specs(string $label = null) - * @method Grid\Column|Collection weight(string $label = null) - * @method Grid\Column|Collection sell_price(string $label = null) - * @method Grid\Column|Collection vip_price(string $label = null) - * @method Grid\Column|Collection coupon_discount_amount(string $label = null) - * @method Grid\Column|Collection vip_discount_amount(string $label = null) - * @method Grid\Column|Collection reduced_amount(string $label = null) + * @method Grid\Column|Collection spu_id(string $label = null) * @method Grid\Column|Collection total_amount(string $label = null) - * @method Grid\Column|Collection user_coupon_id(string $label = null) - * @method Grid\Column|Collection shipping_fee(string $label = null) - * @method Grid\Column|Collection products_total_amount(string $label = null) + * @method Grid\Column|Collection vip_discount_amount(string $label = null) + * @method Grid\Column|Collection vip_price(string $label = null) + * @method Grid\Column|Collection weight(string $label = null) + * @method Grid\Column|Collection completed_at(string $label = null) * @method Grid\Column|Collection note(string $label = null) - * @method Grid\Column|Collection remark(string $label = null) + * @method Grid\Column|Collection pay_at(string $label = null) * @method Grid\Column|Collection pay_sn(string $label = null) * @method Grid\Column|Collection pay_way(string $label = null) - * @method Grid\Column|Collection pay_at(string $label = null) - * @method Grid\Column|Collection completed_at(string $label = null) - * @method Grid\Column|Collection tokenable_type(string $label = null) - * @method Grid\Column|Collection tokenable_id(string $label = null) - * @method Grid\Column|Collection token(string $label = null) + * @method Grid\Column|Collection products_total_amount(string $label = null) + * @method Grid\Column|Collection remark(string $label = null) + * @method Grid\Column|Collection shipping_fee(string $label = null) + * @method Grid\Column|Collection user_coupon_id(string $label = null) * @method Grid\Column|Collection abilities(string $label = null) * @method Grid\Column|Collection last_used_at(string $label = null) + * @method Grid\Column|Collection token(string $label = null) + * @method Grid\Column|Collection tokenable_id(string $label = null) + * @method Grid\Column|Collection tokenable_type(string $label = null) * @method Grid\Column|Collection old_points(string $label = null) * @method Grid\Column|Collection gift_sku_id(string $label = null) * @method Grid\Column|Collection attrs(string $label = null) * @method Grid\Column|Collection part_id(string $label = null) * @method Grid\Column|Collection applicant_id(string $label = null) * @method Grid\Column|Collection reviewer_id(string $label = null) - * @method Grid\Column|Collection market_price(string $label = null) - * @method Grid\Column|Collection cost_price(string $label = null) - * @method Grid\Column|Collection media(string $label = null) - * @method Grid\Column|Collection sales(string $label = null) - * @method Grid\Column|Collection release_at(string $label = null) - * @method Grid\Column|Collection verify_state(string $label = null) * @method Grid\Column|Collection buynote_id(string $label = null) + * @method Grid\Column|Collection cost_price(string $label = null) + * @method Grid\Column|Collection market_price(string $label = null) + * @method Grid\Column|Collection media(string $label = null) + * @method Grid\Column|Collection release_at(string $label = null) + * @method Grid\Column|Collection sales(string $label = null) * @method Grid\Column|Collection shipping_template_id(string $label = null) + * @method Grid\Column|Collection verify_state(string $label = null) * @method Grid\Column|Collection feature_id(string $label = null) * @method Grid\Column|Collection items(string $label = null) * @method Grid\Column|Collection view_date(string $label = null) * @method Grid\Column|Collection rule_id(string $label = null) - * @method Grid\Column|Collection template_id(string $label = null) * @method Grid\Column|Collection info(string $label = null) - * @method Grid\Column|Collection phone(string $label = null) + * @method Grid\Column|Collection template_id(string $label = null) * @method Grid\Column|Collection code(string $label = null) - * @method Grid\Column|Collection is_use(string $label = null) * @method Grid\Column|Collection expires_at(string $label = null) - * @method Grid\Column|Collection coupon_name(string $label = null) - * @method Grid\Column|Collection coupon_type(string $label = null) - * @method Grid\Column|Collection coupon_threshold(string $label = null) + * @method Grid\Column|Collection is_use(string $label = null) + * @method Grid\Column|Collection phone(string $label = null) * @method Grid\Column|Collection coupon_amount(string $label = null) + * @method Grid\Column|Collection coupon_name(string $label = null) + * @method Grid\Column|Collection coupon_threshold(string $label = null) + * @method Grid\Column|Collection coupon_type(string $label = null) + * @method Grid\Column|Collection birthday(string $label = null) + * @method Grid\Column|Collection gender(string $label = null) * @method Grid\Column|Collection inviter_id(string $label = null) * @method Grid\Column|Collection nickname(string $label = null) - * @method Grid\Column|Collection gender(string $label = null) - * @method Grid\Column|Collection birthday(string $label = null) - * @method Grid\Column|Collection vip_id(string $label = null) * @method Grid\Column|Collection growth_value(string $label = null) - * @method Grid\Column|Collection phone_verified_at(string $label = null) + * @method Grid\Column|Collection vip_id(string $label = null) * @method Grid\Column|Collection email(string $label = null) * @method Grid\Column|Collection email_verified_at(string $label = null) - * @method Grid\Column|Collection last_login_ip(string $label = null) * @method Grid\Column|Collection last_login_at(string $label = null) + * @method Grid\Column|Collection last_login_ip(string $label = null) + * @method Grid\Column|Collection phone_verified_at(string $label = null) * @method Grid\Column|Collection register_ip(string $label = null) * @method Grid\Column|Collection status_remark(string $label = null) */ @@ -334,69 +334,69 @@ namespace Dcat\Admin { class MiniGrid extends Grid {} /** + * @property Show\Field|Collection created_at + * @property Show\Field|Collection dimensions * @property Show\Field|Collection id + * @property Show\Field|Collection is_show * @property Show\Field|Collection key * @property Show\Field|Collection name - * @property Show\Field|Collection dimensions - * @property Show\Field|Collection is_show - * @property Show\Field|Collection created_at * @property Show\Field|Collection updated_at - * @property Show\Field|Collection user_id - * @property Show\Field|Collection zone_id - * @property Show\Field|Collection consignee - * @property Show\Field|Collection telephone - * @property Show\Field|Collection zone * @property Show\Field|Collection address + * @property Show\Field|Collection consignee * @property Show\Field|Collection is_default + * @property Show\Field|Collection telephone + * @property Show\Field|Collection user_id + * @property Show\Field|Collection zone + * @property Show\Field|Collection zone_id + * @property Show\Field|Collection detail * @property Show\Field|Collection type * @property Show\Field|Collection version - * @property Show\Field|Collection detail * @property Show\Field|Collection is_enabled - * @property Show\Field|Collection parent_id - * @property Show\Field|Collection order - * @property Show\Field|Collection icon - * @property Show\Field|Collection uri * @property Show\Field|Collection extension - * @property Show\Field|Collection permission_id + * @property Show\Field|Collection icon + * @property Show\Field|Collection order + * @property Show\Field|Collection parent_id + * @property Show\Field|Collection uri * @property Show\Field|Collection menu_id - * @property Show\Field|Collection slug + * @property Show\Field|Collection permission_id * @property Show\Field|Collection http_method * @property Show\Field|Collection http_path + * @property Show\Field|Collection slug * @property Show\Field|Collection role_id * @property Show\Field|Collection value - * @property Show\Field|Collection username - * @property Show\Field|Collection password * @property Show\Field|Collection avatar + * @property Show\Field|Collection password * @property Show\Field|Collection remember_token + * @property Show\Field|Collection username * @property Show\Field|Collection address_id * @property Show\Field|Collection image - * @property Show\Field|Collection sort - * @property Show\Field|Collection jump_type * @property Show\Field|Collection jump_link + * @property Show\Field|Collection jump_type + * @property Show\Field|Collection sort * @property Show\Field|Collection after_sale_id * @property Show\Field|Collection desc * @property Show\Field|Collection images - * @property Show\Field|Collection order_id - * @property Show\Field|Collection sn - * @property Show\Field|Collection order_product_id - * @property Show\Field|Collection num * @property Show\Field|Collection amount - * @property Show\Field|Collection state + * @property Show\Field|Collection num + * @property Show\Field|Collection order_id + * @property Show\Field|Collection order_product_id * @property Show\Field|Collection remarks + * @property Show\Field|Collection sn + * @property Show\Field|Collection state * @property Show\Field|Collection tracking_number - * @property Show\Field|Collection is_recommend * @property Show\Field|Collection _lft * @property Show\Field|Collection _rgt + * @property Show\Field|Collection is_recommend * @property Show\Field|Collection article_id - * @property Show\Field|Collection category_id * @property Show\Field|Collection author_name - * @property Show\Field|Collection subtitle - * @property Show\Field|Collection cover + * @property Show\Field|Collection category_id * @property Show\Field|Collection content - * @property Show\Field|Collection points + * @property Show\Field|Collection cover * @property Show\Field|Collection likes - * @property Show\Field|Collection media_type * @property Show\Field|Collection media_content + * @property Show\Field|Collection media_type + * @property Show\Field|Collection points + * @property Show\Field|Collection subtitle * @property Show\Field|Collection continue_click_times * @property Show\Field|Collection last_click_at * @property Show\Field|Collection coupon_id @@ -404,158 +404,158 @@ namespace Dcat\Admin { * @property Show\Field|Collection status * @property Show\Field|Collection administrator_id * @property Show\Field|Collection task_id - * @property Show\Field|Collection threshold * @property Show\Field|Collection limit * @property Show\Field|Collection sent - * @property Show\Field|Collection use_day - * @property Show\Field|Collection use_start_at - * @property Show\Field|Collection use_end_at * @property Show\Field|Collection stock - * @property Show\Field|Collection uuid + * @property Show\Field|Collection threshold + * @property Show\Field|Collection use_day + * @property Show\Field|Collection use_end_at + * @property Show\Field|Collection use_start_at * @property Show\Field|Collection connection - * @property Show\Field|Collection queue - * @property Show\Field|Collection payload * @property Show\Field|Collection exception * @property Show\Field|Collection failed_at + * @property Show\Field|Collection payload + * @property Show\Field|Collection queue + * @property Show\Field|Collection uuid * @property Show\Field|Collection message_id * @property Show\Field|Collection ext * @property Show\Field|Collection order_package_id * @property Show\Field|Collection quantity + * @property Show\Field|Collection consignee_address * @property Show\Field|Collection consignee_name * @property Show\Field|Collection consignee_telephone * @property Show\Field|Collection consignee_zone - * @property Show\Field|Collection consignee_address * @property Show\Field|Collection shipping_company * @property Show\Field|Collection shipping_number - * @property Show\Field|Collection spu_id + * @property Show\Field|Collection coupon_discount_amount + * @property Show\Field|Collection reduced_amount + * @property Show\Field|Collection sell_price * @property Show\Field|Collection sku_id * @property Show\Field|Collection specs - * @property Show\Field|Collection weight - * @property Show\Field|Collection sell_price - * @property Show\Field|Collection vip_price - * @property Show\Field|Collection coupon_discount_amount - * @property Show\Field|Collection vip_discount_amount - * @property Show\Field|Collection reduced_amount + * @property Show\Field|Collection spu_id * @property Show\Field|Collection total_amount - * @property Show\Field|Collection user_coupon_id - * @property Show\Field|Collection shipping_fee - * @property Show\Field|Collection products_total_amount + * @property Show\Field|Collection vip_discount_amount + * @property Show\Field|Collection vip_price + * @property Show\Field|Collection weight + * @property Show\Field|Collection completed_at * @property Show\Field|Collection note - * @property Show\Field|Collection remark + * @property Show\Field|Collection pay_at * @property Show\Field|Collection pay_sn * @property Show\Field|Collection pay_way - * @property Show\Field|Collection pay_at - * @property Show\Field|Collection completed_at - * @property Show\Field|Collection tokenable_type - * @property Show\Field|Collection tokenable_id - * @property Show\Field|Collection token + * @property Show\Field|Collection products_total_amount + * @property Show\Field|Collection remark + * @property Show\Field|Collection shipping_fee + * @property Show\Field|Collection user_coupon_id * @property Show\Field|Collection abilities * @property Show\Field|Collection last_used_at + * @property Show\Field|Collection token + * @property Show\Field|Collection tokenable_id + * @property Show\Field|Collection tokenable_type * @property Show\Field|Collection old_points * @property Show\Field|Collection gift_sku_id * @property Show\Field|Collection attrs * @property Show\Field|Collection part_id * @property Show\Field|Collection applicant_id * @property Show\Field|Collection reviewer_id - * @property Show\Field|Collection market_price - * @property Show\Field|Collection cost_price - * @property Show\Field|Collection media - * @property Show\Field|Collection sales - * @property Show\Field|Collection release_at - * @property Show\Field|Collection verify_state * @property Show\Field|Collection buynote_id + * @property Show\Field|Collection cost_price + * @property Show\Field|Collection market_price + * @property Show\Field|Collection media + * @property Show\Field|Collection release_at + * @property Show\Field|Collection sales * @property Show\Field|Collection shipping_template_id + * @property Show\Field|Collection verify_state * @property Show\Field|Collection feature_id * @property Show\Field|Collection items * @property Show\Field|Collection view_date * @property Show\Field|Collection rule_id - * @property Show\Field|Collection template_id * @property Show\Field|Collection info - * @property Show\Field|Collection phone + * @property Show\Field|Collection template_id * @property Show\Field|Collection code - * @property Show\Field|Collection is_use * @property Show\Field|Collection expires_at - * @property Show\Field|Collection coupon_name - * @property Show\Field|Collection coupon_type - * @property Show\Field|Collection coupon_threshold + * @property Show\Field|Collection is_use + * @property Show\Field|Collection phone * @property Show\Field|Collection coupon_amount + * @property Show\Field|Collection coupon_name + * @property Show\Field|Collection coupon_threshold + * @property Show\Field|Collection coupon_type + * @property Show\Field|Collection birthday + * @property Show\Field|Collection gender * @property Show\Field|Collection inviter_id * @property Show\Field|Collection nickname - * @property Show\Field|Collection gender - * @property Show\Field|Collection birthday - * @property Show\Field|Collection vip_id * @property Show\Field|Collection growth_value - * @property Show\Field|Collection phone_verified_at + * @property Show\Field|Collection vip_id * @property Show\Field|Collection email * @property Show\Field|Collection email_verified_at - * @property Show\Field|Collection last_login_ip * @property Show\Field|Collection last_login_at + * @property Show\Field|Collection last_login_ip + * @property Show\Field|Collection phone_verified_at * @property Show\Field|Collection register_ip * @property Show\Field|Collection status_remark * + * @method Show\Field|Collection created_at(string $label = null) + * @method Show\Field|Collection dimensions(string $label = null) * @method Show\Field|Collection id(string $label = null) + * @method Show\Field|Collection is_show(string $label = null) * @method Show\Field|Collection key(string $label = null) * @method Show\Field|Collection name(string $label = null) - * @method Show\Field|Collection dimensions(string $label = null) - * @method Show\Field|Collection is_show(string $label = null) - * @method Show\Field|Collection created_at(string $label = null) * @method Show\Field|Collection updated_at(string $label = null) - * @method Show\Field|Collection user_id(string $label = null) - * @method Show\Field|Collection zone_id(string $label = null) - * @method Show\Field|Collection consignee(string $label = null) - * @method Show\Field|Collection telephone(string $label = null) - * @method Show\Field|Collection zone(string $label = null) * @method Show\Field|Collection address(string $label = null) + * @method Show\Field|Collection consignee(string $label = null) * @method Show\Field|Collection is_default(string $label = null) + * @method Show\Field|Collection telephone(string $label = null) + * @method Show\Field|Collection user_id(string $label = null) + * @method Show\Field|Collection zone(string $label = null) + * @method Show\Field|Collection zone_id(string $label = null) + * @method Show\Field|Collection detail(string $label = null) * @method Show\Field|Collection type(string $label = null) * @method Show\Field|Collection version(string $label = null) - * @method Show\Field|Collection detail(string $label = null) * @method Show\Field|Collection is_enabled(string $label = null) - * @method Show\Field|Collection parent_id(string $label = null) - * @method Show\Field|Collection order(string $label = null) - * @method Show\Field|Collection icon(string $label = null) - * @method Show\Field|Collection uri(string $label = null) * @method Show\Field|Collection extension(string $label = null) - * @method Show\Field|Collection permission_id(string $label = null) + * @method Show\Field|Collection icon(string $label = null) + * @method Show\Field|Collection order(string $label = null) + * @method Show\Field|Collection parent_id(string $label = null) + * @method Show\Field|Collection uri(string $label = null) * @method Show\Field|Collection menu_id(string $label = null) - * @method Show\Field|Collection slug(string $label = null) + * @method Show\Field|Collection permission_id(string $label = null) * @method Show\Field|Collection http_method(string $label = null) * @method Show\Field|Collection http_path(string $label = null) + * @method Show\Field|Collection slug(string $label = null) * @method Show\Field|Collection role_id(string $label = null) * @method Show\Field|Collection value(string $label = null) - * @method Show\Field|Collection username(string $label = null) - * @method Show\Field|Collection password(string $label = null) * @method Show\Field|Collection avatar(string $label = null) + * @method Show\Field|Collection password(string $label = null) * @method Show\Field|Collection remember_token(string $label = null) + * @method Show\Field|Collection username(string $label = null) * @method Show\Field|Collection address_id(string $label = null) * @method Show\Field|Collection image(string $label = null) - * @method Show\Field|Collection sort(string $label = null) - * @method Show\Field|Collection jump_type(string $label = null) * @method Show\Field|Collection jump_link(string $label = null) + * @method Show\Field|Collection jump_type(string $label = null) + * @method Show\Field|Collection sort(string $label = null) * @method Show\Field|Collection after_sale_id(string $label = null) * @method Show\Field|Collection desc(string $label = null) * @method Show\Field|Collection images(string $label = null) - * @method Show\Field|Collection order_id(string $label = null) - * @method Show\Field|Collection sn(string $label = null) - * @method Show\Field|Collection order_product_id(string $label = null) - * @method Show\Field|Collection num(string $label = null) * @method Show\Field|Collection amount(string $label = null) - * @method Show\Field|Collection state(string $label = null) + * @method Show\Field|Collection num(string $label = null) + * @method Show\Field|Collection order_id(string $label = null) + * @method Show\Field|Collection order_product_id(string $label = null) * @method Show\Field|Collection remarks(string $label = null) + * @method Show\Field|Collection sn(string $label = null) + * @method Show\Field|Collection state(string $label = null) * @method Show\Field|Collection tracking_number(string $label = null) - * @method Show\Field|Collection is_recommend(string $label = null) * @method Show\Field|Collection _lft(string $label = null) * @method Show\Field|Collection _rgt(string $label = null) + * @method Show\Field|Collection is_recommend(string $label = null) * @method Show\Field|Collection article_id(string $label = null) - * @method Show\Field|Collection category_id(string $label = null) * @method Show\Field|Collection author_name(string $label = null) - * @method Show\Field|Collection subtitle(string $label = null) - * @method Show\Field|Collection cover(string $label = null) + * @method Show\Field|Collection category_id(string $label = null) * @method Show\Field|Collection content(string $label = null) - * @method Show\Field|Collection points(string $label = null) + * @method Show\Field|Collection cover(string $label = null) * @method Show\Field|Collection likes(string $label = null) - * @method Show\Field|Collection media_type(string $label = null) * @method Show\Field|Collection media_content(string $label = null) + * @method Show\Field|Collection media_type(string $label = null) + * @method Show\Field|Collection points(string $label = null) + * @method Show\Field|Collection subtitle(string $label = null) * @method Show\Field|Collection continue_click_times(string $label = null) * @method Show\Field|Collection last_click_at(string $label = null) * @method Show\Field|Collection coupon_id(string $label = null) @@ -563,92 +563,92 @@ namespace Dcat\Admin { * @method Show\Field|Collection status(string $label = null) * @method Show\Field|Collection administrator_id(string $label = null) * @method Show\Field|Collection task_id(string $label = null) - * @method Show\Field|Collection threshold(string $label = null) * @method Show\Field|Collection limit(string $label = null) * @method Show\Field|Collection sent(string $label = null) - * @method Show\Field|Collection use_day(string $label = null) - * @method Show\Field|Collection use_start_at(string $label = null) - * @method Show\Field|Collection use_end_at(string $label = null) * @method Show\Field|Collection stock(string $label = null) - * @method Show\Field|Collection uuid(string $label = null) + * @method Show\Field|Collection threshold(string $label = null) + * @method Show\Field|Collection use_day(string $label = null) + * @method Show\Field|Collection use_end_at(string $label = null) + * @method Show\Field|Collection use_start_at(string $label = null) * @method Show\Field|Collection connection(string $label = null) - * @method Show\Field|Collection queue(string $label = null) - * @method Show\Field|Collection payload(string $label = null) * @method Show\Field|Collection exception(string $label = null) * @method Show\Field|Collection failed_at(string $label = null) + * @method Show\Field|Collection payload(string $label = null) + * @method Show\Field|Collection queue(string $label = null) + * @method Show\Field|Collection uuid(string $label = null) * @method Show\Field|Collection message_id(string $label = null) * @method Show\Field|Collection ext(string $label = null) * @method Show\Field|Collection order_package_id(string $label = null) * @method Show\Field|Collection quantity(string $label = null) + * @method Show\Field|Collection consignee_address(string $label = null) * @method Show\Field|Collection consignee_name(string $label = null) * @method Show\Field|Collection consignee_telephone(string $label = null) * @method Show\Field|Collection consignee_zone(string $label = null) - * @method Show\Field|Collection consignee_address(string $label = null) * @method Show\Field|Collection shipping_company(string $label = null) * @method Show\Field|Collection shipping_number(string $label = null) - * @method Show\Field|Collection spu_id(string $label = null) + * @method Show\Field|Collection coupon_discount_amount(string $label = null) + * @method Show\Field|Collection reduced_amount(string $label = null) + * @method Show\Field|Collection sell_price(string $label = null) * @method Show\Field|Collection sku_id(string $label = null) * @method Show\Field|Collection specs(string $label = null) - * @method Show\Field|Collection weight(string $label = null) - * @method Show\Field|Collection sell_price(string $label = null) - * @method Show\Field|Collection vip_price(string $label = null) - * @method Show\Field|Collection coupon_discount_amount(string $label = null) - * @method Show\Field|Collection vip_discount_amount(string $label = null) - * @method Show\Field|Collection reduced_amount(string $label = null) + * @method Show\Field|Collection spu_id(string $label = null) * @method Show\Field|Collection total_amount(string $label = null) - * @method Show\Field|Collection user_coupon_id(string $label = null) - * @method Show\Field|Collection shipping_fee(string $label = null) - * @method Show\Field|Collection products_total_amount(string $label = null) + * @method Show\Field|Collection vip_discount_amount(string $label = null) + * @method Show\Field|Collection vip_price(string $label = null) + * @method Show\Field|Collection weight(string $label = null) + * @method Show\Field|Collection completed_at(string $label = null) * @method Show\Field|Collection note(string $label = null) - * @method Show\Field|Collection remark(string $label = null) + * @method Show\Field|Collection pay_at(string $label = null) * @method Show\Field|Collection pay_sn(string $label = null) * @method Show\Field|Collection pay_way(string $label = null) - * @method Show\Field|Collection pay_at(string $label = null) - * @method Show\Field|Collection completed_at(string $label = null) - * @method Show\Field|Collection tokenable_type(string $label = null) - * @method Show\Field|Collection tokenable_id(string $label = null) - * @method Show\Field|Collection token(string $label = null) + * @method Show\Field|Collection products_total_amount(string $label = null) + * @method Show\Field|Collection remark(string $label = null) + * @method Show\Field|Collection shipping_fee(string $label = null) + * @method Show\Field|Collection user_coupon_id(string $label = null) * @method Show\Field|Collection abilities(string $label = null) * @method Show\Field|Collection last_used_at(string $label = null) + * @method Show\Field|Collection token(string $label = null) + * @method Show\Field|Collection tokenable_id(string $label = null) + * @method Show\Field|Collection tokenable_type(string $label = null) * @method Show\Field|Collection old_points(string $label = null) * @method Show\Field|Collection gift_sku_id(string $label = null) * @method Show\Field|Collection attrs(string $label = null) * @method Show\Field|Collection part_id(string $label = null) * @method Show\Field|Collection applicant_id(string $label = null) * @method Show\Field|Collection reviewer_id(string $label = null) - * @method Show\Field|Collection market_price(string $label = null) - * @method Show\Field|Collection cost_price(string $label = null) - * @method Show\Field|Collection media(string $label = null) - * @method Show\Field|Collection sales(string $label = null) - * @method Show\Field|Collection release_at(string $label = null) - * @method Show\Field|Collection verify_state(string $label = null) * @method Show\Field|Collection buynote_id(string $label = null) + * @method Show\Field|Collection cost_price(string $label = null) + * @method Show\Field|Collection market_price(string $label = null) + * @method Show\Field|Collection media(string $label = null) + * @method Show\Field|Collection release_at(string $label = null) + * @method Show\Field|Collection sales(string $label = null) * @method Show\Field|Collection shipping_template_id(string $label = null) + * @method Show\Field|Collection verify_state(string $label = null) * @method Show\Field|Collection feature_id(string $label = null) * @method Show\Field|Collection items(string $label = null) * @method Show\Field|Collection view_date(string $label = null) * @method Show\Field|Collection rule_id(string $label = null) - * @method Show\Field|Collection template_id(string $label = null) * @method Show\Field|Collection info(string $label = null) - * @method Show\Field|Collection phone(string $label = null) + * @method Show\Field|Collection template_id(string $label = null) * @method Show\Field|Collection code(string $label = null) - * @method Show\Field|Collection is_use(string $label = null) * @method Show\Field|Collection expires_at(string $label = null) - * @method Show\Field|Collection coupon_name(string $label = null) - * @method Show\Field|Collection coupon_type(string $label = null) - * @method Show\Field|Collection coupon_threshold(string $label = null) + * @method Show\Field|Collection is_use(string $label = null) + * @method Show\Field|Collection phone(string $label = null) * @method Show\Field|Collection coupon_amount(string $label = null) + * @method Show\Field|Collection coupon_name(string $label = null) + * @method Show\Field|Collection coupon_threshold(string $label = null) + * @method Show\Field|Collection coupon_type(string $label = null) + * @method Show\Field|Collection birthday(string $label = null) + * @method Show\Field|Collection gender(string $label = null) * @method Show\Field|Collection inviter_id(string $label = null) * @method Show\Field|Collection nickname(string $label = null) - * @method Show\Field|Collection gender(string $label = null) - * @method Show\Field|Collection birthday(string $label = null) - * @method Show\Field|Collection vip_id(string $label = null) * @method Show\Field|Collection growth_value(string $label = null) - * @method Show\Field|Collection phone_verified_at(string $label = null) + * @method Show\Field|Collection vip_id(string $label = null) * @method Show\Field|Collection email(string $label = null) * @method Show\Field|Collection email_verified_at(string $label = null) - * @method Show\Field|Collection last_login_ip(string $label = null) * @method Show\Field|Collection last_login_at(string $label = null) + * @method Show\Field|Collection last_login_ip(string $label = null) + * @method Show\Field|Collection phone_verified_at(string $label = null) * @method Show\Field|Collection register_ip(string $label = null) * @method Show\Field|Collection status_remark(string $label = null) */ diff --git a/resources/lang/zh_CN/admin_message.php b/resources/lang/zh_CN/admin_message.php index 8c4f6b80..68622cc1 100644 --- a/resources/lang/zh_CN/admin_message.php +++ b/resources/lang/zh_CN/admin_message.php @@ -72,6 +72,8 @@ return [ 'disable_user'=>'禁用用户', 'enable_user'=>'启用用户', 'sku_gift'=>'赠品管理', + 'craete_order_package'=>'添加发货单', + 'setting_reduce'=>'设置减免', ], ], ]; diff --git a/resources/lang/zh_CN/order-package.php b/resources/lang/zh_CN/order-package.php index 3da37770..cca4bf75 100644 --- a/resources/lang/zh_CN/order-package.php +++ b/resources/lang/zh_CN/order-package.php @@ -17,6 +17,7 @@ return [ 'packageProduct'=>'包裹内容', 'shipping_company' => '快递公司', 'shipping_number' => '快递单号', + 'inspected_at'=>'签收时间', 'remarks' => '备注', ], 'options' => [ diff --git a/resources/lang/zh_CN/order.php b/resources/lang/zh_CN/order.php new file mode 100644 index 00000000..f763dba8 --- /dev/null +++ b/resources/lang/zh_CN/order.php @@ -0,0 +1,37 @@ + [ + 'Order' => '订单列表', + 'orders' => '订单列表', + ], + 'fields' => [ + 'user_id' => '用户', + 'user'=>[ + 'phone' => '手机号', + ], + 'sn' => '订单编号', + 'user_coupon_id' => '使用优惠券', + 'coupon_discount_amount' => '优惠券金额', + 'vip_discount_amount' => '会员优惠', + 'reduced_amount' => '减免金额', + 'shipping_fee' => '运费', + 'products_total_amount' => '商品总额', + 'total_amount' => '订单总额', + 'weight' => '订单重量', + 'note' => '客户备注', + 'remark' => '订单备注', + 'pay_sn' => '支付单号', + 'pay_way' => '支付方式', + 'pay_at' => '支付时间', + 'consignee_name' => '收货人', + 'consignee_telephone' => '联系方式', + 'consignee_zone' => '收货地区', + 'consignee_address' => '收货地址', + 'status' => '订单状态', + 'completed_at' => '完成时间', + 'created_at' => '下单时间', + ], + 'options' => [ + ], +];