order

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

@@ -62,6 +62,7 @@
     created() {
 //      console.log(config)
       init()
+      console.log(config.user_id)
     }
   }
 

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

@@ -15,9 +15,9 @@
         <div class="tab-view">
           <div v-for="item in orderList" class="my-order-body" @click='btnEditOrder(item)'>
             <div><span class="title">创建日期：</span>{{item.time}}</div>
-            <div><span class="title">服务类型：</span>{{type[item.type]}}</div>
-            <div><span class="title">服务类型：</span>{{item.cart_str}}</div>
-            <div><span class="title">服务类型：</span>{{item.address}}</div>
+            <div><span class="title">服务类型：</span>{{item.type_str}}</div>
+            <div><span class="title">服务形式：</span>{{item.cart_str}}</div>
+            <div><span class="title">服务地址：</span>{{item.address}}</div>
           </div>
         </div>
       </scroller>
@@ -92,7 +92,7 @@
       },
       btnEditOrder(item) {
         _.oldOrderInfo = item;
-        this.$router.push({path: '/oldOrderInfo'})
+        this.$router.push({path: '/orderInfo'})
       }
     }
   }

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

@@ -0,0 +1,90 @@
+<template>
+  <scroller>
+    <div class="box">
+      <title>订单信息</title>
+      <div class="my-order-body">
+        <div><span class="title">创建日期：</span>{{order.time}}</div>
+        <div><span class="title">服务类型：</span>{{order.type_str}}</div>
+        <div><span class="title">服务地址：</span>{{order.address}}</div>
+
+
+        <div v-if='order.type -1 == 0'><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><span class="title">服务技能：</span>{{order.skill_str}}</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><span class="title">预约状态：</span>{{order.contract_str}}</div>
+        <div><span class="title">预约日期：</span>{{order.status_time}}</div>
+        <div><span class="title">家政员：</span><span v-if="order.tech == ''">暂未分配家政员</span>{{order.tech}}</div>
+        <div><span class="title">备注：</span>{{order.desc}}</div>
+
+      </div>
+    </div>
+  </scroller>
+</template>
+<script>
+  import _ from '@/config'
+
+  export default {
+    name: 'orderInfo',
+    data() {
+      return {
+        type: {0: '钟点工', 1: '月嫂', 2: '育婴师', 3: '护理老人', 4: '全套家务'},
+        order: null
+      }
+    },
+    created() {
+      if (_.oldOrderInfo === undefined) {
+        this.$router.push({path: '/order'})
+      }
+      this.order = _.oldOrderInfo;
+      // 转化时间格式
+      this.order.yc_time = _.timetrans(this.order.yc_time); // 预产期
+      this.order.yc_time = this.order.yc_time.substring(0, 10); // 预产期
+      this.order.server_start_time = _.timetrans(this.order.server_start_time);
+      this.order.server_start_time = this.order.server_start_time.substring(11, 16);
+      this.order.server_end_time = _.timetrans(this.order.server_end_time);
+      this.order.server_end_time = this.order.server_end_time.substring(11, 16);
+      this.order.status_time = _.timetrans(this.order.status_time);
+    },
+    watch:{
+      order: function (val, oldVal) {
+        if(val == undefined){
+          this.$router.push({path: '/order'})
+        }
+      }
+    }
+  }
+</script>
+<style scoped lang="less">
+  title {
+    display: block;
+    padding: 15px 0;
+    font-size: 30px;
+    font-weight: 900;
+    text-align: center;
+  }
+
+  .my-order-body {
+    border-top: 1px solid rgba(0, 0, 0, 0.1);
+    border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+
+    padding-left: 15px;
+    & > div {
+      font-size: 15px;
+      padding: 5px 0;
+      border-bottom: 1px solid rgba(0, 0, 0, 0.1);
+      &:last-child {
+        border-bottom: 0;
+      }
+      & > span:nth-child(1) {
+        width: 20%;
+        display: inline-block;
+        margin-right: 20px;
+      }
+    }
+  }
+</style>