Ver Fonte

提交内容
1、Bug修改;

Handy_Cao há 4 anos atrás
pai
commit
8ac3624e60

+ 8 - 5
MTP_iOS/MTP2_iOS/BusinessCore/Account/AccountManager.swift

@@ -419,6 +419,13 @@ class AccountManager: BaseManager {
                             group.leave()
                         })
                         
+                        /// 查询配置信息
+                        group.enter()
+                        self.configQuery(callback: { (configQuery, error) in
+                            dPrint("[\(#function)] \(configQuery ? "查询配置信息成功" : "查询配置信息失败")")
+                            group.leave()
+                        })
+                        
                         /// 查询用户藏品数据
                         group.enter()
                         goodsManager.requestQueryUserFavoriteGoodses { (isCompleted, _, _) in
@@ -765,11 +772,6 @@ class AccountManager: BaseManager {
         }
         
         group.enter()
-        self.configQuery(callback: { (isCompleted, error) in
-            group.leave()
-        })
-        
-        group.enter()
         self.requestGetAllEnums { (isCompleted, error, enums) in
             group.leave()
         }
@@ -1225,6 +1227,7 @@ class AccountManager: BaseManager {
                     }
                     /// 记录信息
                     MTP2BusinessCore.shared.responseDatas.append(newElement: (key: "\(FunCode.ConfigQueryRsp)", data: configQuery!))
+                    /// 执行回调
                     callback(true, nil)
                 })
             }

+ 1 - 1
MTP_iOS/MTP2_iOS/Resource/PlistFiles/Address/LYB_171.plist

@@ -179,7 +179,7 @@
 			<key>bankUrl</key>
 			<string>http://192.168.31.178:20031/bank_scancode</string>
 			<key>areaUrl</key>
-			<string>http://192.168.31.183:8080/cfg?key=test_183</string>
+			<string>http://192.168.31.171:8080/cfg?key=test_171</string>
 		</dict>
 	</array>
 </dict>

+ 113 - 95
MTP_iOS/MTP2_iOS/Resource/Storyboard/Mine/OutInMoney.storyboard

@@ -12,7 +12,7 @@
         <!--出入金-->
         <scene sceneID="5uQ-gJ-KML">
             <objects>
-                <viewController storyboardIdentifier="OutInMoneyViewID" title="出入金" id="Sy7-Xz-moZ" userLabel="出入金" customClass="OutInMoneyViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="OutInMoneyViewID" title="提现" id="Sy7-Xz-moZ" userLabel="出入金" customClass="OutInMoneyViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="7m4-CM-bIj">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1439,10 +1439,10 @@
             </objects>
             <point key="canvasLocation" x="1256" y="150"/>
         </scene>
-        <!--出金-->
+        <!--提现-->
         <scene sceneID="LDB-zt-r8l">
             <objects>
-                <viewController storyboardIdentifier="OutMoneyViewID" title="出金" id="eAL-8Q-re1" customClass="OutMoneyViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="OutMoneyViewID" title="提现" id="eAL-8Q-re1" customClass="OutMoneyViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Ih8-JI-hs8">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1451,10 +1451,10 @@
                                 <rect key="frame" x="0.0" y="44" width="428" height="746"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="p3O-AX-0Q0" userLabel="contentView">
-                                        <rect key="frame" x="0.0" y="0.0" width="428" height="415"/>
+                                        <rect key="frame" x="0.0" y="0.0" width="428" height="460"/>
                                         <subviews>
                                             <stackView contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="JWb-Vn-hOM">
-                                                <rect key="frame" x="10" y="10" width="408" height="395"/>
+                                                <rect key="frame" x="10" y="10" width="408" height="440"/>
                                                 <subviews>
                                                     <stackView contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="K20-vo-1u4" userLabel="出金金额">
                                                         <rect key="frame" x="0.0" y="0.0" width="408" height="35"/>
@@ -1831,7 +1831,7 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView hidden="YES" contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="epZ-6X-ZvZ" userLabel="备注">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="400" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="备注" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Yrt-AR-bwC">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
@@ -1861,24 +1861,25 @@
                                                             </textField>
                                                         </subviews>
                                                     </stackView>
-                                                    <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kp0-Xn-B5Q" userLabel="splitView">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Kp0-Xn-B5Q" userLabel="splitView">
+                                                        <rect key="frame" x="0.0" y="405" width="408" height="35"/>
                                                         <subviews>
                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="MYp-aH-8bs">
