From 840f69828645e58a83c6abdedd08baf462ff6286 Mon Sep 17 00:00:00 2001
From: DESKTOP-QHAFKU5\iceling <iceling@meidd.com>
Date: Sat, 30 Nov 2019 17:50:35 +0800
Subject: [PATCH] 修改一些bug跟界面兼容性调整

---
 pages/user/my_service/appment_main.js       |  3 +++
 pages/user/my_service/hist_service.js       |  5 +++++
 pages/user/my_service/i_service.js          | 40 +++++++++++++++++++++-------------------
 pages/user/my_service/i_service.wxml        |  2 +-
 pages/user/my_service/i_service.wxss        | 10 ++++++----
 pages/user/my_service/tment_details.js      | 91 +++++++++++++++++++++++++++++++++++++++++++++++++++++--------------------------------------
 pages/user/my_service/tment_details.json    |  1 +
 pages/user/my_service/tment_details.wxml    | 23 ++++++++++++-----------
 pages/user/my_service/tment_details.wxss    | 13 ++++++-------
 pages/user/my_service/tment_eval.js         |  1 -
 pages/user/my_service/tment_eval.wxml       | 17 ++++++++---------
 pages/user/my_service/tment_eval.wxss       | 12 ++++++++----
 pages/user/my_service/tment_order_list.wxml | 10 +++++-----
 pages/user/my_service/tment_order_list.wxss |  4 ++++
 14 files changed, 133 insertions(+), 99 deletions(-)

diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js
index 039c7b1..fe48974 100644
--- a/pages/user/my_service/appment_main.js
+++ b/pages/user/my_service/appment_main.js
@@ -85,6 +85,9 @@ Page({
   //提交预约
   sub_success: function(e) {
     var th = this;
+    th.setData({
+      is_textea: 0
+    })
     var formid = e.detail.formId; //发送预约成功模版信息
     var store = th.data.store_name; //门店名称
     var bea_name = th.data.beautician_name; //美容师名称
diff --git a/pages/user/my_service/hist_service.js b/pages/user/my_service/hist_service.js
index 5c40c6a..725676e 100644
--- a/pages/user/my_service/hist_service.js
+++ b/pages/user/my_service/hist_service.js
@@ -145,6 +145,11 @@ Page({
             is_screen:0,
             total:0
           })
+        if (startTime == "") {
+            th.setData({
+              is_nav:0
+            })
+        }
       }
     })
   }
