Commit 40806557ec3ef1c74f8d8917d7508cbaa52f752b

Authored by DESKTOP-QHAFKU5\iceling
2 parents 12e92468 e63897b4

Merge branch 'dev' of http://git.vipzhuang.cn/wxd/MShopWeApp into dev

pages/user/my_service/tment_eval.wxml
... ... @@ -62,7 +62,7 @@
62 62 </view>
63 63 <view wx:if="{{labels.length>0 && is_evaluate==1}}" class="{{labels.length==1 || labels.length==2?'flex-center':''}}" style="width:100%;">
64 64 <view class="labels flex fs24 ellipsis-3">
65   - <view class="label {{item.check==1?'checklabel':''}} flex-center" wx:for="{{labels}}" bindtap="check_label" data-index="{{key}}" wx:for-index="key">
  65 + <view class="label checklabel flex-center" wx:for="{{labels}}" bindtap="check_label" data-index="{{key}}" wx:for-index="key">
66 66 <view class="ellipsis-1">{{item.LabelName}}</view>
67 67 </view>
68 68  
... ...
pages/user/my_service/tment_order_list.wxml
... ... @@ -73,7 +73,7 @@
73 73 <navigator wx:if="{{item.State==0}}" class="important Unimportance flex-level" url="/pages/user/my_service/beauty_deta?BeauticianID={{item.BeauticianID}}&number={{item.Number}}&itemId={{item.ServiceID}}&modify=1&projectId={{item.ProjectID}}">更改时间</navigator>
74 74 <navigator wx:if="{{item.State==1}}" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{0}}" class="important Unimportance flex-level">发表评价</navigator>
75 75 <navigator wx:if="{{item.State==2 || item.State==3}}" url="/pages/user/my_service/appment_main?ProjectID={{item.ProjectID}}&BuyType={{item.BuyType}}&service_id={{item.ServiceID}}" class="important Unimportance flex-level">重新预约</navigator>
76   - <navigator wx:if="{{item.State==4}}" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}" class="important Unimportance flex-level">查看评价</navigator>
  76 + <navigator wx:if="{{item.State==4}}" url="/pages/user/my_service/tment_eval?Number={{item.Number}}&evaluate={{1}}" class="important Unimportance flex-level">评价详情</navigator>
77 77 </view>
78 78 </view>
79 79 <view class="exactly flex-center fs26" wx:if="{{ismore && tm_order_list.length>=3}}">
... ...
pages/user/my_service/tment_order_list.wxss
... ... @@ -69,6 +69,8 @@ page {
69 69 width: 190rpx;
70 70 height: 190rpx;
71 71 margin-right: 20rpx;
  72 + border-radius: 50%;
  73 + border: 1px solid #eee;
72 74 }
73 75  
74 76 .details {
... ...