修复货拉拉载重显示bug

GeliBusinessPlatform/Define/Define.swift

@@ -27,10 +27,10 @@ let systemVersion = (UIDevice.current.systemVersion as String)
 
 //接口地址
 //test
-let SERVERCE_ImageHost = "https://z.gelifood.com/"
-let SERVERCE_HOST = "https://z.gelifood.com/admin/"
-//let SERVERCE_ImageHost = "https://zx.gelifood.com/"
-//let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
+//let SERVERCE_ImageHost = "https://z.gelifood.com/"
+//let SERVERCE_HOST = "https://z.gelifood.com/admin/"
+let SERVERCE_ImageHost = "https://zx.gelifood.com/"
+let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
 ////online
 
 //视图常量

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.xib

 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097.3" 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_5" 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>
@@ -36,7 +37,7 @@
                     <subviews>
                         <view userInteractionEnabled="NO" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ZUK-IF-BZm" customClass="LGButton" customModule="LGButton">
                             <rect key="frame" x="304" y="0.0" width="110" height="83"/>
-                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="110" id="R3Z-3O-X71"/>
                             </constraints>
@@ -51,7 +52,7 @@
                             </userDefinedRuntimeAttributes>
                         </view>
                     </subviews>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstAttribute="bottom" secondItem="ZUK-IF-BZm" secondAttribute="bottom" id="CJ7-E2-2YM"/>
                         <constraint firstItem="ZUK-IF-BZm" firstAttribute="top" secondItem="9me-3I-LYC" secondAttribute="top" id="CP2-qv-V9a"/>
@@ -63,7 +64,7 @@
                     <subviews>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="00z-eF-Akb" customClass="LGButton" customModule="LGButton">
                             <rect key="frame" x="304" y="0.0" width="110" height="49"/>
-                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="110" id="nhu-c8-Mft">
                                     <userDefinedRuntimeAttributes>
@@ -144,7 +145,7 @@
                             </constraints>
                         </imageView>
                     </subviews>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstItem="Dlt-Q6-zeB" firstAttribute="centerY" secondItem="zlN-AZ-k0b" secondAttribute="centerY" id="0mb-ln-xHt"/>
                         <constraint firstItem="Jke-gH-KJE" firstAttribute="centerY" secondItem="Dlt-Q6-zeB" secondAttribute="centerY" id="1Df-UX-cff"/>
@@ -185,7 +186,7 @@
                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="3NL-zo-jTU">
                     <rect key="frame" x="0.0" y="44" width="414" height="44"/>
                     <subviews>
-                        <button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="86G-oA-9TP">
+                        <button opaque="NO" contentMode="scaleToFill" selected="YES" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="86G-oA-9TP">
                             <rect key="frame" x="0.0" y="0.0" width="207" height="44"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -199,7 +200,7 @@
                                 <action selector="selectAction:" destination="-1" eventType="touchUpInside" id="qVz-i0-w67"/>
                             </connections>
                         </button>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="X6m-t6-gdl">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="X6m-t6-gdl">
                             <rect key="frame" x="207" y="0.0" width="207" height="44"/>
                             <fontDescription key="fontDescription" type="system" pointSize="13"/>
                             <color key="tintColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
@@ -221,7 +222,7 @@
                             </constraints>
                         </view>
                     </subviews>
-                    <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                    <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                     <constraints>
                         <constraint firstItem="wjp-2Y-o2i" firstAttribute="width" secondItem="86G-oA-9TP" secondAttribute="width" id="0P6-Zl-UfX"/>
                         <constraint firstAttribute="trailing" secondItem="X6m-t6-gdl" secondAttribute="trailing" id="821-8V-ijz"/>
@@ -248,7 +249,7 @@
                         </view>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="KH0-Nd-WU0">
                             <rect key="frame" x="0.0" y="759" width="304" height="49"/>
-                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         </view>
                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" fixedFrame="YES" text="下运单" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zyY-z2-r2h">
                             <rect key="frame" x="160" y="381" width="94" height="45"/>
@@ -277,7 +278,7 @@
                                 <outlet property="delegate" destination="-1" id="atq-MI-T7V"/>
                             </connections>
                         </tableView>
