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

app/Http/Controllers/Admin/Medical/OrderController.php

@@ -193,7 +193,7 @@ class OrderController extends Controller
         $verify_code = (string)mt_rand(1000, 9999);
         $key = $this->keySmsCode . $phone;
         Cache::store('file')->put($key, $verify_code, 6000);
-        $msg = '【精准医疗】您的资料已处理';
+        $msg = '【精准医学】您的检测报告已完成，点击链接浏览下载 http://t19.9026.com/web/Index';
 
         $result = $this->sendSms($msg, $phone);
       //  dd($result);

app/Http/Controllers/Web/OrderController.php

@@ -126,7 +126,9 @@ class OrderController extends Controller
             return $this->api($res);
         }else{
             $mobile = $request->input();
-
+            if(empty($mobile['mob'])){
+                return redirect('web/Index/index');
+            }
             return view('web.order.index',compact('mobile'));
         }
     }
@@ -164,31 +166,41 @@ class OrderController extends Controller
             return redirect('web/Index/index');
         }
         $checkorder = MedicalOrderModel::find($id);
-
+        $combos=array();
+        $singles=array();
         if($checkorder&&(!empty($checkorder['single'])||!empty($checkorder['combo']))){
-            $single = unserialize($checkorder['single']);
-            $combo = unserialize($checkorder['combo']);
-            foreach ($single as $k_s=>$v_s){
-                $singles[]=(object)[
-                    'id'=>$v_s['id'],
-                    'name'=>$v_s['name'],
-                    'price'=>$v_s['oldPrice'],
-                    'youhui'=>$v_s['realPrice']
-                ];
+
+
+            if(!empty($checkorder['single'])){
+                $single = unserialize($checkorder['single']);
+                foreach ($single as $k_s=>$v_s){
+                    $singles[]=(object)[
+                        'id'=>$v_s['id'],
+                        'name'=>$v_s['name'],
+                        'price'=>$v_s['oldPrice'],
+                        'youhui'=>$v_s['realPrice']
+                    ];
+                }
             }
-            foreach ($combo as $k_c=> $v_c){
-                $combos[]=(object)[
-                    'id'=>$v_c['id'],
-                    'name'=>$v_c['name'],
-                    'neirong'=>$v_c['content'],
-                    'jiage'=>$v_c['oldPrice'],
-                    'youhui'=>$v_c['realPrice']
-                ];
+            if(!empty($checkorder['combo'])){
+                $combo = unserialize($checkorder['combo']);
+                foreach ($combo as $k_c=> $v_c){
+                    $combos[]=(object)[
+                        'id'=>$v_c['id'],
+                        'name'=>$v_c['name'],
+                        'neirong'=>$v_c['content'],
+                        'jiage'=>$v_c['oldPrice'],
+                        'youhui'=>$v_c['realPrice']
+                    ];
+                }
             }
-            $data_single = json_encode($single);
-            $data_combo = json_encode($combo);
-//        dd($data_single);
+
+            $data_single = json_encode($singles);
+            $data_combo = json_encode($combos);
+        //dd($data_single);
             return view('web.order.result',compact('data_single','data_combo'));
+        }else{
+            return redirect('web/Index/index');
         }
         $cat = MedicalSingleCateModel::all();
         $data_single=array();

routes/web.php

@@ -12,7 +12,7 @@
 */
 
 Route::get('/', function () {
-    return redirect('/admin/login');
+    return redirect('/web/Index/index');
 });