diff --git a/pages/Loading/index.vue b/pages/Loading/index.vue
index 93c4064..996fcdd 100644
--- a/pages/Loading/index.vue
+++ b/pages/Loading/index.vue
@@ -1,7 +1,12 @@
-
+
@@ -50,7 +55,8 @@ export default {
}
console.log('进行登录操作')
login().finally(() => {
- this.$yrouter.switchTab({
+ this.changeAuthorization(false)
+ this.$yrouter.replace({
path: '/pages/home/index',
})
})
diff --git a/pages/authorization/index.vue b/pages/authorization/index.vue
index 7c43a22..952f45c 100644
--- a/pages/authorization/index.vue
+++ b/pages/authorization/index.vue
@@ -1,19 +1,32 @@
-
+
-
-
+
+
为了提供更优质的服务,请先登录
-
-
-
+
@@ -22,7 +35,10 @@
为了提供更优质的服务,请先登录
-
+
@@ -44,7 +60,8 @@ export default {
data() {
return {
authorize: false,
- canIUseGetUserProfile: false
+ canIUseGetUserProfile: false,
+ code: ''
}
},
computed: {
@@ -54,8 +71,13 @@ export default {
if (wx.getUserProfile) {
this.canIUseGetUserProfile = true
}
+ this.getLoginCode()
+
// // 先校验用户是否授权,如果没有授权,显示授权按钮
},
+ mounted() {
+ this.getLoginCode()
+ },
onHide() {
this.updateAuthorizationPage(false)
this.changeAuthorization(false)
@@ -111,14 +133,14 @@ export default {
})
})
},
- // 申请获取用户信息
+ // 申请获取用户信息
getUserInfoProfile(data) {
console.log('getUserInfoProfile')
wx.getUserProfile({
lang: 'zh_CN',
desc: '需要获取您的信息用来展示',
success: res => {
- console.log('用户信息',res)
+ console.log('用户信息', res)
uni.showLoading({
title: '登录中',
})
@@ -140,64 +162,63 @@ export default {
},
})
},
- // 微信用户手机号登录
- phoneLogin(e) {
- console.log('用户微信手机号登录')
- if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
- console.log(e.mp.detail)
- getProvider()
- .then(provider => {
- console.log('当前的环境商',provider)
- if (!provider) {
- reject()
- }
- // uni登录
- uni.login({
- provider: provider,
- success: async loginRes => {
- console.log(loginRes)
- let code = loginRes.code // 获取开发code
- cookie.set('wxLoginCode', loginRes.code)
- wxappAuth({
- encryptedData: e.mp.detail.encryptedData,
- iv: e.mp.detail.iv,
- code: code,
- spread: cookie.get('spread'),
- })
- .then( res => {
- console.log('登录成功,开始处理登录信息保存,并获取用户详情')
- uni.hideLoading()
- store.commit('login', res.data.token, dayjs(res.data.expires_time))
- store.dispatch('userInfo', true)
- getUserInfo()
- .then(user => {
- console.log('获取用户信息成功')
- uni.setStorageSync('uid', user.data.uid)
- store.dispatch('setUserInfo', user.data)
- this.$yrouter.reLaunch({
- path: cookie.get('redirect').replace(/\ /g, ''),
- })
- })
- .catch(error => {
- console.log('获取用户信息失败')
- })
- })
- .catch(error => {
- console.log(error)
- console.log('登录接口调用失败')
- })
- }
- })
- })
- .catch(err => {})
- } else {
- uni.showToast({
- title: '已拒绝授权',
- icon: 'none',
- duration: 2000,
- })
- }
- },
+ getLoginCode() {
+ getProvider()
+ .then(provider => {
+ // uni登录
+ uni.login({
+ provider: provider,
+ success: async loginRes => {
+ console.log("🚀 ~ file: index.vue:171 ~ getLoginCode ~ loginRes:", loginRes)
+ this.code = loginRes.code
+ }
+ })
+ })
+ },
+ // 微信用户手机号登录
+ phoneLogin(e) {
+ console.log('用户微信手机号登录')
+ if (e.mp.detail.errMsg == 'getPhoneNumber:ok') {
+ console.log('wxLoginCode', this.code)
+ cookie.set('wxLoginCode', this.code)
+ wxappAuth({
+ encryptedData: e.mp.detail.encryptedData,
+ iv: e.mp.detail.iv,
+ code: this.code,
+ spread: cookie.get('spread'),
+ })
+ .then(res => {
+ console.log('登录成功,开始处理登录信息保存,并获取用户详情')
+ uni.hideLoading()
+ store.commit('login', res.data.token, dayjs(res.data.expires_time))
+ store.dispatch('userInfo', true)
+ getUserInfo()
+ .then(user => {
+ console.log('获取用户信息成功')
+ uni.setStorageSync('uid', user.data.uid)
+ store.dispatch('setUserInfo', user.data)
+ this.$yrouter.reLaunch({
+ path: cookie.get('redirect').replace(/\ /g, ''),
+ })
+ })
+ .catch(error => {
+ console.log('获取用户信息失败')
+ this.getLoginCode()
+ })
+ })
+ .catch(error => {
+ console.log(error)
+ console.log('登录接口调用失败')
+ this.getLoginCode()
+ })
+ } else {
+ uni.showToast({
+ title: '已拒绝授权',
+ icon: 'none',
+ duration: 2000,
+ })
+ }
+ },
},
mounted() {
if (wx.getUserProfile) {
diff --git a/pages/user/User/index.vue b/pages/user/User/index.vue
index e776d6b..fcd5020 100644
--- a/pages/user/User/index.vue
+++ b/pages/user/User/index.vue
@@ -1,11 +1,26 @@
-