From cd0c59aaf123885870ecfbc1501a584ddc215806 Mon Sep 17 00:00:00 2001
From: yvan.ni <765199919@qq.com>
Date: Wed, 11 Dec 2019 10:57:33 +0800
Subject: [PATCH] 商品列表活动价格优化

---
 components/goods_list/goods_list.wxml | 2 +-
 pages/goods/goodsList/goodsList.wxml  | 4 ++--
 pages/goods/search/search.wxml        | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/components/goods_list/goods_list.wxml b/components/goods_list/goods_list.wxml
index 8273aa9..f617993 100644
--- a/components/goods_list/goods_list.wxml
+++ b/components/goods_list/goods_list.wxml
@@ -17,7 +17,7 @@
               <!-- 活动价 -->
               <view class="flex xc-wc">
                 <view class="fs24">￥</view>
-                <view class="fs35">{{item.activity_price}}</view>
+                <view class="fs35">{{item.prom_price}}</view>
               </view>
             </view>
             <view class="flex" style="line-height: 28rpx;">
diff --git a/pages/goods/goodsList/goodsList.wxml b/pages/goods/goodsList/goodsList.wxml
index 15ae34e..475c134 100644
--- a/pages/goods/goodsList/goodsList.wxml
+++ b/pages/goods/goodsList/goodsList.wxml
@@ -38,9 +38,9 @@
       <view class="item-cont">
         <view class="title">{{item.goods_name}}</view>
         <!-- 判断是否有活动价 -->
-        <block wx:if="{{item.activity_price!=''}}">
+        <block wx:if="{{item.prom_price>0}}">
             <!-- 活动价 -->
-            <view class="price">￥{{item.activity_price}}</view>
+            <view class="price">￥{{item.prom_price}}</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>
diff --git a/pages/goods/search/search.wxml b/pages/goods/search/search.wxml
index 4802634..76062eb 100644
--- a/pages/goods/search/search.wxml
+++ b/pages/goods/search/search.wxml
@@ -35,9 +35,9 @@
       <view class="item-cont">
         <view class="title">{{item.goods_name}}</view>
         <!-- 判断是否有活动价 -->
-        <block wx:if="{{item.activity_price!=''}}">
+        <block wx:if="{{item.prom_price>0}}">
           <!-- 活动价 -->
-          <view class="price">￥{{item.activity_price}}</view>
+          <view class="price">￥{{item.prom_price}}</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