-                                                                <rect key="frame" x="0.0" y="-0.33333333333331439" width="408" height="1"/>
-                                                                <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                <rect key="frame" x="0.0" y="17" width="408" height="1"/>
+                                                                <color key="backgroundColor" red="0.94117647058823528" green="0.94117647058823528" blue="0.94117647058823528" alpha="1" colorSpace="calibratedRGB"/>
                                                                 <constraints>
                                                                     <constraint firstAttribute="height" constant="1" id="vaE-Xm-63T"/>
                                                                 </constraints>
                                                             </view>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="扩展信息" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XQl-ls-LPC">
-                                                                <rect key="frame" x="175.33333333333334" y="-8.3333333333333144" width="57.333333333333343" height="17"/>
+                                                                <rect key="frame" x="175.33333333333334" y="9" width="57.333333333333343" height="17"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                                <color key="textColor" red="0.0" green="0.0" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                 <color key="highlightedColor" red="0.0" green="0.0" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                             </label>
                                                         </subviews>
-                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <constraints>
                                                             <constraint firstItem="MYp-aH-8bs" firstAttribute="leading" secondItem="Kp0-Xn-B5Q" secondAttribute="leading" id="GNQ-GU-b07"/>
                                                             <constraint firstItem="XQl-ls-LPC" firstAttribute="centerX" secondItem="Kp0-Xn-B5Q" secondAttribute="centerX" id="IPC-j8-crX"/>
@@ -1888,10 +1889,11 @@
                                                         </constraints>
                                                     </view>
                                                     <view hidden="YES" tag="101" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EhU-Cr-2ZM" userLabel="开户省份">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="开户省份" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Pi7-dF-lYx">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -1931,7 +1933,7 @@
                                                                 </constraints>
                                                             </imageView>
                                                         </subviews>
-                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <constraints>
                                                             <constraint firstItem="Gs3-zO-dIc" firstAttribute="centerY" secondItem="EhU-Cr-2ZM" secondAttribute="centerY" id="13K-Pe-wZy"/>
                                                             <constraint firstItem="Wpr-7R-izg" firstAttribute="centerY" secondItem="EhU-Cr-2ZM" secondAttribute="centerY" id="B67-32-yOG"/>
@@ -1945,12 +1947,13 @@
                                                         </constraints>
                                                     </view>
                                                     <view hidden="YES" tag="102" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="gVn-5m-Idd" userLabel="开户城市">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="开户城市" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sgd-Sm-UjR">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                                                <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
                                                             <textField tag="300" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="fuk-wU-bBf" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
@@ -1961,7 +1964,7 @@
                                                                 <userDefinedRuntimeAttributes>
                                                                     <userDefinedRuntimeAttribute type="boolean" keyPath="maskToBounds" value="YES"/>
                                                                     <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                                                                        <color key="value" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                        <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                     </userDefinedRuntimeAttribute>
                                                                     <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
                                                                         <real key="value" value="1"/>
@@ -1988,7 +1991,7 @@
                                                                 </constraints>
                                                             </imageView>
                                                         </subviews>
-                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <constraints>
                                                             <constraint firstItem="fuk-wU-bBf" firstAttribute="height" secondItem="gVn-5m-Idd" secondAttribute="height" id="6e4-W6-HXE"/>
                                                             <constraint firstItem="fuk-wU-bBf" firstAttribute="centerY" secondItem="gVn-5m-Idd" secondAttribute="centerY" id="DPE-Tq-Dti"/>
@@ -2002,10 +2005,11 @@
                                                         </constraints>
                                                     </view>
                                                     <stackView hidden="YES" tag="100" contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="EFI-EG-V19">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="开户行支行号" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="waf-CA-G6p">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2017,7 +2021,7 @@
                                                                 <textInputTraits key="textInputTraits"/>
                                                                 <userDefinedRuntimeAttributes>
                                                                     <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                                                                        <color key="value" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                        <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                     </userDefinedRuntimeAttribute>
                                                                     <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
                                                                         <real key="value" value="1"/>
@@ -2033,10 +2037,11 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView hidden="YES" tag="14" contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="dHr-SD-6Gl">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="开户行支行名称" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Kyw-aP-efr">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2048,7 +2053,7 @@
                                                                 <textInputTraits key="textInputTraits"/>
                                                                 <userDefinedRuntimeAttributes>
                                                                     <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                                                                        <color key="value" white="0.66666666669999997" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                        <color key="value" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                     </userDefinedRuntimeAttribute>
                                                                     <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
                                                                         <real key="value" value="1"/>
