Merge commit '611667f3' into xiezhaolin

# Conflicts:
#	galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsListViewController.swift

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -248,8 +248,6 @@
 		04EA230A2BB5172F009DA928 /* YHDocumentPromptTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EA23092BB5172F009DA928 /* YHDocumentPromptTableViewCell.swift */; };
 		04EA230C2BB5199D009DA928 /* YHDocumentToActionTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EA230B2BB5199D009DA928 /* YHDocumentToActionTableViewCell.swift */; };
 		04EA230E2BB538E9009DA928 /* YHDocumentUploadTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EA230D2BB538E9009DA928 /* YHDocumentUploadTableViewCell.swift */; };
-		04EA23102BB655A1009DA928 /* YHDocumentUploadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EA230F2BB655A1009DA928 /* YHDocumentUploadView.swift */; };
-		04EA23122BB68C07009DA928 /* YHFileItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04EA23112BB68C07009DA928 /* YHFileItemView.swift */; };
 		04F4B76B2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 04F4B76A2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift */; };
 		6203A87EDC96313BBE789D9C /* Pods_galaxy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 987C69D43AE8D85DC1930DCF /* Pods_galaxy.framework */; };
 		A51044182B493675006B60BB /* README.md in Resources */ = {isa = PBXBuildFile; fileRef = A51044172B493675006B60BB /* README.md */; };
@@ -257,6 +255,8 @@
 		A514E5DC2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */; };
 		A517A4DF2BB53BE8000DEECD /* YHDocListBottomView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A517A4DE2BB53BE8000DEECD /* YHDocListBottomView.swift */; };
 		A517A4E12BB573EB000DEECD /* YHDocListCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A517A4E02BB573EB000DEECD /* YHDocListCell.swift */; };
+		A517A4E42BB6C4BB000DEECD /* YHDocumentUploadView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A517A4E22BB6C4BB000DEECD /* YHDocumentUploadView.swift */; };
+		A517A4E52BB6C4BB000DEECD /* YHFileItemView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A517A4E32BB6C4BB000DEECD /* YHFileItemView.swift */; };
 		A520124F2BABCE05008655EA /* YHFileListContentView.swift in Sources */ = {isa = PBXBuildFile; fileRef = A520124E2BABCE05008655EA /* YHFileListContentView.swift */; };
 		A53026902B4E6F2700F35102 /* YHHomeCustomCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = A530268F2B4E6F2700F35102 /* YHHomeCustomCell.swift */; };
 		A53B61122BB128AF0010B573 /* YHFileListItemsView2.swift in Sources */ = {isa = PBXBuildFile; fileRef = A53B61112BB128AF0010B573 /* YHFileListItemsView2.swift */; };
