样式调整完成

GeliBusinessPlatform/Model/OrderManageModel/OrderDetailModel.swift

@@ -286,6 +286,7 @@ class OrderDetailGoodsModel: Mappable {
     var warehouse_inventory : Int?   //商品库存
     var is_edit : Int? = 0   //订单商品是否有修改，1是0非--前端自主添加的字段
     var commission_val:String? //这个商品的总佣金
+    var remark:String?//商品备注
     required init?( map: Map) {
 
     }
@@ -302,6 +303,7 @@ class OrderDetailGoodsModel: Mappable {
         goods_thumb <- map["goods_thumb"]
         warehouse_inventory <- map["warehouse_inventory"]
         is_edit <- map["is_edit"]
+        remark <- map["remark"]
 
     }
 }

GeliBusinessPlatform/View/Cell/XuanZeShangPinCell.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17156" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <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="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="System colors in document resources" minToolsVersion="11.0"/>

GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.swift

@@ -26,12 +26,16 @@ class DaiKeXiaDanGouWuCell: UITableViewCell,UITextViewDelegate {
     @IBOutlet weak var titleLbl: UILabel!
     @IBOutlet weak var diLbl: UILabel!
     
+    @IBOutlet weak var yu_shou_img: UIImageView!
     var isDetail = false{
         didSet{
             if isDetail {
                 bz_lbl.isHidden = false
                 content_tv.isUserInteractionEnabled = false
                 edit_img.isHidden = true
+                delImg.isHidden = true
+                delBtn.isHidden = true
+                holder_lbl.isHidden = true
             }
         }
     }

GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuCell.xib

@@ -12,14 +12,14 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="DaiKeXiaDanGouWuCell" customModule="TestClass" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="375" height="243"/>
+            <rect key="frame" x="0.0" y="0.0" width="375" height="260"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
-                <rect key="frame" x="0.0" y="0.0" width="375" height="243"/>
+                <rect key="frame" x="0.0" y="0.0" width="375" height="260"/>
                 <autoresizingMask key="autoresizingMask"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oAm-E1-HwQ">
-                        <rect key="frame" x="15" y="242" width="360" height="1"/>
+                        <rect key="frame" x="15" y="259" width="360" height="1"/>
                         <color key="backgroundColor" name="灰色分界线"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="1" id="END-QU-37t"/>
@@ -43,6 +43,13 @@
                             </userDefinedRuntimeAttribute>
                         </userDefinedRuntimeAttributes>
                     </imageView>
+                    <imageView hidden="YES" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="yushou" translatesAutoresizingMaskIntoConstraints="NO" id="2zV-nI-93U">
+                        <rect key="frame" x="71" y="20" width="34" height="18"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="34" id="Z6o-wD-gfU"/>
+                            <constraint firstAttribute="height" constant="18" id="oGG-6h-Vzm"/>
+                        </constraints>
+                    </imageView>
                     <button hidden="YES" opaque="NO" alpha="0.5" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="4lb-rz-I6F">
                         <rect key="frame" x="15" y="20" width="90" height="90"/>
                         <color key="backgroundColor" name="标题字颜色"/>
@@ -85,22 +92,8 @@
                         </attributedString>
                         <nil key="highlightedColor"/>
                     </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="¥51153.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rio-TZ-iyo">
-                        <rect key="frame" x="291.5" y="91" width="63.5" height="16"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                        <nil key="textColor"/>
-                        <nil key="highlightedColor"/>
-                    </label>
-                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="¥51153.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JyG-Tf-6Jd">
-                        <rect key="frame" x="291.5" y="70.5" width="63.5" height="18.5"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <fontDescription key="fontDescription" type="system" pointSize="13"/>
-                        <nil key="textColor"/>
-                        <nil key="highlightedColor"/>
-                    </label>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="WMj-FN-Sws">
-                        <rect key="frame" x="15" y="125" width="345" height="102"/>
+                        <rect key="frame" x="15" y="125" width="345" height="119"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="5kg/箱/袋" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LBB-wB-bMd">
                                 <rect key="frame" x="10" y="10" width="49" height="13.5"/>
@@ -109,42 +102,54 @@
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥260.00*12" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="X1B-vl-mvy">
-                                <rect key="frame" x="10" y="33.5" width="61.5" height="13.5"/>
+                                <rect key="frame" x="10" y="59" width="61.5" height="13.5"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                 <color key="textColor" name="灰色字体颜色"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="点击填写备注" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="WVL-NG-HsK">
-                                <rect key="frame" x="38.5" y="62" width="78" height="18.5"/>
+                                <rect key="frame" x="38.5" y="81.5" width="78" height="18.5"/>
                                 <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
                                 <color key="textColor" name="蓝色字体颜色"/>
                                 <nil key="highlightedColor"/>
                             </label>
                             <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="bianji" translatesAutoresizingMaskIntoConstraints="NO" id="Dmd-Un-AkZ">
-                                <rect key="frame" x="10" y="63" width="16" height="16"/>
+                                <rect key="frame" x="10" y="82.5" width="16" height="16"/>
                                 <constraints>
                                     <constraint firstAttribute="width" constant="16" id="MMn-yf-xWV"/>
                                     <constraint firstAttribute="height" constant="16" id="muF-aA-q6u"/>
                                 </constraints>
                             </imageView>
                             <textView clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" textAlignment="natural" translatesAutoresizingMaskIntoConstraints="NO" id="CW3-oD-5Hm">
-                                <rect key="frame" x="36" y="54" width="299" height="42"/>
+                                <rect key="frame" x="36" y="75" width="299" height="36"/>
                                 <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                 <constraints>
-                                    <constraint firstAttribute="height" constant="42" id="sxT-0i-iXD"/>
+                                    <constraint firstAttribute="height" constant="36" id="sxT-0i-iXD"/>
                                 </constraints>
                                 <color key="textColor" name="灰色字体颜色"/>
                                 <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
                                 <textInputTraits key="textInputTraits" autocapitalizationType="sentences"/>
                             </textView>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="数量" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3f3-RV-d16">
-                                <rect key="frame" x="313" y="9" width="22" height="15.5"/>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="备注：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ykh-Oc-5e6">
+                                <rect key="frame" x="10" y="83" width="33" height="15.5"/>
                                 <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
                                 <color key="textColor" name="灰色字体颜色"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="备注：" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ykh-Oc-5e6">
-                                <rect key="frame" x="10" y="63.5" width="33" height="15.5"/>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥51153.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Rio-TZ-iyo">
+                                <rect key="frame" x="283.5" y="33.5" width="51.5" height="15.5"/>
+                                <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
+                                <color key="textColor" name="灰色字体颜色"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label hidden="YES" opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="¥51153.00" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JyG-Tf-6Jd">
+                                <rect key="frame" x="283.5" y="9" width="51.5" height="15.5"/>
+                                <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
+                                <color key="textColor" name="灰色字体颜色"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="数量" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3f3-RV-d16">
+                                <rect key="frame" x="10" y="33.5" width="22" height="15.5"/>
                                 <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="11"/>
                                 <color key="textColor" name="灰色字体颜色"/>
                                 <nil key="highlightedColor"/>
@@ -152,20 +157,24 @@
                         </subviews>
                         <color key="backgroundColor" name="app底色"/>
                         <constraints>
-                            <constraint firstItem="Dmd-Un-AkZ" firstAttribute="top" secondItem="X1B-vl-mvy" secondAttribute="bottom" constant="16" id="5Ig-Ek-Czg"/>
+                            <constraint firstItem="Dmd-Un-AkZ" firstAttribute="top" secondItem="X1B-vl-mvy" secondAttribute="bottom" constant="10" id="5Ig-Ek-Czg"/>
                             <constraint firstAttribute="trailing" secondItem="CW3-oD-5Hm" secondAttribute="trailing" constant="10" id="6vz-aS-Foq"/>
                             <constraint firstItem="CW3-oD-5Hm" firstAttribute="leading" secondItem="Dmd-Un-AkZ" secondAttribute="trailing" constant="10" id="7n2-Vb-3XY"/>
-                            <constraint firstItem="3f3-RV-d16" firstAttribute="centerY" secondItem="LBB-wB-bMd" secondAttribute="centerY" id="CPt-xo-1dx"/>
-                            <constraint firstItem="X1B-vl-mvy" firstAttribute="top" secondItem="LBB-wB-bMd" secondAttribute="bottom" constant="10" id="G0k-U9-DVo"/>
+                            <constraint firstAttribute="trailing" secondItem="JyG-Tf-6Jd" secondAttribute="trailing" constant="10" id="9AX-WF-nFt"/>
+                            <constraint firstItem="X1B-vl-mvy" firstAttribute="top" secondItem="3f3-RV-d16" secondAttribute="bottom" constant="10" id="G0k-U9-DVo"/>
                             <constraint firstItem="LBB-wB-bMd" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="L6M-kd-Qvr"/>
+                            <constraint firstItem="Rio-TZ-iyo" firstAttribute="centerY" secondItem="3f3-RV-d16" secondAttribute="centerY" id="MHT-Tf-HPF"/>
+                            <constraint firstItem="3f3-RV-d16" firstAttribute="top" secondItem="LBB-wB-bMd" secondAttribute="bottom" constant="10" id="RhT-R5-aDU"/>
                             <constraint firstItem="WVL-NG-HsK" firstAttribute="centerY" secondItem="Dmd-Un-AkZ" secondAttribute="centerY" id="VEI-Ck-HWY"/>
-                            <constraint firstAttribute="trailing" secondItem="3f3-RV-d16" secondAttribute="trailing" constant="10" id="W3g-Fe-Gtf"/>
                             <constraint firstItem="LBB-wB-bMd" firstAttribute="top" secondItem="WMj-FN-Sws" secondAttribute="top" constant="10" id="Xri-zi-cci"/>
-                            <constraint firstItem="CW3-oD-5Hm" firstAttribute="centerY" secondItem="Dmd-Un-AkZ" secondAttribute="centerY" constant="4" id="ZiM-2r-dAw"/>
+                            <constraint firstItem="CW3-oD-5Hm" firstAttribute="centerY" secondItem="Dmd-Un-AkZ" secondAttribute="centerY" constant="2.5" id="ZiM-2r-dAw"/>
                             <constraint firstItem="Dmd-Un-AkZ" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="a7j-vt-r1P"/>
                             <constraint firstItem="ykh-Oc-5e6" firstAttribute="centerY" secondItem="Dmd-Un-AkZ" secondAttribute="centerY" id="cCR-3w-9NS"/>
                             <constraint firstItem="ykh-Oc-5e6" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="das-yY-Rxy"/>
+                            <constraint firstItem="JyG-Tf-6Jd" firstAttribute="centerY" secondItem="LBB-wB-bMd" secondAttribute="centerY" id="lKC-hA-bwp"/>
+                            <constraint firstAttribute="trailing" secondItem="Rio-TZ-iyo" secondAttribute="trailing" constant="10" id="qNT-67-znW"/>
                             <constraint firstItem="X1B-vl-mvy" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="rJS-l5-dkz"/>
+                            <constraint firstItem="3f3-RV-d16" firstAttribute="leading" secondItem="WMj-FN-Sws" secondAttribute="leading" constant="10" id="sAa-RD-lf2"/>
                             <constraint firstItem="WVL-NG-HsK" firstAttribute="leading" secondItem="Dmd-Un-AkZ" secondAttribute="trailing" constant="12.5" id="zlW-a1-QVz"/>
                         </constraints>
                         <userDefinedRuntimeAttributes>
@@ -179,8 +188,10 @@
                     <constraint firstItem="WMj-FN-Sws" firstAttribute="top" secondItem="AWX-Qu-0ML" secondAttribute="bottom" constant="15" id="1VP-8b-PTQ"/>
                     <constraint firstItem="oAm-E1-HwQ" firstAttribute="top" secondItem="WMj-FN-Sws" secondAttribute="bottom" constant="15" id="4IR-Qw-Ra4"/>
                     <constraint firstItem="4lb-rz-I6F" firstAttribute="centerY" secondItem="AWX-Qu-0ML" secondAttribute="centerY" id="6mE-8H-dPD"/>
+                    <constraint firstItem="2zV-nI-93U" firstAttribute="trailing" secondItem="AWX-Qu-0ML" secondAttribute="trailing" id="9vT-N9-JOf"/>
                     <constraint firstItem="4lb-rz-I6F" firstAttribute="centerX" secondItem="AWX-Qu-0ML" secondAttribute="centerX" id="DtW-X9-NRk"/>
                     <constraint firstItem="AWX-Qu-0ML" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="20" id="JoA-Ad-gIn"/>
+                    <constraint firstItem="2zV-nI-93U" firstAttribute="top" secondItem="AWX-Qu-0ML" secondAttribute="top" id="L68-da-sK0"/>
                     <constraint firstItem="AWX-Qu-0ML" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="PkW-SQ-lMP"/>
                     <constraint firstItem="ftv-xQ-eXW" firstAttribute="trailing" secondItem="AWX-Qu-0ML" secondAttribute="trailing" constant="7.5" id="R1R-mm-RvM"/>
                     <constraint firstItem="HYf-UQ-mHg" firstAttribute="centerY" secondItem="4lb-rz-I6F" secondAttribute="centerY" id="UmC-Iq-hqN"/>
@@ -215,13 +226,15 @@
                 <outlet property="priceLbl" destination="Rio-TZ-iyo" id="Ivg-2f-C6y"/>
                 <outlet property="titleLbl" destination="HYf-UQ-mHg" id="bMC-Ni-Yjv"/>
                 <outlet property="totalPriceLbl" destination="Rio-TZ-iyo" id="l5M-Ih-fxa"/>
+                <outlet property="yu_shou_img" destination="2zV-nI-93U" id="uFW-s4-KdR"/>
             </connections>
-            <point key="canvasLocation" x="131.15942028985509" y="121.54017857142857"/>
+            <point key="canvasLocation" x="131.15942028985509" y="121.20535714285714"/>
         </tableViewCell>
     </objects>
     <resources>
         <image name="bianji" width="17" height="16.5"/>
         <image name="shanchuDel" width="15" height="15"/>
+        <image name="yushou" width="34" height="18"/>
         <namedColor name="app底色">
             <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>

GeliBusinessPlatform/ViewController/代客下单（购物）/DaiKeXiaDanGouWuViewController.swift

@@ -191,9 +191,11 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
             cell.totalPriceLbl.text = "\(totalP)"
             
             if orderType == 1 {
+                cell.yu_shou_img.isHidden = false
                 cell.diLbl.isHidden = false
+                cell.priceLbl.isHidden = false
                 cell.diLbl.text = "定金:￥" + djTFstr
-                cell.totalPriceLbl.text = "尾款:￥" + wkTFstr
+                cell.priceLbl.text = "尾款:￥" + wkTFstr
                 
             }else {
 //                cell.totalPriceLbl.text = "¥\(priceStr.floatValue * countStr.floatValue)"
@@ -683,7 +685,7 @@ class DaiKeXiaDanGouWuViewController: BaseViewController,UITableViewDataSource,U
     
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         if indexPath.section == 1 {
-            return 243
+            return 260
         }
         if indexPath.section == 2 {//新增预售
             if orderType == 1 {

GeliBusinessPlatform/ViewController/代客下单（购物）/XuanZeShangPinViewController.swift

@@ -16,6 +16,7 @@ protocol XuanZeShangPinViewControllerDelegate {
 
 class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,XuanZeShangPinCellDelegate,UISearchBarDelegate,SearchBarViewDelegate,UITextFieldDelegate{
     
+    @IBOutlet weak var holder_view: UIView!
     var isCG = false
     var searchV : SearchBarView? = nil
     var delegate:XuanZeShangPinViewControllerDelegate?
@@ -137,7 +138,14 @@ class XuanZeShangPinViewController: BaseViewController,UITableViewDelegate,UITab
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
         getGoodsInfo(["user_token":UserToken,"is_adsale":is_adsale], success: { (data) in
             let model = data as! GetGoodsInfoModel
-            self.datas = model.data!
+            self.datas.removeAll()
+            model.data?.forEach({ (item) in
+                self.datas.append(item)
+            })
+            self.holder_view.isHidden = true
+            if self.datas.count == 0 {
+                self.holder_view.isHidden = false
+            }
             self.listView.reloadData()
             self.listView.mj_header?.endRefreshing()
         }) { (error) in

GeliBusinessPlatform/ViewController/代客下单（购物）/XuanZeShangPinViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="15702" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
+        <deployment identifier="iOS"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="XuanZeShangPinViewController" customModule="TestClass" customModuleProvider="target">
             <connections>
                 <outlet property="btmLbl" destination="5Kt-Ig-zbb" id="fUx-No-8SV"/>
+                <outlet property="holder_view" destination="AEM-4K-zbv" id="epb-Yg-uhP"/>
                 <outlet property="listView" destination="YuT-X7-ecw" id="wKf-Ej-i9r"/>
                 <outlet property="topView" destination="czv-6x-Jkg" id="kMR-43-Prh"/>
                 <outlet property="view" destination="i5M-Pr-FkT" id="sfx-zR-JGt"/>
@@ -23,7 +26,7 @@
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="IB6-lV-KWZ" customClass="LGButton" customModule="LGButton">
                     <rect key="frame" x="0.0" y="813" width="414" height="83"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
                             <color key="value" name="按钮渐变色上"/>
@@ -48,7 +51,7 @@
                 </label>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="YuT-X7-ecw">
                     <rect key="frame" x="0.0" y="88" width="414" height="725"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <connections>
                         <outlet property="dataSource" destination="-1" id="pf9-cD-hFe"/>
                         <outlet property="delegate" destination="-1" id="kFX-d5-Tz7"/>
@@ -56,12 +59,38 @@
                 </tableView>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="czv-6x-Jkg">
                     <rect key="frame" x="0.0" y="44" width="414" height="44"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstAttribute="height" constant="44" id="SDE-Q6-JnV"/>
                     </constraints>
                 </view>
+                <view hidden="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="AEM-4K-zbv">
+                    <rect key="frame" x="0.0" y="88" width="414" height="725"/>
+                    <subviews>
+                        <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="无数据1" translatesAutoresizingMaskIntoConstraints="NO" id="5Kv-xH-Rx8">
+                            <rect key="frame" x="106" y="150" width="202" height="152"/>
+                            <constraints>
+                                <constraint firstAttribute="height" constant="152" id="R3g-Xy-uej"/>
+                                <constraint firstAttribute="width" constant="202" id="abR-Gx-WGv"/>
+                            </constraints>
+                        </imageView>
+                        <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="当前列表暂无数据" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="FmY-FE-2Ik">
+                            <rect key="frame" x="155" y="317" width="104" height="18.5"/>
+                            <fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
+                            <color key="textColor" name="灰色字体颜色"/>
+                            <nil key="highlightedColor"/>
+                        </label>
                     </subviews>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
+                    <constraints>
+                        <constraint firstItem="5Kv-xH-Rx8" firstAttribute="centerX" secondItem="AEM-4K-zbv" secondAttribute="centerX" id="6ro-KB-rxq"/>
+                        <constraint firstItem="5Kv-xH-Rx8" firstAttribute="top" secondItem="AEM-4K-zbv" secondAttribute="top" constant="150" id="Izo-YB-wX7"/>
+                        <constraint firstItem="FmY-FE-2Ik" firstAttribute="centerX" secondItem="AEM-4K-zbv" secondAttribute="centerX" id="JIm-LM-uS9"/>
+                        <constraint firstItem="FmY-FE-2Ik" firstAttribute="top" secondItem="5Kv-xH-Rx8" secondAttribute="bottom" constant="15" id="Rt5-eX-JoN"/>
+                    </constraints>
+                </view>
+            </subviews>
+            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <color key="backgroundColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
                 <constraint firstItem="YuT-X7-ecw" firstAttribute="top" secondItem="czv-6x-Jkg" secondAttribute="bottom" id="70Q-Qt-Cgd"/>
@@ -70,8 +99,12 @@
                 <constraint firstItem="IB6-lV-KWZ" firstAttribute="top" secondItem="5Kt-Ig-zbb" secondAttribute="top" id="Bw1-yn-w9z"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="czv-6x-Jkg" secondAttribute="trailing" id="CVu-Ly-yEo"/>
                 <constraint firstItem="YuT-X7-ecw" firstAttribute="trailing" secondItem="fnl-2z-Ty3" secondAttribute="trailing" id="CeF-wt-3Pe"/>
+                <constraint firstItem="AEM-4K-zbv" firstAttribute="bottom" secondItem="YuT-X7-ecw" secondAttribute="bottom" id="K8e-5t-r0J"/>
                 <constraint firstItem="5Kt-Ig-zbb" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="Zxi-kb-DhB"/>
+                <constraint firstItem="AEM-4K-zbv" firstAttribute="trailing" secondItem="YuT-X7-ecw" secondAttribute="trailing" id="aMR-Kj-YSg"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="bottom" secondItem="5Kt-Ig-zbb" secondAttribute="bottom" id="aeg-df-E1I"/>
+                <constraint firstItem="AEM-4K-zbv" firstAttribute="top" secondItem="YuT-X7-ecw" secondAttribute="top" id="c0l-Bd-LKb"/>
+                <constraint firstItem="AEM-4K-zbv" firstAttribute="leading" secondItem="YuT-X7-ecw" secondAttribute="leading" id="eGN-fV-AnM"/>
                 <constraint firstItem="YuT-X7-ecw" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="eRL-ku-YjT"/>
                 <constraint firstItem="IB6-lV-KWZ" firstAttribute="top" secondItem="YuT-X7-ecw" secondAttribute="bottom" id="oo2-zd-D8w"/>
                 <constraint firstAttribute="trailing" secondItem="IB6-lV-KWZ" secondAttribute="trailing" id="v8D-Yo-QxM"/>
@@ -79,19 +112,30 @@
                 <constraint firstItem="czv-6x-Jkg" firstAttribute="top" secondItem="fnl-2z-Ty3" secondAttribute="top" id="xab-I0-cj9"/>
                 <constraint firstItem="czv-6x-Jkg" firstAttribute="leading" secondItem="fnl-2z-Ty3" secondAttribute="leading" id="y1o-em-TkH"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <point key="canvasLocation" x="131.8840579710145" y="121.875"/>
         </view>
     </objects>
+    <designables>
+        <designable name="IB6-lV-KWZ">
+            <size key="intrinsicContentSize" width="10" height="10"/>
+        </designable>
+    </designables>
     <resources>
+        <image name="无数据1" width="205" height="154.5"/>
         <namedColor name="按钮渐变色上">
             <color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
         <namedColor name="按钮渐变色下,字体颜色">
             <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <namedColor name="灰色字体颜色">
+            <color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
         <namedColor name="白色背景色">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/新增采购单/XinCaiGouViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="17701" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina6_1" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17703"/>
         <capability name="Named colors" minToolsVersion="9.0"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="System colors in document resources" minToolsVersion="11.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -24,7 +25,7 @@
             <subviews>
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1yh-oh-zJe" customClass="LGButton" customModule="LGButton">
                     <rect key="frame" x="0.0" y="813" width="414" height="83"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <userDefinedRuntimeAttributes>
                         <userDefinedRuntimeAttribute type="boolean" keyPath="gradientHorizontal" value="YES"/>
                         <userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
@@ -56,14 +57,15 @@
                 </view>
                 <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="grouped" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="Cs6-iU-pYN">
                     <rect key="frame" x="0.0" y="44" width="414" height="768"/>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <connections>
                         <outlet property="dataSource" destination="-1" id="4d1-os-XKU"/>
                         <outlet property="delegate" destination="-1" id="juZ-cO-vTy"/>
                     </connections>
                 </tableView>
             </subviews>
-            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
+            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
             <constraints>
                 <constraint firstAttribute="bottom" secondItem="1yh-oh-zJe" secondAttribute="bottom" id="6tb-Es-vOW"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="Cs6-iU-pYN" secondAttribute="trailing" id="7d6-BN-QIg"/>
@@ -80,10 +82,14 @@
                 <constraint firstAttribute="trailing" secondItem="cSW-1R-48s" secondAttribute="trailing" id="wzu-wi-iLA"/>
                 <constraint firstItem="fnl-2z-Ty3" firstAttribute="trailing" secondItem="0WX-TF-5sE" secondAttribute="trailing" id="z4Z-Wl-qhJ"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <point key="canvasLocation" x="131.8840579710145" y="91.741071428571431"/>
         </view>
     </objects>
+    <designables>
+        <designable name="1yh-oh-zJe">
+            <size key="intrinsicContentSize" width="10" height="10"/>
+        </designable>
+    </designables>
     <resources>
         <namedColor name="按钮渐变色上">
             <color red="0.3880000114440918" green="0.62400001287460327" blue="0.90200001001358032" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -97,5 +103,8 @@
         <namedColor name="白色背景色">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/订单详情/OrderDViewController.swift

@@ -187,7 +187,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
         listView.separatorStyle = .none
         listView.register(UINib(nibName: "TitleAndBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndBtnCell")
         listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
-        listView.register(UINib(nibName: "XuanZeShangPinCell", bundle: nil), forCellReuseIdentifier: "XuanZeShangPinCell")
+        listView.register(UINib(nibName: "DaiKeXiaDanGouWuCell", bundle: nil), forCellReuseIdentifier: "DaiKeXiaDanGouWuCell")
         listView.register(UINib(nibName: "PingLunCell", bundle: nil), forCellReuseIdentifier: "PingLunCell")
         
         listView.register(UINib(nibName: "GLKHCell", bundle: nil), forCellReuseIdentifier: "GLKHCell")
@@ -429,29 +429,32 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
             return cell
         case 1:
             //MARK:--商品cell
-            let cell = tableView.dequeueReusableCell(withIdentifier: "XuanZeShangPinCell") as! XuanZeShangPinCell
-            cell.priceLbl.isHidden = false
-            cell.selectBtn.isHidden = true
-            if isYuShou {
-                cell.yuShouImg.isHidden = false
-            }
-            if indexPath.row == 1 {
-                cell.lineView.isHidden = true
-            }
+            let cell = tableView.dequeueReusableCell(withIdentifier: "DaiKeXiaDanGouWuCell") as! DaiKeXiaDanGouWuCell
+//            cell.priceLbl.isHidden = false
+            cell.isDetail = true
+//            cell.selectBtn.isHidden = true
             
-            let rowModel = self.dataMdoel?.order_goods![indexPath.row]
-            cell.iconImg?.sd_setImage(with: URL(string: SERVERCE_ImageHost + (rowModel?.goods_thumb)!))
 
-            cell.nameLbl.text = rowModel?.goods_name
-            if rowModel?.goods_attr != nil {
-                cell.detailLbl.text =   (rowModel?.goods_attr)!
             
+            let rowModel = self.dataMdoel?.order_goods![indexPath.row]
+            cell.imgView?.sd_setImage(with: URL(string: SERVERCE_ImageHost + (rowModel?.goods_thumb)!))
+            cell.content_tv.text = rowModel?.remark
+            cell.titleLbl.text = rowModel?.goods_name
+            if rowModel?.goods_attr != nil {
+                cell.detailLbl.text =  "规格:" + (rowModel?.goods_attr)!
             }else{
-                cell.detailLbl.text = "-"
+                cell.detailLbl.text = "规格:-"
+            }
+            if isYuShou {
+                cell.diLbl.isHidden = false
+                cell.priceLbl.isHidden = false
+                cell.yu_shou_img.isHidden = false
+                cell.diLbl.text = "定金:￥" + (self.dataMdoel?.order_res?.sale_res?.dj_amount)!
+                cell.priceLbl.text = "尾款:￥" + (self.dataMdoel?.order_res?.sale_res?.wk_amount)!
             }
             
-            cell.priceLbl.text = "￥" + (self.dataMdoel?.order_res?.goods_amount)!
-            cell.detailLbl2.text = "x" + StringByInt(number: (rowModel?.cart_number!)!)
+            cell.count_lbl.text = "数量:" + StringByInt(number: (rowModel?.cart_number!)!)
+            cell.detailLbl2.text = "小计:￥" + (self.dataMdoel?.order_res?.goods_amount)!
             
             return cell
         case 2:
@@ -1135,7 +1138,7 @@ class OrderDViewController: BaseViewController,UITableViewDelegate,UITableViewDa
     func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
         switch indexPath.section {
         case 1://商品展示heightrow
-            return 120
+            return 260
         case 4://发票信息heightrow
             if segmentIndex == 0 {
                 return 180