// bug修复

galaxy/galaxy/Classes/Modules/Community(社区)/M/YHFriendListModel.swift

@@ -32,6 +32,7 @@ class YHFriendModel: SmartCodable {
     var bio: String = ""
     var isSign: Bool = false
     var verifyInfo: String = ""
+    var signature: String = ""
     
     required init() {
         
@@ -40,7 +41,7 @@ class YHFriendModel: SmartCodable {
     enum CodingKeys: String, CodingKey {
         case id
         case yhId = "yh_id"
-        case username, avatar, position, industry, bio
+        case username, avatar, position, industry, bio, signature
         case isSign = "is_sign"
         case verifyInfo = "verify_info"
     }

galaxy/galaxy/Classes/Modules/Community(社区)/M/YHMatchUserInfo.swift

@@ -108,6 +108,7 @@ class YHUserNameCardInfo: SmartCodable {
     var industry: String = ""
     var honor: String = ""
     var topics: [String] = []
+    var draftTopics: [String] = []
     var authorization: YHAuthorizationModel = YHAuthorizationModel()
     
     // 自定义属性
@@ -158,6 +159,7 @@ class YHUserNameCardInfo: SmartCodable {
         case yhId = "yh_id"
         case isSigned = "is_signed"
         case companyName = "company_name"
+        case draftTopics = "draft_topics"
         case id, avatar, username, zodiac, signature, bio, college, major, background, position, industry, honor
         case topics
         case address

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

@@ -22,8 +22,21 @@ class YHFriendRequestView: UIView {
                 self.headImgV.image = UIImage(named: "people_head_default")
             }
             self.nameLabel.text = self.userModel.username
-            self.professionalLabel.text = self.userModel.position
             self.signImgV.isHidden = !self.userModel.isSign
+            
+            var text1 = ""
+            var text1Arr:[String] = []
+            if !self.userModel.position.isEmpty {
+                text1Arr.append(self.userModel.position)
+            }
+            if !self.userModel.industry.isEmpty {
+                text1Arr.append(self.userModel.industry)
+            }
+            if text1Arr.count > 0 {
+                text1 = text1Arr.joined(separator: " | ")
+            }
+            self.professionalLabel.text = text1
+
         }
     }
     

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

@@ -20,7 +20,7 @@ class YHMyFriendsCell: UITableViewCell {
                 self.headImgV.image = UIImage(named: "people_head_default")
             }
             self.nameLabel.text = self.friendModel.username
-            self.detailLabel.text = self.friendModel.bio
+            self.detailLabel.text = self.friendModel.signature
             self.signImgV.isHidden = !self.friendModel.isSign
             
             var text1 = ""

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

@@ -26,7 +26,7 @@ class YHNameCardInfoView: DragCardView {
             var resultArr:[String] = []
             
             // 城市文字
-            var cityStr = self.userModel.address.showCity()
+            let cityStr = self.userModel.address.showCity()
             if !cityStr.isEmpty {
                 resultArr.append(cityStr)
             }