xxxxxxxx

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

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

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

@@ -145,20 +145,20 @@
                                                             <stackView opaque="NO" contentMode="scaleToFill" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="1Oa-hl-UOt">
                                                                 <rect key="frame" x="0.0" y="235" width="414" height="80"/>
                                                                 <subviews>
-                                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Wve-8p-kfe">
+                                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="nqU-2g-IZy">
                                                                         <rect key="frame" x="0.0" y="0.0" width="83" height="80"/>
                                                                         <subviews>
-                                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yal-Oz-CVd">
+                                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RiS-Ge-ug5">
                                                                                 <rect key="frame" x="0.0" y="0.0" width="83" height="55"/>
-                                                                                <state key="normal" image="home_hot"/>
+                                                                                <state key="normal" image="home_xkqg"/>
                                                                                 <connections>
-                                                                                    <action selector="onButtonPressed:" destination="9T1-s3-NT8" eventType="touchUpInside" id="hqY-4N-rlM"/>
+                                                                                    <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="JGB-8G-898">
+                                                                            <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="5Rx-Pd-fds"/>
+                                                                                    <constraint firstAttribute="height" constant="25" id="waR-2r-bLt"/>
                                                                                 </constraints>
                                                                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                                 <color key="textColor" red="0.1019607843" green="0.10980392160000001" blue="0.1647058824" alpha="1" colorSpace="calibratedRGB"/>
@@ -166,20 +166,20 @@
                                                                             </label>
                                                                         </subviews>
                                                                     </stackView>
-                                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="nqU-2g-IZy">
+                                                                    <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="Wve-8p-kfe">
                                                                         <rect key="frame" x="83" y="0.0" width="82.5" height="80"/>
                                                                         <subviews>
-                                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="RiS-Ge-ug5">
+                                                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Yal-Oz-CVd">
                                                                                 <rect key="frame" x="0.0" y="0.0" width="82.5" height="55"/>
-                                                                                <state key="normal" image="home_xkqg"/>
+                                                                                <state key="normal" image="home_hot"/>
                                                                                 <connections>
-                                                                                    <action selector="onButtonPressed:" destination="9T1-s3-NT8" eventType="touchUpInside" id="4fI-Gg-fbT"/>
+                                                                                    <action selector="onButtonPressed:" destination="9T1-s3-NT8" eventType="touchUpInside" id="hqY-4N-rlM"/>
                                                                                 </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="JGB-8G-898">
                                                                                 <rect key="frame" x="0.0" y="55" width="82.5" height="25"/>
                                                                                 <constraints>
-                                                                                    <constraint firstAttribute="height" constant="25" id="waR-2r-bLt"/>
+                                                                                    <constraint firstAttribute="height" constant="25" id="5Rx-Pd-fds"/>
                                                                                 </constraints>
                                                                                 <fontDescription key="fontDescription" type="system" pointSize="12"/>
                                                                                 <color key="textColor" red="0.1019607843" green="0.10980392160000001" blue="0.1647058824" alpha="1" colorSpace="calibratedRGB"/>
@@ -514,7 +514,7 @@
         <image name="home_order" width="57" height="57"/>
         <image name="home_packet" width="57" height="57"/>
         <image name="home_top_bg" width="414" height="185"/>
-        <image name="home_xkqg" width="57" height="57"/>
+        <image name="home_xkqg" width="50" height="50"/>
         <image name="placeholder_image" width="70" height="63"/>
         <image name="police" width="95" height="67"/>
         <image name="search" width="21" height="21"/>

MTP_iOS/MTP2_iOS/Resource/Storyboard/Order/Order.storyboard

@@ -12,7 +12,7 @@
         <!--Base Navigation Controller-->
         <scene sceneID="dqw-PC-Muy">
             <objects>
-                <navigationController storyboardIdentifier="OrderNav" interfaceStyle="dark" id="WGl-BJ-Qs3" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="OrderNav" id="WGl-BJ-Qs3" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="Ycf-xZ-5pn">
                         <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -109,12 +109,13 @@
                                                                                 <stackView opaque="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="YbX-JC-hL3">
                                                                                     <rect key="frame" x="0.0" y="0.0" width="280" height="64"/>
                                                                                     <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="5Dk-Wd-Og9">
+                                                                                        <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" scrollEnabled="NO" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" editable="NO" text="--" textAlignment="natural" selectable="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3qG-eZ-Bzp">
                                                                                             <rect key="frame" x="0.0" y="0.0" width="200" height="64"/>
-                                                                                            <fontDescription key="fontDescription" type="system" pointSize="14"/>
+                                                                                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                                                             <color key="textColor" red="0.20000000000000001" green="0.20000000000000001" blue="0.20000000000000001" alpha="1" colorSpace="calibratedRGB"/>
-                                                                                            <nil key="highlightedColor"/>
-                                                                                        </label>
+                                                                                            <fontDescription key="fontDescription" type="system" pointSize="20"/>
+                                                                                            <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
+                                                                                        </textView>
                                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" distribution="fillEqually" translatesAutoresizingMaskIntoConstraints="NO" id="Ldg-V4-46w">
                                                                                             <rect key="frame" x="200" y="0.0" width="80" height="64"/>
                                                                                             <subviews>
@@ -222,12 +223,21 @@
                                                                 </stackView>
                                                             </subviews>
                                                         </stackView>
+                                                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="good_jingpin" translatesAutoresizingMaskIntoConstraints="NO" id="dE2-Xs-Xbv">
+                                                            <rect key="frame" x="114" y="66" width="30" height="20"/>
+                                                            <constraints>
+                                                                <constraint firstAttribute="width" constant="30" id="Pmz-1y-Sbe"/>
+                                                                <constraint firstAttribute="height" constant="20" id="bbi-E6-0j2"/>
+                                                            </constraints>
+                                                        </imageView>
                                                     </subviews>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                     <constraints>
+                                                        <constraint firstItem="dE2-Xs-Xbv" firstAttribute="top" secondItem="3qG-eZ-Bzp" secondAttribute="top" constant="10" id="8VT-7l-j4W"/>
                                                         <constraint firstItem="BN7-Sz-mW2" firstAttribute="top" secondItem="RHl-Ey-reZ" secondAttribute="top" constant="10" id="Oxb-0W-wJ2"/>
                                                         <constraint firstAttribute="bottom" secondItem="BN7-Sz-mW2" secondAttribute="bottom" constant="10" id="fo5-GT-AMT"/>
                                                         <constraint firstItem="BN7-Sz-mW2" firstAttribute="leading" secondItem="RHl-Ey-reZ" secondAttribute="leading" constant="10" id="iJ3-bE-kgr"/>
+                                                        <constraint firstItem="dE2-Xs-Xbv" firstAttribute="leading" secondItem="3qG-eZ-Bzp" secondAttribute="leading" id="lAp-PG-LU3"/>
                                                         <constraint firstAttribute="trailing" secondItem="BN7-Sz-mW2" secondAttribute="trailing" constant="10" id="mLq-O0-UMQ"/>
                                                     </constraints>
                                                     <userDefinedRuntimeAttributes>
@@ -261,14 +271,15 @@
                                             <outlet property="amount" destination="uYr-bq-V9J" id="sSM-OI-ye5"/>
                                             <outlet property="cancel" destination="VRE-m7-NNd" id="xet-sM-jFA"/>
                                             <outlet property="company" destination="kfT-zc-ltd" id="AMi-9j-RZq"/>
+                                            <outlet property="flag" destination="dE2-Xs-Xbv" id="yzv-U3-uEq"/>
                                             <outlet property="goodsImage" destination="dIG-2C-qDf" id="RQH-JN-u9e"/>
