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

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

@@ -39,7 +39,7 @@
         <div v-if="order.contract != 2"
              style="width: 100%;border-bottom: 1px solid #afafaf;height: 1px;margin:20px 0;"></div>
         <div v-if='!showTech  && order.status != 4 '><span class="title edit_title">人员：</span>{{order.tech}}</div>
-        <div v-if="order.status === 3 && order.status != 4 "><span class="title edit_title">人员电话：</span><span>{{order.tech_mobile}}</span>
+        <div v-if="order.status === 3 && order.status != 4 "><span class="title edit_title">手机：</span><span>{{order.tech_mobile}}</span>
         </div>
         <div v-if="order.status >  2 && order.status != 4"><span class="title edit_title">面试：</span>{{order.status_time
           == '1970-01-01 08:00:00'?'未设置面试时间':order.status_time}}
@@ -60,7 +60,7 @@
           <span class="title edit_title">人员：</span><span class="edit" @click="selectF">{{tech}}</span>
         </div>
         <div v-if="order.status !== 3 && order.contract !== 2  && order.status != 4  && techMobile != ''">
-          <span class="title edit_title">人员电话：</span><span class="edit" @click="selectF">{{techMobile}}</span>
+          <span class="title edit_title">手机：</span><span class="edit" @click="selectF">{{techMobile}}</span>
         </div>
         <!--
         家政员
@@ -69,7 +69,7 @@
                                                       placeholder='请输入家政员'></span>
         </div>
         <div v-if="order.status !== 3 && order.contract !== 2  && order.status != 4 ">
-          <span class="title">人员电话：</span><span><input v-model="techMobile" class="tech edit" type="text"
+          <span class="title">手机：</span><span><input v-model="techMobile" class="tech edit" type="text"
                                                         placeholder='请输入人员电话'></span>
         </div>
 

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

@@ -60,10 +60,10 @@ if (locationHref.indexOf('http://localhost:80') > -1) {
   // 刘星
   // userId = '5860c5ce9f5160ad048b650f'
   // 立秋:客户
-  // userId = '5823fe6ca84ea02e3e8b45cb'
+  userId = '5823fe6ca84ea02e3e8b45cb'
   // 邓涛
   // userId = '5a5eeaf3fb48a770708b456b' // 已注册
-  userId = '57fe2dc59f5160a1048b4591'  // 未注册
+  // userId = '57fe2dc59f5160a1048b4591'  // 未注册
   // 家政人员
   // userId = '57fa51649f5160c4048b4948'; // 我喂自己袋盐
   // userId = '5823fe35a84ea0c13e8b461c'; // 我喂自己袋盐2