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:
  // 续期资料管理
  // 续期
  续签文书信息确认增加h5跳转

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignDocumentManagement(续签文书管理)/C/YHResignDocumentDetailViewController.swift

@@ -249,7 +249,16 @@ extension YHResignDocumentDetailViewController {
             printLog("###previewEvent")
         }
         
-        infoConfirmationEvent = {
+        infoConfirmationEvent = { [weak self] in
+            guard let self = self else {
+                return
+            }
+            let vc = YHH5WebViewVC()
+            vc.navTitle = self.name
+            // TODO: - Alex等链接下来再赋值
+            //vc.url = url
+            vc.isFullScreenFlag = false
+            self.navigationController?.pushViewController(vc)
             printLog("###infoConfirmationEvent")
         }
         

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/C/YHResignMaterialUploadVC.swift

@@ -338,7 +338,7 @@ extension YHResignMaterialUploadVC: UITableViewDelegate, UITableViewDataSource {
             tipsLabel.font = UIFont.PFSC_R(ofSize:14)
             tipsLabel.numberOfLines = 0
             if !self.templateModel.remark.isEmpty {
-                tipsLabel.text = "注意事项:\n\(self.templateModel.remark)"
+                tipsLabel.text = "注意事项：\(self.templateModel.remark)"
             }
             view.addSubview(tipsLabel)
             
@@ -399,7 +399,7 @@ extension YHResignMaterialUploadVC: UITableViewDelegate, UITableViewDataSource {
         
         let tipsLabel = UILabel()
         tipsLabel.textColor = .labelTextColor2
-        tipsLabel.font = UIFont.PFSC_R(ofSize:12)
+        tipsLabel.font = UIFont.PFSC_R(ofSize:14)
         tipsLabel.textAlignment = .left
         tipsLabel.numberOfLines = 0
         tipsLabel.text = "支持的文件格式为jpg/jpeg、png、doc/docx、pptx、pdf，最多可上传99张图片或文件"

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignMaterialManage(续期资料管理)/VM/YHResignMaterialViewModel.swift

@@ -271,7 +271,8 @@ class YHResignMaterialViewModel: YHBaseViewModel {
                 
                 // 再调用业务接口
                 if let successUrl = successUrl, !successUrl.isEmpty {
-                    let fileName = fileUrl.absoluteString.lastPathComponent
+                    var fileName = fileUrl.absoluteString.lastPathComponent
+                    
                     
                     let model = YHMaterialModelItemModel()
                     model.url = successUrl
@@ -279,7 +280,7 @@ class YHResignMaterialViewModel: YHBaseViewModel {
                     model.naming = fileName
                     
                     let dateFormatter = DateFormatter()
-                    dateFormatter.dateFormat = "YYYY-MM-dd"
+                    dateFormatter.dateFormat = "YYYY-MM-dd HH:mm:ss"
                     let dateString = dateFormatter.string(from: Date())
                     model.updated_at = dateString
                     
@@ -375,8 +376,13 @@ class YHResignMaterialViewModel: YHBaseViewModel {
                 
                 // 再调用业务接口
                 let model = YHMaterialModelItemModel()
-                model.name = imageName
-                model.naming = imageName
+                var imgName = imageName
+                if let fileURL = URL(string: imageName) {
+                    imgName = fileURL.deletingPathExtension().lastPathComponent + "." + suffix
+                }
+            
+                model.name = imgName
+                model.naming = imgName
                 model.url = url
                 
                 let dateFormatter = DateFormatter()