张文飞 пре 3 година
родитељ
комит
36165a6d16
2 измењених фајлова са 10 додато и 6 уклоњено
  1. 9 5
      App.vue
  2. 1 1
      util/api.js

+ 9 - 5
App.vue

@@ -7,7 +7,7 @@
 			if(!code){
 				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_base&state=123&connect_redirect=1#wechat_redirect"
+				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"
 				window.location.href = url;
 			}
 			let BASE_URL = "";
@@ -54,6 +54,10 @@
 		onShow: function() {
 			let token = this.$cache.get('_token_owner_union');
 			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;
 			if (!token||!userId) {
 				this.globalData.userId = userId;
 				this.regist();
@@ -76,14 +80,12 @@
 			},
 			async regist() {
 				let code  = this.getQueryString('code');
-				let shareToken  = this.getQueryString('shareToken');
-				let projectId  = this.getQueryString('projectId');
 				let ret = await this.$myRequest({
 					url: "/regist",
 					data: {
 						"code": code,
-						"shareToken":shareToken||"",
-						"projectId":projectId||"",
+						"shareToken":this.globalData.shareToken||"",
+						"projectId":this.globalData.projectId||"",
 					}
 				});
 				if (ret.data.success) {
@@ -101,6 +103,8 @@
 		globalData: {
 			token: "",
 			userId:"",
+			projectId:"",
+			shareToken:"",
 			color1: "#F07423",
 			color2: "#FD8F3C",
 			color3: "#FFC444",

+ 1 - 1
util/api.js

@@ -34,7 +34,7 @@ export const myRequest = (options) => {
 				uni.hideLoading()
 				uni.hideNavigationBarLoading();
 				uni.stopPullDownRefresh();
-				if(res.data.errorCode=='401'||res.data.message.indexOf('请登录')>-1){
+				if(res.data.errorCode=='401'){
 					uni.$emit('unLogin')
 				}
 				resolve(res)