Merge branch 'develop_PDFReaderPro_V4.7.0' of git.kdan.cc:Mac_PDF/PDF_Office into develop_PDFReaderPro_V4.7.0

PDF Office/PDF Master/MemberCenter/Model/KMMemberInfo.swift

@@ -579,7 +579,8 @@ import Cocoa
         if userScenarioType == .lite_type9 ||
             userScenarioType == .lite_type11 {
             // 升级比较表
-            if KMMemberInfo.shared.vip_paymentModel == "2" {
+            if KMMemberInfo.shared.vip_paymentModel == "2" &&
+                KMMemberInfo.shared.vip_levels != "1" {
                 // 有账号（单、多平台）高级永久权益，升级全平台权益
                 if (platformsArray.count == 1) {
                     // 单平台升级
@@ -630,7 +631,8 @@ import Cocoa
         // 有旧订阅
         if userScenarioType == .pro_type1 {
             // 升级比较表
-            if KMMemberInfo.shared.vip_paymentModel == "2" {
+            if KMMemberInfo.shared.vip_paymentModel == "2" &&
+                KMMemberInfo.shared.vip_levels != "1" {
                 // 有账号（单、多平台）高级永久权益，升级全平台权益
                 if (platformsArray.count == 1) {
                     // 单平台升级

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

@@ -443,11 +443,19 @@ class KMUserInfoViewController: NSViewController {
             KMMemberInfo.shared.userScenarioType == .lite_type9 ||
             KMMemberInfo.shared.userScenarioType == .lite_type12 ||
             KMMemberInfo.shared.userScenarioType == .lite_type13 ||
-            KMMemberInfo.shared.userScenarioType == .pro_type3 {
+            KMMemberInfo.shared.userScenarioType == .pro_type2 ||
+            KMMemberInfo.shared.userScenarioType == .pro_type5 {
             if KMMemberInfo.shared.vip_endDate.count > 0 {
                 spliLineImageView.isHidden = false
                 endDateLabel.isHidden = false
             }
+        } else if KMMemberInfo.shared.userScenarioType == .pro_type1 ||
+                    KMMemberInfo.shared.userScenarioType == .pro_type3 {
+            if KMMemberInfo.shared.vip_endDate.count > 0 &&
+                KMMemberInfo.shared.vip_status == 2 {
+                spliLineImageView.isHidden = false
+                endDateLabel.isHidden = false
+            }
         }
         membershipLabel.font = NSFont.SFMediumFontWithSize(16)
         lockedLabel.font = NSFont.SFMediumFontWithSize(12)