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

@@ -75,25 +75,22 @@ class InquiryFormData extends Base
             unset($data['globalso-date']);
             unset($data['globalso-date']);
 
 
             //推送邮件发送
             //推送邮件发送
-            $has_file = false;
             foreach ($data as $k => $v){
             foreach ($data as $k => $v){
-                if(is_array($v)){
-                    $has_file = true;
-                    break;
+                if(is_array($v) && !empty($v['path'])){
+                    $v = getImageUrl($v['path']);
+                    $data[$k] = $v;
                 }
                 }
                 //其他字段补充到message里
                 //其他字段补充到message里
                 if(!in_array($k, ['name', 'email', 'message', 'phone', 'ip', 'date', 'cname', 'domain', 'edition', 'domain_host_url'])){
                 if(!in_array($k, ['name', 'email', 'message', 'phone', 'ip', 'date', 'cname', 'domain', 'edition', 'domain_host_url'])){
                     $data['message'].=  "<br/>" . $k .': ' . $v;
                     $data['message'].=  "<br/>" . $k .': ' . $v;
                 }
                 }
             }
             }
-            if(!$has_file) {
             $res = (new FormGlobalsoApi())->submitInquiry($ip, $referer, $submit_at, $data, $traffic);
             $res = (new FormGlobalsoApi())->submitInquiry($ip, $referer, $submit_at, $data, $traffic);
             Log::channel('inquiry')->info('询盘发送邮件', [$data, $res]);
             Log::channel('inquiry')->info('询盘发送邮件', [$data, $res]);
             if(!$res){
             if(!$res){
                 throw new \Exception('询盘发送邮件失败');
                 throw new \Exception('询盘发送邮件失败');
             }
             }
         }
         }
-        }
 
 
         $model = new self();
         $model = new self();
         $model->form_id = $form_id;
         $model->form_id = $form_id;