From 6540edd5d111d0f7ef476e58d69b2c2294cfe28d Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 13 Apr 2026 18:13:23 +0800
Subject: [PATCH] feat:bug

---
 src/pages/canteen/components/product-total.vue  |  3 ++-
 src/pages/order/components/confirm-car-list.vue | 10 +++++++---
 src/pages/order/confirm.vue                     |  3 ++-
 src/sheep/api/merchant.ts                       |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/pages/canteen/components/product-total.vue b/src/pages/canteen/components/product-total.vue
index 82bd393..ee73c67 100644
--- a/src/pages/canteen/components/product-total.vue
+++ b/src/pages/canteen/components/product-total.vue
@@ -59,7 +59,8 @@ const doContainer = () => {
 						共{{ props.totCount }}件
 					</view>
 				</view>
-				<view class="flex items-center second-text-20 gap-5rpx">
+				<view v-if="takeOutSetting?.userTakeOutAmt > 0 || totalTakeOutPrice > 0"
+					class="flex items-center second-text-20 gap-5rpx">
 					<view class="font-size-22rpx">
 						另需配送费余¥{{ hooks.useMoney(takeOutSetting?.userTakeOutAmt ?? 0) }}
 					</view>
diff --git a/src/pages/order/components/confirm-car-list.vue b/src/pages/order/components/confirm-car-list.vue
index 630ab99..fc09aa5 100644
--- a/src/pages/order/components/confirm-car-list.vue
+++ b/src/pages/order/components/confirm-car-list.vue
@@ -6,14 +6,16 @@ import { filePath } from "@@/utils/file"
 export type Props = {
     mchName: string
     carList: any
+    takeOutSetting?: any
 }
 const props = withDefaults(defineProps<Props>(), {
     mchName: "未知商户",
     carList: [],
+    takeOutSetting: {},
 })
 
 const totalProductPrice = computed(() => {
-    return props.carList.reduce((pre, cur) => pre + cur.productCount, 0)
+    return props.carList.reduce((pre, cur) => pre + Number(cur.totalPrice), 0)
 })
 
 </script>
@@ -55,9 +57,11 @@ const totalProductPrice = computed(() => {
                 <view class="price-item-label">商品总价</view>
                 <view class="price-item-price">¥{{ hooks.useMoney(totalProductPrice) }}</view>
             </view>
-            <view class="price-item">
+            <view v-if="takeOutSetting?.userTakeOutAmt > 0" class="price-item">
                 <view class="price-item-label">配送费</view>
-                <view class="price-item-price">¥{{ hooks.useMoney(100) }}</view>
+                <view class="price-item-price">
+                    ¥{{ hooks.useMoney(takeOutSetting?.userTakeOutAmt ?? 0) }}
+                </view>
             </view>
         </view>
     </view>
diff --git a/src/pages/order/confirm.vue b/src/pages/order/confirm.vue
index b492f24..795e0b9 100644
--- a/src/pages/order/confirm.vue
+++ b/src/pages/order/confirm.vue
@@ -97,7 +97,8 @@
             </view>
         </view>
         <view class="h-20rpx" />
-        <confirm-car-list :mch-name="state.mchDetail?.name ?? '未知商户'" :car-list="state.cartList" />
+        <confirm-car-list :take-out-setting="state?.parentCar?.takeOutSettingJson"
+            :mch-name="state.mchDetail?.name ?? '未知商户'" :car-list="state.cartList" />
         <template #main-bottom>
             <view class="z-200 p-x-30rpx p-y-30rpx bg-white">
                 <view class="flex items-center justify-between">
diff --git a/src/sheep/api/merchant.ts b/src/sheep/api/merchant.ts
index f071073..024578b 100644
--- a/src/sheep/api/merchant.ts
+++ b/src/sheep/api/merchant.ts
@@ -41,7 +41,7 @@ export default {
 	 */
 	getOrCreateTakeOut: (params: any): Promise<any> =>
 		request({
-			url: "wallet/wallet-manage/get-or-create-take-out",
+			url: "wallet/wallet-manage/app/get-or-create-take-out",
 			method: "GET",
 			params: params,
 		}),