From aa8fd4f7594cbf40a9079b0c7fc147bf8b110544 Mon Sep 17 00:00:00 2001
From: DESKTOP-QHAFKU5\iceling <iceling@meidd.com>
Date: Tue, 3 Dec 2019 15:39:22 +0800
Subject: [PATCH] 预约服务添加导航，以及选择的文字从灰变黑

---
 components/nav_b/nav_b.wxss              |  2 +-
 pages/user/my_service/appment_main.js    |  6 ++++++
 pages/user/my_service/appment_main.json  |  3 ++-
 pages/user/my_service/appment_main.wxml  | 14 ++++++++------
 pages/user/my_service/appment_main.wxss  |  5 ++---
 pages/user/my_service/i_service.js       | 12 ++++++------
 pages/user/my_service/i_service.wxml     |  4 ++--
 pages/user/my_service/tment_details.js   | 16 ++++++----------
 pages/user/my_service/tment_details.wxml |  2 +-
 9 files changed, 34 insertions(+), 30 deletions(-)

diff --git a/components/nav_b/nav_b.wxss b/components/nav_b/nav_b.wxss
index 0f8d90c..6e0e00f 100644
--- a/components/nav_b/nav_b.wxss
+++ b/components/nav_b/nav_b.wxss
@@ -9,7 +9,7 @@
   border-radius: 50rpx;
   position: fixed;
   right: 10rpx;
-  bottom: 650rpx;
+  bottom: 570rpx;
   overflow: hidden;
   z-index: 4;
 }
diff --git a/pages/user/my_service/appment_main.js b/pages/user/my_service/appment_main.js
index 744d37b..c949dfa 100644
--- a/pages/user/my_service/appment_main.js
+++ b/pages/user/my_service/appment_main.js
@@ -500,5 +500,11 @@ Page({
         getApp().my_warnning(res.data.msg, 0, th);
       }
     })
+  },
+  //关闭导航
+  close:function(){
+    var th = this;
+    var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.close_box();
   }
 })
\ No newline at end of file
diff --git a/pages/user/my_service/appment_main.json b/pages/user/my_service/appment_main.json
index fcc72b6..104895a 100644
--- a/pages/user/my_service/appment_main.json
+++ b/pages/user/my_service/appment_main.json
@@ -1,6 +1,7 @@
 {
   "navigationBarTitleText": "预约服务",
     "usingComponents": {
-      "warn": "/components/long_warn/long_warn"
+      "warn": "/components/long_warn/long_warn",
+      "nav_b": "/components/nav_b/nav_b"
     }
 }
\ No newline at end of file
diff --git a/pages/user/my_service/appment_main.wxml b/pages/user/my_service/appment_main.wxml
index 8851219..7013609 100644
--- a/pages/user/my_service/appment_main.wxml
+++ b/pages/user/my_service/appment_main.wxml
@@ -1,5 +1,5 @@
 <wxs module="filters" src="../../../utils/filter.wxs"></wxs>
-<view class="container">
+<view class="container" catchtap="close">
   <image class="main" src="{{iurl}}/miniapp/images/yyservice/main.png"></image>
 
   <view class="Fram">
@@ -13,7 +13,7 @@
 
       <!-- 选择门店 -->
       <view class="flex-vertical-between fs26 select" bindtap="onclickstore">
-        <view class="color value ellipsis-1">{{store_name==""?'选择服务门店':store_name}}</view>
+        <view class="{{store_name==''?'color':''}} value ellipsis-1">{{store_name==""?'选择服务门店':store_name}}</view>
         <view class="angle">∟</view>
       </view>
     </view>
@@ -29,7 +29,7 @@
       <!-- 选择美容师 -->
       <view class="rel fs26">
         <view class="flex-vertical-between Cosmetology" bindtap="query_beautician">
-          <view class="color value ellipsis-1">{{beautician_name==''?'选择美容师':beautician_name}}</view>
+          <view class="{{beautician_name==''?'color':''}} value ellipsis-1">{{beautician_name==''?'选择美容师':beautician_name}}</view>
           <view class="angle">∟</view>
         </view>
         <!-- 美容师下拉列表 -->
@@ -56,7 +56,7 @@
 
       <!-- 选择时间 -->
       <view class="flex-vertical-between fs26 select" data-url="/pages/user/my_service/beauty_deta?url+{{url}}&BeauticianID={{beauticianID}}&itemId={{itemId}}&modify=0&projectId={{project_id}}" bindtap="goto">
-        <view class="color">{{time==""?'选择时间':time}}</view>
+        <view class="{{time==''?'color':''}}">{{time==""?'选择时间':time}}</view>
         <view class="angle angler">∟</view>
       </view>
     </view>
@@ -70,7 +70,7 @@
       </view>
       <view class="flex fs26" bindtap="">
         <block wx:if="{{is_textea==1 && store==0}}">
-          <textarea class="textarea color" placeholder="{{remarks==''?'填写备注':remarks}}" placeholder-class="fs26 color" value="{{remarks}}" bindinput="input_remarks" maxlength="100">
+          <textarea class="textarea" placeholder="{{remarks==''?'填写备注':remarks}}" placeholder-class="fs26 color" value="{{remarks}}" bindinput="input_remarks" maxlength="100">
           </textarea>
         </block>
         <block wx:else>
