作者 lyh

Merge branch 'master' of http://47.244.231.31:8099/zhl/globalso-v6 into master-server

... ... @@ -978,31 +978,41 @@ class ProductLogic extends BaseLogic
}
//处理描述切换栏
$describe = [];
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 && $data[$i+1] = str_replace($vdesc_img,$new_vdesc_img,$data[$i+1]);
if($data[11]??''){
$attr_desc = json_decode($data[11],true);
if(is_array($attr_desc)){
foreach ($attr_desc as $vd){
$desc_title = $vd['title'];
if(empty($desc_title)){
continue;
}
}
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 && $data[$i+1] = str_replace($vdesc_video,$new_vdesc_video,$data[$i+1]);
$desc_text = $vd['text'];
if($desc_text){
preg_match_all('/<img\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $desc_text, $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 && $desc_text = str_replace($vdesc_img,$new_vdesc_img,$desc_text);
}
}
preg_match_all('/<source\s+[^>]*?src\s*=\s*(\'|\")(.*?)\\1[^>]*?\/?\s*>/i', $desc_text, $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 && $desc_text = str_replace($vdesc_video,$new_vdesc_video,$desc_text);
}
}
}
}
$describe[] = [
'title' => $data[$i],
'text' => $data[$i+1],
];
}else{
break;
$describe[] = [
'title' => $desc_title,
'text' => $desc_text
];
}
}
}
$id = $this->model->addReturnId(
[
'project_id' => $project_id,
... ... @@ -1067,8 +1077,8 @@ class ProductLogic extends BaseLogic
$cModel = new Column();
$c_id = $cModel->addReturnId(['column_name'=>$describe_value['title'],'product_id'=>$id]);
$dataS = [
'product_id'=>$c_id,
'column_id'=>$id,
'product_id'=>$id,
'column_id'=>$c_id,
'text_type'=>1,
'title'=>$describe_value['title'] ?? '',
'sort'=>$describe_key + 1,
... ...