From d2fff1687cce6e21ff12fe52b23c54c5bb0ac8d4 Mon Sep 17 00:00:00 2001
From: iceling <iceling@meidd.com>
Date: Mon, 18 Nov 2019 20:34:36 +0800
Subject: [PATCH] 预约订单列表的二维码，预约详情数据填充判断，选择预约时间

---
 pages/user/my_service/beauty_deta.js        | 36 ++++++++++++++++++++++++++++++++++--
 pages/user/my_service/beauty_deta.wxml      | 31 ++++++++++++++++++++-----------
 pages/user/my_service/tment_details.js      | 17 +++++++++++++++--
 pages/user/my_service/tment_details.json    |  5 ++++-
 pages/user/my_service/tment_details.wxml    | 35 ++++++++++++++++++-----------------
 pages/user/my_service/tment_order_list.js   | 12 ++++++++++++
 pages/user/my_service/tment_order_list.json |  5 ++++-
 pages/user/my_service/tment_order_list.wxml | 27 +++++++++++++--------------
 pages/user/my_service/tment_order_list.wxss | 11 ++++++++---
 9 files changed, 128 insertions(+), 51 deletions(-)

diff --git a/pages/user/my_service/beauty_deta.js b/pages/user/my_service/beauty_deta.js
index 78e5f2d..7a12427 100644
--- a/pages/user/my_service/beauty_deta.js
+++ b/pages/user/my_service/beauty_deta.js
@@ -15,6 +15,8 @@ Page({
     name: "", //美容师姓名
     comment: "", //美容师评价
     head_img: "", //美容师头像
+    time: ["08:00", "09:00", "10:00", "11:00", "12:00", "13:00", "14:00", "15:00", "16:00", "17:00", "18:00", "19:00", "20:00", "21:00", "22:00"],
+    time_index: 0, //选择预约时间下标
   },
 
   /**
@@ -32,7 +34,7 @@ Page({
     th.query_date();
   },
   //图片失败，默认图片
-  bind_bnerr1: function (e) {
+  bind_bnerr1: function(e) {
     var _errImg = e.target.dataset.errorimg;
     var _Img = e.target.dataset.img;
     if (_Img != undefined) {
@@ -68,6 +70,24 @@ Page({
       }
     })
   },
+  //返回上个页面
+  navigateBack:function(){
+    wx.navigateBack({ changed: true });//返回上一页  
+  },
+  //选择时间
+  Selection_time: function(e) {
+    var th = this;
+    var index = e.currentTarget.dataset.index;
+    var time_index = th.data.time_index;
+    if (index == time_index) {
+      return;
+    } else {
+      th.setData({
+        time_index: time_index
+      })
+    }
+  },
+
   query_date: function() {
     var th = this;
     var url = "/api/weshop/marketing/reservation/staff/time/list";
@@ -82,8 +102,20 @@ Page({
     }).then(res => {
       if (res.data.code == 0) {
         var data = res.data.data;
+        var time = th.data.time; //固定时间
+        var time_list = [];
+        for (var i = 0; i < time.length; i++) {
+          for (var ii = ii; ii < data.length; ii++) {
+            if (time[i] == data[ii]) {
+              time_list[i] = data[ii];
+              break;
+            } else {
+              time_list[i] = "";
+            }
+          }
+        }
         th.setData({
-          time_list: data
+          time_list: time_list
         })
       } else {
         getApp().my_warnning(res.data.msg, 0, th);
diff --git a/pages/user/my_service/beauty_deta.wxml b/pages/user/my_service/beauty_deta.wxml
index c7f729d..4079c23 100644
--- a/pages/user/my_service/beauty_deta.wxml
+++ b/pages/user/my_service/beauty_deta.wxml
@@ -10,7 +10,7 @@
 
       <view class="introduce fs26">
         <block wx:if="{{comment!=''}}">
-       {{comment}}
+          {{comment}}
         </block>
         <block wx:else>
           暂无介绍
@@ -36,18 +36,27 @@
       <!-- 选择时间 -->
       <view class="Times">
 
-        <view class="flex-center" wx:for="{{time_list}}" style="display:inline-block;">
-
-          <view class="Time flex-center {{index==0?'chTime':'nochTime'}}">
-            <view>
-              <view class="fs26">{{item.GroupHour}}</view>
-              <block wx:if="{{flase}}">
-                <view class="fs24">约满</view>
-              </block>
+        <view class="flex-center" wx:for="{{time}}" style="display:inline-block;">
+          <block wx:if="{{true}}">
+          <!-- {{item==time_list[index]}} -->
+            <view class="Time flex-center {{time_index==index?'chTime':''}}" bindtap="Selection_time" data-index="{{index}}">
+              <view>
+                <view class="fs26">{{item}}</view>
+                <block wx:if="{{flase}}">
+                  <view class="fs24">约满</view>
+                </block>
+              </view>
             </view>
-          </view>
+          </block>
+          <block wx:else>
+          <view class="Time flex-center nochTime">
+              <view>
+                <view class="fs26">{{item}}</view>
+              </view>
+            </view>
+          </block>
         </view>
-        <view class="choice flex-center fs32">
+        <view class="choice flex-center fs32" bindtap="navigateBack">
           <view>确定选择</view>
         </view>
 
diff --git a/pages/user/my_service/tment_details.js b/pages/user/my_service/tment_details.js
index 7fd3089..6facf10 100644
--- a/pages/user/my_service/tment_details.js
+++ b/pages/user/my_service/tment_details.js
@@ -1,7 +1,8 @@
 var e = getApp(),
   a = e.globalData.setting,
   os = a,
-  t = e.request;
+  t = e.request,
+  d = e.globalData;
 Page({
 
   /**
@@ -9,13 +10,25 @@ Page({
    */
   data: {
     iurl: a.imghost,
+    tment_details: [], //预约详情
   },
 
   /**
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-
+    var th = this;
+    var url = "http://localhost:8022/api/weshop/yy_fuwu_meirsxiangq";
+    wx.request({
+      url: url,
+      success: function(res) {
+        if (res.data.code == 0) {
+            th.setData({
+              tment_details:res.data.data
+            })
+        }
+      }
+    })
   },
   /**
    * 生命周期函数--监听页面显示
diff --git a/pages/user/my_service/tment_details.json b/pages/user/my_service/tment_details.json
index dd9566f..3132bf0 100644
--- a/pages/user/my_service/tment_details.json
+++ b/pages/user/my_service/tment_details.json
@@ -1,3 +1,6 @@
 {
-  "navigationBarTitleText": "预约详情"
+  "navigationBarTitleText": "预约详情",
+    "usingComponents": {
+      "warn": "/components/long_warn/long_warn"
+    }
 }
\ No newline at end of file
diff --git a/pages/user/my_service/tment_details.wxml b/pages/user/my_service/tment_details.wxml
index 6acdce9..5350629 100644
--- a/pages/user/my_service/tment_details.wxml
+++ b/pages/user/my_service/tment_details.wxml
@@ -4,29 +4,30 @@
     <!-- 状态栏 -->
     <view class="statusBar fs32 flex-vertical-between lf">
       <view>预约状态：</view>
-      <view>未服务</view>
-      <view wx:if="{{false}}">已服务</view>
-      <view wx:if="{{false}}">已过期</view>
+      <view wx:if="{{tment_details.state==1}}">未服务</view>
+      <view wx:if="{{tment_details.state==2}}">已服务</view>
+      <view wx:if="{{tment_details.state==3}}">已过期</view>
+      <view wx:if="{{tment_details.state==4}}">已取消</view>
     </view>
     <view class="fs30">
       <view class="items lf">
         <!-- 预约门店 -->
         <view class="flex-vertical bmt">
           <view class="name">预约门店:</view>
-          <view class="ellipsis-1 value">王者峡谷中路店</view>
+          <view class="ellipsis-1 value">{{tment_details.store_name}}</view>
         </view>
 
         <!-- 预约项目 -->
         <view class="flex-vertical bmt">
           <view class="name">预约项目:</view>
-          <view class="ellipsis-1 value">王者峡谷中路店</view>
+          <view class="ellipsis-1 value">{{tment_details.item}}</view>
         </view>
 
         <!-- 预约时间 -->
         <view class="flex-vertical bmt">
           <view class="name">预约时间:</view>
-          <view class="date">2018-08-16</view>
-          <view>10:00</view>
+          <view class="date">{{tment_details.time}}</view>
+          <view>{{tment_details.time_interval}}</view>
         </view>
       </view>
       <view class="bt">
@@ -38,7 +39,7 @@
             <view>容</view>
             <view>师:</view>
           </view>
-          <view class="ellipsis-1 value">王者峡谷中路店</view>
+          <view class="ellipsis-1 value">{{tment_details.Beautician}}</view>
         </view>
         <!-- 预约人及联系方式 -->
         <!-- 姓名 -->
@@ -48,7 +49,7 @@
             <view>约</view>
             <view>人:</view>
           </view>
-          <view class="ellipsis-1 value">钱巧玲</view>
+          <view class="ellipsis-1 value">{{tment_details.name}}</view>
         </view>
         <!-- 号码 -->
         <view class="flex-vertical">
@@ -57,7 +58,7 @@
             <view>机</view>
             <view>人:</view>
           </view>
-          <view>18065336494</view>
+          <view>{{tment_details.phone}}</view>
         </view>
       </view>
     </view>
@@ -82,16 +83,16 @@
   <view class="subs flex-vertical-between fs32">
 
     <view class="sub lb flex-center">
-      <view>取消预约</view>
-      <view wx:if="{{false}}">删除订单</view>
-      <view wx:if="{{false}}">更改时间</view>
+      <view wx:if="{{tment_details.state==1}}">取消预约</view>
+      <view wx:if="{{tment_details.state==2 || tment_details.state==3}}">删除订单</view>
     </view>
 
     <view class="sub rb flex-center">
-      <view>更改时间</view>
-      <view wx:if="{{false}}">重新预约</view>
-      <view wx:if="{{false}}">发表评价</view>
+      <navigator wx:if="{{tment_details.state==1}}" url="/pages/user/my_service/beauty_deta">更改时间</navigator>
+      <navigator wx:if="{{tment_details.state==2}}" url="/pages/user/my_service/tment_eval">发表评价</navigator>
+      <navigator wx:if="{{tment_details.state==3}}" url="/pages/user/my_service/appment_main">重新预约</navigator>
     </view>
 
   </view>
-</view>
\ No newline at end of file
+</view>
+<warn id="warn"></warn>
\ No newline at end of file
diff --git a/pages/user/my_service/tment_order_list.js b/pages/user/my_service/tment_order_list.js
index 8a35050..5ab56e2 100644
--- a/pages/user/my_service/tment_order_list.js
+++ b/pages/user/my_service/tment_order_list.js
@@ -49,6 +49,18 @@ Page({
       return false;
     }
   },
+  //显示核销码
+  code_show: function (e) {
+    var th = this;
+    //--获取成功的时候--
+    var no = e.currentTarget.dataset.order_sn;
+    var qc_com = th.selectComponent("#qc_com"); //组件的id
+    var obj = {
+      val: no,
+      content: "请将二维码展示给核销员，使用更快捷"
+    };
+    qc_com.open(obj)
+  },
   query_orderList: function() {
     var th = this;
     var url = "http://localhost:8022/api/weshop/yy_order_list";
diff --git a/pages/user/my_service/tment_order_list.json b/pages/user/my_service/tment_order_list.json
index 4562f44..8a0db23 100644
--- a/pages/user/my_service/tment_order_list.json
+++ b/pages/user/my_service/tment_order_list.json
@@ -1,3 +1,6 @@
 {
-  "navigationBarTitleText": "我的预约"
+  "navigationBarTitleText": "我的预约",
+  "usingComponents": {
+    "qr_code": "/components/qr_code/qr_code"
+  }
 }
\ No newline at end of file
diff --git a/pages/user/my_service/tment_order_list.wxml b/pages/user/my_service/tment_order_list.wxml
index eedf0c8..b6c1823 100644
--- a/pages/user/my_service/tment_order_list.wxml
+++ b/pages/user/my_service/tment_order_list.wxml
@@ -9,19 +9,15 @@
     <!-- 预约项目 -->
     <view wx:for="{{tm_order_list}}">
       <!-- 商品编号和状态 -->
-      <view class="Commodity_number flex-vertical-between fs24 padding">
+      <view class="Commodity_number flex-vertical-between fs26 padding">
         <!--商品编号 -->
         <text class="order_number ellipsis-1" selectable='true'>订单编号：{{item.order_sn}}</text>
-        <!-- 商品评价状态 -->
-        <view class="flex-center xc-wc">
-          <!-- 订单状态 -->
+        <!-- 订单状态 -->
+        <view class="flex-center state">
           <view wx:if="{{item.is_prom==1}}">未服务</view>
           <view wx:if="{{item.is_prom==2}}">已服务</view>
           <view wx:if="{{item.is_prom==3}}">已过期</view>
-          <view class="flex-center">
-            <view class="lin"></view>
-            <image src="{{iurl}}miniapp/images/trash.png" bindtap="deleteOrderData" data-order_id="{{index}}"></image>
-          </view>
+          <view wx:if="{{item.is_prom==4}}">已取消</view>
         </view>
       </view>
 
@@ -59,15 +55,16 @@
         </view>
       </navigator>
       <view class="Unim flex-right-vertical fs26 padding">
-        <block wx:if="{{item.order_status==1}}">
+        <image wx:if="{{item.is_prom==1}}" src="{{iurl}}miniapp/images/order/code.png" class="code" bindtap="code_show" data-order_sn="{{item.order_sn}}"></image>
+        <block wx:if="{{item.is_prom==1}}">
           <navigator url="/pages/user/my_service/tment_details" class="Unimportance flex-level">取消预约</navigator>
         </block>
         <block wx:else>
-          <navigator url="/pages/user/my_service/tment_details" class="Unimportance flex-level">查看详情</navigator>
+          <navigator wx:if="{{item.is_prom==2 || item.is_prom==3}}" url="/pages/user/my_service/tment_details" class="Unimportance flex-level">查看详情</navigator>
         </block>
-        <navigator class="important Unimportance flex-level" url="/pages/user/my_service/tment_details">更改时间</navigator>
-        <navigator url="/pages/user/my_service/tment_eval" wx:if="{{false}}" class="important Unimportance flex-level">发表评价</navigator>
-        <navigator url="/pages/user/my_service/appment_main" wx:if="{{false}}" class="important Unimportance flex-level">重新预约</navigator>
+        <navigator wx:if="{{item.is_prom==1}}" class="important Unimportance flex-level" url="/pages/user/my_service/beauty_deta">更改时间</navigator>
+        <navigator wx:if="{{item.is_prom==2}}" url="/pages/user/my_service/tment_eval" class="important Unimportance flex-level">发表评价</navigator>
+        <navigator wx:if="{{item.is_prom==3}}" url="/pages/user/my_service/appment_main" class="important Unimportance flex-level">重新预约</navigator>
 
       </view>
     </view>
@@ -90,4 +87,6 @@
       <view class="flex-center fs28 white">立即预约</view>
     </navigator>
   </view>
-</view>
\ No newline at end of file
+</view>
+<!-- 弹出框扫描 -->
+<qr_code id="qc_com"></qr_code>
\ No newline at end of file
diff --git a/pages/user/my_service/tment_order_list.wxss b/pages/user/my_service/tment_order_list.wxss
index 7c46cde..cc8d994 100644
--- a/pages/user/my_service/tment_order_list.wxss
+++ b/pages/user/my_service/tment_order_list.wxss
@@ -46,15 +46,20 @@ page {
 }
 
 .order_number {
-  max-width: 500rpx;
+  max-width: 550rpx;
+}
+.state{
+  color: rgb(216,63,82);
 }
-
 .items {
   border-top: 4rpx solid rgb(245, 245, 245);
   border-bottom: 4rpx solid rgb(245, 245, 245);
   height: 260rpx;
 }
-
+.code{
+  width: 55rpx;
+  height: 55rpx;
+}
 .itemimage {
   width: 190rpx;
   height: 190rpx;
--
libgit2 0.21.4