提交内容

1、Bug修改；

MTP_iOS/MTP2_iOS.xcodeproj/project.pbxproj

@@ -116,6 +116,7 @@
 		8369F9B025523B88003386CB /* FeedbackViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8369F9AF25523B88003386CB /* FeedbackViewController.swift */; };
 		8369F9B225523B9B003386CB /* FeedbackDetailViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8369F9B125523B9B003386CB /* FeedbackDetailViewController.swift */; };
 		8369F9B425523BF6003386CB /* Feedback.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 8369F9B325523BF6003386CB /* Feedback.storyboard */; };
+		836DF8AB25E649B70081A6F0 /* FundPasswordUpdateViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 836DF8AA25E649B70081A6F0 /* FundPasswordUpdateViewController.swift */; };
 		83730D0A2550E694008E47F1 /* AuthAddressViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83730D072550E694008E47F1 /* AuthAddressViewController.swift */; };
 		83730D0B2550E694008E47F1 /* SwiftJavaScriptModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = 83730D092550E694008E47F1 /* SwiftJavaScriptModel.swift */; };
 		83730D152550EB1D008E47F1 /* UIColor+Hex.m in Sources */ = {isa = PBXBuildFile; fileRef = 83730D0E2550EB1D008E47F1 /* UIColor+Hex.m */; };
@@ -354,7 +355,7 @@
 		63104EFC2119D76C00BACB4E /* BaseNavigationController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = BaseNavigationController.swift; sourceTree = "<group>"; };
 		63104F092119DA3B00BACB4E /* Data+Extension.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = "Data+Extension.swift"; sourceTree = "<group>"; };
 		63126F8520CD2F9D00566BB8 /* UserDefaultsUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UserDefaultsUtils.swift; sourceTree = "<group>"; };
-		631549ED2057B8FD00036A5F /* BPML.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = BPML.app; sourceTree = BUILT_PRODUCTS_DIR; };
+		631549ED2057B8FD00036A5F /* LYB.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LYB.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		631549F02057B8FD00036A5F /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		631549F72057B8FD00036A5F /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		631549FA2057B8FD00036A5F /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
@@ -456,6 +457,7 @@
 		8369F9AF25523B88003386CB /* FeedbackViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackViewController.swift; sourceTree = "<group>"; };
 		8369F9B125523B9B003386CB /* FeedbackDetailViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FeedbackDetailViewController.swift; sourceTree = "<group>"; };
 		8369F9B325523BF6003386CB /* Feedback.storyboard */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; path = Feedback.storyboard; sourceTree = "<group>"; };
+		836DF8AA25E649B70081A6F0 /* FundPasswordUpdateViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = FundPasswordUpdateViewController.swift; sourceTree = "<group>"; };
 		83730D072550E694008E47F1 /* AuthAddressViewController.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AuthAddressViewController.swift; sourceTree = "<group>"; };
 		83730D092550E694008E47F1 /* SwiftJavaScriptModel.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SwiftJavaScriptModel.swift; sourceTree = "<group>"; };
 		83730D0D2550EB1D008E47F1 /* HEMenu.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HEMenu.h; sourceTree = "<group>"; };
@@ -840,7 +842,7 @@
 		631549EE2057B8FD00036A5F /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				631549ED2057B8FD00036A5F /* BPML.app */,
+				631549ED2057B8FD00036A5F /* LYB.app */,
 			);
 			name = Products;
 			sourceTree = "<group>";
@@ -1504,6 +1506,7 @@
 		83730D2D2550F354008E47F1 /* PasswordUpdate */ = {
 			isa = PBXGroup;
 			children = (
+				836DF8AA25E649B70081A6F0 /* FundPasswordUpdateViewController.swift */,
 				83730D2E2550F354008E47F1 /* LoginPasswordUpdateViewController.swift */,
 			);
 			path = PasswordUpdate;
@@ -2205,7 +2208,7 @@
 			);
 			name = MTP2_iOS;
 			productName = MTP2_iOS;
-			productReference = 631549ED2057B8FD00036A5F /* BPML.app */;
+			productReference = 631549ED2057B8FD00036A5F /* LYB.app */;
 			productType = "com.apple.product-type.application";
 		};
 /* End PBXNativeTarget section */
@@ -2397,6 +2400,7 @@
 				6393315820E0CC4700ED47B7 /* LoginUserCell.swift in Sources */,
 				6332102B209B1AE700878902 /* OrderManager.swift in Sources */,
 				E5E3913720A41B3C00AF8C51 /* UIViewController+Alert.swift in Sources */,
+				836DF8AB25E649B70081A6F0 /* FundPasswordUpdateViewController.swift in Sources */,
 				833AAA1F254C0CAF009A8A4F /* HotQuoteViewController.swift in Sources */,
 				6317C38A20A0203D00542960 /* GoodsModels.swift in Sources */,
 				83D351B82563DB3400B21940 /* UIView+WebVideoCache.m in Sources */,
@@ -2802,7 +2806,7 @@
 				OTHER_LIBTOOLFLAGS = "$(inherited)";
 				OTHER_SWIFT_FLAGS = "$(inherited) \"-D\" \"COCOAPODS\" -D DEBUG";
 				PRODUCT_BUNDLE_IDENTIFIER = com.hsby.hsbylyb;
-				PRODUCT_NAME = BPML;
+				PRODUCT_NAME = LYB;
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				STRIP_INSTALLED_PRODUCT = YES;
@@ -2900,7 +2904,7 @@
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_LIBTOOLFLAGS = "$(inherited)";
 				PRODUCT_BUNDLE_IDENTIFIER = com.hsby.hsbylyb;
-				PRODUCT_NAME = BPML;
+				PRODUCT_NAME = LYB;
 				PROVISIONING_PROFILE = "";
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				STRIP_INSTALLED_PRODUCT = YES;

MTP_iOS/MTP2_iOS.xcodeproj/xcshareddata/xcschemes/MTP2_iOS.xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "631549EC2057B8FD00036A5F"
-               BuildableName = "BPML.app"
+               BuildableName = "LYB.app"
                BlueprintName = "MTP2_iOS"
                ReferencedContainer = "container:MTP2_iOS.xcodeproj">
             </BuildableReference>
@@ -31,7 +31,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "631549EC2057B8FD00036A5F"
-            BuildableName = "BPML.app"
+            BuildableName = "LYB.app"
             BlueprintName = "MTP2_iOS"
             ReferencedContainer = "container:MTP2_iOS.xcodeproj">
          </BuildableReference>
@@ -54,7 +54,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "631549EC2057B8FD00036A5F"
-            BuildableName = "BPML.app"
+            BuildableName = "LYB.app"
             BlueprintName = "MTP2_iOS"
             ReferencedContainer = "container:MTP2_iOS.xcodeproj">
          </BuildableReference>
@@ -78,7 +78,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "631549EC2057B8FD00036A5F"
-            BuildableName = "BPML.app"
+            BuildableName = "LYB.app"
             BlueprintName = "MTP2_iOS"
             ReferencedContainer = "container:MTP2_iOS.xcodeproj">
          </BuildableReference>

MTP_iOS/MTP2_iOS.xcodeproj/xcshareddata/xcschemes/MTP2_iOS_Release.xcscheme

@@ -15,7 +15,7 @@
             <BuildableReference
                BuildableIdentifier = "primary"
                BlueprintIdentifier = "631549EC2057B8FD00036A5F"
-               BuildableName = "BPML.app"
+               BuildableName = "LYB.app"
                BlueprintName = "MTP2_iOS"
                ReferencedContainer = "container:MTP2_iOS.xcodeproj">
             </BuildableReference>
@@ -31,7 +31,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "631549EC2057B8FD00036A5F"
-            BuildableName = "BPML.app"
+            BuildableName = "LYB.app"
             BlueprintName = "MTP2_iOS"
             ReferencedContainer = "container:MTP2_iOS.xcodeproj">
          </BuildableReference>
@@ -54,7 +54,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "631549EC2057B8FD00036A5F"
-            BuildableName = "BPML.app"
+            BuildableName = "LYB.app"
             BlueprintName = "MTP2_iOS"
             ReferencedContainer = "container:MTP2_iOS.xcodeproj">
          </BuildableReference>
@@ -71,7 +71,7 @@
          <BuildableReference
             BuildableIdentifier = "primary"
             BlueprintIdentifier = "631549EC2057B8FD00036A5F"
-            BuildableName = "BPML.app"
+            BuildableName = "LYB.app"
             BlueprintName = "MTP2_iOS"
             ReferencedContainer = "container:MTP2_iOS.xcodeproj">
          </BuildableReference>

MTP_iOS/MTP2_iOS/Application/AppDelegate.swift

@@ -129,7 +129,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate {
             self.customStatusBar.dismiss()
         }
         
