作者 刘锟

update

@@ -707,25 +707,11 @@ class ProjectUpdate extends Command @@ -707,25 +707,11 @@ class ProjectUpdate extends Command
707 //扩展字段 707 //扩展字段
708 if ($six_read) { 708 if ($six_read) {
709 if ($item['extend'] ?? []) { 709 if ($item['extend'] ?? []) {
710 - if($project_id == 1646){  
711 - //特殊项目处理  
712 - $extend_list = [];  
713 - foreach ($item['extend'] as $k_e=>$v_e){  
714 - if(empty($v_e)){  
715 - continue;  
716 - }  
717 -  
718 - foreach ($v_e as $k_e_e => $v_e_e){  
719 - $extend_list[$k_e.'_'.$k_e_e] = $v_e_e;  
720 - }  
721 - }  
722 - }else{  
723 - $extend_list = $item['extend'];  
724 - }  
725 - foreach ($extend_list as $ke => $ve) { 710 + foreach ($item['extend'] as $ke => $ve) {
726 $extend = $extend_model->read(['title' => $ke]); 711 $extend = $extend_model->read(['title' => $ke]);
727 if ($extend) { 712 if ($extend) {
728 if ($extend['type'] == 3) { 713 if ($extend['type'] == 3) {
  714 + //图片
729 $gallery = []; 715 $gallery = [];
730 if (is_array($ve)) { 716 if (is_array($ve)) {
731 foreach ($ve as $ve_img) { 717 foreach ($ve as $ve_img) {
@@ -736,8 +722,14 @@ class ProjectUpdate extends Command @@ -736,8 +722,14 @@ class ProjectUpdate extends Command
736 } 722 }
737 $value = Arr::a2s($gallery); 723 $value = Arr::a2s($gallery);
738 } elseif ($extend['type'] == 4) { 724 } elseif ($extend['type'] == 4) {
739 - $value = Arr::a2s([$this->source_download($ve, $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)]); 725 + //文件
  726 + $file[] = [
  727 + 'name' => $ve['title'],
  728 + 'url' => $this->source_download($ve['url'], $project_id, $domain_arr['host'], $web_url_domain, $home_url, 1)
  729 + ];
  730 + $value = Arr::a2s($file);
740 } else { 731 } else {
  732 + //文本
741 $value = $ve; 733 $value = $ve;
742 } 734 }
743 735