关注列表页面完成

RainbowPlanet/RainbowPlanet/Model/UserModel/UserModel.swift

@@ -54,6 +54,7 @@ class UserModel : NSObject, NSCoding, Mappable{
         isNewMember <- map["is_new_member"]
         inviteUid <- map["invite_uid"]
         inviteCode <- map["invite_code"]
+        username <- map["username"]
 		
 	}
 

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/View/Cell/CardContent/PicVideo/CardContentPicVideoTableViewCell.swift

@@ -189,8 +189,8 @@ extension CardContentPicVideoTableViewCell: UICollectionViewDelegateFlowLayout,U
             }
             cell.communityRecommendDataModel = communityRecommendDataModel
         } else if type == .follow {
-            if communityRecommendDataModel?.imgs?.isEmpty ?? true {
-                if communityRecommendDataModel?.img == "" || communityRecommendDataModel?.img == nil {
+            if communityFollowDataModel?.relateData?.imgs?.isEmpty ?? true {
+                if communityFollowDataModel?.relateData?.img == "" || communityFollowDataModel?.relateData?.img == nil {
                     
                 }else {
                     cell.imgStr = communityFollowDataModel?.relateData?.img

RainbowPlanet/RainbowPlanet/Modules/CommunityModule/Community/ViewController/Follow/CommunityFollowViewController.swift

@@ -163,7 +163,7 @@ extension CommunityFollowViewController {
             self?.communityFollowDataModel?.relateData?.postComment?.insert(communityFollowPostCommentModel, at: 0)
             
             VirusViewModel.shared.comment(communityFollowDataModel:  self?.communityFollowDataModel, id: communityPostCommentIdModel?.id ?? 0)
-            let count = self?.communityFollowDataModel?.relateData?.commentCount ?? 0 + 1
+            let count = 1 + (self?.communityFollowDataModel?.relateData?.commentCount ?? 0)
             self?.communityFollowDataModel?.relateData?.commentCount = count
             self?.tableView.reloadData()
             self?.commentInputView.sendSuccess()
@@ -309,6 +309,7 @@ extension CommunityFollowViewController : UITableViewDelegate,UITableViewDataSou
         case 4:
             let cell = CardContentCommentListTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
             cell.communityFollowDataModel = communityFollowDataModel
+            cell.communityType = .follow
             cell.frame = tableView.bounds
             cell.layoutIfNeeded()
             cell.reloadData()
@@ -318,7 +319,8 @@ extension CommunityFollowViewController : UITableViewDelegate,UITableViewDataSou
             let cell = CardContentCommnetTableViewCell.cellWith(tableView: tableView, indexPath: indexPath)
             cell.addCommnetClosureName = {
                 [weak self] in
-
+                self?.communityFollowDataModel = communityFollowDataModel
+                self?.commentInputView.inputTextView.becomeFirstResponder()
             }
             return cell
         default:
@@ -351,8 +353,6 @@ extension CommunityFollowViewController : UITableViewDelegate,UITableViewDataSou
                     break
                 //评论
                 case 5:
-                    self.commentInputView.inputTextView.becomeFirstResponder()
-                    self.communityFollowDataModel = self.communityFollowDataModels[indexPath.section]
                     break
                 default:
                     break
@@ -383,8 +383,6 @@ extension CommunityFollowViewController : UITableViewDelegate,UITableViewDataSou
                         break
                     //评论
                     case 5:
-                        self.commentInputView.inputTextView.becomeFirstResponder()
-                        self.communityFollowDataModel = self.communityFollowDataModels[indexPath.section]
 
                         break
                     default:

RainbowPlanet/RainbowPlanet/Tools/EmptyView/DIYEmptyView.swift

@@ -22,7 +22,6 @@ class DIYEmptyView: LYEmptyView {
         
     }
     
-    
     /// tableView上的默认图
     ///
     /// - Parameter tableView: UITableView