From 738bd4a2a2b83cf272f4ccc0b8c73b3f26521dba Mon Sep 17 00:00:00 2001
From: lzx_win <2602107437@qq.com>
Date: Sun, 28 Sep 2025 14:57:28 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=94=AF=E4=BB=98):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=94=AF=E4=BB=98=E5=8F=82=E6=95=B0package?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E7=9A=84=E5=85=BC=E5=AE=B9=E6=80=A7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修改多个支付相关页面，将package参数从仅使用package_改为优先使用package_，若无则使用packageValue
同时更新开发环境配置，将current改为release并调整开发环境API地址
---
 pages/details/confirm.vue                                  | 2 +-
 pages/newOrder/confirmOrder.vue                            | 2 +-
 pages/newOrder修改价格计算0714/confirmOrder.vue      | 2 +-
 pages/newOrder备份/confirmOrder.vue                      | 2 +-
 pages/newOrder完成自动选择优惠劵/confirmOrder.vue | 2 +-
 pages_order/order/orderDetail.vue                          | 2 +-
 pages_order/order/orderList.vue                            | 3 ++-
 utils/getUrl.js                                            | 4 ++--
 8 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/pages/details/confirm.vue b/pages/details/confirm.vue
index 799885c..302e9bc 100644
--- a/pages/details/confirm.vue
+++ b/pages/details/confirm.vue
@@ -200,7 +200,7 @@
 					provider: 'wxpay',
 					timeStamp: params.timeStamp,
 					nonceStr: params.nonceStr,
-					package: params.package_,
+					package: params.package_ || params.packageValue,
 					signType: params.signType,
 					paySign: params.paySign,
 					success: (res) => {
diff --git a/pages/newOrder/confirmOrder.vue b/pages/newOrder/confirmOrder.vue
index 25e1b20..f987762 100644
--- a/pages/newOrder/confirmOrder.vue
+++ b/pages/newOrder/confirmOrder.vue
@@ -943,7 +943,7 @@
 					provider: 'wxpay',
 					timeStamp: params.timeStamp,
 					nonceStr: params.nonceStr,
-					package: params.package_,
+					package: params.package_ || params.packageValue,
 					signType: params.signType,
 					paySign: params.paySign,
 					success: (res) => {
diff --git a/pages/newOrder修改价格计算0714/confirmOrder.vue b/pages/newOrder修改价格计算0714/confirmOrder.vue
index cb77963..84a6f19 100644
--- a/pages/newOrder修改价格计算0714/confirmOrder.vue
+++ b/pages/newOrder修改价格计算0714/confirmOrder.vue
@@ -927,7 +927,7 @@ import PriceCalculator from '@/utils/priceCalculator.js'
 					provider: 'wxpay',
 					timeStamp: params.timeStamp,
 					nonceStr: params.nonceStr,
-					package: params.package_,
+					package: params.package_ || params.packageValue,
 					signType: params.signType,
 					paySign: params.paySign,
 					success: (res) => {
diff --git a/pages/newOrder备份/confirmOrder.vue b/pages/newOrder备份/confirmOrder.vue
index 4c4cb4b..a38c300 100644
--- a/pages/newOrder备份/confirmOrder.vue
+++ b/pages/newOrder备份/confirmOrder.vue
@@ -732,7 +732,7 @@
 					provider: 'wxpay',
 					timeStamp: params.timeStamp,
 					nonceStr: params.nonceStr,
-					package: params.package_,
+					package: params.package_ || params.packageValue,
 					signType: params.signType,
 					paySign: params.paySign,
 					success: (res) => {
diff --git a/pages/newOrder完成自动选择优惠劵/confirmOrder.vue b/pages/newOrder完成自动选择优惠劵/confirmOrder.vue
index 2f3657f..a3690fa 100644
--- a/pages/newOrder完成自动选择优惠劵/confirmOrder.vue
+++ b/pages/newOrder完成自动选择优惠劵/confirmOrder.vue
@@ -772,7 +772,7 @@
 					provider: 'wxpay',
 					timeStamp: params.timeStamp,
 					nonceStr: params.nonceStr,
-					package: params.package_,
+					package: params.package_ || params.packageValue,
 					signType: params.signType,
 					paySign: params.paySign,
 					success: (res) => {
diff --git a/pages_order/order/orderDetail.vue b/pages_order/order/orderDetail.vue
index b437141..96c18a8 100644
--- a/pages_order/order/orderDetail.vue
+++ b/pages_order/order/orderDetail.vue
@@ -285,7 +285,7 @@
 					provider: 'wxpay',
 					timeStamp: params.timeStamp,
 					nonceStr: params.nonceStr,
-					package: params.package_,
+					package: params.package_ || params.packageValue,
 					signType: params.signType,
 					paySign: params.paySign,
 					success: (res) => {
diff --git a/pages_order/order/orderList.vue b/pages_order/order/orderList.vue
index 44d4c6d..c22a933 100644
--- a/pages_order/order/orderList.vue
+++ b/pages_order/order/orderList.vue
@@ -336,6 +336,7 @@
 					orderId,
 					openId : getOpenIdKey(),
 				}).then(res => {
+					console.log(res);
 					this.pay(res)
 				}).catch(err => {
 					this.refresh()
@@ -350,7 +351,7 @@
 					provider: 'wxpay',
 					timeStamp: params.timeStamp,
 					nonceStr: params.nonceStr,
-					package: params.package_,
+					package: params.package_ || params.packageValue,
 					signType: params.signType,
 					paySign: params.paySign,
 					success: (res) => {
diff --git a/utils/getUrl.js b/utils/getUrl.js
index c2498c1..a63b854 100644
--- a/utils/getUrl.js
+++ b/utils/getUrl.js
@@ -1,11 +1,11 @@
-let current ="develop";
+let current ="release";
 const accountInfo = wx.getAccountInfoSync();
 
 // current = accountInfo.miniProgram.envVersion;
 
 
 const api={
-	develop:"http://127.0.0.1:8080",
+	develop:"http://127.0.0.1:8002",
 	// develop:"http://h5.xzaiyp.top",
 	// develop:"https://api.catmdogd.com/prod-api",
 	// develop:"https://api-test.catmdogd.com/test-api",