已知bug修复，以及日期排序

DESKTOP-QHAFKU5\iceling
1 parent d4d63f55
Showing 10 changed files with 30 additions and 11 deletions
pages/user/my_service/appment_main.js
pages/user/my_service/appment_main.wxml
pages/user/my_service/beauty_deta.js
pages/user/my_service/beauty_deta.wxml
pages/user/my_service/cosmetology_list.js
pages/user/my_service/cosmetology_list.wxml
pages/user/my_service/hist_service.js
pages/user/my_service/hist_service.wxml
pages/user/my_service/hist_service.wxss
pages/user/my_service/tment_order_list.js
@@ -125,7 +125,7 @@ Page({
             th.setData({
               is_success: 1
             })
-            setTimeout(function() {}, 2000);
+            setTimeout(function() {}, 3000);
             wx.redirectTo({
               url: "/pages/user/my_service/tment_order_list"
             });
@@ -195,7 +195,6 @@ Page({
     getApp().request.promiseGet(url, {
       data: {
         storeId: a.stoid,
-        userId: d.user_id,
         serviceId: itemId,
         latitude: th.data.lat,
         longitude: th.data.lon,
@@ -125,7 +125,7 @@
       <view class="store_name_dis">
         <view class="name_dis flex-vertical-between">
           <view class="store_name fs28 ellipsis-1">{{item.StorageName}}</view>
-          <view wx:if="{{item.Distance!=undefined || item.Distance!=''}}" class="store_dis flex fs22"> 
+          <view wx:if="{{item.Distance!='未设置经纬度'}}" class="store_dis flex fs22"> 
             <view class="ellipsis-1">距您:{{item.Distance}}km</view>
           </view>
         </view>
@@ -57,6 +57,7 @@ Page({
   onShow: function() {
   },
+  
   //图片失败，默认图片
   bind_bnerr1: function(e) {
     var _errImg = e.target.dataset.errorimg;
@@ -94,7 +95,7 @@ Page({
     }).then(res => {
       if (res.data.code == 0) {
         var data = res.data.data;
-        th.setData({
+        th.setData({ 
           name: data.StaffName,
           comment: data.Remark1,
           head_img: data.PhotoUrl
@@ -150,6 +151,7 @@ Page({
     } else {
       var pages = getCurrentPages(); //当前页面
       var iscos = th.data.iscos;
+      var delta = 1 + Number(iscos);//返回哪个页面
       var prevPage = pages[pages.length - 2 - iscos]; //上一页面
       prevPage.setData({
         //直接给上一个页面赋值
@@ -157,7 +159,7 @@ Page({
       });
       wx.navigateBack({
         //返回
-        delta: 2
+        delta: delta
       })
     }
   },
@@ -197,6 +199,15 @@ Page({
           };
           arr.push(em);
         }
+        for (var i = 0; i < arr.length; i++) {
+          for (var j = 0; j < arr.length - i - 1; j++) {
+            if (arr[j].time > arr[j + 1].time) {
+              var c = arr[j].time;
+              arr[j].time = arr[j + 1].time;
+              arr[j + 1].time = c;
+            }
+          }
+        }
         th.setData({
           aweeks: arr
         })
@@ -24,7 +24,6 @@
           <view class="scroll-item-h bd {{index==date_id?'chbd':''}}" bindtap="check_date" data-dateid="{{index}}">
             <view>{{item.time}}</view>
             <view></view>
-            <view wx:if="{{item.key.length<1}}">未排班</view>
           </view>
           <block wx:if="{{index==date_id}}">
             <view class="abs box"></view>
@@ -9,6 +9,7 @@ Page({
    * 页面的初始数据
    */
   data: {
+    defimgurl: "/miniapp/images/yyservice/yyxmdefault.jpg",
     iurl: a.imghost,
     cosmetology_list: [], //美容师列表
     is_cosmetology_read: 0, //是否有读过美容师接口,该属性用在没有美容师列表的排版
@@ -8,7 +8,7 @@
       <!-- 个人属性 -->
       <view class="flex-vertical-between">
         <view class="flex-vertical">
-          <image class="portrait" src="{{item.PhotoUrl}}" lazy-load="true" data-errorimg="cosmetology_list[{{index}}].PhotoUrl" binderror="bind_bnerr1" data-img="{{item.PhotoUrl}}"></image>
+          <image class="portrait" src="{{item.PhotoUrl==''?iurl+defimgurl:item.PhotoUrl}}" lazy-load="true" data-errorimg="cosmetology_list[{{index}}].PhotoUrl" binderror="bind_bnerr1" data-img="{{item.PhotoUrl}}"></image>
           <view>
             <!-- 用户名 -->
             <view class="UserName ellipsis-1 fs32">{{item.StaffName}}</view>
@@ -95,7 +95,6 @@ Page({
       th.setData({
         hist_List: [],
         curpage: 1,
-        is_screen: 0,
         is_service_read: 0,
         is_screen: 1,
         is_reset:1
@@ -137,7 +136,8 @@ Page({
       } else {
           th.setData({
             is_service_read:1,
-            is_screen:0
+            is_screen:0,
+            total:0
           })
       }
     })
 <view wx:if="{{true}}" class="{{isPickerRender==true?'container':''}}">
   <!-- 点击方法 -->
-  <view class="exption flex-vertical-between fs28" wx:if="{{hist_List.length>0 || is_screen==1}}">
+  <view class="exption flex-vertical-between fs28" wx:if="{{hist_List.length>0 || startTime!=''}}">
     <view class="flex">
       共使用
       <view class="count">{{total}}</view>
@@ -50,8 +50,11 @@
     </view>
   </view>
 </view>
+<view wx:if="{{hist_List.length<1 && startTime!=''}}" class="flex-center fs26 slot">
+<view>该时间段无预约记录</view> 
+</view>
 <!-- 无历史服务 -->
-<view class="empty_order" wx:if="{{hist_List.length<1 && is_service_read && is_screen==0}}">
+<view class="empty_order" wx:if="{{hist_List.length<1 && is_service_read && startTime==''}}">
   <view class="flex-level">
     <image src="{{iurl}}miniapp/images/yyservice/no_history.png"></image>
   </view>
@@ -108,3 +108,8 @@ page {
 .After_all .end {
   margin: 0rpx 15rpx;
 }
+.slot{
+  color: rgb(153, 153, 153);
+  height:300rpx;
+  width:100%;
+}
 \ No newline at end of file
@@ -109,6 +109,7 @@ Page({
           is_read: 1
         }), wx.stopPullDownRefresh(); //停止下拉刷新 {
       } else {
+        wx.hideLoading();
         th.setData({
           tm_order_list: [],
           is_read: 1