合并分支 'akun' 到 'master'

Akun



查看合并请求 !2798

@@ -979,6 +979,18 @@ class ProductLogic extends  BaseLogic
                     }
                     }
                 }
                 }
             }
             }
+            $exist_attr_keys = array_column($attrs,'key');//已存在的参数key
+            for($i=12;$i<count($data);$i++){
+                if($data[$i] ?? ''){
+                    $data_i_array = explode('^v6sp$',$data[$i]);
+                    if(count($data_i_array) == 2 && !in_array($data_i_array[0],$exist_attr_keys)){
+                        $attrs[] = [
+                            'key' => $data_i_array[0],
+                            'value' => $data_i_array[1]
+                        ];
+                    }
+                }
+            }
             //处理描述切换栏
             //处理描述切换栏
             $describe = [];
             $describe = [];
             if($data[11]??''){
             if($data[11]??''){

@@ -319,7 +319,7 @@ class UserLoginLogic
         $info['is_amp'] = $is_amp;
         $info['is_amp'] = $is_amp;
         $info['is_three_code'] = $project['is_three_code'] ?? 0;
         $info['is_three_code'] = $project['is_three_code'] ?? 0;
         //产品，新闻，博客导入模板
         //产品，新闻，博客导入模板
-        $info['import_products_url'] = 'https://ecdn6.globalso.com/upload/p/1/file/2024-12/products.csv';
+        $info['import_products_url'] = 'https://ecdn6.globalso.com/upload/p/1/file/2025-09/products-1.csv';
         $info['import_news_url'] = 'https://ecdn6.globalso.com/upload/p/1/file/2024-12/news.csv';
         $info['import_news_url'] = 'https://ecdn6.globalso.com/upload/p/1/file/2024-12/news.csv';
         $info['import_blogs_url'] = 'https://ecdn6.globalso.com/upload/p/1/file/2024-12/blogs.csv';
         $info['import_blogs_url'] = 'https://ecdn6.globalso.com/upload/p/1/file/2024-12/blogs.csv';
         //缩略图宽度
         //缩略图宽度