Преглед на файлове

【内嵌支付】修复“展开微信或支付宝支付二维码时,隐私权限文案显示不全”

wanjun преди 6 месеца
родител
ревизия
ab9e08a098

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

@@ -368,6 +368,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
         if VerificationManager.default().email != nil {
             emailTextField.stringValue = VerificationManager.default().email
         }
+        emailTextField.delegate = self
         errorLabel.textColor = NSColor(named: "KMPurchaseErrorColor")
         errorLabel.font = NSFont.SFProTextRegularFont(11.0)
         emailErrorLabel(isReveal: false)
@@ -838,6 +839,7 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
     }
     
     @IBAction func payButtonAction(_ sender: NSButton) {
+        emailErrorLabel(isReveal: false)
         confirmPayment(isConfirm: false)
         refreshApplyButton(isReveal: true)
         paymentMethod = KMPaymentType(rawValue: uint32(sender.tag)) ?? .paypal
@@ -1646,7 +1648,7 @@ extension KMPurchaseEmbeddedWindowController: NSTextFieldDelegate {
             if !isNumeric(textField!.stringValue) {
                 if textField == amountTextField1 { textField?.stringValue = String(pdfCount) }
             }
-        }
+        } 
     }
 }
 

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

@@ -116,7 +116,7 @@
                                     <subviews>
                                         <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="D4J-Se-9AB">
                                             <rect key="frame" x="-2" y="2" width="210" height="16"/>
-                                            <textFieldCell key="cell" lineBreakMode="clipping" title="Are you a student or a professor? " id="ag6-6K-D9d">
+                                            <textFieldCell key="cell" title="Are you a student or a professor? " id="ag6-6K-D9d">
                                                 <font key="font" usesAppearanceFont="YES"/>
                                                 <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                                 <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -127,6 +127,8 @@
                                         <constraint firstItem="D4J-Se-9AB" firstAttribute="top" secondItem="hQ9-hE-7SE" secondAttribute="top" constant="2" id="7aV-Ot-vTx"/>
                                         <constraint firstAttribute="bottom" secondItem="D4J-Se-9AB" secondAttribute="bottom" constant="2" id="OtY-Cy-YeS"/>
                                         <constraint firstItem="D4J-Se-9AB" firstAttribute="centerY" secondItem="hQ9-hE-7SE" secondAttribute="centerY" id="TBD-GV-YFs"/>
+                                        <constraint firstItem="D4J-Se-9AB" firstAttribute="top" secondItem="hQ9-hE-7SE" secondAttribute="top" constant="2" id="U0K-IA-VLi"/>
+                                        <constraint firstAttribute="bottom" secondItem="D4J-Se-9AB" secondAttribute="bottom" constant="2" id="cCQ-Co-b3S"/>
                                         <constraint firstItem="D4J-Se-9AB" firstAttribute="leading" secondItem="hQ9-hE-7SE" secondAttribute="leading" id="kC9-ph-ha2"/>
                                         <constraint firstAttribute="trailing" secondItem="D4J-Se-9AB" secondAttribute="trailing" id="s8e-kx-aIL"/>
                                     </constraints>

+ 1 - 1
PDF Office/PDF Master/Strings/zh-Hans.lproj/Localizable.strings

@@ -4102,7 +4102,7 @@
 "The coupon code is invalid. Please try again." = "优惠劵代码无效、请重试。";
 "Please enter right license code. How to Retrieve License." = "请输入正确的许可证代码。如何检索许可证。";
 "Input license code previously activated the app" = "输入先前激活应用程序的许可证代码。";
-"By submitting this order, I agree to the Privacy Policy and Terms of Service for subscription products" = "通过提交此订单,我同意订阅产品的隐私政策和服务条款";
+"By submitting this order, I agree to the %@ and %@ for subscription products" = "通过提交此订单,我同意订阅产品的%@和%@";
 "Continue to Pay" = "继续支付";
 "1 license code to activate 2 PCs. (Mac and Windows)" = "一个序列码可激活两台桌机设备(Mac和Windows)";
 "Pay sum" = "支付金额";

+ 1 - 1
PDF Office/PDF Master/Strings/zh-Hant.lproj/Localizable.strings

@@ -4234,7 +4234,7 @@
 "The coupon code is invalid. Please try again." = "優惠劵代碼無效、請重試。";
 "Please enter right license code. How to Retrieve License." = "請輸入正確的許可證代碼。";
 "Input license code previously activated the app" = "輸入先前啟動應用程式的許可證代碼。";
-"By submitting this order, I agree to the Privacy Policy and Terms of Service for subscription products" = "提交此訂單,我同意訂閱產品的隱私和服務政策條款";
+"By submitting this order, I agree to the %@ and %@ for subscription products" = "提交此訂單,我同意訂閱產品的%@和%@";
 "Continue to Pay" = "繼續支付";
 "1 license code to activate 2 PCs. (Mac and Windows)" = "一個序號可啟動突變桌機設備(Mac和Windows)";
 "Pay sum" = "支付金額";