细节修改 服务中心

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/C/YHResignCertificateListViewController.swift

@@ -64,6 +64,7 @@ extension YHResignCertificateListViewController: UITableViewDelegate, UITableVie
     
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withClass: YHResignCertificateListTableViewCell.self)
+        cell.index = indexPath.row
         var model: [YHResignCertificateModel] = []
         if indexPath.row == 0 {
             model = self.viewModel.mainModel.TRAVEL
@@ -84,9 +85,6 @@ extension YHResignCertificateListViewController: UITableViewDelegate, UITableVie
         cell.dataSource = model
         cell.clickBlock = { [weak self] model in
             guard let self = self else { return }
-            if model.age < 11 {
-                return
-            }
             if indexPath.row == 0 {
                 if model.cert_type == "PASS_PORT" {
                     let vc = YHResignCertificateDetailPassPortViewController()
@@ -104,6 +102,9 @@ extension YHResignCertificateListViewController: UITableViewDelegate, UITableVie
                 self.navigationController?.pushViewController(vc)
             }
             if indexPath.row == 2 {
+                if model.age < 11 {
+                    return
+                }
                 let vc = YHResignCertificateDetailViewController()
                 vc.detailType = .HongKongCard
                 vc.dataModel = model

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/M/YHResignCertificateModel.swift

@@ -63,6 +63,7 @@ class YHResignCertificateInfoModel: SmartCodable {
     var validate_start: String = ""
     var validate_end: String = ""
 
+    var is_show: Bool = false
     required init() {
     }
 }

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignCertificateManage(续期证件管理)/V/YHResignCertificateListTableViewCell.swift

@@ -15,6 +15,7 @@ class YHResignCertificateListTableViewCell: UITableViewCell {
     var titleLabel: UILabel!
     var mainItemView: UIView!
     var lineView: UIView!
+    var index: Int = 0
     var dataSource: [YHResignCertificateModel]? {
         didSet {
             updateAllViews()
@@ -104,6 +105,7 @@ class YHResignCertificateListTableViewCell: UITableViewCell {
             }
             total = total + 1
             let itemView = YHResignCertificateView()
+            itemView.index = index
             itemView.clickBlock = {[weak self] model in
                 guard let self = self else { return }
                 if let block = self.clickBlock {
@@ -133,6 +135,7 @@ class YHResignCertificateView: UIView {
     var explainLabel: UILabel!
     var nextStepImageView: UIImageView!
     var centerButton: UIButton!
+    var index: Int = 0
 
     var dataSource: YHResignCertificateModel? {
         didSet {
@@ -230,8 +233,18 @@ class YHResignCertificateView: UIView {
             explainLabel.textColor = UIColor(hex: 0x3cc694)
             nextStepImageView.image = UIImage(named: "service_adopter_income_success")
         }
-        if dataSource.age < 11 {
+        
+        if dataSource.cert_type == "PASS_PORT" {
+            subTitleLabel.text = " (护照入境)"
+        } else if dataSource.cert_type == "HK_PASS_PORT" {
+            subTitleLabel.text = " (港澳通行证入境)"
+        } else {
+            subTitleLabel.text = ""
+        }
+        
+        if dataSource.age < 11 , index == 2 {
             explainLabel.text = "无需提供"
+            subTitleLabel.text = " (未满11岁)"
             explainLabel.textColor = UIColor.mainTextColor18
             nextStepImageView.isHidden = true
             explainLabel.snp.remakeConstraints { make in
@@ -248,16 +261,7 @@ class YHResignCertificateView: UIView {
                 make.centerY.equalToSuperview()
             }
         }
-        if dataSource.cert_type == "PASS_PORT" {
-            subTitleLabel.text = " (护照入境)"
-        } else if dataSource.cert_type == "HK_PASS_PORT" {
-            subTitleLabel.text = " (港澳通行证入境)"
-        } else {
-            subTitleLabel.text = ""
-        }
-        if dataSource.age < 11 {
-            subTitleLabel.text = " (未满11岁)"
-        }
+        
     }
     
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/Resign(续签)/ResignGuidelines(续期身份指引)/C/YHResignGuidelinesExampleShareViewController.swift

@@ -158,11 +158,11 @@ extension YHResignGuidelinesExampleShareViewController {
     }
     
     @objc func wxClick() {
-//        YHShareManager.shared.sendLinkContent("香港身份规划专属礼包，限时领取!", "1000元折扣福利券，资深银河规划专家1V1评估方案", UIImage(named: "invitation_with_gifts_share_other") ?? UIImage(), link: YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/evaluation?channel=lkhtj-app&customer_id=\(YHLoginManager.shared.userModel?.id ?? "")&scene_id=30")
+        YHShareManager.shared.sendLinkContent("香港身份测评专属方案，限时领取！", "银河身份规划专家1V1评估，获取香港身份方案", UIImage(named: "resign_guidelines_example_share_other") ?? UIImage(), link: YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/evaluation?channel=lkhtj-app&customer_id=\(YHLoginManager.shared.userModel?.id ?? "")&scene_id=30")
     }
     
     @objc func peopleClick() {
-//        YHShareManager.shared.sendLinkContent("香港身份规划专属礼包，限时领取!", "1000元折扣福利券，资深银河规划专家1V1评估方案", UIImage(named: "invitation_with_gifts_share_other") ?? UIImage(), link: YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/evaluation?channel=lkhtj-app&customer_id=\(YHLoginManager.shared.userModel?.id ?? "")&scene_id=30", WXSceneTimeline)
+        YHShareManager.shared.sendLinkContent("香港身份测评专属方案，限时领取！", "银河身份规划专家1V1评估，获取香港身份方案", UIImage(named: "resign_guidelines_example_share_other") ?? UIImage(), link: YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/evaluation?channel=lkhtj-app&customer_id=\(YHLoginManager.shared.userModel?.id ?? "")&scene_id=30", WXSceneTimeline)
 
     }
     

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceCenterStepThreeTableHeadView.swift

@@ -16,7 +16,7 @@ class YHServiceCenterStepThreeTableHeadView: UIView {
         didSet {
             if dataSource.count > selectIndex {
                 let model = dataSource[selectIndex]
-                explainLabel.text = model.personStr
+                explainLabel.text = "本期人员：" + model.personStr
                 if model.personStr.count > 20 {
                     moreButton.isHidden = false
                 } else {
@@ -118,7 +118,8 @@ class YHServiceCenterStepThreeTableHeadView: UIView {
     }
     
     @objc func showAlert() {
-        YHCommonAlertView.show("", explainLabel.text, "我知道了",fullGuestureEnable: false) {
+        let model = dataSource[selectIndex]
+        YHCommonAlertView.show("", "本期续期人员：" + model.personStr, "我知道了",fullGuestureEnable: false) {
             
         } callBack: {
             

galaxy/galaxy/Res/Assets.xcassets/ServiceCenter/续签/续签身份指引/resign_guidelines_example_share_other.imageset/Contents.json

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