// 消息列表

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

@@ -36,7 +36,11 @@ class YHOrderTipsItemView: UIView {
                 
             } else if msg.type == YHMessageType.infoSubmit.rawValue {
                 return "资料递交"
-            }  else {
+                
+            }  else if msg.type == YHMessageType.identityApproved.rawValue {
+                return "身份获批"
+                
+            } else {
                 return "--"
             }
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift

@@ -224,8 +224,9 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
                 navigationController?.pushViewController(vc)
                 
             } else if model.type == 13 { //原则批已获批~
-                
-                principleViewModel.requestIsSendMail(orderId: orderID) { isSend in
+                YHHUD.show(.progress(message:"加载中"))
+                self.principleViewModel.requestIsSendMail(orderId: orderID) { isSend in
+                    YHHUD.hide()
                     if isSend {
                         // 已发送邮件
                         let vc = YHPrincipleApprovedMailViewController()

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMessageDetailListVC.swift

@@ -24,6 +24,9 @@ class YHMessageDetailListVC: YHBaseViewController {
         return model
     }()
     
+    let principleViewModel: YHPrincleViewModel = YHPrincleViewModel()
+
+    
     lazy var navBar: YHCustomNavigationBar = {
         let bar = YHCustomNavigationBar.navBar()
         bar.backgroundColor = .white
@@ -265,6 +268,10 @@ extension YHMessageDetailListVC: UITableViewDelegate, UITableViewDataSource {
                 }
                 self.navigationController?.popToRootViewController(animated: false)
                 goTabBarBy(tabType: .service)
+                
+            } else if self.type == YHMessageType.identityApproved.rawValue { // 身份获批
+                self.navigationController?.popToRootViewController(animated: false)
+                goTabBarBy(tabType: .service)
             }
         }
     }

galaxy/galaxy/Classes/Modules/Message(消息)/M/YHMsgListModel.swift

@@ -16,6 +16,7 @@ enum YHMessageType: Int {
     case draft = 3      // 文书定稿
     case fileSign = 4   // 文件签字
     case infoSubmit = 5 // 资料递交
+    case identityApproved = 6 // 身份获批
 }
 
 class YHMessageInfoModel: SmartCodable {
@@ -50,6 +51,9 @@ class YHMessageInfoModel: SmartCodable {
             
         } else if type == YHMessageType.infoSubmit.rawValue {
             return "资料递交"
+            
+        } else if type == YHMessageType.identityApproved.rawValue {
+            return "身份获批"
         }
         return ""
     }
@@ -61,6 +65,7 @@ class YHMsgListModel: SmartCodable {
     var draft: YHMessageInfoModel = YHMessageInfoModel()
     var signature: YHMessageInfoModel = YHMessageInfoModel()
     var dataSubmission: YHMessageInfoModel = YHMessageInfoModel()
+    var approval: YHMessageInfoModel = YHMessageInfoModel()
     
     required init() {
         self.information.type = YHMessageType.infoFill.rawValue
@@ -68,6 +73,7 @@ class YHMsgListModel: SmartCodable {
         self.draft.type = YHMessageType.draft.rawValue
         self.signature.type = YHMessageType.fileSign.rawValue
         self.dataSubmission.type = YHMessageType.infoSubmit.rawValue
+        self.approval.type = YHMessageType.identityApproved.rawValue
     }
     
     enum CodingKeys: String, CodingKey {

galaxy/galaxy/Classes/Modules/Message(消息)/V/YHDetailMessageCell.swift

@@ -56,6 +56,9 @@ class YHDetailMessageCell: UITableViewCell {
             if !model.url.isEmpty {
                 bottomBtn.setTitle("去签字".local, for: .normal)
             }
+            
+        } else if type == YHMessageType.identityApproved.rawValue {
+            bottomBtn.setTitle("去查看".local, for: .normal)
         }
     }
 

galaxy/galaxy/Classes/Modules/Message(消息)/V/YHMessageSessionCell.swift

@@ -48,6 +48,9 @@ class YHMessageSessionCell: UITableViewCell {
             
         } else if model.type == YHMessageType.infoSubmit.rawValue {
             self.iconImgView.image = UIImage(named: "msg_icon_info_submit")
+        
+        } else if model.type == YHMessageType.identityApproved.rawValue {
+            self.iconImgView.image = UIImage(named: "msg_icon_identity_approved")
         }
         
         self.badgeLabel.isHidden = model.unreadCount <= 0

galaxy/galaxy/Classes/Modules/Message(消息)/VM/YHMsgViewModel.swift

@@ -37,6 +37,8 @@ class YHMsgViewModel: NSObject {
                 self.msgList.draft.type = YHMessageType.draft.rawValue
                 self.msgList.signature.type = YHMessageType.fileSign.rawValue
                 self.msgList.dataSubmission.type = YHMessageType.infoSubmit.rawValue
+                self.msgList.approval.type = YHMessageType.identityApproved.rawValue
+
                 
                 callBackBlock(true, nil)
             } else {

galaxy/galaxy/Res/Assets.xcassets/Message/msg_icon_identity_approved.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "Message_shenfenhuopi@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "Message_shenfenhuopi@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}