@@ -2064,10 +2069,11 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView hidden="YES" tag="2" contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="lVX-nK-gMy" userLabel="银行密码">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="银行密码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FIV-EQ-SgO">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2095,10 +2101,11 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView hidden="YES" tag="10" contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="KyF-KT-ORZ">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="原手机号码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Ufv-Du-xQb">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2126,10 +2133,11 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView hidden="YES" tag="1" contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="b9e-Oy-dJX" userLabel="验证码">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="验证码" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="IWH-R2-tzv">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2182,10 +2190,11 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView hidden="YES" tag="3" contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="Y4y-VK-Wea" userLabel="性别">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="性别" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="Jqk-0M-AZ5">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2220,10 +2229,11 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView hidden="YES" tag="4" contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="iAw-Wo-AqH" userLabel="法人姓名">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="法人姓名" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="oRm-Qa-8X1">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2251,10 +2261,11 @@
                                                         </subviews>
                                                     </stackView>
                                                     <view hidden="YES" tag="5" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="hwT-Cy-xPt" userLabel="法人证件类型">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="法人证件类型" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="glu-Sw-OrF">
                                                                 <rect key="frame" x="0.0" y="0.0" width="408" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2297,7 +2308,7 @@
                                                                 </constraints>
                                                             </imageView>
                                                         </subviews>
-                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <constraints>
                                                             <constraint firstItem="5g7-3E-vzS" firstAttribute="centerY" secondItem="hwT-Cy-xPt" secondAttribute="centerY" id="CGH-yD-eDQ"/>
                                                             <constraint firstItem="glu-Sw-OrF" firstAttribute="height" secondItem="hwT-Cy-xPt" secondAttribute="height" id="RgA-9T-vh2"/>
@@ -2310,10 +2321,11 @@
                                                         </constraints>
                                                     </view>
                                                     <stackView hidden="YES" tag="6" contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="OKJ-R6-gAD">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="法人证件号码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="rYp-xL-jFM">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2341,10 +2353,11 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView hidden="YES" tag="7" contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="sI2-3t-g7A">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="经办人姓名" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Sp1-AY-cxp">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2372,10 +2385,11 @@
                                                         </subviews>
                                                     </stackView>
                                                     <view hidden="YES" tag="8" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jYm-mu-bFh" userLabel="经办人证件类型">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="经办人证件类型" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="8zQ-ji-Sz6" userLabel="经办人证件类型">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2415,7 +2429,7 @@
                                                                 </constraints>
                                                             </imageView>
                                                         </subviews>
-                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                         <constraints>
                                                             <constraint firstItem="5xu-Qv-SfZ" firstAttribute="height" secondItem="jYm-mu-bFh" secondAttribute="height" id="Cq7-9f-gox"/>
                                                             <constraint firstItem="8zQ-ji-Sz6" firstAttribute="centerY" secondItem="jYm-mu-bFh" secondAttribute="centerY" id="JaV-TW-AIZ"/>
@@ -2429,10 +2443,11 @@
                                                         </constraints>
                                                     </view>
                                                     <stackView hidden="YES" tag="9" contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="mgQ-8r-gPK">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="经办人证件号码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Nue-vV-WNz">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2460,10 +2475,11 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView hidden="YES" tag="11" contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="QEz-Wa-Jpp">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="所属会员代码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="jkp-t3-NBA">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2491,10 +2507,11 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView hidden="YES" tag="12" contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="MNK-LD-xnl">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="法人联系号码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="aW4-Pd-kRO">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2522,10 +2539,11 @@
                                                         </subviews>
                                                     </stackView>
                                                     <stackView hidden="YES" tag="13" contentMode="scaleToFill" spacing="40" translatesAutoresizingMaskIntoConstraints="NO" id="pPr-ph-v0S">
-                                                        <rect key="frame" x="0.0" y="395" width="408" height="0.0"/>
+                                                        <rect key="frame" x="0.0" y="440" width="408" height="0.0"/>
                                                         <subviews>
                                                             <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="经办人联系号码" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5NK-BQ-yXX">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="0.0"/>
