优化

galaxy/galaxy.xcodeproj/project.pbxproj

@@ -8497,7 +8497,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.10;
+				MARKETING_VERSION = 2.1.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8643,7 +8643,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.10;
+				MARKETING_VERSION = 2.1.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8851,7 +8851,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.10;
+				MARKETING_VERSION = 2.1.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -8899,7 +8899,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 2.1.10;
+				MARKETING_VERSION = 2.1.9;
 				PRODUCT_BUNDLE_IDENTIFIER = com.intelligence.galaxy;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";

galaxy/galaxy/Classes/Modules/Plan(方案)/MakePlan/C/YHMakePlanViewController.swift

@@ -107,7 +107,7 @@ class YHMakePlanViewController: YHBaseViewController {
                     vc.isFullScreenFlag = false
                     vc.navTitle = "购物车"
                     vc.isSupportWebviewInterBackFlag = true
-                    self.navigationController?.pushViewController(vc)
+                    UIViewController.current?.navigationController?.pushViewController(vc)
                 }
             }
         }
@@ -120,7 +120,7 @@ class YHMakePlanViewController: YHBaseViewController {
     }
     
     @objc func share() {
-        YHMakePlanShareAlertView.show(url: viewModel.score.url) { _ in
+        YHMakePlanShareAlertView.show(url: viewModel.score.share_url) { _ in
             
         }
     }
@@ -129,6 +129,7 @@ class YHMakePlanViewController: YHBaseViewController {
         viewModel.getProductList {[weak self] _, _ in
             guard let self = self else { return }
             tableView.reloadData()
+            updataPrice()
             getScore()
         }
     }

galaxy/galaxy/Classes/Modules/Plan(方案)/MakePlan/M/YHMakePlanScoreModel.swift

@@ -12,5 +12,5 @@ import SmartCodable
 struct YHMakePlanScoreModel: SmartCodable {
     var year: Int = -1
     var pass_rate: String = ""
-    var url: String = ""
+    var share_url: String = ""
 }

galaxy/galaxy/Classes/Modules/Plan(方案)/MakePlan/V/YHMakePlanCardView.swift

@@ -138,8 +138,25 @@ class YHMakePlanCardView: UIView {
     }
     
     @objc func gotoDetail() {
+        if selectButton.isHidden {
+            return
+        }
+        
+        var id = self.data?.product_id ?? 0
+        if self.data?.price == "" {
+            let count = self.data?.sub_product.count ?? 0
+            var index = 0
+            for i in 0 ..< count {
+                let flag = self.data?.sub_product[i].is_add_cart ?? false
+                if flag {
+                    index = i
+                }
+            }
+            let subModel = data?.sub_product[index]
+            id = subModel?.product_id ?? 0
+        }
         
-        var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/goods/sales-detail" + "?id=\(self.data?.product_id ?? 0)" + "&source=renewal_customize"
+        var url = YHBaseUrlManager.shared.curH5URL() + "superAppBridge.html#/goods/sales-detail" + "?id=\(id)" + "&source=renewal_customize&hidelive=1"
 
         if YHLoginManager.shared.isLogin() {
             let token = YHLoginManager.shared.h5Token

galaxy/galaxy/Classes/Modules/Plan(方案)/MakePlan/V/YHMakePlanTopView.swift

@@ -12,11 +12,13 @@ import AttributedString
 class YHMakePlanTopView: UIView {
     var dataSource: YHMakePlanScoreModel? {
         didSet {
+            let year = dataSource?.year ?? 0
+            let rate = dataSource?.pass_rate ?? ""
             let a: ASAttributedString = .init("预计可续期(年) ", .font(UIFont.PFSC_M(ofSize: 14)), .foreground(UIColor(hex: 0x6a7586)))
-            let b: ASAttributedString = .init("\(String(describing: dataSource?.year))", .font(UIFont.PFSC_M(ofSize: 24)), .foreground(UIColor.mainTextColor))
+            let b: ASAttributedString = .init("\(year)", .font(UIFont.PFSC_M(ofSize: 24)), .foreground(UIColor.mainTextColor))
             yearsLabel.attributed.text = a + b
             let aa: ASAttributedString = .init("续签综合通过率 ", .font(UIFont.PFSC_M(ofSize: 14)), .foreground(UIColor(hex: 0x6a7586)))
-            let bb: ASAttributedString = .init("\(String(describing: dataSource?.pass_rate))", .font(UIFont.PFSC_M(ofSize: 24)), .foreground(UIColor.mainTextColor))
+            let bb: ASAttributedString = .init("\(rate)", .font(UIFont.PFSC_M(ofSize: 24)), .foreground(UIColor.mainTextColor))
 //            let c: ASAttributedString = .init("%", .font(UIFont.PFSC_M(ofSize: 16)), .foreground(UIColor.mainTextColor))
             percentageLabel.attributed.text = aa + bb
         }

galaxy/galaxy/Classes/Modules/Plan(方案)/MakePlan/VM/YHMakePlanViewModel.swift

@@ -193,10 +193,6 @@ class YHMakePlanViewModel: YHBaseViewModel {
             // 1. json字符串 转 对象
             guard self != nil else { return }
             if json.code == 200 {
-                guard let dic = json.data?.peel as?  [String: Any], let result = YHMakePlanScoreModel.deserialize(from: dic) else {
-                    callBackBlock(false, nil)
-                    return
-                }
                 callBackBlock(true, nil)
             } else {
                 let error: YHErrorModel = YHErrorModel(errorCode: Int32(json.code), errorMsg: json.msg.count > 0 ? json.msg : "数据错误")