Merge branch 'master' of http://gitlab.bluearp.com/ldj/zptz-sass-kelaidian

app/Services/DealPicService.php

@@ -48,11 +48,11 @@ class DealPicService extends Service{
             } else {
                 return ['code'=>500, 'msg'=>'不支持的上传类型', 'data'=>''];
             }
-            
+
             //定义文件名
             $file_name = time() . rand(11, 99) .rand(111, 999).'.'.$ext;
             $original_file_name = 'original2'.$file_name;
-            
+
             // $company_id = $session['company_id'];
             $dir=rtrim($request['path'],'/');
             $dirs = explode('/', $dir);
@@ -81,7 +81,7 @@ class DealPicService extends Service{
             //获取上传文件大小，字节 kb
             $files_size = $file_object->getClientSize();
             $size = $files_size / 1024 / 1024;//换算为mb
-            
+
             $size = sprintf( "%.2f", $size);//保留两位小数
 
             // 如果上传视频，限制上传视频文件大小
@@ -486,7 +486,7 @@ class DealPicService extends Service{
                 unlink($value);//删除图片
             }
         } catch (Exception $e) {
-            
+
         }
         return true;
     }