+                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
@@ -2942,193 +2960,193 @@
     </scenes>
     <designables>
         <designable name="36F-aO-saT">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="3UZ-I8-wff">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="4ZY-fw-S5R">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="4eY-VX-qdj">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="44" height="18.666666666666668"/>
         </designable>
         <designable name="4qd-69-VTP">
             <size key="intrinsicContentSize" width="63" height="18.666666666666668"/>
         </designable>
         <designable name="56l-1T-0zb">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="5g7-3E-vzS">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
         </designable>
         <designable name="5xu-Qv-SfZ">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
         </designable>
         <designable name="6YK-8g-RB2">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="8d4-nQ-WVy">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="94b-a3-0zq">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="AgJ-dP-P0t">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
         </designable>
         <designable name="BHi-xo-QJl">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="Cgy-7d-Ic4">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="DCG-AV-uCN">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="DE8-7b-Pqw">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="E6F-H5-HVh">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="EeR-9K-jGh">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="FqP-cW-d8M">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="Fqa-Uz-Hrh">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="G92-VO-XJX">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="HBY-ka-CyL">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="HIW-3N-okK">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="LBB-LB-yoG">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="Lv7-e8-wFE">
             <size key="intrinsicContentSize" width="72" height="29"/>
         </designable>
         <designable name="MVJ-g6-Ld2">
-            <size key="intrinsicContentSize" width="4" height="17"/>
+            <size key="intrinsicContentSize" width="24" height="17"/>
         </designable>
         <designable name="OPc-1z-pxV">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="P4n-Up-XwQ">
-            <size key="intrinsicContentSize" width="4" height="17"/>
+            <size key="intrinsicContentSize" width="24" height="17"/>
         </designable>
         <designable name="QlQ-p3-RW9">
             <size key="intrinsicContentSize" width="72" height="29"/>
         </designable>
         <designable name="ReG-2s-A86">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="UBN-Hs-ByH">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="VSZ-Ku-qmc">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="VUo-IK-rAe">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="VwY-DW-qti">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="44" height="18.666666666666668"/>
         </designable>
         <designable name="Vxs-YA-ZA8">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="Wpr-7R-izg">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
         </designable>
         <designable name="Yzo-v8-3b7">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="Z3N-Eh-W71">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
         </designable>
         <designable name="ZIH-ka-hrP">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
         </designable>
         <designable name="ZOW-Jc-fBt">
             <size key="intrinsicContentSize" width="63" height="18.666666666666668"/>
         </designable>
         <designable name="aI2-y1-Xv1">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="dJp-9b-Voy">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="e6d-Hg-yNK">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="ey8-Sw-MsH">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="f9r-DO-SuS">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="fuk-wU-bBf">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
         </designable>
         <designable name="hoF-oX-4fc">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="44" height="18.666666666666668"/>
         </designable>
         <designable name="jsh-mN-9cI">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="kG2-M3-2tu">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="44" height="18.666666666666668"/>
         </designable>
         <designable name="l3x-pH-MSj">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="mEc-eN-WrG">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="pzH-6a-ApT">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="44" height="18.666666666666668"/>
         </designable>
         <designable name="qbi-zr-Xg9">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="s3B-Zg-231">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="s6i-Pk-Awo">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="vRr-kP-3Sn">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="vX6-DQ-znZ">
             <size key="intrinsicContentSize" width="4" height="17"/>
         </designable>
         <designable name="wND-p1-GgT">
-            <size key="intrinsicContentSize" width="4" height="17"/>
+            <size key="intrinsicContentSize" width="24" height="17"/>
         </designable>
         <designable name="wQi-Jm-FHZ">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="whO-0n-Mti">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="xrW-Ns-1Bh">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
         </designable>
         <designable name="yfL-Ky-Ax9">
             <size key="intrinsicContentSize" width="49" height="17"/>
         </designable>
         <designable name="z71-eE-lPm">
-            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
         </designable>
     </designables>
     <resources>

+ 12 - 1
MTP_iOS/MTP2_iOS/UserInterface/Coupon/ChooseCouponViewController.swift

@@ -65,7 +65,8 @@ class ChooseCouponViewController: BaseViewController {
             /// 异常
             guard let _ = takeInfo as? MoGoodsInfo else { return }
             /// 查询数据
-            reloadData(segmentedView.selectedIndex)
+            reloadData(0)
+            reloadData(1)
         }
     }
     /// 付款金额
