代码提交；

MTP_iOS/MTP2_iOS/BusinessCore/Goods/GoodsManager.swift

@@ -217,6 +217,20 @@ class GoodsManager: BaseManager {
         return ids
     }
     
+    /// - Parameter trademode: 交易模式
+    /// - Returns: marketID
+    func getGoodsGroupInfos(_ trademode: ETradeMode = .TRADEMODE_LISTING_SELECT) -> [(name: String, marketid: Int)] {
+        if let _ = MTP2BusinessCore.shared.accountManager?.loginRsp { /// 未登录
+            return goodsGroupInfos?.filter({$0.tradeMode == trademode}).map({ (obj) -> (name: String, marketid: Int) in
+                return (name: obj.marketName, marketid: obj.marketID)
+            }) ?? []
+        } else {
+            return hsbyMarkets?.filter({$0.trademode == trademode}).map({ (obj) -> (name: String, marketid: Int) in
+                return (name: obj.marketname, marketid: obj.marketid)
+            }) ?? []
+        }
+    }
+    
     /// 获取对应商品组数据信息
     /// - Returns: [String]
     func getGoodsGroupNames() -> [String] {

MTP_iOS/MTP2_iOS/Resource/PlistFiles/Address/LYB_171.plist

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

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

@@ -376,7 +376,6 @@
                                                                                                 <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
                                                                                                     <color key="value" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/>
                                                                                                 </userDefinedRuntimeAttribute>
-                                                                                                <userDefinedRuntimeAttribute type="string" keyPath="_animationType" value="scale"/>
                                                                                                 <userDefinedRuntimeAttribute type="number" keyPath="duration">
                                                                                                     <real key="value" value="0.5"/>
                                                                                                 </userDefinedRuntimeAttribute>

MTP_iOS/MTP2_iOS/Resource/Storyboard/Main/Main.storyboard

@@ -288,9 +288,6 @@
                                     <constraint firstItem="C6l-Yh-wsc" firstAttribute="top" secondItem="SyR-az-t8K" secondAttribute="top" constant="60" id="roy-wD-3Nk"/>
                                     <constraint firstItem="h13-7b-6qK" firstAttribute="trailing" secondItem="GHT-3Z-yFe" secondAttribute="trailing" id="tlb-fa-a5y"/>
                                 </constraints>
-                                <userDefinedRuntimeAttributes>
-                                    <userDefinedRuntimeAttribute type="string" keyPath="_animationType" value="pop"/>
-                                </userDefinedRuntimeAttributes>
                             </view>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="N6I-Qo-bbL">
                                 <rect key="frame" x="308" y="872" width="100" height="25"/>

MTP_iOS/MTP2_iOS/Resource/Storyboard/Message/Message.storyboard

@@ -306,7 +306,7 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" translatesAutoresizingMaskIntoConstraints="NO" id="muo-Qv-nvI">
                                         <rect key="frame" x="0.0" y="0.0" width="387" height="55"/>
                                         <subviews>
-                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="dgl-VR-W0a">
+                                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" numberOfLines="2" baselineAdjustment="alignBaselines" minimumFontSize="14" translatesAutoresizingMaskIntoConstraints="NO" id="dgl-VR-W0a">
                                                 <rect key="frame" x="0.0" y="0.0" width="387" height="35"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="35" id="w3V-In-IJm"/>

MTP_iOS/MTP2_iOS/Resource/Storyboard/Quote/Quote.storyboard

@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="whO-0g-9Vi">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="whO-0g-9Vi">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17125"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="Stack View standard spacing" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>
@@ -14,7 +14,7 @@
         <!--Base Navigation Controller-->
         <scene sceneID="WQ2-uy-UMe">
             <objects>
-                <navigationController storyboardIdentifier="Quote" navigationBarHidden="YES" id="whO-0g-9Vi" customClass="BaseNavigationController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="Quote" navigationBarHidden="YES" id="whO-0g-9Vi" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <nil key="simulatedTopBarMetrics"/>
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="mVJ-l0-gsb">
                         <autoresizingMask key="autoresizingMask"/>
@@ -34,7 +34,7 @@
         <!--商品-->
         <scene sceneID="RNx-k1-yNM">
             <objects>
-                <viewController storyboardIdentifier="QuoteID" title="商品" id="xeO-3J-Mt1" customClass="QuoteViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="QuoteID" title="商品" id="xeO-3J-Mt1" customClass="QuoteViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="EjB-rc-Htp">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -123,7 +123,7 @@
         <!--热卖商品-->
         <scene sceneID="z3N-RR-iXf">
             <objects>
-                <viewController storyboardIdentifier="HotQuote" title="热卖商品" id="6Ds-Av-TML" customClass="HotQuoteViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="HotQuote" title="热卖商品" id="6Ds-Av-TML" customClass="HotQuoteViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="52A-rl-jfg">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -184,7 +184,7 @@
                                     <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                 </collectionViewFlowLayout>
                                 <cells>
-                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="Goods_Cell" id="Jcg-Gl-ICh" customClass="GoodsCell" customModule="BPML" customModuleProvider="target">
+                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="Goods_Cell" id="Jcg-Gl-ICh" customClass="GoodsCell" customModule="LYB" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="0.0" width="180" height="240"/>
                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                         <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="Z1H-3B-IzZ">
@@ -316,7 +316,7 @@
         <!--商品检索-->
         <scene sceneID="zJa-JA-lj0">
             <objects>
-                <viewController storyboardIdentifier="Search" title="商品检索" id="jmY-sS-fDN" customClass="SearchViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="Search" title="商品检索" id="jmY-sS-fDN" customClass="SearchViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="1LV-76-Zt9">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -361,7 +361,7 @@
                                                     <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                                 </collectionViewFlowLayout>
                                                 <cells>
-                                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="HisSearchGoods_Cell" id="p2r-mC-UYh" customClass="SearchCell" customModule="BPML" customModuleProvider="target">
+                                                    <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="HisSearchGoods_Cell" id="p2r-mC-UYh" customClass="SearchCell" customModule="LYB" customModuleProvider="target">
                                                         <rect key="frame" x="0.0" y="0.0" width="128" height="128"/>
                                                         <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                         <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="EFf-9P-AiM">
@@ -485,7 +485,7 @@
         <!--新品上市-->
         <scene sceneID="HuN-Kf-c1S">
             <objects>
-                <viewController storyboardIdentifier="NewQuote" title="新品上市" id="4rx-6d-Erv" customClass="NewQuoteViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="NewQuote" title="新品上市" id="4rx-6d-Erv" customClass="NewQuoteViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="1WD-GE-BJc">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -543,7 +543,7 @@
                                         <rect key="frame" x="0.0" y="45" width="414" height="773"/>
                                         <color key="backgroundColor" red="0.96470588235294119" green="0.96470588235294119" blue="0.96470588235294119" alpha="1" colorSpace="calibratedRGB"/>
                                         <prototypes>
-                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Goods_Cell" rowHeight="230" id="e5s-gb-556" customClass="QuoteCell" customModule="BPML" customModuleProvider="target">
+                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Goods_Cell" rowHeight="230" id="e5s-gb-556" customClass="QuoteCell" customModule="LYB" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="28" width="414" height="230"/>
                                                 <autoresizingMask key="autoresizingMask"/>
                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="e5s-gb-556" id="fp2-Fr-ztj">
@@ -713,7 +713,6 @@
                                                                 <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
                                                                     <real key="value" value="10"/>
                                                                 </userDefinedRuntimeAttribute>
-                                                                <userDefinedRuntimeAttribute type="string" keyPath="_animationType" value="pop"/>
                                                             </userDefinedRuntimeAttributes>
                                                         </view>
                                                     </subviews>
@@ -780,7 +779,7 @@
         <!--详情-->
         <scene sceneID="atJ-ad-eId">
             <objects>
-                <viewController storyboardIdentifier="GoodsDetail" title="详情" id="thl-zW-mFS" customClass="GoodsDetailViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="GoodsDetail" title="详情" id="thl-zW-mFS" customClass="GoodsDetailViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="5dz-IU-8Sc">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1175,7 +1174,7 @@
         <!--客服-->
         <scene sceneID="mGc-iL-nCg">
             <objects>
-                <viewController storyboardIdentifier="Customer" title="客服" id="Lzr-Ea-coQ" customClass="CustomerViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="Customer" title="客服" id="Lzr-Ea-coQ" customClass="CustomerViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="7Hh-4s-QFJ">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1355,7 +1354,7 @@
         <!--Base Navigation Controller-->
         <scene sceneID="GAM-KY-PS1">
             <objects>
-                <navigationController storyboardIdentifier="TradeNav" id="c9Z-gE-3dp" customClass="BaseNavigationController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="TradeNav" id="c9Z-gE-3dp" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" id="tfq-w2-WSy">
                         <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -1375,7 +1374,7 @@
         <!--购买-->
         <scene sceneID="B76-sf-29M">
             <objects>
-                <viewController storyboardIdentifier="Trade" title="购买" id="k8w-j5-9u5" customClass="TradeViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="Trade" title="购买" id="k8w-j5-9u5" customClass="TradeViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="WkP-DT-rJ8">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1511,7 +1510,7 @@
                                                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.84705882349999995" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
-                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="saf-mT-RHu" customClass="IBNumberEditText" customModule="BPML" customModuleProvider="target">
+                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="saf-mT-RHu" customClass="IBNumberEditText" customModule="LYB" customModuleProvider="target">
                                                                                 <rect key="frame" x="80" y="0.0" width="294" height="35"/>
                                                                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                                             </view>
@@ -1563,7 +1562,7 @@
                                                                                 <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="0.84705882349999995" colorSpace="calibratedRGB"/>
                                                                                 <nil key="highlightedColor"/>
                                                                             </label>
-                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="byr-19-SUp" customClass="IBNumberEditText" customModule="BPML" customModuleProvider="target">
+                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="byr-19-SUp" customClass="IBNumberEditText" customModule="LYB" customModuleProvider="target">
                                                                                 <rect key="frame" x="80" y="0.0" width="294" height="35"/>
                                                                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                                             </view>
@@ -1677,7 +1676,7 @@
                                                         </constraints>
                                                         <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                                         <prototypes>
-                                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Trade_Cell" rowHeight="50" id="abC-Xl-Y7N" customClass="TradeCell" customModule="BPML" customModuleProvider="target">
+                                                            <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Trade_Cell" rowHeight="50" id="abC-Xl-Y7N" customClass="TradeCell" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="0.0" y="28" width="394" height="50"/>
                                                                 <autoresizingMask key="autoresizingMask"/>
                                                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="abC-Xl-Y7N" id="gvd-lu-Dr5">
@@ -1727,7 +1726,7 @@
                                                                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                                                                             <nil key="highlightedColor"/>
                                                                                         </label>
-                                                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cwr-sL-tbr" customClass="IBNumberEditText" customModule="BPML" customModuleProvider="target">
+                                                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="cwr-sL-tbr" customClass="IBNumberEditText" customModule="LYB" customModuleProvider="target">
                                                                                             <rect key="frame" x="230" y="0.0" width="154" height="35"/>
                                                                                             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                                         </view>
@@ -1877,7 +1876,7 @@
         <!--我的闲置-->
         <scene sceneID="7NR-T0-n0L">
             <objects>
-                <viewController storyboardIdentifier="MyUnused" title="我的闲置" hidesBottomBarWhenPushed="YES" id="l7l-N6-iC8" customClass="MyUnusedViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="MyUnused" title="我的闲置" hidesBottomBarWhenPushed="YES" id="l7l-N6-iC8" customClass="MyUnusedViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="ZQl-jq-Xnc">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -1943,7 +1942,7 @@
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="fBy-Dd-G3g">
                                                                         <rect key="frame" x="80" y="0.0" width="294" height="60"/>
                                                                         <subviews>
-                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zCB-hc-Xjy" customClass="IBNumberEditText" customModule="BPML" customModuleProvider="target">
+                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="zCB-hc-Xjy" customClass="IBNumberEditText" customModule="LYB" customModuleProvider="target">
                                                                                 <rect key="frame" x="0.0" y="0.0" width="294" height="35"/>
                                                                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                                                 <constraints>
@@ -1985,7 +1984,7 @@
                                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="AYb-sQ-tX3">
                                                                         <rect key="frame" x="80" y="0.0" width="294" height="60"/>
                                                                         <subviews>
-                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EbG-Cf-rNC" customClass="IBNumberEditText" customModule="BPML" customModuleProvider="target">
+                                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="EbG-Cf-rNC" customClass="IBNumberEditText" customModule="LYB" customModuleProvider="target">
                                                                                 <rect key="frame" x="0.0" y="0.0" width="294" height="35"/>
                                                                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                                                 <constraints>
@@ -2132,7 +2131,7 @@
                                                                 </constraints>
                                                                 <inset key="separatorInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                                                 <prototypes>
-                                                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Trade_Cell" rowHeight="50" id="A3U-8F-sLe" customClass="TradeCell" customModule="BPML" customModuleProvider="target">
+                                                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="Trade_Cell" rowHeight="50" id="A3U-8F-sLe" customClass="TradeCell" customModule="LYB" customModuleProvider="target">
                                                                         <rect key="frame" x="0.0" y="28" width="374" height="50"/>
                                                                         <autoresizingMask key="autoresizingMask"/>
                                                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="A3U-8F-sLe" id="rfg-km-Sbg">
@@ -2182,7 +2181,7 @@
                                                                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
                                                                                                     <nil key="highlightedColor"/>
                                                                                                 </label>
-                                                                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mvx-0W-aHS" customClass="IBNumberEditText" customModule="BPML" customModuleProvider="target">
+                                                                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="mvx-0W-aHS" customClass="IBNumberEditText" customModule="LYB" customModuleProvider="target">
                                                                                                     <rect key="frame" x="230" y="0.0" width="134" height="35"/>
                                                                                                 </view>
                                                                                             </subviews>
@@ -2297,14 +2296,14 @@
                                                     <constraint firstAttribute="height" constant="300" id="hyM-Jx-pbk"/>
                                                 </constraints>
                                                 <prototypes>
-                                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SellMyDetail_Cell" rowHeight="211" id="saA-gT-SIu" customClass="SellMyDetailCell" customModule="BPML" customModuleProvider="target">
+                                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="SellMyDetail_Cell" rowHeight="211" id="saA-gT-SIu" customClass="SellMyDetailCell" customModule="LYB" customModuleProvider="target">
                                                         <rect key="frame" x="0.0" y="28" width="414" height="211"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="saA-gT-SIu" id="4LU-f0-wyP">
                                                             <rect key="frame" x="0.0" y="0.0" width="414" height="211"/>
                                                             <autoresizingMask key="autoresizingMask"/>
                                                             <subviews>
-                                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9wn-4p-ap3" customClass="IBView" customModule="BPML" customModuleProvider="target">
+                                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="9wn-4p-ap3" customClass="IBView" customModule="LYB" customModuleProvider="target">
                                                                     <rect key="frame" x="5" y="5" width="404" height="196"/>
                                                                     <subviews>
                                                                         <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="fdU-6k-UN2">
@@ -2573,7 +2572,7 @@
         <!--订单详情-->
         <scene sceneID="LKQ-iI-Y6I">
             <objects>
-                <viewController title="订单详情" id="x1E-0s-6ib" customClass="MyUnusedDetailViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController title="订单详情" id="x1E-0s-6ib" customClass="MyUnusedDetailViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="8FH-bc-ir9">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -2779,7 +2778,7 @@
                                                     </userDefinedRuntimeAttributes>
                                                 </view>
                                                 <prototypes>
-                                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="MyUnusedDetail_Cell" rowHeight="180" id="dUB-ui-h9R" customClass="MyUnusedDetailCell" customModule="BPML" customModuleProvider="target">
+                                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="MyUnusedDetail_Cell" rowHeight="180" id="dUB-ui-h9R" customClass="MyUnusedDetailCell" customModule="LYB" customModuleProvider="target">
                                                         <rect key="frame" x="0.0" y="63" width="394" height="180"/>
                                                         <autoresizingMask key="autoresizingMask"/>
                                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="dUB-ui-h9R" id="1BJ-PS-bYz">
@@ -3023,7 +3022,7 @@
         <!--我的商品-->
         <scene sceneID="sQN-bl-4zd">
             <objects>
-                <viewController storyboardIdentifier="MyGoods" id="smL-UT-y3M" customClass="MyGoodsViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="MyGoods" id="smL-UT-y3M" customClass="MyGoodsViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="o4b-jW-NgZ">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -3039,7 +3038,7 @@
                                     <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                 </view>
                                 <prototypes>
-                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="MyOrders_Cell" rowHeight="115" id="m3N-Gb-KAb" customClass="MyOrdersCell" customModule="BPML" customModuleProvider="target">
+                                    <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" insetsLayoutMarginsFromSafeArea="NO" selectionStyle="none" hidesAccessoryWhenEditing="NO" indentationLevel="1" indentationWidth="0.0" reuseIdentifier="MyOrders_Cell" rowHeight="115" id="m3N-Gb-KAb" customClass="MyOrdersCell" customModule="LYB" customModuleProvider="target">
                                         <rect key="frame" x="0.0" y="28" width="414" height="115"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" tableViewCell="m3N-Gb-KAb" id="Gwg-v5-ogb">
@@ -3187,7 +3186,7 @@
         <!--Base Navigation Controller-->
         <scene sceneID="EZR-i8-yJQ">
             <objects>
-                <navigationController storyboardIdentifier="PaymentOrderNav" id="dAd-MB-T2h" customClass="BaseNavigationController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <navigationController storyboardIdentifier="PaymentOrderNav" id="dAd-MB-T2h" customClass="BaseNavigationController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <navigationBar key="navigationBar" contentMode="scaleToFill" id="DGy-ha-bXe">
                         <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                         <autoresizingMask key="autoresizingMask"/>
@@ -3207,7 +3206,7 @@
         <!--一级购买-->
         <scene sceneID="QdG-pg-hyS">
             <objects>
-                <viewController storyboardIdentifier="PreTrade" title="一级购买" id="3Vv-1r-ntY" customClass="PreTradeViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="PreTrade" title="一级购买" id="3Vv-1r-ntY" customClass="PreTradeViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="LyR-CC-CmG">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -3226,7 +3225,7 @@
                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="10" translatesAutoresizingMaskIntoConstraints="NO" id="Tua-YK-f7n">
                                         <rect key="frame" x="20" y="5" width="374" height="243"/>
                                         <subviews>
-                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PU0-zz-CFN" customClass="IBButton" customModule="BPML" customModuleProvider="target">
+                                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="right" contentVerticalAlignment="center" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="PU0-zz-CFN" customClass="IBButton" customModule="LYB" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="374" height="35"/>
                                                 <constraints>
                                                     <constraint firstAttribute="height" constant="35" id="20l-Jy-RtJ"/>
@@ -3281,7 +3280,7 @@
                                                     <stackView opaque="NO" contentMode="scaleToFill" axis="vertical" spacing="5" translatesAutoresizingMaskIntoConstraints="NO" id="Ore-Sp-JGL">
                                                         <rect key="frame" x="100" y="0.0" width="274" height="60"/>
                                                         <subviews>
-                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e1X-Dk-cai" customClass="IBNumberEditText" customModule="BPML" customModuleProvider="target">
+                                                            <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="e1X-Dk-cai" customClass="IBNumberEditText" customModule="LYB" customModuleProvider="target">
                                                                 <rect key="frame" x="0.0" y="0.0" width="274" height="35"/>
                                                                 <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                                 <constraints>
@@ -3419,7 +3418,7 @@
         <!--填写订单-->
         <scene sceneID="eIm-sh-lg3">
             <objects>
-                <viewController storyboardIdentifier="PaymentOrder" title="填写订单" id="y7x-J9-iac" customClass="PaymentOrderViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="PaymentOrder" title="填写订单" id="y7x-J9-iac" customClass="PaymentOrderViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="PIw-3V-Wyp">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -3582,7 +3581,7 @@
                                                                                         <color key="textColor" red="0.46274509800000002" green="0.76078431369999999" blue="0.86666666670000003" alpha="1" colorSpace="calibratedRGB"/>
                                                                                         <nil key="highlightedColor"/>
                                                                                     </label>
-                                                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PHK-co-MMG" customClass="IBNumberEditText" customModule="BPML" customModuleProvider="target">
+                                                                                    <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="PHK-co-MMG" customClass="IBNumberEditText" customModule="LYB" customModuleProvider="target">
                                                                                         <rect key="frame" x="100" y="0.0" width="155" height="35"/>
                                                                                         <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                                                                                         <constraints>
@@ -3961,7 +3960,7 @@
         <!--特卖商品-->
         <scene sceneID="czl-NY-ROh">
             <objects>
-                <viewController storyboardIdentifier="SpecialSale" title="特卖商品" id="Tug-eX-v6j" customClass="SpecialSaleViewController" customModule="BPML" customModuleProvider="target" sceneMemberID="viewController">
+                <viewController storyboardIdentifier="SpecialSale" title="特卖商品" id="Tug-eX-v6j" customClass="SpecialSaleViewController" customModule="LYB" customModuleProvider="target" sceneMemberID="viewController">
                     <view key="view" contentMode="scaleToFill" id="IFh-Po-jbq">
                         <rect key="frame" x="0.0" y="0.0" width="414" height="896"/>
                         <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
@@ -3979,7 +3978,7 @@
                                             <inset key="sectionInset" minX="0.0" minY="0.0" maxX="0.0" maxY="0.0"/>
                                         </collectionViewFlowLayout>
                                         <cells>
-                                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="SpecialGoods_Cell" id="kt2-K3-BX3" customClass="SpecialGoodsCell" customModule="BPML" customModuleProvider="target">
+                                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="SpecialGoods_Cell" id="kt2-K3-BX3" customClass="SpecialGoodsCell" customModule="LYB" customModuleProvider="target">
                                                 <rect key="frame" x="0.0" y="0.0" width="180" height="260"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                                 <collectionViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" insetsLayoutMarginsFromSafeArea="NO" id="dWw-gt-FwF" customClass="AnimatableView" customModule="IBAnimatable">
@@ -4074,7 +4073,6 @@
                                                                 <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
                                                                     <color key="value" red="0.93333333333333335" green="0.93333333333333335" blue="0.93333333333333335" alpha="1" colorSpace="calibratedRGB"/>
                                                                 </userDefinedRuntimeAttribute>
-                                                                <userDefinedRuntimeAttribute type="string" keyPath="_animationType" value="scale"/>
                                                                 <userDefinedRuntimeAttribute type="number" keyPath="duration">
                                                                     <real key="value" value="0.5"/>
                                                                 </userDefinedRuntimeAttribute>
@@ -4182,7 +4180,7 @@
         </designable>
     </designables>
     <inferredMetricsTieBreakers>
-        <segue reference="I73-RN-t4a"/>
+        <segue reference="8nM-Zz-2oE"/>
     </inferredMetricsTieBreakers>
     <resources>
         <image name="back" width="32" height="32"/>

MTP_iOS/MTP2_iOS/UserInterface/Category/CategoryViewController.swift

@@ -141,7 +141,9 @@ extension CategoryViewController: UICollectionViewDelegate, UICollectionViewData
     func collectionView(_ collectionView: UICollectionView, didSelectItemAt indexPath: IndexPath) {
         let specialSaleController = viewController(name: "Quote", identifier: "SpecialSale") as! SpecialSaleViewController
         specialSaleController.category = childs[indexPath.item]
+        specialSaleController.marketid = MTP2BusinessCore.shared.goodsManager?.getMarketIDs(.TRADEMODE_TRADEMODE_HSBY_SHOP)
         self.navigationController?.pushViewController(specialSaleController, animated: true)
+        specialSaleController.initData()
     }
     
     func collectionView(_ collectionView: UICollectionView, layout collectionViewLayout: UICollectionViewLayout, sizeForItemAt indexPath: IndexPath) -> CGSize {
@@ -168,7 +170,9 @@ extension CategoryViewController: UITableViewDelegate, UITableViewDataSource {
         if category.subCategory.count == 0 {
             let specialSaleController = viewController(name: "Quote", identifier: "SpecialSale") as! SpecialSaleViewController
             specialSaleController.category = category
+            specialSaleController.marketid = MTP2BusinessCore.shared.goodsManager?.getMarketIDs(.TRADEMODE_TRADEMODE_HSBY_SHOP)
             self.navigationController?.pushViewController(specialSaleController, animated: true)
+            specialSaleController.initData()
         } else {
             /// 进行刷选
             childs = category.subCategory

MTP_iOS/MTP2_iOS/UserInterface/Coupon/CouponViewController.swift

@@ -180,7 +180,9 @@ extension CouponViewController: UITableViewDelegate, UITableViewDataSource {
         cell.usedBlock = { (_ coupon: MoMyCouponHold?) in
             let specialSaleController = self.viewController(name: "Quote", identifier: "SpecialSale") as! SpecialSaleViewController
             specialSaleController.couponHold = coupon
+            specialSaleController.marketid = "\(coupon?.marketid ?? 0)"
             self.navigationController?.pushViewController(specialSaleController, animated: true)
+            specialSaleController.initData()
         }
         cell.model = coupons[indexPath.row]
         return cell

MTP_iOS/MTP2_iOS/UserInterface/Home/HomeViewController.swift

@@ -307,12 +307,12 @@ class HomeViewController: BaseViewController {
             }
         }
         
-        /// 获取热门商品
-        group.enter()
-        goodsManager.requestQueryTopGoods(goodsManager.getMarketIDs(.TRADEMODE_LISTING_SELECT), nil, nil) { (isComplete, error, topGoods) in
-            hotGoods.append(contentsOf: topGoods ?? [])
-            group.leave()
-        }
+//        /// 获取热门商品
+//        group.enter()
+//        goodsManager.requestQueryTopGoods(goodsManager.getMarketIDs(.TRADEMODE_LISTING_SELECT), nil, nil) { (isComplete, error, topGoods) in
+//            hotGoods.append(contentsOf: topGoods ?? [])
+//            group.leave()
+//        }
         
         /// 发送请求
         group.enter()

MTP_iOS/MTP2_iOS/UserInterface/Quote/QuoteViewController.swift

@@ -42,11 +42,18 @@ class QuoteViewController: BaseViewController {
         return $0
     } (JXSegmentedTitleDataSource())
     
-    /// 热卖商品视图
-    lazy var hotQuoteController: HotQuoteViewController = {
-        $0.view.frame = contentStackView.bounds
-        return $0
-    } (UIStoryboard(name: "Quote", bundle: nil).instantiateViewController(withIdentifier: "HotQuote") as! HotQuoteViewController)
+    /// 市场信息
+    var markets: [(name: String, marketid: Int)] {
+        get {
+            return MTP2BusinessCore.shared.goodsManager?.getGoodsGroupInfos(.TRADEMODE_TRADEMODE_HSBY_SHOP) ?? []
+        }
+    }
+    
+//    /// 热卖商品视图
+//    lazy var hotQuoteController: HotQuoteViewController = {
+//        $0.view.frame = contentStackView.bounds
+//        return $0
+//    } (UIStoryboard(name: "Quote", bundle: nil).instantiateViewController(withIdentifier: "HotQuote") as! HotQuoteViewController)
     
 //    /// 新品上市视图
 //    lazy var newQuoteController: NewQuoteViewController = {
@@ -81,17 +88,32 @@ class QuoteViewController: BaseViewController {
     
     override func viewWillAppear(_ animated: Bool) {
         super.viewWillAppear(animated)
+        
         /// 刷新数据
-        dataSource.titles = ["热卖商品", "竞价商品"]
+        dataSource.titles = markets.map({ (obj) -> String in
+            return obj.name
+        })
         segmentedView.reloadData()
         /// 隐藏导航栏
         self.navigationController?.setNavigationBarHidden(true, animated: true)
+        
+        if markets.count != 0 {
+            /// 特卖商城
+            specialSaleController.marketid = "\(markets[0].marketid)"
+            self.addChild(specialSaleController)
+            specialSaleController.didMove(toParent: self)
+            contentStackView.addArrangedSubview(specialSaleController.view)
+            /// 请求数据
+            specialSaleController.initData()
+        }
     }
     
     // MARK: - 初始化
     /// UI界面显示
     fileprivate func buildView() {
-        showController(selectedIndex: 0)
+//        showController(selectedIndex: 0)
+//        /// 市场ID
+//        specialSaleController.marketid = markets[0].marketid
     }
     
     // MARK: - 交互相关
@@ -110,29 +132,29 @@ class QuoteViewController: BaseViewController {
     /// Tab也切换时显示的容器
     /// - Parameter index: index
     fileprivate func showController(selectedIndex index: Int) {
-        switch index {
-        case 0: /// 热卖商品
-            /// 移出新品上市视图
-            removeChildren(hotQuoteController)
-//            /// 移出新品上市视图
-//            removeChildren(newQuoteController)
-            /// 添加特卖商城视图
-            addChildren(specialSaleController)
-//        case 1:
-//            /// 移出新品上市视图
-//            removeChildren(hotQuoteController)
-//            /// 移出新品上市视图
-//            removeChildren(specialSaleController)
+//        switch index {
+//        case 0: /// 热卖商品
+////            /// 移出新品上市视图
+////            removeChildren(hotQuoteController)
+////            /// 移出新品上市视图
+////            removeChildren(newQuoteController)
 //            /// 添加特卖商城视图
-//            addChildren(newQuoteController)
-        default: /// 竞价商品
+////            addChildren(specialSaleController)
+////        case 1:
+////            /// 移出新品上市视图
+////            removeChildren(hotQuoteController)
+////            /// 移出新品上市视图
+////            removeChildren(specialSaleController)
+////            /// 添加特卖商城视图
+////            addChildren(newQuoteController)
+//        default: /// 竞价商品
+////            /// 移出新品上市视图
+////            removeChildren(newQuoteController)
 //            /// 移出新品上市视图
-//            removeChildren(newQuoteController)
-            /// 移出新品上市视图
-            removeChildren(specialSaleController)
-            /// 添加特卖商城视图
-            addChildren(hotQuoteController)
-        }
+//            removeChildren(specialSaleController)
+////            /// 添加特卖商城视图
+////            addChildren(hotQuoteController)
+//        }
     }
     
     /// addChildren
@@ -167,9 +189,13 @@ class QuoteViewController: BaseViewController {
 extension QuoteViewController: JXSegmentedViewDelegate {
     
     func segmentedView(_ segmentedView: JXSegmentedView, didSelectedItemAt index: Int) {
-        /// 显示相应的视图
-        self.showController(selectedIndex: index)
-        /// 隐藏分类按钮
-        self.category.isHidden = !(index == 0)
+//        /// 显示相应的视图
+//        self.showController(selectedIndex: index)
+        /// 市场ID
+        specialSaleController.marketid = "\(markets[index].marketid)"
+        /// 请求数据
+        specialSaleController.initData()
+//        /// 隐藏分类按钮
+//        self.category.isHidden = !(index == 0)
     }
 }

MTP_iOS/MTP2_iOS/UserInterface/Quote/SpecialSaleViewController.swift

@@ -78,6 +78,8 @@ class SpecialSaleViewController: BaseViewController {
             self.navigationItem.title = "特卖商城"
         }
     }
+    /// 市场ID
+    var marketid: String?
 
     // MARK: - 生命周期
     override func viewDidLoad() {
@@ -97,20 +99,9 @@ class SpecialSaleViewController: BaseViewController {
         }
     }
     
-    override func didMove(toParent parent: UIViewController?) {
-        super.didMove(toParent: parent)
-        
-        if let _ = parent {
-            /// 数据初始化
-            initData()
-        } else {
-            noDataButton.isHidden = true
-        }
-    }
-    
     // MARK: - 数据初始化
     /// 数据初始化
-    fileprivate func initData() {
+    func initData() {
         if MTP2BusinessCore.shared.getLoginStatus() {
             if let obj = category {
                 /// 获取该类目下的商品数据
@@ -170,7 +161,7 @@ class SpecialSaleViewController: BaseViewController {
         /// startAnimating
         self._anim?.startAnimating()
         /// 发送请求
-        goodsManager.requestQueryHsbyMarketGoodses(goodsManager.getMarketIDs(.TRADEMODE_TRADEMODE_HSBY_SHOP), accountID, categoryID, goodsid?.description, couponTypeID) { (isComplete, error, goodses) in
+        goodsManager.requestQueryHsbyMarketGoodses(marketid ?? "", accountID, categoryID, goodsid?.description, couponTypeID) { (isComplete, error, goodses) in
             DispatchQueue.main.async {
                 /// stopAnimating
                 self._anim?.stopAnimating()
@@ -201,7 +192,7 @@ class SpecialSaleViewController: BaseViewController {
         /// startAnimating
         self._anim?.startAnimating()
         /// 发送请求
-        goodsManager.requestQueryHsbyVisitorMarketGoodses(goodsManager.getMarketIDs(.TRADEMODE_TRADEMODE_HSBY_SHOP), categoryID, goodsid?.description, couponTypeID) { (isComplete, error, goodses) in
+        goodsManager.requestQueryHsbyVisitorMarketGoodses(marketid ?? "", categoryID, goodsid?.description, couponTypeID) { (isComplete, error, goodses) in
             DispatchQueue.main.async {
                 /// stopAnimating
                 self._anim?.stopAnimating()

MTP_iOS/MTP2_iOS/UserInterface/Search/SearchViewController.swift

@@ -38,7 +38,7 @@ class SearchViewController: BaseViewController {
         $0.delegate = self
         $0.showsCancelButton = false
         $0.tintColor = .white
-        $0.placeholder = "请输入商品名称或者代码"
+        $0.placeholder = "请输入商品名称或者编号"
         return $0
     }(UISearchBar())
     
@@ -176,7 +176,9 @@ extension SearchViewController: UITableViewDelegate, UITableViewDataSource {
         if goods.trademode == .TRADEMODE_TRADEMODE_HSBY_SHOP {
             let specialSaleController = viewController(name: "Quote", identifier: "SpecialSale") as! SpecialSaleViewController
             specialSaleController.goodsid = goods.goodsid
+            specialSaleController.marketid = "\(goods.marketid)"
             self.navigationController?.pushViewController(specialSaleController, animated: true)
+            specialSaleController.initData()
         } else {
             let goodsDetailController = UIStoryboard(name: "Quote", bundle: nil).instantiateViewController(withIdentifier: "GoodsDetail") as! GoodsDetailViewController
             goodsDetailController.model = goods