Commit 2900d3f73c0fcfe1f496dbdc591c21499079dfec
1 parent
7f8c59db
导购退款评价优化
Showing
2 changed files
with
17 additions
and
7 deletions
packageB/pages/evaluate/evaluate.js
| @@ -131,7 +131,7 @@ Page({ | @@ -131,7 +131,7 @@ Page({ | ||
| 131 | data.map((item,i)=>{ | 131 | data.map((item,i)=>{ |
| 132 | if (item.list && item.list.length>0) { | 132 | if (item.list && item.list.length>0) { |
| 133 | item.list.map((ite,j)=>{ | 133 | item.list.map((ite,j)=>{ |
| 134 | - data[j].list[j].ItemName = item.ItemName | 134 | + data[i].list[j].ItemName = item.ItemName |
| 135 | }) | 135 | }) |
| 136 | } | 136 | } |
| 137 | }) | 137 | }) |
packageB/pages/evaluate/evaluate.wxml
| @@ -16,7 +16,8 @@ | @@ -16,7 +16,8 @@ | ||
| 16 | 16 | ||
| 17 | <!-- 项目 --> | 17 | <!-- 项目 --> |
| 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">购买商品：</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="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 | <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 | </view> | 22 | </view> |
| 22 | 23 | ||
| @@ -134,12 +135,21 @@ | @@ -134,12 +135,21 @@ | ||
| 134 | <view hidden="{{!sh_pop}}"> | 135 | <view hidden="{{!sh_pop}}"> |
| 135 | <view class="cover-layer" bindtap="close_pop"></view> | 136 | <view class="cover-layer" bindtap="close_pop"></view> |
| 136 | <view class="show_pop_div"> | 137 | <view class="show_pop_div"> |
| 137 | - <view class="title">商品详情</view> | 138 | + <view class="title" wx:if="{{ftype==5 || ftype==4}}">卡项详情</view> |
| 139 | + <view class="title" wx:else>商品详情</view> | ||
| 138 | <view style="padding: 0 20rpx;"> | 140 | <view style="padding: 0 20rpx;"> |
| 139 | - <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{show_goods_list}}"> | ||
| 140 | - <view class="ellipsis-2">{{item.WareName?item.WareName:item.ItemName}}</view> | ||
| 141 | - <!-- <view>{{item.Qty}}</view> --> | ||
| 142 | - </view> | 141 | + <block wx:if="{{ftype==5}}"> |
| 142 | + <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{beautician}}"> | ||
| 143 | + <view class="ellipsis-2">{{item.WareName?item.WareName:item.ItemName}}</view> | ||
| 144 | + <!-- <view>{{item.Qty}}</view> --> | ||
| 145 | + </view> | ||
| 146 | + </block> | ||
| 147 | + <block wx:else> | ||
| 148 | + <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{show_goods_list}}"> | ||
| 149 | + <view class="ellipsis-2">{{item.WareName?item.WareName:item.ItemName}}</view> | ||
| 150 | + <!-- <view>{{item.Qty}}</view> --> | ||
| 151 | + </view> | ||
| 152 | + </block> | ||
| 143 | </view> | 153 | </view> |
| 144 | </view> | 154 | </view> |
| 145 | </view> | 155 | </view> |