|
@ -105,7 +105,7 @@ |
|
|
return; |
|
|
return; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
this.$refs.privacyPopup.open() |
|
|
|
|
|
|
|
|
// this.$refs.privacyPopup.open() |
|
|
// uni.showLoading({ |
|
|
// uni.showLoading({ |
|
|
// title: '登录中...' |
|
|
// title: '登录中...' |
|
|
// }); |
|
|
// }); |
|
@ -118,6 +118,8 @@ |
|
|
// url: '/pages/index/index' |
|
|
// url: '/pages/index/index' |
|
|
// }); |
|
|
// }); |
|
|
// }, 1500); |
|
|
// }, 1500); |
|
|
|
|
|
|
|
|
|
|
|
this.handleAgreePrivacy() |
|
|
}, |
|
|
}, |
|
|
handleCancel() { |
|
|
handleCancel() { |
|
|
// 关闭当前页面回到首页 |
|
|
// 关闭当前页面回到首页 |
|
@ -173,14 +175,20 @@ |
|
|
// 执行登录逻辑... |
|
|
// 执行登录逻辑... |
|
|
|
|
|
|
|
|
let self = this |
|
|
let self = this |
|
|
|
|
|
|
|
|
|
|
|
let data = { |
|
|
|
|
|
code: res.code |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
if (uni.getStorageSync('shareId')) { |
|
|
|
|
|
data.shareId = uni.getStorageSync('shareId') |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
wx.login({ |
|
|
wx.login({ |
|
|
success(res) { |
|
|
success(res) { |
|
|
// console.log(res.code,'code') |
|
|
// console.log(res.code,'code') |
|
|
if (res.code) { |
|
|
if (res.code) { |
|
|
self.$api('wxLogin', { |
|
|
|
|
|
code: res.code |
|
|
|
|
|
}, res => { |
|
|
|
|
|
|
|
|
self.$api('wxLogin', data, res => { |
|
|
console.log(res, 'login') |
|
|
console.log(res, 'login') |
|
|
if (res.code == 200) { |
|
|
if (res.code == 200) { |
|
|
uni.hideLoading(); |
|
|
uni.hideLoading(); |
|
|