xxxxx

MTP_iOS/MTP2_iOS/Resource/Storyboard/Home/Home.storyboard

@@ -13,7 +13,7 @@
         <!--Base Navigation Controller-->
         <scene sceneID="TgR-Fw-VwH">
             <objects>
-                <navigationController storyboardIdentifier="Home" interfaceStyle="dark" navigationBarHidden="YES" id="WE7-qu-AR4" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="Home" interfaceStyle="light" navigationBarHidden="YES" id="WE7-qu-AR4" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <nil key="simulatedTopBarMetrics"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="OYc-ho-eEG">
                         <autoresizingMask key="autoresizingMask"/>
@@ -33,7 +33,7 @@
         <!--首页-->
         <scene sceneID="unj-4I-ADf">
             <objects>
-                <viewController storyboardIdentifier="HomeID" title="首页" interfaceStyle="dark" id="9T1-s3-NT8" customClass="HomeViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="HomeID" title="首页" interfaceStyle="light" id="9T1-s3-NT8" customClass="HomeViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="Wqc-lq-i2v">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -93,7 +93,7 @@
                                                 </constraints>
                                             </stackView>
                                             <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="1UL-DK-R34">
-                                                <rect key="frame" x="0.0" y="116" width="414" height="672"/>
+                                                <rect key="frame" x="0.0" y="116" width="414" height="813"/>
                                                 <subviews>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="sGC-WG-D0B">
                                                         <rect key="frame" x="0.0" y="0.0" width="414" height="320"/>
@@ -155,7 +155,7 @@
                                                                                     <action selector="onButtonPressed:" destination="9T1-s3-NT8" eventType="touchUpInside" id="4fI-Gg-fbT"/>
                                                                                 </connections>
                                                                             </button>
-                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="精品商城" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nDu-gN-RRN">
+                                                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="精品套餐" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nDu-gN-RRN">
                                                                                 <rect key="frame" x="0.0" y="55" width="83" height="25"/>
                                                                                 <constraints>
                                                                                     <constraint firstAttribute="height" constant="25" id="waR-2r-bLt"/>
@@ -269,14 +269,62 @@
                                                         </constraints>
                                                     </view>
                                                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mu5-kK-e4Y">
-                                                        <rect key="frame" x="0.0" y="325" width="414" height="7"/>
+                                                        <rect key="frame" x="0.0" y="325" width="414" height="3"/>
                                                         <color key="backgroundColor" red="0.96470588235294119" green="0.96470588235294119" blue="0.97254901960784312" alpha="1" colorSpace="calibratedRGB"/>
                                                         <constraints>
