diff --git a/app/Admin/Controllers/v3/ServicePersonnelController.php b/app/Admin/Controllers/v3/ServicePersonnelController.php index 7b0683e..bb23ae7 100644 --- a/app/Admin/Controllers/v3/ServicePersonnelController.php +++ b/app/Admin/Controllers/v3/ServicePersonnelController.php @@ -47,7 +47,7 @@ class ServicePersonnelController extends AdminController }); // 每页10条 $grid->paginate(10); - $grid->disableDeleteButton(); + // $grid->disableDeleteButton(); }); } @@ -116,7 +116,7 @@ class ServicePersonnelController extends AdminController $form->hidden('id'); $form->text('name')->required(); $form->text('tel')->required(); - $form->image('head_url')->required(); + $form->image('head_url'); }); $form->column(6,function(Form $form) use($marketList,$userList){ $form->select('type')->options(ServicePersonnelModel::$_TYPE)->required(); @@ -129,8 +129,8 @@ class ServicePersonnelController extends AdminController $form->saved(function(Form $form){ $id = $form->getKey(); - - if($form->isCreating && !empty($id)){ + + if($form->isCreating() && !empty($id)){ $model = ServicePersonnelModel::find($id); $qrCode = new WeChatQrCode(); // 生成专员二维码 diff --git a/app/Console/Commands/MigrateStore.php b/app/Console/Commands/MigrateStore.php index 67fd1e1..6d4d42f 100644 --- a/app/Console/Commands/MigrateStore.php +++ b/app/Console/Commands/MigrateStore.php @@ -41,8 +41,8 @@ class MigrateStore extends Command { $oldTableName = 'ims_cjdc_store_new'; $newTableName = 'lanzu_store_new'; - $storeImgPath = 'QR_code/code_store_img/wx_store_';/* 商户小程序码 */ - $storePayPath = 'QR_code/code_pay_img/wx_pay_';/* 收银二维码 */ + // $storeImgPath = 'QR_code/code_store_img/wx_store_';/* 商户小程序码 */ + // $storePayPath = 'QR_code/code_pay_img/wx_pay_';/* 收银二维码 */ // 判断表是否存在 if(!Schema::hasTable($oldTableName)){ var_dump('旧表不存在'); @@ -106,10 +106,10 @@ class MigrateStore extends Command 'introduction'=> strip_tags($value->details), - 'store_applet_img' => $storeImgPath.$storeId.'.jpg', - 'cash_code_img' => $storePayPath.$storeId.'.jpg', + 'store_applet_img' => '', + 'cash_code_img' => '', - 'created_at' => strtotime($value->sq_time), + 'created_at' => $value->time_add ?strtotime($value->time_add) : 0, 'updated_at' => time(), ];