Commit aa8fd4f7594cbf40a9079b0c7fc147bf8b110544
1 parent
6a260123
预约服务添加导航,以及选择的文字从灰变黑
Showing
9 changed files
with
34 additions
and
30 deletions
components/nav_b/nav_b.wxss
pages/user/my_service/appment_main.js
| @@ -500,5 +500,11 @@ Page({ | @@ -500,5 +500,11 @@ Page({ | ||
| 500 | getApp().my_warnning(res.data.msg, 0, th); | 500 | getApp().my_warnning(res.data.msg, 0, th); |
| 501 | } | 501 | } |
| 502 | }) | 502 | }) |
| 503 | + }, | ||
| 504 | + //关闭导航 | ||
| 505 | + close:function(){ | ||
| 506 | + var th = this; | ||
| 507 | + var nav_b = th.selectComponent("#nav_b"); //组件的id | ||
| 508 | + nav_b.close_box(); | ||
| 503 | } | 509 | } |
| 504 | }) | 510 | }) |
| 505 | \ No newline at end of file | 511 | \ No newline at end of file |
pages/user/my_service/appment_main.json
| 1 | { | 1 | { |
| 2 | "navigationBarTitleText": "预约服务", | 2 | "navigationBarTitleText": "预约服务", |
| 3 | "usingComponents": { | 3 | "usingComponents": { |
| 4 | - "warn": "/components/long_warn/long_warn" | 4 | + "warn": "/components/long_warn/long_warn", |
| 5 | + "nav_b": "/components/nav_b/nav_b" | ||
| 5 | } | 6 | } |
| 6 | } | 7 | } |
| 7 | \ No newline at end of file | 8 | \ No newline at end of file |
pages/user/my_service/appment_main.wxml
| 1 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> | 1 | <wxs module="filters" src="../../../utils/filter.wxs"></wxs> |
| 2 | -<view class="container"> | 2 | +<view class="container" catchtap="close"> |
| 3 | <image class="main" src="{{iurl}}/miniapp/images/yyservice/main.png"></image> | 3 | <image class="main" src="{{iurl}}/miniapp/images/yyservice/main.png"></image> |
| 4 | 4 | ||
| 5 | <view class="Fram"> | 5 | <view class="Fram"> |
| @@ -13,7 +13,7 @@ | @@ -13,7 +13,7 @@ | ||
| 13 | 13 | ||
| 14 | <!-- 选择门店 --> | 14 | <!-- 选择门店 --> |
| 15 | <view class="flex-vertical-between fs26 select" bindtap="onclickstore"> | 15 | <view class="flex-vertical-between fs26 select" bindtap="onclickstore"> |
| 16 | - <view class="color value ellipsis-1">{{store_name==""?'选择服务门店':store_name}}</view> | 16 | + <view class="{{store_name==''?'color':''}} value ellipsis-1">{{store_name==""?'选择服务门店':store_name}}</view> |
| 17 | <view class="angle">∟</view> | 17 | <view class="angle">∟</view> |
| 18 | </view> | 18 | </view> |
| 19 | </view> | 19 | </view> |
| @@ -29,7 +29,7 @@ | @@ -29,7 +29,7 @@ | ||
| 29 | <!-- 选择美容师 --> | 29 | <!-- 选择美容师 --> |
| 30 | <view class="rel fs26"> | 30 | <view class="rel fs26"> |
| 31 | <view class="flex-vertical-between Cosmetology" bindtap="query_beautician"> | 31 | <view class="flex-vertical-between Cosmetology" bindtap="query_beautician"> |
| 32 | - <view class="color value ellipsis-1">{{beautician_name==''?'选择美容师':beautician_name}}</view> | 32 | + <view class="{{beautician_name==''?'color':''}} value ellipsis-1">{{beautician_name==''?'选择美容师':beautician_name}}</view> |
| 33 | <view class="angle">∟</view> | 33 | <view class="angle">∟</view> |
| 34 | </view> | 34 | </view> |
| 35 | <!-- 美容师下拉列表 --> | 35 | <!-- 美容师下拉列表 --> |
| @@ -56,7 +56,7 @@ | @@ -56,7 +56,7 @@ | ||
| 56 | 56 | ||
| 57 | <!-- 选择时间 --> | 57 | <!-- 选择时间 --> |
| 58 | <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"> | 58 | <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"> |
| 59 | - <view class="color">{{time==""?'选择时间':time}}</view> | 59 | + <view class="{{time==''?'color':''}}">{{time==""?'选择时间':time}}</view> |
| 60 | <view class="angle angler">∟</view> | 60 | <view class="angle angler">∟</view> |
| 61 | </view> | 61 | </view> |
| 62 | </view> | 62 | </view> |
| @@ -70,7 +70,7 @@ | @@ -70,7 +70,7 @@ | ||
| 70 | </view> | 70 | </view> |
| 71 | <view class="flex fs26" bindtap=""> | 71 | <view class="flex fs26" bindtap=""> |
| 72 | <block wx:if="{{is_textea==1 && store==0}}"> | 72 | <block wx:if="{{is_textea==1 && store==0}}"> |
| 73 | - <textarea class="textarea color" placeholder="{{remarks==''?'填写备注':remarks}}" placeholder-class="fs26 color" value="{{remarks}}" bindinput="input_remarks" maxlength="100"> | 73 | + <textarea class="textarea" placeholder="{{remarks==''?'填写备注':remarks}}" placeholder-class="fs26 color" value="{{remarks}}" bindinput="input_remarks" maxlength="100"> |
| 74 | </textarea> | 74 | </textarea> |
| 75 | </block> | 75 | </block> |
| 76 | <block wx:else> | 76 | <block wx:else> |
| @@ -147,4 +147,6 @@ | @@ -147,4 +147,6 @@ | ||
| 147 | </view> | 147 | </view> |
| 148 | <!-- 蒙尘 --> | 148 | <!-- 蒙尘 --> |
| 149 | <view wx:if="{{store}}" class="disgraceful" bindtap="onclickstore"></view> | 149 | <view wx:if="{{store}}" class="disgraceful" bindtap="onclickstore"></view> |
| 150 | -<warn id="warn"></warn> | ||
| 151 | \ No newline at end of file | 150 | \ No newline at end of file |
| 151 | +<warn id="warn"></warn> | ||
| 152 | +<!-- 制作一个圆球导航 --> | ||
| 153 | +<nav_b id="nav_b"></nav_b> | ||
| 152 | \ No newline at end of file | 154 | \ No newline at end of file |
pages/user/my_service/appment_main.wxss
| @@ -94,7 +94,6 @@ button { | @@ -94,7 +94,6 @@ button { | ||
| 94 | padding-right: 15rpx; | 94 | padding-right: 15rpx; |
| 95 | padding-top: 15rpx; | 95 | padding-top: 15rpx; |
| 96 | padding-bottom: 15rpx; | 96 | padding-bottom: 15rpx; |
| 97 | - color: rgb(172, 172, 172); | ||
| 98 | } | 97 | } |
| 99 | 98 | ||
| 100 | .mabot { | 99 | .mabot { |
| @@ -168,7 +167,7 @@ button { | @@ -168,7 +167,7 @@ button { | ||
| 168 | 167 | ||
| 169 | .disgraceful { | 168 | .disgraceful { |
| 170 | position: fixed; | 169 | position: fixed; |
| 171 | - z-index: 3; | 170 | + z-index: 4; |
| 172 | width: 100%; | 171 | width: 100%; |
| 173 | height: 100%; | 172 | height: 100%; |
| 174 | top: 0rpx; | 173 | top: 0rpx; |
| @@ -177,7 +176,7 @@ button { | @@ -177,7 +176,7 @@ button { | ||
| 177 | } | 176 | } |
| 178 | 177 | ||
| 179 | .storeList { | 178 | .storeList { |
| 180 | - z-index: 4; | 179 | + z-index: 5; |
| 181 | left: 0rpx; | 180 | left: 0rpx; |
| 182 | border-top-left-radius: 25rpx; | 181 | border-top-left-radius: 25rpx; |
| 183 | border-top-right-radius: 25rpx; | 182 | border-top-right-radius: 25rpx; |
pages/user/my_service/i_service.js
| @@ -46,8 +46,6 @@ Page({ | @@ -46,8 +46,6 @@ Page({ | ||
| 46 | */ | 46 | */ |
| 47 | onShow: function() { | 47 | onShow: function() { |
| 48 | var th = this; | 48 | var th = this; |
| 49 | - var nav_b = th.selectComponent("#nav_b"); //组件的id | ||
| 50 | - nav_b.close_box(); | ||
| 51 | var my_confirm = th.selectComponent("#my_confirm"); //组件的id | 49 | var my_confirm = th.selectComponent("#my_confirm"); //组件的id |
| 52 | my_confirm.open_cancel(0); | 50 | my_confirm.open_cancel(0); |
| 53 | }, | 51 | }, |
| @@ -99,8 +97,6 @@ Page({ | @@ -99,8 +97,6 @@ Page({ | ||
| 99 | title: '加载中', | 97 | title: '加载中', |
| 100 | }) | 98 | }) |
| 101 | var th = this; | 99 | var th = this; |
| 102 | - var nav_b = th.selectComponent("#nav_b"); //组件的id | ||
| 103 | - nav_b.close_box(); | ||
| 104 | var url = e.currentTarget.dataset.url; | 100 | var url = e.currentTarget.dataset.url; |
| 105 | var service_id = e.currentTarget.dataset.service_id; //服务id | 101 | var service_id = e.currentTarget.dataset.service_id; //服务id |
| 106 | var project_id = e.currentTarget.dataset.project_id; | 102 | var project_id = e.currentTarget.dataset.project_id; |
| @@ -179,8 +175,6 @@ Page({ | @@ -179,8 +175,6 @@ Page({ | ||
| 179 | //校正是否可预约 | 175 | //校正是否可预约 |
| 180 | correcting: function(e) { | 176 | correcting: function(e) { |
| 181 | var th = this; | 177 | var th = this; |
| 182 | - var nav_b = th.selectComponent("#nav_b"); //组件的id | ||
| 183 | - nav_b.close_box(); | ||
| 184 | wx.showLoading({ | 178 | wx.showLoading({ |
| 185 | title: '加载中', | 179 | title: '加载中', |
| 186 | }) | 180 | }) |
| @@ -250,6 +244,12 @@ Page({ | @@ -250,6 +244,12 @@ Page({ | ||
| 250 | } | 244 | } |
| 251 | }) | 245 | }) |
| 252 | } | 246 | } |
| 247 | + }, | ||
| 248 | + //关闭导航 | ||
| 249 | + close: function () { | ||
| 250 | + var th = this; | ||
| 251 | + var nav_b = th.selectComponent("#nav_b"); //组件的id | ||
| 252 | + nav_b.close_box(); | ||
| 253 | } | 253 | } |
| 254 | 254 | ||
| 255 | }) | 255 | }) |
| 256 | \ No newline at end of file | 256 | \ No newline at end of file |
pages/user/my_service/i_service.wxml
| 1 | <!-- 背景图片 --> | 1 | <!-- 背景图片 --> |
| 2 | -<view> | 2 | +<view catchtap="close"> |
| 3 | <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"></image> | 3 | <image class="backimage" src="{{iurl}}/miniapp/images/yyservice/backimage.png" lazy-load="true"></image> |
| 4 | <navigator class="History fs26" url="/pages/user/my_service/hist_service">历史服务</navigator> | 4 | <navigator class="History fs26" url="/pages/user/my_service/hist_service">历史服务</navigator> |
| 5 | </view> | 5 | </view> |
| 6 | 6 | ||
| 7 | <!-- 预约内容 --> | 7 | <!-- 预约内容 --> |
| 8 | <!-- 项目框架 --> | 8 | <!-- 项目框架 --> |
| 9 | -<view class="Serviceitems"> | 9 | +<view class="Serviceitems" catchtap="close"> |
| 10 | <!-- 单个项目 --> | 10 | <!-- 单个项目 --> |
| 11 | <view class="rel" wx:for="{{service_List}}"> | 11 | <view class="rel" wx:for="{{service_List}}"> |
| 12 | <view class="abs"> | 12 | <view class="abs"> |
pages/user/my_service/tment_details.js
| @@ -102,17 +102,9 @@ Page({ | @@ -102,17 +102,9 @@ Page({ | ||
| 102 | } | 102 | } |
| 103 | }) | 103 | }) |
| 104 | }, | 104 | }, |
| 105 | - close: function() { | ||
| 106 | - var th = this; | ||
| 107 | - var nav_b = th.selectComponent("#nav_b"); //组件的id | ||
| 108 | - nav_b.close_box(); | ||
| 109 | - }, | ||
| 110 | //显示核销码 | 105 | //显示核销码 |
| 111 | code_show: function(e) { | 106 | code_show: function(e) { |
| 112 | var th = this; | 107 | var th = this; |
| 113 | - th.close(); | ||
| 114 | - var nav_b = th.selectComponent("#nav_b"); //组件的id | ||
| 115 | - nav_b.close_box(); | ||
| 116 | //--获取成功的时候-- | 108 | //--获取成功的时候-- |
| 117 | var no = e.currentTarget.dataset.order_sn; | 109 | var no = e.currentTarget.dataset.order_sn; |
| 118 | var qc_com = th.selectComponent("#qc_com"); //组件的id | 110 | var qc_com = th.selectComponent("#qc_com"); //组件的id |
| @@ -125,7 +117,6 @@ Page({ | @@ -125,7 +117,6 @@ Page({ | ||
| 125 | //跳到首页 | 117 | //跳到首页 |
| 126 | goto: function(e) { | 118 | goto: function(e) { |
| 127 | var th = this; | 119 | var th = this; |
| 128 | - th.close(); | ||
| 129 | wx.switchTab({ | 120 | wx.switchTab({ |
| 130 | url: '/pages/index/index/index', | 121 | url: '/pages/index/index/index', |
| 131 | }) | 122 | }) |
| @@ -136,6 +127,11 @@ Page({ | @@ -136,6 +127,11 @@ Page({ | ||
| 136 | onShow: function() { | 127 | onShow: function() { |
| 137 | var th = this; | 128 | var th = this; |
| 138 | th.query_bea(); | 129 | th.query_bea(); |
| 139 | - th.close(); | ||
| 140 | }, | 130 | }, |
| 131 | + //关闭导航 | ||
| 132 | + close: function () { | ||
| 133 | + var th = this; | ||
| 134 | + var nav_b = th.selectComponent("#nav_b"); //组件的id | ||
| 135 | + nav_b.close_box(); | ||
| 136 | + } | ||
| 141 | }) | 137 | }) |
| 142 | \ No newline at end of file | 138 | \ No newline at end of file |
pages/user/my_service/tment_details.wxml
| 1 | -<view class="container" wx:for="{{tment_details}}" wx:if="{{index<1}}"> | 1 | +<view class="container" wx:for="{{tment_details}}" wx:if="{{index<1}}" catchtap="close"> |
| 2 | <!-- 预约人的属性 --> | 2 | <!-- 预约人的属性 --> |
| 3 | <view class="Subscriber padding"> | 3 | <view class="Subscriber padding"> |
| 4 | <!-- 状态栏 --> | 4 | <!-- 状态栏 --> |