普通下单成功页面完成对接

GeliBusinessPlatform/Model/Logistics/LogisticsModel.swift

@@ -204,24 +204,24 @@ class logisticsOrderDetailsDataModel: Mappable {
     var sr_id :Int?//物流公司id
 
     var express_item_name:String?//寄托物
-    var weight : CGFloat?//重量
-    var volume :CGFloat?  //体积
+    var weight : Float?//重量
+    var volume :Float?  //体积
 
-    var volume_long:CGFloat?
-    var volume_width : CGFloat?
-    var volume_height :CGFloat?
+    var volume_long:Float?
+    var volume_width : Float?
+    var volume_height :Float?
 
     var express_item_qty:Int?   //寄托物总件数
     var quarantine_cert : Int?//有无动物检疫证 0-无效，1-有，2-无；非冷链不需传值
-    var freight_pre :CGFloat? //预估运费
+    var freight_pre :Float? //预估运费
 
-    var freight:CGFloat?//真实运费
+    var freight:Float?//真实运费
     var pickup_begin_time : Double?
     var pickup_end_time :Double?
 
     var fc_flag:Int?//运费结算方式； 0:月结 1:到付 2:现付
-    var guarantee_value : CGFloat? //保价金额(保留小数点后两位)
-    var guarantee_fee :CGFloat?     //保费
+    var guarantee_value : Float? //保价金额(保留小数点后两位)
+    var guarantee_fee :Float?     //保费
 
     var remark:String? //特殊说明/备注
     var delivery_into_ws : Int? //是否送货入仓：1是 0否
@@ -239,7 +239,7 @@ class logisticsOrderDetailsDataModel: Mappable {
     var sign_time : Double? //签收时间
     var lc_id :Int?
 
-    var site_delivery:CGFloat? //站点派送 0-无效，1-是京东派送，2-非京东派送；非冷链不需传值
+    var site_delivery:Float? //站点派送 0-无效，1-是京东派送，2-非京东派送；非冷链不需传值
     var ope_title : String?
     var ope_time :String?
 
@@ -373,7 +373,7 @@ class logisticsOrderDetailsDataModel: Mappable {
 
         r_zipcode <- map["r_zipcode"]
         r_tel <- map["r_tel"]
-        r_mobile <- map["r_mobilev"]
+        r_mobile <- map["r_mobile"]
 
         s_consignee <- map["s_consignee"]
         s_country <- map["s_country"]

GeliBusinessPlatform/ViewController/代客下单（货运）/下单成功/BtmBtnCell.swift

@@ -7,10 +7,14 @@
 //
 
 import UIKit
-
+protocol BtmBtnCellDelegate {
+    func selectBtmBtnCellBy(index:Int)
+}
 class BtmBtnCell: UITableViewCell {
 
+    var delegate : BtmBtnCellDelegate?
     @IBAction func btnClickAction(_ sender: UIButton) {
+        delegate?.selectBtmBtnCellBy(index: sender.tag)
     }
     override func awakeFromNib() {
         super.awakeFromNib()

GeliBusinessPlatform/ViewController/代客下单（货运）/下单成功/JiBenXinXiCell.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="16097" 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="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"/>
@@ -10,7 +11,7 @@
     <objects>
         <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="JiBenXinXiCell" customModule="GeliBusinessPlatform" customModuleProvider="target">
+        <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="JiBenXinXiCell" customModule="TestClass" customModuleProvider="target">
             <rect key="frame" x="0.0" y="0.0" width="375" height="84.5"/>
             <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">
@@ -59,7 +60,6 @@
                         <rect key="frame" x="81" y="51" width="40" height="19"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="19" id="1Lm-KY-q7E"/>
-                            <constraint firstAttribute="width" constant="40" id="34h-jW-4Od"/>
                         </constraints>
                         <attributedString key="attributedText">
                             <fragment content="已下单">
@@ -75,7 +75,6 @@
                         <rect key="frame" x="320" y="52.5" width="40" height="16"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="16" id="VLy-Xe-zQt"/>
-                            <constraint firstAttribute="width" constant="40" id="gfw-5e-wMg"/>
                         </constraints>
                         <attributedString key="attributedText">
                             <fragment content="已支付">

GeliBusinessPlatform/ViewController/代客下单（货运）/下单成功/XiaDanCGDiZhiCell.xib

@@ -35,22 +35,25 @@
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" name="白色背景色"/>
                         <nil key="highlightedColor"/>
+                        <userDefinedRuntimeAttributes>
+                            <userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
+                                <real key="value" value="11"/>
+                            </userDefinedRuntimeAttribute>
+                        </userDefinedRuntimeAttributes>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="r2q-vU-NH6">
-                        <rect key="frame" x="47" y="10" width="42" height="21"/>
+                        <rect key="frame" x="47" y="10" width="37.5" height="21"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="21" id="HM8-Xf-qiE"/>
-                            <constraint firstAttribute="width" constant="42" id="hbk-rG-MdJ"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="15"/>
                         <color key="textColor" name="标题字颜色"/>
                         <nil key="highlightedColor"/>
                     </label>
                     <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="iSv-bJ-NyY">
-                        <rect key="frame" x="99" y="12.5" width="42" height="18.5"/>
+                        <rect key="frame" x="94.5" y="12.5" width="33" height="18.5"/>
                         <constraints>
                             <constraint firstAttribute="height" constant="18.5" id="dxh-7j-bGh"/>
-                            <constraint firstAttribute="width" constant="42" id="zF6-S4-bQZ"/>
                         </constraints>
                         <fontDescription key="fontDescription" type="system" pointSize="13"/>
                         <color key="textColor" name="灰色字体颜色"/>
@@ -72,6 +75,7 @@
                     <constraint firstItem="iRc-P8-Tpp" firstAttribute="top" secondItem="r2q-vU-NH6" secondAttribute="bottom" constant="5" id="Cpj-vz-7Li"/>
                     <constraint firstAttribute="trailing" secondItem="iRc-P8-Tpp" secondAttribute="trailing" constant="15" id="EtC-Al-wEo"/>
                     <constraint firstItem="r2q-vU-NH6" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="10" id="F9a-ys-axx"/>
+                    <constraint firstAttribute="trailing" secondItem="iRc-P8-Tpp" secondAttribute="trailing" constant="15" id="FCa-XV-9dj"/>
                     <constraint firstItem="iSv-bJ-NyY" firstAttribute="bottom" secondItem="r2q-vU-NH6" secondAttribute="bottom" id="MNo-vf-zjk"/>
                     <constraint firstItem="r2q-vU-NH6" firstAttribute="leading" secondItem="LtM-kL-bvY" secondAttribute="trailing" constant="10" id="cPg-H5-5rJ"/>
                     <constraint firstItem="LtM-kL-bvY" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="cZs-1k-CCo"/>
@@ -79,6 +83,7 @@
                     <constraint firstItem="rEJ-LN-YNz" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="t0f-1o-QAH"/>
                     <constraint firstItem="iSv-bJ-NyY" firstAttribute="leading" secondItem="r2q-vU-NH6" secondAttribute="trailing" constant="10" id="wK3-le-72G"/>
                     <constraint firstItem="iRc-P8-Tpp" firstAttribute="leading" secondItem="r2q-vU-NH6" secondAttribute="leading" id="xqW-hO-tlX"/>
+                    <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="iSv-bJ-NyY" secondAttribute="trailing" constant="15" id="zKf-fs-7fQ"/>
                 </constraints>
             </tableViewCellContentView>
             <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>

GeliBusinessPlatform/ViewController/代客下单（货运）/下单成功/XiaDanChengGongViewController.swift

@@ -8,16 +8,17 @@
 
 import UIKit
 
-class XiaDanChengGongViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource {
-
+class XiaDanChengGongViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,BtmBtnCellDelegate {
+    
     
     var orderID:String?
+    var dataModel:logisticsOrderDetailsDataModel?
     
     @IBOutlet weak var listView: UITableView!
     override func viewDidLoad() {
         super.viewDidLoad()
         
-        navbar.title = "成功下单"
+        navbar.title = "下单成功"
         self.view.addSubview(navbar)
         
         SetTopFrame(view: listView, height: fullScreenHeight - NavCGRect.height)
@@ -27,15 +28,23 @@ class XiaDanChengGongViewController: BaseViewController,UITableViewDelegate,UITa
         listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
         listView.register(UINib(nibName: "XiaDanCGDiZhiCell", bundle: nil), forCellReuseIdentifier: "XiaDanCGDiZhiCell")
         listView.register(UINib(nibName: "JiBenXinXiCell", bundle: nil), forCellReuseIdentifier: "JiBenXinXiCell")
-                listView.register(UINib(nibName: "BtmBtnCell", bundle: nil), forCellReuseIdentifier: "BtmBtnCell")
-        
+        listView.register(UINib(nibName: "BtmBtnCell", bundle: nil), forCellReuseIdentifier: "BtmBtnCell")
         
+        loadData()        
     }
     func loadData(){
         let UserToken = UserDefaults.standard.value(forKey: "user_token")
-
+        HUD.flash(.progress)
+        listView.isHidden = true
+        
         logisticsOrderDetails(["user_token":UserToken as Any,"id":orderID as Any], success: { (data) in
+            HUD.hide()
+            
+            let model = data as! logisticsOrderDetailsModel
+            self.dataModel = model.data
             
+            self.listView.isHidden = false
+            self.listView.reloadData()
         }) { (error) in
             
         }
@@ -74,9 +83,15 @@ class XiaDanChengGongViewController: BaseViewController,UITableViewDelegate,UITa
         return 10
     }
     func numberOfSections(in tableView: UITableView) -> Int {
+        if dataModel == nil {
+            return 0
+        }
         return 3
     }
     func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
+        if dataModel == nil {
+            return 0
+        }
         switch section {
         case 0:return 3
         case 1:return 5
@@ -113,37 +128,87 @@ class XiaDanChengGongViewController: BaseViewController,UITableViewDelegate,UITa
             }
             let cell = tableView.dequeueReusableCell(withIdentifier: "XiaDanCGDiZhiCell") as! XiaDanCGDiZhiCell
             cell.statusLbl.text = "寄"
+            cell.namelbl.text = dataModel?.s_consignee
+            cell.phoneLbl.text = dataModel?.s_mobile
+            cell.adrLbl.text = dataModel?.s_address
+            
             if indexPath.row == 2 {
                 cell.statusLbl.backgroundColor = UIColor(named: "企业、预售字体")
                 cell.statusLbl.text = "收"
+                
+                cell.namelbl.text = dataModel?.r_consignee
+                cell.phoneLbl.text = dataModel?.r_mobile
+                cell.adrLbl.text = dataModel?.r_address
             }
+            
             return cell
         case 1:
             if indexPath.row == 0 {
                 let cell = tableView.dequeueReusableCell(withIdentifier: "JiBenXinXiCell") as! JiBenXinXiCell
+                
+                cell.orderStatusLbl.text = dataModel?.delivery_status_cn
+                cell.payStatusLbl.text = dataModel?.pay_status_cn
+                
+                
                 return cell
             }
             
             let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
             cell.nameLbl.text = p2Arr[indexPath.row-1]
-            cell.textTF.text = p2Arr[indexPath.row-1]
+            
+            var arrStr:[String] = []
+            arrStr.append((dataModel?.sale_plat)!)
+            arrStr.append((dataModel?.order_sn)!)
+            arrStr.append(String(format: "%.2f", (dataModel?.freight_pre)!))
+            arrStr.append((dataModel?.fc_flag_cn)!)
+            
+            cell.textTF.text = arrStr[indexPath.row-1]
+            
             cell.textTF.isUserInteractionEnabled = false
             cell.line.isHidden = true
             return cell
             
         default:
-        if indexPath.row == 9 {
-            let cell = tableView.dequeueReusableCell(withIdentifier: "BtmBtnCell") as! BtmBtnCell
-            return cell
-        }
+            if indexPath.row == 9 {
+                let cell = tableView.dequeueReusableCell(withIdentifier: "BtmBtnCell") as! BtmBtnCell
+                cell.delegate = self
+                return cell
+            }
             let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
             cell.textTF.isUserInteractionEnabled = false
             cell.line.isHidden = true
             cell.nameLbl.text = p3Arr[indexPath.row]
-            cell.textTF.text = p3Arr[indexPath.row]
+            
+            var arrStr:[String] = []
+            arrStr.append((dataModel?.express_item_name)!)
+            arrStr.append(String(format: "%.2f", (dataModel?.weight)!))
+            arrStr.append(StringByInt(number: (dataModel?.express_item_qty)!))
+            arrStr.append(String(format: "%.2f", (dataModel?.volume)!))
+            arrStr.append((dataModel?.tempture_num)!)
+            arrStr.append((dataModel?.home_delivery_on_cn)!)
+            arrStr.append((dataModel?.site_delivery_cn)!)
+            arrStr.append(String(format: "%.2f", (dataModel?.guarantee_value)!))
+            arrStr.append((dataModel?.remark)!)
+            
+            cell.textTF.text = arrStr[indexPath.row]
             return cell
         }
     }
     
+    func selectBtmBtnCellBy(index: Int) {
+        switch index {
+        case 0:
+            let vc = XiaYunDanViewController()
+            self.navigationController?.pushViewController(vc, animated: true)
+        case 1:
+            let vc = YunDanXiangQingViewController()
+            self.navigationController?.pushViewController(vc, animated: true)
+        case 2:
+            let vc = YDLBVc()
+            self.navigationController?.pushViewController(vc, animated: true)
+        default:
+            break
+        }
+    }
     
 }