From 681535e94bd842a672729158235ac15159c9adae Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 24 Sep 2023 00:45:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=20vipPrice=20=E7=9A=84?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/goodList/index.vue       |  2 +-
 pages/goods_details/index.vue       |  2 +-
 pages/goods_list/index.vue          |  2 +-
 pages/users/order_confirm/index.vue | 10 +++++-----
 pages/users/order_list/index.vue    |  2 +-
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/components/goodList/index.vue b/components/goodList/index.vue
index 3d2054be..773952c7 100644
--- a/components/goodList/index.vue
+++ b/components/goodList/index.vue
@@ -12,7 +12,7 @@
 					<view class='text'>
 						<view class='line1'>{{ item.name }}</view>
 						<view class='money font-color'>￥<text class='num'>{{ fen2yuan(item.price) }}</text></view>
-						<view class='vip-money acea-row row-middle' v-if="item.vipPrice > 0">￥{{ fen2yuan(item.vipPrice || 0) }}
+						<view class='vip-money acea-row row-middle' v-if="item.vipPrice > 0">￥{{ fen2yuan(item.price - item.vipPrice) }}
 							<image src='../../static/images/vip.png'></image><text class='num'>已售{{ item.salesCount }}{{item.unitName}}</text>
 						</view>
 						<view class='vip-money acea-row row-middle' v-else><text class='num'>已售{{ item.salesCount }}{{item.unitName}}</text></view>
diff --git a/pages/goods_details/index.vue b/pages/goods_details/index.vue
index d74690f6..e13cbb22 100644
--- a/pages/goods_details/index.vue
+++ b/pages/goods_details/index.vue
@@ -29,7 +29,7 @@
 								<view class='money font-color'>
 									￥
 									<text class='num'>{{ fen2yuan(spu.price) }}</text>
-									<text class='vip-money' v-if="spu.vipPrice && spu.vipPrice > 0">￥{{ fen2yuan(spu.vipPrice) }}</text>
+									<text class='vip-money' v-if="spu.vipPrice && spu.vipPrice > 0">￥{{ fen2yuan(spu.price - spu.vipPrice) }}</text>
 									<image v-if="spu.vipPrice && spu.vipPrice > 0" src="../../static/images/vip.png" />
 								</view>
 								<view class='iconfont icon-fenxiang' @click="listenerActionSheet"></view>
diff --git a/pages/goods_list/index.vue b/pages/goods_list/index.vue
index 8c5b39e3..471cabac 100644
--- a/pages/goods_list/index.vue
+++ b/pages/goods_list/index.vue
@@ -50,7 +50,7 @@
 							<view class='money font-color' :class='is_switch?"":"on"'>￥<text
 									class='num'>{{ fen2yuan(item.price) }}</text></view>
 							<view class='vip acea-row row-between-wrapper' :class='is_switch?"":"on"'>
-								<view class='vip-money' v-if="item.vipPrice > 0">￥{{ fen2yuan(item.vipPrice) }}
+								<view class='vip-money' v-if="item.vipPrice > 0">￥{{ fen2yuan(item.price - item.vipPrice) }}
 									<image src='../../static/images/vip.png'></image>
 								</view>
 								<view>已售 {{ item.salesCount || 0}} {{item.unitName}}</view>
diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index a1bca3b3..b1a77e6f 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -70,12 +70,12 @@
 							</checkbox-group>
 						</view>
 					</view>
-          <!-- VIP 展示 TODO -->
-					<!-- <view class='item acea-row row-between-wrapper'
-						v-if="priceGroup.vipPrice > 0 && userInfo.vip && !pinkId && !BargainId && !combinationId && !seckillId">
+          <!-- VIP 展示 -->
+					<view class='item acea-row row-between-wrapper'
+						v-if="orderInfoVo.price.vipPrice > 0">
 						<view>会员优惠</view>
-						<view class='discount'>-￥{{priceGroup.vipPrice}}</view>
-					</view> -->
+						<view class='discount'>-￥{{ fen2yuan(orderInfoVo.price.vipPrice) }}</view>
+					</view>
           <!-- 配送展示 TODO -->
 					<view class='item acea-row row-between-wrapper' v-if='deliveryType === 1'>
 						<view>快递费用</view>
diff --git a/pages/users/order_list/index.vue b/pages/users/order_list/index.vue
index 08fd7ad3..e707d8a9 100644
--- a/pages/users/order_list/index.vue
+++ b/pages/users/order_list/index.vue
@@ -47,7 +47,7 @@
               <view v-if="order.status === 0" class="font-color">待付款</view>
               <view v-else-if="order.status === 10 && order.deliveryType === 1" class="font-color">待发货</view>
               <!-- TODO 芋艿：核销逻辑 -->
-              <view v-else-if="order._status === 10 && order.deliveryType === 2" class="font-color">待核销</view>
+              <view v-else-if="order.status === 10 && order.deliveryType === 2" class="font-color">待核销</view>
               <view v-else-if="order.status === 20" class="font-color">待收货</view>
               <view v-else-if="order.status === 30 && !order.commentStatus" class="font-color">待评价</view>
               <view v-else-if="order.status === 30 && order.commentStatus" class="font-color">已完成</view>