浏览代码

Merge branch 'develop'

zhangchangchun 5 年之前
父节点
当前提交
d195eee887
共有 1 个文件被更改,包括 10 次插入9 次删除
  1. 10 9
      app/Http/Controllers/V1/ShopController.php

+ 10 - 9
app/Http/Controllers/V1/ShopController.php

@@ -44,7 +44,7 @@ class ShopController extends Controller {
             'province_id' => 'required|integer|digits_between:1,7',
             'city_name' => 'required|string:max:50',
             'city_id' => 'required|integer|digits_between:1,7',
-            'contact_name' => 'string|max:50',
+            'contact_name' => 'string|max:6',
             'contact_mobile' => 'max:16',
             'shop_desc' => 'string|max:100',
             'status' =>['required',Rule::in([0,1])],
@@ -83,26 +83,26 @@ class ShopController extends Controller {
     {
         $data = $request->all();
         $validator = Validator::make($data, [
-            'shop_name' => 'required|max:11',
-            'shop_short_name' => 'required|string|max:100',
+            'shop_name' => 'required|max:50',
+            'shop_short_name' => 'required|string|max:50',
             'mobile' => 'required|max:11',
-            'address' => 'required|string',
+            'address' => 'required|string|max:50',
             'province_name' => 'required|string|max:50',
             'province_id' => 'required|integer|digits_between:1,7',
             'city_name' => 'required|string:max:50',
             'city_id' => 'required|integer|digits_between:1,7',
-            'contact_name' => 'string|max:50',
+            'contact_name' => 'string|max:6',
             'contact_mobile' => 'max:16',
-            'shop_desc' => 'string|max:500',
+            'shop_desc' => 'string|max:100',
             'status' =>['required',Rule::in([0,1])],
             'logo_img' => 'string',
             'license_img' => 'required|string',
             'food_trans_license' => 'required|string',
             'other_license' => 'string',
-            'proportion'=>'required|digits_between:1,100|integer',
+            'proportion'=>'required|between:0,100',
             'verify_type'=>['required',Rule::in([0,1])],
-            'account'=>'string|max:20',
-            'password'=>'string|min:6|max:18',
+            'account'=>'string|max:16',
+            'password'=>'string|min:6|max:16',
             'shop_id'=>'integer|required',
             'shop_account_id'=>'integer|required',
         ]);
@@ -175,6 +175,7 @@ class ShopController extends Controller {
                     $upStatus = $product->upProductStatus($data['shop_id']);
                     if(isset($upStatus['status_code']) && $upStatus['status_code'] == 200){
                         DB::commit();
+                        //退出登陆
                         Log::info('商家id'.$data['shop_id'].'商品禁售成功');
                         return  ['message'  => '成功','status_code'   => 200];
                     }else{