+                                            <outlet property="goodsName" destination="3qG-eZ-Bzp" id="lcg-6A-LIv"/>
                                             <outlet property="orderNo" destination="tUM-oM-bWn" id="eYs-Dm-zQd"/>
                                             <outlet property="pay" destination="1Pp-9k-xUh" id="A8r-4f-dOt"/>
                                             <outlet property="price" destination="OI6-BT-fqH" id="zvS-ZM-T2f"/>
                                             <outlet property="qty" destination="yof-8V-rXa" id="j8n-w2-Afo"/>
                                             <outlet property="stackView" destination="J2u-w1-Qec" id="lG6-DS-LMo"/>
                                             <outlet property="status" destination="gyy-qS-JmD" id="eUw-ug-A8m"/>
-                                            <outlet property="title" destination="5Dk-Wd-Og9" id="ObR-bC-e9K"/>
                                         </connections>
                                     </tableViewCell>
                                 </prototypes>
@@ -1138,6 +1149,7 @@
     </designables>
     <resources>
         <image name="button_red" width="390" height="55"/>
+        <image name="good_jingpin" width="31" height="16"/>
         <image name="payment_check" width="17" height="17"/>
         <image name="payment_wechat" width="28" height="28"/>
         <image name="placeholder_image" width="70" height="63"/>

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 ? 0 : 1)
+                quoteController.segmentedView.defaultSelectedIndex = (sender == self.rmzq ? 1 : 0)
                 quoteController.segmentedView.reloadData()
-                quoteController.segmentedView.delegate?.segmentedView(quoteController.segmentedView, didSelectedItemAt: sender == self.rmzq ? 0 : 1)
+                quoteController.segmentedView.delegate?.segmentedView(quoteController.segmentedView, didSelectedItemAt: sender == self.rmzq ? 1 : 0)
             }
         case hbzx:    /// 海拔资讯
             let auth = UIStoryboard(name: "Settings", bundle: nil).instantiateViewController(withIdentifier: "Auth") as! AuthAddressViewController

MTP_iOS/MTP2_iOS/UserInterface/Order/OrderViewController.swift

@@ -13,6 +13,12 @@ import SDWebImage
 import GTMRefresh
 import IBAnimatable
 
+var style: NSMutableParagraphStyle = {
+    $0.firstLineHeadIndent = 30.0
+    $0.lineHeightMultiple = 1.2
+    return $0
+} (NSMutableParagraphStyle())
+
 /// 我的订单视图容器控制类
 class OrderViewController: BaseViewController {
     
@@ -385,12 +391,14 @@ class OrderCell: BaseTableViewCell<MoHsbyMyBuyOrderDetails> {
     @IBOutlet weak var orderNo: UILabel!
     /// 商品图片
     @IBOutlet weak var goodsImage: UIImageView!
+    /// 商品类型
+    @IBOutlet weak var flag: UIImageView!
     /// 价格
     @IBOutlet weak var price: UILabel!
     /// 金额
     @IBOutlet weak var amount: UILabel!
     /// 标题
-    @IBOutlet weak var title: UILabel!
+    @IBOutlet weak var goodsName: UITextView!
     /// 数量
     @IBOutlet weak var qty: UILabel!
     /// 撤销
@@ -408,9 +416,11 @@ class OrderCell: BaseTableViewCell<MoHsbyMyBuyOrderDetails> {
             /// 单号
             orderNo.text = obj.goodscode
             /// 商品名称
-            title.text = obj.goodsname
+            goodsName.attributedText = obj.goodsname.withParagraphStyle(style).withTextColor(UIColorFromHex(rgbValue: 0x333333)).withFont(.font_14)
             /// 供应商名称
             company.text = model?.trademode == .TRADEMODE_TRADEMODE_CPTRADE_LS ? obj.vendorname1 : obj.vendorname2
+            /// 标识
+            flag.image = UIImage(named: obj.marketid == 70202 ? "good_jingpin" : "good_hot")
             
             if let payOrder = obj as? MoMyPayOrders { /// 待付款
                 /// 状态