update email api

desktop11/goto.js

@@ -86,45 +86,95 @@ $(".content1-right").on('beforeChange', function (event, slick, currentSlide, ne
 
 
 
-$.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;
-};
 
 
+function submit() {
+  $('#submitbutton').text('表單送出中，請稍後');
+  
+ let loc = $( "#loc option:selected" ).text();
+
+ 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);
+  //   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,
     
     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) {
@@ -141,6 +191,7 @@ $(".contact-form1").submit(function (e) {
     complete: function () {
       console.log('complete');
 
+
     },
 
     error: function (jqXHR, textStatus, errorThrown) {
@@ -150,27 +201,10 @@ $(".contact-form1").submit(function (e) {
       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;
-});
+}
 
 // $(".contact-form1").submit(function (e) {
 //   if ($('#credit').prop("checked")) {

desktop11/index.html

@@ -501,8 +501,8 @@
     
                         </div>
                     </form> -->
-                    <form class="contact-form1">
-                        <input type="hidden" name="version" value="a">
+                    <div class="contact-form1">
+                        <input type="hidden" id="version" name="version" value="a">
                         <div id="contact-form" name="myForm">
                             <div id="form-left">
                                 <input type="email" name="email" id="email" placeholder="電子信箱" required>
@@ -511,26 +511,26 @@
                                     pattern="09\d{2}\d{6}" required>
                                 <select name="loc" id="loc" required>
                                     <option value="" disabled selected="selected">您目前所在地區?</option>
-                                    <option class="option">基隆市</option>
-                                    <option class="option">台北市</option>
-                                    <option class="option">新北市</option>
-                                    <option class="option">桃園市</option>
-                                    <option class="option">新竹縣</option>
-                                    <option class="option">新竹市</option>
-                                    <option class="option">苗栗縣</option>
-                                    <option class="option">台中市</option>
-                                    <option class="option">彰化縣</option>
-                                    <option class="option">南投縣</option>
-                                    <option class="option">雲林縣</option>
-                                    <option class="option">嘉義縣</option>
-                                    <option class="option">嘉義市</option>
-                                    <option class="option">台南市</option>
-                                    <option class="option">高雄市</option>
-                                    <option class="option">屏東縣</option>
-                                    <option class="option">宜蘭縣</option>
-                                    <option class="option">花蓮縣</option>
-                                    <option class="option">台東縣</option>
-                                    <option class="option">澎湖縣</option>
+                                    <option class="option" value="基隆市">基隆市</option>
+                                    <option class="option" value="台北市">台北市</option>
+                                    <option class="option" value="新北市">新北市</option>
+                                    <option class="option" value="桃園市">桃園市</option>
+                                    <option class="option" value="新竹縣">新竹縣</option>
+                                    <option class="option" value="新竹市">新竹市</option>
+                                    <option class="option" value="苗栗縣">苗栗縣</option>
+                                    <option class="option" value="台中市">台中市</option>
+                                    <option class="option" value="彰化縣">彰化縣</option>
+                                    <option class="option" value="南投縣">南投縣</option>
+                                    <option class="option" value="雲林縣">雲林縣</option>
+                                    <option class="option" value="嘉義縣">嘉義縣</option>
+                                    <option class="option" value="嘉義市">嘉義市</option>
+                                    <option class="option" value="台南市">台南市</option>
+                                    <option class="option" value="高雄市">高雄市</option>
+                                    <option class="option" value="屏東縣">屏東縣</option>
+                                    <option class="option" value="宜蘭縣">宜蘭縣</option>
+                                    <option class="option" value="花蓮縣">花蓮縣</option>
+                                    <option class="option" value="台東縣">台東縣</option>
+                                    <option class="option" value="澎湖縣">澎湖縣</option>
                                 </select>
                                 <select name="h_class" id="h_class" required>
                                     <option value="" disabled selected="selected">您目前房屋類型</option>
@@ -560,7 +560,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>
@@ -640,17 +640,16 @@
                             </div>
                             <div>
                                 <input type="checkbox" style="margin:15px 10px;" class="custom-control-input"
-                                    id="credit">
+                                    id="credit" value="1">
                                 <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="送出">
-
+                                <button id="submitbutton" class="btn" style="opacity: 1;" type="submit" onclick="submit()">送出</button>
                             </div>
                         </div>
-                    </form>
+                    </div>
                 </div>
 
             </div>

desktop11/style.css

@@ -566,7 +566,7 @@ body .arrow:hover {
 #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,

desktop11/style.scss

@@ -497,7 +497,7 @@ body {
         #h_class,
         #modal,
         #budget,
-        #square,
+        #size,
         #style,
         #datepicker,
         #email,

mobile/index.html

@@ -508,7 +508,7 @@ 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="a">
                     <div id="contact-form" name="myForm">
                         <div id="form-left">
@@ -538,7 +538,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>
@@ -566,7 +566,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>
@@ -648,17 +648,16 @@ src="https://www.facebook.com/tr?id=585285442299590&ev=PageView&noscript=1"
                                         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">
+                                    <input type="checkbox" style="margin:0px 10px; position: relative; bottom:20px;" class="custom-control-input" id="credit" value="1">
                                     <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="送出">
-        
+                                    <button id="submitbutton" class="btn" style="opacity: 1;" type="submit" onclick="submit()">送出</button>
                                 </div>
                     </div>
-                </form>
+                </div>
             </div>
             
         </div>

mobile/script/goto.js

@@ -31,41 +31,200 @@ $(".banner-slider").slick({
 });
 
 
-$.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 || '';
-    }
-  });
+// $.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);
+//   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',
+      
 
-  return o;
-};
+//       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: 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);
+//       }
+//     });
+//   }
+//   else{
+//     $.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;
+// });
+
+function submit() {
+  $('#submitbutton').text('表單送出中，請稍後');
+  
+ let loc = $( "#loc option:selected" ).text();
+
+ 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);
+ 
+  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,
+    
     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) {
@@ -73,43 +232,29 @@ $(".contact-form1").submit(function (e) {
       } 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;
-});
-
+}
 
 $("*").each(function (index, element) {
   // 此元素被點選後執行

mobile/style.css

@@ -682,10 +682,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,

mobile/style.scss

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