@@ -647,8 +647,6 @@
 		04EA23092BB5172F009DA928 /* YHDocumentPromptTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDocumentPromptTableViewCell.swift; sourceTree = "<group>"; };
 		04EA230B2BB5199D009DA928 /* YHDocumentToActionTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDocumentToActionTableViewCell.swift; sourceTree = "<group>"; };
 		04EA230D2BB538E9009DA928 /* YHDocumentUploadTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDocumentUploadTableViewCell.swift; sourceTree = "<group>"; };
-		04EA230F2BB655A1009DA928 /* YHDocumentUploadView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDocumentUploadView.swift; sourceTree = "<group>"; };
-		04EA23112BB68C07009DA928 /* YHFileItemView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileItemView.swift; sourceTree = "<group>"; };
 		04F4B76A2BAA7E1E00D13284 /* YHCertificateTemplateSheetView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHCertificateTemplateSheetView.swift; sourceTree = "<group>"; };
 		19B28612265782F9DC1BE0B0 /* Pods-galaxy.testenv.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.testenv.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.testenv.xcconfig"; sourceTree = "<group>"; };
 		58C2405158A4A6632D0E7460 /* Pods-galaxy.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-galaxy.debug.xcconfig"; path = "Target Support Files/Pods-galaxy/Pods-galaxy.debug.xcconfig"; sourceTree = "<group>"; };
@@ -658,6 +656,8 @@
 		A514E5DB2B60A2B700C93951 /* YHServiceCenterSecondViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHServiceCenterSecondViewController.swift; sourceTree = "<group>"; };
 		A517A4DE2BB53BE8000DEECD /* YHDocListBottomView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDocListBottomView.swift; sourceTree = "<group>"; };
 		A517A4E02BB573EB000DEECD /* YHDocListCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHDocListCell.swift; sourceTree = "<group>"; };
+		A517A4E22BB6C4BB000DEECD /* YHDocumentUploadView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHDocumentUploadView.swift; sourceTree = "<group>"; };
+		A517A4E32BB6C4BB000DEECD /* YHFileItemView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFileItemView.swift; sourceTree = "<group>"; };
 		A520124E2BABCE05008655EA /* YHFileListContentView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = YHFileListContentView.swift; sourceTree = "<group>"; };
 		A530268F2B4E6F2700F35102 /* YHHomeCustomCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHHomeCustomCell.swift; sourceTree = "<group>"; };
 		A53B61112BB128AF0010B573 /* YHFileListItemsView2.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YHFileListItemsView2.swift; sourceTree = "<group>"; };
@@ -1055,7 +1055,6 @@
 		045EEDF82B9F171A0022A143 /* MyDocuments(我的文书) */ = {
 			isa = PBXGroup;
 			children = (
-				04EA23062BB50719009DA928 /* View */,
 				A53B61172BB3C9410010B573 /* V */,
 				04A7BD0D2BA41C7600BD35A2 /* ViewModel */,
 				04A7BD0C2BA41C6E00BD35A2 /* Model */,
@@ -1575,19 +1574,6 @@
 			path = Server;
 			sourceTree = "<group>";
 		};
-		04EA23062BB50719009DA928 /* View */ = {
-			isa = PBXGroup;
-			children = (
-				04EA23072BB50753009DA928 /* YHDocumentMessageTableViewCell.swift */,
-				04EA23092BB5172F009DA928 /* YHDocumentPromptTableViewCell.swift */,
-				04EA230B2BB5199D009DA928 /* YHDocumentToActionTableViewCell.swift */,
-				04EA230D2BB538E9009DA928 /* YHDocumentUploadTableViewCell.swift */,
-				04EA230F2BB655A1009DA928 /* YHDocumentUploadView.swift */,
-				04EA23112BB68C07009DA928 /* YHFileItemView.swift */,
-			);
-			path = View;
-			sourceTree = "<group>";
-		};
 		4758815B24BAF3CAA24EC6A8 /* Pods */ = {
 			isa = PBXGroup;
 			children = (
@@ -1649,6 +1635,12 @@
 		A53B61172BB3C9410010B573 /* V */ = {
 			isa = PBXGroup;
 			children = (
+				A517A4E22BB6C4BB000DEECD /* YHDocumentUploadView.swift */,
+				A517A4E32BB6C4BB000DEECD /* YHFileItemView.swift */,
+				04EA23072BB50753009DA928 /* YHDocumentMessageTableViewCell.swift */,
+				04EA23092BB5172F009DA928 /* YHDocumentPromptTableViewCell.swift */,
+				04EA230B2BB5199D009DA928 /* YHDocumentToActionTableViewCell.swift */,
+				04EA230D2BB538E9009DA928 /* YHDocumentUploadTableViewCell.swift */,
 				A53B61182BB3C9960010B573 /* YHMyDocListHeaderView.swift */,
 				A517A4DE2BB53BE8000DEECD /* YHDocListBottomView.swift */,
 				A517A4E02BB573EB000DEECD /* YHDocListCell.swift */,
@@ -2351,6 +2343,7 @@
 				045EEEBF2B9F171A0022A143 /* YHWorkFileItemView.swift in Sources */,
 				04AF58C42B4FC51C0066011A /* YHLocalizable.swift in Sources */,
 				A520124F2BABCE05008655EA /* YHFileListContentView.swift in Sources */,
+				A517A4E42BB6C4BB000DEECD /* YHDocumentUploadView.swift in Sources */,
 				045EEF042B9F171A0022A143 /* YHIdentityCardCell.swift in Sources */,
 				045EEEB42B9F171A0022A143 /* YHWorkExampleMessageTableViewCell.swift in Sources */,
 				045EEF132B9F171A0022A143 /* YHCountryMessage.swift in Sources */,
@@ -2371,7 +2364,6 @@
 				045EEEDB2B9F171A0022A143 /* YHCollegeSearchViewController.swift in Sources */,
 				045EEE982B9F171A0022A143 /* YHPreviewInfoQuestionAndAnswerItemsView.swift in Sources */,
 				045EEE7A2B9F171A0022A143 /* YHPreviewForOtherInfoModel.swift in Sources */,
-				04EA23102BB655A1009DA928 /* YHDocumentUploadView.swift in Sources */,
 				A5ACE94A2B4564F7002C94D2 /* YHHUDProgressView.swift in Sources */,
 				04A271232BABFF3200652B1B /* YHCertificateUploadTypeCell.swift in Sources */,
 				A5D0012C2BABC84A001F003C /* YHFileListBottomView.swift in Sources */,
@@ -2459,7 +2451,6 @@
 				045EEEBC2B9F171A0022A143 /* YHClipperButton.swift in Sources */,
 				045EEF102B9F171A0022A143 /* YHMainApplicantInformationViewModel.swift in Sources */,
 				0493B3DC2BA7EFE600AF9393 /* YHCertificateSearchViewController.swift in Sources */,
-				04EA23122BB68C07009DA928 /* YHFileItemView.swift in Sources */,
 				A5FD63BF2B6250BC00D1D9DA /* YHInformationPerfectCell.swift in Sources */,
 				045EEE942B9F171A0022A143 /* YHPreviewInfoQuestionAndAnswerItemView.swift in Sources */,
 				045EEED32B9F171A0022A143 /* YHScoreItemCell.swift in Sources */,
@@ -2553,6 +2544,7 @@
 				04EA230C2BB5199D009DA928 /* YHDocumentToActionTableViewCell.swift in Sources */,
 				A5C5B2EA2B4ECA4D00A7C5D1 /* YHDavidModel0.swift in Sources */,
 				A5ACE9572B4564F7002C94D2 /* YHBasicContentView.swift in Sources */,
+				A517A4E52BB6C4BB000DEECD /* YHFileItemView.swift in Sources */,
 				045EEEFE2B9F171A0022A143 /* YHFormItemInputTextCell.swift in Sources */,
 				045EEEDD2B9F171A0022A143 /* YHCollegeNameCell.swift in Sources */,
 				045EEF162B9F171A0022A143 /* YHMainApplicantInformationViewController.swift in Sources */,
@@ -2732,7 +2724,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2742,7 +2734,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = galaxy/Res/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "智慧银河";
+				INFOPLIST_KEY_CFBundleDisplayName = "智汇银河-Test";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard";
@@ -2933,7 +2925,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2943,7 +2935,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = galaxy/Res/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "智慧银河-dev";
+				INFOPLIST_KEY_CFBundleDisplayName = "智汇银河-Dev";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard";
@@ -2975,7 +2967,7 @@
 				CODE_SIGN_IDENTITY = "Apple Development";
 				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				CODE_SIGN_STYLE = Manual;
-				CURRENT_PROJECT_VERSION = 6;
+				CURRENT_PROJECT_VERSION = 8;
 				DEVELOPMENT_TEAM = "";
 				"DEVELOPMENT_TEAM[sdk=iphoneos*]" = RXHYW88XR7;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
@@ -2985,7 +2977,7 @@
 				);
 				GENERATE_INFOPLIST_FILE = YES;
 				INFOPLIST_FILE = galaxy/Res/Info.plist;
-				INFOPLIST_KEY_CFBundleDisplayName = "智慧银河";
+				INFOPLIST_KEY_CFBundleDisplayName = "智汇银河";
 				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.business";
 				INFOPLIST_KEY_UIApplicationSupportsIndirectInputEvents = YES;
 				INFOPLIST_KEY_UILaunchStoryboardName = "Launch Screen.storyboard";

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/C/YHMyDocumentsListViewController.swift

@@ -12,19 +12,15 @@ import UIKit
  */
 
 class YHMyDocumentsListViewController: YHBaseViewController {
-    var bottomButton: UIButton!
     var tableView: UITableView!
     var dataSource: [YHMyDocumentsListModel]?
     var viewModel: YHMyDocumentsListViewModel?
     var orderId: Int = 0
     var mobile: String = ""
+    var arrIDs : [Int] = []//保存所有下载的id
     
     
-    private var isEditFlag : Bool = false {
-        didSet {
-            updateUIForEditStatus()
-        }
-    }
+    private var isEditFlag : Bool = false
     
     lazy var headSessionView : YHMyDocListHeaderView = {
         let view = YHMyDocListHeaderView()
@@ -93,6 +89,17 @@ extension YHMyDocumentsListViewController {
         headSessionView.block = { type in
             self.updateUIForClickButton(type: type)
             self.isEditFlag = type == .downAll ? true : false
+            
+            guard let model = self.viewModel?.mainModel else { return }
+            for item in model.docs {
+                item.isEditFlag = self.isEditFlag
+                if self.isEditFlag {
+                    item.isSelectedFlag = true
+                }
+            }
+            
+            self.updateBottomViewNumbers()
+            self.tableView.reloadData()
         }
         
         view.addSubview(bottomView)
@@ -104,14 +111,24 @@ extension YHMyDocumentsListViewController {
         
         bottomView.block = { (type,flag) in
             if type == .downAllCheck {
-                
+                //todo
+                self.readyToDownLoad()
             } else if type == .allChoice {
+                guard let model = self.viewModel?.mainModel else { return }
+                var tag = false
                 if flag {
                     //全选
+                    tag = true
                 } else {
                     //全选 的 反选
+                    tag = false
                 }
+                for item in model.docs {
+                    item.isSelectedFlag = tag
                 }
+                self.updateBottomViewNumbers()
+            }
+            self.tableView.reloadData()
         }
         
         tableView = {
@@ -131,18 +148,10 @@ extension YHMyDocumentsListViewController {
             make.left.right.equalToSuperview()
             make.bottom.equalToSuperview()
         }
-        
-        
         bottomView.layoutIfNeeded()
         bottomView.bottomButton.addYinHeGradualLayer()
     }
     
-    private func updateUIForEditStatus() {
-        //
-        
-    }
-    
-    
     private func updateUIForClickButton(type : ClickButtonType) {
         bottomView.snp.removeConstraints()
         tableView.snp.removeConstraints()
@@ -167,6 +176,53 @@ extension YHMyDocumentsListViewController {
             }
         }
     }
+    
+    private func updateBottomViewNumbers() {
+        guard let dataSource = viewModel?.mainModel else { return }
+        let count = dataSource.docs.count
+        var selectedCount : Int = 0
+        for item in dataSource.docs {
+            if item.isSelectedFlag {
+                selectedCount += 1
+            }
+        }
+        bottomView.updateNumber(allNumber: count, selectedNumber: selectedCount)
+    }
+    
+    private func readyToDownLoad() {
+        
+        guard let dataSource = viewModel?.mainModel else {
+            YHHUD.flash(message: "暂无数据")
+            return
+        }
+        
+        arrIDs.removeAll()
+        for item in dataSource.docs {
+            if item.isSelectedFlag {
+                arrIDs.append(item.id)
+            }
+        }
+        
+        if arrIDs.isEmpty {
+            YHHUD.flash(message: "至少选择一个下载项")
+            return
+        }
+        
+        //弹窗 选择发送邮箱
+        if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
+            let params = ["order_id":orderID,"ids":arrIDs,"email":"383913637@qq.com"]
+            viewModel?.sendEmailForDocs(params, callBackBlock: { success, error in
+                if success {
+                    YHHUD.flash(message: "发送成功")
+                } else {
+                    let msg = error?.errorMsg ?? "发送失败"
+                    YHHUD.flash(message: msg)
+                }
+            })
+        } else {
+            YHHUD.flash(message: "订单ID 为空")
+        }
+    }
 }
 
 extension YHMyDocumentsListViewController: UITableViewDelegate, UITableViewDataSource {
@@ -185,20 +241,29 @@ extension YHMyDocumentsListViewController: UITableViewDelegate, UITableViewDataS
     }
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
-        let model = viewModel?.mainModel?.docs[indexPath.row]
-        if model?.file_type == "doc" {
-            if model?.template_id == 195 {
+        guard let  dataSource = viewModel?.mainModel else { return }
+        let model = dataSource.docs[indexPath.row]
+        if self.isEditFlag {
+            //编辑状态下的点击
+            model.isSelectedFlag = !model.isSelectedFlag
+            tableView.reloadRows(at: [indexPath], with: UITableView.RowAnimation.none)
+            updateBottomViewNumbers()
+        } else {
+            if model.file_type == "doc" {
+                if model.template_id == 195 {
                     //跳转赴港计划书
+                    
                 } else {
                     let vc = YHMyDocumentsDetailViewController()
-                vc.id = model?.id ?? 0
+                    vc.id = model.id 
                     self.navigationController?.pushViewController(vc)
                 }
             } else {
                 let vc = YHMySignatureDetailViewController()
-            vc.id = model?.id ?? 0
+                vc.id = model.id 
                 self.navigationController?.pushViewController(vc)
             }
         }
+    }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/Model/YHMyDocumentsModel.swift

@@ -27,6 +27,10 @@ class YHMyDocumentsListModel: YHBaseModel {
     var contract_lock: Int = 0
     var is_second_page: Bool = false
     var audi_opinion: String = ""
+    
+    
+    var  isEditFlag : Bool = false //是否为编辑状态
+    var  isSelectedFlag : Bool = true //是否被选择  默认全部全部选择
 }
 
 class YHMyDocumentsNameExtraModel: YHBaseModel {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocListBottomView.swift

@@ -61,6 +61,17 @@ class YHDocListBottomView: UIView {
         view.backgroundColor = .separatorColor
         return view
     }()
+    
+    
+    
+    func updateNumber(allNumber : Int,selectedNumber : Int) {
+        titleLable.text = "已选" + selectedNumber.string + "条"
+        if allNumber == selectedNumber,selectedNumber > 0 {
+            checkButton.isSelected = true
+        } else {
+            checkButton.isSelected = false
+        }
+    }
 }
 
 private extension YHDocListBottomView {
@@ -101,6 +112,10 @@ private extension YHDocListBottomView {
     @objc func clickCheckBtn() {
         checkButton.isSelected = !checkButton.isSelected
         block?(.allChoice,checkButton.isSelected)
+        
+        if checkButton.isSelected == false {
+            titleLable.text = "已选" + 0.string + "条"
+        }
     }
     
     @objc func clickDownloadBtn() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/V/YHDocListCell.swift

@@ -41,6 +41,7 @@ class YHDocListCell: UITableViewCell {
         button.setImage(UIImage(named: "my_doc_check_btn_0"), for: .normal)
         button.setImage(UIImage(named: "my_doc_check_btn_1"), for: .selected)
         button.addTarget(self, action: #selector(clickCheckBtn), for: .touchUpInside)
+        button.isUserInteractionEnabled = false
         return button
     }()
     
@@ -115,10 +116,6 @@ class YHDocListCell: UITableViewCell {
             make.width.equalTo(42)
             make.height.equalTo(20)
         }
-        
-        
-        
-        
         centerView.addSubview(titleLabel)
         titleLabel.snp.makeConstraints { make in
             make.top.equalTo(22)
@@ -139,9 +136,15 @@ class YHDocListCell: UITableViewCell {
     func updateAllViewsForDocs() {
         guard let dataSource = dataSourceForDocs else { return }
         titleLabel.text = dataSource.doc_type_name
-        
+        if dataSource.isEditFlag {
+            checkButton.isHidden = false
+            statusHoldView.isHidden = true
+            checkButton.isSelected = dataSource.isSelectedFlag
+        } else {
+            checkButton.isHidden = true
+            statusHoldView.isHidden = false
             /*
-         1: '待确认',
+             *  1: '待确认',
              *  2: '待签章',
              *  3: '已驳回',
              *  4: '待核对',
@@ -181,11 +184,11 @@ class YHDocListCell: UITableViewCell {
             statusLabel.text = statusTxt
             statusLabel.textColor = color
         }
+    }
     
     
     func updateAllViewsForSign() {
         guard let dataSource = dataSourceForSign else { return }
-        
     }
 }
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyDocuments(我的文书)/ViewModel/YHMyDocumentsListViewModel.swift

@@ -11,6 +11,7 @@ import UIKit
 class YHMyDocumentsListViewModel: YHBaseViewModel {
     var mainModel: YHMyDocumentsModel?
     
+    // 请求文书列表
     func requestDocumentsList(_ orderId: String, _ mobile: String, callBackBlock:@escaping (_ success: Bool?, _ error: YHErrorModel?)->()) {
         let params: [String : Any] = ["order_id": orderId,
                                       "mobile": mobile]
@@ -34,4 +35,24 @@ class YHMyDocumentsListViewModel: YHBaseViewModel {
             callBackBlock(false, err)
         }
     }
+    
+    //发送邮箱
+    func sendEmailForDocs(_ params : [String : Any], callBackBlock:@escaping (_ success: Bool, _ error: YHErrorModel?)->()) {
+        let strUrl = YHBaseUrlManager.shared.curURL() + YHAllApiName.Signature.sendMail
+        let _ = YHNetRequest.getRequest(url: strUrl, params: params) { [weak self] json, code in
+            //1. json字符串 转 对象
+            guard let self = self else {
+                callBackBlock(false, nil)
+                return
+            }
+            if json.code == 200 {
+                callBackBlock(true, nil)
+            } else {
+                let error : YHErrorModel = YHErrorModel(errorCode:Int32(json.code), errorMsg: json.msg)
+                callBackBlock(false, error)
+            }
+        } failBlock: { err in
+            callBackBlock(false, err)
+        }
+    }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyScheme(我的方案)/View/YHSchemeHeadTotalScoreView.swift

@@ -54,7 +54,7 @@ class YHSchemeHeadTotalScoreView: UIView {
         
         scoreLabel = {
             let label = UILabel()
-            label.font = UIFont(name: "AlibabaPuHuiTi-Bold", size: 24)
+            label.font = UIFont.PFSC_B(ofSize: 24)//UIFont(name: "AlibabaPuHuiTi-Bold", size: 24)
             label.textColor = UIColor(hex: 0xd48638)
             label.textAlignment = .right
             label.text = "-"

galaxy/galaxy/Classes/Tools/NetWork/YHAllApiName.swift

@@ -208,7 +208,6 @@ class YHAllApiName {
         static let submit = "infoflow/my-doc/doc-submit"
         // 文书操作记录
         static let record = "infoflow/my-doc/document-operation-record"
-
     }
     
     //我的证件
@@ -219,8 +218,6 @@ class YHAllApiName {
         // 清单列表
         static let documentListApi = "infoflow/certificate/certificate_document_list"
         
-        
-        
         // 证件列表
         static let certificateListApi = "infoflow/needUploadItems"
         

galaxy/galaxy/README.md

-智慧银河APP-iOS
+智汇银河APP-iOS
 =================
 
 工程文件说明