-                                                            <constraint firstAttribute="height" constant="7" id="327-DP-7qQ"/>
+                                                            <constraint firstAttribute="height" constant="3" id="327-DP-7qQ"/>
+                                                        </constraints>
+                                                    </view>
+                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uyD-zQ-1sb">
+                                                        <rect key="frame" x="0.0" y="333" width="414" height="140"/>
+                                                        <subviews>
+                                                            <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="mKv-YC-BN3">
+                                                                <rect key="frame" x="12" y="10" width="390" height="120"/>
+                                                                <subviews>
+                                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GxW-mf-IGn" customClass="AnimatableView" customModule="IBAnimatable">
+                                                                        <rect key="frame" x="0.0" y="0.0" width="190" height="120"/>
+                                                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                                        <userDefinedRuntimeAttributes>
+                                                                            <userDefinedRuntimeAttribute type="color" keyPath="startColor">
+                                                                                <color key="value" red="0.98039215686274506" green="0.82352941176470584" blue="0.45490196078431372" alpha="1" colorSpace="calibratedRGB"/>
+                                                                            </userDefinedRuntimeAttribute>
+                                                                            <userDefinedRuntimeAttribute type="color" keyPath="endColor">
+                                                                                <color key="value" red="0.97647058823529409" green="0.68627450980392157" blue="0.47058823529411764" alpha="1" colorSpace="calibratedRGB"/>
+                                                                            </userDefinedRuntimeAttribute>
+                                                                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                                                <real key="value" value="5"/>
+                                                                            </userDefinedRuntimeAttribute>
+                                                                        </userDefinedRuntimeAttributes>
+                                                                    </view>
+                                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Ayo-UP-GEo" customClass="AnimatableView" customModule="IBAnimatable">
+                                                                        <rect key="frame" x="200" y="0.0" width="190" height="120"/>
+                                                                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                                                                        <userDefinedRuntimeAttributes>
+                                                                            <userDefinedRuntimeAttribute type="color" keyPath="endColor">
+                                                                                <color key="value" red="0.69411764705882351" green="0.58431372549019611" blue="0.97254901960784312" alpha="1" colorSpace="calibratedRGB"/>
+                                                                            </userDefinedRuntimeAttribute>
+                                                                            <userDefinedRuntimeAttribute type="color" keyPath="startColor">
+                                                                                <color key="value" red="0.5490196078431373" green="0.47450980392156861" blue="1" alpha="1" colorSpace="calibratedRGB"/>
+                                                                            </userDefinedRuntimeAttribute>
+                                                                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                                                                <real key="value" value="5"/>
+                                                                            </userDefinedRuntimeAttribute>
+                                                                        </userDefinedRuntimeAttributes>
+                                                                    </view>
+                                                                </subviews>
+                                                            </stackView>
+                                                        </subviews>
+                                                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                        <constraints>
+                                                            <constraint firstItem="mKv-YC-BN3" firstAttribute="top" secondItem="uyD-zQ-1sb" secondAttribute="top" constant="10" id="01B-2O-10d"/>
+                                                            <constraint firstItem="mKv-YC-BN3" firstAttribute="leading" secondItem="uyD-zQ-1sb" secondAttribute="leading" constant="12" id="BoC-GF-bdU"/>
+                                                            <constraint firstAttribute="height" constant="140" id="GMZ-NU-D6U"/>
+                                                            <constraint firstAttribute="bottom" secondItem="mKv-YC-BN3" secondAttribute="bottom" constant="10" id="ni8-YW-Zle"/>
+                                                            <constraint firstAttribute="trailing" secondItem="mKv-YC-BN3" secondAttribute="trailing" constant="12" id="tdl-9u-n9K"/>
                                                         </constraints>
                                                     </view>
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="WjU-T4-NwZ">
-                                                        <rect key="frame" x="0.0" y="337" width="414" height="335"/>
+                                                        <rect key="frame" x="0.0" y="478" width="414" height="335"/>
                                                         <subviews>
                                                             <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="wgU-vX-pvU">
                                                                 <rect key="frame" x="0.0" y="0.0" width="414" height="40"/>
@@ -284,7 +332,7 @@
                                                                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="热门推荐" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="qza-be-h4q">
                                                                         <rect key="frame" x="12" y="0.0" width="69.5" height="40"/>
                                                                         <fontDescription key="fontDescription" type="boldSystem" pointSize="17"/>
-                                                                        <color key="textColor" red="0.37647058823529411" green="0.63137254901960782" blue="0.8901960784313725" alpha="1" colorSpace="calibratedRGB"/>
+                                                                        <color key="textColor" red="0.26666666666666666" green="0.26666666666666666" blue="0.26666666666666666" alpha="1" colorSpace="calibratedRGB"/>
                                                                         <nil key="highlightedColor"/>
                                                                     </label>
                                                                 </subviews>

MTP_iOS/MTP2_iOS/UserInterface/Home/HomeViewController.swift

@@ -252,9 +252,9 @@ class HomeViewController: BaseViewController {
             main.selectedIndex = 1
             DispatchQueue.main.asyncAfter(deadline: DispatchTime.now()+0.4) {
                 /// 选中
-                quoteController.segmentedView.defaultSelectedIndex = (sender == self.rmzq ? 1 : 0)
+                quoteController.segmentedView.defaultSelectedIndex = (sender == self.rmzq ? 0 : 1)
                 quoteController.segmentedView.reloadData()
-                quoteController.segmentedView.delegate?.segmentedView(quoteController.segmentedView, didSelectedItemAt: sender == self.rmzq ? 1 : 0)
+                quoteController.segmentedView.delegate?.segmentedView(quoteController.segmentedView, didSelectedItemAt: sender == self.rmzq ? 0 : 1)
             }
         case hbzx:    /// 海拔资讯
             let auth = UIStoryboard(name: "Settings", bundle: nil).instantiateViewController(withIdentifier: "Auth") as! AuthAddressViewController

MTP_iOS/MTP2_iOS/UserInterface/Order/MyGoodsViewController.swift

@@ -103,7 +103,6 @@ class MyGoodsViewController: BaseViewController {
         // Pass the selected object to the new view controller.
     }
     */
-
 }
 
 // MARK: - 初始化相关