导购退款评价优化

前端开发-罗建龙
1 parent 7f8c59db
Showing 2 changed files with 17 additions and 7 deletions
packageB/pages/evaluate/evaluate.js
packageB/pages/evaluate/evaluate.wxml
@@ -131,7 +131,7 @@ Page({
           data.map((item,i)=>{
             if (item.list && item.list.length>0) {
               item.list.map((ite,j)=>{
-                data[j].list[j].ItemName = item.ItemName
+                data[i].list[j].ItemName = item.ItemName
               })
             }
           })
@@ -16,7 +16,8 @@
  
   <!-- 项目 -->
   <view class="flex-center item" bindtap="show_goods" data-index="{{index}}">
-    <view class="itemlf fs32 flex-level-right">购买商品：</view>
+    <view class="itemlf fs32 flex-level-right" wx:if="{{ftype==5 || ftype==4}}">卡项信息：</view>
+    <view class="itemlf fs32 flex-level-right" wx:else>购买商品：</view>
     <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>
   </view>
  
@@ -134,12 +135,21 @@
 <view hidden="{{!sh_pop}}">
 	<view class="cover-layer" bindtap="close_pop"></view>
 	<view class="show_pop_div">
-		<view class="title">商品详情</view>
+		<view class="title" wx:if="{{ftype==5 || ftype==4}}">卡项详情</view>
+		<view class="title" wx:else>商品详情</view>
 		<view style="padding: 0 20rpx;">
-			<view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{show_goods_list}}">
-				<view class="ellipsis-2">{{item.WareName?item.WareName:item.ItemName}}</view>
-				<!-- <view>{{item.Qty}}</view> -->
-			</view>		
+      <block wx:if="{{ftype==5}}">
+        <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{beautician}}">
+          <view class="ellipsis-2">{{item.WareName?item.WareName:item.ItemName}}</view>
+          <!-- <view>{{item.Qty}}</view> -->
+        </view>		
+      </block>
+      <block wx:else>
+        <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{show_goods_list}}">
+          <view class="ellipsis-2">{{item.WareName?item.WareName:item.ItemName}}</view>
+          <!-- <view>{{item.Qty}}</view> -->
+        </view>		
+      </block>
 		</view>
 	</view>
 </view>