|
@@ -117,6 +117,7 @@ export default {
|
|
|
isUse:false,
|
|
|
scanCode: '', // pc端扫码登录获取的标志码
|
|
|
newUser_sc: '', // 用户扫码进来详情页获取的sc
|
|
|
+ shareActivityCode: '', // 用户扫码进来详情页获取的
|
|
|
isBack:false
|
|
|
};
|
|
|
},
|
|
@@ -134,6 +135,9 @@ export default {
|
|
|
if (uni.getStorageSync('newUser_sc')) {
|
|
|
this.newUser_sc = uni.getStorageSync('newUser_sc')
|
|
|
}
|
|
|
+ if (uni.getStorageSync('shareActivityCode')) {
|
|
|
+ this.shareActivityCode = uni.getStorageSync('shareActivityCode')
|
|
|
+ }
|
|
|
console.log('---this.newUser_sc:', this.newUser_sc);
|
|
|
},
|
|
|
onShow() {
|
|
@@ -155,7 +159,8 @@ export default {
|
|
|
code: this.code,
|
|
|
encryptedData: e.detail.encryptedData,
|
|
|
iv: e.detail.iv,
|
|
|
- shareCode: this.newUser_sc
|
|
|
+ shareCode: this.newUser_sc,
|
|
|
+ shareActivityCode: this.shareActivityCode
|
|
|
}).then(res => {
|
|
|
if (res.data.code == 200) {
|
|
|
this.loginCallback(res, 'wxlogin')
|
|
@@ -192,6 +197,7 @@ export default {
|
|
|
}
|
|
|
that.isUse = true
|
|
|
let datas = {
|
|
|
+ shareActivityCode: this.shareActivityCode,
|
|
|
tel:this.form.tel,
|
|
|
code:this.form.code
|
|
|
}
|
|
@@ -247,6 +253,7 @@ export default {
|
|
|
that.isUse = true
|
|
|
let form = JSON.parse(JSON.stringify(this.form))
|
|
|
form.pwd = this.encryptor(form.pwd)
|
|
|
+ form['shareActivityCode'] = this.shareActivityCode
|
|
|
// 账号登录用户 /app/common/account_login
|
|
|
that.$api.accountLogin(form).then(
|
|
|
res => {
|
|
@@ -358,6 +365,7 @@ export default {
|
|
|
console.log('登录页面:', this.isBack)
|
|
|
// if(res.data.data && res.data.data.full_info){
|
|
|
uni.removeStorageSync('newUser_sc')
|
|
|
+ uni.removeStorageSync('shareActivityCode')
|
|
|
//信息完善,直接进入页面
|
|
|
uni.setStorageSync('user_account', res.data.data.user_account);
|
|
|
uni.setStorageSync('token', res.data.data.token);
|