提示成功图片修改，美容师改为预约美容师，添加导航栏

DESKTOP-QHAFKU5\iceling
1 parent 2fac44da
Showing 16 changed files with 115 additions and 76 deletions
components/nav_b/nav_b.js
components/nav_b/nav_b.wxss
pages/user/my_service/appment_main.js
pages/user/my_service/beauty_deta.js
pages/user/my_service/hist_service.json
pages/user/my_service/hist_service.wxml
pages/user/my_service/i_service.wxml
pages/user/my_service/tment_details.js
pages/user/my_service/tment_details.wxml
pages/user/my_service/tment_details.wxss
pages/user/my_service/tment_eval.wxml
pages/user/my_service/tment_eval.wxss
pages/user/my_service/tment_order_list.js
pages/user/my_service/tment_order_list.json
pages/user/my_service/tment_order_list.wxml
pages/user/my_service/tment_order_list.wxss
@@ -28,6 +28,7 @@ Component({
     goto: function (e) {
       var url = e.currentTarget.dataset.url;
       getApp().goto(url);
+      this.close_box();
     }
   }
@@ -9,7 +9,7 @@
   border-radius: 50rpx;
   position: fixed;
   right: 10rpx;
-  bottom: 570rpx;
+  bottom: 350rpx;
   overflow: hidden;
   z-index: 4;
 }
