【会员系统】- dmg购买相关

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

@@ -259,21 +259,6 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
         couponBox.isHidden = true
         applyBox.isHidden = true
 
-        if(isSubscribeCode() == true) {
-            addButton1.isEnabled = false
-            removeButton1.isEnabled = false
-            amountTextField1.isEditable = false
-            
-            wechatPayButton.isHidden = true
-            alipayButton.isHidden = true
-        } else {
-            addButton1.isEnabled = true
-            removeButton1.isEnabled = true
-            amountTextField1.isEditable = true
-            
-            wechatPayButton.isHidden = false
-            alipayButton.isHidden = false
-        }
     }
     
     override func close() {
@@ -1079,6 +1064,23 @@ class KMPurchaseEmbeddedWindowController: NSWindowController {
         set {
             _product_code = newValue
             
+            
+            if(isSubscribeCode() == true) {
+                addButton1.isEnabled = false
+                removeButton1.isEnabled = false
+                amountTextField1.isEditable = false
+                
+                wechatPayButton.isHidden = true
+                alipayButton.isHidden = true
+            } else {
+                addButton1.isEnabled = true
+                removeButton1.isEnabled = true
+                amountTextField1.isEditable = true
+                
+                wechatPayButton.isHidden = false
+                alipayButton.isHidden = false
+            }
+            
             if(newValue == "advanced-annual-subscription-trail" ||
                newValue == "ai-subscription-year-trail") {
                 couponView.isHidden = true

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

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="23504" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
+<document type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="3.0" toolsVersion="21507" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES" customObjectInstantitationMethod="direct">
     <dependencies>
         <deployment identifier="macosx"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="23504"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="21507"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -88,7 +88,7 @@
         <window title="Window" allowsToolTipsWhenApplicationIsInactive="NO" autorecalculatesKeyViewLoop="NO" releasedWhenClosed="NO" animationBehavior="default" id="F0z-JX-Cv5">
             <windowStyleMask key="styleMask" titled="YES" closable="YES" miniaturizable="YES" resizable="YES"/>
             <rect key="contentRect" x="196" y="240" width="970" height="612"/>
-            <rect key="screenRect" x="0.0" y="0.0" width="1512" height="944"/>
+            <rect key="screenRect" x="0.0" y="0.0" width="1440" height="875"/>
             <value key="minSize" type="size" width="970" height="612"/>
             <value key="maxSize" type="size" width="970" height="612"/>
             <view key="contentView" id="se5-gp-TjO">
@@ -110,7 +110,7 @@
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="hQ9-hE-7SE">
                                                 <rect key="frame" x="382" y="60" width="206" height="20"/>
                                                 <subviews>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="D4J-Se-9AB">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="D4J-Se-9AB">
                                                         <rect key="frame" x="-2" y="2" width="210" height="16"/>
                                                         <textFieldCell key="cell" title="Are you a student or a professor? " id="ag6-6K-D9d">
                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -132,14 +132,14 @@
                                                 <subviews>
                                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="yf6-a4-ZeM">
                                                         <rect key="frame" x="0.0" y="0.0" width="72" height="44"/>
-                                                        <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="EmbeddedPayment00" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="0uc-fz-0IJ">
-                                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                            <font key="font" metaFont="system"/>
-                                                        </buttonCell>
                                                         <constraints>
                                                             <constraint firstAttribute="width" constant="72" id="5Vq-Vt-iaE"/>
                                                             <constraint firstAttribute="height" constant="44" id="nG4-oe-Eyb"/>
                                                         </constraints>
+                                                        <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="EmbeddedPayment00" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="0uc-fz-0IJ">
+                                                            <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                            <font key="font" metaFont="system"/>
+                                                        </buttonCell>
                                                     </button>
                                                     <button translatesAutoresizingMaskIntoConstraints="NO" id="qfZ-QU-TIg">
                                                         <rect key="frame" x="72" y="0.0" width="72" height="44"/>
@@ -202,7 +202,7 @@
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="Dnb-jj-AQO">
                                                         <rect key="frame" x="0.0" y="472" width="335" height="20"/>
                                                         <subviews>
-                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Plj-ou-oBV">
+                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Plj-ou-oBV">
                                                                 <rect key="frame" x="-2" y="2" width="37" height="16"/>
                                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="hQo-6M-c5W">
                                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -220,7 +220,7 @@
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="ih0-ST-chg">
                                                         <rect key="frame" x="0.0" y="412" width="335" height="52"/>
                                                         <subviews>
-                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="e5R-5a-vfZ">
+                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="e5R-5a-vfZ">
                                                                 <rect key="frame" x="-2" y="36" width="339" height="16"/>
                                                                 <textFieldCell key="cell" title="Label" id="3l6-A2-xQx">
                                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -234,7 +234,7 @@
                                                                     <rect key="frame" x="1" y="1" width="333" height="26"/>
                                                                     <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                     <subviews>
-                                                                        <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sU8-qq-wLc">
+                                                                        <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="sU8-qq-wLc">
                                                                             <rect key="frame" x="6" y="5" width="321" height="16"/>
                                                                             <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" sendsActionOnEndEditing="YES" placeholderString="Email to receive license code" id="7u6-O8-4hT">
                                                                                 <font key="font" usesAppearanceFont="YES"/>
@@ -267,7 +267,7 @@
                                                     <customView translatesAutoresizingMaskIntoConstraints="NO" id="O9F-uH-62i">
                                                         <rect key="frame" x="0.0" y="352" width="335" height="20"/>
                                                         <subviews>
-                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="32Y-Vg-5EG">
+                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="32Y-Vg-5EG">
                                                                 <rect key="frame" x="-2" y="2" width="107" height="16"/>
                                                                 <textFieldCell key="cell" lineBreakMode="clipping" title="Payment Method" id="t4i-Kh-bbv">
                                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -373,7 +373,7 @@
                                                             <constraint firstAttribute="height" constant="40" id="R1F-08-HUX"/>
                                                         </constraints>
                                                     </box>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Bf9-95-LZa">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="Bf9-95-LZa">
                                                         <rect key="frame" x="-2" y="242" width="339" height="16"/>
                                                         <textFieldCell key="cell" alignment="left" title="Label" id="xst-Rc-74s">
                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -384,7 +384,7 @@
                                                     <customView hidden="YES" translatesAutoresizingMaskIntoConstraints="NO" id="W7H-2A-riS">
                                                         <rect key="frame" x="0.0" y="392" width="335" height="16"/>
                                                         <subviews>
-                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GJE-gl-04P">
+                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="GJE-gl-04P">
                                                                 <rect key="frame" x="-2" y="0.0" width="339" height="16"/>
                                                                 <textFieldCell key="cell" title="Please enter your email for license receiving." id="5DH-ru-aM0">
                                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -432,7 +432,7 @@
                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="tRc-PM-BHR">
                                                 <rect key="frame" x="24" y="16" width="538" height="492"/>
                                                 <subviews>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lJA-9J-Qba">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lJA-9J-Qba">
                                                         <rect key="frame" x="-2" y="476" width="542" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Your Order" id="Ozs-wZ-Jdr">
                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -449,7 +449,7 @@
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="nrp-eO-h7F">
                                                                 <rect key="frame" x="0.0" y="0.0" width="283" height="48"/>
                                                                 <subviews>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cMG-Kh-1ON">
+                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cMG-Kh-1ON">
                                                                         <rect key="frame" x="-2" y="32" width="287" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="PDF Reader Pro for Mac" id="QBk-Qf-dhQ">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -457,7 +457,7 @@
                                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cJd-qR-iKJ">
+                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cJd-qR-iKJ">
                                                                         <rect key="frame" x="-2" y="16" width="287" height="16"/>
                                                                         <textFieldCell key="cell" title="Premium and PDF to Office Converter" id="eqO-Iv-kEM">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -465,7 +465,7 @@
                                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2wj-Wg-q7u">
+                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="2wj-Wg-q7u">
                                                                         <rect key="frame" x="-2" y="0.0" width="287" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="One License for One Mac. One Time Purchase." id="WE0-rH-JkS">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -490,7 +490,7 @@
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="RLY-aN-DYZ">
                                                                 <rect key="frame" x="340" y="0.0" width="198" height="48"/>
                                                                 <subviews>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JdB-wu-qih">
+                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="JdB-wu-qih">
                                                                         <rect key="frame" x="-2" y="32" width="202" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="USD 59.99 " id="m0k-Bv-h3C">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -498,7 +498,7 @@
                                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4Ko-7d-Zp9">
+                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4Ko-7d-Zp9">
                                                                         <rect key="frame" x="161" y="16" width="39" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" alignment="right" title="79.99" id="YkX-gm-xyN">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -533,7 +533,7 @@
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="Imv-vq-rsc">
                                                                 <rect key="frame" x="0.0" y="72" width="538" height="20"/>
                                                                 <subviews>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ve4-zf-dcX">
+                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="ve4-zf-dcX">
                                                                         <rect key="frame" x="470" y="2" width="70" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="USD 79.99" id="PfN-Xw-Qsg">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -541,7 +541,7 @@
                                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qhy-ap-sxt">
+                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="qhy-ap-sxt">
                                                                         <rect key="frame" x="-2" y="2" width="61" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="List Price" id="NjG-V1-pcr">
                                                                             <font key="font" metaFont="system"/>
@@ -561,7 +561,7 @@
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="KXb-Fc-Ihu">
                                                                 <rect key="frame" x="0.0" y="44" width="538" height="20"/>
                                                                 <subviews>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zuM-1n-klX">
+                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="zuM-1n-klX">
                                                                         <rect key="frame" x="-2" y="2" width="58" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Discount" id="fA9-YE-9nT">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -569,7 +569,7 @@
                                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="n83-tW-ibP">
+                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="n83-tW-ibP">
                                                                         <rect key="frame" x="470" y="2" width="70" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="USD 20.00" id="iaA-9a-RmM">
                                                                             <font key="font" metaFont="system"/>
@@ -589,7 +589,7 @@
                                                             <customView translatesAutoresizingMaskIntoConstraints="NO" id="ZY4-l7-Ejn">
                                                                 <rect key="frame" x="0.0" y="0.0" width="538" height="28"/>
                                                                 <subviews>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="W9v-hZ-TbY">
+                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="W9v-hZ-TbY">
                                                                         <rect key="frame" x="470" y="6" width="70" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="USD 59.99" id="zmn-H2-590">
                                                                             <font key="font" usesAppearanceFont="YES"/>
@@ -597,7 +597,7 @@
                                                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                                                         </textFieldCell>
                                                                     </textField>
-                                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9Ta-Z5-dCX">
+                                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="9Ta-Z5-dCX">
                                                                         <rect key="frame" x="-2" y="6" width="55" height="16"/>
                                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Pay sum" id="ed2-fx-e4R">
                                                                             <font key="font" metaFont="system"/>
@@ -633,8 +633,8 @@
                                                                             <rect key="frame" x="1" y="1" width="318" height="26"/>
                                                                             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                                                             <subviews>
-                                                                                <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lA7-Px-ulG">
-                                                                                    <rect key="frame" x="-2" y="5" width="322" height="16"/>
+                                                                                <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="lA7-Px-ulG">
+                                                                                    <rect key="frame" x="6" y="5" width="314" height="16"/>
                                                                                     <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" id="bOU-uz-Gia">
                                                                                         <font key="font" usesAppearanceFont="YES"/>
                                                                                         <color key="textColor" name="controlTextColor" catalog="System" colorSpace="catalog"/>
@@ -643,14 +643,14 @@
                                                                                 </textField>
                                                                                 <button translatesAutoresizingMaskIntoConstraints="NO" id="3y5-gc-zaR">
                                                                                     <rect key="frame" x="294" y="3" width="20" height="20"/>
-                                                                                    <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="ad_cancel_button00" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="VVQ-Bm-i0Z">
-                                                                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                                        <font key="font" metaFont="system"/>
-                                                                                    </buttonCell>
                                                                                     <constraints>
                                                                                         <constraint firstAttribute="height" constant="20" id="sf2-M6-hOb"/>
                                                                                         <constraint firstAttribute="width" constant="20" id="tzF-K4-ZxX"/>
                                                                                     </constraints>
+                                                                                    <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="ad_cancel_button00" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="VVQ-Bm-i0Z">
+                                                                                        <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                                                        <font key="font" metaFont="system"/>
+                                                                                    </buttonCell>
                                                                                     <connections>
                                                                                         <action selector="couponClearButton:" target="-2" id="uRG-Gj-lvm"/>
                                                                                     </connections>
@@ -658,7 +658,7 @@
                                                                             </subviews>
                                                                             <constraints>
                                                                                 <constraint firstAttribute="trailing" secondItem="lA7-Px-ulG" secondAttribute="trailing" id="1RW-JP-lfy"/>
-                                                                                <constraint firstItem="lA7-Px-ulG" firstAttribute="leading" secondItem="2We-vj-b92" secondAttribute="leading" id="M4Q-OV-nmR"/>
+                                                                                <constraint firstItem="lA7-Px-ulG" firstAttribute="leading" secondItem="2We-vj-b92" secondAttribute="leading" constant="8" id="M4Q-OV-nmR"/>
                                                                                 <constraint firstAttribute="trailing" secondItem="3y5-gc-zaR" secondAttribute="trailing" constant="4" id="s0v-at-YPd"/>
                                                                             </constraints>
                                                                         </view>
@@ -709,7 +709,7 @@
                                                                     <constraint firstItem="KlW-6M-F8A" firstAttribute="top" secondItem="o5K-ag-Vbf" secondAttribute="top" id="syK-Nu-TdQ"/>
                                                                 </constraints>
                                                             </customView>
-                                                            <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yok-Ur-JfA">
+                                                            <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="yok-Ur-JfA">
                                                                 <rect key="frame" x="-2" y="100" width="542" height="16"/>
                                                                 <textFieldCell key="cell" title="Label" id="hyR-5a-ztf">
                                                                     <font key="font" usesAppearanceFont="YES"/>
@@ -763,14 +763,14 @@
                                                             </box>
                                                             <button translatesAutoresizingMaskIntoConstraints="NO" id="7t3-ch-kiy">
                                                                 <rect key="frame" x="0.0" y="8" width="32" height="16"/>
-                                                                <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="EmbeddedPayment03" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="4ah-qQ-9ju">
-                                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                    <font key="font" metaFont="system"/>
-                                                                </buttonCell>
                                                                 <constraints>
                                                                     <constraint firstAttribute="width" constant="32" id="6hB-r9-Pm4"/>
                                                                     <constraint firstAttribute="height" constant="16" id="QtM-Wi-Flx"/>
                                                                 </constraints>
+                                                                <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="EmbeddedPayment03" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="4ah-qQ-9ju">
+                                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                                    <font key="font" metaFont="system"/>
+                                                                </buttonCell>
                                                                 <connections>
                                                                     <action selector="amountButtonAction:" target="-2" id="eWz-9K-64x"/>
                                                                 </connections>
@@ -783,19 +783,19 @@
                                                             </box>
                                                             <button tag="1" translatesAutoresizingMaskIntoConstraints="NO" id="5ta-gx-G7H">
                                                                 <rect key="frame" x="91" y="8" width="32" height="16"/>
-                                                                <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="EmbeddedPayment04" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="qIU-OL-6zl">
-                                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
-                                                                    <font key="font" metaFont="system"/>
-                                                                </buttonCell>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="16" id="LX5-lM-aLJ"/>
                                                                     <constraint firstAttribute="width" constant="32" id="hwA-cT-gmt"/>
                                                                 </constraints>
+                                                                <buttonCell key="cell" type="bevel" title="Button" bezelStyle="rounded" image="EmbeddedPayment04" imagePosition="only" alignment="center" imageScaling="proportionallyDown" inset="2" id="qIU-OL-6zl">
+                                                                    <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
+                                                                    <font key="font" metaFont="system"/>
+                                                                </buttonCell>
                                                                 <connections>
                                                                     <action selector="amountButtonAction:" target="-2" id="ATs-Y1-Dcf"/>
                                                                 </connections>
                                                             </button>
-                                                            <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cCy-Cw-W9i">
+                                                            <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="cCy-Cw-W9i">
                                                                 <rect key="frame" x="30" y="8" width="63" height="16"/>
                                                                 <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" alignment="center" title="1" id="dy8-KA-MYf">
                                                                     <font key="font" metaFont="system"/>
@@ -834,7 +834,7 @@
                                                             <constraint firstItem="xIt-JB-DLi" firstAttribute="leading" secondItem="7t3-ch-kiy" secondAttribute="trailing" id="vOJ-kF-F09"/>
                                                         </constraints>
                                                     </customView>
-                                                    <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="m7F-pU-vLK">
+                                                    <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="m7F-pU-vLK">
                                                         <rect key="frame" x="503" y="303" width="37" height="16"/>
                                                         <textFieldCell key="cell" lineBreakMode="clipping" title="Label" id="o1x-jJ-2mD">
                                                             <font key="font" metaFont="system"/>
@@ -945,7 +945,7 @@
                             </constraints>
                             <imageCell key="cell" refusesFirstResponder="YES" alignment="left" imageScaling="proportionallyDown" image="EmbeddedPayment14" id="Q6h-Sg-TIg"/>
                         </imageView>
-                        <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pcl-Qd-CLL">
+                        <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="pcl-Qd-CLL">
                             <rect key="frame" x="87" y="12" width="58" height="16"/>
                             <textFieldCell key="cell" lineBreakMode="clipping" title="Buy Now" id="PIg-4F-yje">
                                 <font key="font" metaFont="system"/>
@@ -998,7 +998,7 @@
                                 <rect key="frame" x="1" y="1" width="221" height="26"/>
                                 <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                                 <subviews>
-                                    <textField focusRingType="none" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4au-dI-0Fs">
+                                    <textField verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="4au-dI-0Fs">
                                         <rect key="frame" x="6" y="5" width="209" height="16"/>
                                         <textFieldCell key="cell" scrollable="YES" lineBreakMode="clipping" selectable="YES" editable="YES" sendsActionOnEndEditing="YES" placeholderString="Value" id="h6L-Q2-6Em">
                                             <font key="font" usesAppearanceFont="YES"/>
@@ -1215,7 +1215,7 @@
             <rect key="frame" x="0.0" y="0.0" width="445" height="264"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
             <subviews>
-                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8Om-Bo-EFk">
+                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="8Om-Bo-EFk">
                     <rect key="frame" x="137" y="232" width="172" height="16"/>
                     <textFieldCell key="cell" lineBreakMode="clipping" title="Scan QR Code with WeChat" id="dCY-vA-Gcp">
                         <font key="font" usesAppearanceFont="YES"/>
@@ -1253,7 +1253,7 @@
                         <customView translatesAutoresizingMaskIntoConstraints="NO" id="Qf0-lb-5o7">
                             <rect key="frame" x="0.0" y="0.0" width="180" height="48"/>
                             <subviews>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="asE-LH-mvG">
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="asE-LH-mvG">
                                     <rect key="frame" x="-2" y="32" width="184" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Purchased" id="tOJ-Jb-ivS">
                                         <font key="font" usesAppearanceFont="YES"/>
@@ -1261,7 +1261,7 @@
                                         <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                     </textFieldCell>
                                 </textField>
-                                <textField focusRingType="none" horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hj7-ST-7me">
+                                <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" translatesAutoresizingMaskIntoConstraints="NO" id="hj7-ST-7me">
                                     <rect key="frame" x="-2" y="0.0" width="184" height="16"/>
                                     <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="Successfully" id="h2L-ZH-7FT">
                                         <font key="font" usesAppearanceFont="YES"/>

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

@@ -1289,7 +1289,7 @@ class KMMemberCenterManager: NSObject {
                     cnyPriceString = string
                     cnyPrice = token
                 }
-                if let token = result["displayCnyPrice"] as? NSNumber {
+                if let token = result["cnyDisplayPrice"] as? NSNumber {
                     let string = KMFormatNSNumber(token, to: 2)
                     displayCnyPriceString = string
                     displayCnyPrice = token