From 0e58c5ba8f1587500827c0b4529c17963e8fc56b Mon Sep 17 00:00:00 2001 From: "liujw155@outlook.com" Date: Thu, 14 Jan 2021 10:13:47 +0800 Subject: [PATCH] change login query --- src/js/api.js | 4 ++-- src/pages/index/index.vue | 21 ++++++++++++--------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/js/api.js b/src/js/api.js index 41c6e1b..9eee7d0 100644 --- a/src/js/api.js +++ b/src/js/api.js @@ -1,5 +1,5 @@ -// export const ORIGIN = `http://testmanager.ouxuanzhineng.cn`; // 测试 -export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 +export const ORIGIN = `http://testmanager.ouxuanzhineng.cn`; // 测试 +// export const ORIGIN = `https://minimanage.ouxuanzhineng.cn`; // 正式 export const API = { wechatMiniAppLoginAndSync: `${ORIGIN}/user/wechatMiniAppLoginAndSync`, // 小程序授权 diff --git a/src/pages/index/index.vue b/src/pages/index/index.vue index 33458dc..7dacfa8 100644 --- a/src/pages/index/index.vue +++ b/src/pages/index/index.vue @@ -208,17 +208,19 @@ let setting; try{setting = await uniGetSetting({})}catch(err){console.error(err)}; if(setting&&setting.authSetting&&setting.authSetting['scope.userInfo'] === true){ - - let [ loginRes, userRes ] = await Promise.all([uniLogin(), uniGetUserInfo()]); - + let [ loginRes, userRes ] = await Promise.all([uniLogin(), uniGetUserInfo({lang: 'zh_CN'})]); + console.log(userRes) return servers.post({ url: API.wechatMiniAppLoginAndSync, data: { appid: APPID, code: loginRes.code, encryptedData: userRes.encryptedData, - iv: userRes.iv, - is_details: 1, + // is_details: 1, + // 后端解密错误，直接传用户信息 + user_info: userRes.userInfo, + user_raw_data: userRes.rawData, + ...userRes.userInfo, }, isDefaultGet: false, }) @@ -269,16 +271,17 @@ return util.showNone('获取登陆凭证失败！稍后重试'); } - util.showLoad(); - servers.post({ url: API.wechatMiniAppLoginAndSync, data: { appid: APPID, code: loginRes.code, encryptedData: userRes.detail.encryptedData, - iv: userRes.detail.iv, - is_details: 1, + // is_details: 1, + // 后端解密错误，直接传用户信息 + user_info: userRes.detail.userInfo, + user_raw_data: userRes.detail.rawData, + ...userRes.detail.userInfo, // 'avatar_url': userRes.detail.userInfo.avatarUrl, // ...userRes.detail.userInfo, },