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/ViewController/KMUserInfoViewController.swift

@@ -464,6 +464,7 @@ class KMUserInfoViewController: NSViewController {
             if KMMemberInfo.shared.vip_endDate.count > 0 {
                 spliLineImageView.isHidden = false
                 endDateLabel.isHidden = false
+                endDateLabel.textColor = NSColor(named: "FA1E5D")
             }
         }
         membershipLabel.font = NSFont.SFMediumFontWithSize(16)
@@ -1032,22 +1033,9 @@ class KMUserInfoViewController: NSViewController {
             number4_1Label.textColor = NSColor(hex: "FFFFFF")
             number5Label.textColor = NSColor(hex: "FFFFFF")
             membershipLabel.textColor = NSColor(hex: "FFFFFF")
-            if KMMemberInfo.shared.userScenarioType == .dmg_type13 ||
-                KMMemberInfo.shared.userScenarioType == .dmg_type15 ||
-                KMMemberInfo.shared.userScenarioType == .dmg_type9 ||
-                KMMemberInfo.shared.userScenarioType == .dmg_type17 ||
-                KMMemberInfo.shared.userScenarioType == .dmg_type25 ||
-                KMMemberInfo.shared.userScenarioType == .dmg_type27 ||
-                KMMemberInfo.shared.userScenarioType == .dmg_type21 ||
-                KMMemberInfo.shared.userScenarioType == .dmg_type32 ||
-                KMMemberInfo.shared.userScenarioType == .dmg_type40 ||
-                KMMemberInfo.shared.userScenarioType == .dmg_type42 ||
-                KMMemberInfo.shared.userScenarioType == .dmg_type36 ||
-                KMMemberInfo.shared.userScenarioType == .dmg_type47 {
-                if KMMemberInfo.shared.vip_endDate.count > 0 {
-                    spliLineImageView.isHidden = false
-                    endDateLabel.isHidden = false
-                }
+            if KMMemberInfo.shared.vip_endDate.count > 0 {
+                spliLineImageView.isHidden = false
+                endDateLabel.isHidden = false
             }
             rightsBox.fillColor = NSColor(named: "FFFFFF_0.2") ?? .white
             buyNow1Box.fillColor = NSColor(hex: "FFFFFF")