From bf74d9b9178df586683c6a180013e52b3eb57426 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Mon, 1 Dec 2025 17:48:44 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=A2=E5=8D=95=E8=BD=AC=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/admin/controller/InquiryTransmitController.php | 2 +- app/common/service/InquiryTransmitService.php | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/admin/controller/InquiryTransmitController.php b/app/admin/controller/InquiryTransmitController.php index a3d932c..a0bdc6b 100644 --- a/app/admin/controller/InquiryTransmitController.php +++ b/app/admin/controller/InquiryTransmitController.php @@ -112,7 +112,7 @@ class InquiryTransmitController extends BaseController 'uCountry' => $params['uCountry'] ]; - $this->service->serviceStore($request, $edata); + $this->service->serviceStore($request, $edata, $domain); $this->emailHtml($edata); diff --git a/app/common/service/InquiryTransmitService.php b/app/common/service/InquiryTransmitService.php index 4563dc7..7b0fed4 100644 --- a/app/common/service/InquiryTransmitService.php +++ b/app/common/service/InquiryTransmitService.php @@ -31,7 +31,7 @@ class InquiryTransmitService } /** 创建 */ - public function serviceStore(Request $request, array $data = []) + public function serviceStore(Request $request, array $data = [], string $domain = '') { $data['email'] = $data['Email']; $data['name'] = $data['Name']; @@ -40,8 +40,9 @@ class InquiryTransmitService $data['country'] = $data['Country']; $data['form_Url'] = $data['Form Url']; $data['message'] = $data['Message']; - $data['iplocation'] = $data['IpLocation']; + $data['ip_location'] = $data['IpLocation']; $data['ip'] = $data['Ip']; + $data['domain'] = $domain; return InquiryTransmit::create($data); } From db7c8a650b2006880f07180a924fa53b71f86c56 Mon Sep 17 00:00:00 2001 From: "WIN-C27C5MSVTPO\\16961" <1696136552@qq.com> Date: Mon, 1 Dec 2025 17:51:16 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=AF=A2=E5=8D=95=E8=BD=AC=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/InquiryTransmitController.php | 26 ++++++++++--------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/app/admin/controller/InquiryTransmitController.php b/app/admin/controller/InquiryTransmitController.php index a0bdc6b..f4ac093 100644 --- a/app/admin/controller/InquiryTransmitController.php +++ b/app/admin/controller/InquiryTransmitController.php @@ -78,13 +78,14 @@ class InquiryTransmitController extends BaseController 'en-3-P-vdx' => $this->formHmtl2($config) }; - return json([ - 'code' => 200, - 'data' => [ - 'html' => $html - ], - 'message' => 'success' - ]); + return $this->success(['html' => $html], 'success'); +// return json([ +// 'code' => 200, +// 'data' => [ +// 'html' => $html +// ], +// 'message' => 'success' +// ]); } if ($request->method() == 'POST') { @@ -116,11 +117,12 @@ class InquiryTransmitController extends BaseController $this->emailHtml($edata); - return json([ - 'code' => 200, - 'data' => [], - 'message' => 'Thank you for your message! We will contact with you soon.' - ]); + return $this->success([], 'Thank you for your message! We will contact with you soon.'); +// return json([ +// 'code' => 200, +// 'data' => [], +// 'message' => 'Thank you for your message! We will contact with you soon.' +// ]); } } catch (\Throwable $th) { Log::info('Data:'.date('Y-m-d H:i:s').':'.$th->getMessage().'|'.$th->getLine().'|'.$th->getFile());