【会员系统】标准版、高级版 无试用选项

PDF Office/PDF Master/Class/Purchase/DMG/Verification/KMVerificationMessageViewController.m

@@ -246,12 +246,12 @@ NSPopoverDelegate>
         type == KMUserScenarioTypeDmg_type44 ||
         type == KMUserScenarioTypeDmg_type45) {
         self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedString(@"Upgrade", nil)];
-    } else if (type == KMUserScenarioTypeDmg_type4 ||
-               type == KMUserScenarioTypeDmg_type19 ||
-               type == KMUserScenarioTypeDmg_type34) {
+    } else if (type == KMUserScenarioTypeDmg_type4 ) {
         self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedString(@"Free Trial", nil)];
     } else if (type == KMUserScenarioTypeDmg_type11 ||
+               type == KMUserScenarioTypeDmg_type19 ||
                type == KMUserScenarioTypeDmg_type22 ||
+               type == KMUserScenarioTypeDmg_type34 ||
                type == KMUserScenarioTypeDmg_type37 ) {
         self.button.title = [NSString stringWithFormat:@" %@ ",NSLocalizedStringFromTable(@"Buy Now", @"MemberCenterLocalizable", nil)];
     } else if (type == KMUserScenarioTypeDmg_type18 ||
@@ -527,9 +527,7 @@ NSPopoverDelegate>
 
 - (IBAction)buttonAction:(id)sender {
     KMUserScenarioType type = [KMMemberInfo shared].userScenarioType;
-    if (type == KMUserScenarioTypeDmg_type4 ||
-        type == KMUserScenarioTypeDmg_type19 ||
-        type == KMUserScenarioTypeDmg_type34) {
+    if (type == KMUserScenarioTypeDmg_type4) {
         [[KMProductCompareWC shared] setOrientation:YES];
         [[KMProductCompareWC shared] setOrientationType:KMCompareTableTypeTrial];
         [[KMProductCompareWC shared] showWindow:nil];

PDF Office/PDF Master/MemberCenter/ViewController/KMUserInfoViewController.swift

@@ -1143,7 +1143,11 @@ class KMUserInfoViewController: NSViewController {
                     buyNow2Box.isHidden = true
                     buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
                 } else { // 免费
-                    
+                    if KMMemberInfo.shared.userScenarioType == .dmg_type19 ||
+                        KMMemberInfo.shared.userScenarioType == .dmg_type34 {
+                        buyNow2Box.isHidden = true
+                        buyNow1BoxLeftConst.constant = (CGRectGetWidth(view.bounds) - CGRectGetWidth(buyNow1Box.frame))/2
+                    }
                 }
             }
         }