[new] 挽回弹窗固定年套餐

QuickSearchLocation.xcodeproj/project.pbxproj

@@ -1322,7 +1322,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 25;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = Q364C8K9BL;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -1366,7 +1366,7 @@
 				ASSETCATALOG_COMPILER_GLOBAL_ACCENT_COLOR_NAME = AccentColor;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 25;
+				CURRENT_PROJECT_VERSION = 26;
 				DEVELOPMENT_TEAM = Q364C8K9BL;
 				ENABLE_USER_SCRIPT_SANDBOXING = NO;
 				FRAMEWORK_SEARCH_PATHS = (

QuickSearchLocation/Classes/Common/Tool/QSLGuideusersToCommentManager.swift

@@ -86,26 +86,26 @@ class QSLGuideusersToCommentManager: NSObject {
     //管理处理是否触发好评引导弹窗
     func manageWhetherTriggerPopUpWindow(_ showType: QSLGuideusersToCommentType) {
         //print("startTimersfsdf---C--\(showType)---\(self.commentType)")
-        QSLNetwork().request(.guideIsTriggered(dict: [String: Any]())) { response in
-            let guideIsModel: QSLGuideIsTriggeredModel = response.mapObject(QSLGuideIsTriggeredModel.self, modelKey: "data")
-            self.commentType = showType
-            self.guideGobalModel = guideIsModel
-            if guideIsModel.trigger  && self.areThisTwoChannel(){
-                DispatchQueue.main.async {
-                    self.noMemberPositiveReviewPopWindow()
-                }
-                /*if showType == .member {
-                    DispatchQueue.main.async {
-                        self.memberPositiveReviewPopWindow()
-                    }
-                } else {
-                    DispatchQueue.main.async {
-                        self.noMemberPositiveReviewPopWindow()
-                    }
-                }*/
-            }
-        } fail: { code, msg in
-        }
+//        QSLNetwork().request(.guideIsTriggered(dict: [String: Any]())) { response in
+//            let guideIsModel: QSLGuideIsTriggeredModel = response.mapObject(QSLGuideIsTriggeredModel.self, modelKey: "data")
+//            self.commentType = showType
+//            self.guideGobalModel = guideIsModel
+//            if guideIsModel.trigger  && self.areThisTwoChannel(){
+//                DispatchQueue.main.async {
+//                    self.noMemberPositiveReviewPopWindow()
+//                }
+//                /*if showType == .member {
+//                    DispatchQueue.main.async {
+//                        self.memberPositiveReviewPopWindow()
+//                    }
+//                } else {
+//                    DispatchQueue.main.async {
+//                        self.noMemberPositiveReviewPopWindow()
+//                    }
+//                }*/
+//            }
+//        } fail: { code, msg in
+//        }
     }
     
     //判断是不是这两个渠道 ASA渠道和自然流量两个渠道

QuickSearchLocation/Classes/Common/Tool/QSLJumpManager.swift

@@ -32,7 +32,7 @@ extension QSLJumpManager {
         let vc = QSLVipController()
         vc.type = type
         self.rootViewController()?.pushVC(vc: vc)
-        vc.finishHandler = {[weak self] isCancel in
+        vc.finishHandler = {[weak self] isCancel, yearGood in
             if isCancel {
                 return
             }
@@ -42,6 +42,7 @@ extension QSLJumpManager {
             if let currentWindow = UIApplication.keyWindow {
                 gravityInstance?.track(QSLGravityConst.new_vip_retention_show, properties: ["trigger_type":"close_vip_center"])
                 QSLRetainPopUpAlertView.alert(view: currentWindow, isOneBtn: true, oneBtnText: "继续支付", oneBtnClosure:  { [weak self] in
+                    QSLCountdownManager.shared.selectGood = yearGood
                     self?.unlockBtnAction()
                     gravityInstance?.track(QSLGravityConst.new_vip_retention_click, properties: ["button":"continue_payment"])
                 },closeBtnClosure: {
@@ -52,6 +53,7 @@ extension QSLJumpManager {
     }
     
     func unlockBtnAction(){
+
         if let selectGood = QSLCountdownManager.shared.selectGood{
             
             let memberModel = QSLBaseManager.shared.userModel.memberModel
@@ -79,8 +81,13 @@ extension QSLJumpManager {
                     
                     DispatchQueue.main.asyncAfter(deadline: .now() + 1) {
                         NotificationCenter.default.post(name: QSLNotification.QSLRefreshMember, object: nil)
+                        
+                        if(!QSLBaseManager.shared.isLogin()){
+                            QSLJumpManager.shared.pushToLogin(type: .member)
+                        }
                     }
                     
+                    
                 } else if status == .cancel {
                     gravityInstance?.track(QSLGravityConst.new_vip_result, properties: ["is_member":QSLBaseManager.shared.isVip(),"purchase_result": "cancel","pay_amount":Int32(selectGood.amount)])
                     QSLLoading.error(text: "支付取消")

QuickSearchLocation/Classes/Pages/QSLVip/Controller/QSLActivityVipVC.swift

@@ -145,9 +145,17 @@ class QSLActivityVipVC: QSLBaseController {
     
     func payFailAlertTip() {
 //        gravityInstance?.track(QSLGravityConst.activity_vip_retention_show, properties: ["trigger_type":"cancel_payment"])
+        var yearGood = self.selectGood
+        for subGood in self.goodList{
+            if(subGood.level == 36600){
+                yearGood = subGood
+                break
+            }
+        }
         
         if let currentWindow = UIApplication.keyWindow {
             QSLRetainPopUpAlertView.alert(view: currentWindow, isOneBtn: true, oneBtnText: "继续支付", oneBtnClosure:  { [weak self] in
+                self?.selectGood = yearGood
                 self?.payBtnAction()
 //                gravityInstance?.track(QSLGravityConst.activity_vip_retention_click, properties: ["button":"continue_payment"])
             },secondBtnClosure: {

QuickSearchLocation/Classes/Pages/QSLVip/Controller/QSLVipController.swift

@@ -31,7 +31,8 @@ class QSLVipController: QSLBaseController {
     
     var type: QSLVipJumpType?
     var isCancel = false
-    var finishHandler: ((Bool) -> Void)?
+    var yearGood : QSLGoodModel?
+    var finishHandler: ((Bool,QSLGoodModel?) -> Void)?
     var goodList: [QSLGoodModel] = [QSLGoodModel]()
     
     ///是否是订阅的产品
@@ -452,7 +453,7 @@ class QSLVipController: QSLBaseController {
     }()
     
     deinit {
-        self.finishHandler?(self.isCancel)
+        self.finishHandler?(self.isCancel,self.yearGood)
     }
 
     override func viewDidLoad() {
@@ -800,6 +801,15 @@ extension QSLVipController {
                 }
                 
                 self.checkRenewalOfProducts()
+                
+                var yearGood = self.selectGood
+                for subGood in self.goodList{
+                    if(subGood.level == 36600){
+                        yearGood = subGood
+                        break
+                    }
+                }
+                self.yearGood = yearGood
             }
             self.goodsCollectionView.reloadData()
         } fail: { code, error in