添加分类（店铺和商品）相关

app/Admin/Controllers/GoodsTypeController.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Repositories\GoodsType;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Controllers\AdminController;
+
+class GoodsTypeController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new GoodsType(), function (Grid $grid) {
+            $grid->id->sortable();
+            $grid->cover_img->image('',50);
+            $grid->type_name;
+            $grid->sort->sortable();
+            // 排序
+            $grid->model()->orderBy('id', 'desc');
+
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->like('type_name');
+            });
+
+            // 每页10条
+            $grid->paginate(10);
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new GoodsType(), function (Show $show) {
+            $show->type_name->width(4);
+            $show->cover_img->image()->width(2);
+            $show->sort->width(1);
+            $show->created_at_text->width(2);
+            $show->updated_at_text->width(2);
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new GoodsType(), function (Form $form) {
+            $form->hidden('id');
+            $form->text('type_name')->required()->maxLength(20,'最多只能输入20个中文字');
+
+            /* uniqueName图片名称唯一,否则可能图片上传失败 */
+            $form->image('cover_img')->required()->uniqueName();
+
+            $form->number('sort')->width(100);
+
+            $form->disableResetButton();
+            $form->disableViewCheck();
+            $form->disableEditingCheck();
+            $form->disableCreatingCheck();
+        });
+    }
+}

app/Admin/Controllers/ImsCjdcMarketController.php

@@ -26,7 +26,7 @@ class ImsCjdcMarketController extends AdminController
                 if ($mid == 0) return '懒族自营';
                 $mp = LanzuMpInfo::find($mid);
                 if (!$mp) {
-                    return '<span style="color: red">数据错误</span>';
+                    return '<span style="color: #ff0000">数据错误</span>';
                 }
                 return $mp->name;
             });

app/Admin/Controllers/StoreTypeController.php

@@ -0,0 +1,77 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Repositories\StoreType;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Controllers\AdminController;
+
+class StoreTypeController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new StoreType(), function (Grid $grid) {
+            $grid->id->sortable();
+            $grid->cover_img->image('',50);
+            $grid->type_name;
+            $grid->sort->sortable();
+            // 排序
+            $grid->model()->orderBy('id', 'desc');
+
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->like('type_name');
+            });
+
+            // 每页10条
+            $grid->paginate(10);
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        return Show::make($id, new StoreType(), function (Show $show) {
+            $show->type_name->width(4);
+            $show->cover_img_url->image()->width(1);
+            $show->sort->width(1);
+            $show->created_at_text->width(2);
+            $show->updated_at_text->width(2);
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new StoreType(), function (Form $form) {
+            $form->hidden('id');
+            $form->text('type_name')->required()->maxLength(20,'最多只能输入20个中文字');
+
+            /* uniqueName图片名称唯一,否则可能图片上传失败 */
+            $form->image('cover_img')->required()->uniqueName();
+
+            $form->number('sort')->width(100);
+
+            $form->disableResetButton();
+            $form->disableViewCheck();
+            $form->disableEditingCheck();
+            $form->disableCreatingCheck();
+        });
+    }
+}

app/Admin/Controllers/TypeCorrelation.php

@@ -0,0 +1,80 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Repositories\StoreType;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+use Dcat\Admin\Controllers\AdminController;
+use App\Models\StoreType as StoreTypeModel;
+
+class TypeCorrelationController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        return Grid::make(new StoreType(), function (Grid $grid) {
+            $grid->id->sortable();
+            $grid->cover_img->image('',50);
+            $grid->type_name;
+            $grid->sort->sortable();
+            // 排序
+            $grid->model()->orderBy('id', 'desc');
+
+            $grid->filter(function (Grid\Filter $filter) {
+                $filter->like('type_name');
+            });
+
+            // 每页10条
+            $grid->paginate(10);
+        });
+    }
+
+    /**
+     * Make a show builder.
+     *
+     * @param mixed $id
+     *
+     * @return Show
+     */
+    protected function detail($id)
+    {
+        // $s = StoreTypeModel::find(23);
+        // dd($s->cover_img_url);
+        return Show::make($id, new StoreType(), function (Show $show) {
+            $show->type_name->width(4);
+            $show->cover_img_url->image()->width(1);
+            $show->sort->width(1);
+            $show->created_at_text->width(2);
+            $show->updated_at_text->width(2);
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new StoreType(), function (Form $form) {
+            $form->hidden('id');
+            $form->text('type_name')->required()->maxLength(20,'最多只能输入20个中文字');
+
+            /* uniqueName图片名称唯一,否则可能图片上传失败 */
+            $form->image('cover_img')->required()->uniqueName();
+
+            $form->number('sort')->width(100);
+
+            $form->disableResetButton();
+            $form->disableViewCheck();
+            $form->disableEditingCheck();
+            $form->disableCreatingCheck();
+        });
+    }
+}

app/Admin/Repositories/GoodsType.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\GoodsType as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class GoodsType extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}

app/Admin/Repositories/StoreType.php

@@ -0,0 +1,16 @@
+<?php
+
+namespace App\Admin\Repositories;
+
+use App\Models\StoreType as Model;
+use Dcat\Admin\Repositories\EloquentRepository;
+
+class StoreType extends EloquentRepository
+{
+    /**
+     * Model.
+     *
+     * @var string
+     */
+    protected $eloquentClass = Model::class;
+}

app/Admin/routes.php

@@ -43,4 +43,9 @@ Route::group([
     $router->any('/api/stores', 'LanzuServiceSpeakerController@getStores');
     //统计店铺新增用户
     $router->resource('/storeUserReport', 'StoreUserReportController');
+
+    //分类
+    $router->resource('/storeType', 'StoreTypeController');
+    $router->resource('/goodsType', 'GoodsTypeController');
+
 });

app/Console/Commands/SetGoodsMarketId.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use App\Models\LanzuGoods;
+
+use App\Models\LanzuStore;
+
+
+class SetGoodsMarketId extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'command:SetGoodsMarketId';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Command 根据商品表中storeid设置市场id';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+
+        $goods = LanzuGoods::all();
+
+        $no_store_ids = [];
+
+        foreach($goods as $key => $item){
+            $store = LanzuStore::find($item->store_id);
+            if($store){
+                $item->market_id =  $store->market_id;
+                $item->save();
+                print_r($item->id.'\r\n');
+            }else{
+                $no_store_ids[] = $item->store_id;
+                break;
+            }
+        }
+
+        var_dump($no_store_ids);
+
+        return 0;
+    }
+}

