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",