diff --git a/pages/user/my_service/i_service.js b/pages/user/my_service/i_service.js
index 46a1f90..f2835c5 100644
--- a/pages/user/my_service/i_service.js
+++ b/pages/user/my_service/i_service.js
@@ -95,14 +95,18 @@ Page({
   },
   /*-- 打开服务项目 --*/
   open_fw: function(e) {
+    wx.showLoading({
+      title: '加载中',
+    })
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.close_box();
     var url = e.currentTarget.dataset.url;
     var service_id = e.currentTarget.dataset.service_id; //服务id
     var project_id = e.currentTarget.dataset.project_id;
     var ind = e.currentTarget.dataset.ind;
     var item = this.data.service_List[ind];
-    var ewm = "^"+th.data.userinfo.erpvipid + "|" + item.ProjectID + "|" + item.BuyType + "|TY01|";
+    var ewm = "^" + th.data.userinfo.erpvipid + "|" + item.ProjectID + "|" + item.BuyType + "|TY01|";
     var tt = th.format_time(1);
     ewm = ewm + tt;
     th.data.qr_code_object.val = ewm;
@@ -115,6 +119,7 @@ Page({
         userId: d.user_id
       }
     }).then(res => {
+      wx.hideLoading();
       th.setData({
         is_sub: 0
       })
@@ -123,21 +128,20 @@ Page({
         my_confirm.open_cancel(1);
         my_confirm.open(
           "已有预约记录!",
-          "继续使用",
           "预约详情",
+          "继续使用",
           function() {
-            nav_b.close_box();
-            my_confirm.open_cancel(0);
-            qc_com.open(th.data.qr_code_object)
-          },
-          function() {
-            nav_b.close_box();
             my_confirm.open_cancel(0);
             var deta_url = "/pages/user/my_service/tment_details?number=" + res.data.data.Number;
             wx.navigateTo({
               url: deta_url
             })
+          },
+          function() {
+            my_confirm.open_cancel(0);
+            qc_com.open(th.data.qr_code_object)
           }
+
         )
 
       } else {
@@ -176,6 +180,7 @@ Page({
   correcting: function(e) {
     var th = this;
     var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.close_box();
     wx.showLoading({
       title: '加载中',
     })
@@ -205,10 +210,16 @@ Page({
             my_confirm.open_cancel(1);
             my_confirm.open(
               "已有预约记录!",
-              "继续预约",
               "预约详情",
+               "继续预约",
               function() {
-                nav_b.close_box();
+                my_confirm.open_cancel(0);
+                var deta_url = "/pages/user/my_service/tment_details?number=" + number;
+                wx.navigateTo({
+                  url: deta_url
+                })
+              },
+               function() {
                 my_confirm.open_cancel(0);
                 getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/sm/check", {
                   data: {
@@ -226,18 +237,9 @@ Page({
                     getApp().my_warnning(res.data.msg, 0, th);
                   }
                 })
-              },
-              function() {
-                nav_b.close_box();
-                my_confirm.open_cancel(0);
-                var deta_url = "/pages/user/my_service/tment_details?number=" + number;
-                wx.navigateTo({
-                  url: deta_url
-                })
               }
             )
           } else {
-            nav_b.close_box();
             wx.navigateTo({
               url: url,
             })
diff --git a/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml
index fafdb83..47b31a3 100644
--- a/pages/user/my_service/i_service.wxml
+++ b/pages/user/my_service/i_service.wxml
@@ -44,7 +44,7 @@
 
     </view>
 
-    <view class="flex-center fs24 functionMax">
+    <view class="flex-center fs28 functionMax">
       <view class="flex-level Use" bindtap="open_fw" data-ind="{{index}}" data-service_id="{{item.ServiceID}}">
         <view>立即使用</view>
       </view>
diff --git a/pages/user/my_service/i_service.wxss b/pages/user/my_service/i_service.wxss
index 76e0687..846440b 100644
--- a/pages/user/my_service/i_service.wxss
+++ b/pages/user/my_service/i_service.wxss
@@ -74,11 +74,13 @@ page {
 .itemCount {
   margin-bottom: 5rpx;
   color: rgb(177, 177, 177);
+  align-items: baseline;
 }
 
 .itemEffective {
   margin-bottom: 30rpx;
   color: rgb(177, 177, 177);
+  align-items: baseline;
 }
 
 .functionMax {
@@ -88,16 +90,16 @@ page {
 
 .Use {
   width: 170rpx;
-  height: 40rpx;
-  line-height: 40rpx;
+  height: 50rpx;
+  line-height: 50rpx;
   border-radius: 25rpx;
   background-color: red;
 }
 
 .appointment {
   width: 115rpx;
-  height: 40rpx;
-  line-height: 40rpx;
+  height: 50rpx;
+  line-height: 50rpx;
   border-radius: 25rpx;
   margin-left: 20rpx;
 }
diff --git a/pages/user/my_service/tment_details.js b/pages/user/my_service/tment_details.js
index 8e0a1dc..9e415f0 100644
--- a/pages/user/my_service/tment_details.js
+++ b/pages/user/my_service/tment_details.js
@@ -20,44 +20,48 @@ Page({
   //取消预约
   cancel_tment: function(e) {
     var th = this;
-    var index = e.currentTarget.dataset.index;
-    var states = th.data.states;
-    var tment_details = th.data.tment_details;
-    var number = th.data.number;
-    var json = {
-      "number": number,
-      "storeId": a.stoid,
-      "states": states
-    };
-    var data = JSON.stringify(json);
-    var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
-    wx.request({
-      url: url,
-      data: data,
-      method: 'put',
-      header: {
-        'content-type': 'application/json'
-      }, // 设置请求的 header
-      success: function(res) {
-        if (res.data.code == 0) {
-          getApp().my_warnning("取消成功", 0, th);
-          var id = th.data.activeCategoryId;
-          if (id == 1) {
-            tment_details.splice(index, 1);
-            th.setData({
-              tment_details: tment_details
-            })
-          } else {
-            var start = 'tment_details[' + index + '].State';
-            th.setData({
-              [start]: 3
-            })
+    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+    my_confirm.open(
+      "确定取消？",
+      "取消",
+      "确定",
+      function() {
+        my_confirm.open_cancel(0);
+      },
+      function() {
+        var index = e.currentTarget.dataset.index;
+        var states = th.data.states;
+        var tment_details = th.data.tment_details;
+        var number = th.data.number;
+        var json = {
+          "number": number,
+          "storeId": a.stoid,
+          "states": states
+        };
+        var data = JSON.stringify(json);
+        var url = th.data.url + "/api/weshop/marketing/reservation/reservation/update"; //预约接口地址
+        wx.request({
+          url: url,
+          data: data,
+          method: 'put',
+          header: {
+            'content-type': 'application/json'
+          }, // 设置请求的 header
+          success: function(res) {
+            my_confirm.open_cancel(0);
+            if (res.data.code == 0) {
+              getApp().my_warnning("取消成功", 0, th);
+              var start = 'tment_details[' + 0 + '].State';
+                th.setData({
+                  [start]: 3
+                })     
+            } else {
+              getApp().my_warnning(res.data.msg, 0, th);
+            }
           }
-        } else {
-          getApp().my_warnning(res.data.msg, 0, th);
-        }
+        })
       }
-    })
+    );
 
   },
 
@@ -85,8 +89,8 @@ Page({
       wx.hideLoading();
       if (res.data.code == 0) {
         var data = res.data.data.pageData;
-         var arrangeTime = data[0].ArrangeTime.substring(0, 11);
-         var day = data[0].ArrangeTime.substring(11, 16);
+        var arrangeTime = data[0].ArrangeTime.substring(0, 11);
+        var day = data[0].ArrangeTime.substring(11, 16);
         th.setData({
           tment_details: data,
           arrangeTime: arrangeTime,
@@ -98,9 +102,17 @@ Page({
       }
     })
   },
+  close: function() {
+    var th = this;
+    var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.close_box();
+  },
   //显示核销码
   code_show: function(e) {
     var th = this;
+    th.close();
+    var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.close_box();
     //--获取成功的时候--
     var no = e.currentTarget.dataset.order_sn;
     var qc_com = th.selectComponent("#qc_com"); //组件的id
@@ -112,6 +124,8 @@ Page({
   },
   //跳到首页
   goto: function(e) {
+    var th = this;
+    th.close();
     wx.switchTab({
       url: '/pages/index/index/index',
     })
@@ -122,5 +136,6 @@ Page({
   onShow: function() {
     var th = this;
     th.query_bea();
+    th.close();
   },
 })
\ No newline at end of file
diff --git a/pages/user/my_service/tment_details.json b/pages/user/my_service/tment_details.json
index 2f3f3a8..98e6ad7 100644
--- a/pages/user/my_service/tment_details.json
+++ b/pages/user/my_service/tment_details.json
@@ -3,6 +3,7 @@
   "usingComponents": {
     "qr_code": "/components/qr_code/qr_code",
     "warn": "/components/long_warn/long_warn",
+    "my_confirm": "/components/my_confirm/my_confirm",
     "nav_b": "/components/nav_b/nav_b"
   }
 }
\ 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 edf27a9..bed6bea 100644
--- a/pages/user/my_service/tment_details.wxml
+++ b/pages/user/my_service/tment_details.wxml
@@ -14,7 +14,7 @@
       <view class="items lf">
         <!-- 预约订单 -->
         <view class="flex-vertical bmt" bindtap="code_show" data-order_sn="{{number}}">
-          <view class="flex-vertical">
+          <view class="flex-vertical ai-bas">
             <view class="name">预约订单:</view>
             <view class="ellipsis-1 value">{{number}}</view>
           </view>
@@ -22,19 +22,19 @@
         </view>
 
         <!-- 预约门店 -->
-        <view class="flex-vertical bmt">
+        <view class="flex-vertical bmt ai-bas">
           <view class="name">预约门店:</view>
           <view class="ellipsis-1 value">{{item.StorageName}}</view>
         </view>
 
         <!-- 预约项目 -->
-        <view class="flex-vertical bmt">
+        <view class="flex-vertical bmt ai-bas">
           <view class="name">预约项目:</view>
           <view class="ellipsis-1 value">{{item.ServiceName}}</view>
         </view>
 
         <!-- 预约时间 -->
-        <view class="flex-vertical bmt">
+        <view class="flex-vertical bmt ai-bas">
           <view class="name">预约时间:</view>
           <view class="date">{{arrangeTime}}</view>
           <view>{{day}}</view>
@@ -43,7 +43,7 @@
       <view class="bt">
 
         <!-- 美容师 -->
-        <view class="flex-vertical bmt">
+        <view class="flex-vertical bmt ai-bas">
           <view class="name flex-vertical-between">
             <view>美</view>
             <view>容</view>
@@ -53,7 +53,7 @@
         </view>
         <!-- 预约人及联系方式 -->
         <!-- 姓名 -->
-        <view class="flex-vertical bmt">
+        <view class="flex-vertical bmt ai-bas">
           <view class="name flex-vertical-between">
             <view>预</view>
             <view>约</view>
@@ -62,11 +62,11 @@
           <view class="ellipsis-1 value">{{item.VIPName}}</view>
         </view>
         <!-- 号码 -->
-        <view class="flex-vertical">
+        <view class="flex-vertical ai-bas">
           <view class="name flex-vertical-between">
             <view>手</view>
             <view>机</view>
-            <view>人:</view>
+            <view>号:</view>
           </view>
           <view>{{item.MobileTel}}</view>
         </view>
@@ -91,8 +91,8 @@
    <!-- submit栏 -->
   <view class="subs flex-vertical-between fs32">
     <!-- 左边栏 -->
-    <view class="sub flex-center yellow-b" wx:if="{{item.State==0}}">
-      <view class="yellow-b" data-index="{{index}}" bindtap="cancel_tment">取消预约</view>
+    <view class="sub flex-center yellow-b" wx:if="{{item.State==0}}" bindtap="cancel_tment">
+      <view class="yellow-b" data-index="{{index}}">取消预约</view>
     </view>
     <navigator wx:if="{{item.State>0}}" class="sub flex-center yellow-b" url="/pages/user/my_service/tment_order_list">
       <view class="yellow-b">我的服务</view>
@@ -116,7 +116,8 @@
 </view>
  
 <!--  制作一个圆球导航  -->
-<nav_b></nav_b>
+<nav_b id="nav_b"></nav_b>
+<my_confirm id="my_confirm"></my_confirm>
 <!-- 弹出框扫描 -->
 <qr_code id="qc_com"></qr_code>
 <warn id="warn"></warn>
diff --git a/pages/user/my_service/tment_details.wxss b/pages/user/my_service/tment_details.wxss
index dd9c0db..2147702 100644
--- a/pages/user/my_service/tment_details.wxss
+++ b/pages/user/my_service/tment_details.wxss
@@ -18,7 +18,7 @@ page {
 }
 
 .bmt {
-  margin-bottom: 45rpx;
+  margin-bottom: 35rpx;
 }
 
 .name {
@@ -33,7 +33,7 @@ page {
 /* 公用 */
 
 .container {
-  padding-bottom:40rpx;
+  padding-bottom:70rpx;
 }
 
 .padding{
@@ -58,7 +58,7 @@ page {
 }
 
 .items {
-  margin: 55rpx 0rpx;
+  margin: 40rpx 0rpx;
 }
 
 .Tips {
@@ -80,11 +80,10 @@ page {
 
 .subs {
   width: 710rpx;
-  padding: 0rpx 20rpx;
+  padding: 15rpx 20rpx;
   position: fixed;
   bottom:0rpx;
   background-color: rgb(255,255,255);
-  height: 140rpx;
 }
 
 .sub {
@@ -106,10 +105,10 @@ page {
 
 .Stickl {
   width: 39rpx;
-  height: 8rpx;
+  height: 10rpx;
   background-color: rgb(153, 153, 153);
   transform: rotate(270deg);
-  border-radius: 8rpx;
+  border-radius: 20rpx;
   left: 95rpx;
   top: -15rpx;
 }
diff --git a/pages/user/my_service/tment_eval.js b/pages/user/my_service/tment_eval.js
index d0fdef3..1a1416f 100644
--- a/pages/user/my_service/tment_eval.js
+++ b/pages/user/my_service/tment_eval.js
@@ -208,7 +208,6 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-    console.log("为呃呃呃" + options.evaluate);
     var th = this;
     th.setData({
       number: options.Number,
diff --git a/pages/user/my_service/tment_eval.wxml b/pages/user/my_service/tment_eval.wxml
index f4f7a6a..1e8e750 100644
--- a/pages/user/my_service/tment_eval.wxml
+++ b/pages/user/my_service/tment_eval.wxml
@@ -11,19 +11,19 @@
       <view class="fs32">美容师</view>
       <view> ：</view>
     </view>
-    <view class="itemlr fs30 ellipsis-1 {{is_evaluate==0?'datetime':''}}">{{beautician.BeauticianName}}</view>
+    <view class="itemlr fs30 ellipsis-1">{{beautician.BeauticianName}}</view>
   </view>
 
   <!-- 项目 -->
   <view class="flex-center item">
     <view class="itemlf fs32">服务项目：</view>
-    <view class="itemlr fs30 ellipsis-1 {{is_evaluate==0?'datetime':''}}">{{beautician.StorageName}}</view>
+    <view class="itemlr fs30 ellipsis-1">{{beautician.StorageName}}</view>
   </view>
 
   <!-- 时间 -->
   <view class="flex-center item">
     <view class="itemlf fs32">服务时间：</view>
-    <view class="itemlr fs30 {{is_evaluate==0?'datetime':''}}">{{arrangeTime}}</view>
+    <view class="itemlr fs30">{{arrangeTime}}</view>
   </view>
 
   <!-- 评价时间 -->
@@ -75,12 +75,6 @@
     <view>满意的话请打五星噢，谢谢您的支持!</view>
   </view>
 
-  <navigator wx:if="{{is_evaluate==0}}" class="Subs fs32 flex-center" bindtap="evaluate_save">
-    <view class="Submission flex-center">
-      <view>确认提交</view>
-    </view>
-  </navigator>
-
   <block wx:if="{{sub_evaluate}}">
     <view class="subSuccess">
       <view class="flex-center">
@@ -92,4 +86,9 @@
     </view>
   </block>
 </view>
+<navigator wx:if="{{is_evaluate==0}}" class="Subs fs32 flex-center" bindtap="evaluate_save">
+  <view class="Submission flex-center">
+    <view>确认提交</view>
+  </view>
+</navigator>
 <warn id="warn"></warn>
\ No newline at end of file
diff --git a/pages/user/my_service/tment_eval.wxss b/pages/user/my_service/tment_eval.wxss
index 724978c..cfd9318 100644
--- a/pages/user/my_service/tment_eval.wxss
+++ b/pages/user/my_service/tment_eval.wxss
@@ -1,6 +1,7 @@
 .container {
   border-top: 7rpx solid rgb(245, 245, 245);
   padding-bottom: 100rpx;
+  background-color: rgb(255, 255, 255);
 }
 
 .head {
@@ -24,6 +25,7 @@
 .itemlr {
   width: 360rpx;
 }
+
 .starss {
   margin-top: 15rpx;
   border-top: 3rpx dashed rgb(203, 203, 203);
@@ -36,12 +38,14 @@
   height: 50rpx;
   margin-right: 20rpx;
 }
-.datetime{
-  width:190rpx;
+
+.datetime {
+  width: 190rpx;
 }
+
 .tea_labs {
   padding: 0rpx 56rpx;
-  margin-top:20rpx;
+  margin-top: 20rpx;
 }
 
 .proposal {
@@ -101,7 +105,7 @@
   background-color: rgb(255, 255, 255);
   position: fixed;
   width: 100%;
-  bottom: 40rpx; 
+  bottom: 40rpx;
 }
 
 .Submission {
diff --git a/pages/user/my_service/tment_order_list.wxml b/pages/user/my_service/tment_order_list.wxml
index 9d5a99c..0ae00fc 100644
--- a/pages/user/my_service/tment_order_list.wxml
+++ b/pages/user/my_service/tment_order_list.wxml
@@ -31,23 +31,23 @@
           </view>
           <!-- 项目内容 -->
           <view class="details">
-            <view class="item flex-vertical">
+            <view class="item flex-vertical base">
               <view class="itemname">预约门店:</view>
               <view class="itemvalue ellipsis-1">{{item.StorageName}}</view>
             </view>
-            <view class="item flex-vertical">
+            <view class="item flex-vertical base">
               <view class="itemname">预约项目:</view>
               <view class="itemvalue ellipsis-1">{{item.ServiceName}}</view>
             </view>
-            <view class="item flex-vertical">
+            <view class="item flex-vertical base">
               <view class="itemname">美容师:</view>
               <view class="itemvalue ellipsis-1">{{item.BeauticianName}}</view>
             </view>
-            <view class="item flex-vertical">
+            <view class="item flex-vertical base">
               <view class="itemname">预约时间:</view>
               <view>{{item.ArrangeTime}}</view>
             </view>
-            <view class="item flex-vertical" wx:if="{{item.WriteTime==''?false:true}}">
+            <view class="item flex-vertical base" wx:if="{{item.WriteTime==''?false:true}}">
               <view class="itemname">服务时间:</view>
               <view>{{item.WriteTime}}</view>
             </view>
diff --git a/pages/user/my_service/tment_order_list.wxss b/pages/user/my_service/tment_order_list.wxss
index 524e9f9..a4c114f 100644
--- a/pages/user/my_service/tment_order_list.wxss
+++ b/pages/user/my_service/tment_order_list.wxss
@@ -135,3 +135,7 @@ page {
   background-color: rgb(255, 72, 72);
   border-radius: 40rpx;
 }
+.base{
+  display: flex;
+  align-items: baseline;
+}
\ No newline at end of file
--
libgit2 0.21.4