Эх сурвалжийг харах

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

north 7 жил өмнө
parent
commit
c5b9edc660

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/housekeeping/home/static/css/app.css


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/housekeeping/home/static/js/app.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/housekeeping/home/static/js/app.js.map


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 0
www/webapp/housekeeping/home/static/js/manifest.js.map


+ 1 - 1
www/webapp/housekeeping/src/components/houseKeeping/edit.vue

@@ -143,7 +143,7 @@
                 </label>
                 <label @click="addressEdit = false,readmeEdit = false">
                   <!--<span>希望服务区域:</span>-->
-                  <span>希望服务区域":</span>
+                  <span>区域:</span>
                   <span>
                     <span style="min-height: 24px;display: block;" v-if="descEdit == false"
                           v-model="userInfo.desc"

+ 45 - 37
www/webapp/housekeeping/src/components/houseKeeping/isreg.vue

@@ -7,52 +7,60 @@
 </template>
 
 <script>
-  import _ from '@/config'
+import _ from '@/config';
 
-  export default {
-    name: "isreg",
-    created() {
-      let self = this;
-      let storeId = '';
-      let href = location.href;
-      if (href.indexOf('storeId') > -1) {
-        storeId = 1;
-        _.$http('/j/JGEmpolyer/Register', {
+export default {
+  name: 'isreg',
+  created() {
+    let self = this;
+    let storeId = '';
+    let href = location.href;
+    if (href.indexOf('storeId') > -1) {
+      storeId = Number.parseInt(href.split('storeId=')[1]);
+      _.$http(
+        '/j/JGEmpolyer/Register',
+        {
           userId: _.user_id,
           storeId: storeId,
-          isReg: true
-        }, res => {
+          isReg: true,
+        },
+        res => {
+          console.log(res)
           if (res.data.message == '未注册') {
-            self.$router.push({path: '/houseKeeping/login/', query: {storeId: storeId}});
+            self.$router.push({
+              path: '/houseKeeping/login/',
+              query: { storeId: storeId },
+            });
           } else {
-            self.$router.push({path: '/houseKeeping/info/'});
+            self.$router.push({ path: '/houseKeeping/info/' });
           }
-        })
-      } else {
-        weui.alert('请重新扫二维码,进入本页面', function () {
-          // self.$router.push({path: '/managementList'});
-          // wx.closeWindow();
-        });
-        return
-      }
-    },
-    methods: {}
-  }
+        }
+      );
+    } else {
+      weui.alert('请重新扫二维码,进入本页面', function() {
+        // self.$router.push({path: '/managementList'});
+        // wx.closeWindow();
+      });
+      return;
+    }
+  },
+  methods: {},
+};
 </script>
 
 <style scoped>
-  .isreg {
-    padding: 50% 0;
-    text-align: center;
-    color: #e64340;
-    font-size: 1.5rem;
-    font-weight: bold;
-    text-shadow: 1px 1px 1px #747171;
-  }
+.isreg {
+  padding: 50% 0;
+  text-align: center;
+  color: #e64340;
+  font-size: 1.5rem;
+  font-weight: bold;
+  text-shadow: 1px 1px 1px #747171;
+}
 
