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

app/Http/Controllers/Admin/Controller.php

@@ -34,7 +34,7 @@ abstract class Controller extends BaseController
             }
             return $url;
         } else {
-            return env('CDN_URL').$url;
+            return env('APP_URL').$url;
         }
     }
 

app/Http/Controllers/Web/OrderController.php

@@ -68,6 +68,7 @@ class OrderController extends Controller
                     $res['err'] ='网络错误';
                 }
             }
+           // dd($res);
             return $this->api($res);
         }else{
             return view('web.order.index');

app/Widget/Tools/FileUpload.php

@@ -60,7 +60,7 @@ class FileUpload {
                             extensions: "{$file_types}",
                         },
                         swf: "/base/webuploader/uploader.swf",
-                        server: "/admin/base/attachment/webupload",
+                        server: "/admin/Base/Attachment/webupload",
                         fileNumLimit: 300,
                         fileSizeLimit: 20 * 1024 * 1024,
                         fileSingleSizeLimit: 10 * 1024 * 1024,

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

@@ -150,7 +150,7 @@
 
                                 <div class="form-group">
 
-                                    <label class="control-label col-sm-3">尺寸图片(1920*1080)</label>
+                                    <label class="control-label col-sm-3">PDF上传</label>
                                     <div class="col-sm-9">
                                         {{--{!!  widget('Tools.ImgUpload')->single2('/upload/attr','attr',"attr",  isset($data['attr'])? $data['attr'] : '',array("sizex"=>1920,"sizey"=>1080)) !!}--}}
                                         {!!  widget('Tools.FileUpload')->single('/upload/pdf','pdf',"data[pdf]",  isset($data['pdf'])? $data['pdf'] : '') !!}