xxxxx

MTP_iOS/MTP2_iOS.xcodeproj/project.pbxproj

@@ -2776,7 +2776,7 @@
 				CODE_SIGN_ENTITLEMENTS = MTP2_iOS/BPML.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1110;
+				CURRENT_PROJECT_VERSION = 1120;
 				DEVELOPMENT_TEAM = QF38M2SZT9;
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2800,7 +2800,7 @@
 					"$(PROJECT_DIR)/MTP2_iOS/ThirdParty/WeChat",
 					"$(PROJECT_DIR)/MTP2_iOS/ThirdParty/UMSPosPayOnly",
 				);
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_LDFLAGS = "$(inherited)";
 				OTHER_LIBTOOLFLAGS = "$(inherited)";
@@ -2827,7 +2827,7 @@
 				CODE_SIGN_ENTITLEMENTS = MTP2_iOS/BPML.entitlements;
 				CODE_SIGN_IDENTITY = "Apple Development";
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 1110;
+				CURRENT_PROJECT_VERSION = 1120;
 				DEVELOPMENT_TEAM = QF38M2SZT9;
 				ENABLE_BITCODE = YES;
 				FRAMEWORK_SEARCH_PATHS = (
@@ -2851,7 +2851,7 @@
 					"$(PROJECT_DIR)/MTP2_iOS/ThirdParty/WeChat",
 					"$(PROJECT_DIR)/MTP2_iOS/ThirdParty/UMSPosPayOnly",
 				);
