From 78d38d9c29bbbf130cd7fa320a7e609ed492a484 Mon Sep 17 00:00:00 2001 From: vine_liutk <961510893@qq.com> Date: Wed, 12 Jan 2022 21:20:16 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E7=BB=8F=E9=94=80=E5=95=86?= =?UTF-8?q?=E9=83=A8=E5=88=86=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Actions/Grid/UserResetAccountPassword.php | 38 ++++++ .../Controllers/DealerProductController.php | 121 ++++++++++++++++++ app/Admin/Controllers/UserController.php | 6 + app/Admin/Forms/UserResetAccountPassword.php | 59 +++++++++ app/Admin/Repositories/DealerProduct.php | 16 +++ app/Admin/routes.php | 4 + app/Models/DealerOrder.php | 11 ++ app/Models/DealerOrderProduct.php | 11 ++ app/Models/DealerProduct.php | 28 ++++ app/Models/DealerProductLvlRule.php | 11 ++ app/Models/DealerProductSaleRule.php | 11 ++ app/Models/DealerUserProduct.php | 11 ++ app/Models/DealerUserProductLog.php | 11 ++ ...12_165443_create_dealer_products_table.php | 40 ++++++ ...1_12_165458_create_dealer_orders_table.php | 50 ++++++++ ...509_create_dealer_order_products_table.php | 39 ++++++ ..._create_dealer_product_lvl_rules_table.php | 35 +++++ ...create_dealer_product_sale_rules_table.php | 34 +++++ ...5842_create_dealer_user_products_table.php | 36 ++++++ ..._create_dealer_user_product_logs_table.php | 35 +++++ database/seeders/AdminMenuSeeder.php | 37 ++++++ dcat_admin_ide_helper.php | 104 ++++++++++++--- resources/lang/zh_CN/dealer-product.php | 21 +++ 23 files changed, 749 insertions(+), 20 deletions(-) create mode 100644 app/Admin/Actions/Grid/UserResetAccountPassword.php create mode 100644 app/Admin/Controllers/DealerProductController.php create mode 100644 app/Admin/Forms/UserResetAccountPassword.php create mode 100644 app/Admin/Repositories/DealerProduct.php create mode 100644 app/Models/DealerOrder.php create mode 100644 app/Models/DealerOrderProduct.php create mode 100644 app/Models/DealerProduct.php create mode 100644 app/Models/DealerProductLvlRule.php create mode 100644 app/Models/DealerProductSaleRule.php create mode 100644 app/Models/DealerUserProduct.php create mode 100644 app/Models/DealerUserProductLog.php create mode 100644 database/migrations/2022_01_12_165443_create_dealer_products_table.php create mode 100644 database/migrations/2022_01_12_165458_create_dealer_orders_table.php create mode 100644 database/migrations/2022_01_12_165509_create_dealer_order_products_table.php create mode 100644 database/migrations/2022_01_12_165719_create_dealer_product_lvl_rules_table.php create mode 100644 database/migrations/2022_01_12_165733_create_dealer_product_sale_rules_table.php create mode 100644 database/migrations/2022_01_12_175842_create_dealer_user_products_table.php create mode 100644 database/migrations/2022_01_12_190218_create_dealer_user_product_logs_table.php create mode 100644 resources/lang/zh_CN/dealer-product.php diff --git a/app/Admin/Actions/Grid/UserResetAccountPassword.php b/app/Admin/Actions/Grid/UserResetAccountPassword.php new file mode 100644 index 00000000..e37d2e9a --- /dev/null +++ b/app/Admin/Actions/Grid/UserResetAccountPassword.php @@ -0,0 +1,38 @@ +title) { + return $this->title; + } + return ' 安全密码  '; + } + + /** + * @param Model|Authenticatable|HasPermissions|null $user + * + * @return bool + */ + protected function authorize($user): bool + { + return $user->can('dcat.admin.users.reset_account_password'); + } + + public function render() + { + $form = UserResetAccountPasswordForm::make()->payload(['id'=>$this->getKey()]); + return Modal::make() + ->lg() + ->title($this->title()) + ->body($form) + ->button($this->title()); + } +} diff --git a/app/Admin/Controllers/DealerProductController.php b/app/Admin/Controllers/DealerProductController.php new file mode 100644 index 00000000..baee630d --- /dev/null +++ b/app/Admin/Controllers/DealerProductController.php @@ -0,0 +1,121 @@ +column('id')->sortable(); + $grid->column('name'); + $grid->column('subtitle'); + $grid->column('cover')->image(80, 80); + // $grid->column('images'); + // $grid->column('description'); + $grid->column('price')->prepend('￥'); + // $grid->column('stock'); + // $grid->column('sales_count'); + $grid->column('is_sale')->if(function () { + return Admin::user()->can('dcat.admin.dealer_products.edit'); + }) + ->then(function (Column $column) { + $column->switch(); + }) + ->else(function (Column $column) { + $column->bool(); + }); + $grid->column('created_at')->sortable(); + /** 操作 **/ + //新增 + if (Admin::user()->can('dcat.admin.dealer_products.create')) { + $grid->disableCreateButton(false); + } + //修改 + // $grid->showQuickEditButton(Admin::user()->can('dcat.admin.product_spus.edit')); + //删除以及自定义操作 + $grid->actions(function (Grid\Displayers\Actions $actions) { + $actions->disableEdit(Admin::user()->cannot('dcat.admin.dealer_products.edit')); + $actions->disableDelete(Admin::user()->cannot('dcat.admin.dealer_products.destroy')); + }); + $grid->filter(function (Grid\Filter $filter) { + $filter->panel(); + $filter->equal('name')->width(3); + }); + }); + } + + /** + * Make a show builder. + * + * @param mixed $id + * + * @return Show + */ + protected function detail($id) + { + return Show::make($id, new DealerProduct(), function (Show $show) { + $show->field('id'); + $show->field('name'); + $show->field('subtitle'); + $show->field('cover'); + $show->field('images'); + $show->field('description'); + $show->field('price'); + $show->field('stock'); + $show->field('sales_count'); + $show->field('is_sale'); + $show->field('created_at'); + $show->field('updated_at'); + }); + } + + /** + * Make a form builder. + * + * @return Form + */ + protected function form() + { + return Form::make(new DealerProduct(), function (Form $form) { + $form->display('id'); + $form->text('name')->required(); + $form->text('subtitle'); + $form->divider(); + $form->image('cover') + ->move('dealer-products/cover/'.Carbon::now()->toDateString()) + ->saveFullUrl() + ->removable(false) + ->retainable() + ->autoUpload(); + $form->multipleImage('images') + ->move('dealer-products/'.Carbon::now()->toDateString()) + ->saveFullUrl() + ->removable(false) + ->retainable() + ->autoUpload(); + $form->editor('description'); + $form->currency('price')->symbol('￥'); + // $form->text('stock'); + // $form->text('sales_count'); + $form->switch('is_sale'); + + $form->display('created_at'); + $form->display('updated_at'); + }); + } +} diff --git a/app/Admin/Controllers/UserController.php b/app/Admin/Controllers/UserController.php index e3f036b2..1dcaa00e 100644 --- a/app/Admin/Controllers/UserController.php +++ b/app/Admin/Controllers/UserController.php @@ -6,6 +6,7 @@ use App\Admin\Actions\Grid\DisableUser; use App\Admin\Actions\Grid\EnableUser; use App\Admin\Actions\Grid\Frozen; use App\Admin\Actions\Grid\UserEditAgent; +use App\Admin\Actions\Grid\UserResetAccountPassword; use App\Admin\Actions\Grid\UserResetPassword; use App\Admin\Actions\Show\UserDisableBonus; use App\Admin\Actions\Show\UserEditBank; @@ -128,6 +129,11 @@ class UserController extends AdminController if (Admin::user()->can('dcat.admin.users.reset_password')) { $actions->append(new UserResetPassword()); } + + // 重置用户账户密码 + if (Admin::user()->can('dcat.admin.users.reset_account_password')) { + $actions->append(new UserResetAccountPassword()); + } }); $grid->filter(function (Grid\Filter $filter) { diff --git a/app/Admin/Forms/UserResetAccountPassword.php b/app/Admin/Forms/UserResetAccountPassword.php new file mode 100644 index 00000000..39d3a7c3 --- /dev/null +++ b/app/Admin/Forms/UserResetAccountPassword.php @@ -0,0 +1,59 @@ +can('dcat.admin.users.reset_account_password'); + } + + /** + * Handle the form request. + * + * @param array $input + * + * @return mixed + */ + public function handle(array $input) + { + $id = $this->payload['id'] ?? 0; + $user = User::findOrFail($id); + + if (!$user->wallet) { + throw new BizException('该用户还未设置安全密码'); + } + $user->wallet?->update([ + 'password' => $input['password'], + ]); + // $user->tokens()->delete(); + + return $this->response() + ->success(__('admin.update_succeeded')) + ->refresh(); + } + + /** + * Build a form here. + */ + public function form() + { + $this->password('password')->required(); + // 设置错误信息 + $this->password('password_confirm')->same('password', '两次密码输入不一致')->required(); + } +} diff --git a/app/Admin/Repositories/DealerProduct.php b/app/Admin/Repositories/DealerProduct.php new file mode 100644 index 00000000..580018e0 --- /dev/null +++ b/app/Admin/Repositories/DealerProduct.php @@ -0,0 +1,16 @@ +get('import-job-logs', 'ImportJobLogController@index')->name('import_job_logs.index'); + + //经销商 + $router->resource('dealer-products', 'DealerProductController')->names('dealer_products'); + /** api接口 **/ $router->get('api/product-categories', 'ProductCategoryController@categories')->name('api.product_categories'); $router->get('api/product-group-details', 'ProductGroupController@details')->name('api.product_group_details'); diff --git a/app/Models/DealerOrder.php b/app/Models/DealerOrder.php new file mode 100644 index 00000000..a61c04f8 --- /dev/null +++ b/app/Models/DealerOrder.php @@ -0,0 +1,11 @@ + JsonArray::class, + ]; + + public function lvlRules() + { + return $this->hasMany(DealerProductLvlRule::class, 'product_id'); + } + + public function saleRules() + { + return $this->hasMany(DealerProductSaleRule::class, 'product_id'); + } +} diff --git a/app/Models/DealerProductLvlRule.php b/app/Models/DealerProductLvlRule.php new file mode 100644 index 00000000..353c6e3d --- /dev/null +++ b/app/Models/DealerProductLvlRule.php @@ -0,0 +1,11 @@ +id(); + $table->string('name')->comment('商品名称'); + $table->string('subtitle')->nullable()->comment('商品副标题'); + $table->string('cover')->nullable()->comment('封面图'); + $table->json('images')->nullable()->comment('商品图片'); + $table->text('description')->nullable()->comment('商品详情'); + $table->unsignedDecimal('price', 10, 2)->default(0.00)->comment('销售价格:元'); + $table->integer('stock')->unsigned()->default(0)->comment('库存'); + $table->integer('sales_count')->unsigned()->default(0)->comment('销量'); + $table->unsignedTinyInteger('is_sale')->default(0)->comment('是否在售'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('dealer_products'); + } +} diff --git a/database/migrations/2022_01_12_165458_create_dealer_orders_table.php b/database/migrations/2022_01_12_165458_create_dealer_orders_table.php new file mode 100644 index 00000000..6118ffbf --- /dev/null +++ b/database/migrations/2022_01_12_165458_create_dealer_orders_table.php @@ -0,0 +1,50 @@ +id(); + $table->string('sn')->comment('订单编号'); + $table->unsignedBigInteger('user_id')->comment('下单用户'); + $table->unsignedBigInteger('consignor_id')->nullable()->comment('发货用户'); + $table->unsignedDecimal('total_amount', 10, 2)->default(0.00)->comment('订单价格'); + $table->unsignedTinyInteger('state')->default(0)->comment('状态：0待接单，1待打款，2待收款，3待发货，4待收货，5已完成，9已取消'); + $table->unsignedTinyInteger('settle_state')->default(0)->comment('结算状态：0待处理，1已生成，2已结算'); + $table->string('consignee_name')->nullable()->comment('收货人姓名'); + $table->string('consignee_telephone')->nullable()->comment('收货人联系方式'); + $table->string('consignee_zone')->nullable()->comment('收货人所在地区'); + $table->string('consignee_address')->nullable()->comment('收货人详细地址'); + $table->text('pay_info')->nullable()->comment('收款信息；用户确认打款时存入'); + $table->string('pay_image')->nullable()->comment('打款凭证'); + $table->timestamp('pay_time')->nullable()->comment('支付时间'); + $table->timestamp('paied_time')->nullable()->comment('确认收款时间'); + $table->timestamp('shipping_time')->nullable()->comment('发货时间'); + $table->timestamp('shippinged_time')->nullable()->comment('确认收货时间'); + $table->timestamps(); + + $table->index(['user_id', 'state']); + $table->index('state'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('dealer_orders'); + } +} diff --git a/database/migrations/2022_01_12_165509_create_dealer_order_products_table.php b/database/migrations/2022_01_12_165509_create_dealer_order_products_table.php new file mode 100644 index 00000000..d88824ab --- /dev/null +++ b/database/migrations/2022_01_12_165509_create_dealer_order_products_table.php @@ -0,0 +1,39 @@ +id(); + $table->unsignedBigInteger('order_id')->comment('订单ID'); + $table->unsignedBigInteger('product_id')->comment('商品ID'); + $table->string('name')->comment('商品名称'); + $table->string('subtitle')->nullable()->comment('商品副标题'); + $table->string('cover')->nullable()->comment('封面图'); + $table->unsignedDecimal('price', 10, 2)->default(0.00)->comment('销售价格:元'); + $table->unsignedDecimal('sale_price', 10, 2)->default(0.00)->comment('成交价格:元'); + $table->integer('qty')->unsigned()->default(0)->comment('数量'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('dealer_order_products'); + } +} diff --git a/database/migrations/2022_01_12_165719_create_dealer_product_lvl_rules_table.php b/database/migrations/2022_01_12_165719_create_dealer_product_lvl_rules_table.php new file mode 100644 index 00000000..5691a9d5 --- /dev/null +++ b/database/migrations/2022_01_12_165719_create_dealer_product_lvl_rules_table.php @@ -0,0 +1,35 @@ +id(); + $table->unsignedBigInteger('product_id')->default(0)->comment('商品ID'); + $table->unsignedDecimal('sale_price', 10, 2)->default(0.00)->comment('销售价格:元'); + $table->unsignedDecimal('min_order_amount', 10, 2)->default(0.00)->comment('最低进货价'); + $table->unsignedTinyInteger('lvl')->default(0)->comment('等级'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('dealer_product_lvl_rules'); + } +} diff --git a/database/migrations/2022_01_12_165733_create_dealer_product_sale_rules_table.php b/database/migrations/2022_01_12_165733_create_dealer_product_sale_rules_table.php new file mode 100644 index 00000000..78b10ac2 --- /dev/null +++ b/database/migrations/2022_01_12_165733_create_dealer_product_sale_rules_table.php @@ -0,0 +1,34 @@ +id(); + $table->unsignedBigInteger('product_id')->default(0)->comment('商品ID'); + $table->unsignedDecimal('price', 10, 2)->default(0.00)->comment('销售价格:元'); + $table->unsignedInteger('qty')->default(0)->comment('达到指定数量'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('dealer_product_sale_rules'); + } +} diff --git a/database/migrations/2022_01_12_175842_create_dealer_user_products_table.php b/database/migrations/2022_01_12_175842_create_dealer_user_products_table.php new file mode 100644 index 00000000..645a397f --- /dev/null +++ b/database/migrations/2022_01_12_175842_create_dealer_user_products_table.php @@ -0,0 +1,36 @@ +id(); + $table->unsignedBigInteger('user_id')->comment('用户ID'); + $table->unsignedBigInteger('product_id')->comment('商品ID'); + $table->unsignedInteger('stock')->default(0)->comment('库存'); + $table->timestamps(); + + $table->unique(['user_id', 'product_id']); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('dealer_user_products'); + } +} diff --git a/database/migrations/2022_01_12_190218_create_dealer_user_product_logs_table.php b/database/migrations/2022_01_12_190218_create_dealer_user_product_logs_table.php new file mode 100644 index 00000000..cf5805ed --- /dev/null +++ b/database/migrations/2022_01_12_190218_create_dealer_user_product_logs_table.php @@ -0,0 +1,35 @@ +id(); + $table->unsignedBigInteger('user_id')->comment('用户ID'); + $table->unsignedBigInteger('product_id')->comment('商品ID'); + $table->unsignedTinyInteger('type')->default(0)->comment('变动类型'); + $table->unsignedInteger('qty')->default(0)->comment('变动数量'); + $table->timestamps(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::dropIfExists('dealer_user_product_logs'); + } +} diff --git a/database/seeders/AdminMenuSeeder.php b/database/seeders/AdminMenuSeeder.php index 49cf7dc4..d5749964 100644 --- a/database/seeders/AdminMenuSeeder.php +++ b/database/seeders/AdminMenuSeeder.php @@ -284,6 +284,43 @@ class AdminMenuSeeder extends Seeder ], ], ], + [ + 'title' =>'批零管理', + 'icon' => 'fa fa-skyatlas', + 'uri' =>'', + 'children' => [ + [ + 'title' =>'经销商管理', + 'icon' => '', + 'uri' => 'dealer-users', + ], + [ + 'title' =>'商品管理', + 'icon' => '', + 'uri' => 'dealer-products', + ], + [ + 'title' => '订单管理', + 'icon' => '', + 'uri' => 'dealer-orders', + ], + [ + 'title' =>'渠道补贴', + 'icon'=>'', + 'uri' => '', + ], + [ + 'title' =>'进货补贴', + 'icon' => '', + 'uri' => '', + ], + [ + 'title'=>'管理津贴', + 'icon' => '', + 'uri' => '', + ], + ], + ], [ 'title' => '系统管理', 'icon' => 'feather icon-settings', diff --git a/dcat_admin_ide_helper.php b/dcat_admin_ide_helper.php index 04d16f08..ce441304 100644 --- a/dcat_admin_ide_helper.php +++ b/dcat_admin_ide_helper.php @@ -107,6 +107,27 @@ namespace Dcat\Admin { * @property Grid\Column|Collection use_day * @property Grid\Column|Collection use_end_at * @property Grid\Column|Collection use_start_at + * @property Grid\Column|Collection price + * @property Grid\Column|Collection product_id + * @property Grid\Column|Collection qty + * @property Grid\Column|Collection sale_price + * @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 consignor_id + * @property Grid\Column|Collection paied_time + * @property Grid\Column|Collection pay_image + * @property Grid\Column|Collection pay_info + * @property Grid\Column|Collection pay_time + * @property Grid\Column|Collection settle_state + * @property Grid\Column|Collection shipping_time + * @property Grid\Column|Collection shippinged_time + * @property Grid\Column|Collection total_amount + * @property Grid\Column|Collection lvl + * @property Grid\Column|Collection min_order_amount + * @property Grid\Column|Collection is_sale + * @property Grid\Column|Collection sales_count * @property Grid\Column|Collection failed_reason * @property Grid\Column|Collection jobable_id * @property Grid\Column|Collection jobable_type @@ -118,7 +139,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection agent_level * @property Grid\Column|Collection completed_at * @property Grid\Column|Collection rule - * @property Grid\Column|Collection total_amount * @property Grid\Column|Collection total_sales_value * @property Grid\Column|Collection connection * @property Grid\Column|Collection exception @@ -139,10 +159,6 @@ namespace Dcat\Admin { * @property Grid\Column|Collection order_package_id * @property Grid\Column|Collection quantity * @property Grid\Column|Collection checked_at - * @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 is_failed * @property Grid\Column|Collection last_news * @property Grid\Column|Collection shipping_code @@ -352,6 +368,27 @@ namespace Dcat\Admin { * @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 price(string $label = null) + * @method Grid\Column|Collection product_id(string $label = null) + * @method Grid\Column|Collection qty(string $label = null) + * @method Grid\Column|Collection sale_price(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 consignor_id(string $label = null) + * @method Grid\Column|Collection paied_time(string $label = null) + * @method Grid\Column|Collection pay_image(string $label = null) + * @method Grid\Column|Collection pay_info(string $label = null) + * @method Grid\Column|Collection pay_time(string $label = null) + * @method Grid\Column|Collection settle_state(string $label = null) + * @method Grid\Column|Collection shipping_time(string $label = null) + * @method Grid\Column|Collection shippinged_time(string $label = null) + * @method Grid\Column|Collection total_amount(string $label = null) + * @method Grid\Column|Collection lvl(string $label = null) + * @method Grid\Column|Collection min_order_amount(string $label = null) + * @method Grid\Column|Collection is_sale(string $label = null) + * @method Grid\Column|Collection sales_count(string $label = null) * @method Grid\Column|Collection failed_reason(string $label = null) * @method Grid\Column|Collection jobable_id(string $label = null) * @method Grid\Column|Collection jobable_type(string $label = null) @@ -363,7 +400,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection agent_level(string $label = null) * @method Grid\Column|Collection completed_at(string $label = null) * @method Grid\Column|Collection rule(string $label = null) - * @method Grid\Column|Collection total_amount(string $label = null) * @method Grid\Column|Collection total_sales_value(string $label = null) * @method Grid\Column|Collection connection(string $label = null) * @method Grid\Column|Collection exception(string $label = null) @@ -384,10 +420,6 @@ namespace Dcat\Admin { * @method Grid\Column|Collection order_package_id(string $label = null) * @method Grid\Column|Collection quantity(string $label = null) * @method Grid\Column|Collection checked_at(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 is_failed(string $label = null) * @method Grid\Column|Collection last_news(string $label = null) * @method Grid\Column|Collection shipping_code(string $label = null) @@ -602,6 +634,27 @@ namespace Dcat\Admin { * @property Show\Field|Collection use_day * @property Show\Field|Collection use_end_at * @property Show\Field|Collection use_start_at + * @property Show\Field|Collection price + * @property Show\Field|Collection product_id + * @property Show\Field|Collection qty + * @property Show\Field|Collection sale_price + * @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 consignor_id + * @property Show\Field|Collection paied_time + * @property Show\Field|Collection pay_image + * @property Show\Field|Collection pay_info + * @property Show\Field|Collection pay_time + * @property Show\Field|Collection settle_state + * @property Show\Field|Collection shipping_time + * @property Show\Field|Collection shippinged_time + * @property Show\Field|Collection total_amount + * @property Show\Field|Collection lvl + * @property Show\Field|Collection min_order_amount + * @property Show\Field|Collection is_sale + * @property Show\Field|Collection sales_count * @property Show\Field|Collection failed_reason * @property Show\Field|Collection jobable_id * @property Show\Field|Collection jobable_type @@ -613,7 +666,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection agent_level * @property Show\Field|Collection completed_at * @property Show\Field|Collection rule - * @property Show\Field|Collection total_amount * @property Show\Field|Collection total_sales_value * @property Show\Field|Collection connection * @property Show\Field|Collection exception @@ -634,10 +686,6 @@ namespace Dcat\Admin { * @property Show\Field|Collection order_package_id * @property Show\Field|Collection quantity * @property Show\Field|Collection checked_at - * @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 is_failed * @property Show\Field|Collection last_news * @property Show\Field|Collection shipping_code @@ -847,6 +895,27 @@ namespace Dcat\Admin { * @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 price(string $label = null) + * @method Show\Field|Collection product_id(string $label = null) + * @method Show\Field|Collection qty(string $label = null) + * @method Show\Field|Collection sale_price(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 consignor_id(string $label = null) + * @method Show\Field|Collection paied_time(string $label = null) + * @method Show\Field|Collection pay_image(string $label = null) + * @method Show\Field|Collection pay_info(string $label = null) + * @method Show\Field|Collection pay_time(string $label = null) + * @method Show\Field|Collection settle_state(string $label = null) + * @method Show\Field|Collection shipping_time(string $label = null) + * @method Show\Field|Collection shippinged_time(string $label = null) + * @method Show\Field|Collection total_amount(string $label = null) + * @method Show\Field|Collection lvl(string $label = null) + * @method Show\Field|Collection min_order_amount(string $label = null) + * @method Show\Field|Collection is_sale(string $label = null) + * @method Show\Field|Collection sales_count(string $label = null) * @method Show\Field|Collection failed_reason(string $label = null) * @method Show\Field|Collection jobable_id(string $label = null) * @method Show\Field|Collection jobable_type(string $label = null) @@ -858,7 +927,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection agent_level(string $label = null) * @method Show\Field|Collection completed_at(string $label = null) * @method Show\Field|Collection rule(string $label = null) - * @method Show\Field|Collection total_amount(string $label = null) * @method Show\Field|Collection total_sales_value(string $label = null) * @method Show\Field|Collection connection(string $label = null) * @method Show\Field|Collection exception(string $label = null) @@ -879,10 +947,6 @@ namespace Dcat\Admin { * @method Show\Field|Collection order_package_id(string $label = null) * @method Show\Field|Collection quantity(string $label = null) * @method Show\Field|Collection checked_at(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 is_failed(string $label = null) * @method Show\Field|Collection last_news(string $label = null) * @method Show\Field|Collection shipping_code(string $label = null) diff --git a/resources/lang/zh_CN/dealer-product.php b/resources/lang/zh_CN/dealer-product.php new file mode 100644 index 00000000..623df182 --- /dev/null +++ b/resources/lang/zh_CN/dealer-product.php @@ -0,0 +1,21 @@ + [ + 'DealerProduct' => '商品管理', + 'dealer-products' => '商品管理', + ], + 'fields' => [ + 'name' => '商品名称', + 'subtitle' => '商品副标题', + 'cover' => '封面图', + 'images' => '商品图片', + 'description' => '商品详情', + 'price' => '销售价格', + 'stock' => '库存', + 'sales_count' => '销量', + 'is_sale' => '是否在售', + ], + 'options' => [ + ], +];