From 609f70afc707edb84b423e4db8c6028ce6fabc57 Mon Sep 17 00:00:00 2001
From: taiyuan <taiyuan@yolipai.com>
Date: Thu, 8 Apr 2021 15:03:34 +0800
Subject: [PATCH] 上下架价格显示修改

---
 packageA/pages/distribution/goods/goods.wxml | 255 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++--
 packageA/pages/distribution/goods/goods.wxss |   4 ++++
 2 files changed, 257 insertions(+), 2 deletions(-)

diff --git a/packageA/pages/distribution/goods/goods.wxml b/packageA/pages/distribution/goods/goods.wxml
index 5148403..4d6b65b 100644
--- a/packageA/pages/distribution/goods/goods.wxml
+++ b/packageA/pages/distribution/goods/goods.wxml
@@ -1,3 +1,4 @@
+<wxs src="../../../../utils/filter.wxs" module="filter"></wxs>
 <view>
 	<view class="head pr">
 		<!-- 搜索 -->
@@ -78,7 +79,132 @@
 					<view class="flex fdc jc_sb">
 						<view class="ellipsis-2">{{item.goods_name}}</view>
 						<view>
-							<view class="money fs32 c-red">{{item.market_price}}</view>
+							<!-- 判断是否有活动价 -->
+							<block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
+							  <view class="flex xc-wc ai-center" >
+										  <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>	
+										  <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>	
+							    <!-- 活动价 -->
+							    <view class="flex xc-wc ai-center" wx:if="{{item.prom_price}}">
+							      <view class="fs24">￥</view>
+							      <view class="fs35">{{item.prom_price}}</view>
+							    </view>
+							  </view>
+							  <view class="flex" style="line-height: 28rpx;">
+							    <!-- 原价 -->
+							    <view class="price flex xc-ash line_th">
+							      <view class="fs22">￥</view>
+							      <view class="fs22">{{item.market_price}}</view>
+							    </view>
+							  </view>
+							</block>
+							<block wx:else>
+							  <!-- 商品价格,先判断下是后⼜等级价-->
+							  <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+							    <!-- 当会员是等级卡的时候 -->
+							    <block wx:if="{{card_field}}">
+							      <!-- 等级价>0 -->
+							      <block wx:if="{{item[card_field]>0}}">
+							        <view class="flex">
+							          <!-- 办卡价 -->
+							          <view class="flex xc-wc ai-center">
+							            <view class="fs24">￥</view>
+							            <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
+							            <view class="card_bg ellipsis-1">
+							              <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+							              <text class="card_name">{{card_name}}</text>
+							            </view>
+							          </view>
+							        </view>
+							        <view class="flex" style="line-height: 28rpx;">
+							          <!-- 原价 -->
+							          <view class="price flex xc-ash line_th">
+							            <view class="fs22">￥</view>
+							            <view class="fs22">{{item.market_price}}</view>
+							          </view>
+							        </view>
+							      </block>
+							      <blocK wx:else>
+							        <view class="flex">
+							          <!-- 办卡价 -->
+							          <view class="flex xc-wc ai-center">
+							            <view class="fs24">￥</view>
+							            <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							          </view>
+							        </view>
+							        <view class="flex" style="line-height: 28rpx;">
+							          <!-- 原价 -->
+							          <view class="price flex xc-ash line_th">
+							            <view class="fs22">￥</view>
+							            <view class="fs22">{{item.market_price}}</view>
+							          </view>
+							        </view>
+							      </blocK>
+							    </block>
+							    <block wx:else>
+							      <!-- 如果商品有设置等级价⼤于0的 -->
+							      <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+							        <view class="flex">
+							          <!-- 办卡价 -->
+							          <view class="flex xc-wc ai-center">
+							            <view class="fs24">￥</view>
+							            <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							          </view>
+							          <!-- 原价 -->
+							          <view class="price flex xc-ash line_th">
+							            <view class="fs22">￥</view>
+							            <view class="fs22">{{item.market_price}}</view>
+							          </view>
+							        </view>
+							        <view class="flexr" style="">
+							          <!-- 等级价 -->
+																	<view class="price flex ai-center">
+																	  <view class="fs22">￥</view>
+																	  <view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+																	  <view class="card_bg ellipsis-1">
+																	    <image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>
+																			<text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+																		</view>
+																	</view>
+							        </view>
+							      </block>
+							      <block wx:else>
+							        <view class="flex">
+							          <!-- 办卡价 -->
+							          <view class="flex xc-wc ai-center">
+							            <view class="fs24">￥</view>
+							            <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							          </view>
+							        </view>
+							        <view class="flex" style="line-height: 28rpx;">
+							          <!-- 原价 -->
+							          <view class="price flex xc-ash line_th">
+							            <view class="fs22">￥</view>
+							            <view class="fs22">{{item.market_price}}</view>
+							          </view>
+							        </view>
+							      </block>
+							    </block>
+							  </block>
+							  <!-- 商品压根就没有等级价 -->
+							  <block wx:else>
+							    <view class="flex">
+							      <!-- 办卡价 -->
+							      <view class="flex xc-wc ai-center">
+							        <view class="fs24">￥</view>
+							        <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							      </view>
+							    </view>
+							    <view class="flex" style="line-height: 28rpx;">
+							      <!-- 原价 -->
+							      <view class="price flex xc-ash line_th">
+							        <view class="fs22">￥</view>
+							        <view class="fs22">{{item.market_price}}</view>
+							      </view>
+							    </view>
+							  </block>
+							</block>
+							<!-- <view class="money fs32 c-red">{{item.market_price}}</view> -->
 							<view class="fs24 c-a">分成金额：<text class="money c-red">{{item.commission}}</text></view>
 						</view>
 					</view>
