缴费618

galaxy/fastlane/Fastfile

@@ -37,9 +37,10 @@ platform :ios do
   push = "HIGH"
   txIM = "develop-desk-tx"
   gift = "gift_push"
+  Im_618 = "develop-tx-618"
 
   #打包正使用的分支
-  myPack_branch = txIM
+  myPack_branch = Im_618
 
 
   # 打adhoc包 执行命令 fastlane galaxyTest

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHConfigManager.swift

@@ -73,6 +73,25 @@ class YHConfigManager: NSObject {
         }
         return tOssUrl + "/"
     }
+    
+    // 测试环境-Support H5
+    static let baseSupportH5UrlTest: String = "https://test-supporth5.galaxy-immi.com"
+    // 正式环境-Support H5
+    static let baseSupportH5UrlRelease: String = "https://supporth5.galaxy-immi.com"
+    
+    var supportH5Url: String {
+        var tSupportUrl = ""
+#if DEBUG
+        tSupportUrl = YHConfigManager.baseSupportH5UrlTest
+#elseif TESTENV
+        tSupportUrl = YHConfigManager.baseSupportH5UrlTest
+#elseif UATENV
+        tSupportUrl = YHConfigManager.baseSupportH5UrlRelease
+#else
+        tSupportUrl = YHConfigManager.baseSupportH5UrlRelease
+#endif
+        return tSupportUrl + "/"
+    }
 }
 
 extension YHConfigManager {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/Resign(续签)/ResignHKAppoint(在港递交预约)/C/YHResignAppointScheduleListViewController.swift

@@ -414,7 +414,33 @@ class YHResignAppointScheduleListViewController: YHBaseViewController {
             self.updateBottomBtnAndMotifyBtnStatus()
         }
     }
-}
+    
+    private func gotoH5RenewalApplicationVC(id: Int, isEdit: Int) {
+        // http://192.168.25.49:3000/renewalPayment.html#/?id=1728&isEdit=2&orderId=157506&stepId=613&param=eyJhbGjoQC7uciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE3NTIxMzIyMDgsImkiOjQyMzgxNzEzODcwNzAyMSwidSI6IumTtuays-mbhuWboiIsInIiOiJzdXBlcl9hcHAifQ.ZWIiwq8qrUidVOyL7HZmjfQawQl5kN_DsZnvdj3y_jQ
+        var url = YHBaseUrlManager.shared.supportH5URL() + "renewalPayment.html#/" + "?id=\(id)&isEdit=\(isEdit)&orderId=\(orderId)&stepId=\(renewalId)"
+        if YHLoginManager.shared.isLogin() {
+            let token = YHLoginManager.shared.h5Token
+            let urlHasParam = String.hasQueryParameters(urlString: url)
+            if urlHasParam {
+                url = url + "&param=" + token
+            } else {
+                url = url + "?param=" + token
+            }
+        }
+        var tUrl = url
+        if !url.contains("navigationH=") {
+            tUrl = url + "?navigationH=\(k_Height_NavigationtBarAndStatuBar)"
+            if url.contains("?") {
+                tUrl = url + "&navigationH=\(k_Height_NavigationtBarAndStatuBar)"
+            }
+        }
+        let vc = YHH5WebViewVC()
+        vc.url = tUrl
+        vc.isHideNavigationBar = false
+        vc.isFullScreenFlag = false
+        navigationController?.pushViewController(vc)
+    }
+ }
 
 extension YHResignAppointScheduleListViewController: UITableViewDelegate, UITableViewDataSource {
     
@@ -440,8 +466,9 @@ extension YHResignAppointScheduleListViewController: UITableViewDelegate, UITabl
                 cell.applyPaymentBlock = {
                     [weak self]  in
                     guard let self = self else { return }
-                    let vc = YHHKVisaRenewalApplicationVC(id: model.id, isEdit: model.is_edit)
-                    self.navigationController?.pushViewController(vc)
+//                    let vc = YHHKVisaRenewalApplicationVC(id: model.id, isEdit: model.is_edit)
+//                    self.navigationController?.pushViewController(vc)
+                    self.gotoH5RenewalApplicationVC(id: model.id, isEdit: model.is_edit)
                 }
                 cell.modifyBtn.isHidden = self.isHiddenModifyBtn
                 // 点击修改按钮
@@ -467,8 +494,9 @@ extension YHResignAppointScheduleListViewController: UITableViewDelegate, UITabl
             cell2.applyPaymentBlock = {
                 [weak self] in
                 guard let self = self else { return }
-                let vc = YHHKVisaRenewalApplicationVC(id: model.id, isEdit: model.is_edit)
-                self.navigationController?.pushViewController(vc)
+//                let vc = YHHKVisaRenewalApplicationVC(id: model.id, isEdit: model.is_edit)
+//                self.navigationController?.pushViewController(vc)
+                self.gotoH5RenewalApplicationVC(id: model.id, isEdit: model.is_edit)
                 
             }
             let isShowCorner =  (indexPath.row == scheduleArr.count-1)

galaxy/galaxy/Classes/Tools/NetWork/YHBaseUrlManager.swift

@@ -40,6 +40,10 @@ class YHBaseUrlManager {
         return YHConfigManager.shared.h5Url
     }
     
+    func supportH5URL() -> String {
+        return YHConfigManager.shared.supportH5Url
+    }
+    
     // 隐私协议 PrivacyAgreement
     func curPrivacyAgreementUrl() -> String {
         return curH5URL() + "superApp/ganglife"