@@ -125,6 +126,11 @@ class ChooseCouponViewController: BaseViewController {
                     self.coupons = objs?.filter({ (obj) -> Bool in
                         return obj.holdstatus == .executed
                     }) ?? []
+                    /// 更新数据
+                    if self.coupons.count != 0 {
+                        self.dataSource.titles[0] = "可用优惠券 (\(self.coupons.count))"
+                        self.segmentedView.reloadData()
+                    }
                 } else {
                     self.coupons = []
                     /// showError
@@ -150,6 +156,11 @@ class ChooseCouponViewController: BaseViewController {
                 /// 查询成功
                 if isComplete {
                     self.coupons = objs ?? []
+                    /// 更新数据
+                    if self.coupons.count != 0 {
+                        self.dataSource.titles[1] = "不可用优惠券 (\(self.coupons.count))"
+                        self.segmentedView.reloadData()
+                    }
                 } else {
                     self.coupons = []
                     /// showError

+ 5 - 5
MTP_iOS/MTP2_iOS/UserInterface/Extension/UIViewController+Alert.swift

@@ -16,7 +16,7 @@ extension UIViewController {
     ///   - title: 标题
     ///   - message: 提示内容
     ///   - handler: 确定按钮点击后的回调块
-    func showHintController(title: String, message: String, comfirmTitle: String = "ok", handler: ((UIAlertAction) -> Swift.Void)? = nil) {
+    func showHintController(title: String, message: String, comfirmTitle: String = "确定", handler: ((UIAlertAction) -> Swift.Void)? = nil) {
         let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
         alertController.addAction(UIAlertAction(title: comfirmTitle, style: .cancel, handler: handler))
         alertController.view.tintColor = UIColor.darkText
@@ -47,8 +47,8 @@ extension UIViewController {
     ///   - handler: 确定信息后的回调块
     func showYesOrNOController(title: String, message: String, handler: ((UIAlertAction) -> Swift.Void)? = nil) {
         let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
-        alertController.addAction(UIAlertAction(title: "yes", style: .destructive, handler: handler))
-        alertController.addAction(UIAlertAction(title: "no", style: .cancel, handler: nil))
+        alertController.addAction(UIAlertAction(title: "确定", style: .destructive, handler: handler))
+        alertController.addAction(UIAlertAction(title: "取消", style: .cancel, handler: nil))
         alertController.view.tintColor = UIColor.darkText
         self.present(alertController, animated: true, completion: nil)
     }
@@ -61,8 +61,8 @@ extension UIViewController {
     ///   - handler: 确定信息后的回调块
     func showCommitAlertController(title: String, message: String, handler: ((UIAlertAction) -> Swift.Void)? = nil) {
         let alertController = UIAlertController(title: title, message: message, preferredStyle: .alert)
-        alertController.addAction(UIAlertAction(title: "ok", style: .destructive, handler: handler))
-        alertController.addAction(UIAlertAction(title: "cancle", style: .cancel, handler: nil))
+        alertController.addAction(UIAlertAction(title: "确定", style: .destructive, handler: handler))
+        alertController.addAction(UIAlertAction(title: "取消", style: .cancel, handler: nil))
         alertController.view.tintColor = UIColor.darkText
         self.present(alertController, animated: true, completion: nil)
     }

+ 5 - 3
MTP_iOS/MTP2_iOS/UserInterface/Mine/OutInMoney/OutInQueryViewController.swift

@@ -7,6 +7,7 @@
 //
 
 import UIKit
+import SwiftDate
 
 class OutInQueryViewController: BaseTableViewController<MoMoneyOutIn>, UITextFieldDelegate {
     
@@ -56,7 +57,8 @@ class OutInQueryViewController: BaseTableViewController<MoMoneyOutIn>, UITextFie
     }
     
     func checkValue() -> Bool {
-        if let startTime = self.startTimeTextField.text, let endTime = self.endTimeTextField.text {
+        if let startTime = self.startTimeTextField.text,
+           let endTime = self.endTimeTextField.text {
             if startTime.compare(endTime) == .orderedDescending {
                 self.showHintController(title: "提示", message: "开始日期不能大于结束日期")
                 return false
@@ -75,10 +77,10 @@ class OutInQueryViewController: BaseTableViewController<MoMoneyOutIn>, UITextFie
     func setupTextField(textField: UITextField) {
         let formatter = DateFormatter()
         formatter.dateFormat = "yyyy-MM-dd"
-        let startTime = formatter.string(from: DateUtils.getLastDate())
+        let startTime = formatter.string(from: Date()-7.days)
         let endTime = formatter.string(from: Date())
         /// 设置开始和结束时间
-        self.startTime = DateUtils.getLastDate()
+        self.startTime = Date()-7.days
         self.endTime = Date()
         switch textField.tag {
         case OutInQueryViewController.STARTTIMETEXTFIELDTAG: