From cb7f9908f77217cf28fc4e426f07cbbe1c477287 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Fri, 8 Mar 2024 21:09:06 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=EF=BC=9A=E9=85=92=E9=81=93?=
 =?UTF-8?q?=E9=A6=86=E5=95=86=E5=93=81=E8=B4=AD=E4=B9=B0=E4=B8=8B=E5=8D=95?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/users/order_confirm/index.vue | 46 +++++++++++++++++++++++++++--
 1 file changed, 44 insertions(+), 2 deletions(-)

diff --git a/pages/users/order_confirm/index.vue b/pages/users/order_confirm/index.vue
index 042edb7..fcb2178 100644
--- a/pages/users/order_confirm/index.vue
+++ b/pages/users/order_confirm/index.vue
@@ -367,6 +367,24 @@
 						</view>
 					</view>
 				</view>-->
+
+
+        <!-- 酒水卡积分抵扣明细 START-->
+        <view class='item acea-row row-between-wrapper integral-switch-content' v-if="order_type == 36">
+          <view>酒水卡积分抵扣：</view>
+          <view class='money wine-money'>
+            <view class="wine-line">
+              使用了{{orderTotalWineIntegral || 0 }}个酒水卡积分，抵扣<text class="pColor">{{orderTotalWineIntegralPrice || 0}}元</text>
+            </view>
+            <view class="wine-line">
+              剩余差价{{ orderTotalWineDiffMoney || 0 }}元，实际应付<text class="pColor">{{orderTotalWineDiffMoneyPrice || 0}}元</text>
+            </view>
+
+          </view>
+        </view>
+        <!-- 酒水卡积分抵扣明细 END-->
+
+
 				<!--<view class='item acea-row row-between-wrapper' v-if="!seckillId && order_type != 3 && order_type != 4 && enabledPlatformCoupon">
 					<view>平台优惠券<text @tap="showCoupon" class="iconfont icon-wenhao1"></text></view>
 					<block v-if="platformCoupon.length > 0">
@@ -548,6 +566,10 @@
 				coupon_price: 0, //优惠券抵扣金额
 				useIntegral: false, //是否使用积分
 				integral_price: 0, //积分抵扣金额
+        orderTotalWineIntegralPrice: 0,
+        orderTotalWineIntegral: '',
+        orderTotalWineDiffMoney: 0,
+        orderTotalWineDiffMoneyPrice: 0,
 				integral: 0,
 				ChangePrice: 0, //使用积分抵扣变动后的金额
 				formIds: [], //收集formid
@@ -566,7 +588,7 @@
 				priceGroup: {},
 				animated: false,
 				totalPrice: 0,
-				// use_integral: false,
+				use_integral: false,
         // use_mer_integral: false,// 是否使用商户积分
         // order_use_mer_integral: 0,// 使用的商户总积分
         // order_use_mer_integral_price: 0,// 商户积分抵扣的总金额
@@ -1046,6 +1068,13 @@
 					that.$set(that, 'coupon_price', res.data.order_coupon_price);
 					that.$set(that, 'integral_count', res.data.order_total_integral);
 					that.$set(that, 'integral_price', res.data.order_total_integral_price);
+
+          that.$set(that, 'orderTotalWineIntegral', res.data.orderTotalWineIntegral);
+          that.$set(that, 'orderTotalWineIntegralPrice', res.data.orderTotalWineIntegralPrice);
+          that.$set(that, 'orderTotalWineDiffMoney', res.data.orderTotalWineDiffMoney);
+          that.$set(that, 'orderTotalWineDiffMoneyPrice', res.data.orderTotalWineDiffMoneyPrice);
+
+
 					that.$set(that, 'open_integral', res.data.openIntegral);
 					that.$set(that, 'use_integral', res.data.useIntegral);
           // that.$set(that, 'use_mer_integral', res.data.useMerIntegral);
@@ -1671,7 +1700,20 @@
     }
   }
 }
-
+.wine-money{
+  display: inline-flex;
+  flex-direction: column;
+  flex-wrap: nowrap;
+  align-items: center;
+  justify-content: center;
+  width: 100%;
+  .wine-line{
+    width: 100%;
+    height: 50rpx;
+    line-height: 50rpx;
+    text-align: right;
+  }
+}
 
 
 	/deep/checkbox .uni-checkbox-input.uni-checkbox-input-checked,