-                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iF4-Vu-8Dl">
+                        <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="system" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="iF4-Vu-8Dl">
                             <rect key="frame" x="252" y="757.66666666666663" width="52" height="52"/>
                             <constraints>
                                 <constraint firstAttribute="width" constant="52" id="XCz-J7-8Wg"/>
@@ -293,7 +294,7 @@
                         </button>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="qOG-da-TxK" customClass="LGButton" customModule="LGButton">
                             <rect key="frame" x="304" y="759" width="110" height="49"/>
-                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                             <userDefinedRuntimeAttributes>
                                 <userDefinedRuntimeAttribute type="color" keyPath="gradientStartColor">
                                     <color key="value" name="按钮渐变色上"/>
@@ -315,7 +316,7 @@
                         </label>
                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="1IP-8h-lB4">
                             <rect key="frame" x="0.0" y="0.0" width="414" height="44"/>
-                            <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                            <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         </view>
                     </subviews>
                     <color key="backgroundColor" name="app底色"/>
@@ -355,6 +356,7 @@
                     </userDefinedRuntimeAttributes>
                 </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="BXb-QP-ceT" firstAttribute="top" secondItem="Try-UC-8fP" secondAttribute="bottom" id="4Cc-Zk-TCe"/>
@@ -378,10 +380,20 @@
                 <constraint firstAttribute="trailing" secondItem="9me-3I-LYC" secondAttribute="trailing" id="uFa-GF-rhx"/>
                 <constraint firstItem="ZUK-IF-BZm" firstAttribute="width" secondItem="00z-eF-Akb" secondAttribute="width" id="z1r-JE-qp5"/>
             </constraints>
-            <viewLayoutGuide key="safeArea" id="fnl-2z-Ty3"/>
             <point key="canvasLocation" x="175.36231884057972" y="75.669642857142847"/>
         </view>
     </objects>
+    <designables>
+        <designable name="00z-eF-Akb">
+            <size key="intrinsicContentSize" width="10" height="10"/>
+        </designable>
+        <designable name="ZUK-IF-BZm">
+            <size key="intrinsicContentSize" width="10" height="10"/>
+        </designable>
+        <designable name="qOG-da-TxK">
+            <size key="intrinsicContentSize" width="10" height="10"/>
+        </designable>
+    </designables>
     <resources>
         <image name="jinru" width="13" height="23"/>
         <namedColor name="#E37847">
@@ -411,5 +423,8 @@
         <namedColor name="蓝色字体颜色">
             <color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/HLLTopCell.swift

@@ -81,9 +81,16 @@ class HLLTopCell: UITableViewCell,UIScrollViewDelegate {
             numIdx = num
         }
         let model = datas[numIdx]
-        weightLbl.text = model.vehicle_price_text_item?.text_weight
+        if (model.vehicle_price_text_item!.text_weight!.contains("/")){
+            let arr = model.vehicle_price_text_item?.text_weight?.components(separatedBy: "/")
+            weightLbl.text = arr?.first
+        }else{
+            weightLbl.text = model.vehicle_price_text_item?.text_weight
+        }
         sizeLbl.text = model.vehicle_price_text_item?.text_size
+       
         tjLbl.text = model.vehicle_price_text_item?.text_volume
+       
     }
     
     @IBOutlet weak var rightBtn: UIButton!

GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/HLLTopCell.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>
@@ -31,7 +32,7 @@
                                 <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="aC7-Bu-5oE">
-                                <rect key="frame" x="167.5" y="21.5" width="51.5" height="18.5"/>
+                                <rect key="frame" x="167.5" y="21.5" width="85" height="18.5"/>
                                 <constraints>
                                     <constraint firstAttribute="height" constant="18.5" id="VaA-Ma-ZMN"/>
                                 </constraints>
@@ -49,7 +50,10 @@
                                 <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="Yit-BG-pxY">
-                                <rect key="frame" x="267.5" y="23" width="51.5" height="16"/>
+                                <rect key="frame" x="267.5" y="23" width="92.5" height="16"/>
+                                <constraints>
+                                    <constraint firstAttribute="height" constant="16" id="AON-sN-Tci"/>
+                                </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" name="灰色字体颜色"/>
                                 <nil key="highlightedColor"/>
