seam 7 gadi atpakaļ
vecāks
revīzija
51ea3d0915

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
www/webapp/housekeeping/home/static/css/app.css


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
www/webapp/housekeeping/home/static/js/app.js


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
www/webapp/housekeeping/home/static/js/app.js.map


Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
www/webapp/housekeeping/home/static/js/manifest.js.map


+ 390 - 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,99 @@
   </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() {
+    console.log(_.locationHref)
+    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 +273,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 +322,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 +361,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 +395,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 (process.env.NODE_ENV == 'development') {
+            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>

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

@@ -63,7 +63,7 @@ if (locationHref.indexOf('http://localhost:80') > -1) {
   // userId = '5823fe6ca84ea02e3e8b45cb'
   // 邓涛
   // userId = '5a5eeaf3fb48a770708b456b' // 已注册
-  // userId = '57fe2dc59f5160a1048b4591'  // 未注册
+  userId = '57fe2dc59f5160a1048b4591'  // 未注册
   // 家政人员
   // userId = '57fa51649f5160c4048b4948'; // 我喂自己袋盐
   // userId = '5823fe35a84ea0c13e8b461c'; // 我喂自己袋盐2

Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels