补全UI显示

GeliBusinessPlatform/Model/OrderManageModel/OrderListModel.swift

@@ -35,7 +35,7 @@ class OrderListDataModel: Mappable {
     var pay_status : Int? //支付状态
     var pay_type : Int? //支付类型
     var shipping_status : Int? //发货状态
-    var from : Int? //订单来源
+    var from : Int? //订单来源，0PC商城，1android商城，2IOS商城，3后台(销售)下单，4小程序段
     var user_name : String? //购买用户
     var cus_name : String? //购买客户
     var goods_number : String? //订单商量总数

GeliBusinessPlatform/View/Cell/DaiQueRenCell.swift

@@ -13,6 +13,7 @@ import UIKit
 }
 class DaiQueRenCell: UITableViewCell {
 
+    @IBOutlet weak var formLbl: UILabel!
     @IBOutlet weak var cancelBtn: UIButton!
     @IBOutlet weak var submitBtn: UIButton!
     @IBOutlet weak var priceLbl: UILabel!

GeliBusinessPlatform/View/Cell/DaiQueRenCell.xib

@@ -175,6 +175,27 @@
                                     <action selector="submitClick:" destination="KGk-i7-Jjw" eventType="touchUpInside" id="RLX-ry-ohi"/>
                                 </connections>
                             </button>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="销售下单" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="3z1-vN-y0a">
+                                <rect key="frame" x="129" y="62" width="54" height="18"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" constant="54" id="6Zg-Ut-Gaa"/>
+                                    <constraint firstAttribute="height" constant="18" id="ppe-qW-dBh"/>
+                                </constraints>
+                                <fontDescription key="fontDescription" type="system" pointSize="11"/>
+                                <color key="textColor" name="蓝色字体颜色"/>
+                                <nil key="highlightedColor"/>
+                                <userDefinedRuntimeAttributes>
+                                    <userDefinedRuntimeAttribute type="color" keyPath="borderColor">
+                                        <color key="value" name="蓝色字体颜色"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="borderWidth">
+                                        <real key="value" value="1"/>
+                                    </userDefinedRuntimeAttribute>
+                                    <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                        <real key="value" value="2"/>
+                                    </userDefinedRuntimeAttribute>
+                                </userDefinedRuntimeAttributes>
+                            </label>
                         </subviews>
                         <color key="backgroundColor" systemColor="systemBackgroundColor" cocoaTouchSystemColor="whiteColor"/>
                         <constraints>
@@ -182,9 +203,11 @@
                             <constraint firstItem="M0x-Nm-BAc" firstAttribute="top" secondItem="nLT-tE-vtc" secondAttribute="bottom" constant="10" id="64X-jQ-4P4"/>
                             <constraint firstItem="pfF-Zq-wJ4" firstAttribute="centerY" secondItem="u9L-yx-Fqd" secondAttribute="centerY" id="8as-zv-PeJ"/>
                             <constraint firstItem="nLT-tE-vtc" firstAttribute="leading" secondItem="XiS-He-UoI" secondAttribute="trailing" constant="5" id="E2b-56-HvK"/>
+                            <constraint firstItem="3z1-vN-y0a" firstAttribute="leading" secondItem="XiS-He-UoI" secondAttribute="trailing" constant="5" id="E6K-mP-YFk"/>
                             <constraint firstAttribute="trailing" secondItem="zm2-s9-DRT" secondAttribute="trailing" constant="15" id="FTk-f8-viS"/>
                             <constraint firstItem="YlW-t1-IH9" firstAttribute="leading" secondItem="ufT-fd-pM6" secondAttribute="leading" constant="15" id="G06-ee-zVc"/>
                             <constraint firstAttribute="trailing" secondItem="M0x-Nm-BAc" secondAttribute="trailing" constant="15" id="I2s-Iq-fnT"/>
+                            <constraint firstItem="3z1-vN-y0a" firstAttribute="centerY" secondItem="XiS-He-UoI" secondAttribute="centerY" id="JEI-pM-vO5"/>
                             <constraint firstItem="c4F-4I-yYj" firstAttribute="leading" secondItem="ufT-fd-pM6" secondAttribute="leading" constant="15" id="K4P-tG-IRT"/>
                             <constraint firstItem="nLT-tE-vtc" firstAttribute="centerY" secondItem="XiS-He-UoI" secondAttribute="centerY" id="KVz-cG-9cE"/>
                             <constraint firstAttribute="trailing" secondItem="xfR-bA-9k3" secondAttribute="trailing" constant="15" id="L1r-cN-5k4"/>
@@ -242,6 +265,7 @@
                 <outlet property="cancelBtn" destination="R3b-6k-iUu" id="hCY-gG-iv2"/>
                 <outlet property="countLbl" destination="M0x-Nm-BAc" id="9pr-ew-nY6"/>
                 <outlet property="dateLbl" destination="xfR-bA-9k3" id="rL0-QQ-c0q"/>
+                <outlet property="formLbl" destination="3z1-vN-y0a" id="9L3-mX-CWP"/>
                 <outlet property="nameLbl" destination="pfF-Zq-wJ4" id="GCr-ga-AZW"/>
                 <outlet property="priceLbl" destination="O7t-Fb-Wvu" id="I21-Be-J83"/>
                 <outlet property="statusLbl" destination="Kp0-Gc-5iN" id="czD-zG-jwe"/>
@@ -277,5 +301,8 @@
         <namedColor name="白色背景色">
             <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
         </namedColor>
+        <namedColor name="蓝色字体颜色">
+            <color red="0.27799999713897705" green="0.56099998950958252" blue="0.88999998569488525" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
     </resources>
 </document>

GeliBusinessPlatform/ViewController/订单列表/OrderListVC.swift

@@ -173,7 +173,21 @@ class OrderListVC: BaseViewController, UITableViewDelegate, UITableViewDataSourc
         cell.nameLbl.text = rowModel.cus_name
         cell.statusLbl.text = orderStatusStrByInt(leftBtn: cell.cancelBtn, rightBtn: cell.submitBtn, statusNumber: rowModel.order_status!)
         cell.accountLbl.text = rowModel.order_sn
+
         cell.typeLbl.text = orderTypeStrByInt(statusNumber: rowModel.order_type!)
+        if rowModel.order_type == 1 {
+            cell.typeLbl.isHidden = true
+        }else{
+            cell.typeLbl.isHidden = false
+        }
+        
+        if rowModel.from == 3 {
+            cell.formLbl.isHidden = false
+            cell.typeLbl.isHidden = true
+        }else{
+            cell.formLbl.isHidden = true
+        }
+        
         cell.dateLbl.text = dayByDouble(sender: rowModel.add_time!)
         cell.countLbl.text = "商品数量：\(rowModel.goods_number!)"
         cell.priceLbl.text = "金额：￥\(rowModel.sum_amount!)"