From 622c80393acef2ebb2ef9695818d9a1aa526795d Mon Sep 17 00:00:00 2001
From: luo <17530855@qq.com>
Date: Tue, 19 Mar 2024 16:58:07 +0800
Subject: [PATCH] 优化卡项评价

---
 packageB/pages/evaluate/evaluate.wxml    | 21 ++++++++++++++++++---
 packageB/pages/user/comment/comment.wxml |  4 ++--
 2 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/packageB/pages/evaluate/evaluate.wxml b/packageB/pages/evaluate/evaluate.wxml
index 63fb93e..889ab20 100644
--- a/packageB/pages/evaluate/evaluate.wxml
+++ b/packageB/pages/evaluate/evaluate.wxml
@@ -18,7 +18,13 @@
   <view class="flex-center item" bindtap="show_goods" data-index="{{index}}">
     <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>
+    <block wx:if="{{ftype==5 || ftype==4}}">
+      <view class="itemlr fs30 ellipsis-2 go_right" style="position: relative;padding-right: 35rpx;" wx:if="{{it.numberlist}}">{{it.numberlist[0].ItemName}}</view>
+      <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>
+    </block>
+    <block wx:else>
+      <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>   
+    </block>
   </view>
 
   <!-- 时间 -->
@@ -138,11 +144,20 @@
 		<view class="title" wx:if="{{ftype==5 || ftype==4}}">卡项详情</view>
 		<view class="title" wx:else>商品详情</view>
 		<view style="padding: 0 20rpx;">
-      <block wx:if="{{ftype==5}}">
-        <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{beautician}}">
+      <block wx:if="{{ftype==5 || ftype==4}}">
+        <block wx:if="{{beautician.length==1 && beautician[0].numberlist && beautician[0].numberlist.length>0}}">
+          <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{beautician[0].numberlist}}">
           <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="{{beautician}}">
+          <view class="ellipsis-2">{{item.WareName?item.WareName:item.ItemName}}</view>
+          <!-- <view>{{item.Qty}}</view> -->
+        </view>		
+        </block>
+
       </block>
       <block wx:else>
         <view class="flex jc_sb fs30" style="margin-top: 20rpx;" wx:for="{{show_goods_list}}">
diff --git a/packageB/pages/user/comment/comment.wxml b/packageB/pages/user/comment/comment.wxml
index 052d83d..48db6c6 100644
--- a/packageB/pages/user/comment/comment.wxml
+++ b/packageB/pages/user/comment/comment.wxml
@@ -116,9 +116,9 @@
             <view>查看评价</view>
           </navigator>
 
-          <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}}">
+          <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}}">
             <view class="fs24">去评价</view>
-          </navigator>
+          </navigator> 
         </view>
       </view>
     </view>
--
libgit2 0.21.4