Commit cd0a7978 authored by Steven杜宇's avatar Steven杜宇

// 消息页资料递交

parent a0d26533
...@@ -160,11 +160,17 @@ class YHMessageListVC: YHBaseViewController { ...@@ -160,11 +160,17 @@ class YHMessageListVC: YHBaseViewController {
hasUnreadMsg = true hasUnreadMsg = true
} }
// 资料递交
if !self.viewModel.msgList.dataSubmission.lastMessage.isEmpty {
hasUnreadMsg = true
}
if hasUnreadMsg { if hasUnreadMsg {
msgArr.append(self.viewModel.msgList.information) msgArr.append(self.viewModel.msgList.information)
msgArr.append(self.viewModel.msgList.certificate) msgArr.append(self.viewModel.msgList.certificate)
msgArr.append(self.viewModel.msgList.draft) msgArr.append(self.viewModel.msgList.draft)
msgArr.append(self.viewModel.msgList.signature) msgArr.append(self.viewModel.msgList.signature)
msgArr.append(self.viewModel.msgList.dataSubmission)
} }
} }
emptyDataTipsView.isHidden = msgArr.count > 0 emptyDataTipsView.isHidden = msgArr.count > 0
......
...@@ -60,12 +60,19 @@ class YHMsgListModel: SmartCodable { ...@@ -60,12 +60,19 @@ class YHMsgListModel: SmartCodable {
var certificate: YHMessageInfoModel = YHMessageInfoModel() var certificate: YHMessageInfoModel = YHMessageInfoModel()
var draft: YHMessageInfoModel = YHMessageInfoModel() var draft: YHMessageInfoModel = YHMessageInfoModel()
var signature: YHMessageInfoModel = YHMessageInfoModel() var signature: YHMessageInfoModel = YHMessageInfoModel()
var dataSubmission: YHMessageInfoModel = YHMessageInfoModel()
required init() { required init() {
self.information.type = YHMessageType.infoFill.rawValue self.information.type = YHMessageType.infoFill.rawValue
self.certificate.type = YHMessageType.cerUpload.rawValue self.certificate.type = YHMessageType.cerUpload.rawValue
self.draft.type = YHMessageType.draft.rawValue self.draft.type = YHMessageType.draft.rawValue
self.signature.type = YHMessageType.fileSign.rawValue self.signature.type = YHMessageType.fileSign.rawValue
self.dataSubmission.type = YHMessageType.infoSubmit.rawValue
}
enum CodingKeys: String, CodingKey {
case information, certificate, draft, signature
case dataSubmission = "data_submission"
} }
} }
......
...@@ -32,6 +32,7 @@ class YHMsgViewModel: NSObject { ...@@ -32,6 +32,7 @@ class YHMsgViewModel: NSObject {
self.msgList.certificate.type = YHMessageType.cerUpload.rawValue self.msgList.certificate.type = YHMessageType.cerUpload.rawValue
self.msgList.draft.type = YHMessageType.draft.rawValue self.msgList.draft.type = YHMessageType.draft.rawValue
self.msgList.signature.type = YHMessageType.fileSign.rawValue self.msgList.signature.type = YHMessageType.fileSign.rawValue
self.msgList.dataSubmission.type = YHMessageType.infoSubmit.rawValue
callBackBlock(true, nil) callBackBlock(true, nil)
} else { } else {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment