Commit 8710c85a4faac6de4662a2c6620e0721375945b4
1 parent
afafe562
部分样式修改
Showing
6 changed files
with
17 additions
and
11 deletions
pages/user/my_service/appment_main.js
| @@ -201,6 +201,9 @@ Page({ | @@ -201,6 +201,9 @@ Page({ | ||
| 201 | }, | 201 | }, |
| 202 | goto: function(e) { | 202 | goto: function(e) { |
| 203 | var th = this; | 203 | var th = this; |
| 204 | + th.setData({ | ||
| 205 | + beautician: 0 | ||
| 206 | + }) | ||
| 204 | if (th.data.store_name == "") { | 207 | if (th.data.store_name == "") { |
| 205 | getApp().my_warnning("请选择服务门店", 0, th); | 208 | getApp().my_warnning("请选择服务门店", 0, th); |
| 206 | } else if (th.data.beautician_name == "") { | 209 | } else if (th.data.beautician_name == "") { |
| @@ -330,9 +333,7 @@ Page({ | @@ -330,9 +333,7 @@ Page({ | ||
| 330 | } | 333 | } |
| 331 | } | 334 | } |
| 332 | } else { | 335 | } else { |
| 333 | - th.setData({ | ||
| 334 | - }) | ||
| 335 | - getApp().my_warnning(res.data.msg, 0, th); | 336 | + getApp().my_warnning("暂无美容师", 0, th); |
| 336 | } | 337 | } |
| 337 | }) | 338 | }) |
| 338 | } | 339 | } |
| @@ -383,7 +384,8 @@ Page({ | @@ -383,7 +384,8 @@ Page({ | ||
| 383 | nav_bea: function() { | 384 | nav_bea: function() { |
| 384 | var th = this; | 385 | var th = this; |
| 385 | th.setData({ | 386 | th.setData({ |
| 386 | - is_textea: 0 | 387 | + is_textea: 0, |
| 388 | + beautician: 0 | ||
| 387 | }) | 389 | }) |
| 388 | var storageId = th.data.storageId; //线下门店id | 390 | var storageId = th.data.storageId; //线下门店id |
| 389 | var itemId = th.data.itemId; //服务id | 391 | var itemId = th.data.itemId; //服务id |
pages/user/my_service/beauty_deta.wxml
| @@ -5,7 +5,7 @@ | @@ -5,7 +5,7 @@ | ||
| 5 | <!-- 个人信息 --> | 5 | <!-- 个人信息 --> |
| 6 | <view class="Personal"> | 6 | <view class="Personal"> |
| 7 | <view class="name fs36 ellipsis-1">{{name}}</view> | 7 | <view class="name fs36 ellipsis-1">{{name}}</view> |
| 8 | - <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> | 8 | + <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> |
| 9 | 9 | ||
| 10 | <view class="introduce fs26"> | 10 | <view class="introduce fs26"> |
| 11 | <block wx:if="{{comment!=''}}"> | 11 | <block wx:if="{{comment!=''}}"> |
pages/user/my_service/hist_service.wxml
| 1 | <view class="{{isPickerRender==true?'container':''}}"> | 1 | <view class="{{isPickerRender==true?'container':''}}"> |
| 2 | <!-- 点击方法 --> | 2 | <!-- 点击方法 --> |
| 3 | - <view class="exption flex-vertical-between fs28" wx:if="{{is_nav ||hist_List.length>0}}"> | 3 | + <view class="exption flex-vertical-between fs28" wx:if="{{is_nav || hist_List.length>0}}"> |
| 4 | <view class="flex"> | 4 | <view class="flex"> |
| 5 | 共使用 | 5 | 共使用 |
| 6 | <view class="count">{{total}}</view> | 6 | <view class="count">{{total}}</view> |
| @@ -25,7 +25,7 @@ | @@ -25,7 +25,7 @@ | ||
| 25 | <!-- left --> | 25 | <!-- left --> |
| 26 | <view> | 26 | <view> |
| 27 | <view class="flex fs28"> | 27 | <view class="flex fs28"> |
| 28 | - <view class="itemName ellipsis-1">{{item.StorageName==''?'匿名':item.StorageName}}</view> | 28 | + <view class="itemName ellipsis-1">{{item.ServiceName==''?'匿名':item.ServiceName}}</view> |
| 29 | <view>(美容师：</view> | 29 | <view>(美容师：</view> |
| 30 | <view class="itemUsna ellipsis-1">{{item.BeauticianName}}</view> | 30 | <view class="itemUsna ellipsis-1">{{item.BeauticianName}}</view> |
| 31 | ) | 31 | ) |
pages/user/my_service/i_service.js
| @@ -45,7 +45,10 @@ Page({ | @@ -45,7 +45,10 @@ Page({ | ||
| 45 | * 生命周期函数--监听页面显示 | 45 | * 生命周期函数--监听页面显示 |
| 46 | */ | 46 | */ |
| 47 | onShow: function() { | 47 | onShow: function() { |
| 48 | - | 48 | + var nav_b = th.selectComponent("#nav_b"); //组件的id |
| 49 | + nav_b.close_box(); | ||
| 50 | + var my_confirm = th.selectComponent("#my_confirm"); //组件的id | ||
| 51 | + my_confirm.open_cancel(0); | ||
| 49 | }, | 52 | }, |
| 50 | onReachBottom: function() { | 53 | onReachBottom: function() { |
| 51 | var th = this; | 54 | var th = this; |
| @@ -233,6 +236,7 @@ Page({ | @@ -233,6 +236,7 @@ Page({ | ||
| 233 | } | 236 | } |
| 234 | ) | 237 | ) |
| 235 | } else { | 238 | } else { |
| 239 | + nav_b.close_box(); | ||
| 236 | wx.navigateTo({ | 240 | wx.navigateTo({ |
| 237 | url: url, | 241 | url: url, |
| 238 | }) | 242 | }) |
pages/user/my_service/i_service.wxml
| @@ -56,7 +56,7 @@ | @@ -56,7 +56,7 @@ | ||
| 56 | </view> | 56 | </view> |
| 57 | <!-- 没有数据 --> | 57 | <!-- 没有数据 --> |
| 58 | <!-- 加载完毕并且数据大于=页大小 --> | 58 | <!-- 加载完毕并且数据大于=页大小 --> |
| 59 | - <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=pageSize}}"> | 59 | + <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=6}}"> |
| 60 | <view class="Line"></view> | 60 | <view class="Line"></view> |
| 61 | <view class="end fs26 xc-black">到底了</view> | 61 | <view class="end fs26 xc-black">到底了</view> |
| 62 | <view class="Line"></view> | 62 | <view class="Line"></view> |
pages/user/my_service/tment_details.wxss
| @@ -35,7 +35,7 @@ page { | @@ -35,7 +35,7 @@ page { | ||
| 35 | 35 | ||
| 36 | .container { | 36 | .container { |
| 37 | padding: 0rpx 20rpx; | 37 | padding: 0rpx 20rpx; |
| 38 | - padding-bottom:85rpx; | 38 | + padding-bottom:40rpx; |
| 39 | } | 39 | } |
| 40 | 40 | ||
| 41 | .Subscriber { | 41 | .Subscriber { |
| @@ -82,7 +82,7 @@ page { | @@ -82,7 +82,7 @@ page { | ||
| 82 | margin-bottom: 20rpx; | 82 | margin-bottom: 20rpx; |
| 83 | position: fixed; | 83 | position: fixed; |
| 84 | width: 705rpx; | 84 | width: 705rpx; |
| 85 | - bottom:60rpx; | 85 | + bottom:85rpx; |
| 86 | } | 86 | } |
| 87 | 87 | ||
| 88 | .sub { | 88 | .sub { |