// 活动bug修复

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/C/YHActivityListViewController.swift

@@ -127,7 +127,7 @@ class YHActivityListViewController: YHBaseViewController {
     }()
     
     lazy var emptyDataTipsView: YHEmptyDataView = {
-        let view = YHEmptyDataView.createView("暂无活动", kNoFriendsBgName)
+        let view = YHEmptyDataView.createView("暂无活动", kEmptyCommonBgName)
         view.topMargin = 222
         view.isHidden = true
         return view
@@ -199,7 +199,6 @@ extension YHActivityListViewController {
                     self.tableView.es.noticeNoMoreData()
                     self.tableView.footer?.alpha = 1
                 }
-                
             })
         }
     }
@@ -212,9 +211,15 @@ extension YHActivityListViewController {
             self.emptyDataTipsView.isHidden = self.viewModel.arrActivityListData.count > 0 ? true : false
             DispatchQueue.main.asyncAfter(deadline: .now()+0.5, execute: {
                 self.tableView.es.stopPullToRefresh()
+                self.emptyDataTipsView.isHidden = self.viewModel.arrActivityListData.count > 0 ? true : false
+
                 if self.viewModel.hasMoreForActivityList == false {
                     self.tableView.es.noticeNoMoreData()
-                    self.tableView.footer?.alpha = 1
+                    if self.viewModel.arrActivityListData.count > 0 {
+                        self.tableView.footer?.alpha = 1
+                    } else {
+                        self.tableView.footer?.alpha = 0
+                    }
                 }
             })
         }

galaxy/galaxy/Classes/Modules/Community(社区)/Activity(活动)/V/YHActivityApplyInfoItemView.swift

@@ -62,7 +62,7 @@ extension YHActivityApplyInfoItemView {
         }
         
         nameItem.updateItem(title: "您的姓名", value: model.name)
-        numberItem.updateItem(title: "报名人数", value: String(model.number))
+        numberItem.updateItem(title: "报名人数", value: "\(model.number)人")
         phoneItem.updateItem(title: "手机号码", value: model.mobile)
     }
     

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

@@ -117,12 +117,12 @@ class YHUserNameCardInfo: SmartCodable {
 
     var isHiddenEducation : Bool {
         get {
-            return self.authorization.educationExperience == 2
+            return self.authorization.educationExperience != 2
         }
     }
     var isHiddenWorkExperience: Bool {
         get {
-            return self.authorization.workExperience == 2
+            return self.authorization.workExperience != 2
         }
     }
     

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

@@ -53,7 +53,7 @@ class YHMyEducationCell: UITableViewCell {
             }
             
             if self.userModel.isCurrentUser {
-                self.hiddenBtn.isHidden = self.userModel.isHiddenEducation
+                self.hiddenBtn.isHidden = !self.userModel.isHiddenEducation
                 
             } else {
                 self.hiddenBtn.isHidden = true

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

@@ -145,7 +145,7 @@ class YHMyWorkExperienceCell: UITableViewCell {
             }
             
             if self.userModel.isCurrentUser {
-                self.hiddenBtn.isHidden = self.userModel.isHiddenWorkExperience 
+                self.hiddenBtn.isHidden = !self.userModel.isHiddenWorkExperience
                 
             } else {
                 self.hiddenBtn.isHidden = true

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHOrderTipsView.swift

@@ -284,7 +284,7 @@ private extension YHOrderTipsView {
         }
         
         let aa: ASAttributedString = .init("智能", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor(hex: 0x2465DE, alpha: 1.0)))
-        let bb: ASAttributedString = .init("客服", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.mainTextColor))
+        let bb: ASAttributedString = .init("助理", .font(UIFont.PFSC_B(ofSize: 17)),.foreground(UIColor.mainTextColor))
         lableTip.attributed.text = aa+bb