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

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

@@ -27,6 +27,9 @@
     <div class="registered" @click="registeredF" v-if="registered && administrator == false">
       注册
     </div>
+    <div class="registered" v-if="!registered" @click="myOrder">
+      我的
+    </div>
     <!--导航-->
     <div class="footer">
       <img :src="footer" alt="">
@@ -47,13 +50,13 @@
         // footer: 'http://odulvej8l.bkt.clouddn.com/2018-01-08-8.jpg',
         footer: 'http://odulvej8l.bkt.clouddn.com/2018-01-17-8.jpg',
         registered: false,
-        administrator:false
+        administrator: false
       }
     },
     methods: {
       demand(type) {
         let that = this;
-        if(that.administrator){
+        if (that.administrator) {
           weui.alert('门店管理员无法预约服务！');
           return;
         }
@@ -71,6 +74,9 @@
       },
       registeredF() {
         this.$router.push({path: '/userInfo'});
+      },
+      myOrder() {
+        this.$router.push({path: '/order'});
       }
     },
     created() {
@@ -182,21 +188,21 @@
   }*/
 
   /*iphoneX*/
-/*  @media (min-height: 812px) {
-    .home {
-      padding-top: 6vh;
-    }
+  /*  @media (min-height: 812px) {
+      .home {
+        padding-top: 6vh;
+      }
 
-    .footer {
-      position: fixed;
-      bottom: 0;
-      left: 0;
-      right: 0;
-      & > img {
-        width: 200%;
-        height: 15vh;
-        margin-left: -50%;
+      .footer {
+        position: fixed;
+        bottom: 0;
+        left: 0;
+        right: 0;
+        & > img {
+          width: 200%;
+          height: 15vh;
+          margin-left: -50%;
+        }
       }
-    }
-  }*/
+    }*/
 </style>

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

@@ -38,11 +38,11 @@
         <div v-if="!showStatus"><span class="title">预约日期：</span>{{order.status_time}}</div>
         <!--家政员-->
         <div v-if="showTech">
-          <span class="title">家政员：</span><span><input v-model="tech" class="tech" type="text"
+          <span class="title">家政员：</span><span><input v-model="tech" class="tech edit" type="text"
                                                       placeholder='请输入家政员'></span>
         </div>
         <div v-if="order.status !== 3 && order.contract !== 2">
-          <span class="title">家政员电话：</span><span><input v-model="techMobile" class="tech" type="text"
+          <span class="title">家政员电话：</span><span><input v-model="techMobile" class="tech edit" type="text"
                                                         placeholder='请输入家政员电话'></span>
         </div>
         <div v-if='!showTech'><span class="title">家政员：</span>{{order.tech}}</div>
@@ -58,7 +58,7 @@
         <!--</div>-->
         <div v-if="order.status == 2">
           <span class="title">面试状态：</span>
-          <span style="margin-left: -4px;" @click="btnServiceForm">{{serviceForm}}</span>
+          <span style="margin-left: -4px;" @click="btnServiceForm" class="edit">{{serviceForm}}</span>
         </div>
         <div><span class="title">备注：</span>{{order.desc}}</div>
       </div>
@@ -360,6 +360,9 @@
       }
     }
   }
+  .edit{
+    color: blue;
+  }
 
   .stroe {
     display: flex;

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

@@ -14,7 +14,9 @@
         </div>
         <div class="tab-view">
           <div v-if="orderList.length !==0" style="font-size: 13px;padding-left: 15px;">点击订单查看详情！</div>
-          <div v-for="item in orderList" class="my-order-body" @click='btnEditOrder(item)'>
+          <div v-for="item in orderList" v-bind:class="{'light-yellow':item.flag == 0}" class="my-order-body"
+               @click='btnEditOrder(item)'>
+            <!--<div>{{item.flag}}</div>-->
             <div><span class="title">创建日期：</span>{{item.time}}</div>
             <div><span class="title">客户姓名：</span>{{item.user_name}}</div>
             <div><span class="title">服务类型：</span>{{item.type_str}}</div>
@@ -108,6 +110,7 @@
             return item1.contract > item2.contract
           })
         }
+
         // 日期转时间戳 2014-07-10
         function ycTime(t) {
           let stringTime = t + ' 00:00:00';
@@ -124,6 +127,18 @@
       },
       btnEditOrder(item) {
         let that = this;
+        console.log(item);
+        console.log(item.id);
+        console.log(item.flag);
+        if (item.flag == 0) {
+          axios.get(_.apiPath + '/j/HouseKeeping/Flag&id=' + item.id).then(res => {
+            if (res.data.success) {
+              edit();
+            }
+          })
+        } else {
+          edit();
+        }
         // 转化时间格式
         /*item.yc_time = _.timetrans(item.yc_time); // 预产期
         item.yc_time = item.yc_time.substring(0, 10); // 预产期
@@ -131,11 +146,12 @@
         item.server_start_time = item.server_start_time.substring(11, 16);
         item.server_end_time = _.timetrans(item.server_end_time);
         item.server_end_time = item.server_end_time.substring(11, 16);*/
-
-        setTimeout(function () {
-          _.oldOrderInfo = item;
-          that.$router.push({path: '/managementEdit'})
-        }, 100);
+        function edit() {
+          setTimeout(function () {
+            _.oldOrderInfo = item;
+            that.$router.push({path: '/managementEdit'})
+          }, 100);
+        }
       }
     }
   }
@@ -195,6 +211,9 @@
       flex-wrap: wrap;
 
       /*background-color: #0ac8ff;*/
+      .light-yellow {
+        background-color: #fef243;
+      }
       .my-order-body {
         font-size: 15px;
         border-top: 1px solid rgba(0, 0, 0, 0.2);

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

@@ -82,6 +82,10 @@
       axios.post(_.apiPath + '/j/HouseKeeping/list&id=' + _.user_id).then(res => {
         if (res.status === 200) {
           that.oldOrderList = res.data.rows;
+          this.oldOrderList.sort(function (item1, item2) {
+            return item1.time < item2.time
+          })
+          console.log(this.oldOrderList)
           for (let i = 0; i < that.oldOrderList.length; i++) {
             that.oldOrderList[i].time = _.timetrans(that.oldOrderList[i].time)
           }
@@ -175,6 +179,9 @@
       flex-wrap: wrap;
 
       /*background-color: #0ac8ff;*/
+      .edit{
+        background-color: #fef243;
+      }
       .my-order-body {
         font-size: 15px;
         border-top: 1px solid rgba(0, 0, 0, 0.2);

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

@@ -30,11 +30,11 @@ if (locationHref.indexOf('http://localhost:8080/') > -1) {
   // userId = '582405cea84ea02e3e8b4611' // 养老院
   // userId = '59e41443fb48a7552f8b459e'; // 管理员
   // 张工
-  userId = '582849af9f5160c2048b55dc';
+  // userId = '582849af9f5160c2048b55dc';
   // 戴老师
   // userId = '57e38f1b9f5160ac048b457d' // 顾客
   // 刘星
-  // userId = '5860c5ce9f5160ad048b650f'
+  userId = '5860c5ce9f5160ad048b650f'
 } else if (locationHref.indexOf('admin.yiguanjiadev.me') > -1) {
   apiPath = 'http://admin.yiguanjiadev.me/index.php?r=';
   // userId = '57fe2dc59f5160a1048b4591'; // 享月会