Skip to content

G
GeliBusinessPlatform
Commit 517a57b3 authored by 刘俊宏's avatar 刘俊宏
Browse files
Options

货拉拉运单详情ing

parent 11d0016a
Expand all Show whitespace changes
Inline Side-by-side
Showing with 195 additions and 22 deletions
GeliBusinessPlatform/Assets.xcassets/货拉拉/货拉拉待接单.imageset/Contents.json 0 → 100644
View file @ 517a57b3
{
"images" : [
{
"filename" : "货拉拉待接单.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "货拉拉待接单@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "货拉拉待接单@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Assets.xcassets/货拉拉/货拉拉待装货.imageset/Contents.json 0 → 100644
View file @ 517a57b3
{
"images" : [
{
"filename" : "货拉拉待装货.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "货拉拉待装货@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "货拉拉待装货@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Assets.xcassets/货拉拉/货拉拉运单取消.imageset/Contents.json 0 → 100644
View file @ 517a57b3
{
"images" : [
{
"filename" : "货拉拉运单取消.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "货拉拉运单取消@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "货拉拉运单取消@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Assets.xcassets/货拉拉/货拉拉运单完成.imageset/Contents.json 0 → 100644
View file @ 517a57b3
{
"images" : [
{
"filename" : "货拉拉运单完成.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "货拉拉运单完成@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "货拉拉运单完成@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Assets.xcassets/货拉拉/货拉拉运输中.imageset/Contents.json 0 → 100644
View file @ 517a57b3
{
"images" : [
{
"filename" : "货拉拉运输中.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "货拉拉运输中@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "货拉拉运输中@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Model/LalamoveInterface/LalamoveModel.swift
View file @ 517a57b3
......@@ -541,6 +541,7 @@ class getHllOrderDetailsDataModel: Mappable {
var order_detail_item :getHllOrderDetailsOrderDetailItemDataModel?//订单明细信息
var driver_info :getHllOrderDetailsdriverInfoDataModel?//接单司机信息
var delivery :getHllOrderDetailsSalePlatDataModel?//关联信息
required init?( map: Map) {
......@@ -548,6 +549,22 @@ class getHllOrderDetailsDataModel: Mappable {
func mapping(map: Map) {
order_detail_item <- map["order_detail_item"]
driver_info <- map["driver_info"]
delivery <- map["delivery"]
}
}
class getHllOrderDetailsSalePlatDataModel: Mappable {
var sale_plat : String?
var order_sn : String?
required init?( map: Map) {
}
func mapping(map: Map) {
sale_plat <- map["sale_plat"]
order_sn <- map["order_sn"]
}
}
class getHllOrderDetailsdriverInfoDataModel: Mappable {
......@@ -670,7 +687,7 @@ class orderDetailItemDataModel: Mappable { //订单信息
var create_time : String?// 订单创建时间， 示例：2019-12-25 12:47:14
var order_reason : String?//员工用车原因
var remark : String?//订单备注
var price_fen : Int?//订单总价格
var price_fen : Float?//订单总价格
var user_id : Int?//下单用户ID
var city_id : Int?//下单城市ID
var ep_id : Int?//下单用户企业账号ID
......@@ -753,14 +770,14 @@ class orderDetailItemOrderPriceArrDataModel: Mappable { //订单计价明细数
var type : Int?//
// 计价类型 1-起步价,2-超里程价,3-拉拉券扣减,4-额外需求产生的费用,5-小费,6-规格,7-平台订单补贴,8-司机添加的额外费用,15-货物保险费用,21-高速费,22-停车费,23-搬运费,24-其他,25-逾时等候费
var price_fen : Int?//费用金额(分) 示例：0
var price_fen : Float?//费用金额(分) 示例：0
var pay_status : Int?//支付状态 1已支付, 0未支付
required init?( map: Map) {
}
func mapping(map: Map) {
type <- map["bill_type"]
type <- map["type"]
price_fen <- map["price_fen"]
pay_status <- map["pay_status"]
}
......
GeliBusinessPlatform/View/Cell/TitleAndLblCell.xib
View file @ 517a57b3
<?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_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
......
GeliBusinessPlatform/View/Cell/TitleHeaderCell.xib
View file @ 517a57b3
<?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_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>
......@@ -17,10 +18,10 @@
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<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="KOf-o4-7xH">
<rect key="frame" x="15" y="25.5" width="65.5" height="18.5"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="额外费用" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="KOf-o4-7xH">
<rect key="frame" x="15" y="25.5" width="52.5" height="18.5"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="13"/>
<color key="textColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="0.84705882352941175" colorSpace="calibratedRGB"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
......@@ -36,4 +37,9 @@
<point key="canvasLocation" x="132" y="107"/>
</tableViewCell>
</objects>
<resources>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/DriverItemTableViewCell.swift
View file @ 517a57b3
......@@ -10,6 +10,9 @@ import UIKit
class DriverItemTableViewCell: UITableViewCell {
@IBOutlet weak var driverTypeLbl: UILabel!
@IBOutlet weak var driverNumLbL: UILabel!
@IBOutlet weak var driverNameLbl: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
......
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/DriverItemTableViewCell.xib
View file @ 517a57b3
<?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_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
......@@ -31,20 +31,20 @@
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="黄师傅" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c3R-LQ-jdQ">
<rect key="frame" x="130" y="37" width="45" height="21"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="c3R-LQ-jdQ">
<rect key="frame" x="130" y="37" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="15"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="粤ADK023 (野马)" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nhF-X3-1zA">
<rect key="frame" x="130" y="64.5" width="107" height="19"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="nhF-X3-1zA">
<rect key="frame" x="130" y="102" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="厢式货车（长27*款16.7*高3.6）" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bcL-SK-guN">
<rect key="frame" x="130" y="86.5" width="188" height="18.5"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bcL-SK-guN">
<rect key="frame" x="130" y="105" width="0.0" height="0.0"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="13"/>
<color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/>
......@@ -62,6 +62,11 @@
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="driverNameLbl" destination="c3R-LQ-jdQ" id="C3m-lo-xJH"/>
<outlet property="driverNumLbL" destination="nhF-X3-1zA" id="Ytf-0e-zQk"/>
<outlet property="driverTypeLbl" destination="bcL-SK-guN" id="9w6-1w-7Ik"/>
</connections>
<point key="canvasLocation" x="173.18840579710147" y="157.36607142857142"/>
</tableViewCell>
</objects>
......
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/TitleTimeHeaderFooterView.swift
View file @ 517a57b3
......@@ -10,6 +10,13 @@ import Foundation
class TitleTimeHeaderFooterView: UIView {
var contentView:UIView!
@IBOutlet weak var specLbl5: UILabel!
@IBOutlet weak var specLbl4: UILabel!
@IBOutlet weak var specLbl3: UILabel!
@IBOutlet weak var specLbl2: UILabel!
@IBOutlet weak var specLbl1: UILabel!
@IBOutlet weak var specLbl0: UILabel!
@IBOutlet weak var driveTypeNameLbl: UILabel!
@IBOutlet weak var fuTitleLbl: UILabel!
@IBOutlet weak var titleLbl: UILabel!
//初始化时将xib中的view添加进来
......
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillAddressItemCell.xib
View file @ 517a57b3
<?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_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
......@@ -49,7 +49,7 @@
</userDefinedRuntimeAttributes>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="黄小丽 18378147992" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="d4F-L8-sHy">
<rect key="frame" x="46" y="74" width="297" height="16"/>
<rect key="frame" x="46" y="84" width="297" height="16"/>
<constraints>
<constraint firstAttribute="height" constant="16" id="bGF-qJ-Zma"/>
</constraints>
......@@ -58,9 +58,23 @@
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="JfY-Q9-10Q">
<rect key="frame" x="46" y="29" width="292" height="42"/>
<rect key="frame" x="46" y="29" width="292" height="52"/>
<attributedString key="attributedText">
<fragment content="广东省广州市白云区嘉禾望岗白云大道交叉路口东南侧（望岗村民委员会西侧约150米">
<fragment content="广东省广州市白云区嘉禾望岗白云大道交叉路口东南侧（望岗">
<attributes>
<color key="NSColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<font key="NSFont" size="11" name="PingFangSC-Regular"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="3" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content="村民">
<attributes>
<color key="NSColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<font key="NSFont" size="12" name="PingFangSC-Regular"/>
<paragraphStyle key="NSParagraphStyle" alignment="left" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="3" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
<fragment content="委员会西侧约150米">
<attributes>
<color key="NSColor" red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
<font key="NSFont" size="11" name="PingFangSC-Regular"/>
......@@ -97,7 +111,7 @@
<constraint firstItem="JJG-L3-lyj" firstAttribute="top" secondItem="Zm0-Vi-78r" secondAttribute="bottom" constant="2" id="YGa-qO-R9y"/>
<constraint firstItem="Zm0-Vi-78r" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" id="ZMj-hd-wiR"/>
<constraint firstItem="JfY-Q9-10Q" firstAttribute="leading" secondItem="wxD-2W-Kct" secondAttribute="leading" id="d9o-tS-vGG"/>
<constraint firstAttribute="bottom" secondItem="d4F-L8-sHy" secondAttribute="bottom" constant="10" id="enF-EC-E99"/>
<constraint firstAttribute="bottom" secondItem="d4F-L8-sHy" secondAttribute="bottom" id="enF-EC-E99"/>
<constraint firstAttribute="trailing" secondItem="d4F-L8-sHy" secondAttribute="trailing" constant="15" id="fik-0a-bN6"/>
<constraint firstItem="d4F-L8-sHy" firstAttribute="leading" secondItem="wxD-2W-Kct" secondAttribute="leading" id="geB-F3-UYR"/>
<constraint firstAttribute="trailing" secondItem="JfY-Q9-10Q" secondAttribute="trailing" constant="20" id="rWE-FX-NSP"/>
......@@ -117,7 +131,7 @@
<outlet property="lineView" destination="eV0-oM-vuy" id="6LP-YK-WUE"/>
<outlet property="namePhoneLbl" destination="d4F-L8-sHy" id="4lt-Va-UDs"/>
</connections>
<point key="canvasLocation" x="194.20289855072465" y="120.53571428571428"/>
<point key="canvasLocation" x="-252" y="11"/>
</tableViewCell>
</objects>
<resources>
......
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillStautsTableViewCell.swift
View file @ 517a57b3
......@@ -10,6 +10,8 @@ import UIKit
class WayBillStautsTableViewCell: UITableViewCell {
@IBOutlet weak var statusImgV: UIImageView!
@IBOutlet weak var statusLbl: UILabel!
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
......
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillStautsTableViewCell.xib
View file @ 517a57b3
<?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_1" orientation="portrait" appearance="light"/>
<dependencies>
<deployment identifier="iOS"/>
......@@ -50,6 +50,10 @@
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections>
<outlet property="statusImgV" destination="UfI-eg-vON" id="Cm6-1F-KYy"/>
<outlet property="statusLbl" destination="obx-QZ-ioI" id="CRQ-Rf-MIn"/>
</connections>
<point key="canvasLocation" x="136.95652173913044" y="173.77232142857142"/>
</tableViewCell>
</objects>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment