完成新更UI

GeliBusinessPlatform.xcodeproj/project.pbxproj

@@ -582,6 +582,10 @@
 		F9A4F25024C9689600D1DD13 /* OtherDemandViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9A4F24E24C9689600D1DD13 /* OtherDemandViewController.xib */; };
 		F9B6D9E12486890D00111698 /* MoreAndTimeSelectView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9B6D9E02486890D00111698 /* MoreAndTimeSelectView.swift */; };
 		F9B6D9E32486891C00111698 /* MoreAndTimeSelectView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9B6D9E22486891C00111698 /* MoreAndTimeSelectView.xib */; };
+		F9B9FAC324DE3BA200ACDC8F /* LalamoveBillTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9B9FAC124DE3BA200ACDC8F /* LalamoveBillTableViewCell.swift */; };
+		F9B9FAC424DE3BA200ACDC8F /* LalamoveBillTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9B9FAC224DE3BA200ACDC8F /* LalamoveBillTableViewCell.xib */; };
+		F9B9FAC724DE409300ACDC8F /* UpBillDataTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9B9FAC524DE409300ACDC8F /* UpBillDataTableViewCell.swift */; };
+		F9B9FAC824DE409300ACDC8F /* UpBillDataTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9B9FAC624DE409300ACDC8F /* UpBillDataTableViewCell.xib */; };
 		F9D44E8324CBC50700FBD8DB /* WayBillAddressCanDelItemCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9D44E8124CBC50700FBD8DB /* WayBillAddressCanDelItemCell.swift */; };
 		F9D44E8424CBC50700FBD8DB /* WayBillAddressCanDelItemCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9D44E8224CBC50700FBD8DB /* WayBillAddressCanDelItemCell.xib */; };
 		F9D44E8824CBC6A400FBD8DB /* ToAndFormSelectViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9D44E8624CBC6A400FBD8DB /* ToAndFormSelectViewController.swift */; };
@@ -1259,6 +1263,10 @@
 		F9A4F24E24C9689600D1DD13 /* OtherDemandViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OtherDemandViewController.xib; sourceTree = "<group>"; };
 		F9B6D9E02486890D00111698 /* MoreAndTimeSelectView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MoreAndTimeSelectView.swift; sourceTree = "<group>"; };
 		F9B6D9E22486891C00111698 /* MoreAndTimeSelectView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = MoreAndTimeSelectView.xib; sourceTree = "<group>"; };
+		F9B9FAC124DE3BA200ACDC8F /* LalamoveBillTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LalamoveBillTableViewCell.swift; sourceTree = "<group>"; };
+		F9B9FAC224DE3BA200ACDC8F /* LalamoveBillTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = LalamoveBillTableViewCell.xib; sourceTree = "<group>"; };
+		F9B9FAC524DE409300ACDC8F /* UpBillDataTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = UpBillDataTableViewCell.swift; sourceTree = "<group>"; };
+		F9B9FAC624DE409300ACDC8F /* UpBillDataTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = UpBillDataTableViewCell.xib; sourceTree = "<group>"; };
 		F9D44E8124CBC50700FBD8DB /* WayBillAddressCanDelItemCell.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = WayBillAddressCanDelItemCell.swift; sourceTree = "<group>"; };
 		F9D44E8224CBC50700FBD8DB /* WayBillAddressCanDelItemCell.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WayBillAddressCanDelItemCell.xib; sourceTree = "<group>"; };
 		F9D44E8624CBC6A400FBD8DB /* ToAndFormSelectViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ToAndFormSelectViewController.swift; sourceTree = "<group>"; };
@@ -2457,6 +2465,10 @@
 				E0706EF324B40BE800D8251C /* TitleAndTfYuanCell.xib */,
 				E074B69A24DD305500777003 /* TitleHeaderCell.swift */,
 				E074B69B24DD305500777003 /* TitleHeaderCell.xib */,
+				F9B9FAC124DE3BA200ACDC8F /* LalamoveBillTableViewCell.swift */,
+				F9B9FAC224DE3BA200ACDC8F /* LalamoveBillTableViewCell.xib */,
+				F9B9FAC524DE409300ACDC8F /* UpBillDataTableViewCell.swift */,
+				F9B9FAC624DE409300ACDC8F /* UpBillDataTableViewCell.xib */,
 			);
 			path = Cell;
 			sourceTree = "<group>";
@@ -3191,6 +3203,7 @@
 				F96A5856247BBFFF0070A057 /* AddGuiGeCell.xib in Resources */,
 				E0A2E82824555B4400D6DB34 /* KuCunShangPinCell.xib in Resources */,
 				E0239203249069FD00C4C632 /* CGDXQVc.xib in Resources */,
+				F9B9FAC824DE409300ACDC8F /* UpBillDataTableViewCell.xib in Resources */,
 				E042F73D245288F800CDFA12 /* WenDuCell.xib in Resources */,
 				E02DDD92244FE55400ABB707 /* NewCreateHeader.xib in Resources */,
 				F9956B1C2463D941001A617D /* WorkSelectTimeView.xib in Resources */,
@@ -3306,6 +3319,7 @@
 				F96E48A424CA79D4000AB8D4 /* WayBillAddressItemCell.xib in Resources */,
 				F969BF08244EC38000C79953 /* GoodsCollectionViewCell.xib in Resources */,
 				E0D4166524483058008DCAB4 /* ChangePassViewController.xib in Resources */,
+				F9B9FAC424DE3BA200ACDC8F /* LalamoveBillTableViewCell.xib in Resources */,
 				F95A9ED9245520E500867849 /* OrderListVC.xib in Resources */,
 				E099B589246BF8FA009F587F /* OrderDViewController.xib in Resources */,
 				E0BE8A91245A9B9600E80134 /* YingFuZhangKuanCell.xib in Resources */,
@@ -3435,6 +3449,7 @@
 				F950FDE624518B9500C40530 /* FSCalendarAppearance.m in Sources */,
 				F9531F392465108800724BEE /* JXPhotoBrowserPageIndicator.swift in Sources */,
 				F9023F6D2449A9B100DD5A63 /* TitleAndTFCell.swift in Sources */,
+				F9B9FAC724DE409300ACDC8F /* UpBillDataTableViewCell.swift in Sources */,
 				E0CC8482248239F6009B1FE9 /* OutGoodsDetailModel.swift in Sources */,
 				F933F6D22452DAE100189561 /* TabBarContentClassView.swift in Sources */,
 				F933F6C82452C68B00189561 /* PKHUDTextView.swift in Sources */,
@@ -3523,6 +3538,7 @@
 				E00E48C62457C99900F16545 /* KuCunShangPinXQViewController.swift in Sources */,
 				E02D586B2477A1480065A9EB /* GetAddrsInfoModel.swift in Sources */,
 				F9531F3C2465108800724BEE /* JXPhotoBrowserSmoothZoomAnimator.swift in Sources */,
+				F9B9FAC324DE3BA200ACDC8F /* LalamoveBillTableViewCell.swift in Sources */,
 				F9531F402465108800724BEE /* JXPhotoBrowserZoomAnimator.swift in Sources */,
 				E0337EED2464EED000952EF4 /* PinPaiListViewController.swift in Sources */,
 				E0BE8A9C245A9E5900E80134 /* YingFuZhangKuanXQCell.swift in Sources */,

GeliBusinessPlatform/Assets.xcassets/订单管理/shangchuantupian.imageset/Contents.json

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

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/View/Cell/LalamoveBillTableViewCell.swift

+//
+//  LalamoveBillTableViewCell.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/8/8.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import UIKit
+
+class LalamoveBillTableViewCell: UITableViewCell {
+
+    @IBOutlet weak var imgV2: UIImageView!
+    @IBOutlet weak var imgV1: UIImageView!
+    @IBOutlet weak var nameLbl: UILabel!
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        self.selectionStyle = .none
+    }
+
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+
+        // Configure the view for the selected state
+    }
+    
+}

GeliBusinessPlatform/View/Cell/LalamoveBillTableViewCell.xib

+<?xml version="1.0" encoding="UTF-8"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="16097" 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"/>
+        <capability name="Named colors" minToolsVersion="9.0"/>
+        <capability name="Safe area layout guides" minToolsVersion="9.0"/>
+        <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
+    </dependencies>
+    <objects>
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
+        <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="159" id="KGk-i7-Jjw" customClass="LalamoveBillTableViewCell" customModule="TestClass" customModuleProvider="target">
+            <rect key="frame" x="0.0" y="0.0" width="345" height="159"/>
+            <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="345" height="159"/>
+                <autoresizingMask key="autoresizingMask"/>
+                <subviews>
+                    <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="查看票据" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="sR8-2p-s0j">
+                        <rect key="frame" x="15" y="15" width="52.5" 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" translatesAutoresizingMaskIntoConstraints="NO" id="7RH-D6-2bx">
+                        <rect key="frame" x="15" y="43.5" width="117" height="75"/>
+                        <color key="backgroundColor" name="app底色"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="117" id="ZJG-4R-D6X"/>
+                            <constraint firstAttribute="height" constant="75" id="pap-qw-4iT"/>
+                        </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                <real key="value" value="3"/>
+                            </userDefinedRuntimeAttribute>
+                        </userDefinedRuntimeAttributes>
+                    </imageView>
+                    <imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Peb-o2-hIW">
+                        <rect key="frame" x="142" y="43.5" width="117" height="75"/>
+                        <color key="backgroundColor" name="app底色"/>
+                        <constraints>
+                            <constraint firstAttribute="width" constant="117" id="AuI-9f-C9C"/>
+                            <constraint firstAttribute="height" constant="75" id="lJ7-KJ-xxS"/>
+                        </constraints>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                <real key="value" value="3"/>
+                            </userDefinedRuntimeAttribute>
+                        </userDefinedRuntimeAttributes>
+                    </imageView>
+                </subviews>
+                <constraints>
+                    <constraint firstItem="7RH-D6-2bx" firstAttribute="top" secondItem="sR8-2p-s0j" secondAttribute="bottom" constant="10" id="4RI-AH-9DT"/>
+                    <constraint firstItem="sR8-2p-s0j" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="GuK-M7-Zhv"/>
+                    <constraint firstItem="Peb-o2-hIW" firstAttribute="centerY" secondItem="7RH-D6-2bx" secondAttribute="centerY" id="RDe-Xm-sLP"/>
+                    <constraint firstItem="7RH-D6-2bx" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="XOw-ad-VYm"/>
+                    <constraint firstItem="Peb-o2-hIW" firstAttribute="leading" secondItem="7RH-D6-2bx" secondAttribute="trailing" constant="10" id="f6M-Wd-Sy1"/>
+                    <constraint firstItem="sR8-2p-s0j" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="iGe-VU-VAf"/>
+                </constraints>
+            </tableViewCellContentView>
+            <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
+            <connections>
+                <outlet property="imgV1" destination="7RH-D6-2bx" id="lW6-jw-lJ9"/>
+                <outlet property="imgV2" destination="Peb-o2-hIW" id="lxb-dX-YXO"/>
+                <outlet property="nameLbl" destination="sR8-2p-s0j" id="kCf-rk-OCp"/>
+            </connections>
+            <point key="canvasLocation" x="257.24637681159425" y="140.29017857142856"/>
+        </tableViewCell>
+    </objects>
+    <resources>
+        <namedColor name="app底色">
+            <color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+        <namedColor name="标题字颜色">
+            <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
+        </namedColor>
+    </resources>
+</document>

GeliBusinessPlatform/View/Cell/UpBillDataTableViewCell.swift

+//
+//  UpBillDataTableViewCell.swift
+//  GeliBusinessPlatform
+//
+//  Created by 刘俊宏 on 2020/8/8.
+//  Copyright © 2020 junye lu. All rights reserved.
+//
+
+import UIKit
+
+class UpBillDataTableViewCell: UITableViewCell {
+    @IBOutlet weak var selectSegmentV: UISegmentedControl!
+    
+    @IBOutlet weak var updataBtn: UIButton!
+    @IBOutlet weak var upDataTLbl: UILabel!
+    @IBOutlet weak var inputInfoTF: UITextField!
+    @IBOutlet weak var inputInfoTfBgV: UIView!
+    @IBOutlet weak var billNumLbl: UILabel!
+    
+    //查看发票信息
+    @IBAction func checkBillDetailAction(_ sender: UIButton) {
+        print("//查看发票信息")
+    }
+    //通知用户
+    @IBAction func noticUserAction(_ sender: UIButton) {
+        print("//通知用户")
+
+    }
+    //上传发票
+    @IBAction func updataAction(_ sender: UIButton) {
+        print("//上传发票")
+
+    }
+    override func awakeFromNib() {
+        super.awakeFromNib()
+        self.selectionStyle = .none
+        let redAttribute = [NSAttributedString.Key.foregroundColor: UIColor.white,NSAttributedString.Key.font: UIFont.systemFont(ofSize: 13)] as [NSAttributedString.Key : Any]
+        selectSegmentV.setTitleTextAttributes(redAttribute, for: .selected)
+        
+        let redAttribute1 = [NSAttributedString.Key.foregroundColor: UIColor.init(named: "灰色字体颜色") as Any,NSAttributedString.Key.font: UIFont.systemFont(ofSize: 13)] as [NSAttributedString.Key : Any]
+        selectSegmentV.setTitleTextAttributes(redAttribute1, for: .normal)
+    }
+    
+    override func setSelected(_ selected: Bool, animated: Bool) {
+        super.setSelected(selected, animated: animated)
+        
+        // Configure the view for the selected state
+    }
+    
+}

GeliBusinessPlatform/View/LogisticalSelectView/LogisticalSelectView.swift