@@ -64,24 +68,27 @@
                                 <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="3Ee-iC-Maa">
-                                <rect key="frame" x="57.5" y="23" width="51.5" height="16"/>
+                                <rect key="frame" x="57.5" y="23" width="95" height="16"/>
                                 <fontDescription key="fontDescription" type="system" pointSize="13"/>
                                 <color key="textColor" name="灰色字体颜色"/>
                                 <nil key="highlightedColor"/>
                             </label>
                         </subviews>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstItem="AsL-1h-Y7c" firstAttribute="top" secondItem="6H1-9e-5gM" secondAttribute="top" id="4Dh-9v-gYg"/>
+                            <constraint firstAttribute="trailing" secondItem="Yit-BG-pxY" secondAttribute="trailing" constant="15" id="5Ny-IH-p4m"/>
                             <constraint firstAttribute="height" constant="51" id="7Is-x1-1hq"/>
                             <constraint firstItem="wLi-w7-vL4" firstAttribute="top" secondItem="6H1-9e-5gM" secondAttribute="top" id="EzS-pi-dWY"/>
                             <constraint firstItem="Yit-BG-pxY" firstAttribute="centerY" secondItem="aC7-Bu-5oE" secondAttribute="centerY" id="FEL-Zp-Y4G"/>
                             <constraint firstItem="Yit-BG-pxY" firstAttribute="leading" secondItem="dcU-lR-ZVX" secondAttribute="leading" id="GgP-zY-J9k"/>
                             <constraint firstItem="wLi-w7-vL4" firstAttribute="leading" secondItem="6H1-9e-5gM" secondAttribute="leading" constant="57.5" id="IAQ-n4-Do0"/>
+                            <constraint firstItem="aC7-Bu-5oE" firstAttribute="leading" secondItem="3Ee-iC-Maa" secondAttribute="trailing" constant="15" id="QsG-xM-4Ot"/>
                             <constraint firstItem="aC7-Bu-5oE" firstAttribute="top" secondItem="AsL-1h-Y7c" secondAttribute="bottom" constant="3" id="Qy9-Zc-gHc"/>
                             <constraint firstItem="3Ee-iC-Maa" firstAttribute="centerY" secondItem="aC7-Bu-5oE" secondAttribute="centerY" id="UKT-1O-yg0"/>
                             <constraint firstItem="aC7-Bu-5oE" firstAttribute="leading" secondItem="AsL-1h-Y7c" secondAttribute="leading" id="WrE-Jq-ofm"/>
                             <constraint firstItem="dcU-lR-ZVX" firstAttribute="top" secondItem="6H1-9e-5gM" secondAttribute="top" id="Z0z-vO-vfu"/>
+                            <constraint firstItem="Yit-BG-pxY" firstAttribute="leading" secondItem="aC7-Bu-5oE" secondAttribute="trailing" constant="15" id="dkL-mj-Tix"/>
                             <constraint firstItem="3Ee-iC-Maa" firstAttribute="leading" secondItem="wLi-w7-vL4" secondAttribute="leading" id="sTl-1n-vkH"/>
                             <constraint firstItem="AsL-1h-Y7c" firstAttribute="centerX" secondItem="6H1-9e-5gM" secondAttribute="centerX" id="vj6-vD-EeX"/>
                             <constraint firstAttribute="trailing" secondItem="dcU-lR-ZVX" secondAttribute="trailing" constant="53.5" id="zbV-6L-D7f"/>
@@ -115,7 +122,7 @@
                     </button>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="yKZ-TN-Ah3">
                         <rect key="frame" x="63" y="35" width="249" height="76"/>
-                        <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
+                        <color key="backgroundColor" systemColor="systemBackgroundColor"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="76" id="Tmt-kI-8i7"/>
                         </constraints>
@@ -156,5 +163,8 @@
         <namedColor name="灰色字体颜色">
             <color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <systemColor name="systemBackgroundColor">
+            <color white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+        </systemColor>
     </resources>
 </document>