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

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

@@ -330,19 +330,30 @@ extension YHHKVisaRenewalPaymentVC {
             }
             sections.append(confirmingPresenceSection)
             let payMethodTips: ASAttributedString = .init(string: "提示：", .foreground(UIColor.yhOrangeColor)) + .init(string: "请先到下方“缴费成员”处") + .init(string: "复制档案号", .foreground(UIColor.yhOrangeColor)) + .init(string: "再缴费")
-            let webPageUrl = paymentListModel.payment_url//"https://www.gov.hk/tc/residents/immigration/nonpermanent/onlinepaymentforevisa.htm"
+            let webPageUrl = paymentListModel.payment_url
             if webPageUrl.count > 0, URL(string: webPageUrl) != nil {
                 let qrImage = webPageUrl.generateQRCode()
                 let payMethodSection: [YHVisaRenewalItemDetailType] = [.sectionHeader("港府官网缴费方式", "缴费遇到问题?", { [weak self] in
+                    guard let self = self else {
+                        return
+                    }
                     printLog("缴费遇到问题")
-                    self?.showTroubleshootingGuideVC()
+                    self.showTroubleshootingGuideVC()
                 }), .tips(payMethodTips), .payMethodUrl("方式一", "点击下方链接，跳转浏览器，进入港府官网操作缴费", webPageUrl, { [weak self] in
+                    guard let self = self else {
+                        return
+                    }
                     printLog("点击下方链接，跳转浏览器")
-                    self?.gotoWebVC(webPageUrl)
+                    self.gotoWebVC(webPageUrl)
                 }), .payMethodQrcode("方式二", "用其他设备直接扫码，或长按保存图片，通过微信识别打开", qrImage)]
                 sections.append(payMethodSection)
             }
-            var payMembersSection: [YHVisaRenewalItemDetailType] = [.sectionHeader("缴费成员", "电子签证范例")]
+            var payMembersSection: [YHVisaRenewalItemDetailType] = [.sectionHeader("缴费成员", "电子签证范例", { [weak self] in
+                guard let self = self else {
+                    return
+                }
+                self.gotoPreview(paymentListModel.evisa_example_url)
+            })]
             payMembersSection.append(contentsOf: paymentMembers)
             sections.append(payMembersSection)
             datas = sections

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

@@ -12,7 +12,7 @@ import SmartCodable
 class YHHKVisaRenewalPaymentList: SmartCodable {
     var payment_url: String = ""
     var list: [YHHKVisaRenewalPaymentItem] = []
-
+    var evisa_example_url: String = ""
     required init() {
     }
 }