Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

* 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  消息
  // 消息
  //  最近浏览数

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

@@ -135,22 +135,18 @@ class YHMessageListVC: YHBaseViewController {
                 msgArr.removeAll()
                 // 资料填写
                 if let infoMsg = msgList.information {
-                    infoMsg.customType = .infoFill
                     msgArr.append(infoMsg)
                 }
                 // 证件上传
                 if let cerMsg = msgList.certificate {
-                    cerMsg.customType = .cerUpload
                     msgArr.append(cerMsg)
                 }
                 // 文书定稿
                 if let dratMsg = msgList.draft {
-                    dratMsg.customType = .draft
                     msgArr.append(dratMsg)
                 }
                 // 文件签字
                 if let signMsg = msgList.signature {
-                    signMsg.customType = .fileSign
                     msgArr.append(signMsg)
                 }
                 emptyDataTipsView.isHidden = msgArr.count > 0

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

@@ -22,9 +22,7 @@ class YHMessageInfoModel: SmartCodable {
     var lastMessage: String = ""
     var lastMessageTime: Int = 0
     var type: Int = 0
-    
-    var customType: YHMessageType = .none
-    
+        
     required init() {
         
     }
@@ -33,20 +31,19 @@ class YHMessageInfoModel: SmartCodable {
         case unreadCount = "unread_count"
         case lastMessage = "last_message"
         case lastMessageTime = "last_message_time"
-        case type
     }
     
     func getTitle() -> String {
-        if customType == .infoFill {
+        if type == YHMessageType.infoFill.rawValue {
             return "资料填写"
             
-        } else if customType == .cerUpload {
+        } else if type == YHMessageType.cerUpload.rawValue {
             return "证件上传"
             
-        } else if customType == .draft {
+        } else if type == YHMessageType.draft.rawValue {
             return "文书定稿"
             
-        } else if customType == .fileSign {
+        } else if type == YHMessageType.fileSign.rawValue {
             return "文件签字"
         }
         return ""
@@ -75,4 +72,8 @@ class YHDetailMessageModel: SmartCodable {
     required init() {
         
     }
+    
+    enum CodingKeys: String, CodingKey {
+        case orderId = "order_id"
+    }
 }

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

@@ -34,16 +34,16 @@ class YHMessageSessionCell: UITableViewCell {
         
         self.nameLabel.text = model.getTitle()
         
-        if model.customType == .infoFill {
+        if model.type == YHMessageType.infoFill.rawValue {
             self.iconImgView.image = UIImage(named: "msg_icon_info_fill")
             
-        } else if model.customType == .cerUpload {
+        } else if model.type == YHMessageType.cerUpload.rawValue {
             self.iconImgView.image = UIImage(named: "msg_icon_cer_upload")
             
-        } else if model.customType == .draft {
+        } else if model.type == YHMessageType.draft.rawValue {
             self.iconImgView.image = UIImage(named: "msg_icon_draft")
             
-        } else if model.customType == .fileSign {
+        } else if model.type == YHMessageType.fileSign.rawValue {
             self.iconImgView.image = UIImage(named: "msg_icon_file_sign")
         }
         

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserInfoHeaderView.swift

@@ -190,7 +190,7 @@ class YHUserInfoHeaderView: UIView {
     }
     
     func showCount(_ count: Int)-> String {
-        return count < 10000 ? String(count) : String(format: "%.1fw", Double(count/10000))
+        return count < 10000 ? String(count) : String(format: "%.1fw", Double(count)/Double(10000))
     }
     
     private func createUI() {