张文飞 3 年之前
父節點
當前提交
3b55e1a391
共有 2 個文件被更改,包括 4 次插入12 次删除
  1. 1 8
      App.vue
  2. 3 4
      pages/homePage/homePage.vue

+ 1 - 8
App.vue

@@ -22,10 +22,8 @@
 		onShow: function() {
 			let shareToken  = this.getQueryString('shareToken');
 			let projectId  = this.getQueryString('projectId');
-			let pathName  = this.getQueryString('pathName');
 			this.globalData.projectId = projectId||'';
 			this.globalData.shareToken = shareToken||'';
-			this.globalData.pathName = pathName||'';
 			this.regist();
 			document.body.style.setProperty("background-color",this.globalData.color4);
 		},
@@ -61,12 +59,7 @@
 						uni.$emit('request')
 					}else{
 						//注册失败,去掉老的code,会进入onLaunch,重新获取新的code
-						let href = location.href;
-						let hrefs = href.split('#');
-						let shareToken = this.getQueryString('shareToken')
-						let projectId = this.getQueryString('projectId')
-						let state = this.getQueryString('state');
-						let url = location.origin+location.pathname + "?shareToken="+shareToken+"&projectId="+projectId+"&state="+state+"&pathName="+hrefs[1];
+						let url = location.origin+location.pathname;
 						window.location.href = url;
 					}
 				}

+ 3 - 4
pages/homePage/homePage.vue

@@ -277,8 +277,7 @@
 				this.$refs.login.hide();
 			})
 			let projectId = this.getQueryString('projectId');
-			let pathName = this.getQueryString('pathName');
-			this.toPage(pathName,projectId);
+			this.toPage(projectId);
 		},
 		onPullDownRefresh() {
 			this.getData();
@@ -291,8 +290,8 @@
 			
 		},
 		methods: {
-			toPage(pathName,projectId){
-				if((projectId&&pathName.indexOf('houseDetail')>-1)||(projectId&&!pathName)){
+			toPage(projectId){
+				if(projectId){
 					let e = {
 						projectId
 					}