Commit 6060b637 by 程默

登录逻辑修改

parent 7f315e02
......@@ -10,7 +10,7 @@
<!-- <div>{{testd}}</div>
<div>{{test_sessionId}}</div>--sessionId
<div>{{unionId}}</div>--unionId
<div>{{test_isHaveUnion}}</div>--isHaveUnion -->
<div>{{test_isHaveUnion}}</div>--isHaveUnion-->
<!-- <div class="enterpriseLogin" @click="eLogin">账号登录</div> -->
</div>
<div class="toCLogin1" v-if="isShowPhone">
......@@ -74,96 +74,122 @@ export default {
this.backParams = serialize(options.params);
}
this.getshop();
this.init();
},
methods: {
getshop() {
shop.getShopInfo().then(res => {
if (res.data.code == 200) {
this.shopName = res.data.data.shopName;
this.logoUrl = process.env.IMG_DOMAIN + res.data.data.logoUrl;
} else {
}
});
this.shopName = wx.getStorageSync("shopName");
this.logoUrl = wx.getStorageSync("logoUrl");
if (!(this.shopName && this.logoUrl)) {
shop.getShopInfo().then(res => {
if (res.data.code == 200) {
this.shopName = res.data.data.shopName;
this.logoUrl = process.env.IMG_DOMAIN + res.data.data.logoUrl;
wx.setStorage({
key: "shopName",
data: res.data.data.shopName
});
wx.setStorage({
key: "logoUrl",
data: process.env.IMG_DOMAIN + res.data.data.logoUrl
});
}
});
}
},
init() {
wx.login({
success: res => {
if (res.code) {
login
.miniLogin({ code: res.code })
.then(res => {
// wx.showToast({ title: res.data.code, icon: "none" });
if (res.data.code == 200) {
this.testd = JSON.stringify(res.data);
this.test_isHaveUnion = res.data.data.isHaveUnion;
console.log("login---", res.data);
wx.setStorage({
key: "openid",
data: res.data.data.openid
});
if (res.data.data.isHaveUnion == "true") {
//有账号
this.backParams += `&sessionid=${
res.data.data.sessionId
}&needCertified=${res.data.data.NEED_CERTIFIED}`;
this.NEED_CERTIFIED = res.data.data.NEED_CERTIFIED;
wx.setStorage({
key: "sessionid",
data: res.data.data.sessionId
});
this.isHaveUnion = true;
return new Promise((resolve, reject) => {
wx.login({
success: res => {
if (res.code) {
login
.miniLogin({ code: res.code })
.then(res => {
if (res.data.code == 200) {
resolve(res);
} else {
//需要绑定
this.isHaveUnion = false;
reject(res.data.msg);
}
this.appid = res.data.data.appid;
this.session_key = res.data.data.session_key;
this.openid = res.data.data.openid;
this.isShow = true;
this.test_sessionId = wx.getStorageSync("sessionid");
} else {
wx.showToast({ title: res.data.msg, icon: "none" });
}
})
.catch(err => {
wx.showToast({ title: err, icon: "none" });
});
})
.catch(err => {
reject(err);
});
}
},
fail: err => {
reject(err);
}
}
});
});
},
getUserInfo: function(e) {
wx.showLoading({
title: "加载中"
});
if (e.target.errMsg == "getUserInfo:ok" && this.isShow) {
wx.hideLoading();
if (this.isHaveUnion) {
//是会员 直接登录
wx.reLaunch({
url: `../index/main?from=login&backpath=${
this.backPath
}&params=${encodeURIComponent(this.backParams)}`
if (e.target.errMsg == "getUserInfo:ok") {
this.init()
.then(res => {
console.log("promise", res);
wx.hideLoading();
//存入openid
wx.setStorage({
key: "openid",
data: res.data.data.openid
});
if (res.data.data.isHaveUnion == "true") {
//有账号
this.backParams += `&sessionid=${
res.data.data.sessionId
}&needCertified=${res.data.data.NEED_CERTIFIED}`;
this.NEED_CERTIFIED = res.data.data.NEED_CERTIFIED;
wx.setStorage({
key: "sessionid",
data: res.data.data.sessionId
});
this.isHaveUnion = true;
} else {
//需要绑定
this.isHaveUnion = false;
}
this.appid = res.data.data.appid;
this.session_key = res.data.data.session_key;
this.openid = res.data.data.openid;
this.isShow = true;
//checkLogin
this.checkLogin();
})
.catch(err => {
console.log("err", err);
wx.hideLoading();
wx.showToast({ title: err, icon: "none" });
});
} else {
var data = wx_decode(
this.appid,
this.session_key,
e.mp.detail.encryptedData,
e.mp.detail.iv
);
this.unionId = data.unionId || "";
this.userInfo = JSON.parse(e.target.rawData);
console.log(this.userInfo, "this.userInfo");
} else {
wx.hideLoading();
wx.showToast({ title: "获取用户信息失败", icon: "none" });
}
},
checkLogin() {
if (this.isHaveUnion) {
//是会员 直接登录
wx.reLaunch({
url: `../index/main?from=login&backpath=${
this.backPath
}&params=${encodeURIComponent(this.backParams)}`
});
} else {
var data = wx_decode(
this.appid,
this.session_key,
e.mp.detail.encryptedData,
e.mp.detail.iv
);
this.unionId = data.unionId || "";
this.userInfo = JSON.parse(e.target.rawData);
console.log(this.userInfo, "this.userInfo");
// return
if (this.unionId) {
if (this.unionId) {
login
.checkUnionid({ unionId: this.unionId, openId: this.openid })
.then(res => {
......@@ -191,13 +217,10 @@ export default {
.catch(err => {
wx.showToast({ title: err, icon: "none" });
});
} else {
} else {
//不是会员需要绑定手机号
this.isShowPhone = true;
}
}
} else {
wx.hideLoading();
}
},
getPhoneNumber(e) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment