Merge branch 'master' of git.oschina.net:yiguanjia/php

www/webapp/housekeeping/src/components/reservation.vue

@@ -40,7 +40,8 @@
         <!--服务地址-->
         <div class="weui-cell">
           <div class="weui-cell__hd"><label class="weui-label">服务地址</label></div>
-          <div class="weui-cell__bd"><input v-model="userAddress" class="weui-input" type="text" required="" placeholder="输入您需要上门服务的地址">
+          <div class="weui-cell__bd"><input v-model="userAddress" class="weui-input" type="text" required=""
+                                            placeholder="输入您需要上门服务的地址">
           </div>
           <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
         </div>
@@ -412,7 +413,6 @@
           skillsArray = [];
 
 
-
         // 用户名判断
         /*        if (!that.userName) {
                   weui.alert('请输入您的姓名');
@@ -498,11 +498,13 @@
           that.userAge = 1
         }
         let AM = time(that.serviceTimeAM)
+        // alert(AM);
+        return;
         let PM = time(that.serviceTimePM)
+
         // 字符串拼接
         let stitching = `&user_id=${config.user_id}&mobile=${that.mobile}&user_name=${that.userName}&type=${that.serviceType + 1}&skill=${JSON.stringify(skillsArray)}&cart=${that.resServiceArr}&age=${that.userAge}&address=${that.userAddress}&store_id=${that.storeId}&desc=${that.dec}&yc_time=${that.resTime}&server_start_time=${AM}&server_end_time=${PM}`;
-        alert(stitching);
-        return;
+
         if (that)
           axios.post(config.apiPath + 'j/HouseKeeping/Add' + stitching).then(res => {
             // console.log(res);
@@ -550,7 +552,9 @@
 
   function time(t) {
     let stringTime = '1970-01-01 ' + t + ':00';
+    alert(stringTime);
     let timestamp = Date.parse(new Date(stringTime));
+    alert(timestamp);
     timestamp = timestamp / 1000;
     return timestamp;
   }