From 4ab7123653d103e88982478381bd29d56734dcf3 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Mon, 2 Nov 2020 09:40:11 +0800
Subject: [PATCH] 1.  分类风格3显示积分价格！！

---
 pages/goods/categoryList/categoryList.wxml | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pages/goods/categoryList/categoryList.wxml b/pages/goods/categoryList/categoryList.wxml
index 163c5fc..4a87b11 100644
--- a/pages/goods/categoryList/categoryList.wxml
+++ b/pages/goods/categoryList/categoryList.wxml
@@ -411,9 +411,13 @@
                         <view class="item-cont">
                           <view class="title">{{item.goods_name}}</view>
                             <!-- 判断是否有活动价 -->
-                            <block wx:if="{{item.prom_price>0}}">
+                            <block wx:if="{{item.prom_price>0 || item.prom_integral}}">
                                 <!-- 活动价 -->
-                                <view class="price">￥{{item.prom_price}}</view>
+                                <view class="price">
+									<text wx:if="{{item.prom_integral}}">{{item.prom_integral}}积分</text>
+									<text wx:if="{{item.prom_integral && item.prom_price}}">+</text> 
+									<text wx:if="{{item.prom_price}}">￥{{item.prom_price}}</text> 							
+								</view>
                                 <view class="comment flex jc_sb">
                                   <view class="word-line xc-ash">￥{{item.market_price}}</view>
                                   <view>评论{{item.comment_count}} 已售{{item.sales_sum}}</view>
--
libgit2 0.21.4