-  @media (max-width: 320px) {
-    .isreg {
-      font-size: 1.2rem;
-    }
+@media (max-width: 320px) {
+  .isreg {
+    font-size: 1.2rem;
   }
+}
 </style>

+ 389 - 352
www/webapp/housekeeping/src/components/houseKeeping/login.vue

@@ -6,73 +6,94 @@
       <div class="weui-cells weui-cells_form">
         <!--姓名-->
         <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=""
-                                            placeholder="输入您的姓名">
+          <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="" placeholder="输入您的姓名">
+          </div>
+          <div class="weui-cell__ft">
+            <i class="weui-icon-warn"></i>
           </div>
-          <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
         </div>
         <!--性别-->
         <div class="weui-cell">
-          <div class="weui-cell__hd"><label class="weui-label">性别</label></div>
+          <div class="weui-cell__hd">
+            <label class="weui-label">性别</label>
+          </div>
           <!--color: #9b9b9b;-->
-          <div class="weui-cell__bd"><input style="text-align: left;color: blue;" class="weui-input" type="submit"
-                                            @click="selectSex" :value="sex">
+          <div class="weui-cell__bd"><input style="text-align: left;color: blue;" class="weui-input" type="submit" @click="selectSex" :value="sex">
+          </div>
+          <div class="weui-cell__ft">
+            <i class="weui-icon-warn"></i>
           </div>
-          <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
         </div>
         <!--门店-->
         <div class="weui-cell">
-          <div class="weui-cell__hd"><label class="weui-label">门店</label></div>
+          <div class="weui-cell__hd">
+            <label class="weui-label">门店</label>
+          </div>
           <!--color: #9b9b9b;-->
-          <div class="weui-cell__bd"><input style="text-align: left" class="weui-input" type="submit"
-                                            :value="storeStr">
+          <div class="weui-cell__bd"><input style="text-align: left" class="weui-input" type="submit" :value="storeStr">
+          </div>
+          <div class="weui-cell__ft">
+            <i class="weui-icon-warn"></i>
           </div>
-          <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
         </div>
         <!--手机验证-->
         <div class="weui-cell">
-          <div class="weui-cell__hd"><label class="weui-label">手机</label></div>
-          <div class="weui-cell__bd"><input class="weui-input" type="tel" v-model="mobile" required=""
-                                            pattern="^\d{11}$" maxlength="11" placeholder="输入您现在的手机号" emptytips="请输入手机号"
-                                            notmatchtips="请输入正确的手机号"></div>
-          <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
+          <div class="weui-cell__hd">
+            <label class="weui-label">手机</label>
+          </div>
+          <div class="weui-cell__bd"><input class="weui-input" type="tel" v-model="mobile" required="" pattern="^\d{11}$" maxlength="11" placeholder="输入您现在的手机号" emptytips="请输入手机号" notmatchtips="请输入正确的手机号"></div>
+          <div class="weui-cell__ft">
+            <i class="weui-icon-warn"></i>
+          </div>
         </div>
         <div class="weui-cell weui-cell_vcode">
-          <div class="weui-cell__hd"><label class="weui-label">验证码</label></div>
-          <div class="weui-cell__bd"><input v-model="iCreateCode" class="weui-input" maxlength="4" type="text"
-                                            required="" pattern="REG_VCODE" placeholder="点击验证码更换" tips="请输入验证码"></div>
-          <div class="weui-cell__ft"><i class="weui-icon-warn"></i>
+          <div class="weui-cell__hd">
+            <label class="weui-label">验证码</label>
+          </div>
+          <div class="weui-cell__bd"><input v-model="iCreateCode" class="weui-input" maxlength="4" type="text" required="" pattern="REG_VCODE" placeholder="点击验证码更换" tips="请输入验证码"></div>
+          <div class="weui-cell__ft">
+            <i class="weui-icon-warn"></i>
             <input type="button" class="code checkCode checkCodeBtn" @click='getCreateCode()' :value="createCode">
           </div>
         </div>
         <div class="weui-cell weui-cell_vcode">
-          <div class="weui-cell_hd"><label class="weui-label">短信验证</label></div>
-          <div class="weui-cell_hd"><input v-model="iCode" type="text" class="weui-input" maxlength="4"
-                                           placeholder="输入短信验证码"></div>
-          <div class="weui-cell__ft" style="margin-left: auto;"><i class="weui-icon-warn"></i>
+          <div class="weui-cell_hd">
+            <label class="weui-label">短信验证</label>
+          </div>
+          <div class="weui-cell_hd"><input v-model="iCode" type="text" class="weui-input" maxlength="4" placeholder="输入短信验证码"></div>
+          <div class="weui-cell__ft" style="margin-left: auto;">
+            <i class="weui-icon-warn"></i>
             <input @click="getCode()" type="button" class="getCreateCode" value="获取">
           </div>
         </div>
 
-
         <!--工种-->
         <div class="weui-cell">
-          <div class="weui-cell__hd"><label class="weui-label">工种</label></div>
+          <div class="weui-cell__hd">
+            <label class="weui-label">工种</label>
+          </div>
           <div class="weui-cell__bd" @click="showWorkPopup=true">
             <p style="font-size: .9em;color: rgb(137,137,137);">{{oldWorksStrArr}}</p>
           </div>
-          <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
+          <div class="weui-cell__ft">
+            <i class="weui-icon-warn"></i>
+          </div>
         </div>
 
-
         <!--技能-->
         <div class="weui-cell">
-          <div class="weui-cell__hd"><label class="weui-label">技能</label></div>
+          <div class="weui-cell__hd">
+            <label class="weui-label">技能</label>
+          </div>
           <div class="weui-cell__bd" @click="showSkillPopup=true">
             <p style="font-size: .9em;color: rgb(137,137,137);">{{oldSkillStrArr}}</p>
           </div>
-          <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
+          <div class="weui-cell__ft">
+            <i class="weui-icon-warn"></i>
+          </div>
         </div>
 
         <!--本地地址-->
@@ -94,12 +115,16 @@
 
         <!--自述-->
         <div class="weui-cell">
-          <div class="weui-cell__hd"><label class="weui-label">自述</label></div>
+          <div class="weui-cell__hd">
+            <label class="weui-label">自述</label>
+          </div>
           <div class="weui-cell__bd">
             <input v-model="readme" class="weui-input" type="text" required="" placeholder="输入您对自己的评价">
             <!--            <textarea cols="10" style="height: inherit" v-model="readme" placeholder="输入您对自己的评价" class="weui-input" ></textarea>-->
           </div>
-          <div class="weui-cell__ft"><i class="weui-icon-warn"></i></div>
+          <div class="weui-cell__ft">
+            <i class="weui-icon-warn"></i>
+          </div>
         </div>
 
         <div class="submit" @click="submit()">提交</div>
@@ -110,18 +135,12 @@
             <div style="padding:10px 10px 40px 10px;">
               <div style="display: flex;flex-direction: row;margin-bottom: 20px">
                 <div style="color:#888;flex: 1" @click=btnOldWorks>取消</div>
-                <div style="flex: 1;text-align: right" @click="btnNewWorks"><span
-                  style="display: inline-block;padding: 0 10px">确定</span>
+                <div style="flex: 1;text-align: right" @click="btnNewWorks">
+                  <span style="display: inline-block;padding: 0 10px">确定</span>
                 </div>
               </div>
-              <checker
-                type="checkbox"
-                v-model="worksStr"
-                default-item-class="skillsStr-item"
-                selected-item-class="skillsStr-item-selected"
-                disabled-item-class="skillsStr-item-disabled">
-                <checker-item v-for="(item,index) in userTypeOfWorkArr" :key="index"
-                              :value="(item.label)">
+              <checker type="checkbox" v-model="worksStr" default-item-class="skillsStr-item" selected-item-class="skillsStr-item-selected" disabled-item-class="skillsStr-item-disabled">
+                <checker-item v-for="(item,index) in userTypeOfWorkArr" :key="index" :value="(item.label)">
                   {{item.label}}
                 </checker-item>
               </checker>
@@ -132,18 +151,12 @@
             <div style="padding:10px 10px 40px 10px;">
               <div style="display: flex;flex-direction: row;margin-bottom: 20px">
                 <div style="color:#888;flex: 1" @click=btnOldSkills>取消</div>
-                <div style="flex: 1;text-align: right" @click="btnNewSkills"><span
-                  style="display: inline-block;padding: 0 10px">确定</span>
+                <div style="flex: 1;text-align: right" @click="btnNewSkills">
+                  <span style="display: inline-block;padding: 0 10px">确定</span>
                 </div>
               </div>
-              <checker
-                type="checkbox"
-                v-model="skillStr"
-                default-item-class="skillsStr-item"
-                selected-item-class="skillsStr-item-selected"
-                disabled-item-class="skillsStr-item-disabled">
-                <checker-item v-for="(item,index) in uSkillArr" :key="index"
-                              :value="(item.label)">
+              <checker type="checkbox" v-model="skillStr" default-item-class="skillsStr-item" selected-item-class="skillsStr-item-selected" disabled-item-class="skillsStr-item-disabled">
+                <checker-item v-for="(item,index) in uSkillArr" :key="index" :value="(item.label)">
                   {{item.label}}
                 </checker-item>
               </checker>
@@ -155,89 +168,98 @@
   </scroller>
 </template>
 <script>
-  import _ from '@/config'
-  import {Checker, CheckerItem, XInput, Group, XButton, Cell, TransferDom, Popup} from 'vux'
+import _ from '@/config';
+import {
+  Checker,
+  CheckerItem,
+  XInput,
+  Group,
+  XButton,
+  Cell,
+  TransferDom,
+  Popup,
+} from 'vux';
 
-  export default {
-    name: 'login',
-    directives: {
-      TransferDom
-    },
-    components: {
-      Checker,
-      CheckerItem,
-      XInput,
-      XButton,
-      Group,
-      Cell,
-      Popup
-    },
-    data() {
-      return {
-        name: '家政员注册',
-        userName: '',
-        sex: '请选择性别', // 性别
-        sexIndex: 0, // 性别
-        mobile: '',
-        createCode: '', // 验证码
-        iCreateCode: '', // 用户输入的验证码
-        code: '', // 短信验证码
-        iCode: '', // 用户输入的短信验证码
-        userAddress1: '', // 本地地址
-        userAddress2: '', // 户籍地址
-        userTypeOfWorkArr: [
-          {label: '钟点工', value: 1},
-          {label: '月嫂', value: 2},
-          {label: '育婴师', value: 3},
-          {label: '护理老人', value: 4},
-          {label: '全套家务', value: 5}
-        ], // 工种
-        showWorkPopup: false, // 工种
-        worksStr: '', // 工种
-        worksStrArr: '', // 工种
-        oldWorksStrArr: '请选择工种', // 工种
+export default {
+  name: 'login',
+  directives: {
+    TransferDom,
+  },
+  components: {
+    Checker,
+    CheckerItem,
+    XInput,
+    XButton,
+    Group,
+    Cell,
+    Popup,
+  },
+  data() {
+    return {
+      name: '家政员注册',
+      userName: '',
+      sex: '请选择性别', // 性别
+      sexIndex: 0, // 性别
+      mobile: '',
+      createCode: '', // 验证码
+      iCreateCode: '', // 用户输入的验证码
+      code: '', // 短信验证码
+      iCode: '', // 用户输入的短信验证码
+      userAddress1: '', // 本地地址
+      userAddress2: '', // 户籍地址
+      userTypeOfWorkArr: [
+        { label: '钟点工', value: 1 },
+        { label: '月嫂', value: 2 },
+        { label: '育婴师', value: 3 },
+        { label: '护理老人', value: 4 },
+        { label: '全套家务', value: 5 },
+      ], // 工种
+      showWorkPopup: false, // 工种
+      worksStr: '', // 工种
+      worksStrArr: '', // 工种
+      oldWorksStrArr: '请选择工种', // 工种
 
-        userSkill: '', // 技能
-        uSkillArr: [
-          {label: '烧饭', value: 1},
-          {label: '保洁', value: 2},
-          {label: '育婴', value: 3},
-          {label: '护理', value: 4},
-          {label: '全套家务', value: 5}
-        ], // 技能
-        showSkillPopup: false, // 技能
-        skillStr: '', // 技能
-        skillStrArr: '', // 技能
-        oldSkillStrArr: '请选择技能', // 技能
+      userSkill: '', // 技能
+      uSkillArr: [
+        { label: '烧饭', value: 1 },
+        { label: '保洁', value: 2 },
+        { label: '育婴', value: 3 },
+        { label: '护理', value: 4 },
+        { label: '全套家务', value: 5 },
+      ], // 技能
+      showSkillPopup: false, // 技能
+      skillStr: '', // 技能
+      skillStrArr: '', // 技能
+      oldSkillStrArr: '请选择技能', // 技能
 
-        readme: '', // 自述
-        store: '', // 门店
-        storeStr: ''
-      }
-    },
-    created() {
-      let self = this;
-      self.store = self.$route.query.storeId;
-      // 获取所有门店
-      _.$http('/j/HouseKeeping/GetStore', {}, res => {
-        // self.storeArr = res.data;
-        // console.log(self.store)
-        for (let i in res.data) {
-          if (self.store == res.data[i].store_id) {
-            self.storeStr = res.data[i].store_name
-          }
+      readme: '', // 自述
+      store: '', // 门店
+      storeStr: '',
+    };
+  },
+  created() {
+    let self = this;
+    self.store = self.$route.query.storeId;
+    // 获取所有门店
+    _.$http('/j/HouseKeeping/GetStore', {}, res => {
+      // self.storeArr = res.data;
+      // console.log(self.store)
+      for (let i in res.data) {
+        if (self.store == res.data[i].store_id) {
+          self.storeStr = res.data[i].store_name;
         }
-      });
+      }
+    });
 
-      // 门店逻辑判断
-      this.createCode = createCode();
-      /*      axios.get(_.apiPath + 'o2o/user/info&user_id=' + _.user_id).then(function (res) {
+    // 门店逻辑判断
+    this.createCode = createCode();
+    /*      axios.get(_.apiPath + 'o2o/user/info&user_id=' + _.user_id).then(function (res) {
               // console.log(res.data.data)
             })*/
-    },
-    watch: {
-      // 短信验证码
-      /*      iCode: function (val, oldVal) {
+  },
+  watch: {
+    // 短信验证码
+    /*      iCode: function (val, oldVal) {
               if (val.length === 4) {
                 if (val == this.code) {
                   this.iCodeShow = false;
@@ -250,48 +272,48 @@
                 }
               }
             }*/
-      // 工种选择
-      worksStr: function (val, oldVal) {
-        this.worksStrArr = ''; // 初始化
-        this.oldWorksStrArr = ''; // 初始化
-        for (let i in val) {
-          this.oldWorksStrArr = `${this.oldWorksStrArr} ${val[i]}`
-        }
-        // 重新赋值
-        if (val == '') {
-          this.oldWorksStrArr = '请选择工种';
-        }
-      },
-      skillStr: function (val, oldVal) {
-        this.skillStrArr = ''; // 初始化
-        this.oldSkillStrArr = ''; // 初始化
-        for (let i in val) {
-          this.oldSkillStrArr = `${this.oldSkillStrArr} ${val[i]}`
-        }
-        // 重新赋值
-        if (val == '') {
-          this.oldSkillStrArr = '请选择工种';
-        }
+    // 工种选择
+    worksStr: function(val, oldVal) {
+      this.worksStrArr = ''; // 初始化
+      this.oldWorksStrArr = ''; // 初始化
+      for (let i in val) {
+        this.oldWorksStrArr = `${this.oldWorksStrArr} ${val[i]}`;
+      }
+      // 重新赋值
+      if (val == '') {
+        this.oldWorksStrArr = '请选择工种';
       }
     },
-    methods: {
-      submit() {
-        let self = this,
-          skillsArray = [],
-          worksArray = []; // 技能
-        // 用户名判断
-        if (!self.userName) {
-          weui.alert('请输入您的姓名');
-          return
-        }
-        // 检验手机号码
-        if (Number.parseInt(self.iCode) !== self.code) {
-          weui.alert('您手机号码未通过验证,请重新操作!');
-          return
-        }
+    skillStr: function(val, oldVal) {
+      this.skillStrArr = ''; // 初始化
+      this.oldSkillStrArr = ''; // 初始化
+      for (let i in val) {
+        this.oldSkillStrArr = `${this.oldSkillStrArr} ${val[i]}`;
+      }
+      // 重新赋值
+      if (val == '') {
+        this.oldSkillStrArr = '请选择工种';
+      }
+    },
+  },
+  methods: {
+    submit() {
+      let self = this,
+        skillsArray = [],
+        worksArray = []; // 技能
+      // 用户名判断
+      if (!self.userName) {
+        weui.alert('请输入您的姓名');
+        return;
+      }
+      // 检验手机号码
+      if (Number.parseInt(self.iCode) !== self.code) {
+        weui.alert('您手机号码未通过验证,请重新操作!');
+        return;
+      }
 
-        // 家政员 地址
-        /*if (!self.userAddress1) {
+      // 家政员 地址
+      /*if (!self.userAddress1) {
           weui.alert('请输入您的本地地址');
           return
         }
@@ -299,34 +321,36 @@
           weui.alert('请输入您的户籍地址');
           return
         }*/
-        // 工种
-        if (self.worksStr == '') {
-          weui.alert('请选择工种');
-          return
-        } else {
-          for (let i in self.worksStr) {
-            for (let j in self.uSkillArr) {
-              if (self.userTypeOfWorkArr[j].label == self.worksStr[i]) {
-                worksArray.push(self.userTypeOfWorkArr[j].value);
-              }
+      // 工种
+      if (self.worksStr == '') {
+        weui.alert('请选择工种');
+        return;
+      } else {
+        for (let i in self.worksStr) {
+          for (let j in self.uSkillArr) {
+            if (self.userTypeOfWorkArr[j].label == self.worksStr[i]) {
+              worksArray.push(self.userTypeOfWorkArr[j].value);
             }
           }
         }
-        // 技能
-        if (self.skillStr == '') {
-          weui.alert('请选择服务技能');
-          return
-        } else {
-          for (let i in self.skillStr) {
-            for (let j in self.uSkillArr) {
-              if (self.uSkillArr[j].label == self.skillStr[i]) {
-                skillsArray.push(self.uSkillArr[j].value);
-              }
+      }
+      // 技能
+      if (self.skillStr == '') {
+        weui.alert('请选择服务技能');
+        return;
+      } else {
+        for (let i in self.skillStr) {
+          for (let j in self.uSkillArr) {
+            if (self.uSkillArr[j].label == self.skillStr[i]) {
+              skillsArray.push(self.uSkillArr[j].value);
             }
           }
         }
-        // 提交数据
-        _.$http('/j/JGEmpolyer/Register/', {
+      }
+      // 提交数据
+      _.$http(
+        '/j/JGEmpolyer/Register/',
+        {
           userId: _.user_id,
           storeId: self.store,
           phone: self.mobile,
@@ -336,18 +360,20 @@
           work_type: worksArray,
           skill: skillsArray,
           sex: self.sexIndex,
-          readme: self.readme
-        }, res => {
+          readme: self.readme,
+        },
+        res => {
           if (res.data.success) {
-            weui.alert('注册成功', function () {
-              self.$router.push({path: '/houseKeeping/attention'});
-              return
+            weui.alert('注册成功', function() {
+              self.$router.push({ path: '/houseKeeping/attention' });
+              return;
             });
           }
           // console.log(res);
-        })
+        }
+      );
 
-        /*axios.get(_.apiPath + 'j/JGEmpolyer/Register/', {
+      /*axios.get(_.apiPath + 'j/JGEmpolyer/Register/', {
           params: {
             userId: _.user_id,
             storeId: self.store,
@@ -368,190 +394,201 @@
           }
           console.log(res);
         });*/
-      },
-      /*工种*/
-      btnNewWorks() {
-        this.showWorkPopup = false;
-      },
-      btnOldWorks() {
-        this.worksStr = '';
-        this.oldWorksStrArr = '请选择工种';
-        this.showWorkPopup = false;
-      },
-      /*技能*/
-      btnNewSkills() {
-        this.showSkillPopup = false;
-      },
-      btnOldSkills() {
-        this.skillStr = '';
-        this.oldWorksStrArr = '请选择工种';
-        this.showSkillPopup = false;
-      },
-      // 获取短信验证码
-      getCode() {
-        let self = this;
-        _.SMS({
+    },
+    /*工种*/
+    btnNewWorks() {
+      this.showWorkPopup = false;
+    },
+    btnOldWorks() {
+      this.worksStr = '';
+      this.oldWorksStrArr = '请选择工种';
+      this.showWorkPopup = false;
+    },
+    /*技能*/
+    btnNewSkills() {
+      this.showSkillPopup = false;
+    },
+    btnOldSkills() {
+      this.skillStr = '';
+      this.oldWorksStrArr = '请选择工种';
+      this.showSkillPopup = false;
+    },
+    // 获取短信验证码
+    getCode() {
+      let self = this;
+      _.SMS(
+        {
           mobile: self.mobile,
           iCreateCode: self.iCreateCode,
-          createCode: self.createCode
-        }, res => {
+          createCode: self.createCode,
+        },
+        res => {
           self.code = res;
-          this.iCode = this.code // 系统调试时开启
+          // 系统调试时开启
+          if (_.locationHref.indexOf('common.yiguanjia.me') == -1) {
+            self.iCode = self.code; // 系统调试时开启
+          }
           // this.iCreateCode = '';// 清空已输入验证码
           // this.createCode = createCode(); // 重置验证码
-        });
-      },
-      // 选择性别
-      selectSex() {
-        let self = this;
-        weui.picker([
+        }
+      );
+    },
+    // 选择性别
+    selectSex() {
+      let self = this;
+      weui.picker(
+        [
           {
             label: '男',
-            value: 0
-          }, {
+            value: 0,
+          },
+          {
             label: '女',
-            value: 1
-          }
-        ], {
+            value: 1,
+          },
+        ],
+        {
           className: 'custom-classname',
           container: 'body',
           defaultValue: [0],
-          onChange: function (result) {
+          onChange: function(result) {
             // console.log(result)
           },
-          onConfirm: function (result) {
+          onConfirm: function(result) {
             // console.log(result)
             self.sex = result[0].label;
             self.sexIndex = result[0].value;
           },
-          id: 'singleLinePicker'
-        })
-      }
-    }
-  }
+          id: 'singleLinePicker',
+        }
+      );
+    },
+  },
+};
 
-  // 验证码
-  function createCode(Number) {
-    let code = '';
-    let random = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; // 随机数
-    for (let i = 0; i < 4; i++) { // 循环操作
-      let charIndex = Math.floor(Math.random() * random.length); // 取得随机数的索引
-      code += random[charIndex] // 根据索引取得随机数加到code上
-    }
-    return code // 把code值赋给验证码
+// 验证码
+function createCode(Number) {
+  let code = '';
+  let random = [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]; // 随机数
+  for (let i = 0; i < 4; i++) {
+    // 循环操作
+    let charIndex = Math.floor(Math.random() * random.length); // 取得随机数的索引
+    code += random[charIndex]; // 根据索引取得随机数加到code上
   }
+  return code; // 把code值赋给验证码
+}
 </script>
 
 <style scoped lang="less">
-  .login {
-    padding: 0 15px;
-    h3 {
-      width: 100%;
-      text-align: center;
-      margin: 5% 0;
-    }
-    /*验证码*/
-    .select-time {
-      text-align: left;
-      color: #848484;
-      font-size: .7em;
-    }
-    .service-time {
-      float: left;
-      display: inline-block;
-      width: 50%;
-    }
-    input {
-      font-size: 16px;
-    }
-    .weui-label {
-      width: 4.5em;
-    }
-    .weui-input {
-      font-size: .9em;
-    }
-    .title {
-      text-align: center;
-      font-weight: 500;
-    }
-    .checkCodeBtn {
-      font-family: Arial;
-      font-style: italic;
-      font-weight: bold;
-      border: 0;
-      height: 35px;
-      letter-spacing: 3px;
-      color: blue;
-      padding: 0px 10px;
-      margin-top: 5px;
-      text-align: center;
-    }
-    .getCreateCode {
-      border: 0;
-      height: 35px;
-      padding: 0 18px;
-      margin-top: 5px;
-    }
-    /*服务形式*/
-    .service-form {
-      transition: all .1s;
-      cursor: pointer;
-      color: #000;
-      text-align: left;
-      padding-left: 0;
-      &:after {
-        width: 0;
-        height: 0;
-      }
-      &:active {
-        background-color: #dddddd;
-      }
-    }
-    .submit {
-      background: #61904a;
-      color: rgb(255, 255, 255);
-      border: 0;
-      padding: 10px 0;
-      font-size: 22px;
-      line-height: 30px;
-      height: 30px;
-      width: calc(100% - 15px);
-      margin: 15px auto;
-      display: block;
-      text-align: center;
-      transition: all .1s;
-      &:active {
-        font-size: 20px;
-        background: rgba(97, 144, 74, 0.8);
-      }
+.login {
+  padding: 0 15px;
+  h3 {
+    width: 100%;
+    text-align: center;
+    margin: 5% 0;
+  }
+  /*验证码*/
+  .select-time {
+    text-align: left;
+    color: #848484;
+    font-size: 0.7em;
+  }
+  .service-time {
+    float: left;
+    display: inline-block;
+    width: 50%;
+  }
+  input {
+    font-size: 16px;
+  }
+  .weui-label {
+    width: 4.5em;
+  }
+  .weui-input {
+    font-size: 0.9em;
+  }
+  .title {
+    text-align: center;
+    font-weight: 500;
+  }
+  .checkCodeBtn {
+    font-family: Arial;
+    font-style: italic;
+    font-weight: bold;
+    border: 0;
+    height: 35px;
+    letter-spacing: 3px;
+    color: blue;
+    padding: 0px 10px;
+    margin-top: 5px;
+    text-align: center;
+  }
+  .getCreateCode {
+    border: 0;
+    height: 35px;
+    padding: 0 18px;
+    margin-top: 5px;
+  }
+  /*服务形式*/
+  .service-form {
+    transition: all 0.1s;
+    cursor: pointer;
+    color: #000;
+    text-align: left;
+    padding-left: 0;
+    &:after {
+      width: 0;
+      height: 0;
     }
-
-    .verification-code {
-      width: 100px;
-      height: 44px;
-      color: black;
+    &:active {
+      background-color: #dddddd;
     }
   }
-
-  .skillsStr-item {
-    background-color: #ddd;
-    color: #222;
-    font-size: 14px;
-    padding: 5px 10px;
-    margin-right: 10px;
-    line-height: 18px;
-    border-radius: 15px;
-    &:last-child {
-      margin-top: 15px;
+  .submit {
+    background: #61904a;
+    color: rgb(255, 255, 255);
+    border: 0;
+    padding: 10px 0;
+    font-size: 22px;
+    line-height: 30px;
+    height: 30px;
+    width: calc(100% - 15px);
+    margin: 15px auto;
+    display: block;
+    text-align: center;
+    transition: all 0.1s;
+    &:active {
+      font-size: 20px;
+      background: rgba(97, 144, 74, 0.8);
     }
   }
 
-  .skillsStr-item-selected {
-    background-color: #61904a;
-    color: #fff;
+  .verification-code {
+    width: 100px;
+    height: 44px;
+    color: black;
   }
+}
 
-  .skillsStr-item-disabled {
-    color: #999;
+.skillsStr-item {
+  background-color: #ddd;
+  color: #222;
+  font-size: 14px;
+  padding: 5px 10px;
+  margin-right: 10px;
+  line-height: 18px;
+  border-radius: 15px;
+  &:last-child {
+    margin-top: 15px;
   }
+}
+
+.skillsStr-item-selected {
+  background-color: #61904a;
+  color: #fff;
+}
+
+.skillsStr-item-disabled {
+  color: #999;
+}
 </style>

+ 653 - 644
www/webapp/housekeeping/src/components/management/edit.vue

@@ -1,16 +1,22 @@
 <template>
   <div class="box">
     <div style="position: fixed;z-index:-15;background-color: #eeeeef;top: 0;bottom: 0;right: 0;left: 0;"></div>
-    <title class="order-body-title">预约信息<span @click="back"></span></title>
+    <title class="order-body-title">预约信息
+      <span @click="back"></span>
+    </title>
     <div class="order-body">
       <div class="my-order-body">
-        <div><span class="title">创建:</span>{{order.time_str}}</div>
-        <div><span class="title">姓名:</span>{{order.user_name}}</div>
-        <div><span class="title">手机:</span><a id='tel' class="edit"
-                                              v-bind:href='`tel:${order.mobile}`'>{{order.mobile}}</a>
+        <div>
+          <span class="title">创建:</span>{{order.time_str}}</div>
+        <div>
+          <span class="title">姓名:</span>{{order.user_name}}</div>
+        <div>
+          <span class="title">手机:</span>
+          <a id='tel' class="edit" v-bind:href='`tel:${order.mobile}`'>{{order.mobile}}</a>
         </div>
 
-        <div><span class="title">地址:</span>{{order.address}}</div>
+        <div>
+          <span class="title">地址:</span>{{order.address}}</div>
 
         <!--
         <div class="stroe"><span class="title"
@@ -20,47 +26,61 @@
         </span></div>
         -->
 
-        <div class="stroe"><span class="title"
-                                 style="display: flex;align-items: center;"><span>门店:</span></span><span>{{store.name }}</span>
+        <div class="stroe">
+          <span class="title" style="display: flex;align-items: center;">
+            <span>门店:</span>
+          </span>
+          <span>{{store.name }}</span>
         </div>
-        <div><span class="title">服务:</span>{{order.type_str}}</div>
+        <div>
+          <span class="title">服务:</span>{{order.type_str}}</div>
 
-        <div v-if='order.type -1 == 0'><span
-          class="title">时间:</span>{{time.start}} ~ {{time.end}}
+        <div v-if='order.type -1 == 0'>
+          <span class="title">时间:</span>{{time.start}} ~ {{time.end}}
         </div>
-        <div v-if='order.type -1  == 0'><span class="title">形式:</span>{{order.cart_str}}</div>
+        <div v-if='order.type -1  == 0'>
+          <span class="title">形式:</span>{{order.cart_str}}</div>
 
-        <div v-if='order.type -1  == 0'><span class="title">技能:</span>{{skillStr}}</div>
-        <div v-if='order.type - 1 != 0'><span class="title">{{order.type > 2?'日期':'预产'}}:</span>{{order.yc_time}}
+        <div v-if='order.type -1  == 0'>
+          <span class="title">技能:</span>{{skillStr}}</div>
+        <div v-if='order.type - 1 != 0'>
+          <span class="title">{{order.type > 2?'日期':'预产'}}:</span>{{order.yc_time}}
         </div>
-        <div v-if='order.type -1 == 2'><span class="title">童龄:</span>{{order.age}}岁</div>
-        <div><span class="title">备注:</span>{{order.desc}}</div>
+        <div v-if='order.type -1 == 2'>
+          <span class="title">童龄:</span>{{order.age}}岁</div>
+        <div>
+          <span class="title">备注:</span>{{order.desc}}</div>
         <!--<div v-if="showContract"><span class="title">状态:</span><span @click='btnContract'>{{contractStr}}</span></div>-->
-        <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.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>
-        <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}}
+        <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}}
         </div>
-        <div v-if="order.status == 4"><span class="title edit_title ">原因:</span>{{order.cancel_cause}}</div>
-
+        <div v-if="order.status == 4">
+          <span class="title edit_title ">原因:</span>{{order.cancel_cause}}</div>
 
         <!--showContract  btnContract-->
-        <div v-if="order.status === 3 && order.contract === 2"><span class="title">状态:</span>{{order.contract_str}}
+        <div v-if="order.status === 3 && order.contract === 2">
+          <span class="title">状态:</span>{{order.contract_str}}
         </div>
 
         <!--家政员-->
         <div v-if="showTech && order.status != 4 && tech == ''">
-          <span class="title edit_title">人员:</span><span class="edit" style="display:inline-block;"
-                                                         @click="selectF">自动筛选家政员</span>
+          <span class="title edit_title">人员:</span>
+          <span class="edit" style="display:inline-block;" @click="selectF">自动筛选家政员</span>
         </div>
         <div v-if="showTech && order.status != 4 && tech != ''">
-          <span class="title edit_title">人员:</span><span class="edit" @click="selectF">{{tech}}</span>
+          <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>
         <!--
         家政员
@@ -79,24 +99,17 @@
           <!--选择时间-->
           <!--<span>预约日期:</span>
           <span class="edit"  @click="getTimes">{{bookingTime}}</span>-->
-          <datetime v-model="bookingTime" format="YYYY-MM-DD HH:00"
-                    @on-change="change" :title="('面试:')" year-row="{value}年" month-row="{value}月"
-                    day-row="{value}日"
-                    hour-row="{value}点" minute-row="{value}分" confirm-text="完成" cancel-text="取消"
-                    :start-date='startDate'
-                    placeholder="请选择日期"
-                    :end-date='endDate' :min-hour=9 :max-hour=18></datetime>
+          <datetime v-model="bookingTime" format="YYYY-MM-DD HH:00" @on-change="change" :title="('面试:')" year-row="{value}年" month-row="{value}月" day-row="{value}日" hour-row="{value}点" minute-row="{value}分" confirm-text="完成" cancel-text="取消" :start-date='startDate' placeholder="请选择日期" :end-date='endDate' :min-hour=9 :max-hour=18></datetime>
         </div>
         <!--预约状态-->
         <div v-if="order.status === 1 && order.contract !== 2">
-          <span class="title edit_title">状态:</span><span class="edit" @click='btnAppointmentStatus'>{{appointmentStatusStr.label}}</span>
+          <span class="title edit_title">状态:</span>
+          <span class="edit" @click='btnAppointmentStatus'>{{appointmentStatusStr.label}}</span>
         </div>
         <!--取消原因-->
         <div v-if="showTechAppointmentStatus" style="margin-top: 5px;">
-          <span class="title edit_title">原因:</span><span><input v-model="showTechAppointmentStatusStr" class="tech edit"
-                                                                type="text"
-                                                                style="font-size: 15px"
-                                                                placeholder='请输入取消原因'></span>
+          <span class="title edit_title">原因:</span>
+          <span><input v-model="showTechAppointmentStatusStr" class="tech edit" type="text" style="font-size: 15px" placeholder='请输入取消原因'></span>
         </div>
 
         <!--面试状态-->
@@ -127,115 +140,117 @@
   </div>
 </template>
 <script>
-  import _ from "@/config";
-  import selectTime from "@/config/selectTime";
-  import axios from "axios";
-  import {Group, Datetime, XButton} from "vux";
-
-  export default {
-    name: "orderInfo",
-    data() {
-      return {
-        type: {
-          0: "钟点工",
-          1: "月嫂",
-          2: "育婴师",
-          3: "护理老人",
-          4: "全套家务"
+import _ from '@/config';
+import selectTime from '@/config/selectTime';
+import axios from 'axios';
+import { Group, Datetime, XButton } from 'vux';
+
+export default {
+  name: 'orderInfo',
+  data() {
+    return {
+      type: {
+        0: '钟点工',
+        1: '月嫂',
+        2: '育婴师',
+        3: '护理老人',
+        4: '全套家务',
+      },
+      serviceArr: [
+        { label: '未面试', value: 1 },
+        { label: '已面试', value: 2 },
+      ],
+      contractArr: [
+        { label: '未签约', value: 1 },
+        { label: '已签约', value: 2 },
+      ],
+      appointmentStatus: [
+        {
+          label: '已预约',
+          value: 0,
         },
-        serviceArr: [
-          {label: "未面试", value: 1},
-          {label: "已面试", value: 2}
-        ],
-        contractArr: [
-          {label: "未签约", value: 1},
-          {label: "已签约", value: 2}
-        ],
-        appointmentStatus: [
-          {
-            label: "已预约",
-            value: 0
-          },
-          {
-            label: "已取消",
-            value: 1
-          }
-        ],
-        appointmentStatusStr: "", // 预约状态
-        showTechAppointmentStatus: false, // 取消原因
-        showTechAppointmentStatusStr: "",
-        serviceForm: "未面试",
-        resServiceArr: 1,
-        contractFrom: "未签约",
-        resContract: 1,
-        order: {},
-        eAppointmentDate: false,
-        monthArr: {},
-        skillStr: "", // 服务技能
-        bookingTime: "请选择日期", // 服务时间
-        time: {
-          start: "",
-          end: ""
+        {
+          label: '已取消',
+          value: 1,
         },
-        value: ["2017-06-24", "03", "05"], // 设定日期格式
-        startDate: selectTime.startDate, // 限定最小日期
-        endDate: "", // 限定最大日期
-        tech: "",
-        techMobile: "",
-        store: {
-          name: "",
-          address: "",
-          mobile: ""
+      ],
+      appointmentStatusStr: '', // 预约状态
+      showTechAppointmentStatus: false, // 取消原因
+      showTechAppointmentStatusStr: '',
+      serviceForm: '未面试',
+      resServiceArr: 1,
+      contractFrom: '未签约',
+      resContract: 1,
+      order: {},
+      eAppointmentDate: false,
+      monthArr: {},
+      skillStr: '', // 服务技能
+      bookingTime: '请选择日期', // 服务时间
+      time: {
+        start: '',
+        end: '',
+      },
+      value: ['2017-06-24', '03', '05'], // 设定日期格式
+      startDate: selectTime.startDate, // 限定最小日期
+      endDate: '', // 限定最大日期
+      tech: '',
+      techMobile: '',
+      store: {
+        name: '',
+        address: '',
+        mobile: '',
+      },
+      showTech: false, // 家政员
+      showContract: false, // 签约状态
+      contractStr: '未签约',
+      contractStrArr: [],
+      btnSubmintStr: '提交',
+      // btnSubmintStr: '已预约',
+      btnSubmintStrShow: true,
+      showStatus: false, // 预约状态
+      homeClerkDetails: {}, // 家政员信息
+    };
+  },
+  created() {
+    let self = this;
+    // 初始化订单状态 => 已预约
+    self.appointmentStatusStr = self.appointmentStatus[0];
+    // 设置订单中门店信息
+    if (_.orderInfo.store.name == undefined) {
+      _.$http(
+        '/j/HouseKeeping/GetStore',
+        {
+          user_id: _.user_id,
         },
-        showTech: false, // 家政员
-        showContract: false, // 签约状态
-        contractStr: "未签约",
-        contractStrArr: [],
-        btnSubmintStr: "提交",
-        // btnSubmintStr: '已预约',
-        btnSubmintStrShow: true,
-        showStatus: false, // 预约状态
-        homeClerkDetails: {} // 家政员信息
-      };
-    },
-    created() {
-      let self = this;
-      // 初始化订单状态 => 已预约
-      self.appointmentStatusStr = self.appointmentStatus[0];
-      // 设置订单中门店信息
-      if (_.orderInfo.store.name == undefined) {
-        _.$http(
-          "/j/HouseKeeping/GetStore", {
-            user_id: _.user_id
-          }, res => {
-            for (let i in res.data) {
-              // 筛选出订单中的门店信息
-              if (res.data[i].store_id == _.oldOrderInfo.store_id) {
-                self.store.name = res.data[i].store_name;
-                self.store.address = res.data[i].address;
-                self.store.mobile = res.data[i].mobile;
-                // 初始化门店信息
-                _.orderInfo.store.name = self.store.name;
-                _.orderInfo.store.address = self.store.address;
-                _.orderInfo.store.mobile = self.store.mobile;
-                return;
-              }
+        res => {
+          for (let i in res.data) {
+            // 筛选出订单中的门店信息
+            if (res.data[i].store_id == _.oldOrderInfo.store_id) {
+              self.store.name = res.data[i].store_name;
+              self.store.address = res.data[i].address;
+              self.store.mobile = res.data[i].mobile;
+              // 初始化门店信息
+              _.orderInfo.store.name = self.store.name;
+              _.orderInfo.store.address = self.store.address;
+              _.orderInfo.store.mobile = self.store.mobile;
+              return;
             }
           }
-        );
-      } else {
-        // 首次进入该界面前
-        self.store.name = _.orderInfo.store.name;
-        self.store.address = _.orderInfo.store.address;
-        self.store.mobile = _.orderInfo.store.mobile;
-      }
+        }
+      );
+    } else {
+      // 首次进入该界面前
+      self.store.name = _.orderInfo.store.name;
+      self.store.address = _.orderInfo.store.address;
+      self.store.mobile = _.orderInfo.store.mobile;
+    }
 
-      if (_.oldOrderInfo === undefined) {
-        self.$router.push({path: "/managementList"});
-        return;
-      }
-      // 编辑界面
-      /*setTimeout(() => {
+    if (_.oldOrderInfo === undefined) {
+      self.$router.push({ path: '/managementList' });
+      return;
+    }
+    // 编辑界面
+    /*setTimeout(() => {
           let $clientHeight = document.documentElement.clientHeight,
             $time = document.getElementsByClassName('order-body-title'),
             $orderBody = document.getElementsByClassName('order-body'),
@@ -243,283 +258,255 @@
             $mBtnHeight = $mBtn[0] != undefined ? $mBtn[0].clientHeight : 0;
           $orderBody[0].style.height = $clientHeight - $time[0].clientHeight - $mBtnHeight + 15 + 'px';
         }, 200);*/
-      self.order = _.oldOrderInfo;
-      // 状态编辑
-      // 时间
-      self.order.time_str = _.timetrans(self.order.time);
-      // 已面试
-      if (self.order.contract === 1 && self.order.status === 2) {
-        self.btnSubmintStr = "提交";
-      }
-      // 已签约
-      if (self.order.contract === 1 && self.order.status === 3) {
-        self.btnSubmintStr = "提交";
-        // self.btnSubmintStr = '已签约'
-      }
-      // 已完成
-      if (self.order.contract === 2 && self.order.status === 3) {
-        self.btnSubmintStrShow = false;
-      }
+    self.order = _.oldOrderInfo;
+    // 状态编辑
+    // 时间
+    self.order.time_str = _.timetrans(self.order.time);
+    // 已面试
+    if (self.order.contract === 1 && self.order.status === 2) {
+      self.btnSubmintStr = '提交';
+    }
+    // 已签约
+    if (self.order.contract === 1 && self.order.status === 3) {
+      self.btnSubmintStr = '提交';
+      // self.btnSubmintStr = '已签约'
+    }
+    // 已完成
+    if (self.order.contract === 2 && self.order.status === 3) {
+      self.btnSubmintStrShow = false;
+    }
 
-      // 预约时间
-      // console.log(self.order.status_time);
-      // console.log(self.bookingTime);
-      // console.log(_.oldOrderInfo.bookingTime);
-      if (self.order.status_time != 0) {
-        self.bookingTime = self.order.status_time;
-        if (_.oldOrderInfo.bookingTime == undefined) {
-          _.oldOrderInfo.bookingTime = self.bookingTime;
-        }
-      }
-      if (_.oldOrderInfo.bookingTime != undefined) {
-        self.bookingTime = _.oldOrderInfo.bookingTime;
+    // 预约时间
+    // console.log(self.order.status_time);
+    // console.log(self.bookingTime);
+    // console.log(_.oldOrderInfo.bookingTime);
+    if (self.order.status_time != 0) {
+      self.bookingTime = self.order.status_time;
+      if (_.oldOrderInfo.bookingTime == undefined) {
+        _.oldOrderInfo.bookingTime = self.bookingTime;
       }
+    }
+    if (_.oldOrderInfo.bookingTime != undefined) {
+      self.bookingTime = _.oldOrderInfo.bookingTime;
+    }
 
-
-      // 家政员
-      if (self.order.tech.length > 0) {
-        self.tech = self.order.tech;
-      }
-      // 家政员电话
-      if (self.order.tech_mobile !== "") {
-        self.techMobile = self.order.tech_mobile;
-      }
-      // 家政员信息赋值
-      if (_.oldOrderInfo != undefined && _.oldOrderInfo.homeClerkDetails != undefined) {
-        self.homeClerkDetails = _.oldOrderInfo.homeClerkDetails;
-        self.tech = self.homeClerkDetails.name;
-        // self.order.tech = self.homeClerkDetails.name;
-        // _.oldOrderInfo.tech = self.homeClerkDetails.name;
-        // _.oldOrderInfo.tech_mobile = self.homeClerkDetails.phone;
-        self.techMobile = self.homeClerkDetails.phone;
-        // self.order.tech_mobile = self.homeClerkDetails.phone;
-        // console.log(205)
-      }
-      if (_.oldOrderInfo.homeClerkDetails == undefined) {
-        // console.log(207)
-        self.tech = self.order.tech;
-        self.techMobile = self.order.tech_mobile;
-      }
-      // 转化时间格式
-      // this.order.yc_time = _.timetrans(this.order.yc_time); // 预产期
-      this.order.yc_time = this.order.yc_time.substring(0, 10); // 预产期
-      this.time.start = _.timetrans(this.order.server_start_time);
-      this.time.start = this.time.start.substring(11, 16);
-      this.time.end = _.timetrans(this.order.server_end_time);
-      this.time.end = this.time.end.substring(11, 16);
-
-      if (this.order.status - 1 == 0) {
-        this.eAppointmentDate = true;
-      }
-      if (this.order.status !== 3) {
-        this.showStatus = true;
-        this.showTech = true;
-      }
-      if (this.order.contract == 1 && this.order.status == 2) {
-        this.showContract = true;
-      }
-      for (let i in this.order.skill_str) {
-        this.skillStr = `${this.skillStr} ${this.order.skill_str[i]}`;
-      }
-    },
-    components: {
-      Group,
-      Datetime,
-      XButton
-    },
-    methods: {
-      // 给家政员发送短信
-      btnServer() {
-        let self = this;
-        _.$http("/j/HouseKeeping/Server", {
+    // 家政员
+    if (self.order.tech.length > 0) {
+      self.tech = self.order.tech;
+    }
+    // 家政员电话
+    if (self.order.tech_mobile !== '') {
+      self.techMobile = self.order.tech_mobile;
+    }
+    // 家政员信息赋值
+    if (
+      _.oldOrderInfo != undefined &&
+      _.oldOrderInfo.homeClerkDetails != undefined
+    ) {
+      self.homeClerkDetails = _.oldOrderInfo.homeClerkDetails;
+      self.tech = self.homeClerkDetails.name;
+      // self.order.tech = self.homeClerkDetails.name;
+      // _.oldOrderInfo.tech = self.homeClerkDetails.name;
+      // _.oldOrderInfo.tech_mobile = self.homeClerkDetails.phone;
+      self.techMobile = self.homeClerkDetails.phone;
+      // self.order.tech_mobile = self.homeClerkDetails.phone;
+      // console.log(205)
+    }
+    if (_.oldOrderInfo.homeClerkDetails == undefined) {
+      // console.log(207)
+      self.tech = self.order.tech;
+      self.techMobile = self.order.tech_mobile;
+    }
+    // 转化时间格式
+    // this.order.yc_time = _.timetrans(this.order.yc_time); // 预产期
+    this.order.yc_time = this.order.yc_time.substring(0, 10); // 预产期
+    this.time.start = _.timetrans(this.order.server_start_time);
+    this.time.start = this.time.start.substring(11, 16);
+    this.time.end = _.timetrans(this.order.server_end_time);
+    this.time.end = this.time.end.substring(11, 16);
+
+    if (this.order.status - 1 == 0) {
+      this.eAppointmentDate = true;
+    }
+    if (this.order.status !== 3) {
+      this.showStatus = true;
+      this.showTech = true;
+    }
+    if (this.order.contract == 1 && this.order.status == 2) {
+      this.showContract = true;
+    }
+    for (let i in this.order.skill_str) {
+      this.skillStr = `${this.skillStr} ${this.order.skill_str[i]}`;
+    }
+  },
+  components: {
+    Group,
+    Datetime,
+    XButton,
+  },
+  methods: {
+    // 给家政员发送短信
+    btnServer() {
+      let self = this;
+      _.$http(
+        '/j/HouseKeeping/Server',
+        {
           user_name: self.tech,
           servers: self.order.type_str,
           status_time: ycTime(self.bookingTime),
           store: self.store.name,
           address: self.store.address,
           mobile: self.techMobile,
-          phone: self.store.mobile
-        }, res => {
-          console.log(res.data)
-        })
-      },
-      // 选择家政员
-      selectF() {
-        /*if (this.bookingTime === '请选择日期') {
+          phone: self.store.mobile,
+        },
+        res => {
+          console.log(res.data);
+        }
+      );
+    },
+    // 选择家政员
+    selectF() {
+      /*if (this.bookingTime === '请选择日期') {
             weui.alert('请先选择预约日期,再选择家政员');
             return
           } else {
             this.$router.push({path: '/managementEmployee'})
           }*/
-        this.$router.push({path: "/managementEmployee"});
-      },
-      // 预约状态
-      btnAppointmentStatus() {
-        let self = this;
-        weui.picker(self.appointmentStatus, {
-          className: "custom-classname",
-          container: "body",
-          defaultValue: [0],
-          onChange: function (result) {
-            // console.log(result)
-          },
-          onConfirm: function (result) {
-            // console.log(result)
-            self.appointmentStatusStr = result[0];
-            if (self.appointmentStatusStr.value === 1) {
-              self.btnSubmintStr = "提交";
-              // self.btnSubmintStr = '已取消';
-              self.showTechAppointmentStatus = true;
-              // console.log('123')
-            } else {
-              self.btnSubmintStr = "提交";
-              // self.btnSubmintStr = '已预约';
-              self.showTechAppointmentStatus = false;
-            }
-          },
-          id: "singleLinePicker"
-        });
-      },
-      btnSubmint() {
-        let self = this;
-
-        if (self.appointmentStatusStr.value != 1) {
-          // 家政员不为空判断
-          if (self.tech.length == "" && !self.appointmentStatusStr.value) {
-            weui.alert("请筛选家政员");
-            return;
+      this.$router.push({ path: '/managementEmployee' });
+    },
+    // 预约状态
+    btnAppointmentStatus() {
+      let self = this;
+      weui.picker(self.appointmentStatus, {
+        className: 'custom-classname',
+        container: 'body',
+        defaultValue: [0],
+        onChange: function(result) {
+          // console.log(result)
+        },
+        onConfirm: function(result) {
+          // console.log(result)
+          self.appointmentStatusStr = result[0];
+          if (self.appointmentStatusStr.value === 1) {
+            self.btnSubmintStr = '提交';
+            // self.btnSubmintStr = '已取消';
+            self.showTechAppointmentStatus = true;
+            // console.log('123')
+          } else {
+            self.btnSubmintStr = '提交';
+            // self.btnSubmintStr = '已预约';
+            self.showTechAppointmentStatus = false;
           }
+        },
+        id: 'singleLinePicker',
+      });
+    },
+    btnSubmint() {
+      let self = this;
 
-          //  预约日期判断
-          if (self.bookingTime == '请选择日期' || self.bookingTime == "" && !self.appointmentStatusStr.value) {
-            weui.alert("请选择预约日期");
-            return;
-          }
+      if (self.appointmentStatusStr.value != 1) {
+        // 家政员不为空判断
+        if (self.tech.length == '' && !self.appointmentStatusStr.value) {
+          weui.alert('请筛选家政员');
+          return;
         }
 
-        // 预约中
-        if (self.order.contract == 1 && self.order.status == 1) {
-          // 已预约
-          if (!self.appointmentStatusStr.value) {
-            _.$http(
-              "/j/HouseKeeping/Edit",
-              {
-                id: _.oldOrderInfo.id,
-                status: 2,
-                flag: 1,
-                status_time: ycTime(self.bookingTime),
-                tech: self.tech,
-                tech_mobile: self.techMobile
-              },
-              res => {
-                if (res.data.success) {
-                  self.btnServer();
-                  weui.alert("提交成功", function () {
-                    self.$router.push({path: "/managementList"});
-                  });
-                  return;
-                } else {
-                  weui.alert("提交失败");
-                  return;
-                }
-              }
-            );
-            return;
-          } else {
-            // 已取消
-            // 取消原因不为空
-            if (self.showTechAppointmentStatusStr == "") {
-              weui.alert("请输入取消原因!");
-              return;
-            }
-            self.$vux.confirm.show({
-              title: "提示",
-              content: "请确定,是否取消该预约?",
-              // 组件除show外的属性
-              onCancel() {
-              },
-              onConfirm() {
-                _.$http(
-                  "/j/HouseKeeping/Edit",
-                  {
-                    id: _.oldOrderInfo.id,
-                    status: 4,
-                    cancel_cause: self.showTechAppointmentStatusStr
-                  },
-                  res => {
-                    if (res.data.success) {
-                      weui.alert("提交成功", function () {
-                        self.$router.push({path: "/managementList"});
-                      });
-                      return;
-                    } else {
-                      weui.alert("提交失败");
-                      return;
-                    }
-                  }
-                );
+        //  预约日期判断
+        if (
+          self.bookingTime == '请选择日期' ||
+          (self.bookingTime == '' && !self.appointmentStatusStr.value)
+        ) {
+          weui.alert('请选择预约日期');
+          return;
+        }
+      }
+
+      // 预约中
+      if (self.order.contract == 1 && self.order.status == 1) {
+        // 已预约
+        if (!self.appointmentStatusStr.value) {
+          _.$http(
+            '/j/HouseKeeping/Edit',
+            {
+              id: _.oldOrderInfo.id,
+              status: 2,
+              flag: 1,
+              status_time: ycTime(self.bookingTime),
+              tech: self.tech,
+              tech_mobile: self.techMobile,
+            },
+            res => {
+              if (res.data.success) {
+                self.btnServer();
+                weui.alert('提交成功', function() {
+                  self.$router.push({ path: '/managementList' });
+                });
+                return;
+              } else {
+                weui.alert('提交失败');
                 return;
               }
-            });
+            }
+          );
+          return;
+        } else {
+          // 已取消
+          // 取消原因不为空
+          if (self.showTechAppointmentStatusStr == '') {
+            weui.alert('请输入取消原因!');
+            return;
           }
+          self.$vux.confirm.show({
+            title: '提示',
+            content: '请确定,是否取消该预约?',
+            // 组件除show外的属性
+            onCancel() {},
+            onConfirm() {
+              _.$http(
+                '/j/HouseKeeping/Edit',
+                {
+                  id: _.oldOrderInfo.id,
+                  status: 4,
+                  cancel_cause: self.showTechAppointmentStatusStr,
+                },
+                res => {
+                  if (res.data.success) {
+                    weui.alert('提交成功', function() {
+                      self.$router.push({ path: '/managementList' });
+                    });
+                    return;
+                  } else {
+                    weui.alert('提交失败');
+                    return;
+                  }
+                }
+              );
+              return;
+            },
+          });
         }
-        // 已面试
-        if (self.order.contract == 1 && self.order.status == 2) {
-          // 用户不想进入已面试阶段
-          if (self.resServiceArr === 1) {
-            // 时间未发生变化 || 家政员未发生变化
-            if (
-              _.oldOrder.tech == self.tech &&
-              ycTime(self.bookingTime) == ycTime(self.order.status_time)
-            ) {
+      }
+      // 已面试
+      if (self.order.contract == 1 && self.order.status == 2) {
+        // 用户不想进入已面试阶段
+        if (self.resServiceArr === 1) {
+          // 时间不变
+          if (ycTime(self.bookingTime) == ycTime(self.order.status_time)) {
+            if (_.oldOrder.tech == self.tech) {
               self.$vux.alert.show({
                 // title:'提示',
-                content: "请勿重复提交"
-              });
-            } else if (
-              // 时间发生变化,但是家政员不变
-            ycTime(self.bookingTime) != ycTime(self.order.status_time)) {
-              self.$vux.confirm.show({
-                // title: '提示',
-                content: "提交后将给客户发送预约短信,确认提交吗?",
-                onCancel() {
-                },
-                onConfirm() {
-                  _.$http(
-                    "/j/HouseKeeping/Edit",
-                    {
-                      id: _.oldOrderInfo.id,
-                      contract: 1,
-                      status: 2,
-                      flag: 1,
-                      status_time: ycTime(self.bookingTime),
-                      tech: self.tech,
-                      tech_mobile: self.techMobile
-                    },
-                    res => {
-                      if (_.oldOrder.tech != self.tech) {
-                        self.btnServer();
-                      }
-                      statusF(res.data.success);
-                      return;
-                    }
-                  );
-                }
+                content: '请勿重复提交',
               });
-            } else if (
-              // 时间发生变化,但是家政员不变
-            ycTime(self.bookingTime) == ycTime(self.order.status_time) &&
-            _.oldOrder.tech != self.tech
-            ) {
+            } else {
               _.$http(
-                "/j/HouseKeeping/Edit",
+                '/j/HouseKeeping/Edit',
                 {
                   id: _.oldOrderInfo.id,
                   contract: 1,
                   status: 2,
                   status_time: ycTime(self.bookingTime),
                   tech: self.tech,
-                  tech_mobile: self.techMobile
+                  tech_mobile: self.techMobile,
                 },
                 res => {
                   self.btnServer();
@@ -528,304 +515,326 @@
                 }
               );
             }
-            // 用户想进入已面试阶段
+            // 时间变化
           } else {
-            // 已面试,但编辑过家政员或面试日期,进行拦截
-            if (
-              self.tech != _.oldOrder.tech ||
-              ycTime(self.order.status_time) != ycTime(self.bookingTime)
-            ) {
-              self.$vux.alert.show({
-                content: "提交失败!",
-              })
-              return
-            }
             self.$vux.confirm.show({
-              title: "提示",
-              content: "请确定,家政员是否已面试",
-              // 组件除show外的属性
-              onCancel() {
-              },
+              // title: '提示',
+              content: '提交后将给客户发送预约短信,确认提交吗?',
+              onCancel() {},
               onConfirm() {
                 _.$http(
-                  "/j/HouseKeeping/Edit",
+                  '/j/HouseKeeping/Edit',
                   {
                     id: _.oldOrderInfo.id,
                     contract: 1,
-                    status: 3,
+                    status: 2,
+                    flag: 1,
                     status_time: ycTime(self.bookingTime),
-                    tech: self.tech
+                    tech: self.tech,
+                    tech_mobile: self.techMobile,
                   },
                   res => {
+                    self.btnServer();
                     statusF(res.data.success);
                     return;
                   }
                 );
-              }
-            });
-          }
-        }
-
-        // 已签约
-        if (self.order.contract == 1 && self.order.status == 3) {
-          if (self.resContract == 2) {
-            self.$vux.confirm.show({
-              title: "提示",
-              content: "请确定,家政员是否已签约",
-              // 组件除show外的属性
-              onCancel() {
               },
-              onConfirm() {
-                _.$http(
-                  "/j/HouseKeeping/Edit",
-                  {
-                    id: _.oldOrderInfo.id,
-                    contract: 2
-                  },
-                  res => {
-                    statusF(res.data.success);
-                    return;
-                  }
-                );
-              }
             });
-          } else {
+          }
+          // 用户想进入已面试阶段
+        } else {
+          // 已面试,但编辑过家政员或面试日期,进行拦截
+          if (
+            self.tech != _.oldOrder.tech ||
+            ycTime(self.order.status_time) != ycTime(self.bookingTime)
+          ) {
             self.$vux.alert.show({
-              title: "提示",
-              content: "请先选择签约状态,然后提交!"
+              content: '提交失败!',
             });
+            return;
           }
+          self.$vux.confirm.show({
+            title: '提示',
+            content: '请确定,家政员是否已面试',
+            // 组件除show外的属性
+            onCancel() {},
+            onConfirm() {
+              _.$http(
+                '/j/HouseKeeping/Edit',
+                {
+                  id: _.oldOrderInfo.id,
+                  contract: 1,
+                  status: 3,
+                  status_time: ycTime(self.bookingTime),
+                  tech: self.tech,
+                },
+                res => {
+                  statusF(res.data.success);
+                  return;
+                }
+              );
+            },
+          });
         }
+      }
 
-        // 提交返回状态
-        function statusF(s) {
-          if (s) {
-            self.$vux.alert.show({
-              title: "提示",
-              content: "提交成功!",
-              onShow() {
-                // console.log('Plugin: I\'m showing')
-              },
-              onHide() {
-                self.$router.push({path: "/managementList"});
-                return;
-              }
-            });
-          } else {
-            self.$vux.alert.show({
-              title: "提示",
-              content: "提交失败!请稍后再试。",
-              onShow() {
-              },
-              onHide() {
-                self.$router.push({path: "/managementList"});
-              }
-            });
-          }
+      // 已签约
+      if (self.order.contract == 1 && self.order.status == 3) {
+        if (self.resContract == 2) {
+          self.$vux.confirm.show({
+            title: '提示',
+            content: '请确定,家政员是否已签约',
+            // 组件除show外的属性
+            onCancel() {},
+            onConfirm() {
+              _.$http(
+                '/j/HouseKeeping/Edit',
+                {
+                  id: _.oldOrderInfo.id,
+                  contract: 2,
+                },
+                res => {
+                  statusF(res.data.success);
+                  return;
+                }
+              );
+            },
+          });
+        } else {
+          self.$vux.alert.show({
+            title: '提示',
+            content: '请先选择签约状态,然后提交!',
+          });
         }
-      },
-      change(val) {
-        this.bookingTime = val;
-        // console.log(this.bookingTime)
-        _.oldOrderInfo.bookingTime = this.bookingTime;
-      },
-      //  预约日期
-      getTime() {
-        let self = this;
-        // 组件内使用
-        this.$vux.datetime.show({
-          value: "", // 其他参数同 props
-          format: "YYYY-MM-DD HH:00",
-          yearRow: "{value}年",
-          monthRow: "{value}月",
-          dayRow: "{value}日",
-          hourRow: "{value}点",
-          confirmText: "完成",
-          cancelText: "取消",
-          onHide() {
-            const _this = this;
-            self.bookingTime = _this.value;
-          },
-          onShow() {
-            const _this = this;
-            // console.log(_this)
-          }
-        });
-      },
-      btnServiceForm() {
-        let self = this;
-        weui.picker(self.serviceArr, {
-          className: "custom-classname",
-          container: "body",
-          defaultValue: [1],
-          onChange: function (result) {
-          },
-          onConfirm: function (result) {
-            self.serviceForm = result[0].label;
-            self.resServiceArr = result[0].value;
-          },
-          id: "singleLinePicker"
-        });
-      },
-      btnContractFrom() {
-        let self = this;
-        weui.picker(self.contractArr, {
-          className: "custom-classname",
-          container: "body",
-          defaultValue: [1],
-          onChange: function (result) {
-          },
-          onConfirm: function (result) {
-            self.contractFrom = result[0].label;
-            self.resContract = result[0].value;
-          },
-          id: "singleLinePicker"
-        });
-      },
-      back() {
-        this.$router.push("/managementList");
-        // this.$router ? this.$router.back() : window.history.back()
       }
-    },
-    watch: {
-      order: function (val, oldVal) {
-        if (val == undefined) {
-          this.$router.push({path: "/order"});
+
+      // 提交返回状态
+      function statusF(s) {
+        if (s) {
+          self.$vux.alert.show({
+            title: '提示',
+            content: '提交成功!',
+            onShow() {
+              // console.log('Plugin: I\'m showing')
+            },
+            onHide() {
+              self.$router.push({ path: '/managementList' });
+              return;
+            },
+          });
+        } else {
+          self.$vux.alert.show({
+            title: '提示',
+            content: '提交失败!请稍后再试。',
+            onShow() {},
+            onHide() {
+              self.$router.push({ path: '/managementList' });
+            },
+          });
         }
       }
-    }
-  };
-
-  // 日期转时间戳 2014-07-10
-  function ycTime(t) {
-    let stringTime = t + ":00";
-    let timestamp = Date.parse(new Date(stringTime));
-    timestamp = timestamp / 1000;
-    return timestamp;
-  }
+    },
+    change(val) {
+      this.bookingTime = val;
+      // console.log(this.bookingTime)
+      _.oldOrderInfo.bookingTime = this.bookingTime;
+    },
+    //  预约日期
+    getTime() {
+      let self = this;
+      // 组件内使用
+      this.$vux.datetime.show({
+        value: '', // 其他参数同 props
+        format: 'YYYY-MM-DD HH:00',
+        yearRow: '{value}年',
+        monthRow: '{value}月',
+        dayRow: '{value}日',
+        hourRow: '{value}点',
+        confirmText: '完成',
+        cancelText: '取消',
+        onHide() {
+          const _this = this;
+          self.bookingTime = _this.value;
+        },
+        onShow() {
+          const _this = this;
+          // console.log(_this)
+        },
+      });
+    },
+    btnServiceForm() {
+      let self = this;
+      weui.picker(self.serviceArr, {
+        className: 'custom-classname',
+        container: 'body',
+        defaultValue: [1],
+        onChange: function(result) {},
+        onConfirm: function(result) {
+          self.serviceForm = result[0].label;
+          self.resServiceArr = result[0].value;
+        },
+        id: 'singleLinePicker',
+      });
+    },
+    btnContractFrom() {
+      let self = this;
+      weui.picker(self.contractArr, {
+        className: 'custom-classname',
+        container: 'body',
+        defaultValue: [1],
+        onChange: function(result) {},
+        onConfirm: function(result) {
+          self.contractFrom = result[0].label;
+          self.resContract = result[0].value;
+        },
+        id: 'singleLinePicker',
+      });
+    },
+    back() {
+      this.$router.push('/managementList');
+      // this.$router ? this.$router.back() : window.history.back()
+    },
+  },
+  watch: {
+    order: function(val, oldVal) {
+      if (val == undefined) {
+        this.$router.push({ path: '/order' });
+      }
+    },
+  },
+};
+
+// 日期转时间戳 2014-07-10
+function ycTime(t) {
+  let stringTime = t + ':00';
+  let timestamp = Date.parse(new Date(stringTime));
+  timestamp = timestamp / 1000;
+  return timestamp;
+}
 </script>
 <style scoped lang="less">
-  .weui-cell {
-    padding: 0 15px 0 0 !important;
+.weui-cell {
+  padding: 0 15px 0 0 !important;
+}
+
+title {
+  background-color: white;
+  margin-bottom: 5px;
+  display: block;
+  padding-top: 0.8rem;
+  font-size: 1rem;
+  text-align: center;
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  border-bottom: 1px solid #eeeeef;
+  span {
+    content: '';
+    width: 20px;
+    height: 20px;
+    position: absolute;
+    left: 15px;
+    bottom: 10px;
+    background-image: url('http://oduj3utzz.bkt.clouddn.com/arrow_left_2.svg');
+    background-repeat: no-repeat;
+    background-size: 100%;
+    background-position: center;
   }
+}
 
-  title {
-    background-color: white;
-    margin-bottom: 5px;
-    display: block;
-    padding-top: 0.8rem;
-    font-size: 1rem;
-    text-align: center;
-    position: fixed;
-    top: 0;
-    left: 0;
-    right: 0;
-    border-bottom: 1px solid #eeeeef;
-    span {
-      content: "";
-      width: 20px;
-      height: 20px;
-      position: absolute;
-      left: 15px;
-      bottom: 10px;
-      background-image: url("http://oduj3utzz.bkt.clouddn.com/arrow_left_2.svg");
-      background-repeat: no-repeat;
-      background-size: 100%;
-      background-position: center;
-    }
-  }
-
-  .order-body {
-    padding: 15px;
-    background-color: #eeeeef;
-    display: flex;
-    /*@media (width: 375px) and (height: 812px) {
+.order-body {
+  padding: 15px;
+  background-color: #eeeeef;
+  display: flex;
+  /*@media (width: 375px) and (height: 812px) {
         height: 89.5vh;
       }*/
 
-    .my-order-body {
-      background-color: #fff;
-      padding: 10px;
-      /*padding-left: 30px;*/
-      margin-top: 45px;
-      @media (max-width: 320px) {
-        /*padding: 0;*/
-        /*padding-left: .5rem;*/
-        /*margin-bottom: 20%;*/
-      }
+  .my-order-body {
+    background-color: #fff;
+    padding: 10px;
+    /*padding-left: 30px;*/
+    margin-top: 45px;
+    @media (max-width: 320px) {
+      /*padding: 0;*/
+      /*padding-left: .5rem;*/
+      /*margin-bottom: 20%;*/
+    }
 
-      flex: 1;
-      & > div {
-        color: #afafaf;
-        background-color: white;
-        font-size: 17px;
-        padding: 3px 0;
+    flex: 1;
+    & > div {
+      color: #afafaf;
+      background-color: white;
+      font-size: 17px;
+      padding: 3px 0;
 
-        @media (max-width: 320px) {
-          padding: 1px 0;
-          font-size: 14.5px;
-        }
-        & > span:nth-child(1) {
-          /*width: 25%;
+      @media (max-width: 320px) {
+        padding: 1px 0;
+        font-size: 14.5px;
+      }
+      & > span:nth-child(1) {
+        /*width: 25%;
             padding-left: 15px;
             display: inline-block;
             margin-right: 20px;
     */
-          min-width: 65px;
-          @media (max-width: 320px) {
-            /*min-width: 80px;*/
-          }
-          /*flex: 2;*/
-          color: #6a696a;
-          font-weight: bold;
-          text-align: left;
-          /*padding-left: 15px;*/
-          display: inline-block;
+        min-width: 65px;
+        @media (max-width: 320px) {
+          /*min-width: 80px;*/
         }
+        /*flex: 2;*/
+        color: #6a696a;
+        font-weight: bold;
+        text-align: left;
+        /*padding-left: 15px;*/
+        display: inline-block;
+      }
 
-        & > span:nth-child(2) {
-          /*width: 60%;*/
-          /*flex: 7;*/
-          display: inline-block;
-        }
+      & > span:nth-child(2) {
+        /*width: 60%;*/
+        /*flex: 7;*/
+        display: inline-block;
       }
     }
   }
-
-  .edit {
-    color: #f4bf69;
-  }
-
-  .edit_title {
-    color: #208bb7 !important;
-    font-weight: 100 !important;
-  }
-
-  .stroe {
-    display: flex;
-    flex-direction: row;
-  }
-
-  .tech,
-  .tech:focus {
-    border: 0;
-    outline: none;
-  }
-
-  .m-btn {
-    width: 100%;
-    /*margin: 10% auto 0;*/
-    bottom: 0;
-    /*position: fixed;*/
-    color: white;
-    font-size: 1.2rem;
-    padding: 0.5rem 0;
-    text-align: center;
-    /*min-height: 10vh;*/
-    background-color: #ffb433;
-  }
-
-  /* .weui-cell_access p {
+}
+
+.edit {
+  color: #f4bf69;
+}
+
+.edit_title {
+  color: #208bb7 !important;
+  font-weight: 100 !important;
+}
+
+.stroe {
+  display: flex;
+  flex-direction: row;
+}
+
+.tech,
+.tech:focus {
+  border: 0;
+  outline: none;
+}
+
+.m-btn {
+  width: 100%;
+  /*margin: 10% auto 0;*/
+  bottom: 0;
+  /*position: fixed;*/
+  color: white;
+  font-size: 1.2rem;
+  padding: 0.5rem 0;
+  text-align: center;
+  /*min-height: 10vh;*/
+  background-color: #ffb433;
+}
+
+/* .weui-cell_access p {
      color: #afafaf !important;
      font-weight: bold !important;
      font-size: 0.7rem !important;

+ 11 - 3
www/webapp/housekeeping/src/components/management/homeClerkDetails.vue

@@ -34,21 +34,21 @@
 
         <div class="info">
           <div>
-            <span>注册时间:</span>
+            <span>注册:</span>
           </div>
           <div>{{info.reg_time_str}}</div>
         </div>
 
         <div class="info" v-if="info.work_type.length != 1 || info.work_type[0] != 1">
           <div>
-            <span>服务日期:</span>
+            <span>日期:</span>
           </div>
           <div>{{info.work_time == ''?'暂无服务日期':info.work_time}}</div>
         </div>
 
         <div class="info">
           <div>
-            <span>钟点工时间:</span>
+            <span>时间:</span>
           </div>
           <div>
             <span>{{timeStr}}</span>
@@ -62,6 +62,14 @@
           <div>{{info.status_str}}</div>
         </div>
 
+        <div class="info">
+          <div>
+            <span>区域:</span>
+          </div>
+          <div>{{info.desc}}</div>
+        </div>
+
+
         <div class="info">
           <div>自述:</div>
           <div style="width: 60%"><p style="word-wrap: break-word">

+ 1 - 1
www/webapp/housekeeping/src/components/orderInfo.vue

@@ -16,7 +16,7 @@
 
 
         <div v-if='order.type == 1'><span
-          class="title">服务时间:</span>{{order.server_start_time}} ~ {{order.server_end_time}}
+          class="title">时间:</span>{{order.server_start_time}} ~ {{order.server_end_time}}
         </div>
         <div v-if='order.type == 1'><span class="title">形式:</span>{{order.cart_str}}</div>
 

+ 2 - 2
www/webapp/housekeeping/src/config/globalVariables.js

@@ -50,7 +50,7 @@ if (locationHref.indexOf('http://localhost:80') > -1) {
   apiPath = 'http://commontest.yiguanjia.me/index.php?r=';
   // userId = '57fe2dc59f5160a1048b4591' // 享月会
   // userId = '582405cea84ea02e3e8b4611' // 养老院
-  userId = '59e41443fb48a7552f8b459e'; // 管理员\门店老师
+  // userId = '59e41443fb48a7552f8b459e'; // 管理员\门店老师
   // 张工
   // userId = '582849af9f5160c2048b55dc';
 
@@ -63,7 +63,7 @@ if (locationHref.indexOf('http://localhost:80') > -1) {
   // userId = '5823fe6ca84ea02e3e8b45cb'
   // 邓涛
   // userId = '5a5eeaf3fb48a770708b456b' // 已注册
-  // userId = '57fe2dc59f5160a1048b4591'  // 未注册
+  userId = '57fe2dc59f5160a1048b4591'  // 未注册
   // 家政人员
   // userId = '57fa51649f5160c4048b4948'; // 我喂自己袋盐
   // userId = '5823fe35a84ea0c13e8b461c'; // 我喂自己袋盐2

Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно