From 8710c85a4faac6de4662a2c6620e0721375945b4 Mon Sep 17 00:00:00 2001
From: DESKTOP-QHAFKU5\iceling <iceling@meidd.com>
Date: Fri, 29 Nov 2019 17:44:03 +0800
Subject: [PATCH] 部分样式修改

---
 pages/user/my_service/appment_main.js    | 10 ++++++----
 pages/user/my_service/beauty_deta.wxml   |  2 +-
 pages/user/my_service/hist_service.wxml  |  4 ++--
 pages/user/my_service/i_service.js       |  6 +++++-
 pages/user/my_service/i_service.wxml     |  2 +-
 pages/user/my_service/tment_details.wxss |  4 ++--
 6 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js
index 2ffc417..315928e 100644
--- a/pages/user/my_service/appment_main.js
+++ b/pages/user/my_service/appment_main.js
@@ -201,6 +201,9 @@ Page({
   },
   goto: function(e) {
     var th = this;
+    th.setData({
+      beautician: 0
+    })
     if (th.data.store_name == "") {
       getApp().my_warnning("请选择服务门店", 0, th);
     } else if (th.data.beautician_name == "") {
@@ -330,9 +333,7 @@ Page({
             }
           }
         } else {
-          th.setData({
-          })
-          getApp().my_warnning(res.data.msg, 0, th);
+          getApp().my_warnning("暂无美容师", 0, th);
         }
       })
     }
@@ -383,7 +384,8 @@ Page({
   nav_bea: function() {
     var th = this;
     th.setData({
-      is_textea: 0
+      is_textea: 0,
+      beautician: 0
     })
     var storageId = th.data.storageId; //线下门店id
     var itemId = th.data.itemId; //服务id
diff --git a/pages/user/my_service/beauty_deta.wxml b/pages/user/my_service/beauty_deta.wxml
index 4181742..c973cbb 100644
--- a/pages/user/my_service/beauty_deta.wxml
+++ b/pages/user/my_service/beauty_deta.wxml
@@ -5,7 +5,7 @@
     <!-- 个人信息 -->
     <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}}" bindtap="previewImage"></image>
+      <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!=''}}">
diff --git a/pages/user/my_service/hist_service.wxml b/pages/user/my_service/hist_service.wxml
index a9f3b9d..1a6936b 100644
--- a/pages/user/my_service/hist_service.wxml
+++ b/pages/user/my_service/hist_service.wxml
@@ -1,6 +1,6 @@
 <view class="{{isPickerRender==true?'container':''}}">
   <!-- 点击方法 -->
-  <view class="exption flex-vertical-between fs28" wx:if="{{is_nav ||hist_List.length>0}}">
+  <view class="exption flex-vertical-between fs28" wx:if="{{is_nav || hist_List.length>0}}">
     <view class="flex">
       共使用
       <view class="count">{{total}}</view>
@@ -25,7 +25,7 @@
       <!-- left -->
       <view>
         <view class="flex fs28">
-          <view class="itemName ellipsis-1">{{item.StorageName==''?'匿名':item.StorageName}}</view>
+          <view class="itemName ellipsis-1">{{item.ServiceName==''?'匿名':item.ServiceName}}</view>
           <view>(美容师：</view>
           <view class="itemUsna ellipsis-1">{{item.BeauticianName}}</view>
           )
diff --git a/pages/user/my_service/i_service.js b/pages/user/my_service/i_service.js
index b5614ed..ba13ca6 100644
--- a/pages/user/my_service/i_service.js
+++ b/pages/user/my_service/i_service.js
@@ -45,7 +45,10 @@ Page({
    * 生命周期函数--监听页面显示
    */
   onShow: function() {
-  
+    var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.close_box();
+    var my_confirm = th.selectComponent("#my_confirm"); //组件的id
+    my_confirm.open_cancel(0);
   },
   onReachBottom: function() {
     var th = this;
@@ -233,6 +236,7 @@ Page({
               }
             )
           } 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 242b9a8..fafdb83 100644
--- a/pages/user/my_service/i_service.wxml
+++ b/pages/user/my_service/i_service.wxml
@@ -56,7 +56,7 @@
   </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>=6}}">
     <view class="Line"></view>
     <view class="end fs26 xc-black">到底了</view>
     <view class="Line"></view>
diff --git a/pages/user/my_service/tment_details.wxss b/pages/user/my_service/tment_details.wxss
index c418e9e..e4f52e6 100644
--- a/pages/user/my_service/tment_details.wxss
+++ b/pages/user/my_service/tment_details.wxss
@@ -35,7 +35,7 @@ page {
 
 .container {
   padding: 0rpx 20rpx;
-  padding-bottom:85rpx;
+  padding-bottom:40rpx;
 }
 
 .Subscriber {
@@ -82,7 +82,7 @@ page {
   margin-bottom: 20rpx;
   position: fixed;
   width: 705rpx;
-  bottom:60rpx;
+  bottom:85rpx;
 }
 
 .sub {
--
libgit2 0.21.4