Merge remote-tracking branch 'origin/master' into akun

@@ -243,8 +243,6 @@ class ProductController extends BaseController
         }else{
         }else{
             $v['status_text'] = '';
             $v['status_text'] = '';
         }
         }
-        //获取当前用户选择的模版
-        $v['video'] = json_decode($v['video'] ?? '');
         $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);
         $template_id = $this->getTemplateId(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL);
         $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id'] ?? 0);
         $v['is_renovation']  =  $this->getIsRenovation(BTemplate::SOURCE_PRODUCT,BTemplate::IS_DETAIL,$template_id,$v['id'] ?? 0);
         $v['url'] = $this->user['domain'].$v['route'];
         $v['url'] = $this->user['domain'].$v['route'];

@@ -264,38 +264,42 @@ class ProductLogic extends  BaseLogic
      */
      */
     public function handleSaveParam(&$param){
     public function handleSaveParam(&$param){
         //产品图
         //产品图
-        if(isset($param['gallery']) && !empty($param['gallery'])){
+        if(isset($param['gallery'])){
             foreach ($param['gallery'] as $k => $v){
             foreach ($param['gallery'] as $k => $v){
                 $v['url'] = str_replace_url($v['url']);
                 $v['url'] = str_replace_url($v['url']);
                 $param['gallery'][$k] = $v;
                 $param['gallery'][$k] = $v;
             }
             }
             $param['thumb'] = Arr::a2s($param['gallery'][0] ?? []);
             $param['thumb'] = Arr::a2s($param['gallery'][0] ?? []);
             $param['gallery'] = Arr::a2s($param['gallery'] ?? []);
             $param['gallery'] = Arr::a2s($param['gallery'] ?? []);
-        }else{
-            $param['gallery'] = Arr::a2s([]);
-            $param['thumb'] =  Arr::a2s([]);
         }
         }
-        if(isset($param['video']) && !empty($param['video'])){
+        if(isset($param['files'])){
+            foreach ($param['files'] as $k => $v){
+                $v['url'] = str_replace_url($v['url']);
+                $param['files'][$k] = $v;
+            }
+            $param['files'] = Arr::a2s($param['files'] ?? []);
+        }
+        if(isset($param['video'])){
+            foreach ($param['video'] as $k => $v){
+                $v['url'] = str_replace_url($v['url']);
+                $param['video'][$k] = $v;
+            }
             $param['video'] = Arr::a2s($param['video'] ?? []);
             $param['video'] = Arr::a2s($param['video'] ?? []);
-        }else{
-            $param['video'] = Arr::a2s([]);
         }
         }
-        $param['attrs'] = Arr::a2s($param['attrs'] ?? []);
-        $param['attr_id'] = Arr::arrToSet($param['attr_id'] ?? '');
-        if(isset($param['keyword_id']) && !empty($param['keyword_id'])){
+        if(isset($param['keyword_id'])){
             $param['keyword_id'] = ','.Arr::arrToSet($param['keyword_id']).',';
             $param['keyword_id'] = ','.Arr::arrToSet($param['keyword_id']).',';
         }
         }
+        $param['attrs'] = Arr::a2s($param['attrs'] ?? []);
+        $param['attr_id'] = Arr::arrToSet($param['attr_id'] ?? '');
         $param['describe'] = Arr::a2s($param['describe'] ?? []);
         $param['describe'] = Arr::a2s($param['describe'] ?? []);
         $param['describe_id'] = Arr::arrToSet($param['describe_id'] ?? '');
         $param['describe_id'] = Arr::arrToSet($param['describe_id'] ?? '');
         $param['seo_mate'] = Arr::a2s($param['seo_mate'] ?? '');
         $param['seo_mate'] = Arr::a2s($param['seo_mate'] ?? '');
         $param['related_product_id'] = Arr::arrToSet($param['related_product_id'] ?? '');
         $param['related_product_id'] = Arr::arrToSet($param['related_product_id'] ?? '');
-        if(isset($param['icon']) && !empty($param['icon'])){
+        if(isset($param['icon'])){
             foreach ($param['icon'] as $k1 => $v1){
             foreach ($param['icon'] as $k1 => $v1){
                 $param['icon'][$k1] = str_replace_url($v1);
                 $param['icon'][$k1] = str_replace_url($v1);
             }
             }
             $param['icon'] = Arr::a2s($param['icon'] ?? []);
             $param['icon'] = Arr::a2s($param['icon'] ?? []);
-        }else{
-            $param['icon'] = Arr::a2s([]);
         }
         }
         $param['created_uid'] = $this->user['id'];
         $param['created_uid'] = $this->user['id'];
         return $param;
         return $param;

@@ -166,6 +166,46 @@ class Product extends Base
     }
     }
 
 
     /**
     /**
+     * @remark :下载文件
+     * @name   :getFilesAttribute
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/23 14:29
+     */
+    public function getFilesAttribute($value){
+        if(!empty($value)){
+            $value = Arr::s2a($value);
+            foreach ($value as $k => $v){
+                if(!empty($v['url'])){
+                    $v['url'] = getImageUrl($v['url']);
+                }
+                $value[$k] = $v;
+            }
+        }
+        return $value;
+    }
+
+    /**
+     * @remark :视频
+     * @name   :getVideoAttribute
+     * @author :lyh
+     * @method :post
+     * @time   :2024/1/23 14:31
+     */
+    public function getVideoAttribute($value){
+        if(!empty($value)){
+            $value = Arr::s2a($value);
+            foreach ($value as $k => $v){
+                if(!empty($v['url'])){
+                    $v['url'] = getImageUrl($v['url']);
+                }
+                $value[$k] = $v;
+            }
+        }
+        return $value;
+    }
+
+    /**
      * @remark :图标获取器
      * @remark :图标获取器
      * @name   :getGalleryAttribute
      * @name   :getGalleryAttribute
      * @author :lyh
      * @author :lyh