From d815fd5e3ff0dd96d30db222588df735f4fd661c Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Fri, 1 Mar 2024 18:48:32 +0800
Subject: [PATCH] =?UTF-8?q?bugfix=EF=BC=9A=E7=A1=AE=E8=AE=A4=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=A1=B5=E9=9D=A2=EF=BC=8C=E4=B8=8D=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E4=BC=98=E6=83=A0=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/order/confirm.vue | 11 +++++++++++
 pages/order/detail.vue  | 12 ++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/pages/order/confirm.vue b/pages/order/confirm.vue
index 7a945ab..69e7f4d 100644
--- a/pages/order/confirm.vue
+++ b/pages/order/confirm.vue
@@ -103,6 +103,17 @@
             <text class="_icon-forward item-icon" />
           </view>
         </view>
+        <view
+          class="order-item ss-flex ss-col-center ss-row-between"
+          v-if="state.orderInfo.price.vipPrice > 0"
+        >
+          <view class="item-title">会员优惠</view>
+          <view class="ss-flex ss-col-center">
+            <text class="item-value text-red">
+              -￥{{ fen2yuan(state.orderInfo.price.vipPrice) }}
+            </text>
+          </view>
+        </view>
       </view>
       <view class="total-box-footer ss-font-28 ss-flex ss-row-right ss-col-center ss-m-r-28">
         <view class="total-num ss-m-r-20">
diff --git a/pages/order/detail.vue b/pages/order/detail.vue
index 6b3025b..06f5e42 100644
--- a/pages/order/detail.vue
+++ b/pages/order/detail.vue
@@ -67,7 +67,7 @@
       class="detail-goods"
       :style="[{ marginTop: state.orderInfo.receiverAreaId > 0 ? '0' : '-40rpx' }]"
     >
-      <!-- 订单信息 TODO 芋艿： -->
+      <!-- 订单信 -->
       <view class="order-list" v-for="item in state.orderInfo.items" :key="item.goods_id">
         <view class="order-card">
           <s-goods-item
@@ -168,10 +168,18 @@
         <text class="detail">￥{{ fen2yuan(state.orderInfo.deliveryPrice) }}</text>
       </view>
       <!-- TODO 芋艿：优惠劵抵扣、积分抵扣 -->
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.couponPrice > 0">
+        <text class="title">优惠劵金额</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.couponPrice) }}</text>
+      </view>
       <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.discountPrice > 0">
-        <text class="title">优惠金额</text>
+        <text class="title">活动优惠</text>
         <text class="detail">¥{{ fen2yuan(state.orderInfo.discountPrice) }}</text>
       </view>
+      <view class="notice-item ss-flex ss-row-between" v-if="state.orderInfo.vipPrice > 0">
+        <text class="title">会员优惠</text>
+        <text class="detail">-¥{{ fen2yuan(state.orderInfo.vipPrice) }}</text>
+      </view>
       <view class="notice-item all-rpice-item ss-flex ss-m-t-20">
         <text class="title">{{ state.orderInfo.payStatus ? '已付款' : '需付款' }}</text>
         <text class="detail all-price">￥{{ fen2yuan(state.orderInfo.payPrice) }}</text>