【会员系统】修复“DMG 年订阅可试用情况下价格切换”

PDF Office/PDF Master/MemberCenter/ViewModel/KMProductModel.swift

@@ -509,7 +509,7 @@ class KMProductModel: ObservableObject {
                     } else {
                         return String(format: "CNY ￥%@", getDMGCNYPrice(productCode: KMAdvancedAnnualSubscriptionBlackFiveCodeKey_DMG))
                     }
-                } else if KMMemberInfo.shared.canTrail {
+                } else if KMMemberInfo.shared.canTrail && state == .trial {
                     if NSLocalizedString("USD", tableName: "MemberCenterLocalizable", comment: "") == "USD" {
                         return String(format: "USD $%@", getDMGPrice(productCode: KMAdvancedAnnualSubscriptionTrailCodeKey_DMG))
                     } else {
@@ -662,7 +662,7 @@ class KMProductModel: ObservableObject {
             } else {
                 if isBlackFive {
                     code = KMAdvancedAnnualSubscriptionBlackFiveCodeKey_DMG
-                } else if KMMemberInfo.shared.canTrail {
+                } else if KMMemberInfo.shared.canTrail && state == .trial {
                     code = KMAdvancedAnnualSubscriptionTrailCodeKey_DMG
                 } else {
                     code = KMAdvancedAnnualSubscriptionCodeKey_DMG
@@ -744,7 +744,15 @@ class KMProductModel: ObservableObject {
 #if VERSION_FREE
 #if VERSION_DMG
     // DMG
-            let embeddedWC = KMPurchaseEmbeddedWindowController.currentCode(KMAdvancedAnnualSubscriptionCodeKey_DMG)
+            var code = ""
+            if isBlackFive {
+                code = KMAdvancedAnnualSubscriptionBlackFiveCodeKey_DMG
+            } else if KMMemberInfo.shared.canTrail && state == .trial {
+                code = KMAdvancedAnnualSubscriptionTrailCodeKey_DMG
+            } else {
+                code = KMAdvancedAnnualSubscriptionCodeKey_DMG
+            }
+            let embeddedWC = KMPurchaseEmbeddedWindowController.currentCode(code)
             embeddedWC.showWindow(nil)
             embeddedWC.window?.center()
 #else

PDF Office/PDF Master/MemberCenter/WindowsController/KMProductCompareWC.swift

@@ -370,7 +370,7 @@ class KMProductCompareWC: NSWindowController {
 #if VERSION_FREE
 #if VERSION_DMG
     // DMG
-        if KMMemberInfo.shared.canTrail {
+        if KMMemberInfo.shared.canTrail && model.state == .trial {
             advancedPlanPurchaseLbl.stringValue = NSLocalizedString("Free Trial", comment: "")
         }
         if model.state == .dmg_Base {