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

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/C/YHHKImmigrationRecordsVC.swift

@@ -118,7 +118,6 @@ extension YHHKImmigrationRecordsVC {
         
         bottomView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.right.equalToSuperview()
             make.bottom.equalTo(view.safeAreaLayoutGuide.snp.bottom)
             make.height.equalTo(64)
         }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/HongKongImmigrationRecords(在港记录管理)/C/YHHKRecordsEditContentVC.swift

@@ -135,7 +135,6 @@ extension YHHKRecordsEditContentVC {
         
         bottomView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.right.equalToSuperview()
             make.bottom.equalTo(view.safeAreaLayoutGuide.snp.bottom)
             make.height.equalTo(64)
         }

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

@@ -16,7 +16,7 @@ class YHHKVisaRenewalPaymentVC: YHBaseViewController {
     }()
     
     private lazy var tableView: UITableView = {
-        let view = UITableView(frame: .zero, style: .plain)
+        let view = UITableView(frame: .zero, style: .grouped)
         view.backgroundColor = .clear
         view.separatorStyle = .none
         view.rowHeight = UITableView.automaticDimension
@@ -28,6 +28,53 @@ class YHHKVisaRenewalPaymentVC: YHBaseViewController {
         return view
     }()
     
+    private lazy var guideButton: UIControl = {
+        let button = UIControl()
+        let titleLabel = UILabel()
+        titleLabel.text = "领取续签指引"
+        titleLabel.textColor = .mainTextColor
+        titleLabel.textAlignment = .center
+        titleLabel.font = UIFont.PFSC_R(ofSize: 11)
+        let image = UIImage(named: "resign_visa_pay_guide")
+        let imageView = UIImageView(image: image)
+        button.addSubview(titleLabel)
+        button.addSubview(imageView)
+        imageView.snp.makeConstraints { make in
+            make.top.equalToSuperview().offset(12)
+            make.centerX.equalToSuperview()
+            make.width.height.equalTo(24)
+        }
+        titleLabel.snp.makeConstraints { make in
+            make.top.equalTo(imageView.snp.bottom)
+            make.centerX.equalTo(imageView)
+        }
+        button.addTarget(self, action: #selector(clickGuideButton), for: .touchUpInside)
+        return button
+    }()
+    
+    private lazy var sureButton: UIButton = {
+        let button = UIButton(type: .custom)
+        button.titleLabel?.font = UIFont.PFSC_M(ofSize: 16)
+        button.setTitle("去上传旅行证件", for: .normal)
+        button.setTitle("去上传旅行证件", for: .highlighted)
+        button.setTitleColor( UIColor(hex:0xffffff), for: .normal)
+        button.setTitleColor( UIColor(hex:0xffffff), for: .highlighted)
+        button.setTitleColor( UIColor(hex:0xffffff), for: .disabled)
+        button.addTarget(self, action: #selector(clickSureButton), for: .touchUpInside)
+        button.layer.cornerRadius = kCornerRadius3
+        button.clipsToBounds = true
+        button.backgroundColor = .brandMainColor
+        button.alpha = 0.3
+        button.isEnabled = false
+        return button
+    }()
+    
+    private lazy var bottomView: UIView = {
+        let view = UIView()
+        view.backgroundColor = .white
+        return view
+    }()
+        
     private var didShowGuideVC = false
     
     private let orderId: Int
@@ -58,6 +105,14 @@ class YHHKVisaRenewalPaymentVC: YHBaseViewController {
 }
 
 extension YHHKVisaRenewalPaymentVC {
+    @objc private func clickGuideButton() {
+        showGuideVC()
+    }
+    
+    @objc private func clickSureButton() {
+        //
+    }
+    
     private func setupUI() {
         gk_navTitle = "签证缴费"
         gk_navBarAlpha = 1.0
@@ -65,6 +120,28 @@ extension YHHKVisaRenewalPaymentVC {
         view.backgroundColor = UIColor.contentBkgColor
         view.addSubview(stepView)
         view.addSubview(tableView)
+        view.addSubview(bottomView)
+        bottomView.addSubview(sureButton)
+        bottomView.addSubview(guideButton)
+        
+        bottomView.snp.makeConstraints { make in
+            make.left.right.equalToSuperview()
+            make.bottom.equalTo(view.safeAreaLayoutGuide.snp.bottom)
+            make.height.equalTo(64)
+        }
+        
+        guideButton.snp.makeConstraints { make in
+            make.left.equalToSuperview()
+            make.top.bottom.equalToSuperview()
+            make.width.equalTo(106)
+        }
+        
+        sureButton.snp.makeConstraints { make in
+            make.left.equalTo(guideButton.snp.right)
+            make.right.equalToSuperview().offset(-20)
+            make.centerY.equalToSuperview()
+            make.height.equalTo(48)
+        }
         stepView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
             make.top.equalTo(k_Height_NavigationtBarAndStatuBar)
@@ -74,7 +151,7 @@ extension YHHKVisaRenewalPaymentVC {
             make.left.equalToSuperview().offset(kMargin).priority(.high)
             make.right.equalToSuperview().offset(-kMargin).priority(.high)
             make.top.equalTo(stepView.snp.bottom)
-            make.bottom.equalToSuperview()
+            make.bottom.equalTo(bottomView.snp.top)
         }
         
         tableView.tableHeaderView = UIView(frame: CGRect.init(x: 0, y: 0, width: KScreenWidth, height: kMargin))

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

@@ -112,7 +112,6 @@ extension YHVisaRenewalGuideVC {
         bottomView.addSubview(sureButton)
         bottomView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.right.equalToSuperview()
             make.bottom.equalTo(view.safeAreaLayoutGuide.snp.bottom)
             make.height.equalTo(64)
         }

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

@@ -81,7 +81,6 @@ extension YHVisaRenewalTroubleshootingGuideVC {
         bottomView.addSubview(sureButton)
         bottomView.snp.makeConstraints { make in
             make.left.right.equalToSuperview()
-            make.right.equalToSuperview()
             make.bottom.equalTo(view.safeAreaLayoutGuide.snp.bottom)
             make.height.equalTo(64)
         }

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/续签/续签在港缴费/resign_visa_pay_guide.imageset/Contents.json

+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "resign_visa_pay_guide@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "resign_visa_pay_guide@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}