diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js
index 830c91b..9740689 100644
--- a/pages/user/my_service/appment_main.js
+++ b/pages/user/my_service/appment_main.js
@@ -40,7 +40,7 @@ Page({
     tment_count: "", //可预约人数
     lat: "", //纬度坐标
     lon: "", //经度坐标
-    is_gps: 1,//是否开启gps
+    is_gps: 1, //是否开启gps
   },
   onclickstore: function() {
     var th = this;
@@ -53,6 +53,7 @@ Page({
       wx.hideLoading();
     } else {
       th.setData({
+        beautician: 0,
         store: 1,
         placeholder: ""
       })
@@ -125,10 +126,11 @@ Page({
             th.setData({
               is_success: 1
             })
-            setTimeout(function() {}, 3000);
-            wx.redirectTo({
-              url: "/pages/user/my_service/tment_order_list"
-            });
+            setTimeout(function() {
+              wx.redirectTo({
+                url: "/pages/user/my_service/tment_order_list"
+              });
+            }, 800);
           } else {
             getApp().my_warnning(res.data.msg, 0, th);
           }
@@ -203,8 +205,8 @@ Page({
         keyWord: key_word
       }
     }).then(res => {
+      wx.hideLoading();
       if (res.data.code == 0) {
-        wx.hideLoading();
         th.data.curpage++;
         var arr1 = th.data.store_list;
         var arr2 = res.data.data.pageData;
@@ -237,6 +239,9 @@ Page({
           beautician: 0
         })
       }
+      wx.showLoading({
+        title: '加载中',
+      })
       var itemid = th.data.itemId; //正式使用的项目id
       var storageId = th.data.storageId; //正式使用的线下门店id
       var url = "/api/weshop/marketing/reservation/staff/page"; //接口地址
@@ -248,12 +253,16 @@ Page({
           storageId: storageId
         }
       }).then(res => {
+        wx.hideLoading();
         if (res.data.code == 0) {
           th.setData({
             beautician_list: res.data.data.pageData
-          }) //停止下拉刷新
+          })
+          if (res.data.data.pageData.length < 1) {
+            getApp().my_warnning("暂无美容师", 0, th);
+          }
         } else {
-          getApp().my_warnning(res.data.msg, 0, th);
+          getApp().my_warnning("暂无美容师", 0, th);
         }
       })
     }
@@ -289,6 +298,9 @@ Page({
       is_search: 0,
       store_list: []
     })
+    wx.showLoading({
+      title: '加载中',
+    })
     th.query_store();
     if (store_list.length < 1) {
       th.setData({
diff --git a/pages/user/my_service/appment_main.wxml b/pages/user/my_service/appment_main.wxml
index 5e4f4a2..b0fc8ee 100644
--- a/pages/user/my_service/appment_main.wxml
+++ b/pages/user/my_service/appment_main.wxml
@@ -70,7 +70,7 @@
       </view>
       <view class="flex fs26">
         <block wx:if="{{store==0 && beautician==0}}">
-          <textarea class="textarea" disabled="{{store || beautician}}" placeholder="{{remarks==''?'填写备注':remarks}}" placeholder-class="fs26 color" value="{{remarks}}" bindinput="input_remarks">
+          <textarea class="textarea" disabled="{{store || beautician}}" placeholder="{{remarks==''?'填写备注':remarks}}" placeholder-class="fs26 color" value="{{remarks}}" bindinput="input_remarks" maxlength="100">
           </textarea>
         </block>
         <block wx:else>
@@ -108,7 +108,7 @@
     <icon bindtap="onclickstore" color="black" size="22" type="cancel"></icon>
   </view>
   <view class="searchbar flex-vertical-between storeListpadd">
-    <input class="inputstore fs28" placeholder="{{key_word==''?'输入要搜索的门店':key_word}}" placeholder-class="fs28" maxlength="16" bindinput="input_store" />
+    <input class="inputstore fs28" placeholder="{{key_word==''?'输入要搜索的门店':key_word}}" placeholder-class="fs28" maxlength="16" bindinput="input_store" bindconfirm="search_store"/>
     <view class="search flex-center" bindtap="search_store">
       <view class="fs28">搜索</view>
     </view>
@@ -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!='未设置经纬度'}}" class="store_dis flex fs22"> 
+          <view wx:if="{{item.Distance!=1000000}}" class="store_dis flex fs22">
             <view class="ellipsis-1">距您:{{item.Distance}}km</view>
           </view>
         </view>
diff --git a/pages/user/my_service/appment_main.wxss b/pages/user/my_service/appment_main.wxss
index be3de2e..e6ecb2d 100644
--- a/pages/user/my_service/appment_main.wxss
+++ b/pages/user/my_service/appment_main.wxss
@@ -122,6 +122,7 @@
   padding: 0rpx 5rpx;
   border: 2rpx solid rgb(238, 238, 238);
   background-color: rgb(255, 255, 255);
+  padding-bottom: 5rpx;
 }
 
 .beautician {
@@ -244,6 +245,7 @@
 
 .store_dis {
   height: 30rpx;
+  line-height: 30rpx;
   padding: 5rpx 15rpx;
   background-color: rgb(227, 227, 227);
   border-radius: 25rpx;
diff --git a/pages/user/my_service/beauty_deta.js b/pages/user/my_service/beauty_deta.js
index f82a561..b03c05d 100644
--- a/pages/user/my_service/beauty_deta.js
+++ b/pages/user/my_service/beauty_deta.js
@@ -20,13 +20,15 @@ Page({
     aweeks: [], //七天的预约时间
     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: "", //选择预约时间下标
+    weeks: [], //星期几数组
+    time_index: -1, //选择预约时间下标
     date_id: 0, //选择日期的id
     beautician_id: "", //美容师id
     itemId: "", //服务id
     number: "", //预约单号
     modify: 0, //是否是修改时间
     iscos: 0, //是否是从美容师列表过来的
+    hours: "", //获取当前时分秒
   },
 
   /**
@@ -34,20 +36,31 @@ Page({
    */
   onLoad: function(options) {
     var th = this;
+    var myDate = new Date();
+    var date = myDate.getHours() + ":00"; //获取当前小时数(0-23)
+    console.log(date > "09:00" + "和哦哦哦哦的");
     var beautician_id = options.BeauticianID;
     th.setData({
-      url: options.url,
       beautician_id: beautician_id,
       itemId: options.itemId,
-      iscos: options.iscos,
-      modify: options.modify
+      modify: options.modify,
+      hours: date
     })
-    
-    if (options.number != "") {
+    if (options.url != undefined) {
+      th.setData({
+        url: options.url
+      })
+    }
+    if (options.number != undefined) {
       th.setData({
         number: options.number
       })
     }
+    if (options.iscos != undefined) {
+      th.setData({
+        iscos: options.iscos
+      })
+    }
     th.query_beatea();
     th.query_aweek();
   },
@@ -57,7 +70,7 @@ Page({
   onShow: function() {
 
   },
-  
+
   //图片失败，默认图片
   bind_bnerr1: function(e) {
     var _errImg = e.target.dataset.errorimg;
@@ -95,7 +108,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
@@ -112,7 +125,7 @@ Page({
     var seekTime = th.data.seekTime; //选择的日期
     var time_list = th.data.time_list;
     var time_index = th.data.time_index;
-    if (time_index == "") {
+    if (time_index == -1) {
       getApp().my_warnning("请选择预约时间", 0, th);
       return false;
     }
@@ -139,10 +152,12 @@ Page({
         success: function(res) {
           if (res.data.code == 0) {
             getApp().my_warnning(res.data.msg, 0, th);
-            wx.navigateBack({
-              //返回
-              delta: 1
-            })
+            setTimeout(function() {
+              wx.navigateBack({
+                //返回
+                delta: 1
+              })
+            }, 1000);
           } else {
             getApp().my_warnning(res.data.msg, 0, th);
           }
@@ -151,16 +166,29 @@ Page({
     } else {
       var pages = getCurrentPages(); //当前页面
       var iscos = th.data.iscos;
-      var delta = 1 + Number(iscos);//返回哪个页面
-      var prevPage = pages[pages.length - 2 - iscos]; //上一页面
-      prevPage.setData({
-        //直接给上一个页面赋值
-        time: time,
-      });
-      wx.navigateBack({
-        //返回
-        delta: delta
-      })
+      var delta = 1;
+      if (Number(iscos) == 1) {
+        delta = delta + Number(iscos); //返回哪个页面
+        var prevPage = pages[pages.length - 2 - Number(iscos)]; //上一页面
+        prevPage.setData({
+          //直接给上一个页面赋值
+          time: time,
+        });
+        wx.navigateBack({
+          //返回
+          delta: 2
+        })
+      } else {
+        var prevPage = pages[pages.length - 2]; //上一页面
+        prevPage.setData({
+          //直接给上一个页面赋值
+          time: time,
+        });
+        wx.navigateBack({
+          //返回
+          delta: 1
+        })
+      }
     }
   },
   //选择时间
@@ -199,19 +227,32 @@ 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;
-            }
-          }
+
+        arr.sort(th.sort_arr);
+
+
+
+
+        var weeks = ["今天", "明天", "后天"];
+        var week = "";
+        for (var i = 3; i < arr.length; i++) {
+          var date = new Date(arr[i].time);
+          if (date.getDay() == 0) week = "周日"
+          if (date.getDay() == 1) week = "周一"
+          if (date.getDay() == 2) week = "周二"
+          if (date.getDay() == 3) week = "周三"
+          if (date.getDay() == 4) week = "周四"
+          if (date.getDay() == 5) week = "周五"
+          if (date.getDay() == 6) week = "周六"
+          weeks[i] = week;
         }
         th.setData({
-          aweeks: arr
+          aweeks: arr,
+          weeks: weeks
         })
-        th.query_date();
+        if (arr.length > 0) {
+          th.query_date();
+        }
       } else {
         getApp().my_warnning(res.data.msg, 0, th);
       }
@@ -236,13 +277,15 @@ Page({
         var time_list = res.data.data;
         var time = th.data.time;
         var new_time = [];
-        for (var i = 0; i < time.length; i++) {
-          for (var ii = 0; ii < time_list.length; ii++) {
-            if (time[i] == time_list[ii].GroupHour.substring(0, 5)) {
-              new_time[i] = time_list[ii].GroupHour.substring(0, 5);
-              break;
-            } else {
-              new_time[i] = "";
+        if (time_list != null) {
+          for (var i = 0; i < time.length; i++) {
+            for (var ii = 0; ii < res.data.data.length; ii++) {
+              if (time[i] == time_list[ii].GroupHour.substring(0, 5)) {
+                new_time[i] = time_list[ii].GroupHour.substring(0, 5);
+                break;
+              } else {
+                new_time[i] = "";
+              }
             }
           }
         }
@@ -296,4 +339,19 @@ Page({
       urls: [th.data.head_img] // 需要预览的图片http链接列表  
     })
   },
+
+  sort_arr: function(a, b) {
+    a = a['time'];
+    b = b['time'];
+    if (a < b) {
+      return -1;
+    }
+    if (a > b) {
+      return 1;
+    }
+    return 0;
+  }
+
+
+
 })
\ No newline at end of file
diff --git a/pages/user/my_service/beauty_deta.wxml b/pages/user/my_service/beauty_deta.wxml
index 9e4a60d..d158394 100644
--- a/pages/user/my_service/beauty_deta.wxml
+++ b/pages/user/my_service/beauty_deta.wxml
@@ -21,12 +21,17 @@
       <view class="fs36" style="margin-bottom:35rpx;">服务预约</view>
       <scroll-view class="scroll-h fs26 " scroll-x>
         <view class="rel" wx:for="{{aweeks}}" style="display: inline-block;">
-          <view class="scroll-item-h bd {{index==date_id?'chbd':''}}" bindtap="check_date" data-dateid="{{index}}">
-            <view>{{item.time}}</view>
-            <view></view>
-          </view>
-          <block wx:if="{{index==date_id}}">
-            <view class="abs box"></view>
+          <block wx:if="{{aweeks[index].val!=''}}">
+            <view class="scroll-item-h bd {{index==date_id?'chbd':''}}" bindtap="check_date" data-dateid="{{index}}">
+              <view>{{weeks[index]}}</view>
+              <view>{{item.time}}</view>
+            </view>
+          </block>
+          <block wx:else>
+            <view class="scroll-item-h bd">
+              <view>{{weeks[index]}}(约满)</view>
+              <view>{{item.time}}</view>
+            </view>
           </block>
         </view>
 
@@ -36,13 +41,10 @@
       <view class="Times">
 
         <view class="flex-center" wx:for="{{time}}" style="display:inline-block;" wx:for-index="key" wx:for-item="it">
-          <block wx:if="{{it==time_list[key]}}">
+          <block wx:if="{{it==time_list[key] && date_id==0?hours<it:true}}">
             <view class="Time flex-center {{time_index==key?'chTime':''}}" bindtap="Selection_time" data-index="{{key}}">
               <view>
                 <view class="fs26">{{it}}</view>
-                <block wx:if="{{flase}}">
-                  <view class="fs24">约满</view>
-                </block>
               </view>
             </view>
           </block>
diff --git a/pages/user/my_service/cosmetology_list.js b/pages/user/my_service/cosmetology_list.js
index 8facab2..325b405 100644
--- a/pages/user/my_service/cosmetology_list.js
+++ b/pages/user/my_service/cosmetology_list.js
@@ -44,8 +44,8 @@ Page({
         pageSize: th.data.pageSize
       }
     }).then(res => {
+      wx.hideLoading();
       if (res.data.code == 0) {
-        wx.hideLoading();
         th.data.curpage++;
         var arr1 = th.data.cosmetology_list;
         var arr2 = res.data.data.pageData;
diff --git a/pages/user/my_service/hist_service.js b/pages/user/my_service/hist_service.js
index 45a62b8..05e61bf 100644
--- a/pages/user/my_service/hist_service.js
+++ b/pages/user/my_service/hist_service.js
@@ -118,8 +118,8 @@ Page({
         pageSize: th.data.pageSize
       }
     }).then(res => {
+      wx.hideLoading();
       if (res.data.code == 0) {
-        wx.hideLoading();
         th.data.curpage++;
         var arr1 = th.data.hist_List;
         var arr2 = res.data.data.pageData;
diff --git a/pages/user/my_service/i_service.js b/pages/user/my_service/i_service.js
index defe890..f0db0e1 100644
--- a/pages/user/my_service/i_service.js
+++ b/pages/user/my_service/i_service.js
@@ -51,13 +51,13 @@ Page({
     if (this.data.total <= th.data.pageSize) return;
     if (this.data.ismore) return;
 
-    wx.showLoading({
-      title: '加载中...',
-    })
     th.query_service();
   },
   //查询服务项目列表
   query_service: function() {
+    wx.showLoading({
+      title: '加载中',
+    })
     var th = this;
     var url = "/api/weshop/marketing/reservation/sm/page";
     getApp().request.promiseGet(url, {
@@ -68,8 +68,8 @@ Page({
         pageSize: th.data.pageSize
       }
     }).then(res => {
+      wx.hideLoading();
       if (res.data.code == 0) {
-        wx.hideLoading();
         th.data.curpage++;
         var arr1 = th.data.service_List;
         var arr2 = res.data.data.pageData;
@@ -82,9 +82,7 @@ Page({
             ismore: ismore,
             is_service_read: 1,
           }),
-          console.log("顶顶顶顶顶" + res.data.data.pageData.length);
-        console.log("呃呃呃呃" + th.data.service_List.length);
-        wx.stopPullDownRefresh(); //停止下拉刷新
+          wx.stopPullDownRefresh(); //停止下拉刷新
       } else {
         getApp().my_warnning(res.data.msg, 0, th);
       }
@@ -128,5 +126,41 @@ Page({
   goto: function(e) {
     var url = e.currentTarget.dataset.url;
     getApp().goto(url);
+  },
+  //校正是否可预约
+  correcting: function(e) {
+    var th = this;
+    var url = e.currentTarget.dataset.url;
+    var service_id = e.currentTarget.dataset.service_id; //服务id
+    var project_id = e.currentTarget.dataset.project_id;
+    getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/check", {
+      data: {
+        serviceId: service_id,
+        storeId: a.stoid,
+        userId: d.user_id
+      }
+    }).then(res => {
+      if (res.data.code == 0) {
+        getApp().request.promiseGet("/api/weshop/marketing/reservation/reservation/sm/check", {
+          data: {
+            projectId: project_id,
+            serviceId: service_id,
+            storeId: a.stoid,
+            userId: d.user_id
+          }
+        }).then(res => {
+          if (res.data.code == 0) {
+            wx.navigateTo({
+              url: url
+            })
+          } else {
+            getApp().my_warnning(res.data.msg, 0, th);
+          }
+        })
+      } else {
+        getApp().my_warnning(res.data.msg, 0, th);
+      }
+    })
   }
+
 })
\ No newline at end of file
diff --git a/pages/user/my_service/i_service.wxml b/pages/user/my_service/i_service.wxml
index 146c37b..67ac67a 100644
--- a/pages/user/my_service/i_service.wxml
+++ b/pages/user/my_service/i_service.wxml
@@ -1,6 +1,6 @@
 <!-- 背景图片 -->
 <view>
-  <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" mode="widthFix" lazy-load="true"></image>
+  <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>
 </view>
 
@@ -49,7 +49,7 @@
         <view>立即使用</view>
       </view>
       <!-- 可预约 -->
-      <navigator wx:if="{{item.State>0}}" class="flex-level appointment yellow-b" url="/pages/user/my_service/appment_main?service_id={{item.ServiceID}}&BuyType={{item.BuyType}}&ProjectID={{item.ProjectID}}">
+      <navigator wx:if="{{item.State}}" class="flex-level appointment yellow-b" data-url="/pages/user/my_service/appment_main?service_id={{item.ServiceID}}&BuyType={{item.BuyType}}&ProjectID={{item.ProjectID}}" bindtap="correcting" data-service_id="{{item.ServiceID}}" data-project_id="{{item.ProjectID}}">
         <view>预约</view>
       </navigator>
     </view>
diff --git a/pages/user/my_service/i_service.wxss b/pages/user/my_service/i_service.wxss
index 5d2773e..76e0687 100644
--- a/pages/user/my_service/i_service.wxss
+++ b/pages/user/my_service/i_service.wxss
@@ -10,7 +10,7 @@ page {
   left: 0rpx;
   z-index: 0;
   width: 100%;
-  height: 100%;
+  /* height: 100%; */
 }
 
 /* 历史服务定位 */
@@ -26,7 +26,7 @@ page {
 .rel {
   background-color: rgb(255, 255, 255);
   width: 350rpx;
-  height: 405rpx;
+  height: 430rpx;
   border-radius: 20rpx;
   display: inline-block;
   margin-right: 15rpx;
diff --git a/pages/user/my_service/tment_order_list.js b/pages/user/my_service/tment_order_list.js
index 83566e1..1978c6a 100644
--- a/pages/user/my_service/tment_order_list.js
+++ b/pages/user/my_service/tment_order_list.js
@@ -93,9 +93,8 @@ Page({
         pageSize: th.data.pageSize
       }
     }).then(res => {
-
+      wx.hideLoading();
       if (res.data.code == 0) {
-        wx.hideLoading();
         th.data.curpage++;
         var arr1 = th.data.tm_order_list;
         var arr2 = res.data.data.pageData;