提交

10 months ago · 2ee76bfdc9
14 changed files with 51 additions and 20 deletions
--- 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年以来的秒数     
--- 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年以来的秒数     
--- 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))
+						// })
 					}
 				});
 			},
--- 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年以来的秒数     
--- a/unpackage/dist/build/web/index.html
+++ b/unpackage/dist/build/web/index.html
@ -1,2 +1,2 @@
 <!DOCTYPE html><html lang=zh-CN><head><meta charset=utf-8><meta http-equiv=X-UA-Compatible content="IE=edge"><title>daoyous</title><script>var coverSupport = 'CSS' in window && typeof CSS.supports === 'function' && (CSS.supports('top: env(a)') || CSS.supports('top: constant(a)'))
-            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.690d039f.js></script><script src=/static/js/index.a23fc75f.js></script></body></html>
+            document.write('<meta name="viewport" content="width=device-width, user-scalable=no, initial-scale=1.0, maximum-scale=1.0, minimum-scale=1.0' + (coverSupport ? ', viewport-fit=cover' : '') + '" />')</script><link rel=stylesheet href=/static/index.2da1efab.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.690d039f.js></script><script src=/static/js/index.54f9da58.js></script></body></html>
--- a/unpackage/dist/build/web/static/js/index.54f9da58.js
+++ b/unpackage/dist/build/web/static/js/index.54f9da58.js
--- a/unpackage/dist/build/web/static/js/subPackages-daoyou-order.3f7b08d2.js
+++ b/unpackage/dist/build/web/static/js/subPackages-daoyou-order.3f7b08d2.js
--- a/unpackage/dist/build/web/static/js/subPackages-daoyou-order.f9c4ef53.js
+++ b/unpackage/dist/build/web/static/js/subPackages-daoyou-order.f9c4ef53.js
--- a/unpackage/dist/build/web/static/js/subPackages-line-orders.69ea0091.js
+++ b/unpackage/dist/build/web/static/js/subPackages-line-orders.69ea0091.js
--- a/unpackage/dist/build/web/static/js/subPackages-line-orders.9cba2673.js
+++ b/unpackage/dist/build/web/static/js/subPackages-line-orders.9cba2673.js
--- a/unpackage/dist/build/web/static/js/subPackages-order-orderDetail.61b41644.js
+++ b/unpackage/dist/build/web/static/js/subPackages-order-orderDetail.61b41644.js
--- a/unpackage/dist/build/web/static/js/subPackages-order-orderDetail.db147afe.js
+++ b/unpackage/dist/build/web/static/js/subPackages-order-orderDetail.db147afe.js
--- a/unpackage/dist/build/web/static/js/subPackages-order-trades.985e6980.js
+++ b/unpackage/dist/build/web/static/js/subPackages-order-trades.985e6980.js
--- a/unpackage/dist/build/web/static/js/subPackages-order-trades.a4172615.js
+++ b/unpackage/dist/build/web/static/js/subPackages-order-trades.a4172615.js