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

app/Http/Controllers/Web/OrderController.php

@@ -113,7 +113,8 @@ class OrderController extends Controller
             return redirect('web/Index/index');
         }
         $checkorder = MedicalOrderModel::find($id);
-        if($checkorder){
+
+        if($checkorder&&(!empty($checkorder['single'])||!empty($checkorder['combo']))){
             $single = unserialize($checkorder['single']);
             $combo = unserialize($checkorder['combo']);
             foreach ($single as $k_s=>$v_s){

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

@@ -248,6 +248,8 @@
                 },
                 url:"{{ url('/web/Index/getCode') }}",
                 success:function (msg) {
+                    var data = eval('('+msg+')');
+                    console.log(data);
                     if(msg.state ==1){
                         alert('发送成功');
                     }else{