Merge branch 'hotfix-phoenix' of http://120.24.33.109:11081/hyzjshwo/mp_lanzu_cat into hotfix-phoenix

app/Admin/Controllers/v3/CouponController.php

@@ -150,8 +150,8 @@ class CouponController extends AdminController
             $form->column(6,function(Form $form){
                 $form->text('title')->required()->maxLength(255,'最多只能输入500个字');
                 $form->textarea('introduce')->required();
-                $form->currency('full_amount')->required()->floatTwo()->symbol('￥');
-                $form->currency('discounts')->required()->floatTwo()->symbol('￥');
+                $form->currency('full_amount')->required()->symbol('￥');
+                $form->currency('discounts')->required()->symbol('￥');
                 $form->radio('discount_type')->options(CouponModel::$_DISCOUNTTYPE)->default(1);
                 $form->number('inventory')->required()->type('number')->attribute('min', 1)->default(1);
                 $form->number('weigh')->type('number')->attribute('min', 0)->default(0);

app/Admin/Controllers/v3/GoodsController.php

@@ -191,16 +191,16 @@ class GoodsController extends AdminController
             $form->column(6, function (Form $form) use($storeList,$categoryList,$goodsCategoryList ){
                 $form->hidden('market_id')->default(0);
                 $form->select('category_id')->required()->options($categoryList)->load('goods_category_id', '/api/goods_category_list');
-                $form->select('goods_category_id')->required();
+                $form->select('goods_category_id');
                 $form->select('store_id')->required()->options($storeList);
                 $form->text('name')->required()->maxLength(20);
                 $form->image('cover_img')->autoUpload()->required();
                 $form->number('sort');
             });
             $form->column(6, function (Form $form) {
-                $form->currency('price')->required()->floatTwo()->symbol('￥');
-                $form->currency('original_price')->required()->floatTwo()->symbol('￥');
-                $form->currency('vip_price')->required()->floatTwo()->symbol('￥');
+                $form->currency('price')->required()->symbol('￥');
+                $form->currency('original_price')->required()->symbol('￥');
+                $form->currency('vip_price')->required()->symbol('￥');
                 $form->text('goods_unit')->help('如：斤，个，盒，500克，1000克，1500克等');
                 $form->radio('is_infinite')->options(['关闭','开启'])->default(1);
                 $form->number('inventory')->required()->attribute('min', 1)->default(1);

app/Admin/Controllers/v3/ServicePersonnelController.php

@@ -147,6 +147,7 @@ class ServicePersonnelController extends AdminController
                         return $form->error('用户已经为服务专员');
                     }
                 }
+               
             });
             $form->saved(function(Form $form){
                 $id = $form->getKey();
@@ -162,6 +163,11 @@ class ServicePersonnelController extends AdminController
                     }
                 }
             });
+            $form->deleting(function (Form $form) {
+                $model = ServicePersonnelModel::select('id')->find($form->getKey());
+                $model->status = 2;
+                $model->save();
+            });
             $form->disableResetButton();
             $form->disableViewCheck();
             $form->disableEditingCheck();

app/Admin/Controllers/v3/StoreController.php

@@ -264,16 +264,17 @@ class StoreController extends AdminController
                 if($form->isEditing() && !empty($marketId) && $marketId != $form->model()->market_id){
                     return $form->error('不能更换市场，会影响店铺下商品所属市场！');
                 }
-                if(!empty($id) && !empty($adminId)){
+                if(!empty($adminId)){
                     $user = UserModel::getUserInfo($adminId,'id');
                     if(empty($user)){
                         return $form->error('管理员不存在');
                     }
-                    $store = StoreModel::select('id')->where([
-                        ['admin_id','=',$adminId],
-                        ['id','<>',$id?$id:0],
-                    ])->first();
+                    $storeM = StoreModel::select('id')->where('admin_id',$adminId);
+                    if($form->isEditing()){
+                        $storeM->where([['id','<>',$id?$id:0]]);
+                    }
                     
+                    $store = $storeM->first();
                     if(!empty($store)){
                         return $form->error('管理员已经绑定了店铺');
                     }