张文飞 3 vuotta sitten
vanhempi
commit
905b760dee
2 muutettua tiedostoa jossa 6 lisäystä ja 5 poistoa
  1. 6 2
      App.vue
  2. 0 3
      pages/homePage/homePage.vue

+ 6 - 2
App.vue

@@ -11,7 +11,7 @@
 			 *    bug: 如果之前去掉code,则会进入(一)进入了死循环;
 			 *    想法:先去让他带着code去regist,成功则说明是新的code,失败则去掉code进入(一)
 			 */
-			if(!code){
+			if(!code&&false){
 				let url =  href.split('#')[0];
 				url = encodeURIComponent(url);
 				url = "https://open.weixin.qq.com/connect/oauth2/authorize?appid="+config.appid+"&redirect_uri="+url+"&response_type=code&scope=snsapi_userinfo&state=123&connect_redirect=1#wechat_redirect"
@@ -66,10 +66,14 @@
 						let shareToken = this.getQueryString('shareToken')
 						let projectId = this.getQueryString('projectId')
 						let state = this.getQueryString('state');
-						let url = "https://h5test4.elab-plus.vip/Union/?shareToken="+shareToken+"&projectId="+projectId+"&state="+state+"&pathName="+hrefs[1];
+						let url = href.origin+ "?shareToken="+shareToken+"&projectId="+projectId+"&state="+state+"&pathName="+hrefs[1];
 						window.location.href = url;
 					}
 				}
+				
+				uni.showModal({
+					content:"location:"+location.origin+location.pathname
+				})
 			},
 		},
 		globalData: {

+ 0 - 3
pages/homePage/homePage.vue

@@ -289,9 +289,6 @@
 		},
 		methods: {
 			toPage(pathName,projectId){
-				uni.showModal({
-					content:"pathName:"+pathName+"projectId: "+projectId,
-				});
 				if((projectId&&pathName.indexOf('houseDetail')>-1)||(projectId&&!pathName)){
 					let e = {
 						projectId