diff --git a/app.wxss b/app.wxss
index 352c091..57abd70 100644
--- a/app.wxss
+++ b/app.wxss
@@ -50,6 +50,13 @@ button {
     -webkit-box-orient: vertical;
     -webkit-line-clamp: 3;
 }
+.ellipsis-4 {
+    overflow: hidden;
+    text-overflow: ellipsis;
+    display: -webkit-box;
+    -webkit-box-orient: vertical;
+    -webkit-line-clamp: 4;
+}
 
 .pd-bg-fff {
     padding: 0 30rpx;
diff --git a/components/nav_b/nav_b.wxml b/components/nav_b/nav_b.wxml
index 566122e..9fb82e8 100644
--- a/components/nav_b/nav_b.wxml
+++ b/components/nav_b/nav_b.wxml
@@ -1,4 +1,3 @@
-
 <view class="box_main {{isopen==1?'box_isopen':''}}"  >
     <view class="dian" bindtap="open_box">
         <image src="{{iurl}}/miniapp/images/sheng_lue.png" ></image>
diff --git a/components/nav_b/nav_b.wxss b/components/nav_b/nav_b.wxss
index ed01bf6..0f8d90c 100644
--- a/components/nav_b/nav_b.wxss
+++ b/components/nav_b/nav_b.wxss
@@ -1,67 +1,62 @@
-.box_main{
-    width:80rpx;
-    height:80rpx;
-    background:#272636;
-    transition:width 0.8s;
-    -moz-transition:width 0.8s; /* Firefox 4 */
-    -webkit-transition:width 0.8s; /* Safari and Chrome */
-    -o-transition:width 0.8s; /* Opera */
-    border-radius:50rpx ;
-    position: fixed;
-    right: 10rpx;
-    bottom:300rpx;
-    overflow: hidden;
-    z-index: 111;
-}
-
-.box_isopen{
-    width: 420rpx;
-}
-
-.box_main .dian{
+.box_main {
+  width: 80rpx;
+  height: 80rpx;
+  background: #272636;
+  transition: width 0.8s;
+  -moz-transition: width 0.8s; /* Firefox 4 */
+  -webkit-transition: width 0.8s; /* Safari and Chrome */
+  -o-transition: width 0.8s; /* Opera */
+  border-radius: 50rpx;
+  position: fixed;
+  right: 10rpx;
+  bottom: 650rpx;
+  overflow: hidden;
+  z-index: 4;
+}
+
+.box_isopen {
+  width: 420rpx;
+}
+
+.box_main .dian {
   text-align: center;
-width: 50rpx;
-height: 50rpx;
-color: #ffff;
-font-size: 50rpx;
-background: none;
-
+  width: 80rpx;
+  height: 80rpx;
+  color: #ffff;
+  font-size: 50rpx;
+  background: none;
 }
 
-.box_main .dian image{
+.box_main .dian image {
   width: 60rpx;
-height: 20rpx;
-margin: 30rpx 0 0 10rpx;
+  height: 20rpx;
 }
 
-.box_main.box_isopen  .dian{
-    display: none;
+.box_main.box_isopen  .dian {
+  display: none;
 }
 
-.box_main .cl_list{
-    display: none;
+.box_main .cl_list {
+  display: none;
 }
 
-.box_main.box_isopen  .cl_list{
-    display: block;
-    margin-left: 20rpx;
+.box_main.box_isopen  .cl_list {
+  display: block;
+  margin-left: 20rpx;
 }
 
-.box_main .cl_list .item{
-    display: inline-block;
-    width:100rpx;
-    height:80rpx;
-    text-align: center;
-    line-height: 80rpx;
-    color: #fff;
-    vertical-align: top;
-    font-size: 32rpx;
-
+.box_main .cl_list .item {
+  display: inline-block;
+  width: 100rpx;
+  height: 80rpx;
+  text-align: center;
+  line-height: 80rpx;
+  color: #fff;
+  vertical-align: top;
+  font-size: 32rpx;
 }
 
-.box_main .cl_list .item.big{
+.box_main .cl_list .item.big {
   font-size: 70rpx;
-line-height: 70rpx;
-
+  line-height: 70rpx;
 }
-
diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js
index fe48974..744d37b 100644
--- a/pages/user/my_service/appment_main.js
+++ b/pages/user/my_service/appment_main.js
@@ -263,6 +263,7 @@ Page({
     var itemId = th.data.itemId; //服务id
     var url = "/api/weshop/marketing/reservation/storage/page";
     var key_word = th.data.key_word;
+    key_word = key_word.replace(/\s+/g, "");
     getApp().request.promiseGet(url, {
       data: {
         storeId: a.stoid,
@@ -288,6 +289,11 @@ Page({
           ismore: ismore,
           is_service_read: 1,
         }), wx.stopPullDownRefresh(); //停止下拉刷新
+        if (key_word != "" && res.data.data.pageData.length < 1) {
+          th.setData({
+            is_search: 1
+          })
+        }
       } else {
         getApp().my_warnning(res.data.msg, 0, th);
       }
@@ -376,11 +382,6 @@ Page({
       title: '加载中',
     })
     th.query_store();
-    if (store_list.length < 1) {
-      th.setData({
-        is_search: 1
-      })
-    }
   },
   //美容师预约跳转页面
   nav_bea: function() {
diff --git a/pages/user/my_service/appment_main.wxml b/pages/user/my_service/appment_main.wxml
index 29d7681..8851219 100644
--- a/pages/user/my_service/appment_main.wxml
+++ b/pages/user/my_service/appment_main.wxml
@@ -93,12 +93,6 @@
         </button>
         </form>
     </view>
-    <!-- <block wx:if="{{false}}">
-      <view class="subSuccess fs36">
-        <image class="Success" src="{{iurl}}/miniapp/images/yyservice/Success.png"></image>
-        <view>预约成功</view>
-      </view>
-    </block> -->
   </view>
 
 </view>
@@ -135,7 +129,7 @@
       </view>
     </view>
     <!-- 通过搜索的时候没有找到的提示语 -->
-    <view wx:if="{{store_list.length<1 && is_search}}" class="flex-center fs28 notstore">
+    <view wx:if="{{store_list.length<1 && is_search==1}}" class="flex-center fs28 notstore">
       <view>没有找到{{key_word}}门店</view>
     </view>
 
diff --git a/pages/user/my_service/appment_main.wxss b/pages/user/my_service/appment_main.wxss
index 89bdad5..07965f6 100644
--- a/pages/user/my_service/appment_main.wxss
+++ b/pages/user/my_service/appment_main.wxss
@@ -136,7 +136,7 @@ button {
 }
 
 .beautician {
-  height: 60rpx;
+  height: 70rpx;
   border-bottom: 2rpx solid rgb(238, 238, 238);
   padding-left: 25rpx;
 }
@@ -218,7 +218,7 @@ button {
 }
 
 .stores {
-  height: 520rpx;
+  height: 500rpx;
   overflow-y: scroll;
 }
 
@@ -234,8 +234,8 @@ button {
 }
 
 .circular {
-  width: 36rpx;
-  height: 36rpx;
+  width: 37rpx;
+  height: 37rpx;
   border-radius: 50%;
   border: 2rpx solid rgb(52, 52, 52);
   margin: 0rpx 15rpx;
diff --git a/pages/user/my_service/beauty_deta.js b/pages/user/my_service/beauty_deta.js
index 6ebee00..6a392fe 100644
--- a/pages/user/my_service/beauty_deta.js
+++ b/pages/user/my_service/beauty_deta.js
@@ -290,28 +290,27 @@ Page({
       }
     }).then(res => {
       if (res.data.code == 0) {
-        if (res.data.data[0].GroupHour!=undefined){
-        if (res.data.data[0].GroupHour.length > 11) {
-          getApp().my_warnning(res.data.data[0].GroupHour, 0, th);
-        }
-        }
         var hours = th.data.hours;
-
         var time_list = res.data.data;
         var time = th.data.time;
         var date_id = th
         var new_time = [];
-        var date = th.data.hours;
+        var date = th.data.hours.substring(0,2);
 
         //不等于空就是有可以预约的时间
         if (time_list != null) {
+          if (res.data.data[0].GroupHour != undefined) {
+            if (res.data.data[0].GroupHour.length > 11) {
+              getApp().my_warnning(res.data.data[0].GroupHour, 0, th);
+            }
+          }
           //循环固定和可预约的时间
           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)) {
                 var date_id = th.data.date_id;
-                if (date >= time_list[ii].GroupHour.substring(0, 2) && date_id == 0) {
+                if (date > time_list[ii].GroupHour.substring(0, 2) && date_id == 0) {
                   new_time[i] = "";
                   break;
                 } else {
diff --git a/pages/user/my_service/beauty_deta.wxml b/pages/user/my_service/beauty_deta.wxml
index c973cbb..57591e4 100644
--- a/pages/user/my_service/beauty_deta.wxml
+++ b/pages/user/my_service/beauty_deta.wxml
@@ -4,17 +4,24 @@
   <view class="comments">
     <!-- 个人信息 -->
     <view class="Personal">
+
       <view class="name fs36 ellipsis-1">{{name}}</view>
-      <image class="head" src="{{head_img==''?iurl+defimgurl:head_img}}" data-errorimg="{{head_img}}" binderror="bind_bnerr1" data-img="{{head_img}}" data-src="{{head_img}}"></image>
 
-      <view class="introduce fs26">
-        <block wx:if="{{comment!=''}}">
-          {{comment}}
-        </block>
-        <block wx:else>
-          暂无介绍
-        </block>
+      <view class="ellipsis-4" style="width:100%">
+        <view style="overflow:hidden;">
+          <image class="head" src="{{head_img==''?iurl+defimgurl:head_img}}" data-errorimg="{{head_img}}" binderror="bind_bnerr1" data-img="{{head_img}}" data-src="{{head_img}}"></image>
+          <view class="introduce fs26">
+            <block wx:if="{{comment!=''}}">
+              {{comment}}
+            </block>
+            <block wx:else>
+              暂无介绍
+            </block>
+          </view>
+          <view style="clear:both"></view>
+        </view>
       </view>
+
     </view>
 
     <view>
@@ -28,7 +35,7 @@
             </view>
           </block>
           <block wx:else>
-            <view class="scroll-item-h bd {{index==date_id?'chbd':''}}" bindtap="check_date" data-dateid="{{index}}"> 
+            <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>
diff --git a/pages/user/my_service/beauty_deta.wxss b/pages/user/my_service/beauty_deta.wxss
index 4219ac6..09fc465 100644
--- a/pages/user/my_service/beauty_deta.wxss
+++ b/pages/user/my_service/beauty_deta.wxss
@@ -10,6 +10,7 @@
   width: 100%;
   height: 270rpx;
   background-color: rgb(214, 1, 33);
+  
 }
 
 .comments {
diff --git a/pages/user/my_service/cosmetology_list.js b/pages/user/my_service/cosmetology_list.js
index bd9d80b..c826005 100644
--- a/pages/user/my_service/cosmetology_list.js
+++ b/pages/user/my_service/cosmetology_list.js
@@ -61,7 +61,6 @@ Page({
           is_cosmetology_read:1
         }), wx.stopPullDownRefresh(); //停止下拉刷新
       } else {
-        getApp().my_warnning(res.data.msg, 0, th);
         th.setData({
           is_cosmetology_read:1
         })
diff --git a/pages/user/my_service/cosmetology_list.wxml b/pages/user/my_service/cosmetology_list.wxml
index bc53e50..5f35a18 100644
--- a/pages/user/my_service/cosmetology_list.wxml
+++ b/pages/user/my_service/cosmetology_list.wxml
@@ -44,13 +44,13 @@
           </view>
         </block>
         <block wx:else>
-          <view>暂无对自己的介绍</view>
+          <view>暂无介绍</view>
         </block>
       </view>
     </view>
     <!-- 没有数据 -->
     <!-- 加载完毕并且数据大于=页大小 -->
-    <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=pageSize}}">
+    <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=4}}">
       <view class="Line"></view>
       <view class="end fs26 xc-black">到底了</view>
       <view class="Line"></view>
diff --git a/pages/user/my_service/hist_service.js b/pages/user/my_service/hist_service.js
index 725676e..4365592 100644
--- a/pages/user/my_service/hist_service.js
+++ b/pages/user/my_service/hist_service.js
@@ -30,8 +30,8 @@ Page({
     total: 0,
     ismore: 0, //是否加载完毕
     is_screen: 0, //是否通过筛选来选择历史服务
-    is_reset:0,//是否重复点击
-    is_nav:1,//是否显示导航栏
+    is_reset: 0, //是否重复点击
+    is_nav: 1, //是否显示导航栏
   },
   pickerShow: function() {
     this.setData({
@@ -59,7 +59,8 @@ Page({
       distance: 0,
       hist_List: [],
       curpage: 1,
-      is_screen: 1
+      is_screen: 1,
+      is_nav: 1
     });
     th.query_hist();
   },
@@ -80,28 +81,28 @@ Page({
    */
   onReachBottom: function() {
     var th = this;
-    if (th.data.total <= th.data.pageSize) return;
-    if (th.data.ismore) return;
+    if (th.data.total <= th.data.pageSize) return false;
+    if (th.data.ismore) return false;
 
     wx.showLoading({
       title: '加载中...',
     })
-    th.query_service();
+    th.query_hist();
   },
   //重置历史服务数据
   his_reset: function() {
     var th = this;
     var is_reset = th.data.is_reset;
-    console.log("22"+is_reset);
-    if (is_reset==0){
+    if (is_reset == 0) {
       th.setData({
         hist_List: [],
         curpage: 1,
         is_service_read: 0,
         is_screen: 1,
-        is_reset:1,
+        is_reset: 1,
         startTime: "",
         endTime: "",
+        is_nav: 1
       })
       th.query_hist();
     }
@@ -140,14 +141,14 @@ Page({
           is_service_read: 1,
         }), wx.stopPullDownRefresh(); //停止下拉刷新
       } else {
-          th.setData({
-            is_service_read:1,
-            is_screen:0,
-            total:0
-          })
-        if (startTime == "") {
+        th.setData({
+          is_service_read: 1,
+          is_screen: 0,
+          ismore: 1
+        })
+        if (startTime!="") {
             th.setData({
-              is_nav:0
+              total:0
             })
         }
       }
diff --git a/pages/user/my_service/hist_service.wxml b/pages/user/my_service/hist_service.wxml
index 1a6936b..1c312ab 100644
--- a/pages/user/my_service/hist_service.wxml
+++ b/pages/user/my_service/hist_service.wxml
@@ -19,7 +19,7 @@
   </view>
 
   <!-- 总的服务列表 -->
-  <view>
+  <view class="items">
     <!-- 单个 -->
     <view class="item flex-vertical-between" wx:for="{{hist_List}}">
       <!-- left -->
diff --git a/pages/user/my_service/hist_service.wxss b/pages/user/my_service/hist_service.wxss
index 776ff8a..8882a8d 100644
--- a/pages/user/my_service/hist_service.wxss
+++ b/pages/user/my_service/hist_service.wxss
@@ -21,6 +21,10 @@ page {
   background-color: rgb(238, 238, 238);
   height: 70rpx;
   color: rgb(153, 153, 153);
+  position: fixed;
+  top:0rpx;
+  left: 0rpx;
+  width: 660rpx;
 }
 
 .count {
@@ -39,7 +43,9 @@ page {
   width: 30rpx;
   height: 30rpx;
 }
-
+.items{
+  margin-top: 70rpx;
+}
 .item {
   margin: 0rpx 25rpx;
   padding: 0rpx 20rpx;
@@ -49,7 +55,7 @@ page {
 
 .itemName {
   margin-right: 10rpx;
-  width: 130rpx;
+  max-width: 130rpx;
 }
 
 .itemUsna {
diff --git a/pages/user/my_service/tment_details.wxml b/pages/user/my_service/tment_details.wxml
index bed6bea..f3503a9 100644
--- a/pages/user/my_service/tment_details.wxml
+++ b/pages/user/my_service/tment_details.wxml
@@ -13,12 +13,12 @@
     <view class="fs30">
       <view class="items lf">
         <!-- 预约订单 -->
-        <view class="flex-vertical bmt" bindtap="code_show" data-order_sn="{{number}}">
+        <view class="flex-vertical bmt" bindtap="code_show" data-order_sn="{{number}}" wx:if="{{item.State==0}}">
           <view class="flex-vertical ai-bas">
             <view class="name">预约订单:</view>
             <view class="ellipsis-1 value">{{number}}</view>
           </view>
-          <image wx:if="{{item.State==0}}" src="{{iurl}}miniapp/images/order/code.png" class="code"></image>
+          <image src="{{iurl}}miniapp/images/order/code.png" class="code"></image>
         </view>
 
         <!-- 预约门店 -->
diff --git a/pages/user/my_service/tment_eval.wxml b/pages/user/my_service/tment_eval.wxml
index 1e8e750..84489b9 100644
--- a/pages/user/my_service/tment_eval.wxml
+++ b/pages/user/my_service/tment_eval.wxml
@@ -7,9 +7,8 @@
 
   <!-- 姓名 -->
   <view class="flex-level item">
-    <view class="itemlf flex-vertical-between">
-      <view class="fs32">美容师</view>
-      <view> ：</view>
+    <view class="itemlf flex-level-right">
+      <view class="fs32">美容师：</view>
     </view>
     <view class="itemlr fs30 ellipsis-1">{{beautician.BeauticianName}}</view>
   </view>
diff --git a/pages/user/my_service/tment_order_list.wxml b/pages/user/my_service/tment_order_list.wxml
index 0ae00fc..7e1ad28 100644
--- a/pages/user/my_service/tment_order_list.wxml
+++ b/pages/user/my_service/tment_order_list.wxml
@@ -5,7 +5,7 @@
       <view>{{item.name}}</view>
     </view>
   </view>
-  <view wx:if="{{true}}">
+  <view class="itemMax">
     <!-- 预约项目 -->
     <view wx:for="{{tm_order_list}}">
       <!-- 商品编号和状态 -->
@@ -82,7 +82,7 @@
   <view class="flex-level">
     <image src="{{iurl}}miniapp/images/order/empty_order.png" lazy-load="true"></image>
   </view>
-  <view class="flex-level fs30 xc-ash">暂无预约记录</view>
+  <view class="flex-level fs30 xc-ash">无预约记录</view>
   <view class="flex-level">
     <navigator url="/pages/user/my_service/i_service" bindtap="goto">
       <view class="flex-center fs32 white">立即预约</view>
diff --git a/pages/user/my_service/tment_order_list.wxss b/pages/user/my_service/tment_order_list.wxss
index a4c114f..5df61fc 100644
--- a/pages/user/my_service/tment_order_list.wxss
+++ b/pages/user/my_service/tment_order_list.wxss
@@ -10,6 +10,12 @@ page {
   border-top: 3rpx solid rgb(221, 221, 221);
   display: flex;
   justify-content: space-between;
+  position: fixed;
+  background-color: rgb(255,255,255);
+  width:696rpx;
+}
+.itemMax{
+  margin-top: 93rpx;
 }
 
 .type-box {
@@ -137,5 +143,7 @@ page {
 }
 .base{
   display: flex;
+  height: 38rpx;
+  line-height: 38rpx;
   align-items: baseline;
 }
\ No newline at end of file