Merge branch 'feature/transmit' into develop

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') {
@@ -112,15 +113,16 @@ class InquiryTransmitController extends BaseController
                     'uCountry'              => $params['uCountry']
                 ];
 
-                $this->service->serviceStore($request, $edata);
+                $this->service->serviceStore($request, $edata, $domain);
 
                 $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());

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);
     }