email api update

desktopB/goto.js

@@ -4,85 +4,201 @@ $(".banner-slider").slick({
   arrows: false,
 });
 
-$.fn.serializeObject = function () {
-  var o = {};
-  var a = this.serializeArray();
-  o["id"] = 0;
-  o["time_stamp"] = "";
-  $.each(a, function () {
-    if (o[this.name]) {
-      if (!o[this.name].push) {
-        o[this.name] = [o[this.name]];
-      }
-      o[this.name].push(this.value || '');
-    } else {
-      o[this.name] = this.value || '';
-    }
-  });
+function submit() {
+  $('#submitbutton').text('表單送出中，請稍後');
+  
+ let loc = $( "#loc option:selected" ).text();
 
-  return o;
-};
+ let h_class=$( "#h_class option:selected" ).text();
+
+ let size=$( "#size option:selected" ).text();
+
+ let name=$( "#name" ).val();
 
+ let email=$( "#email" ).val();
+
+ let phone=$( "#phone" ).val();
+
+ let version=$( "#version" ).val();
 
-$(".contact-form1").submit(function (e) {
   /*	var formRef = $('#form1').serializeArray();
-    var jsonString = JSON.stringify(formRef);*/
-  var jsonInfo = $('.contact-form1').serializeObject();
-  var jsonString = JSON.stringify(jsonInfo);
-  console.log(jsonString),
-
-    $.ajax({
-      type: 'POST',
-      url: 'https://go.hhh.com.tw:8002/deco_request_detail',
-      data: jsonString,
-      dataType: 'json',
-      // async: false,
-
-      success: function (data) {
-        console.log('送出成功: ' + data);
-        if (data == 0) {
-          alert("送出成功");
-        } else if (data == 1) {
-          alert("此email已填過表單");
-        } else if (data == 2) {
-          alert("此phone已填過表單");
-        } else if (data == 3) {
-          alert("此email、phone已填過表單");
-        }
-        location.href ="./index_complete_line.html"; 
-      },
-      beforeSend: function () {
-        console.log('beforeSend');
-      },
-      complete: function () {
-        console.log('complete');
-      },
-      error: function (jqXHR, textStatus, errorThrown) {
-        console.log(JSON.stringify(jqXHR));
-        console.log("AJAX errr: " + textStatus + ' : ' + errorThrown);
-        console.log('送出失敗: ' + jqXHR.responseText);
-      }
-    });
-    if ($('#credit').prop("checked")) {
-      $.ajax({
-        type: 'POST',
-        url: 'https://api.ptt.cx:9999/hhh/mail/deco/v2',
-        data: jsonString,
-        dataType: 'json',
-        contentType: 'application/json; charset=utf-8',
+  //   var jsonString = JSON.stringify(formRef);*/
+  //   $.fn.serializeObject = function () {
+  //     var o = {};
+  //     var a = this.serializeArray();
+  //     o["id"] = 0;
+  //     o["time_stamp"] = "";
+  //     $.each(a, function () {
+  //       if (o[this.name]) {
+  //         if (!o[this.name].push) {
+  //           o[this.name] = [o[this.name]];
+  //         }
+  //         o[this.name].push(this.value || '');
+  //       } else {
+  //         o[this.name] = this.value || '';
+  //       }
+  //     });
+    
+  //     return o;
+  //   };
+
+  // var jsonInfo = $('.contact-form1').serializeObject();
+  // var jsonString = JSON.stringify(jsonInfo);
+  // console.log(jsonString);
+ 
+  let formdata='';
+
+  formdata='{"email": "' + email + '",'
+  formdata+='"name": "' + name + '",'
+  formdata+='"phone": "' + phone + '",'
+  formdata+='"loc": "' + loc + '",'
+  formdata+='"h_class": "' + h_class + '",'
+  formdata+='"version": "' + version + '",'
+  formdata+='"id": "' + 0 + '",'
+  formdata+='"time_stamp": "' + 0 + '",'
+  formdata+='"size": "' + size + '"}';
+
+console.log(formdata);
   
-        success: function (res) {
-          alert('送出成功');
-        },
-        error: function (error) {
-          console.error(error);
-          alert('送出失敗');
+  $.ajax({
+    type: 'POST',
+    url: 'https://go.hhh.com.tw:8002/deco_request_detail',
+    data: formdata,
+    dataType: 'json',
+    // async: false,
+    
+    success: function (data) {
+      console.log('送出成功: ' + data);
+      if (data == 0) {
+        if ($('#credit').prop("checked")) {
+          $.ajax({
+            type: 'POST',
+            url: 'https://api.ptt.cx:9999/hhh/mail/deco/v2',
+            data: formdata,
+            dataType: 'json',
+            contentType: 'application/json; charset=utf-8',
+            async: false,
+            
+            success: function (res) {
+              console.log('送出成功');
+            },
+            error: function (error) {
+              console.error(error);
+              console.log('送出失敗');
+            }
+      
+          });
         }
-  
-      });
+        // alert("送出成功");
+      } else if (data == 1) {
+        alert("此email已填過表單");
+      } else if (data == 2) {
+        alert("此phone已填過表單");
+      } else if (data == 3) {
+        alert("此email、phone已填過表單");
+      }
+      location.href = "./index_complete_line.html";
+    },
+
+    beforeSend: function () {
+      console.log('beforeSend');
+    },
+    complete: function () {
+      console.log('complete');
+
+
+    },
+
+    error: function (jqXHR, textStatus, errorThrown) {
+      console.log(JSON.stringify(jqXHR));
+      console.log("AJAX errr: " + textStatus + ' : ' + errorThrown);
+      console.log('送出失敗: ' + jqXHR.responseText);
+      alert("送出失敗");
     }
+  });
+
+
   return false;
-});
+}
+// $.fn.serializeObject = function () {
+//   var o = {};
+//   var a = this.serializeArray();
+//   o["id"] = 0;
+//   o["time_stamp"] = "";
+//   $.each(a, function () {
+//     if (o[this.name]) {
+//       if (!o[this.name].push) {
+//         o[this.name] = [o[this.name]];
+//       }
+//       o[this.name].push(this.value || '');
+//     } else {
+//       o[this.name] = this.value || '';
+//     }
+//   });
+
+//   return o;
+// };
+
+
+// $(".contact-form1").submit(function (e) {
+//   /*	var formRef = $('#form1').serializeArray();
+//     var jsonString = JSON.stringify(formRef);*/
+//   var jsonInfo = $('.contact-form1').serializeObject();
+//   var jsonString = JSON.stringify(jsonInfo);
+//   console.log(jsonString),
+
+//     $.ajax({
+//       type: 'POST',
+//       url: 'https://go.hhh.com.tw:8002/deco_request_detail',
+//       data: jsonString,
+//       dataType: 'json',
+//       // async: false,
+
+//       success: function (data) {
+//         console.log('送出成功: ' + data);
+//         if (data == 0) {
+//           alert("送出成功");
+//         } else if (data == 1) {
+//           alert("此email已填過表單");
+//         } else if (data == 2) {
+//           alert("此phone已填過表單");
+//         } else if (data == 3) {
+//           alert("此email、phone已填過表單");
+//         }
+//         location.href ="./index_complete_line.html"; 
+//       },
+//       beforeSend: function () {
+//         console.log('beforeSend');
+//       },
+//       complete: function () {
+//         console.log('complete');
+//       },
+//       error: function (jqXHR, textStatus, errorThrown) {
+//         console.log(JSON.stringify(jqXHR));
+//         console.log("AJAX errr: " + textStatus + ' : ' + errorThrown);
+//         console.log('送出失敗: ' + jqXHR.responseText);
+//       }
+//     });
+//     if ($('#credit').prop("checked")) {
+//       $.ajax({
+//         type: 'POST',
+//         url: 'https://api.ptt.cx:9999/hhh/mail/deco/v2',
+//         data: jsonString,
+//         dataType: 'json',
+//         contentType: 'application/json; charset=utf-8',
+  
+//         success: function (res) {
+//           alert('送出成功');
+//         },
+//         error: function (error) {
+//           console.error(error);
+//           alert('送出失敗');
+//         }
+  
+//       });
+//     }
+//   return false;
+// });
 
 $("*").each(function (index, element) {
   // 此元素被點選後執行

desktopB/index.html

@@ -377,7 +377,7 @@
 
                     </div>
                 </form> -->
-                <form class="contact-form1">
+                <div class="contact-form1">
                     <input type="hidden" name="version" value="b">
                     <div id="contact-form" name="myForm">
                         <div id="form-left">
@@ -408,7 +408,7 @@
                                 <option class="option">台東縣</option>
                                 <option class="option">澎湖縣</option>
                             </select>
-                            <select name="h_class" id="type" required>
+                            <select name="h_class" id="h_class" required>
                                 <option value="" disabled selected="selected">您目前房屋類型</option>
                                 <option class="option">預售屋</option>
                                 <option class="option">中古屋</option>
@@ -436,7 +436,7 @@
                                 <option class="option">500萬以上</option>
                             </select> -->
                             <!-- <input name="size" type="text" id="square" placeholder="請輸入坪數" required> -->
-                            <select name="size" id="square" required style="margin-right:1.5vw">
+                            <select name="size" id="size" required style="margin-right:1.5vw">
                                 <option value="" disabled selected="selected">您目前房屋實際坪數</option>
                                 <option class="option">10坪以下</option>
                                 <option class="option">11~20坪</option>
@@ -523,11 +523,10 @@
                             </label>
                         </div>
                         <div class="form-btn">
-                            <input class="btn" style="opacity: 1;" type="submit" value="送出">
-
+                            <button id="submitbutton" class="btn" style="opacity: 1;" type="submit" onclick="submit()">送出</button>
                         </div>
                     </div>
-                </form>
+                </div>
             </div>
 
         </div>

desktopB/style.css

@@ -290,10 +290,10 @@ body .arrow:hover {
 }
 
 #contact-us #contact-form #loc,
-#contact-us #contact-form #type,
+#contact-us #contact-form #h_class,
 #contact-us #contact-form #modal,
 #contact-us #contact-form #budget,
-#contact-us #contact-form #square,
+#contact-us #contact-form #size,
 #contact-us #contact-form #style,
 #contact-us #contact-form #datepicker,
 #contact-us #contact-form #email,

desktopB/style.scss

@@ -252,16 +252,16 @@ body {
         margin: 0 auto;
         padding: 24px;
         #loc,
-        #type,
+        #h_class,
         #modal,
         #budget,
-        #square,
+        #size,
         #style,
         #datepicker,
         #email,
         #name,
         #phone,
-        #gender {
+        #gender  {
             width: 100%;
             height: 50px;
             margin: 20px 0;

mobileB/goto.js

@@ -5,51 +5,92 @@ $(".feedback-slider1").slick({
     swipe: true,
   });
   
+  function submit() {
+    $('#submitbutton').text('表單送出中，請稍後');
+    
+   let loc = $( "#loc option:selected" ).text();
   
-
-  $.fn.serializeObject = function () {
-    var o = {};
-    var a = this.serializeArray();
-    o["id"] = 0;
-    o["time_stamp"] = "";
-    $.each(a, function () {
-      if (o[this.name]) {
-        if (!o[this.name].push) {
-          o[this.name] = [o[this.name]];
-        }
-        o[this.name].push(this.value || '');
-      } else {
-        o[this.name] = this.value || '';
-      }
-    });
+   let h_class=$( "#h_class option:selected" ).text();
   
-    return o;
-  };
- 
+   let size=$( "#size option:selected" ).text();
   
-  $(".contact-form1").submit(function (e) {
-    /*	var formRef = $('#form1').serializeArray();
-      var jsonString = JSON.stringify(formRef);*/
-    var jsonInfo = $('.contact-form1').serializeObject();
-    var jsonString = JSON.stringify(jsonInfo);
-    // email 格式檢查
+   let name=$( "#name" ).val();
   
-   
+   let email=$( "#email" ).val();
   
-    
+   let phone=$( "#phone" ).val();
   
+   let version=$( "#version" ).val();
   
+    /*	var formRef = $('#form1').serializeArray();
+    //   var jsonString = JSON.stringify(formRef);*/
+    //   $.fn.serializeObject = function () {
+    //     var o = {};
+    //     var a = this.serializeArray();
+    //     o["id"] = 0;
+    //     o["time_stamp"] = "";
+    //     $.each(a, function () {
+    //       if (o[this.name]) {
+    //         if (!o[this.name].push) {
+    //           o[this.name] = [o[this.name]];
+    //         }
+    //         o[this.name].push(this.value || '');
+    //       } else {
+    //         o[this.name] = this.value || '';
+    //       }
+    //     });
+      
+    //     return o;
+    //   };
   
+    // var jsonInfo = $('.contact-form1').serializeObject();
+    // var jsonString = JSON.stringify(jsonInfo);
+    // console.log(jsonString);
+   
+    let formdata='';
+  
+    formdata='{"email": "' + email + '",'
+    formdata+='"name": "' + name + '",'
+    formdata+='"phone": "' + phone + '",'
+    formdata+='"loc": "' + loc + '",'
+    formdata+='"h_class": "' + h_class + '",'
+    formdata+='"version": "' + version + '",'
+    formdata+='"id": "' + 0 + '",'
+    formdata+='"time_stamp": "' + 0 + '",'
+    formdata+='"size": "' + size + '"}';
+  
+  console.log(formdata);
+    
     $.ajax({
       type: 'POST',
       url: 'https://go.hhh.com.tw:8002/deco_request_detail',
-      data: jsonString,
+      data: formdata,
       dataType: 'json',
-      // async: false, 
+      // async: false,
+      
       success: function (data) {
         console.log('送出成功: ' + data);
         if (data == 0) {
-          alert("送出成功");
+          if ($('#credit').prop("checked")) {
+            $.ajax({
+              type: 'POST',
+              url: 'https://api.ptt.cx:9999/hhh/mail/deco/v2',
+              data: formdata,
+              dataType: 'json',
+              contentType: 'application/json; charset=utf-8',
+              async: false,
+              
+              success: function (res) {
+                console.log('送出成功');
+              },
+              error: function (error) {
+                console.error(error);
+                console.log('送出失敗');
+              }
+        
+            });
+          }
+          // alert("送出成功");
         } else if (data == 1) {
           alert("此email已填過表單");
         } else if (data == 2) {
@@ -57,41 +98,115 @@ $(".feedback-slider1").slick({
         } else if (data == 3) {
           alert("此email、phone已填過表單");
         }
-        location.href ="./index_complete_line.html"; 
+        location.href = "./index_complete_line.html";
       },
+  
       beforeSend: function () {
         console.log('beforeSend');
       },
       complete: function () {
         console.log('complete');
+  
+  
       },
+  
       error: function (jqXHR, textStatus, errorThrown) {
         console.log(JSON.stringify(jqXHR));
         console.log("AJAX errr: " + textStatus + ' : ' + errorThrown);
         console.log('送出失敗: ' + jqXHR.responseText);
+        alert("送出失敗");
       }
     });
-
-    if ($('#credit').prop("checked")) {
-      $.ajax({
-        type: 'POST',
-        url: 'https://api.ptt.cx:9999/hhh/mail/deco/v2',
-        data: jsonString,
-        dataType: 'json',
-        contentType: 'application/json; charset=utf-8',
-  
-        success: function (res) {
-          alert('送出成功');
-        },
-        error: function (error) {
-          console.error(error);
-          alert('送出失敗');
-        }
   
-      });
-    }
+  
     return false;
-  });
+  }
+
+  // $.fn.serializeObject = function () {
+  //   var o = {};
+  //   var a = this.serializeArray();
+  //   o["id"] = 0;
+  //   o["time_stamp"] = "";
+  //   $.each(a, function () {
+  //     if (o[this.name]) {
+  //       if (!o[this.name].push) {
+  //         o[this.name] = [o[this.name]];
+  //       }
+  //       o[this.name].push(this.value || '');
+  //     } else {
+  //       o[this.name] = this.value || '';
+  //     }
+  //   });
+  
+  //   return o;
+  // };
+ 
+  
+  // $(".contact-form1").submit(function (e) {
+  //   /*	var formRef = $('#form1').serializeArray();
+  //     var jsonString = JSON.stringify(formRef);*/
+  //   var jsonInfo = $('.contact-form1').serializeObject();
+  //   var jsonString = JSON.stringify(jsonInfo);
+  //   // email 格式檢查
+  
+   
+  
+    
+  
+  
+  
+  //   $.ajax({
+  //     type: 'POST',
+  //     url: 'https://go.hhh.com.tw:8002/deco_request_detail',
+  //     data: jsonString,
+  //     dataType: 'json',
+  //     // async: false, 
+  //     success: function (data) {
+  //       console.log('送出成功: ' + data);
+  //       if (data == 0) {
+  //         alert("送出成功");
+  //       } else if (data == 1) {
+  //         alert("此email已填過表單");
+  //       } else if (data == 2) {
+  //         alert("此phone已填過表單");
+  //       } else if (data == 3) {
+  //         alert("此email、phone已填過表單");
+  //       }
+  //       location.href ="./index_complete_line.html"; 
+  //     },
+  //     beforeSend: function () {
+  //       console.log('beforeSend');
+  //     },
+  //     complete: function () {
+  //       console.log('complete');
+  //     },
+  //     error: function (jqXHR, textStatus, errorThrown) {
+  //       console.log(JSON.stringify(jqXHR));
+  //       console.log("AJAX errr: " + textStatus + ' : ' + errorThrown);
+  //       console.log('送出失敗: ' + jqXHR.responseText);
+  //     }
+  //   });
+
+  //   if ($('#credit').prop("checked")) {
+  //     $.ajax({
+  //       type: 'POST',
+  //       url: 'https://api.ptt.cx:9999/hhh/mail/deco/v2',
+  //       data: jsonString,
+  //       dataType: 'json',
+  //       contentType: 'application/json; charset=utf-8',
+  
+  //       success: function (res) {
+  //         alert('送出成功');
+  //       },
+  //       error: function (error) {
+  //         console.error(error);
+  //         alert('送出失敗');
+  //       }
+  
+  //     });
+  //   }
+  //   return false;
+  // });
   $("*").each(function (index, element) {
     // 此元素被點選後執行
     $(this).click(function (e) {

mobileB/index.html

@@ -20,47 +20,49 @@
     <meta property="og:locale" content="zh_TW">
     <title>全室裝修</title>
 
-<!-- Global site tag (gtag.js) - Google Ads: 673725167 -->
-<script async src="https://www.googletagmanager.com/gtag/js?id=AW-673725167"></script>
-<script>
-window.dataLayer = window.dataLayer || [];
-function gtag(){dataLayer.push(arguments);}
-gtag('js', new Date());
-  gtag('config', 'UA-133449203-1');
-gtag('config', 'AW-673725167');
-</script>
-<script>
-function gtag_report_conversion(url) {
-var callback = function () {
-if (typeof(url) != 'undefined') {
-window.location = url;
-}
-};
-gtag('event', 'conversion', {
-'send_to': 'AW-673725167/pOjICLCHpdICEO_1oMEC',
-'event_callback': callback
-});
-return false;
-}
-</script>
+    <!-- Global site tag (gtag.js) - Google Ads: 673725167 -->
+    <script async src="https://www.googletagmanager.com/gtag/js?id=AW-673725167"></script>
+    <script>
+        window.dataLayer = window.dataLayer || [];
+        function gtag() { dataLayer.push(arguments); }
+        gtag('js', new Date());
+        gtag('config', 'UA-133449203-1');
+        gtag('config', 'AW-673725167');
+    </script>
+    <script>
+        function gtag_report_conversion(url) {
+            var callback = function () {
+                if (typeof (url) != 'undefined') {
+                    window.location = url;
+                }
+            };
+            gtag('event', 'conversion', {
+                'send_to': 'AW-673725167/pOjICLCHpdICEO_1oMEC',
+                'event_callback': callback
+            });
+            return false;
+        }
+    </script>
 
-<!-- Facebook Pixel Code -->
-<script>
-!function(f,b,e,v,n,t,s)
-{if(f.fbq)return;n=f.fbq=function(){n.callMethod?
-n.callMethod.apply(n,arguments):n.queue.push(arguments)};
-if(!f._fbq)f._fbq=n;n.push=n;n.loaded=!0;n.version='2.0';
-n.queue=[];t=b.createElement(e);t.async=!0;
-t.src=v;s=b.getElementsByTagName(e)[0];
-s.parentNode.insertBefore(t,s)}(window, document,'script',
-'https://connect.facebook.net/en_US/fbevents.js');
-fbq('init', '585285442299590');
-fbq('track', 'PageView');
-</script>
-<noscript><img height="1" width="1" style="display:none"
-src="https://www.facebook.com/tr?id=585285442299590&ev=PageView&noscript=1"
-/></noscript>
-<!-- End Facebook Pixel Code -->
+    <!-- Facebook Pixel Code -->
+    <script>
+        !function (f, b, e, v, n, t, s) {
+            if (f.fbq) return; n = f.fbq = function () {
+                n.callMethod ?
+                n.callMethod.apply(n, arguments) : n.queue.push(arguments)
+            };
+            if (!f._fbq) f._fbq = n; n.push = n; n.loaded = !0; n.version = '2.0';
+            n.queue = []; t = b.createElement(e); t.async = !0;
+            t.src = v; s = b.getElementsByTagName(e)[0];
+            s.parentNode.insertBefore(t, s)
+        }(window, document, 'script',
+            'https://connect.facebook.net/en_US/fbevents.js');
+        fbq('init', '585285442299590');
+        fbq('track', 'PageView');
+    </script>
+    <noscript><img height="1" width="1" style="display:none"
+            src="https://www.facebook.com/tr?id=585285442299590&ev=PageView&noscript=1" /></noscript>
+    <!-- End Facebook Pixel Code -->
     <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/slick-carousel@1.8.1/slick/slick.css" />
     <link rel="stylesheet" type="text/css" href="//cdn.jsdelivr.net/npm/slick-carousel@1.8.1/slick/slick-theme.css" />
 
@@ -168,7 +170,7 @@ src="https://www.facebook.com/tr?id=585285442299590&ev=PageView&noscript=1"
             </a>
         </nav>
         <div id="sec-contact">
-           
+
             <div class="form-title py-3">
                 <h1>【免費裝修顧問諮詢】</h1>
                 <p>幫您創造專屬的幸福空間.</p>
@@ -318,13 +320,14 @@ src="https://www.facebook.com/tr?id=585285442299590&ev=PageView&noscript=1"
 
                     </div>
                 </form> -->
-                <form class="contact-form1">
+                <div class="contact-form1">
                     <input type="hidden" name="version" value="b">
                     <div id="contact-form" name="myForm">
                         <div id="form-left">
                             <input type="email" name="email" id="email" placeholder="電子信箱" required>
                             <input type="text" name="name" id="name" placeholder="聯絡人名稱" required>
-                            <input type="text" name="phone" id="phone" placeholder="聯絡電話(格式:0987654321)" pattern="09\d{2}\d{6}" required>
+                            <input type="text" name="phone" id="phone" placeholder="聯絡電話(格式:0987654321)"
+                                pattern="09\d{2}\d{6}" required>
                             <select name="loc" id="loc" required>
                                 <option value="" disabled selected="selected">您目前所在地區?</option>
                                 <option class="option">基隆市</option>
@@ -348,7 +351,7 @@ src="https://www.facebook.com/tr?id=585285442299590&ev=PageView&noscript=1"
                                 <option class="option">台東縣</option>
                                 <option class="option">澎湖縣</option>
                             </select>
-                            <select name="h_class" id="type" required>
+                            <select name="h_class" id="h_class" required>
                                 <option value="" disabled selected="selected">您目前房屋類型</option>
                                 <option class="option">預售屋</option>
                                 <option class="option">中古屋</option>
@@ -376,7 +379,7 @@ src="https://www.facebook.com/tr?id=585285442299590&ev=PageView&noscript=1"
                                 <option class="option">500萬以上</option>
                             </select> -->
                             <!-- <input name="size" type="text" id="square" placeholder="請輸入坪數" required> -->
-                            <select name="size" id="square" required style="margin-right:1.5vw">
+                            <select name="size" id="size" required style="margin-right:1.5vw">
                                 <option value="" disabled selected="selected">您目前房屋實際坪數</option>
                                 <option class="option">10坪以下</option>
                                 <option class="option">11~20坪</option>
@@ -427,14 +430,14 @@ src="https://www.facebook.com/tr?id=585285442299590&ev=PageView&noscript=1"
                                 <option class="option">異國風</option>
                             </select> -->
                             <!-- <input name="prefer_date" class="datepicker" type="text" id="datepicker" placeholder="預選裝修日期" required> -->
-                        </div>              
-                            <!-- <div id="fb_login">
+                        </div>
+                        <!-- <div id="fb_login">
                                 <button id="fb-button"><img src="./img/logo/facebook.png" alt="">
                                    <span id="line" style=" font-size: 30px;">｜</span><p>使用fb填入信箱與姓名</p>
                                 </button>
                                 <span id="FB_STATUS_2"></span>
                             </div> -->
-                            <!-- <div id="fb_login">
+                        <!-- <div id="fb_login">
                                 <fb:login-button id="fb-button" scope="public_profile,email"
                                     onlogin="checkLoginState();" data-button-type="continue_with" data-size="large">
                                     使用FB填入信箱與姓名
@@ -442,34 +445,35 @@ src="https://www.facebook.com/tr?id=585285442299590&ev=PageView&noscript=1"
                                 <div id="status"></div>
                             </div> -->
 
-                          
-                            <!-- <select name="gender" id="gender" required>
+
+                        <!-- <select name="gender" id="gender" required>
                                 <option value="" disabled selected="selected">性別</option>
                                 <option class="option">男</option>
                                 <option class="option">女</option>
                             </select> -->
-                            <!-- <input type="checkbox" style="margin:30px 10px;" id="checkbox" checked><label
+                        <!-- <input type="checkbox" style="margin:30px 10px;" id="checkbox" checked><label
                                 for="agree" style="width: 40px;">同意</label><a target="https://hhh.com.tw/about/privacy_policy/"
                                 href="https://hhh.com.tw/about/privacy_policy/">免責聲明與隱私使用政策</a> -->
-                                <div>
-                                    <input type="checkbox" style="margin:15px 10px;" id="checkbox" checked><label
-                                        for="agree" class="ms-1" style="width: 40px;">同意</label><a
-                                        target="_blank"
-                                        href="https://hhh.com.tw/about/privacy_policy/">免責聲明與隱私使用政策</a>
-                                </div>
-                                <div class="my-2">
-                                    <input type="checkbox" style="margin:0px 10px; position: relative; bottom:20px;" class="custom-control-input" id="credit">
-                                    <label class="custom-control-label w-75" for="credit">
-                                            裝潢貸款享超長7年還款期，最低利率2.59%起。
-                                    </label>
-                                </div>
-                                <div class="form-btn">
-                                    <input class="btn" style="opacity: 1;" type="submit" value="送出">
-                                </div>
+                        <div>
+                            <input type="checkbox" style="margin:15px 10px;" id="checkbox" checked><label for="agree"
+                                class="ms-1" style="width: 40px;">同意</label><a target="_blank"
+                                href="https://hhh.com.tw/about/privacy_policy/">免責聲明與隱私使用政策</a>
+                        </div>
+                        <div class="my-2">
+                            <input type="checkbox" style="margin:0px 10px; position: relative; bottom:20px;"
+                                class="custom-control-input" id="credit">
+                            <label class="custom-control-label w-75" for="credit">
+                                裝潢貸款享超長7年還款期，最低利率2.59%起。
+                            </label>
+                        </div>
+                        <div class="form-btn">
+                            <button id="submitbutton" class="btn" style="opacity: 1;" type="submit"
+                                onclick="submit()">送出</button>
+                        </div>
                     </div>
-                </form>
+                </div>
             </div>
-            
+
         </div>
     </section>
     <section id="feedback">

mobileB/style.css

@@ -325,10 +325,10 @@ body .arrow:hover {
 }
 
 #contact-us #contact-form #loc,
-#contact-us #contact-form #type,
+#contact-us #contact-form #h_class,
 #contact-us #contact-form #modal,
 #contact-us #contact-form #budget,
-#contact-us #contact-form #square,
+#contact-us #contact-form #size,
 #contact-us #contact-form #style,
 #contact-us #contact-form #datepicker,
 #contact-us #contact-form #email,

mobileB/style.scss

@@ -256,10 +256,10 @@ body {
         margin: 0 auto;
         padding: 10px;
         #loc,
-        #type,
+        #h_class,
         #modal,
         #budget,
-        #square,
+        #size,
         #style,
         #datepicker,
         #email,