// 人脉

galaxy/galaxy/Classes/Modules/Community(社区)/C/YHMatchPeopleViewController.swift

@@ -152,8 +152,8 @@ class YHMatchPeopleViewController: YHBaseViewController {
     
     @objc func didMyCardBtnClicked() {
         let vc = YHMyNameCardViewController()
-        if let userId = YHLoginManager.shared.userModel?.userid {
-            vc.userId = "\(userId)"
+        if let userId = YHLoginManager.shared.userModel?.id, !userId.isEmpty {
+            vc.userId = userId
         }
         self.navigationController?.pushViewController(vc)
 

galaxy/galaxy/Classes/Modules/Community(社区)/V/YHMyNameCardAvatarInfoCell.swift

@@ -27,26 +27,19 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
             self.cityLabel.frame = CGRectMake(0, 0, cityWidth+8, 20)
             self.zodiacLabel.text = self.userModel.zodiac
             
-            if self.userModel.address.city.isEmpty && self.userModel.zodiac.isEmpty {
-                self.nameTextView.attributed.text = """
-                \(self.userModel.username, .foreground(UIColor.mainTextColor), .font(UIFont.PFSC_B(ofSize:18)))
-                """
-            } else if self.userModel.zodiac.isEmpty {
-                self.nameTextView.attributed.text = """
-                \(self.userModel.username, .foreground(UIColor.mainTextColor), .font(UIFont.PFSC_B(ofSize:18))) \(.view(self.cityLabel, .original(.center)))
-                """
-            } else if self.userModel.address.city.isEmpty {
-                self.nameTextView.attributed.text = """
-                \(self.userModel.username, .foreground(UIColor.mainTextColor), .font(UIFont.PFSC_B(ofSize:18))) \(.view(self.zodiacLabel, .original(.center)))
-                """
-            } else {
-                self.nameTextView.attributed.text = """
-                \(self.userModel.username, .foreground(UIColor.mainTextColor), .font(UIFont.PFSC_B(ofSize:18))) \(.view(self.cityLabel, .original(.center))) \(.view(self.zodiacLabel, .original(.center)))
-                """
-            }
+            var name:ASAttributedString = .init(string:self.userModel.username, .font(UIFont.PFSC_B(ofSize: 18)), .foreground(UIColor.mainTextColor))
+            var cityTag: ASAttributedString = "  \(.view(self.cityLabel, .original(.center)))"
+            var zodiacTag: ASAttributedString = "  \(.view(self.zodiacLabel, .original(.center)))"
             
-            self.professionalLabel.text = self.userModel.position
-            self.detailLabel.text = self.userModel.signature
+            if !self.userModel.address.city.isEmpty {
+                name += cityTag
+            }
+            if !self.userModel.zodiac.isEmpty {
+                name += zodiacTag
+            }
+            self.nameTextView.attributed.text = name + "ASDFASFSDFASFDASFASFDASFASDFASDFASDFASFASFASFDAFAFASDFASDF"
+            self.professionalLabel.text = self.userModel.position + "dfasdfasdfasfasdfasdfasfdasdfasdfasdfsadfasdfas"
+            self.detailLabel.text = self.userModel.signature + "asdfasfdasdfasdfasdfasdgfasdgewrgqrgegvsvdfvfgbsdfbvdfbvsdfvasdvadsvasvda"
             self.signImgV.isHidden = !self.userModel.isSigned
         }
     }
@@ -67,16 +60,15 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
     
     lazy var cardView: UIView = {
         let view = UIView()
-        view.backgroundColor = .white
-        let bgImgView = UIImageView(image: UIImage(named: "people_add_friend_bg"))
-        view.addSubview(bgImgView)
-        bgImgView.snp.makeConstraints { make in
-            make.edges.equalToSuperview()
-        }
         view.layer.cornerRadius = 3.0
         return view
     }()
     
+    lazy var bgImgV:UIImageView = {
+        let bgImgView = UIImageView(image: UIImage(named: "people_add_friend_bg"))
+        return bgImgView
+    }()
+    
     lazy var editBtn:UIButton = {
         let btn = UIButton()
         btn.setImage(UIImage(named: "people_card_edit"), for: .normal)
@@ -152,19 +144,23 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
         self.backgroundColor = .clear
         self.contentView.backgroundColor = .clear
         
+        self.contentView.addSubview(self.bgImgV)
         self.contentView.addSubview(self.cardView)
         self.contentView.addSubview(self.headImgV)
         self.contentView.addSubview(self.signImgV)
         
         cardView.addSubview(self.nameTextView)
-        cardView.addSubview(self.cityLabel)
         cardView.addSubview(self.professionalLabel)
         cardView.addSubview(self.detailLabel)
         cardView.addSubview(self.editBtn)
         
         self.cardView.snp.makeConstraints { make in
             make.left.right.bottom.equalToSuperview()
-            make.top.equalTo(self.headImgV.snp.centerY)
+            make.top.equalTo(headWidth/2.0)
+        }
+        
+        self.bgImgV.snp.makeConstraints { make in
+            make.edges.equalTo(self.cardView)
         }
         
         self.editBtn.snp.makeConstraints { make in
@@ -188,13 +184,14 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
         
         self.nameTextView.snp.makeConstraints { make in
             make.left.equalTo(16)
+            make.right.equalTo(-16)
             make.top.equalTo(headWidth/2.0+10.0)
         }
         
         self.professionalLabel.snp.makeConstraints { make in
             make.left.equalTo(16)
             make.right.equalTo(-16)
-            make.height.equalTo(20)
+//            make.height.equalTo(20)
             make.top.equalTo(self.nameTextView.snp.bottom).offset(8)
         }
         
@@ -202,7 +199,7 @@ class YHMyNameCardAvatarInfoCell: UITableViewCell {
             make.left.equalTo(16)
             make.right.equalTo(-16)
             make.top.equalTo(self.professionalLabel.snp.bottom).offset(8)
-            make.height.equalTo(18)
+//            make.height.equalTo(18)
             make.bottom.equalTo(-16)
         }
         

galaxy/galaxy/Classes/Modules/Login(登录)/M/YHUserModel.swift

@@ -10,6 +10,7 @@ import UIKit
 import SmartCodable
 
 struct YHUserModel: SmartCodable {
+    var id:String = ""
     var userid: Int?
     var nickname: String?
     var mobile: String?

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

@@ -288,8 +288,8 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
         switch item.type {
         case .myCard://我的名片
             let vc = YHMyNameCardViewController()
-            if let userId = YHLoginManager.shared.userModel?.userid {
-                vc.userId = "\(userId)"
+            if let userId = YHLoginManager.shared.userModel?.id, !userId.isEmpty {
+                vc.userId = userId
             }
             self.navigationController?.pushViewController(vc)
         case .myMessage://我的消息