Merge branch 'dev1.0.0' into develop

3 years ago · 4774562e42
parent 9cad7c6410 aae061cad3
commit 4774562e42
3 changed files with 4 additions and 8 deletions
--- a/common/utils/wxpay.js
+++ b/common/utils/wxpay.js
@ -2,7 +2,7 @@
 * @Author: ch
 * @Date: 2022-04-29 14:26:10
 * @LastEditors: ch
- * @LastEditTime: 2022-04-29 16:55:57
+ * @LastEditTime: 2022-05-05 11:26:35
 * @Description: file content
 */

@ -33,11 +33,7 @@ export const Wxpay = async ({orderId,openId})=>{
 			signType : par.signType,
 			paySign : par.paySign
 		}, res => {
-			if(res.err_msg === 'get_brand_wcpay_request:cancel'){
-				uni.navigateTo({
-					url : `/payResult?id=${orderId}`
-				});
-			}else{
+			if(res.err_msg !== 'get_brand_wcpay_request:cancel'){
 				uni.navigateTo({
 					url : `/payResult?orderId=${orderId}`
 				});
--- a/unpackage/dist/build/h5/index.html
+++ b/unpackage/dist/build/h5/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>马士兵严选</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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.52bf7055.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.a5c69d49.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.b5602bf5.js></script><script src=/static/js/index.5496e6cc.js></script></body></html>
--- a/unpackage/dist/build/h5/static/js/index.5496e6cc.js
+++ b/unpackage/dist/build/h5/static/js/index.5496e6cc.js