Просмотр исходного кода

【内嵌支付】修复“切换标准/高级 折扣信息显示隐藏”

wanjun 6 месяцев назад
Родитель
Сommit
499c1dde82

+ 3 - 3
PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseEmbeddedWindowController.swift

@@ -56,6 +56,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
     @IBOutlet weak var discountPriceLabel3: NSTextField! // 折扣
     @IBOutlet weak var extendedButton1: NSButton!
     
+    @IBOutlet weak var couponView: NSView!
     @IBOutlet weak var couponButton: NSButton!
     @IBOutlet weak var couponBox: NSBox!
     @IBOutlet weak var coupomTextField: NSTextField!
@@ -762,9 +763,6 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
         paySumLabel1.stringValue = String(format: "%@ %@", abbreviation, String(format: "%.2f", paySum))
         
         if self.discountScale == "" && self.discountAmount == "" {
-            if lastPriceLabel1.stringValue != paySumLabel1.stringValue {
-                couponButton.isHidden = true
-            }
             refreshApplyButton(isReveal: true)
         } else {
             refreshApplyButton(isReveal: false)
@@ -772,8 +770,10 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
         
         if discount == 0 {
             discountView.isHidden = true
+            couponView.isHidden = false
         } else {
             discountView.isHidden = false
+            couponView.isHidden = true
         }
         discountLayoutConstraint.constant = discountView.isHidden ? -CGRectGetHeight(discountView.bounds) : 8
     }

+ 1 - 0
PDF Office/PDF Master/Class/Purchase/DMG/KMPurchaseEmbeddedWindowController.xib

@@ -34,6 +34,7 @@
                 <outlet property="couponBox" destination="ECb-Ab-7Fq" id="h7u-Fk-i1A"/>
                 <outlet property="couponButton" destination="16N-22-eUq" id="ufx-sv-rRp"/>
                 <outlet property="couponClearButton" destination="3y5-gc-zaR" id="vEZ-gi-ihQ"/>
+                <outlet property="couponView" destination="o5K-ag-Vbf" id="eVy-hs-cjQ"/>
                 <outlet property="discountLabel" destination="zuM-1n-klX" id="t9g-Ms-UQK"/>
                 <outlet property="discountLabel1" destination="n83-tW-ibP" id="9tA-NM-reb"/>
                 <outlet property="discountLayoutConstraint" destination="c55-3v-q3H" id="X98-LV-mYs"/>