// 赴港预约

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/C/YHCertificateAppointViewController.swift

@@ -826,6 +826,7 @@ extension YHCertificateAppointViewController {
                     let batch: [String: Any] = ["start_time": start_time,
                                                 "end_time": end_time,
                                                 "migration_office": model.hkPlace.name,
+                                                "is_will_visit_hk_galaxy_bay": model.isWillVisitHkGalaxyBay,
                                                 "users": users]
                     batchs.append(batch)
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/C/YHReAppointViewController.swift

@@ -252,6 +252,7 @@ extension YHReAppointViewController {
                     let batch: [String: Any] = ["start_time": start_time,
                                                 "end_time": end_time,
                                                 "migration_office": model.hkPlace.name,
+                                                "is_will_visit_hk_galaxy_bay": model.isWillVisitHkGalaxyBay,
                                                 "users": users]
                     batchs.append(batch)
                 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/M/YHAppointHKResultModel.swift

@@ -41,7 +41,8 @@ class YHAppointMemberGroupModel: SmartCodable {
     // 此处是私链URL数组
     var receipts: [String] = []
     var submitTime: String = ""
-    
+    var isWillVisitHkGalaxyBay: Int = 0  // 0没有选择1是2否
+
     // 自定义
     // 私链反馈回执对应的公链
     var publicReceipts: [String] = []
@@ -65,6 +66,7 @@ class YHAppointMemberGroupModel: SmartCodable {
         case goTime = "go_time"
         case receipts = "receipts"
         case submitTime = "submit_time"
+        case isWillVisitHkGalaxyBay = "is_will_visit_hk_galaxy_bay"
     }
     
     required init() {

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/M/YHAppointItem.swift

@@ -71,4 +71,8 @@ class YHSelectGroupMemberModel {
     
     // 是否显示重新预约人员名单
     var isShowReAppointView: Bool = false
+    
+    //
+    var isWillVisitHkGalaxyBay: Int = 0  // 0没有选择1是2否
+
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHGrabingNumberListCell.swift

@@ -41,9 +41,10 @@ class YHGrabingNumberListCell: UITableViewCell {
                 if group.wantMinTime == group.wantMaxTime {
                     wantTimeText = group.wantMinTime
                 }
+                let visitOption = group.isWillVisitHkGalaxyBay == 1 ? "是" : "否"
                 let items2 = [YHGrabItem(type: .info, title: "期望赴港时间：", detail: wantTimeText, isSingleLine: true),
                               YHGrabItem(type: .info, title: "期望香港办证点：", detail: group.wantImmigrationOffice, isSingleLine: false),
-                              YHGrabItem(type: .visit, title: "到访香港体验中心：香港华润大厦 (湾仔入境处旁)", detail: "是", isSingleLine: false)]
+                              YHGrabItem(type: .visit, title: "到访香港体验中心：香港华润大厦 (湾仔入境处旁)", detail: visitOption, isSingleLine: false)]
 
                 listView.intentionInfoView.updateItems(items2)
 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHHaveGrabbedNumberListCell.swift

@@ -34,9 +34,10 @@ class YHHaveGrabbedNumberListCell: UITableViewCell {
                 if group.wantMinTime == group.wantMaxTime {
                     wantTimeText = group.wantMinTime
                 }
+                let visitOption = group.isWillVisitHkGalaxyBay == 1 ? "是" : "否"
                 let items2 = [YHGrabItem(type: .info, title: "期望赴港时间：", detail: wantTimeText, isSingleLine: true),
                               YHGrabItem(type: .info, title: "期望香港办证点：", detail: group.wantImmigrationOffice, isSingleLine: false),
-                              YHGrabItem(type: .visit, title: "到访香港体验中心：香港华润大厦 (湾仔入境处旁)", detail: "是", isSingleLine: false)]
+                              YHGrabItem(type: .visit, title: "到访香港体验中心：香港华润大厦 (湾仔入境处旁)", detail: visitOption, isSingleLine: false)]
                 listView.intentionInfoView.updateItems(items2)
 
                 listContainView.addSubview(listView)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/QMAS(优才)/CustomerService(客服段)/Certificate(办证段)/AppointCertificate(3 赴港办证预约)/V/YHSelectApplicantGroupCell.swift

@@ -311,11 +311,25 @@ class YHSelectApplicantGroupCell: UITableViewCell {
         view.title = "到访香港体验中心：香港华润大厦 (湾仔入境处旁)"
         view.options = ["是", "否"]
         view.selectIndex = 0
-        view.selectBlock = {
-            [weak self] _ in
+        view.selectBlock = { [weak self] index in
             guard let self = self else { return }
-//            let isAllGo = index == 0 ? true : false
-//            self.selectBlock?(isAllGo)
+            guard let model = dataModel?.model else { return }
+
+            if index == 1 { // 点击否
+                refreshBlock?()
+                
+                let view = YHVisitHKAlertView.alertView()
+                view.confirmBlock = { [weak self] isSure in
+                    guard let self = self else { return }
+                    model.isWillVisitHkGalaxyBay = (isSure ? 1 : 2)
+                    refreshBlock?()
+                }
+                view.show()
+                
+            } else { // 点击是
+                model.isWillVisitHkGalaxyBay = (index == 0 ? 1 : 2)
+                refreshBlock?()
+            }
         }
         return view
     }()
@@ -512,7 +526,14 @@ private extension YHSelectApplicantGroupCell {
             // 办证地点是否显示红色错误提示
             timeSelectView.isNeedShowErrorTips = (model.isNeedCheck && !isSelectDate)
             
-            visitOptionView.tips = "请选择"
+            var selectIndex = -1
+            if model.isWillVisitHkGalaxyBay == 1 { // 是
+                selectIndex = 0
+            } else if model.isWillVisitHkGalaxyBay == 2 { // 否
+                selectIndex = 1
+            }
+            visitOptionView.selectIndex = selectIndex
+            visitOptionView.tips = (model.isNeedCheck && selectIndex == -1) ? "请选择" : ""
             self.setNeedsLayout()
             self.layoutIfNeeded()
         }