Merge remote-tracking branch 'origin/master' into akun

@@ -58,14 +58,23 @@ class InquiryController extends BaseController
         if(!empty($data) && !empty($data['list'])){
             $email = $phone = [];
             foreach ($data['list'] as $v){
-                if(!empty($v['phone'])){
-                    $phone[] = $v['phone'];
-                }
-                if(!empty($v['email'])){
-                    $email[] = $v['email'];
-                }
+                if(!empty($v['phone'])){$phone[] = $v['phone'];}
+                if(!empty($v['email'])){$email[] = $v['email'];}
             }
+            $data = $this->handleMobile($data,$phone);
+            $data = $this->handleEmail($data,$email);
         }
+        $this->response('success',Code::SUCCESS,$data);
+    }
+
+    /**
+     * @remark :处理手机号码
+     * @name   :handleMobile
+     * @author :lyh
+     * @method :post
+     * @time   :2025/3/11 16:22
+     */
+    public function handleMobile($data,$phone){
         if(!empty($phone)){
             $phoneDataModel = new PhoneData();
             $phoneDataList = $phoneDataModel->list(['phone'=>['in',$phone]]);
@@ -80,6 +89,17 @@ class InquiryController extends BaseController
                 $data['list'][$key] = $value;
             }
         }
+        return $data;
+    }
+
+    /**
+     * @remark :处理邮箱
+     * @name   :handleEmail
+     * @author :lyh
+     * @method :post
+     * @time   :2025/3/11 16:24
+     */
+    public function handleEmail($data,$email){
         if(!empty($email)){
             $emailDataModel = new EmailData();
             $emailDataList = $emailDataModel->list(['email'=>['in',$email]]);
@@ -94,7 +114,7 @@ class InquiryController extends BaseController
                 $data['list'][$key] = $value;
             }
         }
-        $this->response('success',Code::SUCCESS,$data);
+        return $data;
     }
 
     /**

@@ -27,7 +27,7 @@ class InquiryLogic extends BaseLogic
     public function __construct()
     {
         parent::__construct();
-
+        $this->param = $this->requestAll;
         $this->form_globalso_api = new FormGlobalsoApi();
     }
 
@@ -213,7 +213,7 @@ class InquiryLogic extends BaseLogic
                     'phone_region'=>$data['phone_region'] ?? '',
                 ];
                 if(!empty($param['phone_region'])){
-                    $param['country'] = Translate::tran($this->param['phone_region'], 'zh') ?? '';
+                    $param['country'] = Translate::tran($param['phone_region'], 'zh') ?? '';
                 }
                 (new PhoneData())->addReturnId($param);
                 return $this->success($param);

+<?php
+/**
+ * @remark :
+ * @name   :WebSettingYoutube.php
+ * @author :lyh
+ * @method :post
+ * @time   :2025/3/11 15:51
+ */
+
+namespace App\Models\WebSetting;
+
+use App\Models\Base;
+
+/**
+ * @remark :youtube账号密码设置
+ * @name   :WebSettingYoutube
+ * @author :lyh
+ * @method :post
+ * @time   :2025/3/11 15:51
+ */
+class WebSettingYoutube extends Base
+{
+    protected $table = 'gl_web_setting_youtube';
+}