Commit 622c80393acef2ebb2ef9695818d9a1aa526795d
1 parent
f614cbbe
优化卡项评价
Showing
2 changed files
with
20 additions
and
5 deletions
packageB/pages/evaluate/evaluate.wxml
@@ -18,7 +18,13 @@ | @@ -18,7 +18,13 @@ | ||
18 | <view class="flex-center item" bindtap="show_goods" data-index="{{index}}"> | 18 | <view class="flex-center item" bindtap="show_goods" data-index="{{index}}"> |
19 | <view class="itemlf fs32 flex-level-right" wx:if="{{ftype==5 || ftype==4}}">卡项信息:</view> | 19 | <view class="itemlf fs32 flex-level-right" wx:if="{{ftype==5 || ftype==4}}">卡项信息:</view> |
20 | <view class="itemlf fs32 flex-level-right" wx:else>购买商品:</view> | 20 | <view class="itemlf fs32 flex-level-right" wx:else>购买商品:</view> |
21 | - <view class="itemlr fs30 ellipsis-2 go_right" style="position: relative;padding-right: 35rpx;">{{it.list[0].WareName?it.list[0].WareName:it.list[0].ItemName}}</view> | 21 | + <block wx:if="{{ftype==5 || ftype==4}}"> |
22 | + <view class="itemlr fs30 ellipsis-2 go_right" style="position: relative;padding-right: 35rpx;" wx:if="{{it.numberlist}}">{{it.numberlist[0].ItemName}}</view> | ||
23 | + <view class="itemlr fs30 ellipsis-2 go_right" style="position: relative;padding-right: 35rpx;" wx:else>{{it.list[0].WareName?it.list[0].WareName:it.list[0].ItemName}}</view> | ||
24 | + </block> | ||
25 | + <block wx:else> | ||
26 | + <view class="itemlr fs30 ellipsis-2 go_right" style="position: relative;padding-right: 35rpx;">{{it.list[0].WareName?it.list[0].WareName:it.list[0].ItemName}}</view> | ||
27 | + </block> | ||
22 | </view> | 28 | </view> |
23 | 29 | ||
24 | <!-- 时间 --> | 30 | <!-- 时间 --> |
@@ -138,11 +144,20 @@ | @@ -138,11 +144,20 @@ | ||
138 | <view class="title" wx:if="{{ftype==5 || ftype==4}}">卡项详情</view> | 144 | <view class="title" wx:if="{{ftype==5 || ftype==4}}">卡项详情</view> |
139 | <view class="title" wx:else>商品详情</view> | 145 | <view class="title" wx:else>商品详情</view> |
140 | <view style="padding: 0 20rpx;"> | 146 | <view style="padding: 0 20rpx;"> |
141 | - <block wx:if="{{ftype==5}}"> | ||
142 | - <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{beautician}}"> | 147 | + <block wx:if="{{ftype==5 || ftype==4}}"> |
148 | + <block wx:if="{{beautician.length==1 && beautician[0].numberlist && beautician[0].numberlist.length>0}}"> | ||
149 | + <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{beautician[0].numberlist}}"> | ||
143 | <view class="ellipsis-2">{{item.WareName?item.WareName:item.ItemName}}</view> | 150 | <view class="ellipsis-2">{{item.WareName?item.WareName:item.ItemName}}</view> |
144 | <!-- <view>{{item.Qty}}</view> --> | 151 | <!-- <view>{{item.Qty}}</view> --> |
145 | </view> | 152 | </view> |
153 | + </block> | ||
154 | + <block wx:else> | ||
155 | + <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{beautician}}"> | ||
156 | + <view class="ellipsis-2">{{item.WareName?item.WareName:item.ItemName}}</view> | ||
157 | + <!-- <view>{{item.Qty}}</view> --> | ||
158 | + </view> | ||
159 | + </block> | ||
160 | + | ||
146 | </block> | 161 | </block> |
147 | <block wx:else> | 162 | <block wx:else> |
148 | <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{show_goods_list}}"> | 163 | <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{show_goods_list}}"> |
packageB/pages/user/comment/comment.wxml
@@ -116,9 +116,9 @@ | @@ -116,9 +116,9 @@ | ||
116 | <view>查看评价</view> | 116 | <view>查看评价</view> |
117 | </navigator> | 117 | </navigator> |
118 | 118 | ||
119 | - <navigator wx:if="{{!item.comment_id}}" bindtap="comment" data-recid="{{item.rec_id}}" class="commodity_To_evaluate flex-level comment_go" url="/packageB/pages/user/add_comment/add_comment?card=1&goods_id={{item.card_id}}&order_id={{item.order_id}}&price={{item.price}}"> | 119 | + <navigator wx:if="{{!item.comment_id}}" data-recid="{{item.rec_id}}" class="commodity_To_evaluate flex-level comment_go" url="/packageB/pages/user/add_comment/add_comment?card=1&goods_id={{item.card_id}}&order_id={{item.order_id}}&price={{item.price}}"> |
120 | <view class="fs24">去评价</view> | 120 | <view class="fs24">去评价</view> |
121 | - </navigator> | 121 | + </navigator> |
122 | </view> | 122 | </view> |
123 | </view> | 123 | </view> |
124 | </view> | 124 | </view> |