// 用户头像

galaxy/galaxy/Classes/Modules/Login(登录)/VM/YHLoginViewModel.swift

@@ -195,10 +195,12 @@ extension YHLoginViewModel {
             printLog(json)
             if let dic = json.data as? [AnyHashable : Any] {
                 if let uid = dic["id"] as? String {
+                    YHLoginManager.shared.userModel?.id = uid
                     callBack?(uid)
                     return
                 }
             }
+            YHLoginManager.shared.userModel?.id = ""
             callBack?("")
         } failBlock: { err in
             callBack?("")

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift

@@ -54,7 +54,7 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
     let likeViewModel: YHMyLikeViewModel = YHMyLikeViewModel()
     let msgViewModel: YHMsgViewModel = YHMsgViewModel()
     let loginViewModel = YHLoginViewModel()
-    let userViewModel = YHInformationAuthorizeViewModel()
+    let userViewModel = YHMatchUserViewModel()
 
     lazy var tableView: UITableView = {
         let tableView = UITableView(frame: CGRect.zero, style:.grouped)
@@ -404,14 +404,30 @@ extension YHMyViewController {
     
     func requstUserBasicInfo() {
         if YHLoginManager.shared.isLogin() {
-            userViewModel.requestUserInfo {[weak self] success, error in
+            if isEmptyString(YHLoginManager.shared.userModel?.id) {
+                self.loginViewModel.getUserId {
+                    [weak self] uid in
                     guard let self = self else { return }
-                let url = URL(string: self.userViewModel.model.avatar)
-                self.headerView.avarImgView.kf.setImage(with: url, placeholder: UIImage(named: "mine_head_default"))
-                
+                    requestUserAvatar()
                 }
+            } else {
+                requestUserAvatar()
+            }
+
         } else {
             headerView.updateAvatar()
         }
     }
+    
+    func requestUserAvatar() {
+        if let uid = YHLoginManager.shared.userModel?.id, !uid.isEmpty {
+            self.userViewModel.getUserNameCardInfo(uid: uid) {
+                [weak self] success, error in
+                guard let self = self else { return }
+                let url = URL(string: self.userViewModel.nameCardInfo.avatar)
+                self.headerView.avarImgView.kf.setImage(with: url, placeholder: UIImage(named: "mine_head_default"))
+            }
+        }
+    }
+    
 }