Merge branch 'master' of http://git.9026.com/richod/dcj

app/Http/Controllers/Web/OrderController.php

@@ -54,11 +54,11 @@ class OrderController extends Controller
                     return $this->api($res);
                 }
             }
-          /*  if($code !== $data['verify']){
+            if($code !== $data['verify']){
                 $res['state'] = 0;
                 $res['err'] = '验证码错误！';
                 return $this->api($res);
-            }*/
+            }
             $check = MedicalOrderModel::where('mobile',$data['mobile'])->first();
             if($check&&!empty($check->pdf)){
                 $res['state'] = 2;
@@ -196,11 +196,11 @@ class OrderController extends Controller
         //对手机号码进行验证
         $validator = Validator::make($request->all(),
             [
-                'phone' => 'required|regex:/^1[34578]\d{9}$/',
+                'mobile' => 'required|regex:/^1[34578]\d{9}$/',
             ],
             [
-                'phone.required' => '手机号码必填',
-                'phone.regex' => '手机号码格式不正确',
+                'mobile.required' => '手机号码必填',
+                'mobile.regex' => '手机号码格式不正确',
             ]
         );
 
@@ -215,7 +215,7 @@ class OrderController extends Controller
 
         $times = Cache::store('file')->get($ipkeyexist);
         if($times>10) {
-            return json_encode(['code' => 0, 'msg' => '一天内一个ip最多发送十次验证码']);
+            return json_encode(['state' => 0, 'msg' => '一天内一个ip最多发送十次验证码']);
         }else{
             $times++;
             Cache::store('file')->put($ipkeyexist, $times, 60 * 24);
@@ -224,7 +224,7 @@ class OrderController extends Controller
         $keyexist = $this->keySmsCodeExist . $phone . Carbon::now()->toDateString();;
         $times = Cache::store('file')->get($keyexist);
         if($times>8) {
-            return json_encode(['code' => 0, 'msg' => '一天内最多发送八次验证码']);
+            return json_encode(['state' => 0, 'msg' => '一天内最多发送八次验证码']);
         }else{
             $times++;
             Cache::store('file')->put($keyexist, $times, 60 * 24);
@@ -237,9 +237,9 @@ class OrderController extends Controller
 
         $result = $this->sendSms($msg, $phone);
 //        \Log::info($msg . " res:" . $result);
-        if (!$result) return json_encode(['code' => 0, 'msg' => '短信发送失败']);
+        if (!$result) return json_encode(['state' => 0, 'msg' => '短信发送失败']);
 
-        return json_encode(['code' => 200, 'msg' => '短信发送成功']);
+        return json_encode(['state' => 1, 'msg' => '短信发送成功']);
     }
 
     /*

resources/views/web/order/index.blade.php

@@ -248,7 +248,7 @@
                     if(msg.state ==1){
                         alert('发送成功');
                     }else{
-                        alert(msg.err);
+                        alert(msg.msg);
                     }
                 }
             });