diff --git a/app/Admin/Controllers/v3/StoreController.php b/app/Admin/Controllers/v3/StoreController.php index 3f16d3f..a3079f8 100644 --- a/app/Admin/Controllers/v3/StoreController.php +++ b/app/Admin/Controllers/v3/StoreController.php @@ -84,7 +84,7 @@ class StoreController extends AdminController return $img; }); - // ->image('',50); + $grid->cash_code_img->display(function($appletImg){ $id = $this->id; $oldPath = 'https://img.lanzu.vip/addons/zh_cjdianc/data/code_pay_img/wx_pay_'.$id.'.jpg'.config('filesystems.disks.oss.store_image_resize'); @@ -93,9 +93,8 @@ class StoreController extends AdminController return $img; }); - // ->image('',50); - $grid->is_rest->switch(); + $grid->is_operation->switch(); $grid->is_open->switch(); $grid->actions([new StoreSetTime()]); @@ -221,8 +220,10 @@ class StoreController extends AdminController $form->column(6, function (Form $form) use($marketList,$categoryList){ $form->hidden('id'); - $form->number('mm_user_id')->help('市场经理的懒ID'); + $form->text('mm_user_id')->type('number')->default(0)->attribute('min', 0)->placeholder('市场经理懒ID')->width(4)->help('市场经理的懒ID'); + $form->select('market_id')->required()->options($marketList)->help('谨慎选择所属市场,添加成功后不能修改所属市场,因为会影响商品所属市场!'); + $form->select('category_id')->options($categoryList); $form->text('name')->required()->maxLength(50); if($form->isCreating()){ @@ -234,13 +235,14 @@ class StoreController extends AdminController $form->text('link_name')->required(); $form->mobile('link_tel')->required(); $form->number('sort'); - $form->switch('is_rest') + $form->switch('is_operation') ->customFormat(function ($v) { return $v == 1 ? 1 : 0; }) ->saving(function ($v) { return $v == 1 ? 1 : 0; }); + $form->hidden('is_rest'); $form->switch('is_open') ->customFormat(function ($v) { return $v == 1 ? 1 : 0; @@ -260,10 +262,10 @@ class StoreController extends AdminController $form->image('zm_img')->autoUpload()->required(); $form->image('fm_img')->autoUpload()->required(); } - // $form->select('admin_id')->options($userList)->required(); - // $form->select('user_id')->options($userList)->required(); - $form->number('admin_id')->required()->default(0)->min(0); - $form->number('user_id')->required()->default(0)->min(0); + $form->text('admin_id')->type('number')->required()->default(0)->attribute('min', 0)->placeholder('管理员懒ID')->width(4); + $form->text('user_id')->type('number')->required()->default(0)->attribute('min', 0)->placeholder('提现用户懒ID')->width(4); + // $form->number('admin_id')->default(0)->required()->min(0)->placeholder('管理员懒ID'); + // $form->number('user_id')->default(0)->required()->min(0)->placeholder('提现用户懒ID'); $form->time('time1','时间段一开始')->required()->format('HH:mm'); $form->time('time2','时间段一结束')->required()->format('HH:mm')->rules('after:time1',['after'=>'选择的时间必须比时间段一开始时间晚']); $form->time('time3','时间段二开始')->format('HH:mm'); @@ -285,12 +287,17 @@ class StoreController extends AdminController $id = $form->getKey(); $adminId = $form->input('admin_id'); $marketId = $form->input('market_id'); + $isOperation = $form->input('is_operation'); $time1 = $form->input('time1'); $time2 = $form->input('time2'); $time3 = $form->input('time3'); $time4 = $form->input('time4'); + if($isOperation !== null){ + $form->is_rest = $isOperation == 1 ? 0 : 1; + } + if(!empty($time1) && !empty($time2) && (!empty($time3) || !empty($time4))){ if($time3 && empty($time4)){ return $form->error('请选择时间段二的结束时间!'); @@ -321,6 +328,7 @@ class StoreController extends AdminController return $form->error('管理员已经绑定了店铺'); } } + $form->deleteInput('is_operation'); }); $form->saved(function (Form $form){ $id = $form->getKey(); diff --git a/app/Models/v3/Store.php b/app/Models/v3/Store.php index 96ea359..ec7dfb9 100644 --- a/app/Models/v3/Store.php +++ b/app/Models/v3/Store.php @@ -25,9 +25,14 @@ class Store extends Model protected $appends = [ 'logo_url', 'is_rest_text', - 'is_open_text' + 'is_open_text', + 'is_operation' ]; - + public function getIsOperationAttribute($value) + { + $value = $value ? $value : $this->is_rest; + return $value == 1 ? 0 : 1; + } public function getLogoUrlAttribute($value) { $value = $value ? $value : $this->logo; diff --git a/resources/lang/zh-CN/store.php b/resources/lang/zh-CN/store.php index c6190d2..20c3b53 100644 --- a/resources/lang/zh-CN/store.php +++ b/resources/lang/zh-CN/store.php @@ -15,8 +15,9 @@ return [ 'time4' => '营业时间', 'tel' => '电话(座机)', 'announcement' => '公告', - 'is_rest' => '是否休息', - 'is_rest_text' => '是否休息', + 'is_rest' => '休息/营业', + 'is_rest_text' => '休息/营业', + 'is_operation' => '休息/营业', 'logo' => 'logo', 'logo_url' => 'logo', 'introduction' => '商家简介',