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

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

@@ -500,7 +500,7 @@
         let AM = time(that.serviceTimeAM);
         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}`;
+        let stitching = `&user_id=${config.user_id}&status_time=0&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}`;
         if (that)
           axios.post(config.apiPath + 'j/HouseKeeping/Add' + stitching).then(res => {
             // console.log(res);

www/webapp/housekeeping/src/config/index.js

@@ -30,11 +30,11 @@ if (locationHref.indexOf('http://localhost:8080/') > -1) {
   // userId = '582405cea84ea02e3e8b4611' // 养老院
   // userId = '59e41443fb48a7552f8b459e'; // 管理员
   // 张工
-  // userId = '582849af9f5160c2048b55dc';
+  userId = '582849af9f5160c2048b55dc';
   // 戴老师
   // userId = '57e38f1b9f5160ac048b457d' // 顾客
   // 刘星
-  userId = '5860c5ce9f5160ad048b650f'
+  // userId = '5860c5ce9f5160ad048b650f'
 } else if (locationHref.indexOf('admin.yiguanjiadev.me') > -1) {
   apiPath = 'http://admin.yiguanjiadev.me/index.php?r=';
   // userId = '57fe2dc59f5160a1048b4591'; // 享月会