【综合】订单价格调整

PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseEmbeddedWindowController.swift

@@ -580,8 +580,19 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
             if product_Info.cycle == 0 {
                 tipsString = NSLocalizedString("%.2f/Permanent Plan", tableName: "MemberCenterLocalizable", comment: "")
             }
-        
-            let fullString = String(format: tipsString, insting ?? 0)
+            
+            var fullString = String(format: tipsString, insting ?? 0)
+            
+            let originalStr = showOrgPriceString()
+            let discountStr = showOrgShowPriceString()
+            if originalStr == discountStr  {
+                
+            } else {
+                if discountStr.isEmpty == false && discountStr != "0" {
+                    let data = Float(discountStr) ?? 0
+                    fullString = String(format: tipsString, data)
+                }
+            }
 
             prmiumLabel.stringValue = String(format: "%@ %@", abbreviation, fullString)
             original1 = Float(showOrgPriceString()) ?? 0

PDF Office/PDF Master/MemberCenter/WindowsController/DMG/KMOpenDMGPopupBootWC.swift

@@ -64,6 +64,8 @@ class KMOpenDMGPopupBootWC: NSWindowController {
         signInTextView.isSelectable = true
         signInTextView.textColor = NSColor.black
         signInTextView.font = NSFont.SFProTextRegularFont(12)
+        signInTextView.bounds = signInTextView.enclosingScrollView?.contentView.bounds ?? .zero
+        signInTextView.autoresizingMask = [.width, .height]
         let tipsString = NSLocalizedString("Already have an account? %@", tableName: "MemberCenterLocalizable", comment: "")
         let specialOffer = NSLocalizedString("Sign in", tableName: "MemberCenterLocalizable", comment: "")
         let fullString = String(format: tipsString, specialOffer)