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

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

@@ -136,6 +136,14 @@ class OrderController extends Controller
     }
 
 
+    public function upload(Request $request)
+    {
+        if($request->method() == 'POST') {
+            $data = $request->input();
+            dd($data);
+        }
+    }
+
     /**
      * 保存修改
      */

app/Http/Controllers/Web/OrderController.php

@@ -43,6 +43,7 @@ class OrderController extends Controller
                 return $this->api($res);
             }
             $check = MedicalOrderModel::where('mobile',$data['mobile'])->first();
+           
             if($check&&!empty($check->pdf)){
                 $res['state'] = 2;
                 $res['err'] = '您已提交';
@@ -57,6 +58,7 @@ class OrderController extends Controller
                 $res['err'] = '请您先填写基本资料';
                 $res['redirect_url'] = url('web/Index/sms');
             }
+            return $this->api($res);
         }else{
             return view('web.order.sms');
         }
@@ -74,8 +76,20 @@ class OrderController extends Controller
 
         if($request->method() == 'POST') {
             $data = $request->input();
-            dd($data);
-
+            $style = explode($data['sample_type'],',');
+            $str = '';
+            foreach ($style as $key=>$val){
+                if($val==1){
+                    $str.= 'EDTA抗凝静脉血';
+                }
+                if($val==2){
+                    $str.= '口腔拭子';
+                }
+                if($val==3){
+                    $str.= '宫颈刷';
+                }
+            }
+            $data['sample_type'] = $str;
             foreach ($data as $key=>$val){
                 if(empty($val)&&$key!='sample_type'&&$key!='sex'){
                     $res['state'] = 0;
@@ -272,7 +286,7 @@ class OrderController extends Controller
 
         $verify_code = (string)mt_rand(1000, 9999);
         $key = $this->keySmsCode . $phone;
-        Cache::store('file')->put($key, $verify_code, 60);
+        Cache::store('file')->put($key, $verify_code, 6000);
         $msg = '【精准医疗】您的验证码是：' . $verify_code;
 
         $result = $this->sendSms($msg, $phone);

app/Widget/Tools/FileUpload.php

@@ -121,7 +121,7 @@ EOF;
      * @param string $positions
      * @param array $option
      */
-    public function singles($folder, $id, $name = "data[file]", $file = "", $id_order , $option = [], $param = [])
+    public function singles($folder, $id, $name = "data[file]", $file = "", $id_order , $token,$option = [], $param = [])
     {
         $file_types = 'jpg|jpeg|gif|png|bmp|doc|docx|xls|xlsx|ppt|htm|html|php|txt|zip|rar|gz|bz2|pdf';
         $option['position'] = isset($option['position']) ? $option['position'] : "alioss";
@@ -141,7 +141,7 @@ EOF;
          <link href="/base/webuploader/webuploader.css" rel="stylesheet">
                         <script src="/base/webuploader/webuploader.min.js"></script>
                         
-                        <input type="hidden" class="form-control input-uploadfile" value="{$file}" name="{$name}" placeholder="{$option['placeholder']}" readonly>
+                        <input type="hidden" class="form-control input-uploadfile" id="{$id_order}" value="{$file}" name="{$name}" placeholder="{$option['placeholder']}" readonly>
                             <button id="{$id}" class="btn btn-primary {$option['button_class']}">上传</button>
                            
           
@@ -202,30 +202,33 @@ EOF;
                             layer.msg(response.message, {icon: 2});
                             $(uploaderthis).parent().parent().find(".webuploader-pick").html('上传失败');
                         }
+                        $.ajax({
+                            url:"upload",
+                            traditional:true,
+                            headers: {
+                                'X-CSRF-TOKEN': "{$token}"
+                            },
+                            type:'POST',
+                            data:{
+                                url:$('#{$id_order}').val(),
+                                id:{$id_order}
+                            },
+                            success:function (msg) {
+                                if(msg.state ==0){
+                                    alert("上传失败！")
+                                } else if(msg.state ==1){
+                                    alert('上传成功');
+                                }
+                            }
+                        });
                     });
-
+                    
+                    
+                    
                 }
                 webUpload{$id}();
                 
-                 $.ajax({
-                    url:"{{ url('/web/Index/sms') }}",
-                    traditional:true,
-                    headers: {
-                        'X-CSRF-TOKEN': "{{ csrf_token() }}"
-                    },
-                    type:'POST',
-                    data:{
-                        url:$('#pdfUpload').val(),
-                        id:{$id_order}
-                    },
-                    success:function (msg) {
-                        if(msg.state ==0){
-                            alert("上传失败！")
-                        } else if(msg.state ==1){
-                            alert('上传成功');
-                        }
-                    }
-                });
+                
             </script>
 EOF;
         return $html;

resources/views/admin/medical/order/index.blade.php

@@ -89,7 +89,7 @@
 										<button onclick="layer.open({type: 2,area: ['80%', '90%'],content: '{{ U('Medical/Order/view',['id'=>$item->id])}}'});"  class="btn btn-primary ">查看</button>
 									@endif
 
-										{!!  widget('Tools.FileUpload')->single('/upload/pdf','pdf',"data[pdf]",'',$item->id) !!}
+										{{--{!!  widget('Tools.FileUpload')->singles('/upload/pdf','pdf'.$item->id,"data[pdf]",'',$item->id,'{{ csrf_token() }}') !!}--}}
 
 								</td>
 							</tr>