diff --git a/pages/index/index.vue b/pages/index/index.vue index 3313d16..8fe7b3f 100644 --- a/pages/index/index.vue +++ b/pages/index/index.vue @@ -128,41 +128,53 @@ this.info_index = e.detail.current }, - async getToken() { - let that = this - await uni.login({ - provider: 'weixin', - success: (res) => { - this.$u.api.login({ - code: res.code - }).then(res1 => { - uni.setStorageSync("stbc1_lifeData", { - 'vuex_token': res1.token - }) - // uni.request({ - // url: baseUrl + '/api/mobile/user/get-user-info', - // header: { - // Authorization: `Bearer ${res1.token}` - // }, - // method: "GET", - // success(res2) { - // uni.setStorageSync("stbc1_lifeData", { - // 'vuex_token': res1.token, - // "vuex_user": res2.data.user - // }) - // }, - // fail(err) { - // console.log("err", err) - // } - // }) - }).catch(err => { - console.log('login-error:', JSON.stringify(err)) - }) - }, - fail: (res) => { - console.log("errtoken", JSON.stringify(res)) - } - }); + async getToken() { + let that = this + const loginResult = await new Promise((resolve, reject) => { + uni.login({ + provider: 'weixin', + success: (res) => { + resolve(res.code); + }, + fail: (err) => { + console.error('uni.login失败:', err); + reject(err); + } + }); + }); + const tokenResult = await new Promise((resolve, reject) => { + this.$u.api.login({ + code: loginResult + }).then(res1 => { + console.log("res1", res1) + uni.setStorageSync("stbc1_lifeData", { + 'vuex_token': res1.token + }) + resolve(res1.token); + }).catch(err => { + reject(err) + console.log('login-error:', JSON.stringify(err)) + }) + }); + + await uni.request({ + url: `${baseUrl}/api/mobile/user/get-user-info`, + header: { + Authorization: `Bearer ${tokenResult}` + }, + data: {}, + method: 'GET', + success: result1 => { + uni.setStorageSync( + "stbc1_lifeData", { + 'vuex_token': tokenResult, + "vuex_user": result1.data.user + }) + }, + fail(err) { + console.log("uesr-error",err) + } + }); }, async getUser() { await this.$u.api.user().then(res => {