Browse Source

change login query

voice
刘嘉炜 4 years ago
parent
commit
0e58c5ba8f
  1. 4
      src/js/api.js
  2. 21
      src/pages/index/index.vue

4
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 = { export const API = {
wechatMiniAppLoginAndSync: `${ORIGIN}/user/wechatMiniAppLoginAndSync`, // 小程序授权 wechatMiniAppLoginAndSync: `${ORIGIN}/user/wechatMiniAppLoginAndSync`, // 小程序授权

21
src/pages/index/index.vue

@ -208,17 +208,19 @@
let setting; let setting;
try{setting = await uniGetSetting({})}catch(err){console.error(err)}; try{setting = await uniGetSetting({})}catch(err){console.error(err)};
if(setting&&setting.authSetting&&setting.authSetting['scope.userInfo'] === true){ 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({ return servers.post({
url: API.wechatMiniAppLoginAndSync, url: API.wechatMiniAppLoginAndSync,
data: { data: {
appid: APPID, appid: APPID,
code: loginRes.code, code: loginRes.code,
encryptedData: userRes.encryptedData, 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, isDefaultGet: false,
}) })
@ -269,16 +271,17 @@
return util.showNone('获取登陆凭证失败!稍后重试'); return util.showNone('获取登陆凭证失败!稍后重试');
} }
util.showLoad();
servers.post({ servers.post({
url: API.wechatMiniAppLoginAndSync, url: API.wechatMiniAppLoginAndSync,
data: { data: {
appid: APPID, appid: APPID,
code: loginRes.code, code: loginRes.code,
encryptedData: userRes.detail.encryptedData, 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, // 'avatar_url': userRes.detail.userInfo.avatarUrl,
// ...userRes.detail.userInfo, // ...userRes.detail.userInfo,
}, },

Loading…
Cancel
Save