@@ -146,7 +146,7 @@ Page({
               is_sub: 0
             })
             if (res.data.code == 0) {
-              getApp().my_warnning("预约成功", 0, th);
+              getApp().my_warnning("预约成功", 1, th);
               var store_name = th.data.store_name; //预约门店
               var number = res.data.data.Number;
               var temp_url = "/api/wx/open/app/user/templatMessageSend"; //模版接口     
@@ -165,7 +165,7 @@ Page({
         }, // 设置请求的 header
         success: function(res) {
           if (res.data.code == 0) {
-            getApp().my_warnning(res.data.data, 0, th);
+            getApp().my_warnning(res.data.data, 1, th);
             setTimeout(function() {
               wx.navigateBack({
                 //返回
 {
-  "navigationBarTitleText": "历史服务",
+  "navigationBarTitleText": "历史预约",
   "usingComponents": {
     "timePicker": "/components/timePicker/timePicker",
     "warn": "/components/long_warn/long_warn"
@@ -26,15 +26,19 @@
       <view>
         <view class="flex fs28">
           <view class="itemName ellipsis-1">{{item.ServiceName==''?'匿名':item.ServiceName}}</view>
-          <view>(美容师：</view>
+          <block wx:if="{{item.State==1 || item.State==4}}">
+            <view>(服务美容师：</view>
+          </block>
+          <block wx:else>
+            <view>(预约美容师：</view>
+          </block>
           <view class="itemUsna ellipsis-1">{{item.BeauticianName}}</view>
           )
         </view>
-        <view class="fs24">{{item.BillDate!=''?item.BillDate:item.ArrangeTime}}</view>
+        <view class="fs24">{{item.ArrangeTime}}</view>
       </view>
       <!-- right -->
       <view class="serState fs32">
-        <view wx:if="{{item.State==0}}">未服务</view>
         <view wx:if="{{item.State==1}}">已服务</view>
         <view wx:if="{{item.State==2}}">已过期</view>
         <view wx:if="{{item.State==3}}">已取消</view>
@@ -51,7 +55,7 @@
   </view>
 </view>
 <view wx:if="{{hist_List.length<1 && startTime!=''}}" class="flex-center fs26 slot">
-<view>该时间段无预约记录</view> 
+  <view>该时间段无预约记录</view>
 </view>
 <!-- 无历史服务 -->
 <view class="empty_order" wx:if="{{hist_List.length<1 && is_service_read && startTime==''}}">
 <!-- 背景图片 -->
 <view catchtap="close">
   <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"></image>
-  <navigator class="History fs26" url="/pages/user/my_service/hist_service">历史服务</navigator>
+  <navigator class="History fs26" url="/pages/user/my_service/hist_service">历史预约</navigator>
 </view>
 <!-- 预约内容 -->
@@ -50,7 +50,7 @@ Page({
           success: function(res) {
             my_confirm.open_cancel(0);
             if (res.data.code == 0) {
-              getApp().my_warnning("取消成功", 0, th);
+              getApp().my_warnning("取消成功", 1, th);
               var start = 'tment_details[' + 0 + '].State';
                 th.setData({
                   [start]: 3
@@ -45,9 +45,12 @@
         <!-- 美容师 -->
         <view class="flex-vertical bmt ai-bas">
           <view class="name flex-vertical-between">
-            <view>美</view>
-            <view>容</view>
-            <view>师:</view>
+            <block wx:if="{{item.State==1 || item.State==4}}">
+              <view>服务美容师:</view>
+            </block>
+            <block wx:else>
+              <view>预约美容师:</view>
+            </block>
           </view>
           <view class="ellipsis-1 value">{{item.BeauticianName}}</view>
         </view>
@@ -88,7 +91,7 @@
     <view>2.如有任何问题可致电咨询;</view>
     <view>3.如需退约，需提前取消。</view>
   </view>
-   <!-- submit栏 -->
+  <!-- submit栏 -->
   <view class="subs flex-vertical-between fs32">
     <!-- 左边栏 -->
     <view class="sub flex-center yellow-b" wx:if="{{item.State==0}}" bindtap="cancel_tment">
@@ -114,10 +117,10 @@
   </view>
 </view>
- 
+
 <!--  制作一个圆球导航  -->
 <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>
+<warn id="warn"></warn>
 \ No newline at end of file
@@ -22,12 +22,12 @@ page {
 }
 .name {
-  width: 130rpx;
+  width: 160rpx;
   margin-right: 25rpx;
 }
 .value {
-  max-width: 400rpx;
+  max-width: 390rpx;
 }
 /* 公用 */
@@ -8,26 +8,26 @@
   <!-- 姓名 -->
   <view class="flex-level item">
     <view class="itemlf flex-level-right">
-      <view class="fs32">美容师：</view>
+      <view class="fs32">服务美容师：</view>
     </view>
     <view class="itemlr fs30 ellipsis-1">{{beautician.BeauticianName}}</view>
   </view>
   <!-- 项目 -->
   <view class="flex-center item">
-    <view class="itemlf fs32">服务项目：</view>
+    <view class="itemlf fs32 flex-level-right">服务项目：</view>
     <view class="itemlr fs30 ellipsis-1">{{beautician.StorageName}}</view>
   </view>
   <!-- 时间 -->
   <view class="flex-center item">
-    <view class="itemlf fs32">服务时间：</view>
+    <view class="itemlf fs32 flex-level-right">服务时间：</view>
     <view class="itemlr fs30">{{arrangeTime}}</view>
   </view>
   <!-- 评价时间 -->
   <view class="flex-center" wx:if="{{is_evaluate==1}}">
-    <view class="itemlf fs32">评价时间：</view>
+    <view class="itemlf fs32 flex-level-right">评价时间：</view>
     <view class="itemlr fs30">{{EvaluateDatetime}}</view>
   </view>
@@ -19,7 +19,7 @@
 }
 .itemlf {
-  width: 160rpx;
+  width: 195rpx;
 }
 .itemlr {
@@ -39,7 +39,7 @@ Page({
    * 生命周期函数--监听页面加载
    */
   onLoad: function(options) {
-   
+
   },
   changeTab: function(e) {
     var th = this;
@@ -122,45 +122,57 @@ Page({
   //取消预约
   cancel_tment: function(e) {
     var th = this;
-    var index = e.currentTarget.dataset.index;
-    var states = th.data.states;
-    var order_list = th.data.tm_order_list;
-    var number = order_list[index].Number;
-    var json = {
-      "number": number,
-      "storeId": a.stoid,
-      "states": 3
-    };
-    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) {
-            order_list.splice(index, 1);
-            th.setData({
-              tm_order_list: order_list
-            })
-          } else {
-            var start = 'tm_order_list[' + index + '].State';
-            th.setData({
-              [start]: 3
-            })
+    var th = this;
+    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+    my_confirm.open(
+      "确定取消？",
+      "取消",
+      "确定",
+      function() {
+        my_confirm.open_cancel(0);
+      },
+      function() {
+        my_confirm.open_cancel(0);
+        var index = e.currentTarget.dataset.index;
+        var states = th.data.states;
+        var order_list = th.data.tm_order_list;
+        var number = order_list[index].Number;
+        var json = {
+          "number": number,
+          "storeId": a.stoid,
+          "states": 3
+        };
+        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("取消成功", 1, th);
+              var id = th.data.activeCategoryId;
+              if (id == 1) {
+                order_list.splice(index, 1);
+                th.setData({
+                  tm_order_list: order_list
+                })
+              } else {
+                var start = 'tm_order_list[' + index + '].State';
+                th.setData({
+                  [start]: 3
+                })
+              }
+              wx.stopPullDownRefresh(); //停止下拉刷新
+            } else {
+              getApp().my_warnning(res.data.msg, 0, th);
+            }
           }
-          wx.stopPullDownRefresh(); //停止下拉刷新
-        } else {
-          getApp().my_warnning(res.data.msg, 0, th);
-        }
-      }
-    })
+        })
+      })
   },
   //图片失败，默认图片
@@ -179,11 +191,11 @@ Page({
   onShow: function() {
     var th = this;
     th.setData({
-      curpage:1,
-      total:0,
-      ismore:0,
-      is_read:0,
-      tm_order_list:[]
+      curpage: 1,
+      total: 0,
+      ismore: 0,
+      is_read: 0,
+      tm_order_list: []
     })
     th.query_orderList();
   },
@@ -201,5 +213,11 @@ Page({
     })
     th.query_orderList();
   },
+  //关闭导航
+  close: function() {
+    var th = this;
+    var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.close_box();
+  }
 })
 \ No newline at end of file
@@ -2,6 +2,8 @@
   "navigationBarTitleText": "我的预约",
   "usingComponents": {
     "qr_code": "/components/qr_code/qr_code",
-    "warn": "/components/long_warn/long_warn"
+    "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
-<view class="container">
+<view class="container" catchtap="close">
   <!-- 导航栏 -->
   <view class="type-navbar padding flex-vertical fs30">
     <view class="type-box flex-center {{activeCategoryId==item.id?'chtypebox':''}}" wx:for="{{categories}}" bindtap="changeTab" data-id="{{item.id}}">
@@ -32,23 +32,30 @@
           <!-- 项目内容 -->
           <view class="details">
             <view class="item flex-vertical base">
-              <view class="itemname">预约门店:</view>
+              <view class="itemname flex-level-right">预约门店:</view>
               <view class="itemvalue ellipsis-1">{{item.StorageName}}</view>
             </view>
             <view class="item flex-vertical base">
-              <view class="itemname">预约项目:</view>
+              <view class="itemname flex-level-right">预约项目:</view>
               <view class="itemvalue ellipsis-1">{{item.ServiceName}}</view>
             </view>
             <view class="item flex-vertical base">
-              <view class="itemname">美容师:</view>
+              <block wx:if="{{item.State==1 || item.State==4}}">
+                <view class="itemname flex-level-right">服务美容师:
+                </view>
+              </block>
+              <block wx:else>
+                <view class="itemname flex-level-right">预约美容师:
+                </view>
+              </block>
               <view class="itemvalue ellipsis-1">{{item.BeauticianName}}</view>
             </view>
             <view class="item flex-vertical base">
-              <view class="itemname">预约时间:</view>
+              <view class="itemname flex-level-right">预约时间:</view>
               <view>{{item.ArrangeTime}}</view>
             </view>
             <view class="item flex-vertical base" wx:if="{{item.WriteTime==''?false:true}}">
-              <view class="itemname">服务时间:</view>
+              <view class="itemname flex-level-right">服务时间:</view>
               <view>{{item.WriteTime}}</view>
             </view>
           </view>
@@ -78,7 +85,7 @@
 </view>
 <!-- 无预约订单 -->
-<view class="empty_order" wx:if="{{tm_order_list.length<1 && is_read}}">
+<view class="empty_order" wx:if="{{tm_order_list.length<1 && is_read}}" catchtap="close">
   <view class="flex-level">
     <image src="{{iurl}}miniapp/images/order/empty_order.png" lazy-load="true"></image>
   </view>
@@ -89,6 +96,9 @@
     </navigator>
   </view>
 </view>
+<my_confirm id="my_confirm"></my_confirm>
+<!--  制作一个圆球导航  -->
+<nav_b id="nav_b"></nav_b>
 <!-- 弹出框扫描 -->
 <qr_code id="qc_com"></qr_code>
 <warn id="warn"></warn>
 \ No newline at end of file
@@ -76,7 +76,8 @@ page {
 }
 .itemname {
-  width: 130rpx;
+  width: 150rpx;
+  margin-right: 20rpx;
 }
 .itemvalue {