// bug修复

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

@@ -13,7 +13,7 @@ class YHFriendRequestView: UIView {
     var sendBlock:((String?)->())?
     static let cardHeight = 313.0
     let textMaxCount = 200
-    
+    let placeHolderStr = "在银河相遇，期待与你共话未来，互学互鉴，盼成为好友，谢谢~"
     var userModel:YHMatchUserInfo = YHMatchUserInfo()  {
         didSet {
             if let url = URL(string: self.userModel.avatar) {
@@ -36,14 +36,6 @@ class YHFriendRequestView: UIView {
                 text1 = text1Arr.joined(separator: " | ")
             }
             self.professionalLabel.text = text1
-
-        }
-    }
-    
-    var isSendBtnEnabled = false {
-        didSet {
-            self.sendBtn.backgroundColor = (isSendBtnEnabled ?  UIColor.brandMainColor : UIColor.brandMainColor30)
-            self.sendBtn.isUserInteractionEnabled = isSendBtnEnabled
         }
     }
     
@@ -148,7 +140,7 @@ class YHFriendRequestView: UIView {
         label.textColor = UIColor.placeHolderColor
         label.textAlignment = .left
         label.font = UIFont.PFSC_R(ofSize: 14)
-        label.text = "请输入发送申请信息"
+        label.text = self.placeHolderStr
         label.numberOfLines = 0
         label.isHidden = false
         return label
@@ -181,20 +173,11 @@ class YHFriendRequestView: UIView {
     }
     
     @objc func didSendBtnClicked() {
-        
-        if isEmptyString(self.textView.text) {
-            YHHUD.flash(message: "请输入发送申请信息")
-            return
-        }
-        // 去除两端的空格
-        if var text = self.textView.text {
-            text = text.getRealString()
-            if text.isEmpty {
-                YHHUD.flash(message: "请输入发送申请信息")
-                return
+        var text = self.textView.text
+        if isEmptyString(text) {
+            text = self.placeHolderStr
         }
         self.sendBlock?(text)
-        }
         dismiss()
     }
     
@@ -230,7 +213,6 @@ class YHFriendRequestView: UIView {
         
         cardView.addSubview(cancelBtn)
         cardView.addSubview(sendBtn)
-        self.isSendBtnEnabled = false
         
         blackMaskView.snp.makeConstraints { make in
             make.edges.equalToSuperview()
@@ -333,7 +315,6 @@ extension YHFriendRequestView: UITextViewDelegate {
     func textViewDidChange(_ textView: UITextView) {
         self.textCountLabel.text = "\(textView.text.count)/\(self.textMaxCount)"
         self.placeHolderLabel.isHidden = !textView.text.isEmpty
-        self.isSendBtnEnabled = !textView.text.isYHEmpty()
     }
     
     func textView(_ textView: UITextView, shouldChangeTextIn range: NSRange, replacementText text: String) -> Bool {

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

@@ -19,20 +19,31 @@ class YHOrderTipsItemView: UIView {
         }
     }
     
+    func getTypeString() -> String {
+        if let msg = self.message {
+            if msg.type == YHMessageType.infoFill.rawValue {
+                return "资料填写"
+                
+            } else if msg.type == YHMessageType.cerUpload.rawValue {
+                return "证件上传"
+                
+            } else if msg.type == YHMessageType.draft.rawValue {
+                return "文书定稿"
+                
+            } else if msg.type == YHMessageType.fileSign.rawValue {
+                return "文件签字"
+                
+            } else if msg.type == YHMessageType.infoSubmit.rawValue {
+                return "资料递交"
+            }
+        }
+       
+        return ""
+    }
+    
     func updateData() {
         guard let message = message else { return }
-        var typeString = ""
-        if message.type == 1 {
-            typeString = "资料填写"
-        } else if message.type == 2 {
-            typeString = "证件上传"
-        } else if message.type == 3 {
-            typeString = "文书定稿"
-        } else if message.type == 4 {
-            typeString = "文件签字"
-        } else if message.type == 5 {
-            typeString = "资料递交"
-        }
+        var typeString = self.getTypeString()
         lableMyOrder.text = typeString
         lableName.text = message.content
         lableTime.text = getTimeString(data: TimeInterval(message.time))
@@ -127,7 +138,13 @@ class YHOrderTipsItemView: UIView {
 
 extension YHOrderTipsItemView {
     @objc func tapButton(gestureRecognizer:UITapGestureRecognizer) {
-        goTabBarBy(tabType: .community) //for test hjl
+        
+        if let msg = self.message {
+            let vc = YHMessageDetailListVC()
+            vc.type = Int(msg.type)
+            vc.title = self.getTypeString()
+            UIViewController.current?.navigationController?.pushViewController(vc)
+        }
     }
     
     func setupUI() {