app/Models/GoodsType.php

@@ -0,0 +1,47 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Model;
+
+class GoodsType extends Model
+{
+	use HasDateTimeFormatter;
+    use SoftDeletes;
+
+    protected $table = 'lanzu_goods_type';
+    protected $dateFormat = 'U';
+
+    protected $appends = [
+        'cover_img_url',
+        'created_at_text',
+        'updated_at_text'
+    ];
+
+    public function getCreatedAtTextAttribute($value)
+    {
+        $value = $value ? $value : $this->created_at;
+        return $value;
+        // return date('Y-m-d H:i:s',$value);
+    }
+    public function getUpdatedAtTextAttribute($value)
+    {
+        $value = $value ? $value : $this->updated_at;
+        return $value;
+        // return date('Y-m-d H:i:s',$value);
+    }
+
+    public function getCoverImgUrlAttribute($value)
+    {
+        $value = $value ? $value : $this->cover_img;
+        return $this->imageUrl($value);
+    }
+
+    // 处理图片
+    public function imageUrl($value)
+    {
+        return env('OSS_IMG_HOST').'/'.$value;
+    }
+}

app/Models/LanzuGoods.php

@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+
+use Illuminate\Database\Eloquent\Model;
+
+class LanzuGoods extends Model
+{
+	use HasDateTimeFormatter;
+    protected $table = 'lanzu_goods';
+    protected $dateFormat = 'U';
+}

app/Models/StoreType.php

@@ -0,0 +1,51 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Model;
+
+class StoreType extends Model
+{
+	use HasDateTimeFormatter;
+    use SoftDeletes;
+
+    protected $table = 'lanzu_store_type';
+    protected $dateFormat = 'U';
+
+    protected $appends = [
+        'cover_img_url',
+        'created_at_text',
+        'updated_at_text'
+    ];
+
+    public function getCreatedAtTextAttribute($value)
+    {
+        $value = $value ? $value : $this->created_at;
+        return $value;
+        // return date('Y-m-d H:i:s',$value);
+    }
+    public function getUpdatedAtTextAttribute($value)
+    {
+        $value = $value ? $value : $this->updated_at;
+        return $value;
+        // return date('Y-m-d H:i:s',$value);
+    }
+
+    public function getCoverImgUrlAttribute($value)
+    {
+        $value = $value ? $value : $this->cover_img;
+        return $this->imageUrl($value);
+    }
+
+    // 处理图片
+    public function imageUrl($value)
+    {
+        if(strripos($value,"http") === false){
+            return env('OSS_IMG_HOST').'/'.$value;
+        }else{
+            return $value;
+        }
+    }
+}

database/migrations/2014_10_12_000000_create_users_table.php

@@ -1,36 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateUsersTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('users', function (Blueprint $table) {
-            $table->id();
-            $table->string('name');
-            $table->string('email')->unique();
-            $table->timestamp('email_verified_at')->nullable();
-            $table->string('password');
-            $table->rememberToken();
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('users');
-    }
-}

database/migrations/2016_01_04_173148_create_admin_tables.php

@@ -1,122 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateAdminTables extends Migration
-{
-    public function getConnection()
-    {
-        return config('database.connection') ?: config('database.default');
-    }
-
-    public function config($key)
-    {
-        return config('admin.'.$key);
-    }
-
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create($this->config('database.users_table'), function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('username', 120)->unique();
-            $table->string('password', 80);
-            $table->string('name');
-            $table->string('avatar')->nullable();
-            $table->string('remember_token', 100)->nullable();
-            $table->timestamps();
-        });
-
-        Schema::create($this->config('database.roles_table'), function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('name', 50);
-            $table->string('slug', 50)->unique();
-            $table->timestamps();
-        });
-
-        Schema::create($this->config('database.permissions_table'), function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->string('name', 50);
-            $table->string('slug', 50)->unique();
-            $table->string('http_method')->nullable();
-            $table->text('http_path')->nullable();
-            $table->integer('order')->default(0);
-            $table->bigInteger('parent_id')->default(0);
-            $table->timestamps();
-        });
-
-        Schema::create($this->config('database.menu_table'), function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->bigInteger('parent_id')->default(0);
-            $table->integer('order')->default(0);
-            $table->string('title', 50);
-            $table->string('icon', 50)->nullable();
-            $table->string('uri', 50)->nullable();
-
-            $table->timestamps();
-        });
-
-        Schema::create($this->config('database.role_users_table'), function (Blueprint $table) {
-            $table->bigInteger('role_id');
-            $table->bigInteger('user_id');
-            $table->unique(['role_id', 'user_id']);
-            $table->timestamps();
-        });
-
-        Schema::create($this->config('database.role_permissions_table'), function (Blueprint $table) {
-            $table->bigInteger('role_id');
-            $table->bigInteger('permission_id');
-            $table->unique(['role_id', 'permission_id']);
-            $table->timestamps();
-        });
-
-        Schema::create($this->config('database.role_menu_table'), function (Blueprint $table) {
-            $table->bigInteger('role_id');
-            $table->bigInteger('menu_id');
-            $table->unique(['role_id', 'menu_id']);
-            $table->timestamps();
-        });
-
-        Schema::create($this->config('database.permission_menu_table'), function (Blueprint $table) {
-            $table->bigInteger('permission_id');
-            $table->bigInteger('menu_id');
-            $table->unique(['permission_id', 'menu_id']);
-            $table->timestamps();
-        });
-
-        Schema::create($this->config('database.operation_log_table'), function (Blueprint $table) {
-            $table->bigIncrements('id');
-            $table->bigInteger('user_id');
-            $table->string('path');
-            $table->string('method', 10);
-            $table->string('ip');
-            $table->text('input');
-            $table->index('user_id');
-            $table->timestamps();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists($this->config('database.users_table'));
-        Schema::dropIfExists($this->config('database.roles_table'));
-        Schema::dropIfExists($this->config('database.permissions_table'));
-        Schema::dropIfExists($this->config('database.menu_table'));
-        Schema::dropIfExists($this->config('database.role_users_table'));
-        Schema::dropIfExists($this->config('database.role_permissions_table'));
-        Schema::dropIfExists($this->config('database.role_menu_table'));
-        Schema::dropIfExists($this->config('database.permission_menu_table'));
-        Schema::dropIfExists($this->config('database.operation_log_table'));
-    }
-}

