Commit c4b137429af9896de599f97f2d5f39f0835613e8
1 parent
cad074fd
忘记提交的美容师评级显示bug
Showing
3 changed files
with
21 additions
and
18 deletions
pages/user/my_service/cosmetology_list.wxml
@@ -2,9 +2,9 @@ | @@ -2,9 +2,9 @@ | ||
2 | <image class="appointment" src="{{iurl}}/miniapp/images/yyservice/Cosm_appo.png"></image> | 2 | <image class="appointment" src="{{iurl}}/miniapp/images/yyservice/Cosm_appo.png"></image> |
3 | 3 | ||
4 | <!-- 总预约 --> | 4 | <!-- 总预约 --> |
5 | - <view wx:if="{{true}}"> | 5 | + <view wx:if="{{cosmetology_list.length>0}}"> |
6 | <!-- 当个预约 --> | 6 | <!-- 当个预约 --> |
7 | - <view class="single" wx:for="{{cosmetology_list}}"> | 7 | + <view class="single" wx:for="{{cosmetology_list}}" wx:for-item="item"> |
8 | <!-- 个人属性 --> | 8 | <!-- 个人属性 --> |
9 | <view class="flex-vertical-between"> | 9 | <view class="flex-vertical-between"> |
10 | <view class="flex-vertical"> | 10 | <view class="flex-vertical"> |
@@ -14,21 +14,20 @@ | @@ -14,21 +14,20 @@ | ||
14 | <view class="UserName ellipsis-1 fs32">{{item.StaffName}}</view> | 14 | <view class="UserName ellipsis-1 fs32">{{item.StaffName}}</view> |
15 | <!-- 评价星数 --> | 15 | <!-- 评价星数 --> |
16 | <view class="flex" style="margin-top:10rpx;"> | 16 | <view class="flex" style="margin-top:10rpx;"> |
17 | - <image class="Stars" src="{{iurl}}{{key<item.Star || item.Star==''?'/miniapp/images/StarsredCk.png':'/miniapp/images/StarswhiteUnCk.png'}}" wx:for="{{item.Star==''?5:it.Star}}" wx:for-index="key" wx:for-item="it"></image> | 17 | + <image class="Stars" src="{{iurl}}{{key<item.Star || item.Star==''?'/miniapp/images/StarsredCk.png':'/miniapp/images/StarswhiteUnCk.png'}}" wx:for="{{item.Star==''?5:5}}" wx:for-index="key" wx:for-item="it"></image> |
18 | <!-- images/StarswhiteUnCk.png//白色星星地址 --> | 18 | <!-- images/StarswhiteUnCk.png//白色星星地址 --> |
19 | </view> | 19 | </view> |
20 | <!-- 个人标签 --> | 20 | <!-- 个人标签 --> |
21 | - <view class="Label fs22 flex" wx:if="{{item.EvaluationLabel!=''?true:false}} " wx:for="{{item.EvaluationLabel.split('|')}}"> | ||
22 | - <view wx:if="{{index==0}}" class="flex-center Labelitem itone"> | ||
23 | - <view>{{item}}</view> | 21 | + <view class="Labels fs22 flex" wx:if="{{item.EvaluationLabel!=''?true:false}} "> |
22 | + <view wx:if="{{lab<3}}" class="flex-center Labelitem itone {{lab==1?'itwo':''}} {{lab==2?ith:''}}" wx:for="{{item.EvaluationLabel}}" wx:for-item="it" wx:for-index="lab"> | ||
23 | + <view class="ellipsis-1">{{it.LabelName}}</view> | ||
24 | </view> | 24 | </view> |
25 | - <view wx:if="{{index==1}}" class="flex-center Labelitem itwo"> | ||
26 | - <view>{{item}}</view> | 25 | + <!-- <view wx:if="{{lab==1}}" class="flex-center Labelitem itwo"> |
26 | + <view class="ellipsis-1">{{it.LabelName}}</view> | ||
27 | </view> | 27 | </view> |
28 | - <view wx:if="{{index==2}}" class="flex-center Labelitem ith"> | ||
29 | - <view>{{item}}</view> | ||
30 | - </view> | ||
31 | - | 28 | + <view wx:if="{{lab==2}}" class="flex-center Labelitem ith"> |
29 | + <view class="ellipsis-1">{{it.LabelName}}</view> | ||
30 | + </view> --> | ||
32 | </view> | 31 | </view> |
33 | </view> | 32 | </view> |
34 | </view> | 33 | </view> |
@@ -50,7 +49,7 @@ | @@ -50,7 +49,7 @@ | ||
50 | </view> | 49 | </view> |
51 | <!-- 没有数据 --> | 50 | <!-- 没有数据 --> |
52 | <!-- 加载完毕并且数据大于=页大小 --> | 51 | <!-- 加载完毕并且数据大于=页大小 --> |
53 | - <view class="After_all flex-center" wx:if="{{ismore && service_List.length>=4}}"> | 52 | + <view class="After_all flex-center" wx:if="{{ismore && cosmetology_list.length>=4}}"> |
54 | <view class="Line"></view> | 53 | <view class="Line"></view> |
55 | <view class="end fs26 xc-black">到底了</view> | 54 | <view class="end fs26 xc-black">到底了</view> |
56 | <view class="Line"></view> | 55 | <view class="Line"></view> |
pages/user/my_service/cosmetology_list.wxss
@@ -32,7 +32,10 @@ page{ | @@ -32,7 +32,10 @@ page{ | ||
32 | height: 25rpx; | 32 | height: 25rpx; |
33 | margin-right: 7rpx; | 33 | margin-right: 7rpx; |
34 | } | 34 | } |
35 | - | 35 | +.Labels{ |
36 | + width: 100%; | ||
37 | + margin-top: 15rpx; | ||
38 | +} | ||
36 | .Label { | 39 | .Label { |
37 | margin-top: 25rpx; | 40 | margin-top: 25rpx; |
38 | } | 41 | } |
@@ -43,6 +46,7 @@ page{ | @@ -43,6 +46,7 @@ page{ | ||
43 | border-radius: 20rpx; | 46 | border-radius: 20rpx; |
44 | line-height: 30rpx; | 47 | line-height: 30rpx; |
45 | margin-right: 14rpx; | 48 | margin-right: 14rpx; |
49 | + padding:0rpx 10rpx; | ||
46 | } | 50 | } |
47 | 51 | ||
48 | .itone { | 52 | .itone { |
pages/user/my_service/tment_eval.js
@@ -179,14 +179,14 @@ Page({ | @@ -179,14 +179,14 @@ Page({ | ||
179 | }, // 设置请求的 header | 179 | }, // 设置请求的 header |
180 | success: function(res) { | 180 | success: function(res) { |
181 | if (res.data.code == 0) { | 181 | if (res.data.code == 0) { |
182 | + th.setData({ | ||
183 | + sub_evaluate: 1 | ||
184 | + }) | ||
182 | setTimeout(function() { | 185 | setTimeout(function() { |
183 | - th.setData({ | ||
184 | - sub_evaluate: 1 | ||
185 | - }) | ||
186 | wx.redirectTo({ | 186 | wx.redirectTo({ |
187 | url: "/pages/user/my_service/tment_order_list" | 187 | url: "/pages/user/my_service/tment_order_list" |
188 | }); | 188 | }); |
189 | - }, 2000); | 189 | + }, 2500); |
190 | } else { | 190 | } else { |
191 | getApp().my_warnning(res.data.msg, 0, th); | 191 | getApp().my_warnning(res.data.msg, 0, th); |
192 | } | 192 | } |