From 71a287d373733f1bcbe57d37d10483ac3be52c6d Mon Sep 17 00:00:00 2001
From: YeMingfei666 <1619116647@qq.com>
Date: Wed, 19 Nov 2025 10:45:20 +0800
Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 http/yskApi/limitTimeDiscount.js              |  2 +-
 .../confirm-order/confirm-order.vue           | 44 ++++++++++++++++---
 pagesCreateOrder/util.js                      |  8 ++--
 pagesOrder/pay-order/pay-order.vue            |  1 +
 4 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/http/yskApi/limitTimeDiscount.js b/http/yskApi/limitTimeDiscount.js
index ec26b38..97d44a3 100644
--- a/http/yskApi/limitTimeDiscount.js
+++ b/http/yskApi/limitTimeDiscount.js
@@ -1,4 +1,4 @@
-import http from './http.js'
+import http from '@/http/yskApi/http.js'
 const request = http.request
 import {marketUrl} from './prveUrl.js'
 
diff --git a/pagesCreateOrder/confirm-order/confirm-order.vue b/pagesCreateOrder/confirm-order/confirm-order.vue
index 295936b..30bd21f 100644
--- a/pagesCreateOrder/confirm-order/confirm-order.vue
+++ b/pagesCreateOrder/confirm-order/confirm-order.vue
@@ -286,8 +286,8 @@
                   <template
                     v-else-if="
                       isVip &&
-                      item.salePrice &&
-                      item.salePrice * 1 != item.memberPrice * 1
+                      item.memberPrice &&
+                      item.memberPrice *1!=0
                     "
                   >
                     <text class="line-th color-999"
@@ -416,9 +416,14 @@
             v-if="orderCostSummary.totalDiscountAmount"
           >
             <view class="">优惠金额</view>
-            <view class="font-bold u-font-32"
+            <view class="font-bold u-font-32 u-m-r-16"
               >￥{{ orderCostSummary.totalDiscountAmount }}</view
             >
+            <up-icon
+              name="question-circle"
+              color="#666"
+              @click="showDiscountInfo = true"
+            ></up-icon>
           </view>
         </view>
 
@@ -466,6 +471,26 @@
       :ref="setModel"
       name="packNumber"
     ></pack-number>
+    <up-popup :show="showDiscountInfo" mode="center" round="16rpx" @close="showDiscountInfo = false"  closeOnClickOverlay >
+      <view class="u-p-30 u-flex u-flex-col gap-20" style="min-width: 300rpx;">
+        <view class="u-flex gap-20 u-row-between w-full" v-if="orderCostSummary.goodsDiscountAmount">
+          <text>商品优惠</text>
+          <text class="color-red">￥{{ orderCostSummary.goodsDiscountAmount }}</text>
+        </view>
+        <view class="u-flex gap-20 u-row-between w-full" v-if="orderCostSummary.newUserDiscount">
+          <text>新客立减</text>
+          <text class="color-red">￥{{ orderCostSummary.newUserDiscount }}</text>
+        </view>
+        <view class="u-flex gap-20 u-row-between w-full" v-if="orderCostSummary.fullReduction.actualAmount">
+          <text>满减活动</text>
+          <text class="color-red">￥{{ orderCostSummary.fullReduction.actualAmount }}</text>
+        </view>
+        <view class="u-flex gap-20 u-row-between w-full" v-if="orderCostSummary.vipDiscountAmount">
+          <text>会员折扣</text>
+          <text class="color-red">￥{{ orderCostSummary.vipDiscountAmount }}</text>
+        </view>
+      </view>
+    </up-popup>
     <!-- <edit-discount title="优惠金额" :ref="setModel" name="editMoney" :price="allPrice"></edit-discount> -->
   </view>
 </template>
@@ -509,7 +534,7 @@ import { discountActivity } from "@/http/yskApi/market/discountActivity.js";
 import BigNumber from "bignumber.js";
 import * as limitTimeDiscountApi from "@/http/yskApi/limitTimeDiscount.js";
 
-
+const showDiscountInfo=ref(false)
 const models = new Map();
 const modelData = reactive({
   data: {},
@@ -1228,9 +1253,8 @@ async function createAnOrder() {
     tableCode: pageData.table.tableCode, //台桌编码
     dineMode: pageData.eatTypes.active, //用餐模式 堂食 dine-in 外带 take-out 外卖 take-away
     remark: pageData.form.note, //备注
-    seatNum: 0, //用餐人数
-    packFee:
-      pageData.eatTypes.active == "dine-in" ? seatFeeConfig.personCount : 0, //打包费
+    seatNum:  pageData.eatTypes.active == "dine-in" ? seatFeeConfig.personCount : 0, //用餐人数
+    packFee:orderCostSummary.value.packFee, //打包费
     originAmount: orderCostSummary.value.goodsRealAmount, //订单原金额（不包含打包费+餐位费）
     placeNum: placeNum, //当前订单下单次数
     waitCall: 0, //是否等叫 0 否 1 等叫
@@ -1526,4 +1550,10 @@ watch(
   z-index: 9;
   color: #fff;
 }
+.u-row-between {
+  justify-content: space-between;
+}
+.w-full{
+  width: 100%;
+}
 </style>
\ No newline at end of file
diff --git a/pagesCreateOrder/util.js b/pagesCreateOrder/util.js
index c99b403..d66c250 100644
--- a/pagesCreateOrder/util.js
+++ b/pagesCreateOrder/util.js
@@ -13,11 +13,11 @@ export function getNowCart(carItem,goodsList,user) {
 			if(carItem.product_id == goodsItem.id){
 				goodsItem.skuList.map(item=>{
 					if(carItem.product_id == item.productId&&item.id==carItem.sku_id){
-						carItem.lowPrice = item.salePrice
+						carItem.lowPrice = item.lowPrice||item.salePrice
 						carItem.lowMemberPrice = item.memberPrice
 						carItem.memberPrice = item.memberPrice
 						carItem.specInfo = item.specInfo
-						carItem.salePrice = item.salePrice
+						carItem.salePrice = item.lowPrice
 						
 					}
 				})
@@ -34,8 +34,10 @@ export function getNowCart(carItem,goodsList,user) {
 		carItem.number = parseFloat(carItem.number)
 		carItem.name = carItem.product_name
 		carItem.lowPrice = carItem.discount_sale_amount
-		carItem.discount_sale_amount = 0
+		carItem.discount_sale_amount = carItem.discount_sale_amount?carItem.discount_sale_amount*1:0
+		carItem.discountSaleAmount = carItem.discount_sale_amount
 	}
+	console.log("carItem===",carItem)
 	
 	return carItem
 }
diff --git a/pagesOrder/pay-order/pay-order.vue b/pagesOrder/pay-order/pay-order.vue
index 6c65af0..9b416ca 100644
--- a/pagesOrder/pay-order/pay-order.vue
+++ b/pagesOrder/pay-order/pay-order.vue
@@ -982,6 +982,7 @@ watch(
   (newval) => {
     selCoupon.value = [];
     accountPoints.sel = false;
+    merchantReductionConfig.fixedAmount = 0;
     // 更新购物车和历史订单数据
     uodateCartAndHistory();
     if (newval) {