作者 lyh

gx复制产品

@@ -85,7 +85,7 @@ class CustomModuleContentController extends BaseController @@ -85,7 +85,7 @@ class CustomModuleContentController extends BaseController
85 $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'] ?? 0,$this->user['project_location']); 85 $v['image_link'] = getImageUrl($v['image'],$this->user['storage_type'] ?? 0,$this->user['project_location']);
86 } 86 }
87 if(!empty($v['video'])){ 87 if(!empty($v['video'])){
88 - $v['video']['url'] = getFileUrl($v['video']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location'],$this->user['file_cdn']); 88 + $v['video']['url'] = getFileUrl($v['video']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location'],$this->user['file_cdn'] ?? 0);
89 $v['video']['video_image'] = getImageUrl($v['video']['video_image'],$this->user['storage_type'] ?? 0,$this->user['project_location']); 89 $v['video']['video_image'] = getImageUrl($v['video']['video_image'],$this->user['storage_type'] ?? 0,$this->user['project_location']);
90 } 90 }
91 return $this->success($v); 91 return $this->success($v);
@@ -133,11 +133,11 @@ class ProductController extends BaseController @@ -133,11 +133,11 @@ class ProductController extends BaseController
133 } 133 }
134 } 134 }
135 if(!empty($v['video'])){ 135 if(!empty($v['video'])){
136 - $v['video']['url'] = getFileUrl($v['video']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location'],$this->user['file_cdn']); 136 + $v['video']['url'] = getFileUrl($v['video']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location'],$this->user['file_cdn'] ?? 0);
137 $v['video']['video_image'] = getImageUrl($v['video']['video_image'] ?? '',$this->user['storage_type'] ?? 0,$this->user['project_location']); 137 $v['video']['video_image'] = getImageUrl($v['video']['video_image'] ?? '',$this->user['storage_type'] ?? 0,$this->user['project_location']);
138 } 138 }
139 if(!empty($v['files']) && !empty($v['files']['url'])){ 139 if(!empty($v['files']) && !empty($v['files']['url'])){
140 - $v['files']['url'] = getFileUrl($v['files']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location'],$this->user['file_cdn']); 140 + $v['files']['url'] = getFileUrl($v['files']['url'],$this->user['storage_type'] ?? 0,$this->user['project_location'],$this->user['file_cdn'] ?? 0);
141 } 141 }
142 return $this->success($v); 142 return $this->success($v);
143 } 143 }
@@ -379,9 +379,9 @@ class ProductController extends BaseController @@ -379,9 +379,9 @@ class ProductController extends BaseController
379 foreach ($arr1 as $k1=>$v1){ 379 foreach ($arr1 as $k1=>$v1){
380 $v1 = (array)$v1; 380 $v1 = (array)$v1;
381 if(isset($v1['url'])){ 381 if(isset($v1['url'])){
382 - $v1['url'] = getFileUrl($v1['url'],$this->user['storage_type'],$this->user['project_location'],$this->user['file_cdn']); 382 + $v1['url'] = getFileUrl($v1['url'],$this->user['storage_type'],$this->user['project_location'],$this->user['file_cdn'] ?? 0);
383 }else{ 383 }else{
384 - $v1 = getFileUrl($v1,$this->user['storage_type'],$this->user['project_location'],$this->user['file_cdn']); 384 + $v1 = getFileUrl($v1,$this->user['storage_type'],$this->user['project_location'],$this->user['file_cdn'] ?? 0);
385 } 385 }
386 $arr1[$k1] = $v1; 386 $arr1[$k1] = $v1;
387 } 387 }
@@ -94,7 +94,7 @@ class CustomModuleContentLogic extends BaseLogic @@ -94,7 +94,7 @@ class CustomModuleContentLogic extends BaseLogic
94 }elseif($v['type'] == 4){ 94 }elseif($v['type'] == 4){
95 $arr1 = json_decode($info['values']); 95 $arr1 = json_decode($info['values']);
96 foreach ($arr1 as $k1=>$v1){ 96 foreach ($arr1 as $k1=>$v1){
97 - $v1 = getFileUrl($v1,$this->user['storage_type'],$this->user['project_location'],$this->user['file_cdn']); 97 + $v1 = getFileUrl($v1,$this->user['storage_type'],$this->user['project_location'],$this->user['file_cdn'] ?? 0);
98 $arr1[$k1] = $v1; 98 $arr1[$k1] = $v1;
99 } 99 }
100 $v['values'] = $arr1; 100 $v['values'] = $arr1;