Browse Source

【合并】App Store版本,未登录时,合并文档超出2个时,弹窗应该要引导用户Upgrade,而不是登录/注册
有弹出付费窗口,但是点击Upgrade应该弹比较表,而不是登录窗口

lizhe 1 year ago
parent
commit
0cb4881fd0

+ 3 - 3
PDF Office/PDF Master/Class/KMLightMember/Controller/SubscriptionView/WaterMark/KMSubscribeWaterMarkWindowController.swift

@@ -171,10 +171,10 @@ class KMSubscribeWaterMarkWindowController: NSWindowController {
                 
                 if KMLightMemberManager.manager.isLogin() ||
                     type == .save ||
-                    ((type.isConvertType() || type == .merge) && limit) {
-                    KMComparativeTableViewController.show(window: subscribeWaterMarkMainWindow ?? NSWindow(), .equity, inputType: type)
+                    ((type.isConvertType() || type == .merge) && !limit) {
+                    _ = KMComparativeTableViewController.show(window: subscribeWaterMarkMainWindow ?? NSWindow(), .equity, inputType: type)
                 } else {
-                    KMLoginWindowController.show(window: subscribeWaterMarkMainWindow ?? NSWindow())
+                    _ = KMLoginWindowController.show(window: subscribeWaterMarkMainWindow ?? NSWindow())
                 }
                 subscribeWaterMarkMainWindow = nil
             }