合并分支 'akun' 到 'master'

Akun



查看合并请求 !990

@@ -38,11 +38,21 @@ class WebSettingAmpLogic extends BaseLogic
                 $v['url'] = getImageUrl($v['url'], $this->user['storage_type'], $this->user['project_location']);
             }
         }
+        //首页video处理
+        $info['index_video'] = Arr::s2a($info['index_video']);
+        if (!empty($info['index_video'])) {
+            $info['index_video']['url'] = getImageUrl($info['index_video']['url'], $this->user['storage_type'], $this->user['project_location']);
+        }
         //公司主图处理
         $info['company_image'] = Arr::s2a($info['company_image']);
         if (!empty($info['company_image'])) {
             $info['company_image']['url'] = getImageUrl($info['company_image']['url'], $this->user['storage_type'], $this->user['project_location']);
         }
+        //contact主图处理
+        $info['contact_image'] = Arr::s2a($info['contact_image']);
+        if (!empty($info['contact_image'])) {
+            $info['contact_image']['url'] = getImageUrl($info['contact_image']['url'], $this->user['storage_type'], $this->user['project_location']);
+        }
         //icon处理
         $info['web_icon'] = getImageUrl($info['web_icon']);
         return $this->success($info);
@@ -71,11 +81,21 @@ class WebSettingAmpLogic extends BaseLogic
                 }
             }
             $this->param['index_banner'] = Arr::a2s($index_banner);
+            //首页video处理
+            if (isset($this->param['index_video']) && $this->param['index_video']) {
+                $this->param['index_video']['url'] = str_replace_url($this->param['index_video']['url'] ?? '');
+            }
+            $this->param['index_video'] = Arr::a2s($this->param['index_video'] ?? []);
             //公司主图处理
             if (isset($this->param['company_image']) && $this->param['company_image']) {
                 $this->param['company_image']['url'] = str_replace_url($this->param['company_image']['url'] ?? '');
             }
             $this->param['company_image'] = Arr::a2s($this->param['company_image'] ?? []);
+            //contact主图处理
+            if (isset($this->param['contact_image']) && $this->param['contact_image']) {
+                $this->param['contact_image']['url'] = str_replace_url($this->param['contact_image']['url'] ?? '');
+            }
+            $this->param['contact_image'] = Arr::a2s($this->param['contact_image'] ?? []);
             //icon处理
             $this->param['web_icon'] = str_replace_url($this->param['web_icon'] ?? '');
             //其余参数默认值