From ad97d5683c7dae0b66e8dbab943f11d70a987ff9 Mon Sep 17 00:00:00 2001
From: cjl520cy <8149487+cy250cy-520@user.noreply.gitee.com>
Date: Thu, 30 Apr 2026 11:17:25 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/home/components/filters.vue | 10 +++++-----
 pages/shop/buy-order.vue          |  3 ++-
 pages/shop/buyorder-detail.vue    |  6 +++++-
 pages/shop/userorder-detail.vue   |  5 ++++-
 pages/shop/userorders.vue         |  4 ++--
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/pages/home/components/filters.vue b/pages/home/components/filters.vue
index 2e70229..903fbaf 100644
--- a/pages/home/components/filters.vue
+++ b/pages/home/components/filters.vue
@@ -515,27 +515,27 @@
 				if (this.idType == 1) {
 					if (this.activeFirstId == 1) {
 						uni.navigateTo({
-							url:  `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}`,
+							url:  `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
 						});
 					}
 					if (this.activeFirstId == 2) {
 						uni.navigateTo({
-							url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2`,
+							url: `/pages/shop/userorder-detail?order_id=${order.id}&serviceType=2&haveButton=${this.haveButton}`,
 						});
 					}
 					if (this.activeFirstId == 3) {
 						uni.navigateTo({
-							url: `/pages/shop/SellerDetail?order_id=${order.id}`,
+							url: `/pages/shop/SellerDetail?order_id=${order.id}&haveButton=${this.haveButton}`,
 						});
 					}
 					if (this.activeFirstId == 4) {
 						uni.navigateTo({
-							url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}`,
+							url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&haveButton=${this.haveButton}`,
 						});
 					}
 					if (this.activeFirstId == 5) {
 						uni.navigateTo({
-							url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2`,
+							url: `/pages/shop/userorder-detail?order_id=${order.id}&order_kind=${order.order_kind}&serviceType=2&haveButton=${this.haveButton}`,
 						});
 					}
 				}
diff --git a/pages/shop/buy-order.vue b/pages/shop/buy-order.vue
index ceeb3a2..5ae0473 100644
--- a/pages/shop/buy-order.vue
+++ b/pages/shop/buy-order.vue
@@ -272,7 +272,8 @@
 			},
 
 			getDisplayPrice(order) {
-				const price = order.pay_money || order.order_money || 0
+				const price = Number(order.pay_money) || Number(order.order_money) || 0
+				
 				return Number(price).toFixed(2)
 			},
 
diff --git a/pages/shop/buyorder-detail.vue b/pages/shop/buyorder-detail.vue
index adf82db..5768e0a 100644
--- a/pages/shop/buyorder-detail.vue
+++ b/pages/shop/buyorder-detail.vue
@@ -82,7 +82,11 @@
 					</view>
 					<text class="service-count">×1</text>
 				</view>
-				<view class="service-real">
+				<view class="service-real" v-if="orderInfo.state==7 || orderInfo.state==1">
+					<text class="real-lable">应付金额：</text>
+					<text class="real-price">￥{{orderInfo.order_money}}</text>
+				</view>
+				<view class="service-real" v-else>
 					<text class="real-lable">实际支付金额：</text>
 					<text class="real-price">￥{{orderInfo.pay_money}}</text>
 				</view>
diff --git a/pages/shop/userorder-detail.vue b/pages/shop/userorder-detail.vue
index 4331ac0..80f8863 100644
--- a/pages/shop/userorder-detail.vue
+++ b/pages/shop/userorder-detail.vue
@@ -272,7 +272,7 @@
 		<!-- 底部按钮 -->
 
 		<view class="bottom-buttons"
-			v-if="haveButton && (orderInfo.state == 2) || orderInfo.state == 3 || orderInfo.state == 4">
+			v-if="haveButton && (orderInfo.state == 2 || orderInfo.state == 3 || orderInfo.state == 4)">
 			<!-- <view class="contact-button" @click="contactService(orderInfo.phone_user)">
 		  <image src="/static/images/tell_icon.png" class="tell-icon"></image>
 		  <text class="contact-text">联系TA</text>
@@ -370,6 +370,9 @@
 			if (options.push_id) {
 				this.messageRead(options.push_id)
 			}
+			if(options.haveButton){
+				this.haveButton = options.haveButton
+			}
 
 
 			// 添加调试日志
diff --git a/pages/shop/userorders.vue b/pages/shop/userorders.vue
index 26ae105..8acdbc3 100644
--- a/pages/shop/userorders.vue
+++ b/pages/shop/userorders.vue
@@ -265,10 +265,10 @@
 			// 去订单详情
 			goOrderDetail(item) {
 				let path = "";
-				path = `/pages/shop/userorder-detail?order_id=${item.id}&order_kind=${item.order_kind}`;
+				path = `/pages/shop/userorder-detail?order_id=${item.id}&order_kind=${item.order_kind}&haveButton=${this.haveButton}`;
 				if (item.table_source == "order_self") {
 					//如果是自营订单
-					path = `/pages/shop/userorder-detail?order_id=${item.id}&serviceType=2&order_kind=${item.order_kind}`;
+					path = `/pages/shop/userorder-detail?order_id=${item.id}&serviceType=2&order_kind=${item.order_kind}&haveButton=${this.haveButton}`;
 				}
 				uni.navigateTo({
 					url: path,