合并分支 'akun' 到 'master'

Akun



查看合并请求 !214

@@ -708,43 +708,51 @@ class ProductLogic extends  BaseLogic
                 'description' => $seo_description
             ];
 
+            //处理参数
+            $attrs = [];
+            if($data[4]??''){
+                $attr_arr = json_decode($data[4],true);
+                if(is_array($attr_arr)){
+                    foreach ($attr_arr as $ka=>$va){
+                        if(is_array($va)){
+                            $attrs = $attr_arr;
+                            break;
+                        }
+                        $attrs[] = [
+                            'key' => $ka,
+                            'value' => $va
+                        ];
+                    }
+                }
+            }
+
             //处理描述切换栏
             $describe = [];
-            if($data[11]??''){
-                //处理描述切换栏中的图片
-                $describe = json_decode($data[11],true);
-
-                foreach ($describe as &$v_desc){
-
-                    preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $v_desc['text'], $result_desc);
 
+            for ($i=11;$i<=20;$i+=2){
+                if(($data[$i]??'') && ($data[$i+1]??'')){
+                    preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[$i+1], $result_desc);
                     if($result_desc[2]??[]){
                         foreach ($result_desc[2] as $vdesc_img){
                             $new_vdesc_img = check_remote_url_down($vdesc_img,$project_id,$domain,1);
-                            $new_vdesc_img && $v_desc['text'] = str_replace($vdesc_img,$new_vdesc_img,$v_desc['text']);
+                            $new_vdesc_img && $data[$i+1] = str_replace($vdesc_img,$new_vdesc_img,$data[$i+1]);
                         }
                     }
 
-                    //处理描述切换栏中的视频
-                    preg_match_all('/<source\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $v_desc['text'], $result_desc_video);
+                    preg_match_all('/<source\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $data[$i+1], $result_desc_video);
                     if($result_desc_video[2]??[]){
                         foreach ($result_desc_video[2] as $vdesc_video){
                             $new_vdesc_video = check_remote_url_down($vdesc_video,$project_id,$domain,1);
-                            $new_vdesc_video && $v_desc['text'] = str_replace($vdesc_video,$new_vdesc_video,$v_desc['text']);
+                            $new_vdesc_video && $data[$i+1] = str_replace($vdesc_video,$new_vdesc_video,$data[$i+1]);
                         }
                     }
-                }
-            }
 
-            //处理参数
-            $attrs = [];
-            if($data[4]??''){
-                $attr_arr = json_decode($data[4],true);
-                foreach ($attr_arr as $ka=>$va){
-                    $attrs[] = [
-                        'key' => $ka,
-                        'value' => $va
+                    $describe[] = [
+                        'title' => $data[$i],
+                        'text' => $data[$i+1],
                     ];
+                }else{
+                    break;
                 }
             }