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

www/protected/modules/moonclub/views/web/index.php

@@ -26,7 +26,7 @@
   <!-- vue~资源域名-->
   <?php $host = 'http://common.yiguanjia.me/'; ?>
   <!-- vue~资源版本号 -->
-  <?php $newVersion = 2018012202 ?>
+  <?php $newVersion = 2018012300 ?>
   <link rel=stylesheet href=https://res.wx.qq.com/open/libs/weui/1.1.2/weui.min.css>
   <script type=text/javascript src=https://res.wx.qq.com/open/libs/weuijs/1.1.2/weui.min.js></script>
   <link href=<?php echo $host ?>webapp/moonclub_new/home/static/css/app.css?v=<?php echo $newVersion ?> rel=stylesheet>

www/webapp/housekeeping/src/components/management/edit.vue

@@ -138,7 +138,7 @@
         that.btnSubmintStrShow = false
       }
       // 预约时间
-      console.log(that.order)
+      console.log(that.order);
       if (that.order.status_time !== 0) {
         that.bookingTime = that.order.status_time
       }
@@ -151,13 +151,13 @@
         that.techMobile = that.order.tech_mobile;
       }
       // 转化时间格式
-      /*     this.order.yc_time = _.timetrans(this.order.yc_time); // 预产期
-           this.order.yc_time = this.order.yc_time.substring(0, 10); // 预产期
-           this.order.server_start_time = _.timetrans(this.order.server_start_time);
-           this.order.server_start_time = this.order.server_start_time.substring(11, 16);
-           this.order.server_end_time = _.timetrans(this.order.server_end_time);
-           this.order.server_end_time = this.order.server_end_time.substring(11, 16);
-           */
+      // this.order.yc_time = _.timetrans(this.order.yc_time); // 预产期
+      this.order.yc_time = this.order.yc_time.substring(0, 10); // 预产期
+      this.order.server_start_time = _.timetrans(this.order.server_start_time);
+      this.order.server_start_time = this.order.server_start_time.substring(11, 16);
+      this.order.server_end_time = _.timetrans(this.order.server_end_time);
+      this.order.server_end_time = this.order.server_end_time.substring(11, 16);
+
       if (this.order.status - 1 == 0) {
         this.eAppointmentDate = true
       }

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

@@ -7,7 +7,7 @@
         <!--姓名-->
         <div class="weui-cell" v-if="iCreateCodeShow">
           <div class="weui-cell__hd"><label class="weui-label">姓名</label></div>
-          <div class="weui-cell__bd"><input v-model="userName" class="weui-input" type="text" required="" maxlength="11"
+          <div class="weui-cell__bd"><input v-model="userName" class="weui-input" type="text" required=""
                                             disabled
                                             placeholder="输入您的姓名">
           </div>
@@ -40,8 +40,7 @@
         <!--服务地址-->
         <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=""
-                                            maxlength="11" 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>
@@ -94,7 +93,7 @@
         <!--孩子年龄-->
         <div v-if="serviceType == 2" class="weui-cell">
           <div class="weui-cell__hd"><label class="weui-label">孩子年龄</label></div>
-          <div class="weui-cell__bd"><input v-model="userAge" class="weui-input" type="text" required="" maxlength="11"
+          <div class="weui-cell__bd"><input v-model="userAge" class="weui-input" type="text" required=""
                                             placeholder="输入您孩子的年龄">
           </div>
           <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
@@ -102,7 +101,7 @@
         <!--备注-->
         <div class="weui-cell">
           <div class="weui-cell__hd"><label class="weui-label">备注</label></div>
-          <div class="weui-cell__bd"><input v-model="dec" class="weui-input" type="text" required="" maxlength="11"
+          <div class="weui-cell__bd"><input v-model="dec" class="weui-input" type="text" required=""
                                             placeholder="补充您的需求">
           </div>
           <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>

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

@@ -7,7 +7,7 @@
         <!--姓名-->
         <div class="weui-cell">
           <div class="weui-cell__hd"><label class="weui-label">姓名</label></div>
-          <div class="weui-cell__bd"><input v-model="userName" class="weui-input" type="text" required="" maxlength="11"
+          <div class="weui-cell__bd"><input v-model="userName" class="weui-input" type="text" required=""
                                             placeholder="输入您的姓名">
           </div>
           <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
@@ -101,15 +101,15 @@
           return
         }
         // 检验手机号码
-        if (that.iCode !== that.code || that.iCode == '') {
+        if (Number.parseInt(that.iCode) !== that.code) {
           weui.alert('您手机号码未通过验证,请重新操作!');
           return
         }
         // 提交数据
         axios.post(_.apiPath + 'j/HouseKeeping/AddUserInfo&user_id=' + _.user_id + '&mobile=' + that.mobile + '&name=' + that.userName).then(res => {
-          if(res.data.success){
+          if (res.data.success) {
             weui.alert('注册成功', function () {
-              that.$router.push({path:'/'});
+              that.$router.push({path: '/'});
               return
             });
           }
@@ -124,15 +124,15 @@
           return
         }
         if (this.iCreateCode === this.createCode) {
-          axios.get(_.apiPath + '/moonclub/reserve/code&number=' + this.mobile).then(res => {
+          axios.get(_.apiPath + '/moonclub/reserve/code&mobile=' + this.mobile).then(res => {
             // 短信发送成功
             if (res.data.success) {
               weui.alert('短信已发送,请留意查收!');
               // 绑定短信验证码
               this.code = res.data.data.code;
               // this.iCode = this.code // 系统调试时开启
-              this.iCreateCode = '';// 清空已输入验证码
-              this.createCode = createCode(); // 重置验证码
+              // this.iCreateCode = '';// 清空已输入验证码
+              // this.createCode = createCode(); // 重置验证码
             } else {
               weui.alert('短信发送发送失败,请稍后再试!');
             }

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

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

www/webapp/moonclub_new/src/components/userInfo.vue

@@ -105,15 +105,15 @@
           return
         }
         if (this.iCreateCode === this.createCode) {
-          axios.get(config.apiPath + '/moonclub/reserve/code&number=' + this.number).then(res => {
+          axios.get(config.apiPath + '/moonclub/reserve/code&mobile=' + this.number).then(res => {
             // 短信发送成功
             if (res.data.success) {
               weui.alert('短信已发送,请留意查收!');
               // 绑定短信验证码
               this.code = res.data.data.code;
               // this.iCode = this.code // 系统调试时开启
-              this.iCreateCode = '';// 清空已输入验证码
-              this.createCode = createCode(); // 重置验证码
+              // this.iCreateCode = '';// 清空已输入验证码
+              // this.createCode = createCode(); // 重置验证码
             } else {
               weui.alert('短信发送发送失败,请稍后再试!');
             }