-				MARKETING_VERSION = 1.1.1;
+				MARKETING_VERSION = 1.1.2;
 				ONLY_ACTIVE_ARCH = YES;
 				OTHER_CFLAGS = (
 					"$(inherited)",

MTP_iOS/MTP2_iOS/Resource/PlistFiles/Config.plist

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

MTP_iOS/MTP2_iOS/Resource/Storyboard/Coupon/Coupon.storyboard

@@ -62,7 +62,7 @@
                                                             <rect key="frame" x="0.0" y="0.0" width="404" height="110"/>
                                                         </imageView>
                                                         <stackView opaque="NO" contentMode="scaleToFill" spacing="20" translatesAutoresizingMaskIntoConstraints="NO" id="dmj-SD-I6q">
-                                                            <rect key="frame" x="10" y="10" width="394" height="90"/>
+                                                            <rect key="frame" x="5" y="10" width="399" height="90"/>
                                                             <subviews>
                                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3Si-Te-qbU">
                                                                     <rect key="frame" x="0.0" y="0.0" width="90" height="90"/>
@@ -98,19 +98,19 @@
                                                                     </constraints>
                                                                 </view>
                                                                 <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="8Ro-xO-B46">
-                                                                    <rect key="frame" x="110" y="0.0" width="264" height="90"/>
+                                                                    <rect key="frame" x="110" y="0.0" width="269" height="90"/>
                                                                     <subviews>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="dl5-zQ-pmF">
-                                                                            <rect key="frame" x="0.0" y="0.0" width="264" height="35"/>
+                                                                            <rect key="frame" x="0.0" y="0.0" width="269" height="35"/>
                                                                             <subviews>
                                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="GFQ-PE-fmi">
-                                                                                    <rect key="frame" x="0.0" y="0.0" width="132" height="35"/>
+                                                                                    <rect key="frame" x="0.0" y="0.0" width="134.5" height="35"/>
                                                                                     <fontDescription key="fontDescription" type="system" pointSize="15"/>
                                                                                     <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="kzg-7j-4uc">
-                                                                                    <rect key="frame" x="132" y="0.0" width="132" height="35"/>
+                                                                                    <rect key="frame" x="134.5" y="0.0" width="134.5" height="35"/>
                                                                                     <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"/>
@@ -118,7 +118,7 @@
                                                                             </subviews>
                                                                         </stackView>
                                                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumScaleFactor="0.5" translatesAutoresizingMaskIntoConstraints="NO" id="sAd-38-9E6">
-                                                                            <rect key="frame" x="0.0" y="40" width="264" height="20"/>
+                                                                            <rect key="frame" x="0.0" y="40" width="269" height="20"/>
                                                                             <constraints>
                                                                                 <constraint firstAttribute="height" constant="20" id="ttR-DI-apc"/>
                                                                             </constraints>
@@ -127,16 +127,16 @@
                                                                             <nil key="highlightedColor"/>
                                                                         </label>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3ai-dE-ict">
-                                                                            <rect key="frame" x="0.0" y="65" width="264" height="25"/>
+                                                                            <rect key="frame" x="0.0" y="65" width="269" height="25"/>
                                                                             <subviews>
                                                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="--" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="syK-Bn-EEU">
-                                                                                    <rect key="frame" x="0.0" y="0.0" width="204" height="25"/>
+                                                                                    <rect key="frame" x="0.0" y="0.0" width="209" height="25"/>
                                                                                     <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                                                                     <color key="textColor" red="0.87450980392156863" green="0.34901960784313724" blue="0.34509803921568627" alpha="1" colorSpace="calibratedRGB"/>
                                                                                     <nil key="highlightedColor"/>
                                                                                 </label>
                                                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Sgx-Ja-vRy" customClass="AnimatableButton" customModule="IBAnimatable">
-                                                                                    <rect key="frame" x="204" y="0.0" width="60" height="25"/>
+                                                                                    <rect key="frame" x="209" y="0.0" width="60" height="25"/>
                                                                                     <constraints>
                                                                                         <constraint firstAttribute="width" constant="60" id="LBX-Yd-BnO"/>
                                                                                     </constraints>
@@ -167,7 +167,7 @@
                                                                     </subviews>
                                                                 </stackView>
                                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="UY0-Jy-Bdr" customClass="AnimatableButton" customModule="IBAnimatable">
-                                                                    <rect key="frame" x="394" y="0.0" width="0.0" height="90"/>
+                                                                    <rect key="frame" x="399" y="0.0" width="0.0" height="90"/>
                                                                     <constraints>
                                                                         <constraint firstAttribute="width" id="QE3-2q-8cv"/>
                                                                     </constraints>
@@ -183,7 +183,7 @@
                                                     <constraints>
                                                         <constraint firstItem="dmj-SD-I6q" firstAttribute="top" secondItem="vSJ-jh-4gz" secondAttribute="top" constant="10" id="3u6-9v-sy1"/>
                                                         <constraint firstItem="mLB-dI-a7H" firstAttribute="top" secondItem="vSJ-jh-4gz" secondAttribute="top" id="G46-x5-KG2"/>
-                                                        <constraint firstItem="dmj-SD-I6q" firstAttribute="leading" secondItem="vSJ-jh-4gz" secondAttribute="leading" constant="10" id="G6x-Gv-U1L"/>
+                                                        <constraint firstItem="dmj-SD-I6q" firstAttribute="leading" secondItem="vSJ-jh-4gz" secondAttribute="leading" constant="5" id="G6x-Gv-U1L"/>
                                                         <constraint firstAttribute="bottom" secondItem="dmj-SD-I6q" secondAttribute="bottom" constant="10" id="X7N-9o-qsB"/>
                                                         <constraint firstAttribute="bottom" secondItem="mLB-dI-a7H" secondAttribute="bottom" id="Y54-8D-MQH"/>
                                                         <constraint firstAttribute="trailing" secondItem="dmj-SD-I6q" secondAttribute="trailing" id="ayH-8c-RcO"/>

MTP_iOS/MTP2_iOS/UserInterface/Extension/UIFont+Extension.swift

@@ -24,6 +24,13 @@ extension UIFont {
         }
     }
     
+    /// font_8
+    static var font_8: UIFont {
+        get {
+            return UIFont.systemFont(ofSize: 8)
+        }
+    }
+    
     /// font_13
     static var font_13: UIFont {
         get {

MTP_iOS/MTP2_iOS/UserInterface/Mine/Settings/Signing/View/SelectSignBankTableViewCell.swift

@@ -21,7 +21,7 @@ class SelectSignBankTableViewCell: BaseTableViewCell<SelectSignBankModel> {
         didSet {
             guard let model = model else { return }
             
-            bankNameLabel.text = model.cusbankname 
+            bankNameLabel.text = "中国银联"//model.cusbankname 
             checkImageButton.isSelected = model.isSelected
         }
     }

MTP_iOS/MTP2_iOS/UserInterface/Quote/GoodsDetailViewController.swift

@@ -84,9 +84,9 @@ class GoodsDetailViewController: BaseViewController {
             /// 显示多少列
             self.lineChartView.xRow = 10
             /// 设置X轴坐标字体大小
-            lineChartView.x_Font = .font_10
+            lineChartView.x_Font = .font_8
             /// 设置Y轴坐标字体大小
-            lineChartView.y_Font = .font_10
+            lineChartView.y_Font = .font_8
             /// 设置Y轴坐标字体颜色
             lineChartView.y_Color = UIColorFromHex(rgbValue: 0x4f6a8f)
             /// 设置X轴坐标字体颜色