database/migrations/2019_08_19_000000_create_failed_jobs_table.php

@@ -1,35 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateFailedJobsTable extends Migration
-{
-    /**
-     * Run the migrations.
-     *
-     * @return void
-     */
-    public function up()
-    {
-        Schema::create('failed_jobs', function (Blueprint $table) {
-            $table->id();
-            $table->text('connection');
-            $table->text('queue');
-            $table->longText('payload');
-            $table->longText('exception');
-            $table->timestamp('failed_at')->useCurrent();
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     *
-     * @return void
-     */
-    public function down()
-    {
-        Schema::dropIfExists('failed_jobs');
-    }
-}

database/migrations/2020_08_31_112634_create_lanzu_store_type_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateLanzuStoreTypeTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('lanzu_store_type', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('type_name')->default('')->comment('分类名称');
+            $table->string('cover_img')->default('')->comment('封面图');
+            $table->integer('sort')->default('0')->nullable()->comment('排序');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('lanzu_store_type');
+    }
+}

database/migrations/2020_08_31_171746_create_lanzu_goods_type_table.php

@@ -0,0 +1,35 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class CreateLanzuGoodsTypeTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('lanzu_goods_type', function (Blueprint $table) {
+            $table->increments('id');
+            $table->string('type_name')->default('')->comment('分类名称');
+            $table->string('cover_img')->nullable()->comment('封面图');
+            $table->integer('sort')->nullable()->comment('排序');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('lanzu_goods_type');
+    }
+}

dcat_admin_ide_helper.php

@@ -34,16 +34,17 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection require
      * @property Grid\Column|Collection require_dev
      * @property Grid\Column|Collection phone
+     * @property Grid\Column|Collection status
+     * @property Grid\Column|Collection address
+     * @property Grid\Column|Collection admin_user_id
      * @property Grid\Column|Collection id_frond
      * @property Grid\Column|Collection id_back
      * @property Grid\Column|Collection id_number
      * @property Grid\Column|Collection bank_name
      * @property Grid\Column|Collection bank_card
      * @property Grid\Column|Collection bank_addr
-     * @property Grid\Column|Collection status
      * @property Grid\Column|Collection market_id
      * @property Grid\Column|Collection logo
-     * @property Grid\Column|Collection address
      * @property Grid\Column|Collection introduce
      * @property Grid\Column|Collection imgs
      * @property Grid\Column|Collection addtime
@@ -67,16 +68,28 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection mp_id
      * @property Grid\Column|Collection is_pay
      * @property Grid\Column|Collection mm_id
-     * @property Grid\Column|Collection admin_user_id
      * @property Grid\Column|Collection cs_id
+     * @property Grid\Column|Collection type
+     * @property Grid\Column|Collection user_id
+     * @property Grid\Column|Collection desc
      * @property Grid\Column|Collection activity
      * @property Grid\Column|Collection forward
      * @property Grid\Column|Collection repay
+     * @property Grid\Column|Collection category
+     * @property Grid\Column|Collection value
+     * @property Grid\Column|Collection store_id
+     * @property Grid\Column|Collection store_name
+     * @property Grid\Column|Collection new_user_total
+     * @property Grid\Column|Collection mm_user_id
+     * @property Grid\Column|Collection cover_img
+     * @property Grid\Column|Collection type_name
+     * @property Grid\Column|Collection cover_img_url
+     * @property Grid\Column|Collection created_at_text
+     * @property Grid\Column|Collection updated_at_text
      * @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 user_id
      * @property Grid\Column|Collection permission_id
      * @property Grid\Column|Collection menu_id
      * @property Grid\Column|Collection http_method
@@ -122,7 +135,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection rules
      * @property Grid\Column|Collection uid
      * @property Grid\Column|Collection group_id
-     * @property Grid\Column|Collection type
      * @property Grid\Column|Collection condition
      * @property Grid\Column|Collection ismenu
      * @property Grid\Column|Collection weigh
@@ -135,7 +147,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection executetime
      * @property Grid\Column|Collection group
      * @property Grid\Column|Collection tip
-     * @property Grid\Column|Collection value
      * @property Grid\Column|Collection rule
      * @property Grid\Column|Collection extend
      * @property Grid\Column|Collection event
@@ -178,11 +189,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection packagesize
      * @property Grid\Column|Collection downloadurl
      * @property Grid\Column|Collection enforce
-     * @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 acid
      * @property Grid\Column|Collection uniacid
      * @property Grid\Column|Collection hash
@@ -256,7 +262,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection item
      * @property Grid\Column|Collection area_name
      * @property Grid\Column|Collection num
-     * @property Grid\Column|Collection store_id
      * @property Grid\Column|Collection stars
      * @property Grid\Column|Collection time
      * @property Grid\Column|Collection order_id
@@ -482,6 +487,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection combination_id
      * @property Grid\Column|Collection order_status
      * @property Grid\Column|Collection update_time
+     * @property Grid\Column|Collection refund_time
      * @property Grid\Column|Collection order_shipping_code
      * @property Grid\Column|Collection shipping_name
      * @property Grid\Column|Collection store_ids
@@ -493,6 +499,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection dada_status
      * @property Grid\Column|Collection print_num
      * @property Grid\Column|Collection global_order_id
+     * @property Grid\Column|Collection plat
      * @property Grid\Column|Collection mchid
      * @property Grid\Column|Collection wxkey
      * @property Grid\Column|Collection apiclient_cert
@@ -562,9 +569,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection store_mchid
      * @property Grid\Column|Collection cash_code
      * @property Grid\Column|Collection store_wallet
-     * @property Grid\Column|Collection mm_user_id
      * @property Grid\Column|Collection add_time
-     * @property Grid\Column|Collection category
      * @property Grid\Column|Collection xyh_open
      * @property Grid\Column|Collection is_jd
      * @property Grid\Column|Collection is_jfpay
@@ -624,7 +629,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection tz_src
      * @property Grid\Column|Collection full_delivery
      * @property Grid\Column|Collection is_poundage
-     * @property Grid\Column|Collection type_name
      * @property Grid\Column|Collection appsecret
      * @property Grid\Column|Collection url_name
      * @property Grid\Column|Collection url_logo
@@ -697,7 +701,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection is_open_dada_fee
      * @property Grid\Column|Collection menu_name
      * @property Grid\Column|Collection info
-     * @property Grid\Column|Collection desc
      * @property Grid\Column|Collection tag
      * @property Grid\Column|Collection fw_cost
      * @property Grid\Column|Collection zd_cost
@@ -766,6 +769,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection minute
      * @property Grid\Column|Collection extra
      * @property Grid\Column|Collection tid
+     * @property Grid\Column|Collection payload
      * @property Grid\Column|Collection handled
      * @property Grid\Column|Collection total
      * @property Grid\Column|Collection append_title
@@ -1159,8 +1163,19 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection money_type
      * @property Grid\Column|Collection source_type
      * @property Grid\Column|Collection comment
+     * @property Grid\Column|Collection original_price
+     * @property Grid\Column|Collection vip_price
+     * @property Grid\Column|Collection on_sale
+     * @property Grid\Column|Collection tags
+     * @property Grid\Column|Collection details_imgs
      * @property Grid\Column|Collection is_del
      * @property Grid\Column|Collection is_operated
+     * @property Grid\Column|Collection distribution_money
+     * @property Grid\Column|Collection refuse_note
+     * @property Grid\Column|Collection shipping_type
+     * @property Grid\Column|Collection coupon_money
+     * @property Grid\Column|Collection delivery_money
+     * @property Grid\Column|Collection delivery_status
      * @property Grid\Column|Collection c_attitude
      * @property Grid\Column|Collection c_service
      * @property Grid\Column|Collection c_quality
@@ -1172,10 +1187,19 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection set_reward
      * @property Grid\Column|Collection device_name
      * @property Grid\Column|Collection bind_time
+     * @property Grid\Column|Collection business_license
+     * @property Grid\Column|Collection store_type_id
+     * @property Grid\Column|Collection expire_time
+     * @property Grid\Column|Collection pay_status
+     * @property Grid\Column|Collection apply_time
+     * @property Grid\Column|Collection store_applet_img
+     * @property Grid\Column|Collection cash_code_img
+     * @property Grid\Column|Collection goods_type_id
+     * @property Grid\Column|Collection nick_name
+     * @property Grid\Column|Collection real_name
      * @property Grid\Column|Collection balance
      * @property Grid\Column|Collection bind_type
      * @property Grid\Column|Collection json_data
-     * @property Grid\Column|Collection email_verified_at
      *
      * @method Grid\Column|Collection id(string $label = null)
      * @method Grid\Column|Collection username(string $label = null)
@@ -1200,16 +1224,17 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection require(string $label = null)
      * @method Grid\Column|Collection require_dev(string $label = null)
      * @method Grid\Column|Collection phone(string $label = null)
+     * @method Grid\Column|Collection status(string $label = null)
+     * @method Grid\Column|Collection address(string $label = null)
+     * @method Grid\Column|Collection admin_user_id(string $label = null)
      * @method Grid\Column|Collection id_frond(string $label = null)
      * @method Grid\Column|Collection id_back(string $label = null)
      * @method Grid\Column|Collection id_number(string $label = null)
      * @method Grid\Column|Collection bank_name(string $label = null)
      * @method Grid\Column|Collection bank_card(string $label = null)
      * @method Grid\Column|Collection bank_addr(string $label = null)
-     * @method Grid\Column|Collection status(string $label = null)
      * @method Grid\Column|Collection market_id(string $label = null)
      * @method Grid\Column|Collection logo(string $label = null)
-     * @method Grid\Column|Collection address(string $label = null)
      * @method Grid\Column|Collection introduce(string $label = null)
      * @method Grid\Column|Collection imgs(string $label = null)
      * @method Grid\Column|Collection addtime(string $label = null)
@@ -1233,16 +1258,28 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection mp_id(string $label = null)
      * @method Grid\Column|Collection is_pay(string $label = null)
      * @method Grid\Column|Collection mm_id(string $label = null)
-     * @method Grid\Column|Collection admin_user_id(string $label = null)
      * @method Grid\Column|Collection cs_id(string $label = null)
+     * @method Grid\Column|Collection type(string $label = null)
+     * @method Grid\Column|Collection user_id(string $label = null)
+     * @method Grid\Column|Collection desc(string $label = null)
      * @method Grid\Column|Collection activity(string $label = null)
      * @method Grid\Column|Collection forward(string $label = null)
      * @method Grid\Column|Collection repay(string $label = null)
+     * @method Grid\Column|Collection category(string $label = null)
+     * @method Grid\Column|Collection value(string $label = null)
+     * @method Grid\Column|Collection store_id(string $label = null)
+     * @method Grid\Column|Collection store_name(string $label = null)
+     * @method Grid\Column|Collection new_user_total(string $label = null)
+     * @method Grid\Column|Collection mm_user_id(string $label = null)
+     * @method Grid\Column|Collection cover_img(string $label = null)
+     * @method Grid\Column|Collection type_name(string $label = null)
+     * @method Grid\Column|Collection cover_img_url(string $label = null)
+     * @method Grid\Column|Collection created_at_text(string $label = null)
+     * @method Grid\Column|Collection updated_at_text(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 user_id(string $label = null)
      * @method Grid\Column|Collection permission_id(string $label = null)
      * @method Grid\Column|Collection menu_id(string $label = null)
      * @method Grid\Column|Collection http_method(string $label = null)
@@ -1288,7 +1325,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection rules(string $label = null)
      * @method Grid\Column|Collection uid(string $label = null)
      * @method Grid\Column|Collection group_id(string $label = null)
-     * @method Grid\Column|Collection type(string $label = null)
      * @method Grid\Column|Collection condition(string $label = null)
      * @method Grid\Column|Collection ismenu(string $label = null)
      * @method Grid\Column|Collection weigh(string $label = null)
@@ -1301,7 +1337,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection executetime(string $label = null)
      * @method Grid\Column|Collection group(string $label = null)
      * @method Grid\Column|Collection tip(string $label = null)
-     * @method Grid\Column|Collection value(string $label = null)
      * @method Grid\Column|Collection rule(string $label = null)
      * @method Grid\Column|Collection extend(string $label = null)
      * @method Grid\Column|Collection event(string $label = null)
@@ -1344,11 +1379,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection packagesize(string $label = null)
      * @method Grid\Column|Collection downloadurl(string $label = null)
      * @method Grid\Column|Collection enforce(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 acid(string $label = null)
      * @method Grid\Column|Collection uniacid(string $label = null)
      * @method Grid\Column|Collection hash(string $label = null)
@@ -1422,7 +1452,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection item(string $label = null)
      * @method Grid\Column|Collection area_name(string $label = null)
      * @method Grid\Column|Collection num(string $label = null)
-     * @method Grid\Column|Collection store_id(string $label = null)
      * @method Grid\Column|Collection stars(string $label = null)
      * @method Grid\Column|Collection time(string $label = null)
      * @method Grid\Column|Collection order_id(string $label = null)
@@ -1648,6 +1677,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection combination_id(string $label = null)
      * @method Grid\Column|Collection order_status(string $label = null)
      * @method Grid\Column|Collection update_time(string $label = null)
+     * @method Grid\Column|Collection refund_time(string $label = null)
      * @method Grid\Column|Collection order_shipping_code(string $label = null)
      * @method Grid\Column|Collection shipping_name(string $label = null)
      * @method Grid\Column|Collection store_ids(string $label = null)
@@ -1659,6 +1689,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection dada_status(string $label = null)
      * @method Grid\Column|Collection print_num(string $label = null)
      * @method Grid\Column|Collection global_order_id(string $label = null)
+     * @method Grid\Column|Collection plat(string $label = null)
      * @method Grid\Column|Collection mchid(string $label = null)
      * @method Grid\Column|Collection wxkey(string $label = null)
      * @method Grid\Column|Collection apiclient_cert(string $label = null)
@@ -1728,9 +1759,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection store_mchid(string $label = null)
      * @method Grid\Column|Collection cash_code(string $label = null)
      * @method Grid\Column|Collection store_wallet(string $label = null)
-     * @method Grid\Column|Collection mm_user_id(string $label = null)
      * @method Grid\Column|Collection add_time(string $label = null)
-     * @method Grid\Column|Collection category(string $label = null)
      * @method Grid\Column|Collection xyh_open(string $label = null)
      * @method Grid\Column|Collection is_jd(string $label = null)
      * @method Grid\Column|Collection is_jfpay(string $label = null)
@@ -1790,7 +1819,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection tz_src(string $label = null)
      * @method Grid\Column|Collection full_delivery(string $label = null)
      * @method Grid\Column|Collection is_poundage(string $label = null)
-     * @method Grid\Column|Collection type_name(string $label = null)
      * @method Grid\Column|Collection appsecret(string $label = null)
      * @method Grid\Column|Collection url_name(string $label = null)
      * @method Grid\Column|Collection url_logo(string $label = null)
@@ -1863,7 +1891,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection is_open_dada_fee(string $label = null)
      * @method Grid\Column|Collection menu_name(string $label = null)
      * @method Grid\Column|Collection info(string $label = null)
-     * @method Grid\Column|Collection desc(string $label = null)
      * @method Grid\Column|Collection tag(string $label = null)
      * @method Grid\Column|Collection fw_cost(string $label = null)
      * @method Grid\Column|Collection zd_cost(string $label = null)
@@ -1932,6 +1959,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection minute(string $label = null)
      * @method Grid\Column|Collection extra(string $label = null)
      * @method Grid\Column|Collection tid(string $label = null)
+     * @method Grid\Column|Collection payload(string $label = null)
      * @method Grid\Column|Collection handled(string $label = null)
      * @method Grid\Column|Collection total(string $label = null)
      * @method Grid\Column|Collection append_title(string $label = null)
@@ -2325,8 +2353,19 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection money_type(string $label = null)
      * @method Grid\Column|Collection source_type(string $label = null)
      * @method Grid\Column|Collection comment(string $label = null)
+     * @method Grid\Column|Collection original_price(string $label = null)
+     * @method Grid\Column|Collection vip_price(string $label = null)
+     * @method Grid\Column|Collection on_sale(string $label = null)
+     * @method Grid\Column|Collection tags(string $label = null)
+     * @method Grid\Column|Collection details_imgs(string $label = null)
      * @method Grid\Column|Collection is_del(string $label = null)
      * @method Grid\Column|Collection is_operated(string $label = null)
+     * @method Grid\Column|Collection distribution_money(string $label = null)
+     * @method Grid\Column|Collection refuse_note(string $label = null)
+     * @method Grid\Column|Collection shipping_type(string $label = null)
+     * @method Grid\Column|Collection coupon_money(string $label = null)
+     * @method Grid\Column|Collection delivery_money(string $label = null)
+     * @method Grid\Column|Collection delivery_status(string $label = null)
      * @method Grid\Column|Collection c_attitude(string $label = null)
      * @method Grid\Column|Collection c_service(string $label = null)
      * @method Grid\Column|Collection c_quality(string $label = null)
@@ -2338,10 +2377,19 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection set_reward(string $label = null)
      * @method Grid\Column|Collection device_name(string $label = null)
      * @method Grid\Column|Collection bind_time(string $label = null)
+     * @method Grid\Column|Collection business_license(string $label = null)
+     * @method Grid\Column|Collection store_type_id(string $label = null)
+     * @method Grid\Column|Collection expire_time(string $label = null)
+     * @method Grid\Column|Collection pay_status(string $label = null)
+     * @method Grid\Column|Collection apply_time(string $label = null)
+     * @method Grid\Column|Collection store_applet_img(string $label = null)
+     * @method Grid\Column|Collection cash_code_img(string $label = null)
+     * @method Grid\Column|Collection goods_type_id(string $label = null)
+     * @method Grid\Column|Collection nick_name(string $label = null)
+     * @method Grid\Column|Collection real_name(string $label = null)
      * @method Grid\Column|Collection balance(string $label = null)
      * @method Grid\Column|Collection bind_type(string $label = null)
      * @method Grid\Column|Collection json_data(string $label = null)
-     * @method Grid\Column|Collection email_verified_at(string $label = null)
      */
     class Grid {}
 
@@ -2371,16 +2419,17 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection require
      * @property Show\Field|Collection require_dev
      * @property Show\Field|Collection phone
+     * @property Show\Field|Collection status
+     * @property Show\Field|Collection address
+     * @property Show\Field|Collection admin_user_id
      * @property Show\Field|Collection id_frond
      * @property Show\Field|Collection id_back
      * @property Show\Field|Collection id_number
      * @property Show\Field|Collection bank_name
      * @property Show\Field|Collection bank_card
      * @property Show\Field|Collection bank_addr
-     * @property Show\Field|Collection status
      * @property Show\Field|Collection market_id
      * @property Show\Field|Collection logo
-     * @property Show\Field|Collection address
      * @property Show\Field|Collection introduce
      * @property Show\Field|Collection imgs
      * @property Show\Field|Collection addtime
@@ -2404,16 +2453,28 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection mp_id
      * @property Show\Field|Collection is_pay
      * @property Show\Field|Collection mm_id
-     * @property Show\Field|Collection admin_user_id
      * @property Show\Field|Collection cs_id
+     * @property Show\Field|Collection type
+     * @property Show\Field|Collection user_id
+     * @property Show\Field|Collection desc
      * @property Show\Field|Collection activity
      * @property Show\Field|Collection forward
      * @property Show\Field|Collection repay
+     * @property Show\Field|Collection category
+     * @property Show\Field|Collection value
+     * @property Show\Field|Collection store_id
+     * @property Show\Field|Collection store_name
+     * @property Show\Field|Collection new_user_total
+     * @property Show\Field|Collection mm_user_id
+     * @property Show\Field|Collection cover_img
+     * @property Show\Field|Collection type_name
+     * @property Show\Field|Collection cover_img_url
+     * @property Show\Field|Collection created_at_text
+     * @property Show\Field|Collection updated_at_text
      * @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 user_id
      * @property Show\Field|Collection permission_id
      * @property Show\Field|Collection menu_id
      * @property Show\Field|Collection http_method
@@ -2459,7 +2520,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection rules
      * @property Show\Field|Collection uid
      * @property Show\Field|Collection group_id
-     * @property Show\Field|Collection type
      * @property Show\Field|Collection condition
      * @property Show\Field|Collection ismenu
      * @property Show\Field|Collection weigh
@@ -2472,7 +2532,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection executetime
      * @property Show\Field|Collection group
      * @property Show\Field|Collection tip
-     * @property Show\Field|Collection value
      * @property Show\Field|Collection rule
      * @property Show\Field|Collection extend
      * @property Show\Field|Collection event
@@ -2515,11 +2574,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection packagesize
      * @property Show\Field|Collection downloadurl
      * @property Show\Field|Collection enforce
-     * @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 acid
      * @property Show\Field|Collection uniacid
      * @property Show\Field|Collection hash
@@ -2593,7 +2647,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection item
      * @property Show\Field|Collection area_name
      * @property Show\Field|Collection num
-     * @property Show\Field|Collection store_id
      * @property Show\Field|Collection stars
      * @property Show\Field|Collection time
      * @property Show\Field|Collection order_id
@@ -2819,6 +2872,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection combination_id
      * @property Show\Field|Collection order_status
      * @property Show\Field|Collection update_time
+     * @property Show\Field|Collection refund_time
      * @property Show\Field|Collection order_shipping_code
      * @property Show\Field|Collection shipping_name
      * @property Show\Field|Collection store_ids
@@ -2830,6 +2884,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection dada_status
      * @property Show\Field|Collection print_num
      * @property Show\Field|Collection global_order_id
+     * @property Show\Field|Collection plat
      * @property Show\Field|Collection mchid
      * @property Show\Field|Collection wxkey
      * @property Show\Field|Collection apiclient_cert
@@ -2899,9 +2954,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection store_mchid
      * @property Show\Field|Collection cash_code
      * @property Show\Field|Collection store_wallet
-     * @property Show\Field|Collection mm_user_id
      * @property Show\Field|Collection add_time
-     * @property Show\Field|Collection category
      * @property Show\Field|Collection xyh_open
      * @property Show\Field|Collection is_jd
      * @property Show\Field|Collection is_jfpay
@@ -2961,7 +3014,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection tz_src
      * @property Show\Field|Collection full_delivery
      * @property Show\Field|Collection is_poundage
-     * @property Show\Field|Collection type_name
      * @property Show\Field|Collection appsecret
      * @property Show\Field|Collection url_name
      * @property Show\Field|Collection url_logo
@@ -3034,7 +3086,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection is_open_dada_fee
      * @property Show\Field|Collection menu_name
      * @property Show\Field|Collection info
-     * @property Show\Field|Collection desc
      * @property Show\Field|Collection tag
      * @property Show\Field|Collection fw_cost
      * @property Show\Field|Collection zd_cost
@@ -3103,6 +3154,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection minute
      * @property Show\Field|Collection extra
      * @property Show\Field|Collection tid
+     * @property Show\Field|Collection payload
      * @property Show\Field|Collection handled
      * @property Show\Field|Collection total
      * @property Show\Field|Collection append_title
@@ -3496,8 +3548,19 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection money_type
      * @property Show\Field|Collection source_type
      * @property Show\Field|Collection comment
+     * @property Show\Field|Collection original_price
+     * @property Show\Field|Collection vip_price
+     * @property Show\Field|Collection on_sale
+     * @property Show\Field|Collection tags
+     * @property Show\Field|Collection details_imgs
      * @property Show\Field|Collection is_del
      * @property Show\Field|Collection is_operated
+     * @property Show\Field|Collection distribution_money
+     * @property Show\Field|Collection refuse_note
+     * @property Show\Field|Collection shipping_type
+     * @property Show\Field|Collection coupon_money
+     * @property Show\Field|Collection delivery_money
+     * @property Show\Field|Collection delivery_status
      * @property Show\Field|Collection c_attitude
      * @property Show\Field|Collection c_service
      * @property Show\Field|Collection c_quality
@@ -3509,10 +3572,19 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection set_reward
      * @property Show\Field|Collection device_name
      * @property Show\Field|Collection bind_time
+     * @property Show\Field|Collection business_license
+     * @property Show\Field|Collection store_type_id
+     * @property Show\Field|Collection expire_time
+     * @property Show\Field|Collection pay_status
+     * @property Show\Field|Collection apply_time
+     * @property Show\Field|Collection store_applet_img
+     * @property Show\Field|Collection cash_code_img
+     * @property Show\Field|Collection goods_type_id
+     * @property Show\Field|Collection nick_name
+     * @property Show\Field|Collection real_name
      * @property Show\Field|Collection balance
      * @property Show\Field|Collection bind_type
      * @property Show\Field|Collection json_data
-     * @property Show\Field|Collection email_verified_at
      *
      * @method Show\Field|Collection id(string $label = null)
      * @method Show\Field|Collection username(string $label = null)
@@ -3537,16 +3609,17 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection require(string $label = null)
      * @method Show\Field|Collection require_dev(string $label = null)
      * @method Show\Field|Collection phone(string $label = null)
+     * @method Show\Field|Collection status(string $label = null)
+     * @method Show\Field|Collection address(string $label = null)
+     * @method Show\Field|Collection admin_user_id(string $label = null)
      * @method Show\Field|Collection id_frond(string $label = null)
      * @method Show\Field|Collection id_back(string $label = null)
      * @method Show\Field|Collection id_number(string $label = null)
      * @method Show\Field|Collection bank_name(string $label = null)
      * @method Show\Field|Collection bank_card(string $label = null)
      * @method Show\Field|Collection bank_addr(string $label = null)
-     * @method Show\Field|Collection status(string $label = null)
      * @method Show\Field|Collection market_id(string $label = null)
      * @method Show\Field|Collection logo(string $label = null)
-     * @method Show\Field|Collection address(string $label = null)
      * @method Show\Field|Collection introduce(string $label = null)
      * @method Show\Field|Collection imgs(string $label = null)
      * @method Show\Field|Collection addtime(string $label = null)
@@ -3570,16 +3643,28 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection mp_id(string $label = null)
      * @method Show\Field|Collection is_pay(string $label = null)
      * @method Show\Field|Collection mm_id(string $label = null)
-     * @method Show\Field|Collection admin_user_id(string $label = null)
      * @method Show\Field|Collection cs_id(string $label = null)
+     * @method Show\Field|Collection type(string $label = null)
+     * @method Show\Field|Collection user_id(string $label = null)
+     * @method Show\Field|Collection desc(string $label = null)
      * @method Show\Field|Collection activity(string $label = null)
      * @method Show\Field|Collection forward(string $label = null)
      * @method Show\Field|Collection repay(string $label = null)
+     * @method Show\Field|Collection category(string $label = null)
+     * @method Show\Field|Collection value(string $label = null)
+     * @method Show\Field|Collection store_id(string $label = null)
+     * @method Show\Field|Collection store_name(string $label = null)
+     * @method Show\Field|Collection new_user_total(string $label = null)
+     * @method Show\Field|Collection mm_user_id(string $label = null)
+     * @method Show\Field|Collection cover_img(string $label = null)
+     * @method Show\Field|Collection type_name(string $label = null)
+     * @method Show\Field|Collection cover_img_url(string $label = null)
+     * @method Show\Field|Collection created_at_text(string $label = null)
+     * @method Show\Field|Collection updated_at_text(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 user_id(string $label = null)
      * @method Show\Field|Collection permission_id(string $label = null)
      * @method Show\Field|Collection menu_id(string $label = null)
      * @method Show\Field|Collection http_method(string $label = null)
@@ -3625,7 +3710,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection rules(string $label = null)
      * @method Show\Field|Collection uid(string $label = null)
      * @method Show\Field|Collection group_id(string $label = null)
-     * @method Show\Field|Collection type(string $label = null)
      * @method Show\Field|Collection condition(string $label = null)
      * @method Show\Field|Collection ismenu(string $label = null)
      * @method Show\Field|Collection weigh(string $label = null)
@@ -3638,7 +3722,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection executetime(string $label = null)
      * @method Show\Field|Collection group(string $label = null)
      * @method Show\Field|Collection tip(string $label = null)
-     * @method Show\Field|Collection value(string $label = null)
      * @method Show\Field|Collection rule(string $label = null)
      * @method Show\Field|Collection extend(string $label = null)
      * @method Show\Field|Collection event(string $label = null)
@@ -3681,11 +3764,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection packagesize(string $label = null)
      * @method Show\Field|Collection downloadurl(string $label = null)
      * @method Show\Field|Collection enforce(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 acid(string $label = null)
      * @method Show\Field|Collection uniacid(string $label = null)
      * @method Show\Field|Collection hash(string $label = null)
@@ -3759,7 +3837,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection item(string $label = null)
      * @method Show\Field|Collection area_name(string $label = null)
      * @method Show\Field|Collection num(string $label = null)
-     * @method Show\Field|Collection store_id(string $label = null)
      * @method Show\Field|Collection stars(string $label = null)
      * @method Show\Field|Collection time(string $label = null)
      * @method Show\Field|Collection order_id(string $label = null)
@@ -3985,6 +4062,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection combination_id(string $label = null)
      * @method Show\Field|Collection order_status(string $label = null)
      * @method Show\Field|Collection update_time(string $label = null)
+     * @method Show\Field|Collection refund_time(string $label = null)
      * @method Show\Field|Collection order_shipping_code(string $label = null)
      * @method Show\Field|Collection shipping_name(string $label = null)
      * @method Show\Field|Collection store_ids(string $label = null)
@@ -3996,6 +4074,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection dada_status(string $label = null)
      * @method Show\Field|Collection print_num(string $label = null)
      * @method Show\Field|Collection global_order_id(string $label = null)
+     * @method Show\Field|Collection plat(string $label = null)
      * @method Show\Field|Collection mchid(string $label = null)
      * @method Show\Field|Collection wxkey(string $label = null)
      * @method Show\Field|Collection apiclient_cert(string $label = null)
@@ -4065,9 +4144,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection store_mchid(string $label = null)
      * @method Show\Field|Collection cash_code(string $label = null)
      * @method Show\Field|Collection store_wallet(string $label = null)
-     * @method Show\Field|Collection mm_user_id(string $label = null)
      * @method Show\Field|Collection add_time(string $label = null)
-     * @method Show\Field|Collection category(string $label = null)
      * @method Show\Field|Collection xyh_open(string $label = null)
      * @method Show\Field|Collection is_jd(string $label = null)
      * @method Show\Field|Collection is_jfpay(string $label = null)
@@ -4127,7 +4204,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection tz_src(string $label = null)
      * @method Show\Field|Collection full_delivery(string $label = null)
      * @method Show\Field|Collection is_poundage(string $label = null)
-     * @method Show\Field|Collection type_name(string $label = null)
      * @method Show\Field|Collection appsecret(string $label = null)
      * @method Show\Field|Collection url_name(string $label = null)
      * @method Show\Field|Collection url_logo(string $label = null)
@@ -4200,7 +4276,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection is_open_dada_fee(string $label = null)
      * @method Show\Field|Collection menu_name(string $label = null)
      * @method Show\Field|Collection info(string $label = null)
-     * @method Show\Field|Collection desc(string $label = null)
      * @method Show\Field|Collection tag(string $label = null)
      * @method Show\Field|Collection fw_cost(string $label = null)
      * @method Show\Field|Collection zd_cost(string $label = null)
@@ -4269,6 +4344,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection minute(string $label = null)
      * @method Show\Field|Collection extra(string $label = null)
      * @method Show\Field|Collection tid(string $label = null)
+     * @method Show\Field|Collection payload(string $label = null)
      * @method Show\Field|Collection handled(string $label = null)
      * @method Show\Field|Collection total(string $label = null)
      * @method Show\Field|Collection append_title(string $label = null)
@@ -4662,8 +4738,19 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection money_type(string $label = null)
      * @method Show\Field|Collection source_type(string $label = null)
      * @method Show\Field|Collection comment(string $label = null)
+     * @method Show\Field|Collection original_price(string $label = null)
+     * @method Show\Field|Collection vip_price(string $label = null)
+     * @method Show\Field|Collection on_sale(string $label = null)
+     * @method Show\Field|Collection tags(string $label = null)
+     * @method Show\Field|Collection details_imgs(string $label = null)
      * @method Show\Field|Collection is_del(string $label = null)
      * @method Show\Field|Collection is_operated(string $label = null)
+     * @method Show\Field|Collection distribution_money(string $label = null)
+     * @method Show\Field|Collection refuse_note(string $label = null)
+     * @method Show\Field|Collection shipping_type(string $label = null)
+     * @method Show\Field|Collection coupon_money(string $label = null)
+     * @method Show\Field|Collection delivery_money(string $label = null)
+     * @method Show\Field|Collection delivery_status(string $label = null)
      * @method Show\Field|Collection c_attitude(string $label = null)
      * @method Show\Field|Collection c_service(string $label = null)
      * @method Show\Field|Collection c_quality(string $label = null)
@@ -4675,10 +4762,19 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection set_reward(string $label = null)
      * @method Show\Field|Collection device_name(string $label = null)
      * @method Show\Field|Collection bind_time(string $label = null)
+     * @method Show\Field|Collection business_license(string $label = null)
+     * @method Show\Field|Collection store_type_id(string $label = null)
+     * @method Show\Field|Collection expire_time(string $label = null)
+     * @method Show\Field|Collection pay_status(string $label = null)
+     * @method Show\Field|Collection apply_time(string $label = null)
+     * @method Show\Field|Collection store_applet_img(string $label = null)
+     * @method Show\Field|Collection cash_code_img(string $label = null)
+     * @method Show\Field|Collection goods_type_id(string $label = null)
+     * @method Show\Field|Collection nick_name(string $label = null)
+     * @method Show\Field|Collection real_name(string $label = null)
      * @method Show\Field|Collection balance(string $label = null)
      * @method Show\Field|Collection bind_type(string $label = null)
      * @method Show\Field|Collection json_data(string $label = null)
-     * @method Show\Field|Collection email_verified_at(string $label = null)
      */
     class Show {}
 

resources/lang/zh-CN/global.php

@@ -21,6 +21,9 @@ return [
         'roles'                 => '角色',
         'path'                  => '路径',
         'input'                 => '输入',
+
+        'created_at_text' => '创建时间',
+        'updated_at_text' => '修改时间',
     ],
     'labels' => [
         'list'     => '列表',

resources/lang/zh-CN/goods-type.php

@@ -0,0 +1,15 @@
+<?php
+return [
+    'labels' => [
+        'GoodsType' => '二级分类（商品）',
+        'goodsType' => '二级分类（商品）',
+    ],
+    'fields' => [
+        'type_name' => '分类名称',
+        'cover_img' => '封面图',
+        'cover_img_url' => '封面图',
+        'sort' => '排序',
+    ],
+    'options' => [
+    ],
+];

resources/lang/zh-CN/store-type.php

@@ -0,0 +1,15 @@
+<?php
+return [
+    'labels' => [
+        'StoreType' => '一级分类（店铺）',
+        'storeType' => '一级分类（店铺）',
+    ],
+    'fields' => [
+        'type_name' => '分类名称',
+        'cover_img' => '封面图',
+        'cover_img_url' => '封面图',
+        'sort' => '排序'
+    ],
+    'options' => [
+    ],
+];