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