张文飞 3 rokov pred
rodič
commit
c2a7ae1ad9
2 zmenil súbory, kde vykonal 5 pridanie a 5 odobranie
  1. 3 2
      App.vue
  2. 2 3
      components/subComponents/dmLogin.vue

+ 3 - 2
App.vue

@@ -56,8 +56,8 @@
 			let userId =  this.$cache.get('_user_id');
 			let shareToken  = this.getQueryString('shareToken');
 			let projectId  = this.getQueryString('projectId');
-			this.globalData.projectId = projectId;
-			this.globalData.shareToken = shareToken;
+			this.globalData.projectId = projectId||'';
+			this.globalData.shareToken = shareToken||'';
 			if (!token||!userId) {
 				this.globalData.userId = userId;
 				this.regist();
@@ -97,6 +97,7 @@
 						this.$cache.set('_token_owner_union', token);
 						this.globalData.token = token
 					}
+					uni.$emit('request')
 				}
 			},
 		},

+ 2 - 3
components/subComponents/dmLogin.vue

@@ -41,7 +41,6 @@
 
 <script>
 	import dmDialog from "./dmDialog.vue"
-	let app = getApp();
 	export default{
 		
 		data(){
@@ -150,8 +149,8 @@
 						"code": this.verifity,
 						"phone": this.mobile,
 						"userId": this.userId,
-						"projectId": app.globalData.projectId,
-						"shareToken": app.globalData.shareToken,
+						"projectId": getApp().globalData.projectId||"",
+						"shareToken": getApp().globalData.shareToken||"",
 					}
 				});