@@ -147,4 +147,6 @@
 </view>
 <!-- 蒙尘 -->
 <view wx:if="{{store}}" class="disgraceful" bindtap="onclickstore"></view>
-<warn id="warn"></warn>
\ No newline at end of file
+<warn id="warn"></warn>
+<!--  制作一个圆球导航  -->
+<nav_b id="nav_b"></nav_b>
\ No newline at end of file
diff --git a/pages/user/my_service/appment_main.wxss b/pages/user/my_service/appment_main.wxss
index 07965f6..e2ca36d 100644
--- a/pages/user/my_service/appment_main.wxss
+++ b/pages/user/my_service/appment_main.wxss
@@ -94,7 +94,6 @@ button {
   padding-right: 15rpx;
   padding-top: 15rpx;
   padding-bottom: 15rpx;
-  color: rgb(172, 172, 172);
 }
 
 .mabot {
@@ -168,7 +167,7 @@ button {
 
 .disgraceful {
   position: fixed;
-  z-index: 3;
+  z-index: 4;
   width: 100%;
   height: 100%;
   top: 0rpx;
@@ -177,7 +176,7 @@ button {
 }
 
 .storeList {
-  z-index: 4;
+  z-index: 5;
   left: 0rpx;
   border-top-left-radius: 25rpx;
   border-top-right-radius: 25rpx;
diff --git a/pages/user/my_service/i_service.js b/pages/user/my_service/i_service.js
index f2835c5..2c9e854 100644
--- a/pages/user/my_service/i_service.js
+++ b/pages/user/my_service/i_service.js
@@ -46,8 +46,6 @@ Page({
    */
   onShow: function() {
     var th = this;
-    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);
   },
@@ -99,8 +97,6 @@ Page({
       title: '加载中',
     })
     var th = this;
-    var nav_b = th.selectComponent("#nav_b"); //组件的id
-    nav_b.close_box();
     var url = e.currentTarget.dataset.url;
     var service_id = e.currentTarget.dataset.service_id; //服务id
     var project_id = e.currentTarget.dataset.project_id;
@@ -179,8 +175,6 @@ Page({
   //校正是否可预约
   correcting: function(e) {
     var th = this;
-    var nav_b = th.selectComponent("#nav_b"); //组件的id
-    nav_b.close_box();
     wx.showLoading({
       title: '加载中',
     })
@@ -250,6 +244,12 @@ Page({
         }
       })
     }
+  },
+  //关闭导航
+  close: function () {
+    var th = this;
+    var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.close_box();
   }
 
 })
\ 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 47b31a3..f53dfd9 100644
--- a/pages/user/my_service/i_service.wxml
+++ b/pages/user/my_service/i_service.wxml
@@ -1,12 +1,12 @@
 <!-- 背景图片 -->
-<view>
+<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>
 </view>
 
 <!-- 预约内容 -->
 <!-- 项目框架 -->
-<view class="Serviceitems">
+<view class="Serviceitems" catchtap="close">
   <!-- 单个项目 -->
   <view class="rel" wx:for="{{service_List}}">
     <view class="abs">
diff --git a/pages/user/my_service/tment_details.js b/pages/user/my_service/tment_details.js
index 9e415f0..12d18a6 100644
--- a/pages/user/my_service/tment_details.js
+++ b/pages/user/my_service/tment_details.js
@@ -102,17 +102,9 @@ Page({
       }
     })
   },
-  close: function() {
-    var th = this;
-    var nav_b = th.selectComponent("#nav_b"); //组件的id
-    nav_b.close_box();
-  },
   //显示核销码
   code_show: function(e) {
     var th = this;
-    th.close();
-    var nav_b = th.selectComponent("#nav_b"); //组件的id
-    nav_b.close_box();
     //--获取成功的时候--
     var no = e.currentTarget.dataset.order_sn;
     var qc_com = th.selectComponent("#qc_com"); //组件的id
@@ -125,7 +117,6 @@ Page({
   //跳到首页
   goto: function(e) {
     var th = this;
-    th.close();
     wx.switchTab({
       url: '/pages/index/index/index',
     })
@@ -136,6 +127,11 @@ Page({
   onShow: function() {
     var th = this;
     th.query_bea();
-    th.close();
   },
+  //关闭导航
+  close: function () {
+    var th = this;
+    var nav_b = th.selectComponent("#nav_b"); //组件的id
+    nav_b.close_box();
+  }
 })
\ No newline at end of file
diff --git a/pages/user/my_service/tment_details.wxml b/pages/user/my_service/tment_details.wxml
index f3503a9..e630c13 100644
--- a/pages/user/my_service/tment_details.wxml
+++ b/pages/user/my_service/tment_details.wxml
@@ -1,4 +1,4 @@
-<view class="container" wx:for="{{tment_details}}" wx:if="{{index<1}}">
+<view class="container" wx:for="{{tment_details}}" wx:if="{{index<1}}" catchtap="close">
   <!-- 预约人的属性 -->
   <view class="Subscriber padding">
     <!-- 状态栏 -->
--
libgit2 0.21.4