电子签证缴费优化

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -3,7 +3,7 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 70;
+	objectVersion = 60;
 	objects = {
 
 /* Begin PBXBuildFile section */
@@ -2645,7 +2645,7 @@
 /* End PBXFileReference section */
 
 /* Begin PBXFileSystemSynchronizedBuildFileExceptionSet section */
-		043F0ED92E02A60C003354EB /* PBXFileSystemSynchronizedBuildFileExceptionSet */ = {
+		043F0ED92E02A60C003354EB /* Exceptions for "yinheReplayExt" folder in "yinheReplayExt" target */ = {
 			isa = PBXFileSystemSynchronizedBuildFileExceptionSet;
 			membershipExceptions = (
 				Info.plist,
@@ -2655,7 +2655,18 @@
 /* End PBXFileSystemSynchronizedBuildFileExceptionSet section */
 
 /* Begin PBXFileSystemSynchronizedRootGroup section */
-		043F0ECD2E02A60C003354EB /* yinheReplayExt */ = {isa = PBXFileSystemSynchronizedRootGroup; exceptions = (043F0ED92E02A60C003354EB /* PBXFileSystemSynchronizedBuildFileExceptionSet */, ); explicitFileTypes = {}; explicitFolders = (); path = yinheReplayExt; sourceTree = "<group>"; };
+		043F0ECD2E02A60C003354EB /* yinheReplayExt */ = {
+			isa = PBXFileSystemSynchronizedRootGroup;
+			exceptions = (
+				043F0ED92E02A60C003354EB /* Exceptions for "yinheReplayExt" folder in "yinheReplayExt" target */,
+			);
+			explicitFileTypes = {
+			};
+			explicitFolders = (
+			);
+			path = yinheReplayExt;
+			sourceTree = "<group>";
+		};
 /* End PBXFileSystemSynchronizedRootGroup section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -7238,14 +7249,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Embed Pods Frameworks";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-frameworks.sh\"\n";
@@ -7259,14 +7266,10 @@
 			inputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources-${CONFIGURATION}-input-files.xcfilelist",
 			);
-			inputPaths = (
-			);
 			name = "[CP] Copy Pods Resources";
 			outputFileListPaths = (
 				"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources-${CONFIGURATION}-output-files.xcfilelist",
 			);
-			outputPaths = (
-			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
 			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-galaxy/Pods-galaxy-resources.sh\"\n";

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/VisaPayment(4电子签字缴费)/V/YHPayMemberContentItem.swift

@@ -24,7 +24,7 @@ class YHPayMemberContentItem: UIView {
     
     lazy var titleLabel: UILabel = {
         let label = UILabel()
-        label.font = UIFont.PFSC_R(ofSize: 13)
+        label.font = UIFont.PFSC_B(ofSize: 13)
         label.text = "档案号："
         label.textColor = UIColor.mainTextColor70
         return label
@@ -33,7 +33,7 @@ class YHPayMemberContentItem: UIView {
     lazy var detailLabel: UILabel = {
         let label = UILabel()
         label.numberOfLines = 0
-        label.font = UIFont.PFSC_R(ofSize: 13)
+        label.font = UIFont.PFSC_B(ofSize: 13)
         label.text = ""
         label.textColor = UIColor.mainTextColor
         label.textAlignment = .right

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/VisaPayment(4电子签字缴费)/V/YHVisaPaymentTipsCell.swift

@@ -11,7 +11,7 @@ import UIKit
 class YHVisaPaymentTipsCell: UITableViewCell {
 
     static let cellReuseIdentifier = "YHVisaPaymentTipsCell"
-    static let cellH: CGFloat = 218.0 * (KScreenWidth - 16 * 2) / 343.0
+    static let cellH: CGFloat = 200.0 * (KScreenWidth - 16 * 2) / 343.0
 
     lazy var whiteContentView: UIView = {
         let view = UIView()

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/C/YHHKVisaRenewalApplicationVC.swift

@@ -122,7 +122,7 @@ extension YHHKVisaRenewalApplicationVC {
                         return
                     }
                     self.copyToPasteBoard(person.file_num, message: "已复制临时档案号")
-                }))
+                }, true))
 //                let dateString = self.getShortDate(person.birthday)
                 paymentMembers.append(.subInfo("申请人出生日期：", "\(person.birthday)", nil))
                 paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_money)", nil, .bottom))
@@ -287,9 +287,9 @@ extension YHHKVisaRenewalApplicationVC: UITableViewDelegate, UITableViewDataSour
                 cell.setupCellInfo(title: title)
                 return cell
             }
-        case let .subInfo(title, detail, actionTitle, cellType, defaultMargin, showBottomLine, action):
+        case let .subInfo(title, detail, actionTitle, cellType, defaultMargin, showBottomLine, action, needBold):
             if let cell = tableView.dequeueReusableCell(withIdentifier: YHVisaRenewalPayInfoCell.cellReuseIdentifier) as? YHVisaRenewalPayInfoCell {
-                cell.setupCellInfo(title: title, detail: detail, rightButtonTitle: actionTitle, cellType: cellType, defaultMargin: defaultMargin, showBottomLine: showBottomLine)
+                cell.setupCellInfo(title: title, detail: detail, rightButtonTitle: actionTitle, cellType: cellType, defaultMargin: defaultMargin, showBottomLine: showBottomLine, needBold: needBold)
                 cell.rightButtonEvent = {
                     action?()
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/C/YHHKVisaRenewalPaymentVC.swift

@@ -285,7 +285,7 @@ extension YHHKVisaRenewalPaymentVC {
                                 return
                             }
                             self.copyToPasteBoard(person.file_num, message: "已复制档案号")
-                        }))
+                        }, true))
                         paymentMembers.append(.subInfo("可缴费时间段：", "\(person.min_pay_time) - \(person.max_pay_time)", nil))
                         if person.fee_money.count > 0 {
                             paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_money)", nil))
@@ -306,7 +306,7 @@ extension YHHKVisaRenewalPaymentVC {
                             return
                         }
                         self.copyToPasteBoard(person.file_num, message: "已复制档案号")
-                    }))
+                    }, true))
                     
                     if person.fee_money.count > 0 {
                         paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_money)", nil))
@@ -329,7 +329,7 @@ extension YHHKVisaRenewalPaymentVC {
                             return
                         }
                         self.copyToPasteBoard(person.file_num, message: "已复制档案号")
-                    }))
+                    }, true))
                     paymentMembers.append(.subInfo("可缴费时间段：", "\(person.min_pay_time) - \(person.max_pay_time)", nil))
                     if person.fee_money.count > 0 {
                         paymentMembers.append(.subInfo("缴费金额：", "\(person.fee_money)", nil))
@@ -351,7 +351,7 @@ extension YHHKVisaRenewalPaymentVC {
                 paymentMembers.append(.occupyingSpace)
             }
             sections.append(confirmingPresenceSection)
-            let payMethodTips: ASAttributedString = .init(string: "提示：", .foreground(UIColor.yhOrangeColor)) + .init(string: "请先到下方“缴费成员”处") + .init(string: "复制档案号", .foreground(UIColor.yhOrangeColor)) + .init(string: "再缴费")
+            let payMethodTips: ASAttributedString = .init(string: "提示：", .foreground(UIColor.failColor)) + .init(string: "请先到下方“缴费成员”处", .foreground(UIColor.failColor)) + .init(string: "复制档案号", .foreground(UIColor.failColor)) + .init(string: "再缴费", .foreground(UIColor.failColor))
             let webPageUrl = paymentListModel.payment_url
             if webPageUrl.count > 0, URL(string: webPageUrl) != nil {
                 let payMethodSection: [YHVisaRenewalItemDetailType] = [.sectionHeader("港府官网缴费方式", "缴费遇到问题?", { [weak self] in
@@ -545,9 +545,9 @@ extension YHHKVisaRenewalPaymentVC: UITableViewDelegate, UITableViewDataSource {
                 cell.setupCellInfo(title: title, status: status)
                 return cell
             }
-        case let .subInfo(title, detail, actionTitle, cellType, defaultMargin, showBottomLine, action):
+        case let .subInfo(title, detail, actionTitle, cellType, defaultMargin, showBottomLine, action, needBold):
             if let cell = tableView.dequeueReusableCell(withIdentifier: YHVisaRenewalPayInfoCell.cellReuseIdentifier) as? YHVisaRenewalPayInfoCell {
-                cell.setupCellInfo(title: title, detail: detail, rightButtonTitle: actionTitle, cellType: cellType, defaultMargin: defaultMargin, showBottomLine: showBottomLine)
+                cell.setupCellInfo(title: title, detail: detail, rightButtonTitle: actionTitle, cellType: cellType, defaultMargin: defaultMargin, showBottomLine: showBottomLine, needBold: needBold)
                 cell.rightButtonEvent = {
                     action?()
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/M/YHVisaRenewalItemDetailType.swift

@@ -16,7 +16,7 @@ enum YHVisaRenewalItemDetailType {
     case payMethodUrl(_ title: String, _ tips: String, _ url: String, _ action: (() -> Void)? = nil)
     case payMethodQrcode(_ title: String, _ tips: String, _ qrcodeUrl: String)
     case subHeader(_ title: String, _ status: YHVisaRenewalPaymentStatus)
-    case subInfo(_ title: String, _ detail: String, _ actionTitle: String? = nil, _ cellType: YHResignRoundCellType = .mid, _ defaultMargin: CGFloat? = nil, _ showBottomLine: Bool = false, _ action: (() -> Void)? = nil)
+    case subInfo(_ title: String, _ detail: String, _ actionTitle: String? = nil, _ cellType: YHResignRoundCellType = .mid, _ defaultMargin: CGFloat? = nil, _ showBottomLine: Bool = false, _ action: (() -> Void)? = nil, _ needBold: Bool = false)
     case subContent(_ title: String, _ detail: String, _ actionTitle: String? = nil, _ cellType: YHResignRoundCellType = .mid, _ action: (() -> Void)? = nil)
     case subRemark(_ remark: String)
     case occupyingSpace
@@ -27,7 +27,7 @@ enum YHVisaRenewalInfoItemDetailType {
     case payMethodUrl(_ title: String, _ tips: String, _ url: String, _ action: (() -> Void)? = nil)
     case payMethodQrcode(_ title: String, _ tips: String, _ qrcodeUrl: String)
     case subHeader(_ title: String)
-    case subInfo(_ title: String, _ detail: String, _ actionTitle: String? = nil, _ cellType: YHResignRoundCellType = .mid, _ defaultMargin: CGFloat? = nil, _ showBottomLine: Bool = false, _ action: (() -> Void)? = nil)
+    case subInfo(_ title: String, _ detail: String, _ actionTitle: String? = nil, _ cellType: YHResignRoundCellType = .mid, _ defaultMargin: CGFloat? = nil, _ showBottomLine: Bool = false, _ action: (() -> Void)? = nil, _ needBold: Bool = false)
     case subContent(_ title: String, _ detail: String, _ actionTitle: String? = nil, _ cellType: YHResignRoundCellType = .mid, _ action: (() -> Void)? = nil)
     case occupyingSpace
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/HongKongVisaRenewalPayment(续签在港缴费)/V/YHVisaRenewalPayInfoCell.swift

@@ -55,11 +55,13 @@ class YHVisaRenewalPayInfoCell: YHVisaRenewalPayInfoBaseCell {
         fatalError("init(coder:) has not been implemented")
     }
     
-    func setupCellInfo(title: String, detail: String, rightButtonTitle: String? = nil, cellType: YHResignRoundCellType = .mid, defaultMargin: CGFloat? = nil, showBottomLine: Bool = false) {
+    func setupCellInfo(title: String, detail: String, rightButtonTitle: String? = nil, cellType: YHResignRoundCellType = .mid, defaultMargin: CGFloat? = nil, showBottomLine: Bool = false, needBold: Bool = false) {
         infoTitleLabel.text = title
         infoDetailLabel.text = detail
         updateInnerCellCorner(cellType)
         bottomLineView.isHidden = !showBottomLine
+        infoTitleLabel.font = needBold ? .PFSC_B(ofSize: 13) : .PFSC_R(ofSize: 13)
+        infoDetailLabel.font = needBold ? .PFSC_B(ofSize: 13) : .PFSC_R(ofSize: 13)
         
         var bottomMargin: CGFloat = cellType == .bottom ? 16 : 0
         if let defaultMargin = defaultMargin {