From d7213a2599c0abcef0dc94db37c45da5dee497f2 Mon Sep 17 00:00:00 2001
From: 杨锴 <841720330@qq.com>
Date: 星期二, 19 十一月 2024 09:28:39 +0800
Subject: [PATCH] fix bug
---
XQMuse/SceneDelegate.swift | 24 +++++++++++++++---------
1 files changed, 15 insertions(+), 9 deletions(-)
diff --git a/XQMuse/SceneDelegate.swift b/XQMuse/SceneDelegate.swift
index e8e2070..64ec8bb 100644
--- a/XQMuse/SceneDelegate.swift
+++ b/XQMuse/SceneDelegate.swift
@@ -103,17 +103,23 @@
WeChatTools.getUserInfo(access_token: m.access_token, openId: m.openid) { userInfoModel in
if let u = userInfoModel{
if UserViewModel.getAvatarInfo().wxOpenId.isEmpty{
- Services.loginByWechat(headImgUrl: u.headimgurl, nickname: u.nickname, sex: u.sex, wxOpenId: u.openid).subscribe(onNext: {data in
+ Services.loginByWechat(headImgUrl: u.headimgurl, nickname: u.nickname, sex: u.sex, wxOpenId: u.openid, device: UserViewModel.DeviceUUID).subscribe(onNext: {data in
if let model = data.data{
- sceneDelegate?.loginSuccess()
- JQ_currentViewController().dismiss(animated:true)
- UserViewModel.saveLoginInfo(model)
- Services.getUserInfo().subscribe(onNext: {data in
- if let model = data.data{
- UserViewModel.saveAvatarInfo(model)
- }
- }).disposed(by: JQ_disposeBag)
+ if model.bindStatus == 2{
+ sceneDelegate?.loginSuccess()
+ JQ_currentViewController().dismiss(animated:true)
+ UserViewModel.saveLoginInfo(model)
+
+ Services.getUserInfo().subscribe(onNext: {data in
+ if let model = data.data{
+ UserViewModel.saveAvatarInfo(model)
+ }
+ }).disposed(by: JQ_disposeBag)
+ }else{
+ let vc = UpdatePhoneVC(wechatInfoModel: u,firstAccessToken: model.accessToken)
+ JQ_currentViewController().jq_push(vc: vc)
+ }
}
}).disposed(by: JQ_disposeBag)
}else{
--
Gitblit v1.7.1