【综合】7天领取流程调整

PDF Office/PDF Master/MemberCenter/View/KMSignUpView.swift

@@ -504,16 +504,22 @@ class KMSignUpView: KMBaseXibView {
             self?.window?.hideWaitingView()
             
 #if VERSION_DMG
-            if result == true {
-                if KMDataManager.ud_bool(forKey: KMAdvancedAnnualTrailKey) {
-                    DispatchQueue.main.async {
-                        let winC = KMPurchaseEmbeddedWindowController.currentCode(KMAdvancedAnnualSubscriptionTrailCodeKey_DMG)
-                        winC.showWindow(nil)
-                        winC.window?.center()
-                    }
-                    
-                    KMDataManager.ud_set(false, forKey: KMAdvancedAnnualTrailKey)
+            if result == nil || result == false {
+                return
+            }
+            if KMDataManager.ud_bool(forKey: KMAdvancedAnnualTrailKey) == false {
+                return
+            }
+            
+            let info = KMMemberInfo.shared
+            if info.vip_levels == "1" || info.canTrail { // 用户注册成功 或 登录免费账户
+                DispatchQueue.main.async {
+                    let winC = KMPurchaseEmbeddedWindowController.currentCode(KMAdvancedAnnualSubscriptionTrailCodeKey_DMG)
+                    winC.showWindow(nil)
+                    winC.window?.center()
                 }
+                    
+                KMDataManager.ud_set(false, forKey: KMAdvancedAnnualTrailKey)
             }
 #endif
         }