@@ -94,7 +220,132 @@
 					<view class="flex ai-center jc_sb pdt20">
 						<checkbox value="{{item.goods_id}}" checked="{{item.checked}}" data-name="checkbox"/>
 						<view class="t-r">
-							<view class="money c-red fs32">{{item.market_price}}</view>
+							<!-- 判断是否有活动价 -->
+							<block wx:if="{{item.prom_price>0 || item.prom_integral>0}}">
+							  <view class="flex xc-wc ai-center" >
+										  <text wx:if="{{item.prom_integral}}"><text class="fs35" style="font-weight: bold;">{{item.prom_integral}}</text>积分</text>	
+										  <text wx:if="{{item.prom_integral && item.prom_price}}">+</text>	
+							    <!-- 活动价 -->
+							    <view class="flex xc-wc ai-center" wx:if="{{item.prom_price}}">
+							      <view class="fs24">￥</view>
+							      <view class="fs35">{{item.prom_price}}</view>
+							    </view>
+							  </view>
+							  <view class="flex" style="line-height: 28rpx;">
+							    <!-- 原价 -->
+							    <view class="price flex xc-ash line_th">
+							      <view class="fs22">￥</view>
+							      <view class="fs22">{{item.market_price}}</view>
+							    </view>
+							  </view>
+							</block>
+							<block wx:else>
+							  <!-- 商品价格,先判断下是后⼜等级价-->
+							  <block wx:if="{{g_filter.is_has_rank(rank_switch,item)}}">
+							    <!-- 当会员是等级卡的时候 -->
+							    <block wx:if="{{card_field}}">
+							      <!-- 等级价>0 -->
+							      <block wx:if="{{item[card_field]>0}}">
+							        <view class="flex">
+							          <!-- 办卡价 -->
+							          <view class="flex xc-wc ai-center">
+							            <view class="fs24">￥</view>
+							            <view class="fs35">{{filter.toFix(item[card_field],2)}}</view>
+							            <view class="card_bg ellipsis-1">
+							              <image src="{{url}}/miniapp/images/plus/dj_icon.png"></image>
+							              <text class="card_name">{{card_name}}</text>
+							            </view>
+							          </view>
+							        </view>
+							        <view class="flex" style="line-height: 28rpx;">
+							          <!-- 原价 -->
+							          <view class="price flex xc-ash line_th">
+							            <view class="fs22">￥</view>
+							            <view class="fs22">{{item.market_price}}</view>
+							          </view>
+							        </view>
+							      </block>
+							      <blocK wx:else>
+							        <view class="flex">
+							          <!-- 办卡价 -->
+							          <view class="flex xc-wc ai-center">
+							            <view class="fs24">￥</view>
+							            <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							          </view>
+							        </view>
+							        <view class="flex" style="line-height: 28rpx;">
+							          <!-- 原价 -->
+							          <view class="price flex xc-ash line_th">
+							            <view class="fs22">￥</view>
+							            <view class="fs22">{{item.market_price}}</view>
+							          </view>
+							        </view>
+							      </blocK>
+							    </block>
+							    <block wx:else>
+							      <!-- 如果商品有设置等级价⼤于0的 -->
+							      <block wx:if="{{g_filter.get_card_price(item,card_list,0)}}">
+							        <view class="flex">
+							          <!-- 办卡价 -->
+							          <view class="flex xc-wc ai-center">
+							            <view class="fs24">￥</view>
+							            <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							          </view>
+							          <!-- 原价 -->
+							          <view class="price flex xc-ash line_th">
+							            <view class="fs22">￥</view>
+							            <view class="fs22">{{item.market_price}}</view>
+							          </view>
+							        </view>
+							        <view class="flexr" style="">
+							          <!-- 等级价 -->
+													<view class="price flex ai-center">
+														<view class="fs22">￥</view>
+														<view class="fs28">{{filter.toFix(g_filter.get_card_price(item,card_list,0),2)}}</view>
+														<view class="card_bg ellipsis-1">
+															<image src="{{url}}/miniapp/images/plus/dj_icon.png"></ image>
+															<text class="card_name">{{g_filter.get_card_price(item,card_list,1)}}</text>
+														</view>
+													</view>
+							        </view>
+							      </block>
+							      <block wx:else>
+							        <view class="flex">
+							          <!-- 办卡价 -->
+							          <view class="flex xc-wc ai-center">
+							            <view class="fs24">￥</view>
+							            <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							          </view>
+							        </view>
+							        <view class="flex" style="line-height: 28rpx;">
+							          <!-- 原价 -->
+							          <view class="price flex xc-ash line_th">
+							            <view class="fs22">￥</view>
+							            <view class="fs22">{{item.market_price}}</view>
+							          </view>
+							        </view>
+							      </block>
+							    </block>
+							  </block>
+							  <!-- 商品压根就没有等级价 -->
+							  <block wx:else>
+							    <view class="flex">
+							      <!-- 办卡价 -->
+							      <view class="flex xc-wc ai-center">
+							        <view class="fs24">￥</view>
+							        <view class="fs35">{{filter.toFix(item.shop_price,2)}}</view>
+							      </view>
+							    </view>
+							    <view class="flex" style="line-height: 28rpx;">
+							      <!-- 原价 -->
+							      <view class="price flex xc-ash line_th">
+							        <view class="fs22">￥</view>
+							        <view class="fs22">{{item.market_price}}</view>
+							      </view>
+							    </view>
+							  </block>
+							</block>
+							<!-- <view class="money c-red fs32">{{item.market_price}}</view> -->
 							<view class="c-a">分成金额：<text class="money c-red">{{item.commission}}</text></view>
 						</view>
 					</view>
diff --git a/packageA/pages/distribution/goods/goods.wxss b/packageA/pages/distribution/goods/goods.wxss
index 8a17232..ca41eec 100644
--- a/packageA/pages/distribution/goods/goods.wxss
+++ b/packageA/pages/distribution/goods/goods.wxss
@@ -324,5 +324,9 @@ checkbox .wx-checkbox-input.wx-checkbox-input-checked::before {
 	border: 2rpx solid #FF6768;
 }
 
+.line_th {
+  text-decoration: line-through;
+}
+
 
 
--
libgit2 0.21.4