-        window?.rootViewController?.presentedViewControllerVisibleInWindow.showHintController(title: "tips".localized, message: message) { _ in
+        window?.rootViewController?.presentedViewControllerVisibleInWindow.showHintController(title: "提示", message: message) { _ in
             /// 开启Loading
             NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "正在登出...", type: .ballClipRotate, color: UIColorFromHex(rgbValue: 0xA8B6CC)), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
             

MTP_iOS/MTP2_iOS/BusinessCore/Account/AccountManager.swift

@@ -1051,7 +1051,7 @@ class AccountManager: BaseManager {
         let iv = "Ub$kl^P3".data(using: .utf8),
         let encryptMobileData = MTP2Crypto.desForPhone(objective: utf8Mobile, encryptOrDecrypt: CCOperation(kCCEncrypt), key: key, iv: iv)
         else {
-            callback(false, ErrorInfo(retCode: -60000, retMsg: "手机号码加密失败".localized), nil, nil)
+            callback(false, ErrorInfo(retCode: -60000, retMsg: "手机号码加密失败"), nil, nil)
             return
         }
         
@@ -1064,13 +1064,13 @@ class AccountManager: BaseManager {
         /// 发送请求
         HttpUtils.callPostJsonnInterface(url: url, type: .POST, params: params) { (isCompleted, rsp) in
             if !isCompleted {
-                callback(false, ErrorInfo(retCode: -60000, retMsg: "发送失败，请稍后重试".localized), nil, nil)
+                callback(false, ErrorInfo(retCode: -60000, retMsg: "发送失败，请稍后重试"), nil, nil)
                 return
             }
             if let respondsData = rsp as? [String: Any],
                let success = respondsData["success"] as? String {
                 if success == "false" {
-                    let msg = (respondsData["msg"] as? String) ?? "发送失败，请稍后重试".localized
+                    let msg = (respondsData["msg"] as? String) ?? "发送失败，请稍后重试"
                     callback(false, ErrorInfo(retCode: -60000, retMsg: msg), nil, nil)
                 } else {
                     /// 推荐码

MTP_iOS/MTP2_iOS/BusinessCore/Order/OrderManager.swift

@@ -765,7 +765,7 @@ class OrderManager: BaseManager {
     func requestQueryMyCouponHolds(_ goodsid: Int?,
                                    _ amount: Double?,
                                    _ sellUserID: Int?,
-                                   _ holdStaus: EHoldStatus?,
+                                   _ holdStaus: String?,
                                    callback: @escaping (_ isCompleted: Bool,
                                                     _ error: ErrorInfo?,
                                                     _ coupons: [MoMyCouponHold]?) -> Void) {
@@ -782,7 +782,7 @@ class OrderManager: BaseManager {
         /// 参数列表
         var params = [(key: String, value: Any)]()
         params.append((key: "accountIDs", value: "\(MTP2BusinessCore.shared.accountManager?.getCurrentTAAccountInfo()?.accountId ?? 0)"))
-        if let status = holdStaus { params.append((key: "holdStatus", value: status.rawValue)) }
+        if let status = holdStaus { params.append((key: "holdStatus", value: status)) }
         
         /// Http 头部请求
         /// 登录后服务返回的token
@@ -841,7 +841,7 @@ class OrderManager: BaseManager {
                         /// 执行回调
                         callback(true, nil, array.sorted(by: { (obj1, obj2) -> Bool in
                             return obj1.offamount >= obj2.offamount
-                        }))
+                        }).filter({$0.holdstatus == .executed}))
                     } else {
                         /// 执行回调
                         callback(true, nil, coupons)
@@ -881,6 +881,7 @@ class OrderManager: BaseManager {
         /// 参数列表
         var params = [(key: String, value: Any)]()
         params.append((key: "accountIDs", value: "\(MTP2BusinessCore.shared.accountManager?.getCurrentTAAccountInfo()?.accountId ?? 0)"))
+        params.append((key: "holdStatus", value: "1,2"))
         
         /// Http 头部请求
         /// 登录后服务返回的token
@@ -904,30 +905,35 @@ class OrderManager: BaseManager {
                        let sellid = sellUserID {
                         var unobjs: [MoMyCouponHold] = []
                         for (_, obj) in coupons.enumerated() {
-                            if obj.limitedflag == 1 { /// 判断是否是指定商品 0 不限制 1 限制
-                                /// 如果包括该商品的话
-                                if !obj.limitedgoodsids.contains(find: "\(id)") {
-                                    obj.unusedresult = "该券不可用于此商品"
-                                    unobjs.append(obj)
-                                } else if obj.conditionvalue > am {
-                                    obj.unusedresult = "差\((obj.conditionvalue-am).toString(reserve: 2))元可使用该券"
-                                    unobjs.append(obj)
-                                } else {
+                            if obj.holdstatus == .invalid { /// 未生效
+                                obj.unusedresult = "未生效"
+                                unobjs.append(obj)
+                            } else {
+                                if obj.limitedflag == 1 { /// 判断是否是指定商品 0 不限制 1 限制
+                                    /// 如果包括该商品的话
+                                    if !obj.limitedgoodsids.contains(find: "\(id)") {
+                                        obj.unusedresult = "该券不可用于此商品"
+                                        unobjs.append(obj)
+                                    } else if obj.conditionvalue > am {
+                                        obj.unusedresult = "差\((obj.conditionvalue-am).toString(reserve: 2))元可使用该券"
+                                        unobjs.append(obj)
+                                    } else {
+                                        if obj.isgeneral == 0,
+                                           !obj.userscope.contains(find: "\(sellid)") {
+                                            obj.unusedresult = "该券不可用于此卖家"
+                                            unobjs.append(obj)
+                                        }
+                                    }
+                                } else  {
                                     if obj.isgeneral == 0,
                                        !obj.userscope.contains(find: "\(sellid)") {
                                         obj.unusedresult = "该券不可用于此卖家"
                                         unobjs.append(obj)
-                                    }
-                                }
-                            } else  {
-                                if obj.isgeneral == 0,
-                                   !obj.userscope.contains(find: "\(sellid)") {
-                                    obj.unusedresult = "该券不可用于此卖家"
-                                    unobjs.append(obj)
-                                } else {
-                                    if obj.conditionvalue > am {
-                                        obj.unusedresult = "差\((obj.conditionvalue-am).toString(reserve: 2))元可使用该券"
-                                        unobjs.append(obj)
+                                    } else {
+                                        if obj.conditionvalue > am {
+                                            obj.unusedresult = "差\((obj.conditionvalue-am).toString(reserve: 2))元可使用该券"
+                                            unobjs.append(obj)
+                                        }
                                     }
                                 }
                             }

MTP_iOS/MTP2_iOS/BusinessCore/Upload/UploadManager.swift

@@ -141,7 +141,7 @@ class UploadManager: NSObject {
                 /// 执行回调
                 callBack(true, self.videoUrl, sourceName, nil)
             } else { /// 请求数据失败
-                callBack(false, nil, nil, ErrorInfo.init(retCode: -9001, retMsg: "请求数据失败".localized))
+                callBack(false, nil, nil, ErrorInfo.init(retCode: -9001, retMsg: "请求数据失败"))
             }
         }
     }

MTP_iOS/MTP2_iOS/Resource/Assets.xcassets/normal/add_enable.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "add_enable.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "add_enable@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "add_enable@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

MTP_iOS/MTP2_iOS/Resource/Assets.xcassets/normal/add_unenable.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "add_unenable.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "add_unenable@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "add_unenable@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

MTP_iOS/MTP2_iOS/Resource/Assets.xcassets/normal/sub_enable.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "sub_enable.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "sub_enable@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "sub_enable@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

MTP_iOS/MTP2_iOS/Resource/Assets.xcassets/normal/sub_unenable.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "filename" : "sub_unenable.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "sub_unenable@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "sub_unenable@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}

MTP_iOS/MTP2_iOS/Resource/PlistFiles/Config.plist

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>appVersion</key>
-	<string>LYB</string>
+	<string>LYB_171</string>
 </dict>
 </plist>

MTP_iOS/MTP2_iOS/Resource/Storyboard/Mine/OutInMoney.storyboard

@@ -12,12 +12,12 @@
         <!--出入金-->
         <scene sceneID="5uQ-gJ-KML">
             <objects>
-                <viewController storyboardIdentifier="OutInMoneyViewID" title="出入金" id="Sy7-Xz-moZ" userLabel="出入金" customClass="OutInMoneyViewController" customModule="BPML" 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"/>
                         <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yg0-FK-e62" customClass="SlideSegmentView" customModule="BPML" customModuleProvider="target">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yg0-FK-e62" customClass="SlideSegmentView" customModule="LYB" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="44" width="428" height="882"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
@@ -42,13 +42,13 @@
         <!--入金-->
         <scene sceneID="gmF-vu-JQR">
             <objects>
-                <viewController storyboardIdentifier="InMoneyViewID" title="入金" id="5LC-CK-hbD" customClass="InMoneyViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="InMoneyViewID" title="入金" id="5LC-CK-hbD" customClass="InMoneyViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="vnM-uY-HRX">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7Wg-Ok-bv6">
-                                <rect key="frame" x="0.0" y="44" width="428" height="756"/>
+                                <rect key="frame" x="0.0" y="44" width="428" height="746"/>
                                 <subviews>
                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1mw-Mi-fbB" userLabel="contentView">
                                         <rect key="frame" x="0.0" y="0.0" width="428" height="460"/>
@@ -66,7 +66,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="VUo-IK-rAe" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="VUo-IK-rAe" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -104,7 +104,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="100" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="VwY-DW-qti" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="100" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="VwY-DW-qti" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -161,7 +161,7 @@
                                                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="gvx-cH-k8x">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <subviews>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="P4n-Up-XwQ" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="P4n-Up-XwQ" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="0.0" y="0.0" width="134" height="35"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -207,7 +207,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="s3B-Zg-231" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="s3B-Zg-231" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="111.66666666666666" y="0.0" width="296.33333333333337" height="0.0"/>
                                                                 <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -239,7 +239,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wQi-Jm-FHZ" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wQi-Jm-FHZ" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="0.60000002379999995" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -269,7 +269,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="aI2-y1-Xv1" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="aI2-y1-Xv1" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="0.60000002379999995" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -299,7 +299,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Cgy-7d-Ic4" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Cgy-7d-Ic4" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="0.60000002379999995" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -329,7 +329,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="800" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="pzH-6a-ApT" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="800" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="pzH-6a-ApT" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -383,7 +383,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="900" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="kG2-M3-2tu" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="900" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="kG2-M3-2tu" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="30"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -435,7 +435,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="jsh-mN-9cI" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="jsh-mN-9cI" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="0.60000002379999995" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -465,7 +465,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dJp-9b-Voy" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dJp-9b-Voy" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="0.60000002379999995" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -495,7 +495,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HBY-ka-CyL" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HBY-ka-CyL" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="0.60000002379999995" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -524,7 +524,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="94b-a3-0zq" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="94b-a3-0zq" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -555,7 +555,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="whO-0n-Mti" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="whO-0n-Mti" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -586,7 +586,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Yzo-v8-3b7" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Yzo-v8-3b7" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -643,7 +643,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="200" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="z71-eE-lPm" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="200" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="z71-eE-lPm" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -700,7 +700,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="300" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="ZIH-ka-hrP" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="300" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="ZIH-ka-hrP" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -757,7 +757,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="OPc-1z-pxV" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="OPc-1z-pxV" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -788,7 +788,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DE8-7b-Pqw" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DE8-7b-Pqw" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -819,7 +819,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wND-p1-GgT" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="wND-p1-GgT" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -850,7 +850,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="l3x-pH-MSj" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="l3x-pH-MSj" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -884,7 +884,7 @@
                                                             <stackView contentMode="scaleToFill" distribution="fillEqually" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="w3K-xG-tEN">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <subviews>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="UBN-Hs-ByH" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="UBN-Hs-ByH" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="0.0" y="0.0" width="131.66666666666666" height="0.0"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -904,7 +904,7 @@
                                                                             <outlet property="delegate" destination="5LC-CK-hbD" id="k48-c8-LxV"/>
                                                                         </connections>
                                                                     </textField>
-                                                                    <button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QlQ-p3-RW9" customClass="IBButton" customModule="BPML" customModuleProvider="target">
+                                                                    <button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QlQ-p3-RW9" customClass="IBButton" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="136.66666666666669" y="0.0" width="131.33333333333331" height="0.0"/>
                                                                         <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -975,7 +975,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="36F-aO-saT" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="36F-aO-saT" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1006,7 +1006,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="400" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="Z3N-Eh-W71" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="400" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="Z3N-Eh-W71" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="-15" width="268" height="30"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <constraints>
@@ -1065,7 +1065,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HIW-3N-okK" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="HIW-3N-okK" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1096,7 +1096,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="xrW-Ns-1Bh" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="xrW-Ns-1Bh" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1127,7 +1127,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="500" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="AgJ-dP-P0t" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="500" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="AgJ-dP-P0t" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1184,7 +1184,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="56l-1T-0zb" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="56l-1T-0zb" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1215,7 +1215,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="qbi-zr-Xg9" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="qbi-zr-Xg9" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1246,7 +1246,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="e6d-Hg-yNK" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="e6d-Hg-yNK" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1277,7 +1277,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BHi-xo-QJl" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BHi-xo-QJl" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1355,7 +1355,7 @@
                                 </constraints>
                             </scrollView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="YRO-9z-T68">
-                                <rect key="frame" x="0.0" y="810" width="428" height="82"/>
+                                <rect key="frame" x="0.0" y="800" width="428" height="92"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="银行入金时间段：9:05-15:55" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="J1v-tj-3ag">
                                         <rect key="frame" x="0.0" y="0.0" width="428" height="17"/>
@@ -1364,9 +1364,9 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="QIF-bn-YRR">
-                                        <rect key="frame" x="0.0" y="32" width="428" height="50"/>
+                                        <rect key="frame" x="0.0" y="32" width="428" height="60"/>
                                         <constraints>
-                                            <constraint firstAttribute="height" constant="50" id="d5k-Hi-Gbt"/>
+                                            <constraint firstAttribute="height" constant="60" id="d5k-Hi-Gbt"/>
                                         </constraints>
                                         <inset key="titleEdgeInsets" minX="0.0" minY="-5" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" title="确定" backgroundImage="button_blue">
@@ -1442,13 +1442,13 @@
         <!--出金-->
         <scene sceneID="LDB-zt-r8l">
             <objects>
-                <viewController storyboardIdentifier="OutMoneyViewID" title="出金" id="eAL-8Q-re1" customClass="OutMoneyViewController" customModule="BPML" 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"/>
                         <subviews>
                             <scrollView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FFw-b7-kks">
-                                <rect key="frame" x="0.0" y="44" width="428" height="756"/>
+                                <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"/>
@@ -1459,14 +1459,14 @@
                                                     <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"/>
                                                         <subviews>
-                                                            <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="出金金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Leq-dI-I2b">
+                                                            <label userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="提现金额" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Leq-dI-I2b">
                                                                 <rect key="frame" x="0.0" y="0.0" width="100" height="35"/>
                                                                 <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"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ReG-2s-A86" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ReG-2s-A86" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1504,7 +1504,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6YK-8g-RB2" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6YK-8g-RB2" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="0.60000002379999995" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1534,7 +1534,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="100" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="4eY-VX-qdj" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="100" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="4eY-VX-qdj" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1591,8 +1591,8 @@
                                                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="chh-Lb-L0W">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <subviews>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="vX6-DQ-znZ" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
-                                                                        <rect key="frame" x="0.0" y="0.0" width="134" height="35"/>
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="vX6-DQ-znZ" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
+                                                                        <rect key="frame" x="0.0" y="0.0" width="268" height="35"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                                         <textInputTraits key="textInputTraits" keyboardType="numbersAndPunctuation" secureTextEntry="YES"/>
@@ -1614,8 +1614,8 @@
                                                                             <outlet property="delegate" destination="eAL-8Q-re1" id="euq-6T-gJm"/>
                                                                         </connections>
                                                                     </textField>
-                                                                    <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="y8n-9y-Acs">
-                                                                        <rect key="frame" x="134" y="0.0" width="134" height="35"/>
+                                                                    <button hidden="YES" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="y8n-9y-Acs">
+                                                                        <rect key="frame" x="0.0" y="0.0" width="0.0" height="35"/>
                                                                         <state key="normal" title="忘记密码？"/>
                                                                         <connections>
                                                                             <action selector="forgetPassword:" destination="eAL-8Q-re1" eventType="touchUpInside" id="M9Z-Fj-FOG"/>
@@ -1634,7 +1634,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="E6F-H5-HVh" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="E6F-H5-HVh" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="111.66666666666666" y="0.0" width="296.33333333333337" height="0.0"/>
                                                                 <color key="backgroundColor" white="0.66666666666666663" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1666,7 +1666,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Vxs-YA-ZA8" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Vxs-YA-ZA8" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="0.60000002379999995" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1696,7 +1696,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="800" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="hoF-oX-4fc" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="800" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="hoF-oX-4fc" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1750,7 +1750,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="EeR-9K-jGh" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="EeR-9K-jGh" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="0.60000002379999995" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1780,7 +1780,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mEc-eN-WrG" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mEc-eN-WrG" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="0.60000002379999995" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1810,7 +1810,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="3UZ-I8-wff" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="3UZ-I8-wff" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="0.60000002379999995" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -1839,7 +1839,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="VSZ-Ku-qmc" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="VSZ-Ku-qmc" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1896,7 +1896,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="200" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="Wpr-7R-izg" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="200" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="Wpr-7R-izg" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1953,7 +1953,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="300" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="fuk-wU-bBf" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="300" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="fuk-wU-bBf" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2010,7 +2010,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DCG-AV-uCN" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DCG-AV-uCN" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2041,7 +2041,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LBB-LB-yoG" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LBB-LB-yoG" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2072,7 +2072,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="MVJ-g6-Ld2" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="MVJ-g6-Ld2" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2103,7 +2103,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="8d4-nQ-WVy" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="8d4-nQ-WVy" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2137,7 +2137,7 @@
                                                             <stackView contentMode="scaleToFill" distribution="fillEqually" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="a3V-02-nbr">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <subviews>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="f9r-DO-SuS" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="f9r-DO-SuS" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="0.0" y="0.0" width="131.66666666666666" height="0.0"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2157,7 +2157,7 @@
                                                                             <outlet property="delegate" destination="eAL-8Q-re1" id="i4A-KQ-SIJ"/>
                                                                         </connections>
                                                                     </textField>
-                                                                    <button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lv7-e8-wFE" customClass="IBButton" customModule="BPML" customModuleProvider="target">
+                                                                    <button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Lv7-e8-wFE" customClass="IBButton" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="136.66666666666669" y="0.0" width="131.33333333333331" height="0.0"/>
                                                                         <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2228,7 +2228,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4ZY-fw-S5R" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4ZY-fw-S5R" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2259,7 +2259,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="400" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="5g7-3E-vzS" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="400" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="5g7-3E-vzS" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="-15" width="268" height="30"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <constraints>
@@ -2318,7 +2318,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="G92-VO-XJX" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="G92-VO-XJX" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2349,7 +2349,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Fqa-Uz-Hrh" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Fqa-Uz-Hrh" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2380,7 +2380,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="500" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="5xu-Qv-SfZ" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="500" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="5xu-Qv-SfZ" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2437,7 +2437,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ey8-Sw-MsH" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ey8-Sw-MsH" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2468,7 +2468,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FqP-cW-d8M" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FqP-cW-d8M" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2499,7 +2499,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vRr-kP-3Sn" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="vRr-kP-3Sn" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2530,7 +2530,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="s6i-Pk-Awo" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="s6i-Pk-Awo" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2605,7 +2605,7 @@
                                 </constraints>
                             </scrollView>
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="yJ5-zq-r7c">
-                                <rect key="frame" x="0.0" y="810" width="428" height="82"/>
+                                <rect key="frame" x="0.0" y="800" width="428" height="92"/>
                                 <subviews>
                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="银行出金时间段：9:05-15:55" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="CNc-Vo-p6T">
                                         <rect key="frame" x="0.0" y="0.0" width="428" height="17"/>
@@ -2614,9 +2614,9 @@
                                         <nil key="highlightedColor"/>
                                     </label>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="diU-HD-NE4">
-                                        <rect key="frame" x="0.0" y="32" width="428" height="50"/>
+                                        <rect key="frame" x="0.0" y="32" width="428" height="60"/>
                                         <constraints>
-                                            <constraint firstAttribute="height" constant="50" id="CJf-yc-fI1"/>
+                                            <constraint firstAttribute="height" constant="60" id="CJf-yc-fI1"/>
                                         </constraints>
                                         <inset key="titleEdgeInsets" minX="0.0" minY="-5" maxX="0.0" maxY="0.0"/>
                                         <state key="normal" title="确定" backgroundImage="button_blue">
@@ -2687,7 +2687,7 @@
         <!--出入金查询-->
         <scene sceneID="U4I-oi-ne7">
             <objects>
-                <viewController storyboardIdentifier="OutInQueryViewID" title="出入金查询" id="ORs-RH-Mli" customClass="OutInQueryViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="OutInQueryViewID" title="出入金查询" id="ORs-RH-Mli" customClass="OutInQueryViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="uRA-Yx-cVt">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -2707,7 +2707,7 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="fpo-rk-8Kx">
                                         <rect key="frame" x="75" y="0.0" width="327" height="30"/>
                                         <subviews>
-                                            <textField opaque="NO" tag="100" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="1995-8-8" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ZOW-Jc-fBt" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                            <textField opaque="NO" tag="100" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="1995-8-8" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ZOW-Jc-fBt" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="123.66666666666667" height="30"/>
                                                 <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2736,7 +2736,7 @@
                                                 <nil key="textColor"/>
                                                 <nil key="highlightedColor"/>
                                             </label>
-                                            <textField opaque="NO" tag="101" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="1995-8-8" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4qd-69-VTP" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                            <textField opaque="NO" tag="101" contentMode="scaleToFill" horizontalHuggingPriority="249" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="1995-8-8" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="4qd-69-VTP" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                 <rect key="frame" x="153.66666666666666" y="0.0" width="118.33333333333334" height="30"/>
                                                 <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2756,7 +2756,7 @@
                                                     <outlet property="delegate" destination="ORs-RH-Mli" id="gOz-vk-zro"/>
                                                 </connections>
                                             </textField>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yfL-Ky-Ax9" customClass="IBButton" customModule="BPML" customModuleProvider="target">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="yfL-Ky-Ax9" customClass="IBButton" customModule="LYB" customModuleProvider="target">
                                                 <rect key="frame" x="277" y="0.0" width="50" height="30"/>
                                                 <color key="backgroundColor" red="0.20000000000000001" green="0.51764705879999995" blue="0.95294117649999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <constraints>
@@ -2797,34 +2797,34 @@
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 <view key="tableFooterView" contentMode="scaleToFill" id="00n-bv-Ne6">
-                                    <rect key="frame" x="0.0" y="200" width="428" height="0.0"/>
+                                    <rect key="frame" x="0.0" y="166" width="428" height="0.0"/>
                                     <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </view>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="OutInMoneyTableViewCellID" rowHeight="144" id="ofe-lP-BrA" customClass="OutInMoneyTableViewCell" customModule="BPML" customModuleProvider="target">
-                                        <rect key="frame" x="0.0" y="28" width="428" height="144"/>
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="OutInMoneyTableViewCellID" rowHeight="110" id="ofe-lP-BrA" customClass="OutInMoneyTableViewCell" customModule="LYB" customModuleProvider="target">
+                                        <rect key="frame" x="0.0" y="28" width="428" height="110"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="ofe-lP-BrA" id="qca-a4-71n">
-                                            <rect key="frame" x="0.0" y="0.0" width="428" height="144"/>
+                                            <rect key="frame" x="0.0" y="0.0" width="428" height="110"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="uds-ub-FVX">
-                                                    <rect key="frame" x="25" y="16" width="378" height="112"/>
+                                                    <rect key="frame" x="20" y="11" width="388" height="88"/>
                                                     <subviews>
                                                         <stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="3jz-af-kr4">
-                                                            <rect key="frame" x="0.0" y="0.0" width="378" height="20.666666666666668"/>
+                                                            <rect key="frame" x="0.0" y="0.0" width="388" height="14.666666666666666"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="g2T-m5-bgZ">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="252" height="20.666666666666668"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                    <nil key="textColor"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="258.66666666666669" height="14.666666666666666"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="8PF-33-NoN">
-                                                                    <rect key="frame" x="254" y="0.0" width="124" height="20.666666666666668"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                    <nil key="textColor"/>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="8PF-33-NoN">
+                                                                    <rect key="frame" x="260.66666666666669" y="0.0" width="127.33333333333331" height="14.666666666666666"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                             </subviews>
@@ -2833,43 +2833,43 @@
                                                             </constraints>
                                                         </stackView>
                                                         <stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="9UH-R3-s8P">
-                                                            <rect key="frame" x="0.0" y="30.666666666666664" width="378" height="20.333333333333336"/>
+                                                            <rect key="frame" x="0.0" y="24.666666666666664" width="388" height="14.333333333333336"/>
                                                             <subviews>
                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="11" translatesAutoresizingMaskIntoConstraints="NO" id="nKJ-Nj-CHN">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="252" height="20.333333333333332"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                    <nil key="textColor"/>
+                                                                    <rect key="frame" x="0.0" y="0.0" width="258.66666666666669" height="14.333333333333334"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="g3V-Lk-ono">
-                                                                    <rect key="frame" x="254" y="0.0" width="124" height="20.333333333333332"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                    <nil key="textColor"/>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="g3V-Lk-ono">
+                                                                    <rect key="frame" x="260.66666666666669" y="0.0" width="127.33333333333331" height="14.333333333333334"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                             </subviews>
                                                         </stackView>
                                                         <stackView opaque="NO" contentMode="scaleToFill" spacing="2" translatesAutoresizingMaskIntoConstraints="NO" id="N6i-iV-QkZ">
-                                                            <rect key="frame" x="0.0" y="60.999999999999993" width="378" height="20.666666666666664"/>
+                                                            <rect key="frame" x="0.0" y="49" width="388" height="14.666666666666664"/>
                                                             <subviews>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="luq-oQ-B16">
-                                                                    <rect key="frame" x="0.0" y="0.0" width="252" height="20.666666666666668"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                    <nil key="textColor"/>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="luq-oQ-B16">
+                                                                    <rect key="frame" x="0.0" y="0.0" width="258.66666666666669" height="14.666666666666666"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
-                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="OKj-47-DS9">
-                                                                    <rect key="frame" x="254" y="0.0" width="124" height="20.666666666666668"/>
-                                                                    <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                                    <nil key="textColor"/>
+                                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="OKj-47-DS9">
+                                                                    <rect key="frame" x="260.66666666666669" y="0.0" width="127.33333333333331" height="14.666666666666666"/>
+                                                                    <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                    <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                                                     <nil key="highlightedColor"/>
                                                                 </label>
                                                             </subviews>
                                                         </stackView>
-                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="JVp-nX-f1q">
-                                                            <rect key="frame" x="0.0" y="91.666666666666671" width="378" height="20.333333333333329"/>
-                                                            <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                                                            <nil key="textColor"/>
+                                                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="JVp-nX-f1q">
+                                                            <rect key="frame" x="0.0" y="73.666666666666671" width="388" height="14.333333333333329"/>
+                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                            <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
                                                             <nil key="highlightedColor"/>
                                                         </label>
                                                     </subviews>
@@ -2880,10 +2880,10 @@
                                                 </stackView>
                                             </subviews>
                                             <constraints>
-                                                <constraint firstAttribute="trailingMargin" secondItem="uds-ub-FVX" secondAttribute="trailing" constant="5" id="9C4-6u-XS0"/>
-                                                <constraint firstAttribute="bottomMargin" secondItem="uds-ub-FVX" secondAttribute="bottom" constant="5" id="dnd-Rs-kcz"/>
-                                                <constraint firstItem="uds-ub-FVX" firstAttribute="top" secondItem="qca-a4-71n" secondAttribute="topMargin" constant="5" id="dz2-PI-7nS"/>
-                                                <constraint firstItem="uds-ub-FVX" firstAttribute="leading" secondItem="qca-a4-71n" secondAttribute="leadingMargin" constant="5" id="xgJ-P7-mBq"/>
+                                                <constraint firstAttribute="trailingMargin" secondItem="uds-ub-FVX" secondAttribute="trailing" id="9C4-6u-XS0"/>
+                                                <constraint firstAttribute="bottomMargin" secondItem="uds-ub-FVX" secondAttribute="bottom" id="dnd-Rs-kcz"/>
+                                                <constraint firstItem="uds-ub-FVX" firstAttribute="top" secondItem="qca-a4-71n" secondAttribute="topMargin" id="dz2-PI-7nS"/>
+                                                <constraint firstItem="uds-ub-FVX" firstAttribute="leading" secondItem="qca-a4-71n" secondAttribute="leadingMargin" id="xgJ-P7-mBq"/>
                                             </constraints>
                                         </tableViewCellContentView>
                                         <connections>
@@ -2942,193 +2942,193 @@
     </scenes>
     <designables>
         <designable name="36F-aO-saT">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="3UZ-I8-wff">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="4ZY-fw-S5R">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="4eY-VX-qdj">
-            <size key="intrinsicContentSize" width="44" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" 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="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="5g7-3E-vzS">
-            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="5xu-Qv-SfZ">
-            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="6YK-8g-RB2">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="8d4-nQ-WVy">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="94b-a3-0zq">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="AgJ-dP-P0t">
-            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="BHi-xo-QJl">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="Cgy-7d-Ic4">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="DCG-AV-uCN">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="DE8-7b-Pqw">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="E6F-H5-HVh">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="EeR-9K-jGh">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="FqP-cW-d8M">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="Fqa-Uz-Hrh">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="G92-VO-XJX">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="HBY-ka-CyL">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="HIW-3N-okK">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="LBB-LB-yoG">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" 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="24" height="17"/>
+            <size key="intrinsicContentSize" width="4" height="17"/>
         </designable>
         <designable name="OPc-1z-pxV">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="P4n-Up-XwQ">
-            <size key="intrinsicContentSize" width="24" height="17"/>
+            <size key="intrinsicContentSize" width="4" 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="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="UBN-Hs-ByH">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="VSZ-Ku-qmc">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="VUo-IK-rAe">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="VwY-DW-qti">
-            <size key="intrinsicContentSize" width="44" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="Vxs-YA-ZA8">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="Wpr-7R-izg">
-            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="Yzo-v8-3b7">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="Z3N-Eh-W71">
-            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="ZIH-ka-hrP">
-            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" 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="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="dJp-9b-Voy">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="e6d-Hg-yNK">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="ey8-Sw-MsH">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="f9r-DO-SuS">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="fuk-wU-bBf">
-            <size key="intrinsicContentSize" width="54" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="hoF-oX-4fc">
-            <size key="intrinsicContentSize" width="44" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="jsh-mN-9cI">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="kG2-M3-2tu">
-            <size key="intrinsicContentSize" width="44" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="l3x-pH-MSj">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="mEc-eN-WrG">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="pzH-6a-ApT">
-            <size key="intrinsicContentSize" width="44" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="qbi-zr-Xg9">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="s3B-Zg-231">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="s6i-Pk-Awo">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="vRr-kP-3Sn">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" 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="24" height="17"/>
+            <size key="intrinsicContentSize" width="4" height="17"/>
         </designable>
         <designable name="wQi-Jm-FHZ">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="whO-0n-Mti">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
         <designable name="xrW-Ns-1Bh">
-            <size key="intrinsicContentSize" width="24" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" 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="54" height="18.666666666666668"/>
+            <size key="intrinsicContentSize" width="4" height="18.666666666666668"/>
         </designable>
     </designables>
     <resources>

MTP_iOS/MTP2_iOS/Resource/Storyboard/Mine/Settings.storyboard

@@ -12,7 +12,7 @@
         <!--关于-->
         <scene sceneID="QIS-r5-xvK">
             <objects>
-                <viewController storyboardIdentifier="AboutUsFirst" id="ccu-gx-Gso" customClass="AboutUsViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="AboutUsFirst" id="ccu-gx-Gso" customClass="AboutUsViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="IZE-rl-Qdf">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -75,7 +75,7 @@
         <!--关于-->
         <scene sceneID="i3s-9m-hhb">
             <objects>
-                <navigationController storyboardIdentifier="AboutNav" title="关于" id="G8W-fB-XNX" customClass="BaseNavigationController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="AboutNav" title="关于" id="G8W-fB-XNX" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="atM-pt-TDR">
                         <rect key="frame" x="0.0" y="44" width="428" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -95,7 +95,7 @@
         <!--免责声明-->
         <scene sceneID="ULy-Xv-Om0">
             <objects>
-                <viewController storyboardIdentifier="DISCLAIMER" id="4hd-iL-2N9" customClass="DisclaimerViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="DISCLAIMER" id="4hd-iL-2N9" customClass="DisclaimerViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="aWX-cB-L19">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -137,7 +137,7 @@
         <!--LoginPasswordUpdate-->
         <scene sceneID="ATY-XC-cPp">
             <objects>
-                <viewController storyboardIdentifier="LoginPasswordUpdateFirst" title="登录密码修改" id="8rh-Rr-OVV" userLabel="LoginPasswordUpdate" customClass="LoginPasswordUpdateViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="LoginPasswordUpdateFirst" title="登录密码修改" id="8rh-Rr-OVV" userLabel="LoginPasswordUpdate" customClass="LoginPasswordUpdateViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="JIg-2j-6lv">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -145,7 +145,7 @@
                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="gZ7-fT-HR0">
                                 <rect key="frame" x="0.0" y="98" width="428" height="250"/>
                                 <subviews>
-                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="说明：出于您账户安全性角度考虑，需要您对登录密码重新设置，设置后的新密码将及时生效。" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ceD-pA-wtn" customClass="IBLabel" customModule="BPML" customModuleProvider="target">
+                                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="说明：出于您账户安全性角度考虑，需要您对登录密码重新设置，设置后的新密码将及时生效。" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ceD-pA-wtn" customClass="IBLabel" customModule="LYB" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="0.0" width="428" height="36"/>
                                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                         <color key="textColor" red="0.95657938720000002" green="0.10993451629999999" blue="0.29785734419999998" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -366,6 +366,7 @@
                         <outlet property="submitButton" destination="7Zo-ns-eaP" id="xKH-df-vnW"/>
                         <outlet property="tipMessageLabel" destination="FZg-Ie-MPt" id="vIS-0V-MSa"/>
                         <outlet property="tipMsgLabel" destination="ceD-pA-wtn" id="Y26-iO-T6Y"/>
+                        <segue destination="WZa-tl-ZCc" kind="show" identifier="ShowFundPwd" id="DXD-Cr-ZeJ"/>
                     </connections>
                 </viewController>
                 <placeholder placeholderIdentifier="IBFirstResponder" id="zGE-fh-g4X" userLabel="First Responder" sceneMemberID="firstResponder"/>
@@ -375,7 +376,7 @@
         <!--密码修改-->
         <scene sceneID="a7m-qm-CYh">
             <objects>
-                <navigationController storyboardIdentifier="LoginPWDNav" title="密码修改" id="CxD-Bf-VS8" customClass="BaseNavigationController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="LoginPWDNav" title="密码修改" id="CxD-Bf-VS8" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="tw8-mH-Dzx">
                         <rect key="frame" x="0.0" y="44" width="428" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -395,7 +396,7 @@
         <!--资金信息-->
         <scene sceneID="38A-vo-mVc">
             <objects>
-                <navigationController storyboardIdentifier="FundNav" title="资金信息" id="vME-yJ-sCP" customClass="BaseNavigationController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="FundNav" title="资金信息" id="vME-yJ-sCP" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="IRL-6M-BSr">
                         <rect key="frame" x="0.0" y="44" width="428" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -415,12 +416,12 @@
         <!--资金流水-->
         <scene sceneID="mkF-uE-4GW">
             <objects>
-                <viewController storyboardIdentifier="CapitalFlowViewControllerID" title="资金流水" id="v4Q-sD-QdB" customClass="CapitalFlowViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="CapitalFlowViewControllerID" title="资金流水" id="v4Q-sD-QdB" customClass="CapitalFlowViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="7vz-ZE-xNL">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
                         <subviews>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iEV-Ik-bWp" customClass="AKExcelView" customModule="BPML" customModuleProvider="target">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="iEV-Ik-bWp" customClass="AKExcelView" customModule="LYB" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="88" width="428" height="804"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </view>
@@ -467,7 +468,7 @@
         <!--历史资金流水-->
         <scene sceneID="zPQ-WI-mCo">
             <objects>
-                <viewController storyboardIdentifier="HistoryCapitalFlowViewControllerID" title="历史资金流水" id="NxP-Jr-19Z" customClass="HistoryCapitalFlowViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="HistoryCapitalFlowViewControllerID" title="历史资金流水" id="NxP-Jr-19Z" customClass="HistoryCapitalFlowViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="AKo-wA-JyQ">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -507,7 +508,7 @@
                                                     <outlet property="delegate" destination="NxP-Jr-19Z" id="aSh-vj-hAy"/>
                                                 </connections>
                                             </textField>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Qid-pc-bBE" customClass="IBButton" customModule="BPML" customModuleProvider="target">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Qid-pc-bBE" customClass="IBButton" customModule="LYB" customModuleProvider="target">
                                                 <rect key="frame" x="281.33333333333331" y="0.0" width="49" height="30"/>
                                                 <color key="backgroundColor" red="0.20000000000000001" green="0.51764705879999995" blue="0.95294117649999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -547,7 +548,7 @@
                                     <constraint firstAttribute="height" constant="1" id="4mH-vR-Uxl"/>
                                 </constraints>
                             </view>
-                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YHO-d3-jZf" customClass="AKExcelView" customModule="BPML" customModuleProvider="target">
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YHO-d3-jZf" customClass="AKExcelView" customModule="LYB" customModuleProvider="target">
                                 <rect key="frame" x="0.0" y="129" width="428" height="763"/>
                                 <subviews>
                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="7MM-2U-iaj">
@@ -599,7 +600,7 @@
         <!--Base Navigation Controller-->
         <scene sceneID="ExU-eR-Eg3">
             <objects>
-                <navigationController storyboardIdentifier="AuthNav" id="IoF-Mq-f2h" customClass="BaseNavigationController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="AuthNav" id="IoF-Mq-f2h" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="lLJ-os-6Cq">
                         <rect key="frame" x="0.0" y="44" width="428" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -619,7 +620,7 @@
         <!--认证-->
         <scene sceneID="tHt-Yi-9kt">
             <objects>
-                <viewController storyboardIdentifier="Auth" title="认证" id="dWA-YL-Qzu" customClass="AuthAddressViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="Auth" title="认证" id="dWA-YL-Qzu" customClass="AuthAddressViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="nG5-Yl-b3P">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -676,7 +677,7 @@
         <!--收货信息-->
         <scene sceneID="9sp-Xu-95u">
             <objects>
-                <viewController storyboardIdentifier="PickUpAddress" title="收货信息" id="U6T-El-igb" customClass="ReceiveGoodsInfoViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="PickUpAddress" title="收货信息" id="U6T-El-igb" customClass="ReceiveGoodsInfoViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="nHh-kB-xEU">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -690,14 +691,14 @@
                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </view>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="addressCellID" rowHeight="85" id="m2A-CV-MZp" customClass="ReceiveGoodsCell" customModule="BPML" customModuleProvider="target">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="none" indentationWidth="10" reuseIdentifier="addressCellID" rowHeight="85" id="m2A-CV-MZp" customClass="ReceiveGoodsCell" customModule="LYB" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="28" width="428" height="85"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="m2A-CV-MZp" id="9Tw-fV-C0R">
                                             <rect key="frame" x="0.0" y="0.0" width="428" height="85"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tyz-aD-THv" customClass="IBLabel" customModule="BPML" customModuleProvider="target">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="tyz-aD-THv" customClass="IBLabel" customModule="LYB" customModuleProvider="target">
                                                     <rect key="frame" x="12" y="27.666666666666671" width="30" height="30"/>
                                                     <color key="backgroundColor" red="0.20000000000000001" green="0.51764705879999995" blue="0.95294117649999999" alpha="1" colorSpace="calibratedRGB"/>
                                                     <constraints>
@@ -857,7 +858,7 @@
         <!--新建收货地址-->
         <scene sceneID="uht-aV-TQa">
             <objects>
-                <viewController storyboardIdentifier="CreateReceiveGoodsAddressViewControllerID" title="新建收货地址" id="rCd-vF-0cq" customClass="CreateReceiveGoodsAddressViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="CreateReceiveGoodsAddressViewControllerID" title="新建收货地址" id="rCd-vF-0cq" customClass="CreateReceiveGoodsAddressViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="cE0-Mm-zqW">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -877,7 +878,7 @@
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入提货人姓名" textAlignment="right" minimumFontSize="12" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="exi-Ot-Imi" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入提货人姓名" textAlignment="right" minimumFontSize="12" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="exi-Ot-Imi" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                         <rect key="frame" x="94.666666666666657" y="15" width="310.33333333333337" height="30"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="30" id="Hqf-4e-Oy2"/>
@@ -923,7 +924,7 @@
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <textField tag="100" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入联系电话" textAlignment="right" minimumFontSize="12" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="sK9-pG-hYn" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                    <textField tag="100" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入联系电话" textAlignment="right" minimumFontSize="12" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="sK9-pG-hYn" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                         <rect key="frame" x="94.666666666666657" y="15" width="310.33333333333337" height="30"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="30" id="Phr-rA-Fwh"/>
@@ -969,7 +970,7 @@
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <textField tag="101" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入联系地址" textAlignment="right" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="dtT-kE-62j" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                    <textField tag="101" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入联系地址" textAlignment="right" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="dtT-kE-62j" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                         <rect key="frame" x="94.666666666666657" y="15" width="325.33333333333337" height="30"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="30" id="dkJ-vY-NDL"/>
@@ -1021,7 +1022,7 @@
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <textField tag="102" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入详细地址" textAlignment="right" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="b3r-vH-JKo" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                    <textField tag="102" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入详细地址" textAlignment="right" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="b3r-vH-JKo" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                         <rect key="frame" x="94.666666666666657" y="15" width="310.33333333333337" height="30"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="30" id="eod-CD-9xd"/>
@@ -1065,7 +1066,7 @@
                                                         <nil key="textColor"/>
                                                         <nil key="highlightedColor"/>
                                                     </label>
-                                                    <textField tag="102" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入备注信息" textAlignment="right" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="3Yj-ch-upF" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                    <textField tag="102" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入备注信息" textAlignment="right" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="3Yj-ch-upF" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                         <rect key="frame" x="94.666666666666657" y="15" width="310.33333333333337" height="30"/>
                                                         <constraints>
                                                             <constraint firstAttribute="height" constant="30" id="vox-o3-ijs"/>
@@ -1174,7 +1175,7 @@
         <!--Base Navigation Controller-->
         <scene sceneID="WZm-Lc-xZc">
             <objects>
-                <navigationController storyboardIdentifier="PickUpNav" id="ozv-aO-YIt" customClass="BaseNavigationController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="PickUpNav" id="ozv-aO-YIt" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Sa1-ex-dcr">
                         <rect key="frame" x="0.0" y="44" width="428" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -1194,7 +1195,7 @@
         <!--Base Navigation Controller-->
         <scene sceneID="QmW-nP-VqU">
             <objects>
-                <navigationController storyboardIdentifier="SigningNav" id="au0-R5-Xry" customClass="BaseNavigationController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="SigningNav" id="au0-R5-Xry" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="iJJ-lt-yGj">
                         <rect key="frame" x="0.0" y="44" width="428" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -1214,7 +1215,7 @@
         <!--签约解约-->
         <scene sceneID="aJy-kb-zT3">
             <objects>
-                <viewController storyboardIdentifier="SigningTerminationFirst" title="签约解约" id="0Cs-p9-1D5" customClass="SigningTerminationViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="SigningTerminationFirst" title="签约解约" id="0Cs-p9-1D5" customClass="SigningTerminationViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Jgd-JH-VEa">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1223,7 +1224,7 @@
                                 <rect key="frame" x="0.0" y="0.0" width="428" height="892"/>
                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SigningTerminationCellID" rowHeight="188" id="bbz-FW-rrw" customClass="SigningTerminationTableViewCell" customModule="BPML" customModuleProvider="target">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SigningTerminationCellID" rowHeight="188" id="bbz-FW-rrw" customClass="SigningTerminationTableViewCell" customModule="LYB" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="28" width="428" height="188"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="bbz-FW-rrw" id="6aF-ZO-0wj">
@@ -1374,7 +1375,7 @@
         <!--Base Navigation Controller-->
         <scene sceneID="khE-qb-jDh">
             <objects>
-                <navigationController storyboardIdentifier="SigningNavigaionID" id="dRG-RB-qx5" customClass="BaseNavigationController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="SigningNavigaionID" id="dRG-RB-qx5" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translucent="NO" id="tfX-Dg-yUd">
                         <rect key="frame" x="0.0" y="44" width="428" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -1397,7 +1398,7 @@
         <!--签约申请-->
         <scene sceneID="PQ2-i1-d2N">
             <objects>
-                <viewController storyboardIdentifier="SigningMain" title="签约申请" id="SNX-bC-aRf" customClass="SigningMainViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="SigningMain" title="签约申请" id="SNX-bC-aRf" customClass="SigningMainViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="vgy-Ol-quo">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="838"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1474,7 +1475,7 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" distribution="fillEqually" spacing="15" translatesAutoresizingMaskIntoConstraints="NO" id="A0P-Eb-k40">
                                         <rect key="frame" x="12" y="0.0" width="404" height="45"/>
                                         <subviews>
-                                            <button opaque="NO" tag="104" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="L4f-if-Yhj" userLabel="上一步" customClass="IBButton" customModule="BPML" customModuleProvider="target">
+                                            <button opaque="NO" tag="104" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="L4f-if-Yhj" userLabel="上一步" customClass="IBButton" customModule="LYB" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="124.66666666666667" height="45"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <state key="normal" title="上一步" backgroundImage="button_blue">
@@ -1494,7 +1495,7 @@
                                                     <action selector="onClickButton:" destination="SNX-bC-aRf" eventType="touchUpInside" id="vUQ-jp-lW3"/>
                                                 </connections>
                                             </button>
-                                            <button opaque="NO" tag="105" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l8i-Y0-p9l" customClass="IBButton" customModule="BPML" customModuleProvider="target">
+                                            <button opaque="NO" tag="105" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="l8i-Y0-p9l" customClass="IBButton" customModule="LYB" customModuleProvider="target">
                                                 <rect key="frame" x="139.66666666666666" y="0.0" width="124.66666666666666" height="45"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <state key="normal" title="下一步" backgroundImage="button_red"/>
@@ -1512,7 +1513,7 @@
                                                     <action selector="onClickButton:" destination="SNX-bC-aRf" eventType="touchUpInside" id="F5l-Cj-mHh"/>
                                                 </connections>
                                             </button>
-                                            <button opaque="NO" tag="106" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uXC-j9-IGf" customClass="IBButton" customModule="BPML" customModuleProvider="target">
+                                            <button opaque="NO" tag="106" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="uXC-j9-IGf" customClass="IBButton" customModule="LYB" customModuleProvider="target">
                                                 <rect key="frame" x="279.33333333333331" y="0.0" width="124.66666666666669" height="45"/>
                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
                                                 <state key="normal" title="签约" backgroundImage="button_blue"/>
@@ -1579,7 +1580,7 @@
         <!--Signing Step One View Controller-->
         <scene sceneID="wq6-OI-o9C">
             <objects>
-                <viewController storyboardIdentifier="SigningStepOneViewControllerID" id="R0D-cu-sYU" customClass="SigningStepOneViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="SigningStepOneViewControllerID" id="R0D-cu-sYU" customClass="SigningStepOneViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="WbU-Lq-cIz">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1588,7 +1589,7 @@
                                 <rect key="frame" x="0.0" y="44" width="428" height="848"/>
                                 <color key="backgroundColor" red="0.90196078430000004" green="0.90196078430000004" blue="0.90196078430000004" alpha="1" colorSpace="calibratedRGB"/>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SelectSignBankTableViewCellID" id="wvB-XF-5gs" customClass="SelectSignBankTableViewCell" customModule="BPML" customModuleProvider="target">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" preservesSuperviewLayoutMargins="YES" selectionStyle="default" indentationWidth="10" reuseIdentifier="SelectSignBankTableViewCellID" id="wvB-XF-5gs" customClass="SelectSignBankTableViewCell" customModule="LYB" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="28" width="428" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" preservesSuperviewLayoutMargins="YES" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="wvB-XF-5gs" id="8IB-cx-G9R">
@@ -1654,7 +1655,7 @@
         <!--Signing Step Two View Controller-->
         <scene sceneID="6eV-RT-O9c">
             <objects>
-                <viewController storyboardIdentifier="SigningStepTwoViewControllerID" id="ETg-lh-vtF" customClass="SigningStepTwoViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="SigningStepTwoViewControllerID" id="ETg-lh-vtF" customClass="SigningStepTwoViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="LKC-Kf-vHE">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1717,7 +1718,7 @@
         <!--Signing Step Three View Controller-->
         <scene sceneID="t7f-au-AP9">
             <objects>
-                <viewController storyboardIdentifier="SigningStepThreeViewControllerID" id="ONz-SR-EK7" customClass="SigningStepThreeViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="SigningStepThreeViewControllerID" id="ONz-SR-EK7" customClass="SigningStepThreeViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="53f-AN-12g">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1741,7 +1742,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="201" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="MFR-qu-qGO" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="201" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="MFR-qu-qGO" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <constraints>
@@ -1798,7 +1799,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LcG-fc-K6x" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="LcG-fc-K6x" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1833,7 +1834,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gDB-U6-4mO" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="gDB-U6-4mO" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1868,7 +1869,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="yhY-Ak-129" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="yhY-Ak-129" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1903,7 +1904,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="WWI-Ny-Y7x" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="WWI-Ny-Y7x" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -1963,7 +1964,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="200" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="smm-Ra-snh" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="200" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="smm-Ra-snh" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="-15" width="268" height="30"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <constraints>
@@ -2022,7 +2023,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="300" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="PVj-YN-Ys7" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="300" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="PVj-YN-Ys7" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="-15" width="268" height="30"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <constraints>
@@ -2081,7 +2082,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7zx-ZG-TZ9" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="7zx-ZG-TZ9" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2112,7 +2113,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="5iy-cc-Yl2" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="5iy-cc-Yl2" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2143,7 +2144,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ggJ-bn-aYV" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="ggJ-bn-aYV" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2174,7 +2175,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6JF-CL-RaN" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="6JF-CL-RaN" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2208,7 +2209,7 @@
                                                             <stackView contentMode="scaleToFill" distribution="fillEqually" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="1ux-rB-QhO">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <subviews>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="hOO-pe-TgI" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="hOO-pe-TgI" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="0.0" y="0.0" width="131.66666666666666" height="0.0"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2228,7 +2229,7 @@
                                                                             <outlet property="delegate" destination="ONz-SR-EK7" id="clN-qD-Llr"/>
                                                                         </connections>
                                                                     </textField>
-                                                                    <button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5hj-GX-9wN" customClass="IBButton" customModule="BPML" customModuleProvider="target">
+                                                                    <button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5hj-GX-9wN" customClass="IBButton" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="136.66666666666669" y="0.0" width="131.33333333333331" height="0.0"/>
                                                                         <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2299,7 +2300,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="TDe-FD-7qu" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="TDe-FD-7qu" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2330,7 +2331,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="400" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="slM-m8-0n5" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="400" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="slM-m8-0n5" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="-15" width="268" height="30"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <constraints>
@@ -2389,7 +2390,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="PpP-UG-0yf" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="PpP-UG-0yf" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2420,7 +2421,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="W8n-d5-HlD" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="W8n-d5-HlD" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2451,7 +2452,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField tag="500" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="cTG-0C-GZI" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField tag="500" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="cTG-0C-GZI" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="-15" width="268" height="30"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <constraints>
@@ -2510,7 +2511,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BK5-oO-6J0" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="BK5-oO-6J0" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2541,7 +2542,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="blg-uS-sdw" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="blg-uS-sdw" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2572,7 +2573,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="h72-WU-1ZZ" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="h72-WU-1ZZ" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2603,7 +2604,7 @@
                                                                 <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <nil key="highlightedColor"/>
                                                             </label>
-                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oed-i0-8k8" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="oed-i0-8k8" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2727,7 +2728,7 @@
         <!--选择开户银行-->
         <scene sceneID="qBE-Yj-HV9">
             <objects>
-                <viewController storyboardIdentifier="SelectRegiesterBankViewControllerID" title="选择开户银行" id="krc-ca-JcE" customClass="SelectRegiesterBankViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="SelectRegiesterBankViewControllerID" title="选择开户银行" id="krc-ca-JcE" customClass="SelectRegiesterBankViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="rJ7-K2-kI9">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -2812,7 +2813,7 @@
         <!--签约详情-->
         <scene sceneID="LwN-Sp-UC3">
             <objects>
-                <viewController title="签约详情" id="yUI-qS-SxE" customClass="SigningDetailViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController title="签约详情" id="yUI-qS-SxE" customClass="SigningDetailViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="shF-aM-5yX">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
@@ -2921,7 +2922,7 @@
         <!--签约修改-->
         <scene sceneID="rGA-Xx-aYX">
             <objects>
-                <viewController title="签约修改" id="ztW-CS-sIM" customClass="SigningModifyViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController title="签约修改" id="ztW-CS-sIM" customClass="SigningModifyViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="CuW-FD-wEA">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -2948,7 +2949,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DW1-ea-dD7" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" enabled="NO" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="DW1-ea-dD7" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                         <color key="backgroundColor" red="1" green="1" blue="1" alpha="0.59897667249999997" colorSpace="custom" customColorSpace="sRGB"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -2974,7 +2975,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField tag="201" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="6Oh-v2-Gtp" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField tag="201" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="6Oh-v2-Gtp" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <constraints>
@@ -3031,7 +3032,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="jdI-3C-zsG" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="jdI-3C-zsG" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3066,7 +3067,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0YN-nR-04E" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="0YN-nR-04E" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3101,7 +3102,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="T2W-dq-rww" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="T2W-dq-rww" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="35"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3161,7 +3162,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField tag="200" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="D1j-pj-Ybz" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField tag="200" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="D1j-pj-Ybz" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="-15" width="268" height="30"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <constraints>
@@ -3220,7 +3221,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField tag="300" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="v9G-F3-WFZ" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField tag="300" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="v9G-F3-WFZ" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="-15" width="268" height="30"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <constraints>
@@ -3279,7 +3280,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="uNm-Ib-JAn" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="uNm-Ib-JAn" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3310,7 +3311,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="NtO-x8-KEt" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="NtO-x8-KEt" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3341,7 +3342,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="OIZ-rv-bcw" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="OIZ-rv-bcw" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3372,7 +3373,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="xaj-gb-E16" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="xaj-gb-E16" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3406,7 +3407,7 @@
                                                                     <stackView contentMode="scaleToFill" distribution="fillEqually" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="CwR-re-0cH">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                         <subviews>
-                                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="d30-0F-ekQ" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                            <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="7" translatesAutoresizingMaskIntoConstraints="NO" id="d30-0F-ekQ" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                                 <rect key="frame" x="0.0" y="0.0" width="131.66666666666666" height="0.0"/>
                                                                                 <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3426,7 +3427,7 @@
                                                                                     <outlet property="delegate" destination="ztW-CS-sIM" id="xiJ-V5-72e"/>
                                                                                 </connections>
                                                                             </textField>
-                                                                            <button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U5d-Gt-boj" customClass="IBButton" customModule="BPML" customModuleProvider="target">
+                                                                            <button contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="U5d-Gt-boj" customClass="IBButton" customModule="LYB" customModuleProvider="target">
                                                                                 <rect key="frame" x="136.66666666666669" y="0.0" width="131.33333333333331" height="0.0"/>
                                                                                 <color key="backgroundColor" red="0.0" green="0.47843137250000001" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                                                                 <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3497,7 +3498,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FzU-Uw-iLZ" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="FzU-Uw-iLZ" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3528,7 +3529,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField tag="400" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="FZc-Ar-NnX" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField tag="400" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="FZc-Ar-NnX" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="-15" width="268" height="30"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <constraints>
@@ -3587,7 +3588,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Jta-7J-HK4" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="Jta-7J-HK4" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3618,7 +3619,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dDy-R6-luX" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="dDy-R6-luX" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3649,7 +3650,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField tag="500" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="7mT-N5-35m" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField tag="500" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="12" translatesAutoresizingMaskIntoConstraints="NO" id="7mT-N5-35m" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="-15" width="268" height="30"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <constraints>
@@ -3708,7 +3709,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="de2-74-9PF" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="de2-74-9PF" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3739,7 +3740,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mxT-Gk-2nJ" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="mxT-Gk-2nJ" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3770,7 +3771,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="X06-az-gAh" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="X06-az-gAh" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3801,7 +3802,7 @@
                                                                         <color key="textColor" white="0.33333333329999998" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
-                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="8O2-IE-aSq" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                                                                    <textField contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="8O2-IE-aSq" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="140" y="0.0" width="268" height="0.0"/>
                                                                         <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <fontDescription key="fontDescription" type="system" pointSize="14"/>
@@ -3944,7 +3945,7 @@
         <!--设置-->
         <scene sceneID="lyW-Ug-IiN">
             <objects>
-                <tableViewController storyboardIdentifier="Settings" id="FVi-7V-jsb" customClass="SettingsViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <tableViewController storyboardIdentifier="Settings" id="FVi-7V-jsb" customClass="SettingsViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <tableView key="view" clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" dataMode="static" style="insetGrouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="18" sectionFooterHeight="18" id="ltS-A1-b9A">
                         <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -3952,7 +3953,7 @@
                             <rect key="frame" x="0.0" y="476" width="428" height="55"/>
                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                             <subviews>
-                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="49N-Dn-FZ8" customClass="IBButton" customModule="BPML" customModuleProvider="target">
+                                <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="49N-Dn-FZ8" customClass="IBButton" customModule="LYB" customModuleProvider="target">
                                     <rect key="frame" x="21.333333333333343" y="0.0" width="385.33333333333326" height="55"/>
                                     <state key="normal" title="退出登录" backgroundImage="button_blue">
                                         <color key="titleColor" red="1" green="1" blue="1" alpha="1" colorSpace="calibratedRGB"/>
@@ -4260,6 +4261,206 @@
             </objects>
             <point key="canvasLocation" x="-2471" y="2093"/>
         </scene>
+        <!--资金密码修改-->
+        <scene sceneID="0TF-LX-D3n">
+            <objects>
+                <viewController storyboardIdentifier="FundPasswordUpdate" id="WZa-tl-ZCc" customClass="FundPasswordUpdateViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="FGx-ri-zpc">
+                        <rect key="frame" x="0.0" y="0.0" width="428" height="926"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1F4-yE-PDS" userLabel="bgView">
+                                <rect key="frame" x="0.0" y="98" width="428" height="204"/>
+                                <subviews>
+                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" spacing="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="uLa-mK-0cg">
+                                        <rect key="frame" x="0.0" y="0.0" width="428" height="203"/>
+                                        <subviews>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="7oK-Ny-l03" userLabel="View1">
+                                                <rect key="frame" x="0.0" y="0.0" width="428" height="50.333333333333336"/>
+                                                <subviews>
+                                                    <stackView opaque="NO" contentMode="scaleToFill" distribution="equalSpacing" translatesAutoresizingMaskIntoConstraints="NO" id="muc-OG-c8L">
+                                                        <rect key="frame" x="20" y="0.0" width="388" height="50.333333333333336"/>
+                                                        <subviews>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="资金账号" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="tUA-ty-eLt" userLabel="账号">
+                                                                <rect key="frame" x="0.0" y="0.0" width="57.333333333333336" height="50.333333333333336"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bFh-Ya-hzo" userLabel="111000000016">
+                                                                <rect key="frame" x="153" y="0.0" width="235" height="50.333333333333336"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                                                <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.84705882349999995" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                        </subviews>
+                                                    </stackView>
+                                                </subviews>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <constraints>
+                                                    <constraint firstItem="muc-OG-c8L" firstAttribute="leading" secondItem="7oK-Ny-l03" secondAttribute="leading" constant="20" id="4oC-7l-oHj"/>
+                                                    <constraint firstAttribute="bottom" secondItem="muc-OG-c8L" secondAttribute="bottom" id="Mmm-Vk-WLc"/>
+                                                    <constraint firstAttribute="trailing" secondItem="muc-OG-c8L" secondAttribute="trailing" constant="20" id="ou3-ng-g8d"/>
+                                                    <constraint firstItem="muc-OG-c8L" firstAttribute="top" secondItem="7oK-Ny-l03" secondAttribute="top" id="uPV-NE-30H"/>
+                                                </constraints>
+                                            </view>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9OG-SM-bdW" userLabel="View2">
+                                                <rect key="frame" x="0.0" y="51" width="428" height="50.333333333333343"/>
+                                                <subviews>
+                                                    <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jrZ-kG-jhg">
+                                                        <rect key="frame" x="20" y="0.0" width="388" height="50.333333333333336"/>
+                                                        <subviews>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="原密码" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="nce-lW-TID" userLabel="原密码">
+                                                                <rect key="frame" x="0.0" y="0.0" width="129.33333333333334" height="50.333333333333336"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入原密码" textAlignment="right" minimumFontSize="1" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="yvf-nl-nT0">
+                                                                <rect key="frame" x="129.33333333333334" y="0.0" width="258.66666666666663" height="50.333333333333336"/>
+                                                                <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                <textInputTraits key="textInputTraits" secureTextEntry="YES" textContentType="password"/>
+                                                            </textField>
+                                                        </subviews>
+                                                        <constraints>
+                                                            <constraint firstItem="nce-lW-TID" firstAttribute="width" secondItem="jrZ-kG-jhg" secondAttribute="width" multiplier="1/3" id="ic6-YZ-y1W"/>
+                                                        </constraints>
+                                                    </stackView>
+                                                </subviews>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <constraints>
+                                                    <constraint firstItem="jrZ-kG-jhg" firstAttribute="leading" secondItem="9OG-SM-bdW" secondAttribute="leading" constant="20" id="5Ah-Hm-E9F"/>
+                                                    <constraint firstAttribute="trailing" secondItem="jrZ-kG-jhg" secondAttribute="trailing" constant="20" id="BbT-h0-DOF"/>
+                                                    <constraint firstAttribute="bottom" secondItem="jrZ-kG-jhg" secondAttribute="bottom" id="IIl-4q-LI7"/>
+                                                    <constraint firstItem="jrZ-kG-jhg" firstAttribute="top" secondItem="9OG-SM-bdW" secondAttribute="top" id="dQt-8c-n87"/>
+                                                </constraints>
+                                            </view>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="nCM-Z5-9VP" userLabel="View3">
+                                                <rect key="frame" x="0.0" y="102" width="428" height="50"/>
+                                                <subviews>
+                                                    <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yXM-CV-EMV">
+                                                        <rect key="frame" x="20" y="0.0" width="388" height="50"/>
+                                                        <subviews>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="新密码" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="hVr-bA-DQ2" userLabel="新密码">
+                                                                <rect key="frame" x="0.0" y="0.0" width="129.33333333333334" height="50"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请输入6-20个字符的新密码" textAlignment="right" minimumFontSize="1" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="7hI-oi-pXk">
+                                                                <rect key="frame" x="129.33333333333334" y="0.0" width="258.66666666666663" height="50"/>
+                                                                <color key="textColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                <textInputTraits key="textInputTraits" secureTextEntry="YES" textContentType="password"/>
+                                                            </textField>
+                                                        </subviews>
+                                                        <constraints>
+                                                            <constraint firstItem="hVr-bA-DQ2" firstAttribute="width" secondItem="yXM-CV-EMV" secondAttribute="width" multiplier="1/3" id="y4I-8R-Q5X"/>
+                                                        </constraints>
+                                                    </stackView>
+                                                </subviews>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="trailing" secondItem="yXM-CV-EMV" secondAttribute="trailing" constant="20" id="QDr-KI-hnV"/>
+                                                    <constraint firstItem="yXM-CV-EMV" firstAttribute="top" secondItem="nCM-Z5-9VP" secondAttribute="top" id="eZo-uS-Zh8"/>
+                                                    <constraint firstAttribute="bottom" secondItem="yXM-CV-EMV" secondAttribute="bottom" id="jRr-1u-5T4"/>
+                                                    <constraint firstItem="yXM-CV-EMV" firstAttribute="leading" secondItem="nCM-Z5-9VP" secondAttribute="leading" constant="20" id="uXn-SV-qkt"/>
+                                                </constraints>
+                                            </view>
+                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ym1-fQ-obr" userLabel="View4">
+                                                <rect key="frame" x="0.0" y="152.66666666666666" width="428" height="50.333333333333343"/>
+                                                <subviews>
+                                                    <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="JkN-xU-Jm6">
+                                                        <rect key="frame" x="20" y="0.0" width="388" height="50.333333333333336"/>
+                                                        <subviews>
+                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="确认新密码" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="TwV-ZP-zWL" userLabel="确认新密码">
+                                                                <rect key="frame" x="0.0" y="0.0" width="129.33333333333334" height="50.333333333333336"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
+                                                                <nil key="highlightedColor"/>
+                                                            </label>
+                                                            <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" placeholder="请再次确认新密码" textAlignment="right" minimumFontSize="1" clearButtonMode="whileEditing" translatesAutoresizingMaskIntoConstraints="NO" id="ziz-SU-RT4">
+                                                                <rect key="frame" x="129.33333333333334" y="0.0" width="258.66666666666663" height="50.333333333333336"/>
+                                                                <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                <textInputTraits key="textInputTraits" secureTextEntry="YES" textContentType="password"/>
+                                                            </textField>
+                                                        </subviews>
+                                                        <constraints>
+                                                            <constraint firstItem="TwV-ZP-zWL" firstAttribute="width" secondItem="JkN-xU-Jm6" secondAttribute="width" multiplier="1/3" id="03k-fe-pGr"/>
+                                                        </constraints>
+                                                    </stackView>
+                                                </subviews>
+                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                <constraints>
+                                                    <constraint firstAttribute="bottom" secondItem="JkN-xU-Jm6" secondAttribute="bottom" id="5cq-ce-kbH"/>
+                                                    <constraint firstAttribute="trailing" secondItem="JkN-xU-Jm6" secondAttribute="trailing" constant="20" id="LDy-ee-9nA"/>
+                                                    <constraint firstItem="JkN-xU-Jm6" firstAttribute="top" secondItem="ym1-fQ-obr" secondAttribute="top" id="cBK-7z-VGe"/>
+                                                    <constraint firstItem="JkN-xU-Jm6" firstAttribute="leading" secondItem="ym1-fQ-obr" secondAttribute="leading" constant="20" id="qxV-ee-kEY"/>
+                                                </constraints>
+                                            </view>
+                                        </subviews>
+                                        <constraints>
+                                            <constraint firstAttribute="height" constant="203" id="X5t-6G-847"/>
+                                        </constraints>
+                                    </stackView>
+                                </subviews>
+                                <color key="backgroundColor" red="0.92941176469999998" green="0.92941176469999998" blue="0.92941176469999998" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                <constraints>
+                                    <constraint firstAttribute="trailing" secondItem="uLa-mK-0cg" secondAttribute="trailing" id="5n5-7Z-sts"/>
+                                    <constraint firstItem="uLa-mK-0cg" firstAttribute="width" secondItem="1F4-yE-PDS" secondAttribute="width" id="Hv5-mF-9Tz"/>
+                                    <constraint firstAttribute="bottom" secondItem="uLa-mK-0cg" secondAttribute="bottom" constant="1" id="h8l-mV-xSN"/>
+                                    <constraint firstAttribute="height" constant="204" id="jfn-Bh-Ajf"/>
+                                    <constraint firstItem="uLa-mK-0cg" firstAttribute="leading" secondItem="1F4-yE-PDS" secondAttribute="leading" id="mhc-io-10p"/>
+                                    <constraint firstItem="uLa-mK-0cg" firstAttribute="top" secondItem="1F4-yE-PDS" secondAttribute="top" id="sYi-qX-zsi"/>
+                                    <constraint firstItem="uLa-mK-0cg" firstAttribute="height" secondItem="1F4-yE-PDS" secondAttribute="height" constant="-1" id="ybU-Yl-tOD"/>
+                                </constraints>
+                            </view>
+                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="pI6-pd-ilk" userLabel="提交">
+                                <rect key="frame" x="0.0" y="881" width="428" height="45"/>
+                                <color key="backgroundColor" systemColor="linkColor"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" relation="greaterThanOrEqual" constant="45" id="ELg-8h-0ze"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="18"/>
+                                <color key="tintColor" red="0.12549019610000001" green="0.47450980390000003" blue="0.97647058819999999" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+                                <inset key="titleEdgeInsets" minX="0.0" minY="-5" maxX="0.0" maxY="0.0"/>
+                                <state key="normal" title="提交">
+                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                </state>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="boolean" keyPath="colorFlag" value="YES"/>
+                                </userDefinedRuntimeAttributes>
+                                <connections>
+                                    <action selector="onSubmitButton:" destination="WZa-tl-ZCc" eventType="touchUpInside" id="yVM-K0-9j6"/>
+                                </connections>
+                            </button>
+                        </subviews>
+                        <viewLayoutGuide key="safeArea" id="fPb-IK-LoC"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                        <constraints>
+                            <constraint firstItem="1F4-yE-PDS" firstAttribute="top" secondItem="fPb-IK-LoC" secondAttribute="top" constant="10" id="1Zh-Hc-kiB"/>
+                            <constraint firstAttribute="bottom" secondItem="pI6-pd-ilk" secondAttribute="bottom" id="5oD-Bh-JSk"/>
+                            <constraint firstItem="1F4-yE-PDS" firstAttribute="trailing" secondItem="fPb-IK-LoC" secondAttribute="trailing" id="5oK-QL-Ztf"/>
+                            <constraint firstAttribute="trailing" secondItem="pI6-pd-ilk" secondAttribute="trailing" id="b78-th-aZY"/>
+                            <constraint firstItem="1F4-yE-PDS" firstAttribute="leading" secondItem="fPb-IK-LoC" secondAttribute="leading" id="gk3-MB-ld7"/>
+                            <constraint firstItem="pI6-pd-ilk" firstAttribute="leading" secondItem="FGx-ri-zpc" secondAttribute="leading" id="jWg-s5-Xrw"/>
+                        </constraints>
+                    </view>
+                    <navigationItem key="navigationItem" title="资金密码修改" id="sOg-Oa-aoN"/>
+                    <connections>
+                        <outlet property="accountIDLabel" destination="bFh-Ya-hzo" id="Tit-O3-8Yv"/>
+                        <outlet property="confirmPwdTextField" destination="ziz-SU-RT4" id="dGp-2m-tEY"/>
+                        <outlet property="newPwdTextField" destination="7hI-oi-pXk" id="ZdF-5d-tmV"/>
+                        <outlet property="oldPwdTextField" destination="yvf-nl-nT0" id="PhI-9f-nGN"/>
+                        <outlet property="submitButton" destination="pI6-pd-ilk" id="wma-P2-C71"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="a4o-Ii-VGy" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="938" y="606"/>
+        </scene>
     </scenes>
     <designables>
         <designable name="0YN-nR-04E">
@@ -4454,6 +4655,9 @@
         <systemColor name="groupTableViewBackgroundColor">
             <color red="0.94901960784313721" green="0.94901960784313721" blue="0.96862745098039216" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>
+        <systemColor name="linkColor">
+            <color red="0.0" green="0.47843137254901963" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </systemColor>
         <systemColor name="systemGray3Color">
             <color red="0.7803921568627451" green="0.7803921568627451" blue="0.80000000000000004" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </systemColor>

MTP_iOS/MTP2_iOS/Resource/Storyboard/ResetPwd/ResetPwd.storyboard

@@ -12,7 +12,7 @@
         <!--Base Navigation Controller-->
         <scene sceneID="VSY-D2-rGf">
             <objects>
-                <navigationController storyboardIdentifier="ResetPwdNav" interfaceStyle="light" id="M6I-uv-Lkv" customClass="BaseNavigationController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="ResetPwdNav" interfaceStyle="light" id="M6I-uv-Lkv" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" translucent="NO" id="hdv-0h-1fF">
                         <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -32,7 +32,7 @@
         <!--重置密码-->
         <scene sceneID="FKP-hu-gdq">
             <objects>
-                <viewController storyboardIdentifier="ResetPwdFirstStepID" title="重置密码" id="eVf-nV-bJJ" customClass="ResetPwdFirstStepViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="ResetPwdFirstStepID" title="重置密码" id="eVf-nV-bJJ" customClass="ResetPwdFirstStepViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="ngn-l6-9e6">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="808"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -181,7 +181,7 @@
                                     <constraint firstAttribute="height" constant="45" id="DUI-iw-suc"/>
                                 </constraints>
                                 <state key="normal" title="提交验证" backgroundImage="image_read_grident">
-                                    <color key="titleColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                    <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 </state>
                                 <connections>
                                     <action selector="onButtonPressed:" destination="eVf-nV-bJJ" eventType="touchUpInside" id="vbd-sA-onM"/>
@@ -233,7 +233,7 @@
         <!--滑动图形验证码-->
         <scene sceneID="BOz-Zl-mG4">
             <objects>
-                <viewController storyboardIdentifier="ImageCodeID" title="滑动图形验证码" id="hTz-eI-Clv" customClass="ImageCodeViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="ImageCodeID" title="滑动图形验证码" id="hTz-eI-Clv" customClass="ImageCodeViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="RXF-92-Zli">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -290,7 +290,7 @@
         <!--重置密码-->
         <scene sceneID="vHz-FQ-LaM">
             <objects>
-                <viewController storyboardIdentifier="ResetPwdSecondStepID" id="KTY-Lc-wMf" customClass="ResetPwdSecondStepViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="ResetPwdSecondStepID" id="KTY-Lc-wMf" customClass="ResetPwdSecondStepViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="YWx-0w-WFL">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="808"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -450,7 +450,7 @@
         <!--手机区号-->
         <scene sceneID="kHz-D3-yi4">
             <objects>
-                <viewController storyboardIdentifier="MobileAreaCodeID" id="wh8-iQ-yDb" customClass="MobileAreaCodeViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="MobileAreaCodeID" id="wh8-iQ-yDb" customClass="MobileAreaCodeViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="btT-kR-F6G">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>

MTP_iOS/MTP2_iOS/UserInterface/Base/BaseViewController/BaseViewController.swift

@@ -17,7 +17,7 @@ class BaseViewController: UIViewController {
     /// 无数据按钮
     @IBOutlet weak var noDataButton: UIButton! {
         didSet {
-            noDataButton.set(image: #imageLiteral(resourceName: "noData-universal"), title: "noData".localized, titlePosition: .bottom, additionalSpacing: 3.0, state: .normal)
+            noDataButton.set(image: #imageLiteral(resourceName: "noData-universal"), title: "无数据", titlePosition: .bottom, additionalSpacing: 3.0, state: .normal)
             noDataButton.tintColor = UIColor.lightGray
             noDataButton.isHidden = true
         }

MTP_iOS/MTP2_iOS/UserInterface/Coupon/ChooseCouponViewController.swift

@@ -116,7 +116,7 @@ class ChooseCouponViewController: BaseViewController {
         /// startAnimating
         _anim?.startAnimating()
         /// 查询数据
-        orderManager.requestQueryMyCouponHolds(moGoodsInfo.goodsid, amount, moGoodsInfo.sellUserID, nil) { (isComplete, error, objs) in
+        orderManager.requestQueryMyCouponHolds(moGoodsInfo.goodsid, amount, moGoodsInfo.sellUserID, "1,2") { (isComplete, error, objs) in
             DispatchQueue.main.async {
                 /// stopAnimating
                 self._anim?.stopAnimating()

MTP_iOS/MTP2_iOS/UserInterface/Coupon/CouponViewController.swift

@@ -91,18 +91,18 @@ class CouponViewController: BaseViewController {
             self.requestQueryMyUsedCoupon()
         } else {
             /// 查询数据
-            self.requestQueryMyCoupons(segmentIndex)
+            self.requestQueryMyCoupons(segmentIndex == 0 ? "1,2" : "3")
         }
     }
     
     /// 查询我的优惠券
-    fileprivate func requestQueryMyCoupons(_ segmentIndex: Int) {
+    fileprivate func requestQueryMyCoupons(_ status: String) {
         /// 异常
         guard let orderManager = MTP2BusinessCore.shared.orderManager else { return }
         /// startAnimating
         _anim?.startAnimating()
         /// 查询优惠券
-        orderManager.requestQueryMyCouponHolds(nil, nil, nil, EHoldStatus(rawValue: segmentIndex+2)) { (isComplete, error, objs) in
+        orderManager.requestQueryMyCouponHolds(nil, nil, nil, status) { (isComplete, error, objs) in
             DispatchQueue.main.async {
                 /// stopAnimating
                 self._anim?.stopAnimating()
@@ -221,45 +221,45 @@ class CouponCell: BaseTableViewCell<MoMyCouponHold> {
             goToUse.isHidden = !(obj.holdstatus == .executed)
             /// 数量 未生效和已生效才显示
             qty.text = (obj.holdstatus == .invalid ||  obj.holdstatus == .executed) ? "\(obj.qty)张" : ""
-            /// 选中
-            if let vc = self.superController() as? ChooseCouponViewController,
-               vc.segmentedView.selectedIndex == 0,
-               model?.couponholdid == vc.coupon?.couponholdid {
-                self.choosed = true
-            } else {
-                self.choosed = false
-            }
             
             switch obj.holdstatus {
             case .invalid, .used, .expired: /// 未生效 已使用 已过期
                 /// 背景
                 couponImage.image = UIImage(named: "my_coupon_bg_gray")
                 /// 使用时间
-                usedDate.text = obj.holdstatus == .expired ? "\(DateUtils.getTDateString(obj.startdate))-\(DateUtils.getTDateString(obj.enddate))" : obj.holdstatus.description
+                usedDate.text = (obj.holdstatus == .expired || obj.holdstatus == .invalid) ? "\(DateUtils.getTDateString(obj.startdate))-\(DateUtils.getTDateString(obj.enddate))" : obj.holdstatus.description
                 /// 不能使用原因
                 result.text = ""
             default:
                 if obj.unusedresult == "" {
                     /// 背景
                     couponImage.image = UIImage(named: obj.couponcategroy == 1 ? "my_coupon_bg" : "my_coupon_bg_red")
-                    /// 使用时间
-                    usedDate.text = "\(DateUtils.getTDateString(obj.startdate))-\(DateUtils.getTDateString(obj.enddate))"
                 } else {
                     /// 背景
                     couponImage.image = UIImage(named: "my_coupon_bg_gray")
                     /// 已生效
                     goToUse.isHidden = obj.unusedresult != ""
                 }
+                /// 使用时间
+                usedDate.text = "\(DateUtils.getTDateString(obj.startdate))-\(DateUtils.getTDateString(obj.enddate))"
             }
             if obj.couponcategroy == 1 {
-                discount.attributedText = ("￥".withFont(.font_12)+(obj.couponvalue.toDownString(reserve: 0).withFont(.font_18)))
+                discount.attributedText = ("￥".withFont(.font_12)+(obj.couponvalue.toString(reserve: 2).withFont(.font_18)))
             } else {
                 discount.attributedText = ((obj.couponvalue*10.0).toString(reserve: 1).withFont(.font_18)+(" 折".withFont(.font_12)))
             }
             /// 满多少可用
             moneyOff.text = "满\(obj.conditionvalue)可用"
             /// 不能使用原因
-            result.text = obj.unusedresult
+            result.text = obj.holdstatus == .invalid ? obj.holdstatus.description : obj.unusedresult
+            /// 选中
+            if let vc = self.superController() as? ChooseCouponViewController,
+               vc.segmentedView.selectedIndex == 0,
+               model?.couponholdid == vc.coupon?.couponholdid {
+                self.choosed = true
+            } else {
+                self.choosed = false
+            }
         }
     }
     /// 优惠券使用回调

MTP_iOS/MTP2_iOS/UserInterface/CustomView/IBNumberEditText/IBNumberEditText.swift

@@ -29,14 +29,15 @@ class IBNumberEditText: UIView {
     @IBOutlet weak var numberField: IBTextField!
     /// 定义container为DemoView的子view, 以便更方便的封装xib
     @IBOutlet weak var containerView: UIView!
-    
     /// 小数位，如果需要则设置
     var decimalPlace: Int?
     /// 增量(默认值为1)
     var incrementIntNum = 1
-    var incrementDoubleNum: Double = 1
+    /// 增量值
+    var incrementDoubleNum: Double = 1.0
     /// 最大值
     var maxIntNum = Int.max
+    /// 最大值
     var maxDoubleNum = Double(Int.max)
     /// 最小值
     var minIntNum = 0
@@ -46,8 +47,8 @@ class IBNumberEditText: UIView {
     /// 不允许交互
     override var isUserInteractionEnabled: Bool {
         didSet {
-            addBtn.layer.borderColor = UIColorFromHex(rgbValue: isUserInteractionEnabled ? 0x333333 : 0xcccccc).cgColor
-            minusBtn.layer.borderColor = UIColorFromHex(rgbValue: isUserInteractionEnabled ? 0x333333 : 0xcccccc).cgColor
+            addBtn.setBackgroundImage(UIImage(named: isUserInteractionEnabled ? "add_enable" : "add_unenable"), for: .normal)
+            minusBtn.setBackgroundImage(UIImage(named: isUserInteractionEnabled ? "sub_enable" : "sub_unenable"), for: .normal)
             numberField.textColor = UIColorFromHex(rgbValue: isUserInteractionEnabled ? 0x3384F3 : 0x999999)
         }
     }
@@ -180,7 +181,6 @@ class IBNumberEditText: UIView {
             /// 出发代理
             guard let delegate = self.delegate else { return }
             delegate.numberInputView(self, .Subtract)
-            
         default:
             break
         }
@@ -188,15 +188,6 @@ class IBNumberEditText: UIView {
         /// 通知值变化
         delegate?.IBNumberEditText(textField: numberField)
     }
-    
-    /// 是否置为不可用
-    var isDisabled = false {
-        didSet {
-            self.isUserInteractionEnabled = !isDisabled
-            addBtn.isEnabled = !isDisabled
-            minusBtn.isEnabled = !isDisabled
-        }
-    }
 }
 
 extension IBNumberEditText: UITextFieldDelegate {

MTP_iOS/MTP2_iOS/UserInterface/CustomView/IBNumberEditText/NumberEditText.xib

@@ -8,7 +8,7 @@
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="IBNumberEditText" customModule="BPML" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="IBNumberEditText" customModule="LYB" customModuleProvider="target">
             <connections>
                 <outlet property="addBtn" destination="aWz-wl-ObB" id="ABg-uC-xHn"/>
                 <outlet property="containerView" destination="iN0-l3-epB" id="EmQ-oK-TNk"/>
@@ -24,31 +24,20 @@
                 <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="M0d-xy-Enp">
                     <rect key="frame" x="0.0" y="22" width="414" height="60"/>
                     <subviews>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xJe-dy-UFG" customClass="IBButton" customModule="BPML" customModuleProvider="target">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="xJe-dy-UFG">
                             <rect key="frame" x="0.0" y="0.0" width="35" height="60"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="35" id="djW-p4-TQh"/>
                             </constraints>
-                            <state key="normal" title="-">
+                            <state key="normal" backgroundImage="sub_unenable">
                                 <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </state>
-                            <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
-                                    <real key="value" value="1"/>
-                                </userDefinedRuntimeAttribute>
-                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                                    <color key="value" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
-                                </userDefinedRuntimeAttribute>
-                                <userDefinedRuntimeAttribute type="point" keyPath="圆角倍数">
-                                    <point key="value" x="0.0" y="0.5"/>
-                                </userDefinedRuntimeAttribute>
-                            </userDefinedRuntimeAttributes>
                             <connections>
                                 <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="ZDp-uF-eDu"/>
                             </connections>
                         </button>
-                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="qPR-PI-lbw" customClass="IBTextField" customModule="BPML" customModuleProvider="target">
+                        <textField opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" textAlignment="center" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="qPR-PI-lbw" customClass="IBTextField" customModule="LYB" customModuleProvider="target">
                             <rect key="frame" x="35" y="0.0" width="344" height="60"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <color key="textColor" red="0.20000000000000001" green="0.51764705879999995" blue="0.95294117649999999" alpha="1" colorSpace="calibratedRGB"/>
@@ -58,26 +47,15 @@
                                 <outlet property="delegate" destination="-1" id="rh8-LB-bOU"/>
                             </connections>
                         </textField>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aWz-wl-ObB" customClass="IBButton" customModule="BPML" customModuleProvider="target">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="aWz-wl-ObB">
                             <rect key="frame" x="379" y="0.0" width="35" height="60"/>
                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="35" id="Djf-Ke-PSy"/>
                             </constraints>
-                            <state key="normal" title="+">
+                            <state key="normal" backgroundImage="add_unenable">
                                 <color key="titleColor" white="0.0" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                             </state>
-                            <userDefinedRuntimeAttributes>
-                                <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
-                                    <color key="value" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="1" colorSpace="calibratedRGB"/>
-                                </userDefinedRuntimeAttribute>
-                                <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
-                                    <real key="value" value="1"/>
-                                </userDefinedRuntimeAttribute>
-                                <userDefinedRuntimeAttribute type="point" keyPath="圆角倍数">
-                                    <point key="value" x="0.0" y="0.5"/>
-                                </userDefinedRuntimeAttribute>
-                            </userDefinedRuntimeAttributes>
                             <connections>
                                 <action selector="onButtonPressed:" destination="-1" eventType="touchUpInside" id="jDm-6h-LH9"/>
                             </connections>
@@ -98,14 +76,12 @@
         </view>
     </objects>
     <designables>
-        <designable name="aWz-wl-ObB">
-            <size key="intrinsicContentSize" width="30" height="30"/>
-        </designable>
         <designable name="qPR-PI-lbw">
             <size key="intrinsicContentSize" width="5" height="23"/>
         </designable>
-        <designable name="xJe-dy-UFG">
-            <size key="intrinsicContentSize" width="30" height="30"/>
-        </designable>
     </designables>
+    <resources>
+        <image name="add_unenable" width="12" height="12"/>
+        <image name="sub_unenable" width="12" height="12"/>
+    </resources>
 </document>

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".localized, handler: ((UIAlertAction) -> Swift.Void)? = nil) {
+    func showHintController(title: String, message: String, comfirmTitle: String = "ok", 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".localized, style: .destructive, handler: handler))
-        alertController.addAction(UIAlertAction(title: "no".localized, style: .cancel, handler: nil))
+        alertController.addAction(UIAlertAction(title: "yes", style: .destructive, handler: handler))
+        alertController.addAction(UIAlertAction(title: "no", 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".localized, style: .destructive, handler: handler))
-        alertController.addAction(UIAlertAction(title: "cancle".localized, style: .cancel, handler: nil))
+        alertController.addAction(UIAlertAction(title: "ok", style: .destructive, handler: handler))
+        alertController.addAction(UIAlertAction(title: "cancle", style: .cancel, handler: nil))
         alertController.view.tintColor = UIColor.darkText
         self.present(alertController, animated: true, completion: nil)
     }
@@ -165,7 +165,7 @@ extension UIViewController {
         
         if showCancel == true {
             /// cancel Action
-            let cancelAction = UIAlertAction(title: "cancle".localized, style: .cancel, handler: nil)
+            let cancelAction = UIAlertAction(title: "cancle", style: .cancel, handler: nil)
             alertController.addAction(cancelAction)
         }
         
@@ -190,14 +190,14 @@ extension UIViewController {
     func showErrorMessgae(error: ErrorInfo?) {
         if let error = error {
             if let errorDesc = ErrorUtils.getDesc(errorCode: error.retCode) {
-                self.showHintController(title: "tips".localized, message: errorDesc)
+                self.showHintController(title: "提示", message: errorDesc)
             } else if let retMsg = error.retMsg {
-                self.showHintController(title: "tips".localized, message: retMsg)
+                self.showHintController(title: "提示", message: retMsg)
             } else {
-                self.showHintController(title: "tips".localized, message: "unknownErrorType".localized)
+                self.showHintController(title: "提示", message: "未知错误")
             }
         } else {
-            self.showHintController(title: "tips".localized, message: "systembusy".localized)
+            self.showHintController(title: "提示", message: "系统繁忙")
         }
     }
     

MTP_iOS/MTP2_iOS/UserInterface/Login/LoginViewController.swift

@@ -102,8 +102,8 @@ class LoginViewController: BaseTableViewController<LsLoginUserModel>, UITextFiel
     /// 界面内容初始化
     func buildView() {
         /// 设置attributedPlaceholder
-        usernameTextField.attributedPlaceholder = "用户名/账号/手机号".localized.withTextColor(Color_placeholder_text)
-        passwordTextField.attributedPlaceholder = "请输入您的密码".localized.withTextColor(Color_placeholder_text)
+        usernameTextField.attributedPlaceholder = "用户名/账号/手机号".withTextColor(Color_placeholder_text)
+        passwordTextField.attributedPlaceholder = "请输入您的密码".withTextColor(Color_placeholder_text)
         
         /// 设置cell标识
         cellReuseIdentifier = "LoginUserCellID"
@@ -199,7 +199,7 @@ class LoginViewController: BaseTableViewController<LsLoginUserModel>, UITextFiel
     private func checkValue() -> Bool {
         if let account = self.usernameTextField.text {
             if account.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                WHToast.showError(withMessage: "inputloginaccount".localized, duration: 1.0) {
+                WHToast.showError(withMessage: "请输入登录账户", duration: 1.0) {
                     self.usernameTextField.becomeFirstResponder()
                 }
                 return false
@@ -207,7 +207,7 @@ class LoginViewController: BaseTableViewController<LsLoginUserModel>, UITextFiel
         }
         if let password = self.passwordTextField.text {
             if password.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                WHToast.showError(withMessage: "inputaccountpassword".localized, duration: 1.0) {
+                WHToast.showError(withMessage: "请输入账户密码", duration: 1.0) {
                     self.passwordTextField.becomeFirstResponder()
                 }
                 return false
@@ -240,8 +240,8 @@ class LoginViewController: BaseTableViewController<LsLoginUserModel>, UITextFiel
                 if let error = error,
                     error.retCode == 1003,
                     let loginrsp = accountManager.loginRsp {
-                    let message = "还剩\(loginrsp.pwdWrongLockCnt - loginrsp.pwdWrongCnt)次错误机会，账号或密码不匹配达到\(loginrsp.pwdWrongLockCnt)次，登录账号将锁定\(loginrsp.loginLockHourNum)小时。请联系管理员966000处理。".localized + "您也可通过手机验证码登录！".localized
-                    self.showHintController(title: "tips".localized, message: message)
+                    let message = "还剩\(loginrsp.pwdWrongLockCnt - loginrsp.pwdWrongCnt)次错误机会，账号或密码不匹配达到\(loginrsp.pwdWrongLockCnt)次，登录账号将锁定\(loginrsp.loginLockHourNum)小时。请联系管理员966000处理。" + "您也可通过手机验证码登录！"
+                    self.showHintController(title: "提示", message: message)
                 } else {
                     self.showErrorMessgae(error: error)
                 }

MTP_iOS/MTP2_iOS/UserInterface/Mine/OutInMoney/InMoneyViewController.swift

@@ -190,7 +190,7 @@ class InMoneyViewController: BaseViewController {
             DispatchQueue.main.async {
                 NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
                 if isSuccess {
-                    self.showHintController(title: "tips".localized, message: "入金成功",handler: { (_) in
+                    self.showHintController(title: "提示", message: "入金成功",handler: { (_) in
                         /// 重新请求可出资金
                         MTP2BusinessCore.shared.broadcastManager?.post(action: .FundationInfoReloadData, object: nil)
                         /// 清空数据
@@ -223,7 +223,7 @@ class InMoneyViewController: BaseViewController {
                                     } else {
                                         if let errorInfo = errorInfo {
                                             let error = "\("银行信息返回")\(errorInfo.retCode):\(String(describing: errorInfo.retMsg))"
-                                            self.showHintController(title: "tips".localized, message: error)
+                                            self.showHintController(title: "提示", message: error)
                                         }
                                     }
                                 })
@@ -237,9 +237,9 @@ class InMoneyViewController: BaseViewController {
                                 var error = ErrorUtils.getDesc(errorCode: results.status) ?? "未知错误类型"
                                 if decp != "" {
                                     error = "银行信息返回" + ":" + decp
-                                    self.showHintController(title: "tips".localized, message: error)
+                                    self.showHintController(title: "提示", message: error)
                                 } else {
-                                    self.showHintController(title: "tips".localized, message: error)
+                                    self.showHintController(title: "提示", message: error)
                                 }
                             } else {
                                 /// 需要跳转网页
@@ -268,14 +268,14 @@ class InMoneyViewController: BaseViewController {
         /// 入金金额
         if let inMoneyAmount = self.inMoneyAmountTextField.text {
             if inMoneyAmount.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                self.showHintController(title: "tips".localized, message: "请输入入金金额")
+                self.showHintController(title: "提示", message: "请输入入金金额")
                 return false
             }
         }
         /// 资金密码
         if let moneyPassword = self.moneyPasswordTextField.text {
             if moneyPassword.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                self.showHintController(title: "tips".localized, message: "请输入资金密码")
+                self.showHintController(title: "提示", message: "请输入资金密码")
                 return false
             }
         }
@@ -284,7 +284,7 @@ class InMoneyViewController: BaseViewController {
         if (regiesterProvinceTextField.superview?.isHidden)! == false {
             if let regiesterProvince = self.regiesterProvinceTextField.text {
                 if regiesterProvince.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请选择开户省份")
+                    self.showHintController(title: "提示", message: "请选择开户省份")
                     return false
                 }
             }
@@ -294,7 +294,7 @@ class InMoneyViewController: BaseViewController {
         if (regiesterCityTextField.superview?.isHidden)! == false {
             if let regiesterCity = self.regiesterCityTextField.text {
                 if regiesterCity.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请选择开户城市")
+                    self.showHintController(title: "提示", message: "请选择开户城市")
                     return false
                 }
             }
@@ -304,7 +304,7 @@ class InMoneyViewController: BaseViewController {
         if (regiesterBranchBankNumberTextField.superview?.isHidden)! == false {
             if let regiesterBranchBankNumber = self.regiesterBranchBankNumberTextField.text {
                 if regiesterBranchBankNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入开户行支行号")
+                    self.showHintController(title: "提示", message: "请输入开户行支行号")
                     return false
                 }
             }
@@ -313,7 +313,7 @@ class InMoneyViewController: BaseViewController {
         if (regiesterBranchBankNameTextField.superview?.isHidden)! == false {
             if let regiesterBranchBankName = self.regiesterBranchBankNameTextField.text {
                 if regiesterBranchBankName.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入开户行支行名称")
+                    self.showHintController(title: "提示", message: "请输入开户行支行名称")
                     return false
                 }
             }
@@ -322,7 +322,7 @@ class InMoneyViewController: BaseViewController {
         if (bankPasswordTextField.superview?.isHidden)! == false {
             if let bankPassword = self.bankPasswordTextField.text {
                 if bankPassword.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入银行密码")
+                    self.showHintController(title: "提示", message: "请输入银行密码")
                     return false
                 }
             }
@@ -331,7 +331,7 @@ class InMoneyViewController: BaseViewController {
         if (oldPhoneNumberTextField.superview?.isHidden)! == false {
             if let oldPhoneNumber = self.oldPhoneNumberTextField.text {
                 if oldPhoneNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入原手机号码")
+                    self.showHintController(title: "提示", message: "请输入原手机号码")
                     return false
                 }
             }
@@ -340,7 +340,7 @@ class InMoneyViewController: BaseViewController {
         if (checkCodeTextField.superview?.superview?.isHidden)! == false {
             if let checkCode = self.checkCodeTextField.text {
                 if checkCode.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入验证码")
+                    self.showHintController(title: "提示", message: "请输入验证码")
                     return false
                 }
             }
@@ -348,7 +348,7 @@ class InMoneyViewController: BaseViewController {
         /// 男性
         if (checkMenButton.superview?.superview?.isHidden)! == false {
             if !self.checkMenButton.isSelected && !self.checkWomenButton.isSelected{
-                self.showHintController(title: "tips".localized, message: "请选择性别")
+                self.showHintController(title: "提示", message: "请选择性别")
                 return false
             }
         }
@@ -356,7 +356,7 @@ class InMoneyViewController: BaseViewController {
         if (legalPersonNameTextField.superview?.isHidden)! == false {
             if let legalPersonName = self.legalPersonNameTextField.text {
                 if legalPersonName.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入法人姓名")
+                    self.showHintController(title: "提示", message: "请输入法人姓名")
                     return false
                 }
             }
@@ -365,7 +365,7 @@ class InMoneyViewController: BaseViewController {
         if (legalPersonalIDcardTypeTextField.superview?.isHidden)! == false {
             if let legalPersonalIDcardType = self.legalPersonalIDcardTypeTextField.text {
                 if legalPersonalIDcardType.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请选择法人证件类型")
+                    self.showHintController(title: "提示", message: "请选择法人证件类型")
                     return false
                 }
             }
@@ -375,7 +375,7 @@ class InMoneyViewController: BaseViewController {
         if (legalPersonalIDcardNumberField.superview?.isHidden)! == false {
             if let legalPersonalIDcardNumber = self.legalPersonalIDcardNumberField.text {
                 if legalPersonalIDcardNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入法人证件号码")
+                    self.showHintController(title: "提示", message: "请输入法人证件号码")
                     return false
                 }
             }
@@ -385,7 +385,7 @@ class InMoneyViewController: BaseViewController {
         if (agentNameTextField.superview?.isHidden)! == false {
             if let agentName = self.agentNameTextField.text {
                 if agentName.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入经办人姓名")
+                    self.showHintController(title: "提示", message: "请输入经办人姓名")
                     return false
                 }
             }
@@ -395,7 +395,7 @@ class InMoneyViewController: BaseViewController {
         if (agentIDcardTypeTextField.superview?.isHidden)! == false {
             if let agentIDcardType = self.agentIDcardTypeTextField.text {
                 if agentIDcardType.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请选择经办人证件类型")
+                    self.showHintController(title: "提示", message: "请选择经办人证件类型")
                     return false
                 }
             }
@@ -404,7 +404,7 @@ class InMoneyViewController: BaseViewController {
         if (agentIDcardNumberTextField.superview?.isHidden)! == false {
             if let agentIDcardNumber = self.agentIDcardNumberTextField.text {
                 if agentIDcardNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入经办人证件号码")
+                    self.showHintController(title: "提示", message: "请输入经办人证件号码")
                     return false
                 }
             }
@@ -413,7 +413,7 @@ class InMoneyViewController: BaseViewController {
         if (itsMemberCodeTextField.superview?.isHidden)! == false {
             if let itsMemberCode = self.itsMemberCodeTextField.text {
                 if itsMemberCode.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入所属会员代码")
+                    self.showHintController(title: "提示", message: "请输入所属会员代码")
                     return false
                 }
             }
@@ -422,7 +422,7 @@ class InMoneyViewController: BaseViewController {
         if (legalContactNumberTextField.superview?.isHidden)! == false {
             if let legalContactNumber = self.legalContactNumberTextField.text {
                 if legalContactNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入法人联系号码")
+                    self.showHintController(title: "提示", message: "请输入法人联系号码")
                     return false
                 }
             }
@@ -431,7 +431,7 @@ class InMoneyViewController: BaseViewController {
         if (agentContactNumberTextField.superview?.isHidden)! == false {
             if let agentContactNumber = self.agentContactNumberTextField.text {
                 if agentContactNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入经办人联系号码")
+                    self.showHintController(title: "提示", message: "请输入经办人联系号码")
                     return false
                 }
             }
@@ -512,7 +512,7 @@ extension InMoneyViewController: UITextFieldDelegate {
                     }
                 }
             } else {
-                self.showHintController(title: "tips".localized, message: "没有可选的资金账户")
+                self.showHintController(title: "提示", message: "没有可选的资金账户")
             }
             return false
         case TAG.signingBank:
@@ -532,7 +532,7 @@ extension InMoneyViewController: UITextFieldDelegate {
                     }
                 }
             } else {
-                self.showHintController(title: "tips".localized, message: "没有可选的签约银行")
+                self.showHintController(title: "提示", message: "没有可选的签约银行")
             }
             return false
         case TAG.inMoneyChannel:
@@ -558,7 +558,7 @@ extension InMoneyViewController: UITextFieldDelegate {
                     }
                 }
             } else {
-                self.showHintController(title: "tips".localized, message: "没有入金渠道可选")
+                self.showHintController(title: "提示", message: "没有入金渠道可选")
             }
             return false
         case TAG.regiesterProvince:

MTP_iOS/MTP2_iOS/UserInterface/Mine/OutInMoney/OutInMoneyViewController.swift

@@ -12,7 +12,7 @@ import UIKit
 class OutInMoneyViewController: BaseViewController {
     
     // MARK: - 属性列表
-    let titles:[String] = ["出金", "出入金查询"]
+    let titles:[String] = ["提现", "提现查询"]
     var viewControllers = [UIViewController]()
     var viewControllersID:[String] = []
     
@@ -23,7 +23,8 @@ class OutInMoneyViewController: BaseViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        viewControllersID = ["OutMoneyViewID", "OutInQueryViewID"]  /// 中远等版本
+        /// 中远等版本
+        viewControllersID = ["OutMoneyViewID", "OutInQueryViewID"]
         
         slideSegmentView.titles = titles
         

MTP_iOS/MTP2_iOS/UserInterface/Mine/OutInMoney/OutInQueryViewController.swift

@@ -58,16 +58,16 @@ class OutInQueryViewController: BaseTableViewController<MoMoneyOutIn>, UITextFie
     func checkValue() -> Bool {
         if let startTime = self.startTimeTextField.text, let endTime = self.endTimeTextField.text {
             if startTime.compare(endTime) == .orderedDescending {
-                self.showHintController(title: "tips".localized, message: "开始日期不能大于结束日期")
+                self.showHintController(title: "提示", message: "开始日期不能大于结束日期")
                 return false
             }else if self.startTime?.getString(formatter: "yyyy-MM-dd").compare(DateUtils.getLastDate(self.endTime!).getString(formatter: "yyyy-MM-dd")) == .orderedAscending {
-                self.showHintController(title: "tips".localized, message: "查询间隔不能超过一个月")
+                self.showHintController(title: "提示", message: "查询间隔不能超过一个月")
                 return false
             }else {
                 return true
             }
         }else {
-            self.showHintController(title: "tips".localized, message: "日期不能为空")
+            self.showHintController(title: "提示", message: "日期不能为空")
             return false
         }
     }
@@ -112,10 +112,7 @@ class OutInQueryViewController: BaseTableViewController<MoMoneyOutIn>, UITextFie
             DispatchQueue.main.async {
                 if self.tableView.contentOffset.y == 0 {
                     self._anim?.stopAnimating()
-                } else {
-                    
                 }
-                
                 if isSuccess {
                     /// 查询成功
                     self.tableCellModels = results ?? []

MTP_iOS/MTP2_iOS/UserInterface/Mine/OutInMoney/OutMoneyViewController.swift

@@ -142,8 +142,9 @@ class OutMoneyViewController: BaseViewController {
     
     /// 忘记密码
     @IBAction func forgetPassword(_ sender: UIButton) {
-        let nav = UIStoryboard(name: "ResetPwd", bundle: nil).instantiateViewController(withIdentifier: "ResetPwdNav")
-        UIApplication.shared.keyWindow?.rootViewController?.present(nav, animated: true, completion: nil)
+        /// 资金密码修改
+        let fund = UIStoryboard(name: "Settings", bundle: nil).instantiateViewController(withIdentifier: "FundPasswordUpdate")
+        self.view.superController()?.navigationController?.pushViewController(fund, animated: true)
     }
     
     /// 出金提交
@@ -185,7 +186,7 @@ class OutMoneyViewController: BaseViewController {
             DispatchQueue.main.async {
                 NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
                 if isSuccess {
-                    self.showHintController(title: "tips".localized, message: "出金成功",handler: { (_) in
+                    self.showHintController(title: "提示", message: "出金成功",handler: { (_) in
                         /// 重新请求可出资金
                         MTP2BusinessCore.shared.broadcastManager?.post(action: .FundationInfoReloadData, object: nil)
                         /// 更新可出资金
@@ -201,9 +202,9 @@ class OutMoneyViewController: BaseViewController {
                             var error = ErrorUtils.getDesc(errorCode: results.status) ?? "未知错误类型"
                             if decp != "" {
                                 error = "银行信息返回" + ":" + decp
-                                self.showHintController(title: "tips".localized, message: error)
+                                self.showHintController(title: "提示", message: error)
                             } else {
-                                self.showHintController(title: "tips".localized, message: error)
+                                self.showHintController(title: "提示", message: error)
                             }
                         } else {
                             /// 需要跳转网页
@@ -275,23 +276,23 @@ class OutMoneyViewController: BaseViewController {
         /// 出金金额
         if let outMoneyAmount = self.outMoneyAmountTextField.text {
             if outMoneyAmount.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                self.showHintController(title: "tips".localized, message: "请输入出金金额", handler: nil)
+                self.showHintController(title: "提示", message: "请输入出金金额", handler: nil)
                 return false
             }
             if let outMoneyAmount = Double(outMoneyAmount), let canUserMoney = Double(canUseMoneyTextField.text!) {
                 if outMoneyAmount > canUserMoney {
-                    self.showHintController(title: "tips".localized, message: "出金金额不得大于可取资金", handler: nil)
+                    self.showHintController(title: "提示", message: "出金金额不得大于可取资金", handler: nil)
                     return false
                 }
             } else {
-                self.showHintController(title: "tips".localized, message: "出金金额格式不正确")
+                self.showHintController(title: "提示", message: "出金金额格式不正确")
                 return false
             }
         }
         /// 资金密码
         if let moneyPassword = self.moneyPasswordTextField.text {
             if moneyPassword.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                self.showHintController(title: "tips".localized, message: "请输入资金密码", handler: nil)
+                self.showHintController(title: "提示", message: "请输入资金密码", handler: nil)
                 return false
             }
         }
@@ -300,7 +301,7 @@ class OutMoneyViewController: BaseViewController {
         if (regiesterProvinceTextField.superview?.isHidden)! == false {
             if let regiesterProvince = self.regiesterProvinceTextField.text {
                 if regiesterProvince.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请选择开户省份")
+                    self.showHintController(title: "提示", message: "请选择开户省份")
                     return false
                 }
             }
@@ -309,7 +310,7 @@ class OutMoneyViewController: BaseViewController {
         if (regiesterCityTextField.superview?.isHidden)! == false {
             if let regiesterCity = self.regiesterCityTextField.text {
                 if regiesterCity.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请选择开户城市")
+                    self.showHintController(title: "提示", message: "请选择开户城市")
                     return false
                 }
             }
@@ -318,7 +319,7 @@ class OutMoneyViewController: BaseViewController {
         if (regiesterBranchBankNumberTextField.superview?.isHidden)! == false {
             if let regiesterBranchBankNumber = self.regiesterBranchBankNumberTextField.text {
                 if regiesterBranchBankNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入开户行支行号")
+                    self.showHintController(title: "提示", message: "请输入开户行支行号")
                     return false
                 }
             }
@@ -327,7 +328,7 @@ class OutMoneyViewController: BaseViewController {
         if (regiesterBranchBankNameTextField.superview?.isHidden)! == false {
             if let regiesterBranchBankName = self.regiesterBranchBankNameTextField.text {
                 if regiesterBranchBankName.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入开户行支行名称")
+                    self.showHintController(title: "提示", message: "请输入开户行支行名称")
                     return false
                 }
             }
@@ -336,7 +337,7 @@ class OutMoneyViewController: BaseViewController {
         if (bankPasswordTextField.superview?.isHidden)! == false {
             if let bankPassword = self.bankPasswordTextField.text {
                 if bankPassword.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入银行密码")
+                    self.showHintController(title: "提示", message: "请输入银行密码")
                     return false
                 }
             }
@@ -345,7 +346,7 @@ class OutMoneyViewController: BaseViewController {
         if (oldPhoneNumberTextField.superview?.isHidden)! == false {
             if let oldPhoneNumber = self.oldPhoneNumberTextField.text {
                 if oldPhoneNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入原手机号码")
+                    self.showHintController(title: "提示", message: "请输入原手机号码")
                     return false
                 }
             }
@@ -354,7 +355,7 @@ class OutMoneyViewController: BaseViewController {
         if (checkCodeTextField.superview?.superview?.isHidden)! == false {
             if let checkCode = self.checkCodeTextField.text {
                 if checkCode.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入验证码")
+                    self.showHintController(title: "提示", message: "请输入验证码")
                     return false
                 }
             }
@@ -362,7 +363,7 @@ class OutMoneyViewController: BaseViewController {
         /// 男性
         if (checkMenButton.superview?.superview?.isHidden)! == false {
             if !self.checkMenButton.isSelected && !self.checkWomenButton.isSelected{
-                self.showHintController(title: "tips".localized, message: "请选择性别")
+                self.showHintController(title: "提示", message: "请选择性别")
                 return false
             }
         }
@@ -370,7 +371,7 @@ class OutMoneyViewController: BaseViewController {
         if (legalPersonNameTextField.superview?.isHidden)! == false {
             if let legalPersonName = self.legalPersonNameTextField.text {
                 if legalPersonName.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入法人姓名")
+                    self.showHintController(title: "提示", message: "请输入法人姓名")
                     return false
                 }
             }
@@ -379,7 +380,7 @@ class OutMoneyViewController: BaseViewController {
         if (legalPersonalIDcardTypeTextField.superview?.isHidden)! == false {
             if let legalPersonalIDcardType = self.legalPersonalIDcardTypeTextField.text {
                 if legalPersonalIDcardType.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请选择法人证件类型")
+                    self.showHintController(title: "提示", message: "请选择法人证件类型")
                     return false
                 }
             }
@@ -388,7 +389,7 @@ class OutMoneyViewController: BaseViewController {
         if (legalPersonalIDcardNumberField.superview?.isHidden)! == false {
             if let legalPersonalIDcardNumber = self.legalPersonalIDcardNumberField.text {
                 if legalPersonalIDcardNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入法人证件号码")
+                    self.showHintController(title: "提示", message: "请输入法人证件号码")
                     return false
                 }
             }
@@ -397,7 +398,7 @@ class OutMoneyViewController: BaseViewController {
         if (agentNameTextField.superview?.isHidden)! == false {
             if let agentName = self.agentNameTextField.text {
                 if agentName.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入经办人姓名")
+                    self.showHintController(title: "提示", message: "请输入经办人姓名")
                     return false
                 }
             }
@@ -406,7 +407,7 @@ class OutMoneyViewController: BaseViewController {
         if (agentIDcardTypeTextField.superview?.isHidden)! == false {
             if let agentIDcardType = self.agentIDcardTypeTextField.text {
                 if agentIDcardType.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请选择经办人证件类型")
+                    self.showHintController(title: "提示", message: "请选择经办人证件类型")
                     return false
                 }
             }
@@ -415,7 +416,7 @@ class OutMoneyViewController: BaseViewController {
         if (agentIDcardNumberTextField.superview?.isHidden)! == false {
             if let agentIDcardNumber = self.agentIDcardNumberTextField.text {
                 if agentIDcardNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入经办人证件号码")
+                    self.showHintController(title: "提示", message: "请输入经办人证件号码")
                     return false
                 }
             }
@@ -424,7 +425,7 @@ class OutMoneyViewController: BaseViewController {
         if (itsMemberCodeTextField.superview?.isHidden)! == false {
             if let itsMemberCode = self.itsMemberCodeTextField.text {
                 if itsMemberCode.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入所属会员代码")
+                    self.showHintController(title: "提示", message: "请输入所属会员代码")
                     return false
                 }
             }
@@ -433,7 +434,7 @@ class OutMoneyViewController: BaseViewController {
         if (legalContactNumberTextField.superview?.isHidden)! == false {
             if let legalContactNumber = self.legalContactNumberTextField.text {
                 if legalContactNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入法人联系号码")
+                    self.showHintController(title: "提示", message: "请输入法人联系号码")
                     return false
                 }
             }
@@ -442,7 +443,7 @@ class OutMoneyViewController: BaseViewController {
         if (agentContactNumberTextField.superview?.isHidden)! == false {
             if let agentContactNumber = self.agentContactNumberTextField.text {
                 if agentContactNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入经办人联系号码")
+                    self.showHintController(title: "提示", message: "请输入经办人联系号码")
                     return false
                 }
             }
@@ -473,7 +474,7 @@ extension OutMoneyViewController: UITextFieldDelegate {
                     }
                 }
             } else {
-                self.showHintController(title: "tips".localized, message: "没有可选的资金账户")
+                self.showHintController(title: "提示", message: "没有可选的资金账户")
             }
             return false
         case TAG.signingBank:
@@ -493,7 +494,7 @@ extension OutMoneyViewController: UITextFieldDelegate {
                     }
                 }
             } else {
-                self.showHintController(title: "tips".localized, message: "没有可选的签约银行")
+                self.showHintController(title: "提示", message: "没有可选的签约银行")
             }
             return false
         case TAG.regiesterProvince:

MTP_iOS/MTP2_iOS/UserInterface/Mine/Settings/FundInformation/HistoryCapitalFlowViewController.swift

@@ -118,16 +118,16 @@ class HistoryCapitalFlowViewController: BaseViewController {
     func checkValue() -> Bool {
         if let startTime = self.startTimeTextField.text, let endTime = self.endTimeTextField.text {
             if startTime.compare(endTime) == .orderedDescending {
-                self.showHintController(title: "tips".localized, message: "开始日期不能大于结束日期")
+                self.showHintController(title: "提示", message: "开始日期不能大于结束日期")
                 return false
             }else if self.startTime?.getString(formatter: "yyyy-MM-dd").compare(DateUtils.getLastDate(self.endTime!).getString(formatter: "yyyy-MM-dd")) == .orderedAscending {
-                self.showHintController(title: "tips".localized, message: "查询间隔不能超过一个月")
+                self.showHintController(title: "提示", message: "查询间隔不能超过一个月")
                 return false
             }else {
                 return true
             }
         }else {
-            self.showHintController(title: "tips".localized, message: "日期不能为空")
+            self.showHintController(title: "提示", message: "日期不能为空")
             return false
         }
     }

MTP_iOS/MTP2_iOS/UserInterface/Mine/Settings/PasswordUpdate/LoginPasswordUpdateViewController.swift

@@ -80,7 +80,7 @@ class LoginPasswordUpdateViewController: BaseViewController, UITextFieldDelegate
     @IBAction func onSubmitButton(_ sender: UIButton) {
         /// 验证数据
         if checkValue() {
-            self.showCommitAlertController(title: "tips".localized, message: "是否确认修改密码", handler: { (_) in
+            self.showCommitAlertController(title: "提示", message: "是否确认修改密码", handler: { (_) in
                 
                 guard let accountManager = MTP2BusinessCore.shared.accountManager,
                       let loginId = accountManager.getCurrentLoginID() else { return }
@@ -116,35 +116,35 @@ class LoginPasswordUpdateViewController: BaseViewController, UITextFieldDelegate
             let confirmPwd = confirmPwdTextField.text else { return false }
         
         if oldPwd.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-            self.showHintController(title: "tips".localized, message: "请输入原密码", handler: { (_) in
+            self.showHintController(title: "提示", message: "请输入原密码", handler: { (_) in
                 self.oldPwdTextField.becomeFirstResponder()
             })
             return false
         }
         if newPwd.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-            self.showHintController(title: "tips".localized, message: "请输入新密码", handler: { (_) in
+            self.showHintController(title: "提示", message: "请输入新密码", handler: { (_) in
                 self.newPwdTextField.becomeFirstResponder()
             })
             return false
         } else if !(RegularUtils.checkAllCharactersPatten(check: newPwd) && newPwd.count >= 8 && newPwd.count <= 20) {
-            self.showHintController(title: "tips".localized, message: "请输入8-20位，包含大写字母、小写字母、数字、标点符号至少三项（不包含空格）的字符", handler: { (_) in
+            self.showHintController(title: "提示", message: "请输入8-20位，包含大写字母、小写字母、数字、标点符号至少三项（不包含空格）的字符", handler: { (_) in
                 self.newPwdTextField.becomeFirstResponder()
             })
             return false
         }
         if confirmPwd.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-            self.showHintController(title: "tips".localized, message: "请再次输入新密码", handler: { (_) in
+            self.showHintController(title: "提示", message: "请再次输入新密码", handler: { (_) in
                 self.confirmPwdTextField.becomeFirstResponder()
             })
             return false
         }
         if newPwd != confirmPwd {
-            self.showHintController(title: "tips".localized, message: "两次密码输入不一致")
+            self.showHintController(title: "提示", message: "两次密码输入不一致")
             return false
         }
         
         if oldPwd.trimmingCharacters(in: CharacterSet.whitespaces) == newPwd.trimmingCharacters(in: CharacterSet.whitespaces) {
-            self.showHintController(title: "tips".localized, message: "新密码不可和旧密码一致")
+            self.showHintController(title: "提示", message: "新密码不可和旧密码一致")
             return false
         }
         

MTP_iOS/MTP2_iOS/UserInterface/Mine/Settings/PickUp/CreateReceiveGoodsAddressViewController.swift

@@ -85,7 +85,7 @@ class CreateReceiveGoodsAddressViewController: BaseViewController {
               checkValue() else { return }
         let message = self.type == .MODIFY ? "修改" : "新增"
         /// 开启Loading
-        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "\(message)中......".localized, type: .ballClipRotate, color: UIColorFromHex(rgbValue: 0xA8B6CC)), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
+        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "\(message)中......", type: .ballClipRotate, color: UIColorFromHex(rgbValue: 0xA8B6CC)), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
         
         /// userReceiveInfo
         deliveryManager.userReceiveInfo(receiverName: receiverTextField.text!,
@@ -142,7 +142,7 @@ class CreateReceiveGoodsAddressViewController: BaseViewController {
     private func checkValue() -> Bool {
         if let receiver = self.receiverTextField.text {
             if receiver.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                self.showHintController(title: "tips".localized, message: "请输入提货人姓名", handler: { (_) in
+                self.showHintController(title: "提示", message: "请输入提货人姓名", handler: { (_) in
                     self.receiverTextField.becomeFirstResponder()
                 })
                 return false
@@ -150,27 +150,22 @@ class CreateReceiveGoodsAddressViewController: BaseViewController {
         }
         if let contactNum = self.contactNumTextfield.text {
             if contactNum.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                self.showHintController(title: "tips".localized, message: "请输入联系电话", handler: { (_) in
+                self.showHintController(title: "提示", message: "请输入联系电话", handler: { (_) in
                     self.contactNumTextfield.becomeFirstResponder()
                 })
                 return false
             }
+            
             if contactNum.count > 13 {
-                self.showHintController(title: "tips".localized, message: "联系电话长度不能高于13位", handler: { (_) in
+                self.showHintController(title: "提示", message: "联系电话长度不能高于13位", handler: { (_) in
                     self.contactNumTextfield.becomeFirstResponder()
                 })
                 return false
             }
-            
-            /// 请输入正确的手机号码
-            guard RegularUtils.checkPhoneNumber(with: contactNum) else {
-                WHToast.showError(withMessage: "请输入正确的手机号码!", duration: 2.0, finishHandler: {})
-                return false
-            }
         }
         if let areaAddress = self.areaAddressTextfield.text {
             if areaAddress.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                self.showHintController(title: "tips".localized, message: "请选择联系地址", handler: { (_) in
+                self.showHintController(title: "提示", message: "请选择联系地址", handler: { (_) in
                     self.areaAddressTextfield.becomeFirstResponder()
                 })
                 return false
@@ -178,7 +173,7 @@ class CreateReceiveGoodsAddressViewController: BaseViewController {
         }
         if let detailAddress = self.detailAddressTextfield.text {
             if detailAddress.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                self.showHintController(title: "tips".localized, message: "请输入详细地址", handler: { (_) in
+                self.showHintController(title: "提示", message: "请输入详细地址", handler: { (_) in
                     self.detailAddressTextfield.becomeFirstResponder()
                 })
                 return false

MTP_iOS/MTP2_iOS/UserInterface/Mine/Settings/PickUp/ReceiveGoodsInfoViewController.swift

@@ -132,7 +132,7 @@ extension ReceiveGoodsInfoViewController: ReceiveGoodsCellDelegate {
                 showAlertController(title: "提示", message: "确定要删除吗？", cancelTitle: "取消", sureTitle: "确定删除", cancelBlock: nil) {
                     if let relModel = model {
                         /// 开启Loading
-                        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "删除中......".localized, type: .ballClipRotate, color: UIColorFromHex(rgbValue: 0xA8B6CC)), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
+                        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "删除中......", type: .ballClipRotate, color: UIColorFromHex(rgbValue: 0xA8B6CC)), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
                         
                         MTP2BusinessCore.shared.deliveryManager?.delUserReceiveInfo(receiveInfoId: UInt64(relModel.autoid), callback: { (isSuccess, error) in
                             if isSuccess {

MTP_iOS/MTP2_iOS/UserInterface/Mine/Settings/SettingsViewController.swift

@@ -65,7 +65,7 @@ class SettingsViewController: UITableViewController {
         /// 异常情况
         guard let loginRsp = MTP2BusinessCore.shared.accountManager?.loginRsp else { return }
         
-        self.showCommitAlertController(title: "提示".localized, message: "是否要退出吗？".localized) { (_) in
+        self.showCommitAlertController(title: "提示", message: "是否要退出吗？") { (_) in
             
             if (UIApplication.shared.delegate as! AppDelegate).customStatusBar.isShowing { (UIApplication.shared.delegate as! AppDelegate).customStatusBar.dismiss() }
             

MTP_iOS/MTP2_iOS/UserInterface/Mine/Settings/Signing/SigningDetailViewController.swift

@@ -90,14 +90,14 @@ class SigningDetailViewController: BaseViewController {
             param.tradeDate = cusBankTradeDate
         }
         param.extOperatorID = Int(Date().timeIntervalSince1970)
-        self.showCommitAlertController(title: "tips".localized, message: "是否确定要解约？") { (_) in
+        self.showCommitAlertController(title: "提示", message: "是否确定要解约？") { (_) in
             /// 开启Loading
             NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "正在解约...", color: UIColor.loding()), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
             bankManager.bankSign(param: param) { (isSuccess, errorInfo, results) in
                 DispatchQueue.main.async {
                     NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
                     if isSuccess {
-                        self.showHintController(title: "tips".localized, message: "解约成功") { _ in
+                        self.showHintController(title: "提示", message: "解约成功") { _ in
                             /// 发送刷新列表通知
                             MTP2BusinessCore.shared.broadcastManager?.post(action: .SigningTerminationReloadData, object: self)
                             /// 返回上一层页面
@@ -108,7 +108,7 @@ class SigningDetailViewController: BaseViewController {
                             self.showErrorMessgae(error: errorInfo)
                         } else {
                             let err = "\("银行返回"): \((results?.centerErrMsg)!)"
-                            self.showHintController(title: "tips".localized, message: err)
+                            self.showHintController(title: "提示", message: err)
                         }
                     }
                 }

MTP_iOS/MTP2_iOS/UserInterface/Mine/Settings/Signing/SigningMainViewController.swift

@@ -195,13 +195,13 @@ class SigningMainViewController: BaseViewController {
     func nextStep() {
         if currentStep == 1 {
             if currentSignBankModel == nil {
-                self.showHintController(title: "tips".localized, message: app_Name + "：\("请选择签约银行")。")
+                self.showHintController(title: "提示", message: app_Name + "：\("请选择签约银行")。")
                 return
             }
         } else if currentStep == 2 {
             let viewController = self.children.first as! SigningStepTwoViewController
             if !viewController.checkButton.isSelected {
-                self.showHintController(title: "tips".localized, message: app_Name + "：\("请认真阅读签约风险提示")。")
+                self.showHintController(title: "提示", message: app_Name + "：\("请认真阅读签约风险提示")。")
                 return
             }
         }

MTP_iOS/MTP2_iOS/UserInterface/Mine/Settings/Signing/SigningModifyViewController.swift

@@ -333,7 +333,7 @@ extension SigningModifyViewController {
                 
                 if regiesterBank.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请选择开户行")
+                    self.showHintController(title: "提示", message: "请选择开户行")
                     return false
                 }
             }
@@ -345,7 +345,7 @@ extension SigningModifyViewController {
                 
                 if accountName.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请输入账户名称")
+                    self.showHintController(title: "提示", message: "请输入账户名称")
                     return false
                 }
             }
@@ -357,7 +357,7 @@ extension SigningModifyViewController {
                 
                 if bankAccount.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请输入银行账户")
+                    self.showHintController(title: "提示", message: "请输入银行账户")
                     return false
                 }
             }
@@ -368,11 +368,11 @@ extension SigningModifyViewController {
             if let phoneNumber = self.phoneNumberTextField.text {
                 
                 if phoneNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入手机号码")
+                    self.showHintController(title: "提示", message: "请输入手机号码")
                     return false
                 }
                 if !RegularUtils.checkPhoneNumber(with: phoneNumber) {
-                    self.showHintController(title: "tips".localized, message: "请输入有效的手机号码")
+                    self.showHintController(title: "提示", message: "请输入有效的手机号码")
                     return false
                 }
             }
@@ -384,7 +384,7 @@ extension SigningModifyViewController {
                 
                 if regiesterProvince.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请选择开户省份")
+                    self.showHintController(title: "提示", message: "请选择开户省份")
                     return false
                 }
             }
@@ -396,7 +396,7 @@ extension SigningModifyViewController {
                 
                 if regiesterCity.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请选择开户城市")
+                    self.showHintController(title: "提示", message: "请选择开户城市")
                     return false
                 }
             }
@@ -408,7 +408,7 @@ extension SigningModifyViewController {
                 
                 if regiesterBranchBankNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请输入开户行支行号")
+                    self.showHintController(title: "提示", message: "请输入开户行支行号")
                     return false
                 }
             }
@@ -420,7 +420,7 @@ extension SigningModifyViewController {
                 
                 if regiesterBranchBankName.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请输入开户行支行名称")
+                    self.showHintController(title: "提示", message: "请输入开户行支行名称")
                     return false
                 }
             }
@@ -432,7 +432,7 @@ extension SigningModifyViewController {
                 
                 if bankPassword.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请输入银行密码")
+                    self.showHintController(title: "提示", message: "请输入银行密码")
                     return false
                 }
             }
@@ -444,7 +444,7 @@ extension SigningModifyViewController {
                 
                 if oldPhoneNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请输入原手机号码")
+                    self.showHintController(title: "提示", message: "请输入原手机号码")
                     return false
                 }
             }
@@ -456,7 +456,7 @@ extension SigningModifyViewController {
                 
                 if checkCode.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请输入验证码")
+                    self.showHintController(title: "提示", message: "请输入验证码")
                     return false
                 }
             }
@@ -466,7 +466,7 @@ extension SigningModifyViewController {
             
             if !self.checkMenButton.isSelected && !self.checkWomenButton.isSelected{
                 
-                self.showHintController(title: "tips".localized, message: "请选择性别")
+                self.showHintController(title: "提示", message: "请选择性别")
                 return false
             }
         }
@@ -477,7 +477,7 @@ extension SigningModifyViewController {
                 
                 if legalPersonName.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请输入法人姓名")
+                    self.showHintController(title: "提示", message: "请输入法人姓名")
                     return false
                 }
             }
@@ -489,7 +489,7 @@ extension SigningModifyViewController {
                 
                 if legalPersonalIDcardType.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请选择法人证件类型")
+                    self.showHintController(title: "提示", message: "请选择法人证件类型")
                     return false
                 }
             }
@@ -501,7 +501,7 @@ extension SigningModifyViewController {
                 
                 if legalPersonalIDcardNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请输入法人证件号码")
+                    self.showHintController(title: "提示", message: "请输入法人证件号码")
                     return false
                 }
             }
@@ -513,7 +513,7 @@ extension SigningModifyViewController {
                 
                 if agentName.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请输入经办人姓名")
+                    self.showHintController(title: "提示", message: "请输入经办人姓名")
                     return false
                 }
             }
@@ -525,7 +525,7 @@ extension SigningModifyViewController {
                 
                 if agentIDcardType.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请选择经办人证件类型")
+                    self.showHintController(title: "提示", message: "请选择经办人证件类型")
                     return false
                 }
             }
@@ -537,7 +537,7 @@ extension SigningModifyViewController {
                 
                 if agentIDcardNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请输入经办人证件号码")
+                    self.showHintController(title: "提示", message: "请输入经办人证件号码")
                     return false
                 }
             }
@@ -549,7 +549,7 @@ extension SigningModifyViewController {
                 
                 if itsMemberCode.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请输入所属会员代码")
+                    self.showHintController(title: "提示", message: "请输入所属会员代码")
                     return false
                 }
             }
@@ -561,7 +561,7 @@ extension SigningModifyViewController {
                 
                 if legalContactNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请输入法人联系号码")
+                    self.showHintController(title: "提示", message: "请输入法人联系号码")
                     return false
                 }
             }
@@ -573,7 +573,7 @@ extension SigningModifyViewController {
                 
                 if agentContactNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
                     
-                    self.showHintController(title: "tips".localized, message: "请输入经办人联系号码")
+                    self.showHintController(title: "提示", message: "请输入经办人联系号码")
                     return false
                 }
             }
@@ -665,7 +665,7 @@ extension SigningModifyViewController {
             DispatchQueue.main.async {
                 NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
                 if isCompleted {
-                    self.showHintController(title: "tips".localized, message: "修改成功",handler: { (_) in
+                    self.showHintController(title: "提示", message: "修改成功",handler: { (_) in
                         /// 发送刷新列表通知
                         MTP2BusinessCore.shared.broadcastManager?.post(action: .SigningTerminationReloadData, object: self)
                         self.navigationController?.popViewController(animated: true)
@@ -678,7 +678,7 @@ extension SigningModifyViewController {
                             if decp != "" {
                                 error = "银行信息返回" + String(moSign.status) + ":" + error + "," + decp
                             }
-                            self.showHintController(title: "tips".localized, message: error)
+                            self.showHintController(title: "提示", message: error)
                             
                         } else {
                             /// 需要跳转网页

MTP_iOS/MTP2_iOS/UserInterface/Mine/Settings/Signing/SigningStepThreeViewController.swift

@@ -317,7 +317,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
               checkValue() else { return }
         
         if currentSignBankModel.cansign == 0 {
-            self.showHintController(title: "tips".localized, message: "不支持签约")
+            self.showHintController(title: "提示", message: "不支持签约")
             return
         }
         
@@ -355,7 +355,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
             DispatchQueue.main.async {
                 NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
                 if isCompleted {
-                    self.showHintController(title: "tips".localized, message: "签约成功",handler: { (_) in
+                    self.showHintController(title: "提示", message: "签约成功",handler: { (_) in
                         // 发送刷新列表通知
                         MTP2BusinessCore.shared.broadcastManager?.post(action: .SigningTerminationReloadData, object: self)
                         self.parent?.dismiss(animated: true, completion: nil)
@@ -368,7 +368,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
                             if decp != "" {
                                 error = "银行信息返回" + String(moSign.status) + ":" + error + "," + decp
                             }
-                            self.showHintController(title: "tips".localized, message: error)
+                            self.showHintController(title: "提示", message: error)
                             
                         } else {
                             // 需要跳转网页
@@ -389,7 +389,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (regiesterBankTextField.superview?.isHidden)! == false {
             if let regiesterBank = self.regiesterBankTextField.text {
                 if regiesterBank.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请选择开户行")
+                    self.showHintController(title: "提示", message: "请选择开户行")
                     return false
                 }
             }
@@ -398,7 +398,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (accountNameTextField.superview?.isHidden)! == false {
             if let accountName = self.accountNameTextField.text {
                 if accountName.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入账户名称")
+                    self.showHintController(title: "提示", message: "请输入账户名称")
                     return false
                 }
             }
@@ -407,7 +407,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (bankAccountTextField.superview?.isHidden)! == false {
             if let bankAccount = self.bankAccountTextField.text {
                 if bankAccount.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入银行账户")
+                    self.showHintController(title: "提示", message: "请输入银行账户")
                     return false
                 }
             }
@@ -416,11 +416,11 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (confirmBankAccountTextField.superview?.isHidden)! == false {
             if let confirmBankAccount = self.confirmBankAccountTextField.text {
                 if confirmBankAccount.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入确认银行账户")
+                    self.showHintController(title: "提示", message: "请输入确认银行账户")
                     return false
                 }
                 if confirmBankAccount != bankAccountTextField.text {
-                    self.showHintController(title: "tips".localized, message: "确认银行账户和银行账户不一致")
+                    self.showHintController(title: "提示", message: "确认银行账户和银行账户不一致")
                     return false
                 }
             }
@@ -429,7 +429,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (phoneNumberTextField.superview?.isHidden)! == false {
             if let phoneNumber = self.phoneNumberTextField.text {
                 if phoneNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入手机号码")
+                    self.showHintController(title: "提示", message: "请输入手机号码")
                     return false
                 }
             }
@@ -438,7 +438,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (regiesterProvinceTextField.superview?.isHidden)! == false {
             if let regiesterProvince = self.regiesterProvinceTextField.text {
                 if regiesterProvince.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请选择开户省份")
+                    self.showHintController(title: "提示", message: "请选择开户省份")
                     return false
                 }
             }
@@ -447,7 +447,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (regiesterCityTextField.superview?.isHidden)! == false {
             if let regiesterCity = self.regiesterCityTextField.text {
                 if regiesterCity.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请选择开户城市")
+                    self.showHintController(title: "提示", message: "请选择开户城市")
                     return false
                 }
             }
@@ -456,7 +456,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (regiesterBranchBankNumberTextField.superview?.isHidden)! == false {
             if let regiesterBranchBankNumber = self.regiesterBranchBankNumberTextField.text {
                 if regiesterBranchBankNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入开户行支行号")
+                    self.showHintController(title: "提示", message: "请输入开户行支行号")
                     return false
                 }
             }
@@ -465,7 +465,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (regiesterBranchBankNameTextField.superview?.isHidden)! == false {
             if let regiesterBranchBankName = self.regiesterBranchBankNameTextField.text {
                 if regiesterBranchBankName.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入开户行支行名称")
+                    self.showHintController(title: "提示", message: "请输入开户行支行名称")
                     return false
                 }
             }
@@ -474,7 +474,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (bankPasswordTextField.superview?.isHidden)! == false {
             if let bankPassword = self.bankPasswordTextField.text {
                 if bankPassword.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入银行密码")
+                    self.showHintController(title: "提示", message: "请输入银行密码")
                     return false
                 }
             }
@@ -483,7 +483,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (oldPhoneNumberTextField.superview?.isHidden)! == false {
             if let oldPhoneNumber = self.oldPhoneNumberTextField.text {
                 if oldPhoneNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入原手机号码")
+                    self.showHintController(title: "提示", message: "请输入原手机号码")
                     return false
                 }
             }
@@ -492,7 +492,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (checkCodeTextField.superview?.superview?.isHidden)! == false {
             if let checkCode = self.checkCodeTextField.text {
                 if checkCode.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入验证码")
+                    self.showHintController(title: "提示", message: "请输入验证码")
                     return false
                 }
             }
@@ -500,7 +500,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         /// 男性
         if (checkMenButton.superview?.superview?.isHidden)! == false {
             if !self.checkMenButton.isSelected && !self.checkWomenButton.isSelected{
-                self.showHintController(title: "tips".localized, message: "请选择性别")
+                self.showHintController(title: "提示", message: "请选择性别")
                 return false
             }
         }
@@ -508,7 +508,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (legalPersonNameTextField.superview?.isHidden)! == false {
             if let legalPersonName = self.legalPersonNameTextField.text {
                 if legalPersonName.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入法人姓名")
+                    self.showHintController(title: "提示", message: "请输入法人姓名")
                     return false
                 }
             }
@@ -517,7 +517,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (legalPersonalIDcardTypeTextField.superview?.isHidden)! == false {
             if let legalPersonalIDcardType = self.legalPersonalIDcardTypeTextField.text {
                 if legalPersonalIDcardType.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请选择法人证件类型")
+                    self.showHintController(title: "提示", message: "请选择法人证件类型")
                     return false
                 }
             }
@@ -526,7 +526,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (legalPersonalIDcardNumberField.superview?.isHidden)! == false {
             if let legalPersonalIDcardNumber = self.legalPersonalIDcardNumberField.text {
                 if legalPersonalIDcardNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入法人证件号码")
+                    self.showHintController(title: "提示", message: "请输入法人证件号码")
                     return false
                 }
             }
@@ -535,7 +535,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (agentNameTextField.superview?.isHidden)! == false {
             if let agentName = self.agentNameTextField.text {
                 if agentName.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入经办人姓名")
+                    self.showHintController(title: "提示", message: "请输入经办人姓名")
                     return false
                 }
             }
@@ -544,7 +544,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (agentIDcardTypeTextField.superview?.isHidden)! == false {
             if let agentIDcardType = self.agentIDcardTypeTextField.text {
                 if agentIDcardType.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请选择经办人证件类型")
+                    self.showHintController(title: "提示", message: "请选择经办人证件类型")
                     return false
                 }
             }
@@ -553,7 +553,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (agentIDcardNumberTextField.superview?.isHidden)! == false {
             if let agentIDcardNumber = self.agentIDcardNumberTextField.text {
                 if agentIDcardNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入经办人证件号码")
+                    self.showHintController(title: "提示", message: "请输入经办人证件号码")
                     return false
                 }
             }
@@ -562,7 +562,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (itsMemberCodeTextField.superview?.isHidden)! == false {
             if let itsMemberCode = self.itsMemberCodeTextField.text {
                 if itsMemberCode.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入所属会员代码")
+                    self.showHintController(title: "提示", message: "请输入所属会员代码")
                     return false
                 }
             }
@@ -571,7 +571,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (legalContactNumberTextField.superview?.isHidden)! == false {
             if let legalContactNumber = self.legalContactNumberTextField.text {
                 if legalContactNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入法人联系号码")
+                    self.showHintController(title: "提示", message: "请输入法人联系号码")
                     return false
                 }
             }
@@ -580,7 +580,7 @@ extension SigningStepThreeViewController: SigningMainViewControllerDelegate {
         if (agentContactNumberTextField.superview?.isHidden)! == false {
             if let agentContactNumber = self.agentContactNumberTextField.text {
                 if agentContactNumber.trimmingCharacters(in: CharacterSet.whitespaces).isEmpty {
-                    self.showHintController(title: "tips".localized, message: "请输入经办人联系号码")
+                    self.showHintController(title: "提示", message: "请输入经办人联系号码")
                     return false
                 }
             }

MTP_iOS/MTP2_iOS/UserInterface/Order/MyUnusedDetailViewController.swift

@@ -154,7 +154,7 @@ class MyUnusedDetailViewController: BaseViewController {
         /// 数据异常
         guard let tradeManager = MTP2BusinessCore.shared.tradeManager else { return }
         /// alert
-        showCommitAlertController(title: "tips".localized, message: "确定要撤单吗？"){(_) in
+        showCommitAlertController(title: "提示", message: "确定要撤单吗？"){(_) in
             /// startAnimating
             self._anim?.startAnimating()
             /// 构建数据

MTP_iOS/MTP2_iOS/UserInterface/Order/OrderViewController.swift

@@ -209,7 +209,7 @@ class OrderViewController: BaseViewController {
             return
         }
         /// alert
-        showCommitAlertController(title: "tips".localized, message: "确定要撤单吗？"){(_) in
+        showCommitAlertController(title: "提示", message: "确定要撤单吗？"){(_) in
             /// startAnimating
             self._anim?.startAnimating()
             /// 构建数据
@@ -241,7 +241,7 @@ class OrderViewController: BaseViewController {
             return
         }
         /// alert
-        showCommitAlertController(title: "tips".localized, message: "确定要撤单吗？"){(_) in
+        showCommitAlertController(title: "提示", message: "确定要撤单吗？"){(_) in
             /// startAnimating
             self._anim?.startAnimating()
             /// 构建数据

MTP_iOS/MTP2_iOS/UserInterface/Order/PacketViewController.swift

@@ -74,8 +74,8 @@ class PacketViewController: BaseViewController {
             self.segmentedView.defaultSelectedIndex = self.selectedIndex
             /// 刷新数据
             self.segmentedView.reloadData()
-            /// 刷新数据
-            self.tableView.triggerRefreshing()
+            /// 重置请求条件
+            self.reloadData(self.segmentedView.selectedIndex)
         }
     }
     

MTP_iOS/MTP2_iOS/UserInterface/ResetPwd/CheckMobileViewController.swift

@@ -22,7 +22,7 @@ class CheckMobileViewController: BaseViewController {
     /// 手机号码输入框
     @IBOutlet weak var mobileTextField: UITextField! {
         didSet {
-            mobileTextField.attributedPlaceholder = "pleaseEnterPhoneNumber".localized.withTextColor(Color_placeholder_text)
+            mobileTextField.attributedPlaceholder = "pleaseEnterPhoneNumber".withTextColor(Color_placeholder_text)
         }
     }
     /// 区号按钮
@@ -37,7 +37,7 @@ class CheckMobileViewController: BaseViewController {
     /// 验证码输入框
     @IBOutlet weak var captchaTextField: UITextField! {
         didSet {
-            captchaTextField.attributedPlaceholder = "请输入手机验证码".localized.withTextColor(Color_placeholder_text)
+            captchaTextField.attributedPlaceholder = "请输入手机验证码".withTextColor(Color_placeholder_text)
         }
     }
     /// 提交按钮
@@ -51,7 +51,7 @@ class CheckMobileViewController: BaseViewController {
     /// 推荐码
     @IBOutlet weak var referralField: UITextField! {
         didSet {
-            referralField.attributedPlaceholder = "请输入推荐码".localized.withTextColor(Color_placeholder_text)
+            referralField.attributedPlaceholder = "请输入推荐码".withTextColor(Color_placeholder_text)
         }
     }
     
@@ -101,11 +101,11 @@ class CheckMobileViewController: BaseViewController {
     private func buildView() {
         switch type {
         case .AuthSignup:   // 三方登录注册业务
-            navTitle.title = "手机验证".localized
-            commitButton.setTitle("验证".localized, for: .normal)
+            navTitle.title = "手机验证"
+            commitButton.setTitle("验证", for: .normal)
         case .MobileSignin: // 手机号码登录
-            navTitle.title = "手机登录".localized
-            commitButton.setTitle("登录".localized, for: .normal)
+            navTitle.title = "手机登录"
+            commitButton.setTitle("登录", for: .normal)
         }
         
         /// 获取上次登录的手机账号
@@ -122,7 +122,7 @@ class CheckMobileViewController: BaseViewController {
         case TAG_CAPTCHA:   // 发送短信验证码
             /// 手机号码
             guard let mobile = mobileTextField.text, mobile != "" else {
-                WHToast.showError(withMessage: "请输入手机号码".localized, duration: 1.5, finishHandler: {})
+                WHToast.showError(withMessage: "请输入手机号码", duration: 1.5, finishHandler: {})
                 return
             }
             self.present(imageCodeViewController, animated: true, completion: {})
@@ -140,11 +140,11 @@ class CheckMobileViewController: BaseViewController {
             self.view.endEditing(true)
             
             guard let mobile = mobileTextField.text, mobile != "" else {
-                WHToast.showError(withMessage: "pleaseentercorrectmobilenumber".localized, duration: 1.0, finishHandler: {})
+                WHToast.showError(withMessage: "pleaseentercorrectmobilenumber", duration: 1.0, finishHandler: {})
                 return
             }
             guard let captcha = captchaTextField.text, captcha.trimmingCharacters(in: .whitespaces) != "" else {
-                WHToast.showError(withMessage: "pleaseEnterCheckCode".localized, duration: 1.0, finishHandler: {})
+                WHToast.showError(withMessage: "pleaseEnterCheckCode", duration: 1.0, finishHandler: {})
                 return
             }
             
@@ -169,7 +169,7 @@ class CheckMobileViewController: BaseViewController {
             MCGCDTimer.shared.cancleTimer(WithTimerName: self.captchaTimerID)
             DispatchQueue.main.async {
                 self.captchaButton.isEnabled = true
-                self.captchaButton.setTitle("获取验证码".localized, for: .normal)
+                self.captchaButton.setTitle("获取验证码", for: .normal)
                 self.timerLabel.isHidden = true
             }
         } else {
@@ -206,7 +206,7 @@ class CheckMobileViewController: BaseViewController {
         accountManager.requestSendMobileCaptchaCode(mobile, areaCode, callback: { (isCompleted, errorInfo, showRefer, vcode) in
             DispatchQueue.main.async {
                 if !isCompleted {
-                    self.showHintController(title: "tips".localized, message: errorInfo?.retMsg ?? "发送失败，请稍后重试".localized)
+                    self.showHintController(title: "提示", message: errorInfo?.retMsg ?? "发送失败，请稍后重试")
                     return
                 } else {
                     /// 是否显示推荐码
@@ -225,14 +225,14 @@ class CheckMobileViewController: BaseViewController {
         guard let accountManager = MTP2BusinessCore.shared.accountManager else { return }
         /// pleaseEnterCheckCode
         guard let captcha = self.captchaTextField.text else {
-            WHToast.showError(withMessage: "pleaseEnterCheckCode".localized, duration: 1.0, finishHandler: {})
+            WHToast.showError(withMessage: "pleaseEnterCheckCode", duration: 1.0, finishHandler: {})
             return
         }
         /// 缺少必要数据，请稍后重试
         guard let openID = self.openID,
               let authType = self.authType,
               let mobile = mobileTextField.text else {
-                WHToast.showError(withMessage: "缺少必要数据，请稍后重试".localized, duration: 1.0, finishHandler: {})
+                WHToast.showError(withMessage: "缺少必要数据，请稍后重试", duration: 1.0, finishHandler: {})
                 return
         }
         
@@ -246,20 +246,20 @@ class CheckMobileViewController: BaseViewController {
                     if array.count > 1 && array[1] == "2" {
                         /// 需要补充所属机构 “请输入会员和机构代码”
                         DispatchQueue.main.async {
-                            let alertController = UIAlertController(title: "tips".localized, message: "请输入会员或机构代码".localized, preferredStyle: .alert)
+                            let alertController = UIAlertController(title: "提示", message: "请输入会员或机构代码", preferredStyle: .alert)
                             alertController.addTextField {
                                 textField in
                                 textField.keyboardType = UIKeyboardType.numberPad
                             }
-                            alertController.addAction(UIAlertAction(title: "提交".localized, style: .destructive) {
+                            alertController.addAction(UIAlertAction(title: "提交", style: .destructive) {
                                 action in
                                 guard let textField = alertController.textFields?[0], let value = textField.text else {
-                                    WHToast.showError(withMessage: "请输入会员或机构代码".localized, duration: 1.0, finishHandler: {})
+                                    WHToast.showError(withMessage: "请输入会员或机构代码", duration: 1.0, finishHandler: {})
                                     return
                                 }
                                 self.authSignup(value)
                             })
-                            alertController.addAction(UIAlertAction(title: "cancle".localized, style: .cancel) {
+                            alertController.addAction(UIAlertAction(title: "cancle", style: .cancel) {
                                 action in
                                 DispatchQueue.main.sync {
                                     NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
@@ -271,7 +271,7 @@ class CheckMobileViewController: BaseViewController {
                         DispatchQueue.main.sync {
                             // 正常失败
                             NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
-                            self.showHintController(title: "tips".localized, message: "\(msg.replacingOccurrences(of: "^1", with: ""))")
+                            self.showHintController(title: "提示", message: "\(msg.replacingOccurrences(of: "^1", with: ""))")
                         }
                     }
                     
@@ -283,7 +283,7 @@ class CheckMobileViewController: BaseViewController {
                         guard let range = msg.range(of: "?response=", options: .backwards, range: nil, locale: nil), let probufDataString = msg.suffix(msg.lengthOfBytes(using: .utf8) - range.upperBound.utf16Offset(in: "")).removingPercentEncoding, let data = Data(base64Encoded: String(probufDataString), options: Data.Base64DecodingOptions.init(rawValue: 0)) else {
                             DispatchQueue.main.sync {
                                 NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
-                                self.showHintController(title: "tips".localized, message: "注册失败，请稍后重试".localized)
+                                self.showHintController(title: "提示", message: "注册失败，请稍后重试")
                             }
                             return
                         }
@@ -309,7 +309,7 @@ class CheckMobileViewController: BaseViewController {
                                 if !isCompleted {
                                     DispatchQueue.main.sync {
                                     NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
-                                        self.showHintController(title: "tips".localized, message: "loginFailPleaseTryAgainLater".localized)
+                                        self.showHintController(title: "提示", message: "loginFailPleaseTryAgainLater")
                                     }
                                     return
                                 }
@@ -319,13 +319,13 @@ class CheckMobileViewController: BaseViewController {
                         } else {
                             DispatchQueue.main.sync {
                                 NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
-                                self.showHintController(title: "tips".localized, message: ErrorUtils.getDesc(errorCode: Int(authLoginRsp.retCode)) ?? "loginFailPleaseTryAgainLater".localized)
+                                self.showHintController(title: "提示", message: ErrorUtils.getDesc(errorCode: Int(authLoginRsp.retCode)) ?? "loginFailPleaseTryAgainLater")
                             }
                         }
                     } catch {
                         DispatchQueue.main.sync {
                             NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
-                            self.showHintController(title: "tips".localized, message: "loginFailPleaseTryAgainLater".localized)
+                            self.showHintController(title: "提示", message: "loginFailPleaseTryAgainLater")
                         }
                     }
                 }
@@ -349,7 +349,7 @@ class CheckMobileViewController: BaseViewController {
         let referral = isShowRefer == 0 ? nil : (referralField.text ?? "")
         
         /// 开启Loading
-        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "请稍等……".localized, type: .ballClipRotate, color: UIColorFromHex(rgbValue: 0xA8B6CC)), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
+        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "请稍等……", type: .ballClipRotate, color: UIColorFromHex(rgbValue: 0xA8B6CC)), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
         
         /// 手机号码登录
         accountManager.mobileLogin(mobile: areaCode+mobile, referral, captcha: captcha, memareacode: memareacode) {
@@ -361,20 +361,20 @@ class CheckMobileViewController: BaseViewController {
                     if array.count > 1 && array[1] == "2" {
                         /// 需要补充所属机构 “请输入会员和机构代码”
                         DispatchQueue.main.async {
-                            let alertController = UIAlertController(title: "tips".localized, message: "请输入会员或机构代码".localized, preferredStyle: .alert)
+                            let alertController = UIAlertController(title: "提示", message: "请输入会员或机构代码", preferredStyle: .alert)
                             alertController.addTextField {
                                 textField in
                                 textField.keyboardType = UIKeyboardType.numberPad
                             }
-                            alertController.addAction(UIAlertAction(title: "提交".localized, style: .destructive) {
+                            alertController.addAction(UIAlertAction(title: "提交", style: .destructive) {
                                 action in
                                 guard let textField = alertController.textFields?[0], let value = textField.text else {
-                                    self.showHintController(title: "tips".localized, message: "请输入会员或机构代码".localized)
+                                    self.showHintController(title: "提示", message: "请输入会员或机构代码")
                                     return
                                 }
                                 self.mobileLogin(value)
                             })
-                            alertController.addAction(UIAlertAction(title: "cancle".localized, style: .cancel) {
+                            alertController.addAction(UIAlertAction(title: "cancle", style: .cancel) {
                                 action in
                                 DispatchQueue.main.sync {
                                     NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
@@ -386,7 +386,7 @@ class CheckMobileViewController: BaseViewController {
                         DispatchQueue.main.sync {
                             /// 正常失败
                             NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
-                            self.showHintController(title: "tips".localized, message: "\(msg.replacingOccurrences(of: "^1", with: ""))")
+                            self.showHintController(title: "提示", message: "\(msg.replacingOccurrences(of: "^1", with: ""))")
                         }
                     }
                     
@@ -398,7 +398,7 @@ class CheckMobileViewController: BaseViewController {
                         guard let data = Data(base64Encoded: msg, options: Data.Base64DecodingOptions.init(rawValue: 0)) else {
                             DispatchQueue.main.sync {
                                 NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
-                                self.showHintController(title: "tips".localized, message: "loginFailPleaseTryAgainLater".localized)
+                                self.showHintController(title: "提示", message: "loginFailPleaseTryAgainLater")
                             }
                             return
                         }
@@ -413,7 +413,7 @@ class CheckMobileViewController: BaseViewController {
                                 isCompleted in
                                 if isCompleted == false {
                                     NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
-                                    self.showHintController(title: "tips".localized, message: "loginFailPleaseTryAgainLater".localized)
+                                    self.showHintController(title: "提示", message: "loginFailPleaseTryAgainLater")
                                     return
                                 }
                                 /// 记录本次登录的手机号码
@@ -424,13 +424,13 @@ class CheckMobileViewController: BaseViewController {
                         } else {
                             DispatchQueue.main.sync {
                                 NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
-                                self.showHintController(title: "tips".localized, message: ErrorUtils.getDesc(errorCode: Int(loginRsp.retCode)) ?? "loginFailPleaseTryAgainLater".localized)
+                                self.showHintController(title: "提示", message: ErrorUtils.getDesc(errorCode: Int(loginRsp.retCode)) ?? "loginFailPleaseTryAgainLater")
                             }
                         }
                     } catch {
                         DispatchQueue.main.sync {
                             NVActivityIndicatorPresenter.sharedInstance.stopAnimating(NVActivityIndicatorView.DEFAULT_FADE_OUT_ANIMATION)
-                            self.showHintController(title: "tips".localized, message: "loginFailPleaseTryAgainLater".localized)
+                            self.showHintController(title: "提示", message: "loginFailPleaseTryAgainLater")
                         }
                     }
                 }
@@ -465,7 +465,7 @@ class CheckMobileViewController: BaseViewController {
                 DispatchQueue.main.async {
                     if appDelegate.window?.rootViewController?.isKind(of: LoginViewController.self) ?? false,
                         let loginViewController = (appDelegate.window?.rootViewController as? BaseNavigationController)?.topViewController as? LoginViewController {
-                        loginViewController.showHintController(title: "提示", message: "注册失败，请稍后重试".localized)
+                        loginViewController.showHintController(title: "提示", message: "注册失败，请稍后重试")
                     }
                 }
             }
@@ -476,13 +476,13 @@ class CheckMobileViewController: BaseViewController {
     private func checkInputValue() -> Bool {
          /// 手机号码
         guard let mobile = mobileTextField.text, mobile != "" else {
-            WHToast.showError(withMessage: "请输入手机号码".localized, duration: 1.5, finishHandler: {})
+            WHToast.showError(withMessage: "请输入手机号码", duration: 1.5, finishHandler: {})
             return false
         }
         
         /// 短信验证码
         guard let captcha = self.captchaTextField.text, captcha != "" else {
-            WHToast.showError(withMessage: "pleaseEnterCheckCode".localized, duration: 1.5, finishHandler: {})
+            WHToast.showError(withMessage: "请输入验证码", duration: 1.5, finishHandler: {})
             return false
         }
         
@@ -490,7 +490,7 @@ class CheckMobileViewController: BaseViewController {
         if isShowRefer != 0 {
             /// 短信验证码
             guard let referral = self.referralField.text, referral != "" else {
-                WHToast.showError(withMessage: "请输入推荐码".localized, duration: 1.5, finishHandler: {})
+                WHToast.showError(withMessage: "请输入推荐码", duration: 1.5, finishHandler: {})
                 return false
             }
         }

MTP_iOS/MTP2_iOS/UserInterface/ResetPwd/ResetPwdFirstStepViewController.swift

@@ -22,13 +22,13 @@ class ResetPwdFirstStepViewController: BaseViewController {
     /// 手机号码输入框
     @IBOutlet weak var mobilePhoneField: UITextField! {
         didSet {
-            mobilePhoneField.attributedPlaceholder = "请输入手机号码".localized.withTextColor(Color_placeholder_text)
+            mobilePhoneField.attributedPlaceholder = "请输入手机号码".withTextColor(Color_placeholder_text)
         }
     }
     /// 验证码输入框
     @IBOutlet weak var captchaCodeField: UITextField! {
         didSet {
-            captchaCodeField.attributedPlaceholder = "请输入短信验证码".localized.withTextColor(Color_placeholder_text)
+            captchaCodeField.attributedPlaceholder = "请输入短信验证码".withTextColor(Color_placeholder_text)
         }
     }
     /// timerLabel
@@ -84,14 +84,14 @@ class ResetPwdFirstStepViewController: BaseViewController {
     private func checkInputValue() -> Bool {
         /// 手机号码
         guard let mobilePhone = mobilePhoneField.text, mobilePhone != "" else {
-            WHToast.showError(withMessage: "请输入手机号码".localized, duration: 1.0, finishHandler: {})
+            WHToast.showError(withMessage: "请输入手机号码", duration: 1.0, finishHandler: {})
             return false
         }
         
         /// 请输入正确的手机号码
         if areaCode == "+86" {
             guard mobilePhone.count == 11 else {
-                WHToast.showError(withMessage: "请输入正确的手机号码".localized, duration: 1.0, finishHandler: {})
+                WHToast.showError(withMessage: "请输入正确的手机号码", duration: 1.0, finishHandler: {})
                 return false
             }
         }
@@ -102,13 +102,13 @@ class ResetPwdFirstStepViewController: BaseViewController {
     private func checkCardNumInputValue() -> Bool {
         /// 证件号码
         guard let code = captchaCodeField.text, code != "" else {
-            WHToast.showError(withMessage: "请输入短信验证码".localized, duration: 1.0, finishHandler: {})
+            WHToast.showError(withMessage: "请输入短信验证码", duration: 1.0, finishHandler: {})
             return false
         }
     
         /// 短信验证码输入不正确
         guard code == captchaCode else {
-            WHToast.showError(withMessage: "短信验证码输入不正确".localized, duration: 1.0, finishHandler: {})
+            WHToast.showError(withMessage: "短信验证码输入不正确", duration: 1.0, finishHandler: {})
             return false
         }
         
@@ -141,7 +141,7 @@ class ResetPwdFirstStepViewController: BaseViewController {
         accountManager.requestSendMobileCaptchaCode(mobile, areaCode, callback: { (isCompleted, errorInfo, ShowRefer, vcode) in
             DispatchQueue.main.async {
                 if !isCompleted {
-                    self.showHintController(title: "tips".localized, message: errorInfo?.retMsg ?? "发送失败，请稍后重试".localized)
+                    self.showHintController(title: "提示", message: errorInfo?.retMsg ?? "发送失败，请稍后重试")
                     return
                 } else {
                     /// 短信验证码
@@ -162,7 +162,7 @@ class ResetPwdFirstStepViewController: BaseViewController {
             MCGCDTimer.shared.cancleTimer(WithTimerName: self.captchaTimerID)
             DispatchQueue.main.async {
                 self.captchaButton.isEnabled = true
-                self.captchaButton.setTitle("获取验证码".localized, for: .normal)
+                self.captchaButton.setTitle("获取验证码", for: .normal)
                 self.timerLabel.isHidden = true
             }
         } else {
@@ -204,7 +204,7 @@ class ResetPwdFirstStepViewController: BaseViewController {
         let mobilePhone = mobilePhoneField.text ?? ""
         
         /// 开启Loading
-        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "查询数据中......".localized, type: .ballClipRotate, color: UIColorFromHex(rgbValue: 0xA8B6CC)), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
+        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "查询数据中......", type: .ballClipRotate, color: UIColorFromHex(rgbValue: 0xA8B6CC)), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
         
         /// 查询登录账号信息
         accountManager.queryLoginId("", mobilePhone, areaCode, vcode, callback: { (isComplete, errorInfo, loginId) in

MTP_iOS/MTP2_iOS/UserInterface/ResetPwd/ResetPwdSecondStepViewController.swift

@@ -17,13 +17,13 @@ class ResetPwdSecondStepViewController: BaseViewController {
     /// 密码输入框
     @IBOutlet weak var pwdField: UITextField! {
         didSet {
-            pwdField.attributedPlaceholder = "请输入6-20个字符新密码".localized.withTextColor(Color_placeholder_text)
+            pwdField.attributedPlaceholder = "请输入6-20个字符新密码".withTextColor(Color_placeholder_text)
         }
     }
     /// 确认密码输入框
     @IBOutlet weak var confirmPwdField: UITextField! {
         didSet {
-            confirmPwdField.attributedPlaceholder = "请确认新密码".localized.withTextColor(Color_placeholder_text)
+            confirmPwdField.attributedPlaceholder = "请确认新密码".withTextColor(Color_placeholder_text)
         }
     }
     ///提交按钮
@@ -76,7 +76,7 @@ class ResetPwdSecondStepViewController: BaseViewController {
         let pwd = pwdField.text ?? "", confirmPwd = confirmPwdField.text ?? ""
         /// 请输入6-20位的字符
         guard pwd.count > 5, pwd.count < 21 else {
-            WHToast.showError(withMessage: "请输入6-20位的字符".localized, duration: 1.5) {
+            WHToast.showError(withMessage: "请输入6-20位的字符", duration: 1.5) {
                 self.pwdField.becomeFirstResponder()
             }
             return false
@@ -84,7 +84,7 @@ class ResetPwdSecondStepViewController: BaseViewController {
         
         /// 请输入6-20位的字符
         guard confirmPwd.count > 5, confirmPwd.count < 21 else {
-            WHToast.showError(withMessage: "请输入6-20位的字符".localized, duration: 1.5) {
+            WHToast.showError(withMessage: "请输入6-20位的字符", duration: 1.5) {
                 self.confirmPwdField.becomeFirstResponder()
             }
             return false
@@ -92,7 +92,7 @@ class ResetPwdSecondStepViewController: BaseViewController {
         
         /// 两次密码不一样
         guard pwd == confirmPwd else {
-            WHToast.showError(withMessage: "两次输入的密码不一样".localized, duration: 1.5) {
+            WHToast.showError(withMessage: "两次输入的密码不一样", duration: 1.5) {
                 self.confirmPwdField.becomeFirstResponder()
             }
             return false
@@ -127,7 +127,7 @@ class ResetPwdSecondStepViewController: BaseViewController {
         let encryNewpwd = (datas[0].value + pwd).bytes.sha256().toHexString().lowercased()
         
         /// 开启Loading
-        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "submiting".localized, type: .ballClipRotate, color: UIColorFromHex(rgbValue: 0xA8B6CC)), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
+        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "提交中", type: .ballClipRotate, color: UIColorFromHex(rgbValue: 0xA8B6CC)), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
         
         /// 重置密码请求
         accountManager.requestResetPwd("", vcode, encryNewpwd, replaceString as String, callback: { (isComplete, errorInfo) in

MTP_iOS/MTP2_iOS/UserInterface/Trade/MyUnusedViewController.swift

@@ -383,7 +383,7 @@ class MyUnusedViewController: BaseViewController {
         }
         
         /// 开启Loading
-        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "发布中......".localized, type: .ballClipRotate, color: UIColor.loding(), backgroundColor: .clear), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
+        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "发布中......", type: .ballClipRotate, color: UIColor.loding(), backgroundColor: .clear), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
         /// 发送请求
         tradeManager.tradeCommision(tradeParam: tradeParam) { [weak self] (isSuccess, error, orderNo) in
             DispatchQueue.main.async {
@@ -435,7 +435,7 @@ class MyUnusedViewController: BaseViewController {
         }
         
         /// 开启Loading
-        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "发布中......".localized, type: .ballClipRotate, color: UIColor.loding(), backgroundColor: .clear), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
+        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "发布中......", type: .ballClipRotate, color: UIColor.loding(), backgroundColor: .clear), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
         
         let group = DispatchGroup()
         /// 数据构建
@@ -554,7 +554,7 @@ class MyUnusedViewController: BaseViewController {
         /// 数据异常
         guard let tradeManager = MTP2BusinessCore.shared.tradeManager else { return }
         /// alert
-        showCommitAlertController(title: "tips".localized, message: "确定要撤单吗？"){(_) in
+        showCommitAlertController(title: "提示", message: "确定要撤单吗？"){(_) in
             /// startAnimating
             self._anim?.startAnimating()
             /// 构建数据
@@ -704,6 +704,7 @@ class OrderDelegate: NSCoder, UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: owner.OrderCellIdentifier, for: indexPath) as! TradeCell
         cell.model = self.owner.orderDetails[indexPath.row]
+        cell.isCheck = false
         cell.block = { (_ model: MoHsbyGoodsOrderDetail?, _ isCheck: Bool, _ qty: Int) in
             /// 设置数量
             DispatchQueue.main.asyncAfter(deadline: DispatchTime.now()+0.2) {
@@ -729,7 +730,7 @@ class OrderDelegate: NSCoder, UITableViewDelegate, UITableViewDataSource {
 }
 
 // MARK: - UICollectionViewDelegate, UICollectionViewDataSource, UICollectionViewDelegateFlowLayout
-class MyUnusedDelegate: NSCoder, UITableViewDelegate, UITableViewDataSource{
+class MyUnusedDelegate: NSCoder, UITableViewDelegate, UITableViewDataSource {
 
     let owner: MyUnusedViewController
     init(_ owner: MyUnusedViewController) {

MTP_iOS/MTP2_iOS/UserInterface/Trade/PaymentOrderViewController.swift

@@ -313,7 +313,7 @@ class PaymentOrderViewController: BaseViewController {
         orderManager.requestQueryMyCouponHolds(moGoodsInfo.goodsid,
                                                amount,
                                                moGoodsInfo.sellUserID,
-                                               EHoldStatus.executed) { (isComplete, error, objs) in
+                                               "1,2") { (isComplete, error, objs) in
             DispatchQueue.main.async {
                 /// stopAnimating
                 self._anim?.stopAnimating()
@@ -363,7 +363,7 @@ class PaymentOrderViewController: BaseViewController {
         if let id = userAddress?.autoid { tradeParam.receiveInfoID = UInt64(id)}
         
         /// 开启Loading
-        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "订单生成中......".localized, type: .ballClipRotate, color: UIColor.loding(), backgroundColor: .clear), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
+        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "订单生成中......", type: .ballClipRotate, color: UIColor.loding(), backgroundColor: .clear), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
         
         tradeManager.tradeCommision(tradeParam: tradeParam) { [weak self] (isSuccess, error, orderNo) in
             DispatchQueue.main.async {

MTP_iOS/MTP2_iOS/UserInterface/Trade/PaymentViewController.swift

@@ -264,7 +264,7 @@ class PaymentViewController: BaseViewController {
         }
         
         /// 开启Loading
-        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "支付中......".localized, type: .ballClipRotate, color: UIColorFromHex(rgbValue: 0xA8B6CC)), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
+        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "支付中......", type: .ballClipRotate, color: UIColorFromHex(rgbValue: 0xA8B6CC)), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
         
         /// 请求生成下单参数
         bankManager.requestQuickPay(payOrder.marketid, payOrder.tradeid, Date().getString(formatter: "yyyy-MM-dd"), payOrder.payamount, payWay, accountName) { (isComplete, error, param) in

MTP_iOS/MTP2_iOS/UserInterface/Trade/PreTradeViewController.swift

@@ -143,7 +143,7 @@ class PreTradeViewController: BaseViewController {
         tradeParam.goodsID = obj.goodsid
         
         /// 开启Loading
-        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "订单生成中......".localized, type: .ballClipRotate, color: UIColor.loding(), backgroundColor: .clear), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
+        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "订单生成中......", type: .ballClipRotate, color: UIColor.loding(), backgroundColor: .clear), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
         
         tradeManager.tradeCommision(tradeParam: tradeParam) { [weak self] (isSuccess, error, orderNo) in
             DispatchQueue.main.async {

MTP_iOS/MTP2_iOS/UserInterface/Trade/TradeViewController.swift

@@ -250,7 +250,7 @@ class TradeViewController: BaseViewController {
         tradeParam.goodsID = obj.goodsid
         
         /// 开启Loading
-        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "购买中......".localized, type: .ballClipRotate, color: UIColor.loding(), backgroundColor: .clear), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
+        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "购买中......", type: .ballClipRotate, color: UIColor.loding(), backgroundColor: .clear), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
         
         tradeManager.tradeCommision(tradeParam: tradeParam) { [weak self] (isSuccess, error, orderNo) in
             DispatchQueue.main.async {
@@ -280,7 +280,7 @@ class TradeViewController: BaseViewController {
         let group = DispatchGroup()
         
         /// 开启Loading
-        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "购买中......".localized, type: .ballClipRotate, color: UIColor.loding(), backgroundColor: .clear), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
+        NVActivityIndicatorPresenter.sharedInstance.startAnimating(ActivityData(message: "购买中......", type: .ballClipRotate, color: UIColor.loding(), backgroundColor: .clear), NVActivityIndicatorView.DEFAULT_FADE_IN_ANIMATION)
         
         /// 构建交易参数
         let tradeParam = MoTradeParam()
@@ -420,6 +420,7 @@ extension TradeViewController: UITableViewDelegate, UITableViewDataSource {
     func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
         let cell = tableView.dequeueReusableCell(withIdentifier: CellIdentifier, for: indexPath) as! TradeCell
         cell.model = orderDetails[indexPath.row]
+        cell.isCheck = false
         cell.block = { (_ model: MoHsbyGoodsOrderDetail?, _ isCheck: Bool, _ qty: Int) in
             var qty: Int = 0
             self.tableView.visibleCells.forEach { (cell) in
@@ -495,15 +496,13 @@ class TradeCell: BaseTableViewCell<MoHsbyGoodsOrderDetail> {
     override var model: MoHsbyGoodsOrderDetail? {
         didSet {
             /// 异常
-            guard let obj = model else {
-                return
-            }
+            guard let obj = model else { return }
             /// 数量范围
             qtyField.maxIntNum = obj.enableqty
             if let vc = self.superController() as? MyUnusedViewController { /// 我的闲置
                 qtyField.minIntNum = vc.myGoods?.lotsize ?? 1
                 qtyField.incrementIntNum = vc.myGoods?.lotsize ?? 1
-                qtyField.currentIntNumbers = vc.myGoods?.lotsize ?? 1
+                qtyField.currentIntNumbers = obj.enableqty
             } else {
                 let lotSize = ((self.superController() as? TradeViewController)?.takeInfo as? MoGoodsInfo)?.lotsize ?? 1
                 qtyField.minIntNum = lotSize
@@ -530,8 +529,8 @@ class TradeCell: BaseTableViewCell<MoHsbyGoodsOrderDetail> {
             if let callBack = block { callBack(obj, isCheck, qtyField.currentIntNumbers) }
             /// 设置交互色
             bgView.backgroundColor = UIColorFromHex(rgbValue: isCheck ? 0xecf3fd : 0xf7f7f7)
-            /// 为空
-            if !isCheck { qtyField.numberField.text = "" }
+            /// 是否可用
+            qtyField.isUserInteractionEnabled = isCheck
         }
     }
     
@@ -551,9 +550,8 @@ class TradeCell: BaseTableViewCell<MoHsbyGoodsOrderDetail> {
 }
 
 extension TradeCell: IBNumberEditTextDelegate {
-    func IBNumberEditText(textField: UITextField) {
-        isCheck = true
-    }
+    /// 不做任何处理
+    func IBNumberEditText(textField: UITextField) {}
     
     func numberInputView(_ numberInputView: IBNumberEditText, _ buttonType: NumberInputViewButtonType) {
         /// 如果大于最大数量 默认设置最大数量

MTP_iOS/MTP2_iOS/UserInterface/Utils/ConfigUtils.swift

@@ -241,13 +241,13 @@ class StringUtils {
         if let value = Value {
             switch value {
             case .APPLYTYPE_OUTMONEY:
-                return "出金"
+                return "提现"
             case .APPLYTYPE_INMONEY:
                 return "入金"
             case .APPLYTYPE_SINGLEINMONEY:
                 return "单边账调整:入金"
             case .APPLYTYPE_SINGLEIOUTMONEY:
-                return "单边账调整:出金"
+                return "单边账调整:提现"
             }
         } else {
             return "--"