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

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

@@ -19,8 +19,14 @@
             <!--<div v-if="partTimeWorkers.arrStr =='[6:00-19:00]'">-->
             <!--钟点工时间如果未设置,默认全天有空余时间,可接受安排！-->
             <!--</div>-->
-            <div v-if="partTimeWorkers.show != true" style="font-size: 14px;"><span
-              style="margin-right: 5px;font-weight: 100;" v-for="item in partTimeWorkers.arrStr">{{item}};</span></div>
+            <div v-if="partTimeWorkers.show != true" style="font-size: 14px;">
+              <span v-if="partTimeWorkers.arrStr[0] != '请'">
+              <span style="margin-right: 5px;font-weight: 100;"
+                    v-for="item in partTimeWorkers.arrStr">{{item}};</span>
+              </span>
+
+              <span v-else="partTimeWorkers.arrStr[0] == '请'">请选择时间</span>
+            </div>
           </div>
           <div @click="show(0)">
             <img src="http://oduj3utzz.bkt.clouddn.com/edit.svg" alt="">
@@ -32,8 +38,11 @@
             <div class="edit">
               <!--内容区域-->
               <div class="contents" @click="partTimeWorkers.popup = true">
-                <span style="margin-right: 5px;font-weight: 100;font-size: 17px;"
-                      v-for="item in partTimeWorkers.arrStr">{{item}};</span>
+                <span v-if="partTimeWorkers.arrStr[0] != '请'">
+              <span v-for="item in partTimeWorkers.arrStr">{{item}};</span>
+              </span>
+
+                <span v-else="partTimeWorkers.arrStr[0] == '请'">请选择时间</span>
               </div>
               <!--按钮区域-->
               <div class="btnBox">
@@ -106,10 +115,10 @@
                                placeholder="请输入您的地址"></span>-->
 
 
-                  <span style="min-height: 24px;display: block;font-weight: 100;" v-if="addressEdit == false"
+                  <span style="min-height: 24px;display: block;" v-if="addressEdit == false"
                         v-model="userInfo.address1"
                         @click="addressEdit = true">{{userInfo.address1}}</span>
-                  <input style="width: 60%; color: #ffb433"  v-if="addressEdit" class="weui-input" type="text"
+                  <input style="width: 60%; color: #ffb433;font-weight: bolder" v-if="addressEdit" class="weui-input" type="text"
                          v-model="userInfo.address1"
                          placeholder="请输入您的地址">
                 </label>
@@ -122,10 +131,10 @@
                   <span>
                       <!--<span v-if="userInfo.readme ==''" class="fontColorBlack"
                             style="color: blue">{{userInfo.readme}}</span>-->
-                    <span style="min-height: 24px;display: block;font-weight: 100;" v-if="readmeEdit == false"
+                    <span style="min-height: 24px;display: block;" v-if="readmeEdit == false"
                           v-model="userInfo.readme"
                           @click="readmeEdit = true">{{userInfo.readme}}</span>
-                      <input style="width: 60%;" v-if="readmeEdit" class="weui-input" type="text"
+                      <input style="font-weight: bolder;" v-if="readmeEdit" class="weui-input" type="text"
                              v-model="userInfo.readme"
                              placeholder="请输入您对自己的评价">
 
@@ -283,6 +292,12 @@
             if (this.worksType.numberArr != null) {
               this.worksType.arr = this.uSort(this.worksType.numberArr, 0);
             }
+            if (this.worksType.arr.length != 0) {
+              this.worksType.arrStr = "";
+              for (let i in this.worksType.arr) {
+                this.worksType.arrStr += `${this.worksType.arr[i].label} `;
+              }
+            }
             console.log(this.worksType.arr);
             // 技能
             if (this.skills.numberArr != null) {
@@ -330,7 +345,12 @@
       },
       workTypePartF(list) {
         let self = this;
+        console.log(list);
+        for (let i = 0; i < list.length; i++) {
+          console.log(`start:${list[i].start}--end:${list[i].end}`);
+        }
         self.partTimeWorkersShow();
+        self.partTimeWorkers.arr = [];
         self.partTimeWorkers.arr = list;
         console.log(self.partTimeWorkers.arr);
         self.partTimeWorkers.arrStr = self.str(self.partTimeWorkers.arr);
@@ -497,8 +517,8 @@
       show(index) {
         switch (index) {
           case 0:
-            // this.partTimeWorkers.show = !this.partTimeWorkers.show;
-            this.partTimeWorkers.show = true;
+            this.partTimeWorkers.show = !this.partTimeWorkers.show;
+            // this.partTimeWorkers.show = true;
             this.home.show = false;
             this.userInfo.show = false;
             break;
@@ -888,7 +908,7 @@
               border: 1px solid #c1c1c1;
               border-top: 0;
               border-bottom: 0;
-              padding: 5px;
+              padding: 10px 15px;
               label {
                 /*font-size: 15px;*/
                 /*padding: 5px 0;*/
@@ -896,7 +916,7 @@
                 /*border-bottom: 1px solid rgba(0, 0, 0, 0.1);*/
                 display: flex;
                 align-items: center;
-                font-size: .8rem;
+                /*font-size: .8rem;*/
 
                 &:last-child {
                   border-bottom: 0;

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

@@ -383,11 +383,6 @@
           }
         }
 
-        // 家政员电话不为空判断
-        // if (self.techMobile.length == '') {
-        //   weui.alert('请输入人员电话');
-        //   return
-        // }
         // 预约中
         if (self.order.contract == 1 && self.order.status == 1) {
           // 已预约
@@ -397,6 +392,7 @@
               {
                 id: _.oldOrderInfo.id,
                 status: 2,
+                flag: 1,
                 status_time: ycTime(self.bookingTime),
                 tech: self.tech,
                 tech_mobile: self.techMobile
@@ -413,19 +409,6 @@
                 }
               }
             );
-
-            /*let stitching = `&id=${_.oldOrderInfo.id}&status=2&status_time=${ycTime(self.bookingTime)}&tech=${self.tech}&tech_mobile=${self.techMobile}`;
-              axios.post(_.apiPath + 'j/HouseKeeping/Edit' + stitching).then(res => {
-                if (res.data.success) {
-                  weui.alert('提交成功', function () {
-                    self.$router.push({path: '/managementList'});
-                  });
-                  return
-                } else {
-                  weui.alert('提交失败');
-                  return
-                }
-              })*/
             return;
           } else {
             // 已取消
@@ -481,10 +464,7 @@
         if (self.order.contract == 1 && self.order.status == 2) {
           // 用户不想进入已面试阶段
           if (self.resServiceArr === 1) {
-            // 时间发生变化
-            // 家政员发生变化
-            console.log(_.oldOrder.tech);
-            console.log(self.tech);
+            // 时间未发生变化 || 家政员未发生变化
             if (
               _.oldOrder.tech == self.tech &&
               ycTime(self.bookingTime) == ycTime(self.order.status_time)
@@ -494,6 +474,7 @@
                 content: "请勿重复提交"
               });
             } else if (
+              // 时间发生变化
               ycTime(self.bookingTime) != ycTime(self.order.status_time)
             ) {
               self.$vux.confirm.show({
@@ -537,14 +518,18 @@
                 }
               );
             }
-
-            /*let stitching = `&id=${_.oldOrderInfo.id}&contract=1&status=2&status_time=${ycTime(self.bookingTime)}&tech=${self.tech}&tech_mobile=${self.techMobile}`;
-              axios.post(_.apiPath + 'j/HouseKeeping/Edit' + stitching).then(res => {
-                statusF(res.data.success);
-                return;
-              })*/
             // 用户想进入已面试阶段
           } 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: "请确定,家政员是否已面试",
@@ -566,11 +551,6 @@
                     return;
                   }
                 );
-                /*let stitching = `&id=${_.oldOrderInfo.id}&contract=1&status=3&status_time=${ycTime(self.bookingTime)}&tech=${self.tech}`;
-                  axios.post(_.apiPath + 'j/HouseKeeping/Edit' + stitching).then(res => {
-                    statusF(res.data.success);
-                    return;
-                  })*/
               }
             });
           }
@@ -597,11 +577,6 @@
                     return;
                   }
                 );
-                /*let stitching = `&id=${_.oldOrderInfo.id}&contract=2`;
-                  axios.post(_.apiPath + 'j/HouseKeeping/Edit' + stitching).then(res => {
-                    statusF(res.data.success);
-                    return;
-                  })*/
               }
             });
           } else {

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

@@ -4,27 +4,25 @@
     <title class="order-body-title">预约信息<span @click="back"></span></title>
     <div class="order-body">
       <div class="my-order-body">
-        <div><span class="title">日期：</span>{{time_str}}</div>
+        <div><span class="title">创建：</span>{{time_str}}</div>
         <div><span class="title">类型：</span>{{order.type_str}}</div>
 
         <div><span class="title">地址：</span>{{order.address}}</div>
 
 
-        <div class="stroe"><span class="title"
-                                 style="display: flex;align-items: center;"><span>门店：</span></span><span>
-          {{storeName }}（{{storeAddress}}）<br>门店电话:<a id='tel' class="edit"
-                                                      v-bind:href='`tel:${storeMobile}`'>{{storeMobile}}</a>
+        <div class="stroe"><span class="title" style="display: flex;align-items: center;"><span>门店：</span></span><span>
+          {{storeName }}（{{storeAddress}}）<br>门店电话:<a id='tel' class="edit" v-bind:href='`tel:${storeMobile}`'>{{storeMobile}}</a>
         </span></div>
 
 
-        <div v-if='order.type -1 == 0'><span
+        <div v-if='order.type == 1'><span
           class="title">服务时间：</span>{{order.server_start_time}} ~ {{order.server_end_time}}
         </div>
-        <div v-if='order.type -1  == 0'><span class="title">形式：</span>{{order.cart_str}}</div>
+        <div v-if='order.type == 1'><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 == 1'><span class="title">预产：</span>{{order.yc_time}}</div>
-        <div v-if='order.type -1 == 2'><span class="title">童龄：</span>{{order.age}}岁</div>
+        <div v-if='order.type == 1'><span class="title">技能：</span>{{skillStr}}</div>
+        <div v-if='order.type > 1'><span class="title">{{order.type == 2?'预产':'日期'}}：</span>{{order.yc_time}}</div>
+        <div v-if='order.type == 3'><span class="title">童龄：</span>{{order.age}}岁</div>
         <!--<div><span class="title">预约状态：</span>{{order.contract_str}}</div>-->
         <div v-if="order.status !==1"><span class="title">面试：</span>{{order.status_time_str}}</div>
         <!--<div  v-if="order.status !==1"><span class="title">家政员：</span><span v-if="order.tech == ''">暂未分配家政员</span>{{order.tech}}</div>-->

www/webapp/housekeeping/src/components/public/selectTime.vue

@@ -8,7 +8,7 @@
       <div class="btn" @click="btnTrue">确定</div>
     </div>
     <div style="font-weight: 100;color: rgba(0,0,0,0.7);font-size: 1rem;padding: 10px 0 10px 15px;">
-      绿色表示已选中,灰色表示未选中
+      橙色表示已选中,灰色表示未选中
     </div>
     <div class="times">
       <div v-for="item in times" v-bind:class="{timeBC : item.color}">
@@ -71,6 +71,7 @@
           for (let j in self.show.arr) {
             if (self.times[i].start >= self.show.arr[j].start && self.times[i].end <= self.show.arr[j].end) {
               self.times[i].color = true
+              self.btnTimes.push(self.times[i])
             }
           }
         }
@@ -83,6 +84,7 @@
         item.color = !item.color;
         if (item.color) {
           self.btnTimes.push(item);
+          console.log(self.btnTimes)
         } else {
           let indexOf = self.btnTimes.indexOf(item);
           // console.log(indexOf)
@@ -147,6 +149,7 @@
             }
           }
         }
+
         self.workTypePart = work_type_part;
         // console.log(self.workTypePart)
         self.$emit('workTypePart', self.workTypePart);
@@ -196,7 +199,7 @@
         border: 1px solid white;
         width: 25%;
         text-align: center;
-        padding: 5px 0;
+        padding: 10px 0;
         color: #000;
         background-color: #eeeeee;
         transition: all .3s;

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

@@ -60,12 +60,12 @@ if (locationHref.indexOf('http://localhost:80') > -1) {
   // 刘星
   // userId = '5860c5ce9f5160ad048b650f'
   // 立秋:客户
-  userId = '5823fe6ca84ea02e3e8b45cb'
+  // userId = '5823fe6ca84ea02e3e8b45cb'
   // 邓涛
   // userId = '5a5eeaf3fb48a770708b456b' // 已注册
   // userId = '5870c935a84ea0417e8b456f'  // 未注册
   // 家政人员
-  // userId = '57fa51649f5160c4048b4948'; // 我喂自己袋盐
+  userId = '57fa51649f5160c4048b4948'; // 我喂自己袋盐
   // userId = '5823fe35a84ea0c13e8b461c'; // 我喂自己袋盐2
 } else if (locationHref.indexOf('admin.yiguanjiadev.me') > -1) {
   apiPath = 'http://admin.yiguanjiadev.me/index.php?r=';