|
|
@@ -148,15 +148,19 @@ export function Login(phone_data, code, isAgency) {
|
|
|
export async function loginByUserInfo () {
|
|
|
// wx.showLoading('登录中')
|
|
|
let UserProfile = await getUserProfile()
|
|
|
+ let code = await wxLogin()
|
|
|
+ console.log('************')
|
|
|
+ console.log(UserProfile)
|
|
|
return new Promise(async (resolve, reject) => {
|
|
|
- let code = await wxLogin()
|
|
|
wx.getUserInfo({
|
|
|
withCredentials: true,
|
|
|
success (res) {
|
|
|
res.wx_code = code
|
|
|
res.userInfo = UserProfile.userInfo
|
|
|
+
|
|
|
UserApi.loginByUserInfo(res).then(loginRes => {
|
|
|
const data = loginRes.data
|
|
|
+ console.log(data)
|
|
|
data.user = data.user || data.agency
|
|
|
UserProfile.userInfo.user_id = data.user.user_id || data.user.agency_user_id
|
|
|
saveToken(data.token)
|
|
|
@@ -164,6 +168,7 @@ export async function loginByUserInfo () {
|
|
|
UserProfile.userInfo.name = UserProfile.userInfo.name || UserProfile.userInfo.nickName
|
|
|
UserProfile.userInfo.avatar = UserProfile.userInfo.avatar || UserProfile.userInfo.avatarUrl
|
|
|
getApp().globalData.userinfo =UserProfile.userInfo
|
|
|
+ getApp().globalData.userinfo.agency_user_id =data.agency.agency_user_id
|
|
|
saveUserInfo(UserProfile.userInfo)
|
|
|
EventEmitter.emit('login')
|
|
|
wx.hideLoading()
|