@@ -20,9 +20,31 @@ class LogisticalSelectView: UIView {
     @IBAction func blackAction(_ sender: Any) {
         self.removeFromSuperview()
     }
+    @IBOutlet weak var selectBgView: UIView!
+    @IBOutlet weak var selectBgHeight: NSLayoutConstraint!
+    @IBOutlet weak var sfAgreeLbl: UILabel!
     
     @IBOutlet weak var sfPriceLbl: UILabel!
     @IBOutlet weak var jdPriceLbl: UILabel!
+    
+    var fuTitleArr:Array<String> = [] {
+        didSet {
+            for i in 0..<fuTitleArr.count {
+                let lbl = UILabel()
+                lbl.text = fuTitleArr[i]
+                lbl.textColor = UIColor.init(named: "提示语字体颜色")
+                lbl.font = UIFont.systemFont(ofSize: 11)
+                selectBgView.addSubview(lbl)
+                lbl.snp.makeConstraints { (make) in
+                    make.left.equalTo(sfAgreeLbl)
+                    make.top.equalTo(sfAgreeLbl.snp_bottom).offset((5 + 15) * i + 5)
+                }
+            }
+            selectBgHeight.constant = CGFloat(265 + fuTitleArr.count * 19)
+        }
+    }
+    
+    
     @IBAction func xiadanAction(_ sender: Any) {
         if jdSelectBtn.isSelected || sfSelectBtn.isSelected {
             if jdSelectBtn.isSelected {
@@ -38,6 +60,13 @@ class LogisticalSelectView: UIView {
 
     }
  
+    @IBAction func kuaijianAction(_ sender: UIButton) {
+        if sender.tag == 0 {
+            print("京东快件服务协议")
+        }else if sender.tag == 1 {
+            print("顺丰快件服务协议")
+        }
+    }
     
     @IBAction func selectTheLogisticalAction(_ sender: UIButton) {
         if sender == jdSelectBtn {

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

@@ -332,32 +332,29 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     //MARK:--预估费用
     @IBOutlet weak var priceLbl: UILabel!
     @IBAction func orderAction(_ sender: Any) {
-        if isSelectPoripl {
-            if r_city == nil || s_city == nil || weight == nil || tiJi == nil || wenduIndex == 0{
-                HUD.flash(.label("请填写相关信息"), delay: 1.2)
-                return
-            }
-            let alertView = LogisticalSelectView(frame: self.view.window!.bounds)
-            alertView.delegate = self
-            alertView.jdPriceLbl.text = "京东冷运（预估运费" + (logPayPriceModel?.price_jd)! + "元）"
-            alertView.sfPriceLbl.text = "顺丰冷运（预估运费" + (logPayPriceModel?.price_sf)! + "元）"
-            self.view.window?.addSubview(alertView)
-            if logPayPriceModel?.price_sf == "-"  {
+        if r_city == nil || s_city == nil || weight == nil || tiJi == nil || wenduIndex == 0{
+            HUD.flash(.label("请填写相关信息"), delay: 1.2)
+            return
+        }
+        let alertView = LogisticalSelectView(frame: self.view.window!.bounds)
+        alertView.delegate = self
+        alertView.jdPriceLbl.text = "京东冷运（预估运费" + (logPayPriceModel?.price_jd)! + "元）"
+        alertView.sfPriceLbl.text = "顺丰冷运（预估运费" + (logPayPriceModel?.price_sf)! + "元）"
+        self.view.window?.addSubview(alertView)
+        if logPayPriceModel?.price_sf == "-"  {
+            alertView.jdSelectBtn.isSelected = true
+            alertView.sfSelectBtn.isSelected = false
+        }else if logPayPriceModel?.price_sf != "-" && logPayPriceModel?.price_jd != "-" {
+            alertView.jdSelectBtn.isSelected = false
+            alertView.sfSelectBtn.isSelected = true
+            let num1 = logPayPriceModel?.price_sf as! NSString
+            let num2 = logPayPriceModel?.price_jd as! NSString
+            if num1.floatValue > num2.floatValue {
                 alertView.jdSelectBtn.isSelected = true
                 alertView.sfSelectBtn.isSelected = false
-            }else if logPayPriceModel?.price_sf != "-" && logPayPriceModel?.price_jd != "-" {
-                alertView.jdSelectBtn.isSelected = false
-                alertView.sfSelectBtn.isSelected = true
-                let num1 = logPayPriceModel?.price_sf as! NSString
-                let num2 = logPayPriceModel?.price_jd as! NSString
-                if num1.floatValue > num2.floatValue {
-                    alertView.jdSelectBtn.isSelected = true
-                    alertView.sfSelectBtn.isSelected = false
-                }
             }
-        }else{
-            HUD.flash(.label("未同意快件服务协议无法下单"), delay: 1.2)
         }
+        alertView.fuTitleArr = ["运费：¥56151","提货费：¥684151","配送费：¥26222"]
         
         
     }
@@ -606,18 +603,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     let hPart2 = ["请选择用车时间","下单联系人信息","额外需求","货物保障"]
     var hPart2P = ["","","",""]
     let hPart3 = ["关联平台：","关联订单号："]
-    var isSelectPoripl = false
-    @objc func selectBtnClick(sender:UIButton){
-        if sender.tag == 99 {
-            //跳转查看合同页面
-            let vc = WebViewController()
-            vc.urlStr = "https://www.baidu.com"
-            self.navigationController?.pushViewController(vc, animated: true)
-            return
-        }
-        selectBtn!.isSelected = !selectBtn!.isSelected
-        isSelectPoripl = ((selectBtn?.isSelected) != nil)
-    }
+ 
+    
     //MARK: - CELL DELEGATE
     //MARK: - 货拉拉 headerView
     
@@ -644,58 +631,6 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
     }
     func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
         if tableView == listView {
-            if section == 2 {
-                let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 41.5))
-                view.backgroundColor = UIColor(named: "app底色")
-                
-                let btn = UIButton()
-                view.addSubview(btn)
-                btn.setImage(UIImage(named: "daixuan"), for: .normal)
-                btn.setImage(UIImage(named: "yuxuan"), for: .selected)
-                btn.snp.makeConstraints { (make) in
-                    make.centerY.equalTo(view.snp_centerY)
-                    make.left.equalTo(15)
-                    make.width.height.equalTo(12.5)
-                }
-                selectBtn = btn
-                btn.isSelected = isSelectPoripl
-                let btn2 = UIButton()
-                view.addSubview(btn2)
-                btn2.addTarget(self, action: #selector(selectBtnClick(sender:)), for: .touchUpInside)
-                btn2.snp.makeConstraints { (make) in
-                    make.top.left.bottom.equalTo(0)
-                    make.width.equalTo(105)
-                }
-                
-                let lbl1 = UILabel()
-                lbl1.text = "我已阅读并同意"
-                lbl1.textColor = UIColor(named: "标题字颜色")
-                lbl1.font = UIFont.systemFont(ofSize: 11)
-                lbl1.sizeToFit()
-                view.addSubview(lbl1)
-                lbl1.snp.makeConstraints { (make) in
-                    make.left.equalTo(btn.snp_right).offset(3)
-                    make.top.bottom.equalTo(0)
-                    make.width.equalTo(lbl1.bounds.size.width)
-                }
-                
-                let btn3 = UIButton()
-                btn3.setTitle("《快件服务协议》", for: .normal)
-                btn3.titleLabel?.font = UIFont.systemFont(ofSize: 11)
-                btn3.setTitleColor(UIColor(named: "蓝色字体颜色"), for: .normal)
-                btn3.tag = 99
-                view.addSubview(btn3)
-                btn3.sizeToFit()
-                btn3.addTarget(self, action: #selector(selectBtnClick(sender:)), for: .touchUpInside)
-                btn3.snp.makeConstraints { (make) in
-                    make.left.equalTo(lbl1.snp_right)
-                    make.top.bottom.equalTo(0)
-                    make.width.equalTo(btn3.bounds.size.width)
-                }
-                
-                return view
-                
-            }
             let view = UIView()
             view.backgroundColor = UIColor(named: "app底色")
             return view

GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.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="16097" 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"/>

GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift

@@ -525,9 +525,9 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
             HUD.flash(.label("敬请期待"),delay: 1.2)
             return
         case 88: //运单列表
-            HUD.flash(.label("敬请期待"),delay: 1.2)
-//            let vc = YDLBVc()
-//            self.navigationController?.pushViewController(vc, animated: true)
+//            HUD.flash(.label("敬请期待"),delay: 1.2)
+            let vc = YDLBVc()
+            self.navigationController?.pushViewController(vc, animated: true)
             return
         case 89: //物流公司列表
             HUD.flash(.label("敬请期待"),delay: 1.2)
@@ -535,10 +535,10 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
 //            self.navigationController?.pushViewController(vc, animated: true)
             return
         case 90: //下运单
-            HUD.flash(.label("敬请期待"),delay: 1.2)
+//            HUD.flash(.label("敬请期待"),delay: 1.2)
 
-//            let vc = XiaYunDanViewController()
-//            self.navigationController?.pushViewController(vc, animated: true)
+            let vc = XiaYunDanViewController()
+            self.navigationController?.pushViewController(vc, animated: true)
             return
         case 92: //采购订单管理
             //            HUD.flash(.label("敬请期待"),delay: 1.2)