Parcourir la source

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

zhjx il y a 6 ans
Parent
commit
76270f9923

+ 3 - 3
app/Http/Controllers/Admin/Medical/OrderController.php

xqd xqd
@@ -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 = '【精准医学】您的检测报告已完成,点击链接浏览下载 http://t19.9026.com/web/Index';
+        $msg = '【精准医学】您的检测报告已完成,点击链接浏览下载 http://t19.9026.com';
 
         $result = $this->sendSms($msg, $phone);
       //  dd($result);
@@ -258,9 +258,9 @@ class OrderController extends Controller
                 $str.=$val_s->name;
             }
         }
-        $data['content'] = str_replace('<p>','',$data['content']);
-        $data['content'] = str_replace('</p>','',$data['content']);
+
         $data['combo'] = unserialize($data['combo']);
+
         return view('admin.medical.order.view',compact('data','str'));
     }
 

+ 49 - 45
app/Http/Controllers/Web/OrderController.php

xqd xqd xqd xqd xqd
@@ -37,11 +37,11 @@ class OrderController extends Controller
             $data = $request->input();
             $key = $this->keySmsCode . $data['mobile'];
             $code = Cache::store('file')->get($key);
-           /* 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)){
@@ -89,6 +89,14 @@ class OrderController extends Controller
         if($request->method() == 'POST') {
             $data = $request->input();
 
+
+            foreach ($data as $key=>$val){
+                if(empty($val)&&$key!='work'&&$key!='native_place'&&$key!='address'){
+                    $res['state'] = 0;
+                    $res['err'] = $conf[$key].'不能为空!';
+                    return $this->api($res);
+                }
+            }
             $style = explode(',',$data['sample_type']);
             $str = '';
             foreach ($style as $key=>$val){
@@ -104,14 +112,6 @@ class OrderController extends Controller
             }
             //dd($style);
             $data['sample_type'] = $str;
-            foreach ($data as $key=>$val){
-                if(empty($val)&&$key!='sample_type'&&$key!='sex'){
-                    $res['state'] = 0;
-                    $res['err'] = $conf[$key].'不能为空!';
-                    return $this->api($res);
-                }
-            }
-
             $query = MedicalOrderModel::create($data);
             if($query){
                 $res['state'] = 1;
@@ -165,6 +165,40 @@ class OrderController extends Controller
         if(empty($id)){
             return redirect('web/Index/index');
         }
+
+        $cat = MedicalSingleCateModel::all();
+        $data_single=array();
+        foreach ($cat as $key=>$val){
+            $projects = MedicalSingleProjectModel::where('cate_id',$val['id'])->get();
+            $project = array();
+            foreach($projects as $k=>$v){
+                $project[]=(object)[
+                    'id'=>$v['id'],
+                    'name'=>$v['name'],
+                    'price'=>$v['oldPrice'],
+                    'youhui'=>$v['realPrice']
+                ];
+            }
+            $data_single[]=(object)[
+                'name'=>$val['name'],
+                'data'=>$project
+            ];
+        }
+        $data_combos = MedicalComboModel::all();
+        $data_combo = array();
+        foreach ($data_combos as $k_c=>$v_c){
+            $data_combo[]=(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($data_single);
+        $data_combo = json_encode($data_combo);
+
+
         $checkorder = MedicalOrderModel::find($id);
         $combos=array();
         $singles=array();
@@ -195,44 +229,14 @@ class OrderController extends Controller
                 }
             }
 
-            $data_single = json_encode($singles);
-            $data_combo = json_encode($combos);
+            $data_single_check = json_encode($singles);
+            $data_combo_check = json_encode($combos);
         //dd($data_single);
-            return view('web.order.result',compact('data_single','data_combo'));
-        }else{
+            return view('web.order.result',compact('data_single_check','data_combo_check','data_single','data_combo'));
+        }elseif(!$checkorder){
             return redirect('web/Index/index');
         }
-        $cat = MedicalSingleCateModel::all();
-        $data_single=array();
-        foreach ($cat as $key=>$val){
-            $projects = MedicalSingleProjectModel::where('cate_id',$val['id'])->get();
-            $project = array();
-            foreach($projects as $k=>$v){
-                $project[]=(object)[
-                    'id'=>$v['id'],
-                    'name'=>$v['name'],
-                    'price'=>$v['oldPrice'],
-                    'youhui'=>$v['realPrice']
-                ];
-            }
-            $data_single[]=(object)[
-                'name'=>$val['name'],
-                'data'=>$project
-            ];
-        }
-        $data_combos = MedicalComboModel::all();
-        $data_combo = array();
-        foreach ($data_combos as $k_c=>$v_c){
-            $data_combo[]=(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($data_single);
-        $data_combo = json_encode($data_combo);
+
 //        dd($data_single);
         return view('web.order.post',compact('data_single','data_combo','id'));
     }

+ 1 - 1
app/Services/Base/Attachment.php

xqd
@@ -142,7 +142,7 @@ class Attachment
      */
 
 
-    public function localUpload($field, $request, $tag = 'files', $size = 10 * 1024 * 1024, array $mimeType = ['image/jpeg', 'image/png', 'image/gif','video/mp4','application/pdf'])
+    public function localUpload($field, $request, $tag = 'files', $size = 20 * 1024 * 1024, array $mimeType = ['image/jpeg', 'image/png', 'image/gif','video/mp4','application/pdf'])
     {
 
         $tag = $request['folder'];

+ 2 - 2
app/Widget/Tools/FileUpload.php

xqd xqd
@@ -63,7 +63,7 @@ class FileUpload {
                         server: "/admin/Base/Attachment/webupload",
                         fileNumLimit: 300,
                         fileSizeLimit: 20 * 1024 * 1024,
-                        fileSingleSizeLimit: 10 * 1024 * 1024,
+                        fileSingleSizeLimit: 20 * 1024 * 1024,
                     });
                     uploader.option("formData", {
                         $extParam
@@ -76,7 +76,7 @@ class FileUpload {
                     });
                     uploader.on("error",function(type){
                         if(type=='F_EXCEED_SIZE'){
-                            layer.msg("上传的文件不大于10MB", {icon: 2});
+                            layer.msg("上传的文件不大于20MB", {icon: 2});
                             return false;
                         }else if(type=="Q_TYPE_DENIED"){
                             layer.msg("请上传格式正确的文件", {icon: 2});

+ 1 - 1
resources/views/admin/medical/order/index.blade.php

xqd
@@ -5,7 +5,7 @@
 		<div class="col-sm-12">
 			<div class="ibox float-e-margins">
 				<div class="ibox-title">
-					<h5>单据管理1</h5>
+					<h5>单据管理</h5>
 					<div class="ibox-tools">
 						<a class="collapse-link"> <i class="fa fa-chevron-up"></i>
 						</a>