diff --git a/subPackages/daoyou/order.vue b/subPackages/daoyou/order.vue
index 169d271..706ffe7 100644
--- a/subPackages/daoyou/order.vue
+++ b/subPackages/daoyou/order.vue
@@ -236,6 +236,12 @@
}, '/api/pay/unify').then(res => {
if (res.data) {
let data = res.data
+ if(data.status == 'success') {
+ uni.navigateTo({
+ url: '/subPackages/order/trades'
+ })
+ return;
+ }
WeixinJSBridge.invoke('getBrandWCPayRequest', {
"appId": data.appId, //公众号ID，由商户传入
"timeStamp": data.timeStamp, //时间戳，自1970年以来的秒数
diff --git a/subPackages/line/orders.vue b/subPackages/line/orders.vue
index 7cfd548..01876ca 100644
--- a/subPackages/line/orders.vue
+++ b/subPackages/line/orders.vue
@@ -269,6 +269,12 @@
}, '/api/pay/unify').then(res => {
if (res.data) {
let data = res.data
+ if(data.status == 'success') {
+ uni.navigateTo({
+ url: '/subPackages/order/trades'
+ })
+ return;
+ }
WeixinJSBridge.invoke('getBrandWCPayRequest', {
"appId": data.appId, //公众号ID，由商户传入
"timeStamp": data.timeStamp, //时间戳，自1970年以来的秒数
diff --git a/subPackages/order/orderDetail.vue b/subPackages/order/orderDetail.vue
index 82e2363..894a02f 100644
--- a/subPackages/order/orderDetail.vue
+++ b/subPackages/order/orderDetail.vue
@@ -330,21 +330,34 @@
type: "miniprogram",
platform: 'miniprogram'
}, '/api/pay/unify').then(res => {
- if (res.code == 1) {
- uni.requestPayment({
- nonceStr: res.data.nonceStr,
- package: res.data.package,
- paySign: res.data.paySign,
- signType: res.data.signType,
- timeStamp: res.data.timeStamp,
- success: () => {
- that.getDetail();
- uni.$emit("updateDataByConnect", {
- msgType: 'updateOrderTrades',
- data: {}
- })
- }
+ if (res.data) {
+ let data = res.data
+ if(data.status == 'success') {
+ uni.navigateTo({
+ url: '/subPackages/order/trades'
+ })
+ return;
+ }
+ WeixinJSBridge.invoke('getBrandWCPayRequest', {
+ "appId": data.appId, //公众号ID，由商户传入
+ "timeStamp": data.timeStamp, //时间戳，自1970年以来的秒数
+ "nonceStr": data.nonceStr, //随机串
+ "package": data.package,
+ "signType": data.signType, //微信签名方式：
+ "paySign": data.paySign //微信签名
+ },
+ function(res) {
+ // if (res.err_msg == "get_brand_wcpay_request:ok") {
+ // // 使用以上方式判断前端返回,微信团队郑重提示：
+ // //res.err_msg将在用户支付成功后返回ok，但并不保证它绝对可靠。
+ // }
+ uni.navigateTo({
+ url: '/subPackages/order/trades'
+ })
});
+ // uni.navigateTo({
+ // url: '/subPackages/order/payResult?text=' + encodeURIComponent(JSON.stringify(res.data))
+ // })
}
});
},
diff --git a/subPackages/order/trades.vue b/subPackages/order/trades.vue
index 77ed0a6..07da72a 100644
--- a/subPackages/order/trades.vue
+++ b/subPackages/order/trades.vue
@@ -171,6 +171,12 @@
console.log(res)
if (res.data) {
let data = res.data
+ if(data.status == 'success') {
+ uni.navigateTo({
+ url: '/subPackages/order/trades'
+ })
+ return;
+ }
WeixinJSBridge.invoke('getBrandWCPayRequest', {
"appId": data.appId, //公众号ID，由商户传入
"timeStamp": data.timeStamp, //时间戳，自1970年以来的秒数
diff --git a/unpackage/dist/build/web/index.html b/unpackage/dist/build/web/index.html
index c526962..69fb25e 100644
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@@ -1,2 +1,2 @@
daoyous
\ No newline at end of file
+ document.write('')