11

pages/home/home.vue

@@ -140,7 +140,7 @@ export default {
 		// #endif
 	},
 	onLoad() {
-	  // this.H5Login()
+	  this.H5Login()
 	},
 	onPageScroll(e){
 		let scrollTop = e.scrollTop;
@@ -208,32 +208,32 @@ export default {
 					break;
 			}
 		},
-		// getQueryString(name) {
+		getQueryString(name) {
-		// 	let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
+			let reg = new RegExp("(^|&)" + name + "=([^&]*)(&|$)");
-		// 	let r = window.location.search.substr(1).match(reg);
+			let r = window.location.search.substr(1).match(reg);
-		// 	if (r !== null) return unescape(r[2]);
+			if (r !== null) return unescape(r[2]);
-		// 	return null;
+			return null;
-		// },
+		},
-		// H5Login(){
+		H5Login(){
-		// 	let pageUrl = window.location.href;
+			let pageUrl = window.location.href;
 			
-		// 	let code =this.getQueryString('code');
+			let code =this.getQueryString('code');
-		// 	console.log(code,"lldd");
+			console.log(code,"lldd");
-		// 	let appid="wx5a2c9f7e82918b85"
+			let appid="wx5a2c9f7e82918b85"
 			
-		// 	let redirect_uri = encodeURIComponent(pageUrl);
+			let redirect_uri = encodeURIComponent(pageUrl);
-		// 	// let redirect_uri = pageUrl;
+			// let redirect_uri = pageUrl;
-		// 	console.log(redirect_uri)
+			console.log(redirect_uri)
-		// 	let authUrl =
+			let authUrl =
-		// 		`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_base&state=STATE&connect_redirect=1#wechat_redirect`;
+				`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_base&state=STATE&connect_redirect=1#wechat_redirect`;
-		// 	if (code) {
+			if (code) {
-		// 		uni.setStorageSync("code",code)
+				uni.setStorageSync("code",code)
-		// 	} else {
+			} else {
-		// 		// window.location.href = authUrl;
+				// window.location.href = authUrl;
-		// 		console.log("没有code")
+				console.log("没有code")
-		// 		// return await Promise.reject("跳转授权");
+				// return await Promise.reject("跳转授权");
-		// 	}
+			}
-		// }
+		}
 	}
 };
 </script>

pages/login/login.vue

@@ -109,24 +109,6 @@ export default {
 			})
 			return;
 		}
-		let pageUrl = window.location.href;
-		
-		let code =this.getQueryString('code');
-		console.log(code,"lldd");
-		let appid="wx5a2c9f7e82918b85"
-		
-		let redirect_uri = encodeURIComponent(pageUrl);
-		// let redirect_uri = pageUrl;
-		console.log(redirect_uri)
-		let authUrl =
-			`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_base&state=STATE&connect_redirect=1#wechat_redirect`;
-		if (code) {
-			uni.setStorageSync("code",code)
-		} else {
-			window.location.href = authUrl;
-			console.log("没有code")
-			// return await Promise.reject("跳转授权");
-		}
 		loginApi({account:this.form.phone,password:this.form.password,code:uni.getStorageSync("code")}).then(res=>{
 			if(res.code==1){
 				setUserInfo(res.data.userinfo)
@@ -135,6 +117,19 @@ export default {
 					url:  '/pages/my/my'   
 				});
 				
+			}else{
+				let pageUrl = window.location.href;
+				
+				let code =this.getQueryString('code');
+				console.log(code,"lldd");
+				let appid="wx5a2c9f7e82918b85"
+				
+				let redirect_uri = encodeURIComponent(pageUrl);
+				// let redirect_uri = pageUrl;
+				console.log(redirect_uri)
+				let authUrl =
+					`https://open.weixin.qq.com/connect/oauth2/authorize?appid=${appid}&redirect_uri=${redirect_uri}&response_type=code&scope=snsapi_base&state=STATE&connect_redirect=1#wechat_redirect`;
+				window.location.href = authUrl;
 			}
 		})
     },

pages/warehouse/weituo.vue

@@ -129,7 +129,7 @@
 				payUpGoods(params).then(res=>{
 					let self = this;
 					jweixin.config({
-						debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
+						debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来，若要查看传入的参数，可以在pc端打开，参数信息会通过log打出，仅在pc端时才会打印。
 						appId: res.data.pay_data.appId, // 必填，公众号的唯一标识
 						timestamp: res.data.pay_data.timeStamp, // 必填，生成签名的时间戳
 						nonceStr: res.data.pay_data.nonceStr, // 必填，生成签名的随机串

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.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.c321b385.js></script><script src=/static/js/index.8622b5b7.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.97465e7b.css></head><body><noscript><strong>Please enable JavaScript to continue.</strong></noscript><div id=app></div><script src=/static/js/chunk-vendors.c321b385.js></script><script src=/static/js/index.3cf2361b.js></script></body></html>