Merge branch 'develop' of ssh://120.24.33.109:11022/hyzjshwo/mp_lanzu_cat into develop

app/Admin/Controllers/ImsCjdcStoreController.php

@@ -0,0 +1,88 @@
+<?php
+
+namespace App\Admin\Controllers;
+
+use App\Admin\Repositories\ImsCjdcStore;
+use App\Models\ImsCjdcUser;
+use \App\Models\ImsCjdcStore as modelStore;
+use App\Models\LanzuMmInfo;
+use Dcat\Admin\Admin;
+use Dcat\Admin\Form;
+use Dcat\Admin\Grid;
+use Dcat\Admin\Show;
+
+use Dcat\Admin\Controllers\AdminController;
+
+class ImsCjdcStoreController extends AdminController
+{
+    /**
+     * Make a grid builder.
+     *
+     * @return Grid
+     */
+    protected function grid()
+    {
+        $user = Admin::user();
+        $builder = new ImsCjdcStore('market');
+        if ($user->isRole('lanzu_mm')){
+            //如果登陆角色为市场经理,获取市场经理id
+            $mm = LanzuMmInfo::where(['admin_user_id'=>$user->id])->first();
+            $builder = modelStore::where(['mm_user_id'=>$mm->id]);
+        }
+        return Grid::make($builder, function (Grid $grid) {
+            $grid->id->sortable();
+            $grid->name;
+            $grid->column('market.name','所属市场');
+            $grid->tel;
+            $grid->is_rest('是否休息')->using([1=>'是',2=>'否']);
+            $grid->award_money;
+            $grid->disableEditButton();
+            $grid->disableDeleteButton();
+            $grid->disableCreateButton();
+            $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 ImsCjdcStore(), function (Show $show) {
+            $show->id;
+            $show->name;
+            $show->tel;
+            $show->is_rest;
+            $show->img;
+            $show->start_at;
+            $show->freight;
+            $show->award_money;
+        });
+    }
+
+    /**
+     * Make a form builder.
+     *
+     * @return Form
+     */
+    protected function form()
+    {
+        return Form::make(new ImsCjdcStore(), function (Form $form) {
+            $form->display('id');
+            $form->text('name');
+            $form->text('tel');
+            $form->text('is_rest');
+            $form->text('img');
+            $form->text('start_at');
+            $form->text('freight');
+            $form->text('award_money');
+        });
+    }
+}

app/Admin/Controllers/LanzuMmWithdrawController.php

@@ -48,7 +48,6 @@ class LanzuMmWithdrawController extends AdminController
         }
 
         return Grid::make($buider, function (Grid $grid) use ($mp_info, $mm_id) {
-
             $grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) {
                 if ($actions->row->status != 0) {
                     $actions->disableEdit();
@@ -68,7 +67,7 @@ class LanzuMmWithdrawController extends AdminController
             $grid->money;
             $grid->status('提现状态')->using([-1 => '拒绝', 0 => '审核中', 1 => '通过'])
                 ->label([-1 => 'danger', 0 => 'default', 1 => 'success']);
-            $grid->is_pay('是否到账')->using([0=>'否',1=>'是']);
+            $grid->is_pay('是否到账')->using([0 => '否', 1 => '是']);
             $grid->created_at('提现时间')->display(function ($time) {
                 return date('Y-m-d H:i', $time);
             });
@@ -120,7 +119,7 @@ class LanzuMmWithdrawController extends AdminController
                 $form->display('提现人')->value(LanzuMmInfo::find($mmId)->name);
             } else {//非市场经理登陆时
                 $mmInfo = LanzuMmInfo::find($form->model()->mm_id);
-                if ($mmInfo){
+                if ($mmInfo) {
                     $form->display('提现人')->value($mmInfo->name);
                 }
             }
@@ -156,7 +155,7 @@ class LanzuMmWithdrawController extends AdminController
                             $mmw         = MmWithdraw::find($form->model()->id);
                             $mmw->is_pay = 1;
                             $mmw->save();
-                        }else{
+                        } else {
                             //记录失败日志
                             $res['data'] = $data;
                             Log::error('提现失败.', $res);
@@ -165,11 +164,11 @@ class LanzuMmWithdrawController extends AdminController
                 });
             } else {
                 //表单提交前对金额数值进行验证
-                $form->saving(function (Form $form){
-                    if ($form->money<env('MIN_MONEY')){
-                        return $form->error('提现金额不得小于 '.env('MIN_MONEY').' 元');
-                    }elseif ($form->money>env('MAX_MONEY')){
-                        return $form->error('提现金额不得大于 '.env('MAX_MONEY').' 元');
+                $form->saving(function (Form $form) {
+                    if ($form->money < env('MIN_MONEY')) {
+                        return $form->error('提现金额不得小于 ' . env('MIN_MONEY') . ' 元');
+                    } elseif ($form->money > env('MAX_MONEY')) {
+                        return $form->error('提现金额不得大于 ' . env('MAX_MONEY') . ' 元');
                     }
                 });
 

app/Admin/Controllers/LanzuMpWithdrawController.php

@@ -38,7 +38,6 @@ class LanzuMpWithdrawController extends AdminController
             $grid->created_at;
             $grid->filter(function (Grid\Filter $filter) {
                 $filter->equal('id');
-
             });
 
             $grid->actions(function (Grid\Displayers\Actions $actions) {
@@ -102,9 +101,7 @@ class LanzuMpWithdrawController extends AdminController
                 $tools->disableList();
             });
 
-           // dd($form->model()->mp_info['name']);
             $mpName = $form->model()->mp_info['name'];
-            //dd( $mpName);
             $form->display('id');
             $form->text('mp_id','服务商ID')->disable();
             $form->display('','服务商名')->value($mpName);

app/Admin/Repositories/ImsCjdcStore.php

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

app/Admin/routes.php

@@ -18,6 +18,7 @@ Route::group([
     $router->any('/mp_test', 'LanzuMpInfoController@test');
     $router->resource('/mm', 'LanzuMmInfoController');
     $router->resource('/market', 'ImsCjdcMarketController');
+    $router->resource('/store', 'ImsCjdcStoreController');
     $router->resource('/mp_withdraw', 'LanzuMpWithdrawController');
     $router->resource('/mm_withdraw', 'LanzuMmWithdrawController');
     $router->any('/mm_list', 'LanzuMmWithdrawController@mmInfoList');

app/Models/ImsCjdcMarket.php

@@ -28,4 +28,6 @@ class ImsCjdcMarket extends Model
     public function mp(){
         return $this->hasOne('\App\Models\LanzuMpInfo','id','mp_id');
     }
+
+
 }

app/Models/ImsCjdcStore.php

@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Models;
+
+use Dcat\Admin\Traits\HasDateTimeFormatter;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ImsCjdcStore extends Model
+{
+	use HasDateTimeFormatter;
+    protected $table = 'ims_cjdc_store';
+    public $timestamps = false;
+    public function market(){
+        return $this->hasOne('\App\Models\ImsCjdcMarket','id','market_id');
+    }
+}

dcat_admin_ide_helper.php

@@ -33,15 +33,13 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection config
      * @property Grid\Column|Collection require
      * @property Grid\Column|Collection require_dev
-     * @property Grid\Column|Collection device_name
-     * @property Grid\Column|Collection store_id
      * @property Grid\Column|Collection phone
-     * @property Grid\Column|Collection bank_name
-     * @property Grid\Column|Collection bank_card
-     * @property Grid\Column|Collection bank_addr
      * @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 admin_user_id
      * @property Grid\Column|Collection status
      * @property Grid\Column|Collection market_id
@@ -63,6 +61,13 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection loudspeaker_imei
      * @property Grid\Column|Collection dishes_menu_intro
      * @property Grid\Column|Collection create_time
+     * @property Grid\Column|Collection money
+     * @property Grid\Column|Collection mp_id
+     * @property Grid\Column|Collection is_pay
+     * @property Grid\Column|Collection mm_id
+     * @property Grid\Column|Collection activity
+     * @property Grid\Column|Collection forward
+     * @property Grid\Column|Collection repay
      * @property Grid\Column|Collection parent_id
      * @property Grid\Column|Collection order
      * @property Grid\Column|Collection icon
@@ -153,7 +158,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection gender
      * @property Grid\Column|Collection birthday
      * @property Grid\Column|Collection bio
-     * @property Grid\Column|Collection money
      * @property Grid\Column|Collection score
      * @property Grid\Column|Collection successions
      * @property Grid\Column|Collection maxsuccessions
@@ -248,6 +252,7 @@ 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 img
      * @property Grid\Column|Collection stars
      * @property Grid\Column|Collection time
@@ -386,7 +391,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection waimai_pay_temp
      * @property Grid\Column|Collection dangmian_pay_temp
      * @property Grid\Column|Collection ziti_pay_temp
-     * @property Grid\Column|Collection mp_id
      * @property Grid\Column|Collection deleted_at
      * @property Grid\Column|Collection sender
      * @property Grid\Column|Collection is_email
@@ -557,6 +561,7 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection cash_code
      * @property Grid\Column|Collection store_wallet
      * @property Grid\Column|Collection award_money
+     * @property Grid\Column|Collection mm_user_id
      * @property Grid\Column|Collection add_time
      * @property Grid\Column|Collection category
      * @property Grid\Column|Collection xyh_open
@@ -682,7 +687,6 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection is_zb
      * @property Grid\Column|Collection isyykg
      * @property Grid\Column|Collection zb_img
-     * @property Grid\Column|Collection is_pay
      * @property Grid\Column|Collection pay_money
      * @property Grid\Column|Collection is_vip_delivery
      * @property Grid\Column|Collection is_tel
@@ -1153,6 +1157,8 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection money_type
      * @property Grid\Column|Collection source_type
      * @property Grid\Column|Collection comment
+     * @property Grid\Column|Collection balance
+     * @property Grid\Column|Collection is_operated
      * @property Grid\Column|Collection c_attitude
      * @property Grid\Column|Collection c_service
      * @property Grid\Column|Collection c_quality
@@ -1161,7 +1167,10 @@ namespace Dcat\Admin {
      * @property Grid\Column|Collection user_created_at
      * @property Grid\Column|Collection qr_url
      * @property Grid\Column|Collection head_url
+     * @property Grid\Column|Collection device_name
      * @property Grid\Column|Collection bind_time
+     * @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)
@@ -1186,15 +1195,13 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection config(string $label = null)
      * @method Grid\Column|Collection require(string $label = null)
      * @method Grid\Column|Collection require_dev(string $label = null)
-     * @method Grid\Column|Collection device_name(string $label = null)
-     * @method Grid\Column|Collection store_id(string $label = null)
      * @method Grid\Column|Collection phone(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 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 admin_user_id(string $label = null)
      * @method Grid\Column|Collection status(string $label = null)
      * @method Grid\Column|Collection market_id(string $label = null)
@@ -1216,6 +1223,13 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection loudspeaker_imei(string $label = null)
      * @method Grid\Column|Collection dishes_menu_intro(string $label = null)
      * @method Grid\Column|Collection create_time(string $label = null)
+     * @method Grid\Column|Collection money(string $label = null)
+     * @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 activity(string $label = null)
+     * @method Grid\Column|Collection forward(string $label = null)
+     * @method Grid\Column|Collection repay(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)
@@ -1306,7 +1320,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection gender(string $label = null)
      * @method Grid\Column|Collection birthday(string $label = null)
      * @method Grid\Column|Collection bio(string $label = null)
-     * @method Grid\Column|Collection money(string $label = null)
      * @method Grid\Column|Collection score(string $label = null)
      * @method Grid\Column|Collection successions(string $label = null)
      * @method Grid\Column|Collection maxsuccessions(string $label = null)
@@ -1401,6 +1414,7 @@ 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 img(string $label = null)
      * @method Grid\Column|Collection stars(string $label = null)
      * @method Grid\Column|Collection time(string $label = null)
@@ -1539,7 +1553,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection waimai_pay_temp(string $label = null)
      * @method Grid\Column|Collection dangmian_pay_temp(string $label = null)
      * @method Grid\Column|Collection ziti_pay_temp(string $label = null)
-     * @method Grid\Column|Collection mp_id(string $label = null)
      * @method Grid\Column|Collection deleted_at(string $label = null)
      * @method Grid\Column|Collection sender(string $label = null)
      * @method Grid\Column|Collection is_email(string $label = null)
@@ -1710,6 +1723,7 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection cash_code(string $label = null)
      * @method Grid\Column|Collection store_wallet(string $label = null)
      * @method Grid\Column|Collection award_money(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)
@@ -1835,7 +1849,6 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection is_zb(string $label = null)
      * @method Grid\Column|Collection isyykg(string $label = null)
      * @method Grid\Column|Collection zb_img(string $label = null)
-     * @method Grid\Column|Collection is_pay(string $label = null)
      * @method Grid\Column|Collection pay_money(string $label = null)
      * @method Grid\Column|Collection is_vip_delivery(string $label = null)
      * @method Grid\Column|Collection is_tel(string $label = null)
@@ -2306,6 +2319,8 @@ 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 balance(string $label = null)
+     * @method Grid\Column|Collection is_operated(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)
@@ -2314,7 +2329,10 @@ namespace Dcat\Admin {
      * @method Grid\Column|Collection user_created_at(string $label = null)
      * @method Grid\Column|Collection qr_url(string $label = null)
      * @method Grid\Column|Collection head_url(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 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 {}
@@ -2344,15 +2362,13 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection config
      * @property Show\Field|Collection require
      * @property Show\Field|Collection require_dev
-     * @property Show\Field|Collection device_name
-     * @property Show\Field|Collection store_id
      * @property Show\Field|Collection phone
-     * @property Show\Field|Collection bank_name
-     * @property Show\Field|Collection bank_card
-     * @property Show\Field|Collection bank_addr
      * @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 admin_user_id
      * @property Show\Field|Collection status
      * @property Show\Field|Collection market_id
@@ -2374,6 +2390,13 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection loudspeaker_imei
      * @property Show\Field|Collection dishes_menu_intro
      * @property Show\Field|Collection create_time
+     * @property Show\Field|Collection money
+     * @property Show\Field|Collection mp_id
+     * @property Show\Field|Collection is_pay
+     * @property Show\Field|Collection mm_id
+     * @property Show\Field|Collection activity
+     * @property Show\Field|Collection forward
+     * @property Show\Field|Collection repay
      * @property Show\Field|Collection parent_id
      * @property Show\Field|Collection order
      * @property Show\Field|Collection icon
@@ -2464,7 +2487,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection gender
      * @property Show\Field|Collection birthday
      * @property Show\Field|Collection bio
-     * @property Show\Field|Collection money
      * @property Show\Field|Collection score
      * @property Show\Field|Collection successions
      * @property Show\Field|Collection maxsuccessions
@@ -2559,6 +2581,7 @@ 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 img
      * @property Show\Field|Collection stars
      * @property Show\Field|Collection time
@@ -2697,7 +2720,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection waimai_pay_temp
      * @property Show\Field|Collection dangmian_pay_temp
      * @property Show\Field|Collection ziti_pay_temp
-     * @property Show\Field|Collection mp_id
      * @property Show\Field|Collection deleted_at
      * @property Show\Field|Collection sender
      * @property Show\Field|Collection is_email
@@ -2868,6 +2890,7 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection cash_code
      * @property Show\Field|Collection store_wallet
      * @property Show\Field|Collection award_money
+     * @property Show\Field|Collection mm_user_id
      * @property Show\Field|Collection add_time
      * @property Show\Field|Collection category
      * @property Show\Field|Collection xyh_open
@@ -2993,7 +3016,6 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection is_zb
      * @property Show\Field|Collection isyykg
      * @property Show\Field|Collection zb_img
-     * @property Show\Field|Collection is_pay
      * @property Show\Field|Collection pay_money
      * @property Show\Field|Collection is_vip_delivery
      * @property Show\Field|Collection is_tel
@@ -3464,6 +3486,8 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection money_type
      * @property Show\Field|Collection source_type
      * @property Show\Field|Collection comment
+     * @property Show\Field|Collection balance
+     * @property Show\Field|Collection is_operated
      * @property Show\Field|Collection c_attitude
      * @property Show\Field|Collection c_service
      * @property Show\Field|Collection c_quality
@@ -3472,7 +3496,10 @@ namespace Dcat\Admin {
      * @property Show\Field|Collection user_created_at
      * @property Show\Field|Collection qr_url
      * @property Show\Field|Collection head_url
+     * @property Show\Field|Collection device_name
      * @property Show\Field|Collection bind_time
+     * @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)
@@ -3497,15 +3524,13 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection config(string $label = null)
      * @method Show\Field|Collection require(string $label = null)
      * @method Show\Field|Collection require_dev(string $label = null)
-     * @method Show\Field|Collection device_name(string $label = null)
-     * @method Show\Field|Collection store_id(string $label = null)
      * @method Show\Field|Collection phone(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 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 admin_user_id(string $label = null)
      * @method Show\Field|Collection status(string $label = null)
      * @method Show\Field|Collection market_id(string $label = null)
@@ -3527,6 +3552,13 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection loudspeaker_imei(string $label = null)
      * @method Show\Field|Collection dishes_menu_intro(string $label = null)
      * @method Show\Field|Collection create_time(string $label = null)
+     * @method Show\Field|Collection money(string $label = null)
+     * @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 activity(string $label = null)
+     * @method Show\Field|Collection forward(string $label = null)
+     * @method Show\Field|Collection repay(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)
@@ -3617,7 +3649,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection gender(string $label = null)
      * @method Show\Field|Collection birthday(string $label = null)
      * @method Show\Field|Collection bio(string $label = null)
-     * @method Show\Field|Collection money(string $label = null)
      * @method Show\Field|Collection score(string $label = null)
      * @method Show\Field|Collection successions(string $label = null)
      * @method Show\Field|Collection maxsuccessions(string $label = null)
@@ -3712,6 +3743,7 @@ 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 img(string $label = null)
      * @method Show\Field|Collection stars(string $label = null)
      * @method Show\Field|Collection time(string $label = null)
@@ -3850,7 +3882,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection waimai_pay_temp(string $label = null)
      * @method Show\Field|Collection dangmian_pay_temp(string $label = null)
      * @method Show\Field|Collection ziti_pay_temp(string $label = null)
-     * @method Show\Field|Collection mp_id(string $label = null)
      * @method Show\Field|Collection deleted_at(string $label = null)
      * @method Show\Field|Collection sender(string $label = null)
      * @method Show\Field|Collection is_email(string $label = null)
@@ -4021,6 +4052,7 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection cash_code(string $label = null)
      * @method Show\Field|Collection store_wallet(string $label = null)
      * @method Show\Field|Collection award_money(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)
@@ -4146,7 +4178,6 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection is_zb(string $label = null)
      * @method Show\Field|Collection isyykg(string $label = null)
      * @method Show\Field|Collection zb_img(string $label = null)
-     * @method Show\Field|Collection is_pay(string $label = null)
      * @method Show\Field|Collection pay_money(string $label = null)
      * @method Show\Field|Collection is_vip_delivery(string $label = null)
      * @method Show\Field|Collection is_tel(string $label = null)
@@ -4617,6 +4648,8 @@ 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 balance(string $label = null)
+     * @method Show\Field|Collection is_operated(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)
@@ -4625,7 +4658,10 @@ namespace Dcat\Admin {
      * @method Show\Field|Collection user_created_at(string $label = null)
      * @method Show\Field|Collection qr_url(string $label = null)
      * @method Show\Field|Collection head_url(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 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/ims-cjdc-store.php

@@ -0,0 +1,17 @@
+<?php 
+return [
+    'labels' => [
+        'ImsCjdcStore' => 'ImsCjdcStore',
+    ],
+    'fields' => [
+        'name' => '商家名称',
+        'tel' => '电话',
+        'is_rest' => '是否休息(1 是  2否)',
+        'img' => '商家图片',
+        'start_at' => '起送价',
+        'freight' => '配送费',
+        'award_money' => '奖励总额',
+    ],
+    'options' => [
+    ],
+];