gx

@@ -41,7 +41,7 @@ class CategoryController extends BaseController
             foreach ($list as $k =>$v){
             foreach ($list as $k =>$v){
                 $v['url'] = $this->user['domain'] . $v['route'].'/';
                 $v['url'] = $this->user['domain'] . $v['route'].'/';
                 $v['product_num'] = Category::getProductNum($v['id']);
                 $v['product_num'] = Category::getProductNum($v['id']);
-                $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type']);
+                $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'],$this->user['project_location']);
                 $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_LIST,$template_id,$v['id']);
                 $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_LIST,$template_id,$v['id']);
                 $list[$k] = $v;
                 $list[$k] = $v;
             }
             }

@@ -78,25 +78,25 @@ class ProductController extends BaseController
     public function getHandleFileImage($v){
     public function getHandleFileImage($v){
         //ToDo::处理图片及文件
         //ToDo::处理图片及文件
         if(!empty($v['thumb']) && !empty($v['thumb']['url'])){
         if(!empty($v['thumb']) && !empty($v['thumb']['url'])){
-            $v['thumb']['url'] = getImageUrl($v['thumb']['url'],$this->user['storage_type'] ?? 0);
+            $v['thumb']['url'] = getImageUrl($v['thumb']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location']);
         }
         }
         if(!empty($v['gallery'])){
         if(!empty($v['gallery'])){
             foreach ($v['gallery'] as $gallery_k => $gallery_v){
             foreach ($v['gallery'] as $gallery_k => $gallery_v){
-                $gallery_v['url'] = getImageUrl($gallery_v['url'],$this->user['storage_type'] ?? 0);
+                $gallery_v['url'] = getImageUrl($gallery_v['url'],$this->user['storage_type'] ?? 0,$this->user['project_location']);
                 $v['gallery'][$gallery_k] = $gallery_v;
                 $v['gallery'][$gallery_k] = $gallery_v;
             }
             }
         }
         }
         if(!empty($v['icon'])){
         if(!empty($v['icon'])){
             foreach ($v['icon'] as $icon_k => $icon_v){
             foreach ($v['icon'] as $icon_k => $icon_v){
-                $icon_v = getImageUrl($icon_v,$this->user['storage_type'] ?? 0);
+                $icon_v = getImageUrl($icon_v,$this->user['storage_type'] ?? 0,$this->user['project_location']);
                 $v['icon'][$icon_k] = $icon_v;
                 $v['icon'][$icon_k] = $icon_v;
             }
             }
         }
         }
         if(!empty($v['video']) && !empty($v['video']['url'])){
         if(!empty($v['video']) && !empty($v['video']['url'])){
-            $v['video']['url'] = getImageUrl($v['video']['url'],$this->user['storage_type'] ?? 0);
+            $v['video']['url'] = getImageUrl($v['video']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location']);
         }
         }
         if(!empty($v['files']) && !empty($v['files']['url'])){
         if(!empty($v['files']) && !empty($v['files']['url'])){
-            $v['files']['url'] = getImageUrl($v['files']['url'],$this->user['storage_type'] ?? 0);
+            $v['files']['url'] = getImageUrl($v['files']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location']);
         }
         }
         return $this->success($v);
         return $this->success($v);
     }
     }