1

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

@@ -26,7 +26,7 @@
   <!-- vue~资源域名-->
   <?php $host = 'http://common.yiguanjia.me/'; ?>
   <!-- vue~资源版本号 -->
-  <?php $newVersion = 2018012201 ?>
+  <?php $newVersion = 2018012202 ?>
   <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/Home.vue

@@ -54,7 +54,7 @@
       demand(type) {
         let that = this;
         if(that.administrator){
-          weui.alert('由于您是管理员,未获得下单权限！');
+          weui.alert('门店管理员无法预约服务！');
           return;
         }
         if (this.registered) {

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

@@ -295,7 +295,7 @@
         weui.picker(that.serviceArr, {
           className: 'custom-classname',
           container: 'body',
-          defaultValue: [0],
+          defaultValue: [1],
           onChange: function (result) {
           },
           onConfirm: function (result) {

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

@@ -280,7 +280,7 @@
         weui.picker(that.serviceSkillsArr, {
           className: 'custom-classname',
           container: 'body',
-          defaultValue: [0],
+          defaultValue: [1],
           onChange: function (result) {
           },
           onConfirm: function (result) {
@@ -304,7 +304,7 @@
         weui.picker(newStoreArr, {
           className: 'custom-classname',
           container: 'body',
-          defaultValue: [0],
+          defaultValue: [1],
           onChange: function (result) {
           },
           onConfirm: function (result) {
@@ -320,7 +320,7 @@
         weui.picker(that.serviceTimeArrAM, {
           className: 'custom-classname',
           container: 'body',
-          defaultValue: [0],
+          defaultValue: [1],
           onChange: function (result) {
           },
           onConfirm: function (result) {
@@ -334,7 +334,7 @@
         weui.picker(that.serviceTimeArrPM, {
           className: 'custom-classname',
           container: 'body',
-          defaultValue: [0],
+          defaultValue: [1],
           onChange: function (result) {
           },
           onConfirm: function (result) {
@@ -348,7 +348,7 @@
         weui.picker(that.serviceArr, {
           className: 'custom-classname',
           container: 'body',
-          defaultValue: [0],
+          defaultValue: [1],
           onChange: function (result) {
           },
           onConfirm: function (result) {

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

@@ -130,7 +130,7 @@
               weui.alert('短信已发送,请留意查收!');
               // 绑定短信验证码
               this.code = res.data.data.code;
-              this.iCode = this.code // 系统调试时开启
+              // this.iCode = this.code // 系统调试时开启
               this.iCreateCode = '';// 清空已输入验证码
               this.createCode = createCode(); // 重置验证码
             } else {

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

@@ -25,7 +25,7 @@ if (test) {
 }
 // 判断是否为dev开发
 if (locationHref.indexOf('http://localhost:8080/') > -1) {
-  apiPath = 'http://commontest.yiguanjia.me/index.php?r=';
+  apiPath = 'http://common.yiguanjia.me/index.php?r=';
   // userId = '57fe2dc59f5160a1048b4591' // 享月会
   // userId = '582405cea84ea02e3e8b4611' // 养老院
   userId = '59e41443fb48a7552f8b459e'; // 管理员

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

@@ -79,7 +79,7 @@
           for (let i in this.oldOrderList) {
             // orderTime
             if (parseInt(this.oldOrderList[i].order_time) > 0) {
-              this.oldOrderList[i].order_time = _.timetrans(parseInt(this.oldOrderList[i].order_time))
+              // this.oldOrderList[i].order_time = _.timetrans(parseInt(this.oldOrderList[i].order_time))
             } else {
               this.oldOrderList[i].order_time = '暂无服务时间'
             }