Skip to content

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

货拉拉运单详情UI完善

parent 1cd4e7de
Show whitespace changes
Inline Side-by-side
Showing with 164 additions and 48 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ af85b98d
...@@ -552,6 +552,8 @@ ...@@ -552,6 +552,8 @@
F96E9D60246657B500B5B94A /* HGImage.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F96E9D5E246657B500B5B94A /* HGImage.xcassets */; }; F96E9D60246657B500B5B94A /* HGImage.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F96E9D5E246657B500B5B94A /* HGImage.xcassets */; };
F96E9D61246657B500B5B94A /* HGImage.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F96E9D5F246657B500B5B94A /* HGImage.storyboard */; }; F96E9D61246657B500B5B94A /* HGImage.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = F96E9D5F246657B500B5B94A /* HGImage.storyboard */; };
F971D7B3248B6432007F1619 /* address_new.json in Resources */ = {isa = PBXBuildFile; fileRef = F971D7B2248B6432007F1619 /* address_new.json */; }; F971D7B3248B6432007F1619 /* address_new.json in Resources */ = {isa = PBXBuildFile; fileRef = F971D7B2248B6432007F1619 /* address_new.json */; };
F993C66E24CADE2400493CC7 /* WayBillStautsTableViewCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = F993C66C24CADE2400493CC7 /* WayBillStautsTableViewCell.swift */; };
F993C66F24CADE2400493CC7 /* WayBillStautsTableViewCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = F993C66D24CADE2400493CC7 /* WayBillStautsTableViewCell.xib */; };
F9956B1C2463D941001A617D /* WorkSelectTimeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9956B1B2463D941001A617D /* WorkSelectTimeView.xib */; }; F9956B1C2463D941001A617D /* WorkSelectTimeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = F9956B1B2463D941001A617D /* WorkSelectTimeView.xib */; };
F9956B1E2463D94E001A617D /* WorkSelectTimeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9956B1D2463D94E001A617D /* WorkSelectTimeView.swift */; }; F9956B1E2463D94E001A617D /* WorkSelectTimeView.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9956B1D2463D94E001A617D /* WorkSelectTimeView.swift */; };
F9956B22246408A6001A617D /* GoodsClassViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9956B20246408A6001A617D /* GoodsClassViewController.swift */; }; F9956B22246408A6001A617D /* GoodsClassViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F9956B20246408A6001A617D /* GoodsClassViewController.swift */; };
...@@ -1204,6 +1206,8 @@ ...@@ -1204,6 +1206,8 @@
F96E9D5E246657B500B5B94A /* HGImage.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = HGImage.xcassets; sourceTree = "<group>"; }; F96E9D5E246657B500B5B94A /* HGImage.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = HGImage.xcassets; sourceTree = "<group>"; };
F96E9D5F246657B500B5B94A /* HGImage.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = HGImage.storyboard; sourceTree = "<group>"; }; F96E9D5F246657B500B5B94A /* HGImage.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = HGImage.storyboard; sourceTree = "<group>"; };
F971D7B2248B6432007F1619 /* address_new.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = address_new.json; sourceTree = "<group>"; }; F971D7B2248B6432007F1619 /* address_new.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = address_new.json; sourceTree = "<group>"; };
F993C66C24CADE2400493CC7 /* WayBillStautsTableViewCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WayBillStautsTableViewCell.swift; sourceTree = "<group>"; };
F993C66D24CADE2400493CC7 /* WayBillStautsTableViewCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WayBillStautsTableViewCell.xib; sourceTree = "<group>"; };
F9956B1B2463D941001A617D /* WorkSelectTimeView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WorkSelectTimeView.xib; sourceTree = "<group>"; }; F9956B1B2463D941001A617D /* WorkSelectTimeView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = WorkSelectTimeView.xib; sourceTree = "<group>"; };
F9956B1D2463D94E001A617D /* WorkSelectTimeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkSelectTimeView.swift; sourceTree = "<group>"; }; F9956B1D2463D94E001A617D /* WorkSelectTimeView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WorkSelectTimeView.swift; sourceTree = "<group>"; };
F9956B20246408A6001A617D /* GoodsClassViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoodsClassViewController.swift; sourceTree = "<group>"; }; F9956B20246408A6001A617D /* GoodsClassViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GoodsClassViewController.swift; sourceTree = "<group>"; };
...@@ -2939,6 +2943,8 @@ ...@@ -2939,6 +2943,8 @@
F96E48A624CA90DC000AB8D4 /* DriverItemTableViewCell.xib */, F96E48A624CA90DC000AB8D4 /* DriverItemTableViewCell.xib */,
F9F2866624CA95FD00959142 /* TitleTimeHeaderFooterView.swift */, F9F2866624CA95FD00959142 /* TitleTimeHeaderFooterView.swift */,
F96E48A924CA9559000AB8D4 /* TitleTimeHeaderFooterView.xib */, F96E48A924CA9559000AB8D4 /* TitleTimeHeaderFooterView.xib */,
F993C66C24CADE2400493CC7 /* WayBillStautsTableViewCell.swift */,
F993C66D24CADE2400493CC7 /* WayBillStautsTableViewCell.xib */,
); );
path = cell; path = cell;
sourceTree = "<group>"; sourceTree = "<group>";
...@@ -3103,6 +3109,7 @@ ...@@ -3103,6 +3109,7 @@
E0D197C7244845FD002B080C /* PersonCenterViewController.xib in Resources */, E0D197C7244845FD002B080C /* PersonCenterViewController.xib in Resources */,
F93E320B2473D83D00524DFC /* GeliAlertTextFiled.xib in Resources */, F93E320B2473D83D00524DFC /* GeliAlertTextFiled.xib in Resources */,
E07B1E5F24591AA50055BA3C /* KeHuXQViewController.xib in Resources */, E07B1E5F24591AA50055BA3C /* KeHuXQViewController.xib in Resources */,
F993C66F24CADE2400493CC7 /* WayBillStautsTableViewCell.xib in Resources */,
E095C42724874BDA00922571 /* CKNonGmCell.xib in Resources */, E095C42724874BDA00922571 /* CKNonGmCell.xib in Resources */,
E0707DD624624B5200E039A8 /* AMap.bundle in Resources */, E0707DD624624B5200E039A8 /* AMap.bundle in Resources */,
E02DDD83244FD15B00ABB707 /* TitleAndSwitchHeaderView.xib in Resources */, E02DDD83244FD15B00ABB707 /* TitleAndSwitchHeaderView.xib in Resources */,
...@@ -3460,6 +3467,7 @@ ...@@ -3460,6 +3467,7 @@
F950FDDD24518B9500C40530 /* FSCalendarCollectionViewLayout.m in Sources */, F950FDDD24518B9500C40530 /* FSCalendarCollectionViewLayout.m in Sources */,
E07B1E5E24591AA50055BA3C /* KeHuXQViewController.swift in Sources */, E07B1E5E24591AA50055BA3C /* KeHuXQViewController.swift in Sources */,
F9DDBE962457D3EC00A32CB2 /* WebViewController.swift in Sources */, F9DDBE962457D3EC00A32CB2 /* WebViewController.swift in Sources */,
F993C66E24CADE2400493CC7 /* WayBillStautsTableViewCell.swift in Sources */,
F90F882324C841280050EF02 /* UITableViewIndexView.swift in Sources */, F90F882324C841280050EF02 /* UITableViewIndexView.swift in Sources */,
F956D5AA246A2D9C003FF510 /* LMNBulletsLine.m in Sources */, F956D5AA246A2D9C003FF510 /* LMNBulletsLine.m in Sources */,
E0E4456B24B0221500EF788E /* LogisticsInterface.swift in Sources */, E0E4456B24B0221500EF788E /* LogisticsInterface.swift in Sources */,
......
GeliBusinessPlatform/Assets.xcassets/货拉拉/wancheng.imageset/Contents.json 0 → 100644
View file @ af85b98d
{
"images" : [
{
"filename" : "wancheng.png",
"idiom" : "universal",
"scale" : "1x"
},
{
"filename" : "wancheng@2x.png",
"idiom" : "universal",
"scale" : "2x"
},
{
"filename" : "wancheng@3x.png",
"idiom" : "universal",
"scale" : "3x"
}
],
"info" : {
"author" : "xcode",
"version" : 1
}
}
GeliBusinessPlatform/Define/Define.swift
View file @ af85b98d
...@@ -27,10 +27,10 @@ let systemVersion = (UIDevice.current.systemVersion as String) ...@@ -27,10 +27,10 @@ let systemVersion = (UIDevice.current.systemVersion as String)
//接口地址 //接口地址
//test //test
//let SERVERCE_ImageHost = "https://z.gelifood.com/" let SERVERCE_ImageHost = "https://z.gelifood.com/"
//let SERVERCE_HOST = "https://z.gelifood.com/admin/" let SERVERCE_HOST = "https://z.gelifood.com/admin/"
let SERVERCE_ImageHost = "https://zx.gelifood.com/" //let SERVERCE_ImageHost = "https://zx.gelifood.com/"
let SERVERCE_HOST = "https://zx.gelifood.com/admin/" //let SERVERCE_HOST = "https://zx.gelifood.com/admin/"
////online ////online
//视图常量 //视图常量
......
GeliBusinessPlatform/ViewController/代客下单（货运）/下单成功/ChengGongCell.xib
View file @ af85b98d
<?xml version="1.0" encoding="UTF-8"?> <?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"/> <device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies> <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="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/> <capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/> <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
...@@ -10,7 +11,7 @@ ...@@ -10,7 +11,7 @@
<objects> <objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/> <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/> <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="ChengGongCell" customModule="GeliBusinessPlatform" customModuleProvider="target"> <tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="ChengGongCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="375" height="136.5"/> <rect key="frame" x="0.0" y="0.0" width="375" height="136.5"/>
<autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/> <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"> <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="KGk-i7-Jjw" id="H2p-sc-9uM">
......
GeliBusinessPlatform/ViewController/货拉拉/费用明细/LogisticsCostDetailViewController.swift
View file @ af85b98d
...@@ -17,16 +17,12 @@ class LogisticsCostDetailViewController: BaseViewController { ...@@ -17,16 +17,12 @@ class LogisticsCostDetailViewController: BaseViewController {
navbar.title = "费用明细" navbar.title = "费用明细"
self.view.addSubview(navbar) self.view.addSubview(navbar)
navbar.rightTitle = "收费标准"
navbar.rightBtnColor = UIColor.init(named: "灰色字体颜色")
SetTopFrameView(view: contentV, btmView: self.view) SetTopFrameView(view: contentV, btmView: self.view)
setCostDetailView() setCostDetailView()
} }
func rightBtnClick() {
print("收费标准")
}
//临时UI，待数据,可能有多个，多到要滚动（暂时先考虑够显示） //临时UI，待数据,可能有多个，多到要滚动（暂时先考虑够显示）
func setCostDetailView() { func setCostDetailView() {
......
GeliBusinessPlatform/ViewController/货拉拉/运单详情/WaybillDetailViewController.swift
View file @ af85b98d
...@@ -19,57 +19,69 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab ...@@ -19,57 +19,69 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
listView.register(UINib(nibName: "WayBillAddressItemCell", bundle: nil), forCellReuseIdentifier: "WayBillAddressItemCell") listView.register(UINib(nibName: "WayBillAddressItemCell", bundle: nil), forCellReuseIdentifier: "WayBillAddressItemCell")
listView.register(UINib(nibName: "DriverItemTableViewCell", bundle: nil), forCellReuseIdentifier: "DriverItemTableViewCell") listView.register(UINib(nibName: "DriverItemTableViewCell", bundle: nil), forCellReuseIdentifier: "DriverItemTableViewCell")
listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell") listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
listView.register(UINib(nibName: "WayBillStautsTableViewCell", bundle: nil), forCellReuseIdentifier: "WayBillStautsTableViewCell")
} }
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int { func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if section == 0 { if section == 0 {
return 1 return 1
} }
if section == 3 || section == 4{ if section == 1 {
return 1
}
if section == 4 || section == 5{
return 2 return 2
} }
return 3 return 3
} }
func numberOfSections(in tableView: UITableView) -> Int { func numberOfSections(in tableView: UITableView) -> Int {
return 5; return 6;
} }
func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat { func tableView(_ tableView: UITableView, heightForRowAt indexPath: IndexPath) -> CGFloat {
if indexPath.section == 0 { if indexPath.section == 0 {
return 60
}
if indexPath.section == 1 {
return 103 return 103
} }
if indexPath.section == 2 { if indexPath.section == 3 {
return 30 return 30
} }
if indexPath.section == 3 || indexPath.section == 4{ if indexPath.section == 4 || indexPath.section == 5{
return 35 return 35
} }
return UITableView.automaticDimension return UITableView.automaticDimension
} }
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell { func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.section == 0 { if indexPath.section == 0 {
let cell = tableView.dequeueReusableCell(withIdentifier: "WayBillStautsTableViewCell") as! WayBillStautsTableViewCell
return cell
}
if indexPath.section == 1 {
let cell = tableView.dequeueReusableCell(withIdentifier: "DriverItemTableViewCell") as! DriverItemTableViewCell let cell = tableView.dequeueReusableCell(withIdentifier: "DriverItemTableViewCell") as! DriverItemTableViewCell
return cell return cell
} }
if indexPath.section == 2 || indexPath.section == 3 || indexPath.section == 4{ if indexPath.section == 3 || indexPath.section == 4 || indexPath.section == 5{
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
cell.textTF.isUserInteractionEnabled = false cell.textTF.isUserInteractionEnabled = false
cell.line.isHidden = true cell.line.isHidden = true
if indexPath.section == 2 { if indexPath.section == 3 {
cell.nameLbl.text = "起步价（小面包车）" cell.nameLbl.text = "起步价（小面包车）"
cell.textTF.text = "¥22.4" cell.textTF.text = "¥22.4"
cell.nameLbl.textColor = UIColor.init(named: "灰色字体颜色") cell.nameLbl.textColor = UIColor.init(named: "灰色字体颜色")
cell.textTF.textColor = UIColor.init(named: "标题字颜色") cell.textTF.textColor = UIColor.init(named: "标题字颜色")
}else if indexPath.section == 3 { }else if indexPath.section == 4 {
cell.nameLbl.text = "关联平台" cell.nameLbl.text = "关联平台"
cell.textTF.text = "格利食品网" cell.textTF.text = "格利食品网"
cell.nameLbl.textColor = UIColor.init(named: "标题字颜色") cell.nameLbl.textColor = UIColor.init(named: "标题字颜色")
cell.textTF.textColor = UIColor.init(named: "标题字颜色") cell.textTF.textColor = UIColor.init(named: "标题字颜色")
}else if indexPath.section == 4 { }else if indexPath.section == 5 {
cell.nameLbl.textColor = UIColor.init(named: "标题字颜色") cell.nameLbl.textColor = UIColor.init(named: "标题字颜色")
cell.textTF.textColor = UIColor.init(named: "灰色字体颜色") cell.textTF.textColor = UIColor.init(named: "灰色字体颜色")
cell.nameLbl.text = "货物保障" cell.nameLbl.text = "货物保障"
...@@ -114,10 +126,10 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab ...@@ -114,10 +126,10 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
} }
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat { func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
if section == 1 || section == 2{ if section == 2 || section == 3{
return 45 return 45
} }
if section == 3 || section == 4{ if section == 4 || section == 5{
return 10 return 10
} }
return 0.01 return 0.01
...@@ -129,13 +141,13 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab ...@@ -129,13 +141,13 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
} }
headerView.backgroundColor = UIColor.white headerView.backgroundColor = UIColor.white
if section == 1 || section == 2 { if section == 2 || section == 3 {
let headerV = TitleTimeHeaderFooterView() let headerV = TitleTimeHeaderFooterView()
headerView.addSubview(headerV) headerView.addSubview(headerV)
headerV.snp.makeConstraints { (make) in headerV.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalTo(0); make.left.top.right.bottom.equalTo(0);
} }
if section == 2 { if section == 3 {
headerV.titleLbl.text = "订单费用" headerV.titleLbl.text = "订单费用"
headerV.fuTitleLbl.text = "总计¥662.6" headerV.fuTitleLbl.text = "总计¥662.6"
headerV.titleLbl.font = UIFont.boldSystemFont(ofSize: 15) headerV.titleLbl.font = UIFont.boldSystemFont(ofSize: 15)
...@@ -147,13 +159,13 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab ...@@ -147,13 +159,13 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
return headerView return headerView
} }
func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat { func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
if section == 1 { if section == 2 {
return 110 return 110
} }
if section == 2 { if section == 3 {
return 60 return 60
} }
if section == 3 || section == 4{ if section == 4 || section == 5{
return 10 return 10
} }
...@@ -168,7 +180,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab ...@@ -168,7 +180,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
let lineView = UIView() let lineView = UIView()
lineView.backgroundColor = UIColor.init(named: "灰色分界线") lineView.backgroundColor = UIColor.init(named: "灰色分界线")
if section == 1 { if section == 2 {
let footerV = TitleTimeHeaderFooterView() let footerV = TitleTimeHeaderFooterView()
footerView.addSubview(footerV) footerView.addSubview(footerV)
footerV.snp.makeConstraints { (make) in footerV.snp.makeConstraints { (make) in
...@@ -184,7 +196,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab ...@@ -184,7 +196,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
make.height.equalTo(5) make.height.equalTo(5)
} }
} }
if section == 2 { if section == 3 {
let tishiLbl = UILabel() let tishiLbl = UILabel()
tishiLbl.text = "若产生消费、高速费、停车费、逾时等候费和搬运费，需要您额外支付。额外费用不可使用赠金支付" tishiLbl.text = "若产生消费、高速费、停车费、逾时等候费和搬运费，需要您额外支付。额外费用不可使用赠金支付"
tishiLbl.numberOfLines = 0 tishiLbl.numberOfLines = 0
...@@ -204,7 +216,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab ...@@ -204,7 +216,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
make.height.equalTo(5) make.height.equalTo(5)
} }
} }
if section == 3 { if section == 4 {
footerView.addSubview(lineView) footerView.addSubview(lineView)
lineView.snp.makeConstraints { (make) in lineView.snp.makeConstraints { (make) in
make.left.bottom.right.equalTo(0) make.left.bottom.right.equalTo(0)
......
GeliBusinessPlatform/ViewController/货拉拉/运单详情/WaybillDetailViewController.xib
View file @ af85b98d
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
<subviews> <subviews>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="t9e-fZ-mil"> <tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" style="grouped" separatorStyle="none" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="t9e-fZ-mil">
<rect key="frame" x="0.0" y="44" width="414" height="852"/> <rect key="frame" x="0.0" y="44" width="414" height="852"/>
<color key="backgroundColor" name="app底色"/> <color key="backgroundColor" name="白色背景色"/>
<connections> <connections>
<outlet property="dataSource" destination="-1" id="Ue9-ix-Dvl"/> <outlet property="dataSource" destination="-1" id="Ue9-ix-Dvl"/>
<outlet property="delegate" destination="-1" id="g8m-rX-68V"/> <outlet property="delegate" destination="-1" id="g8m-rX-68V"/>
...@@ -41,8 +41,8 @@ ...@@ -41,8 +41,8 @@
</view> </view>
</objects> </objects>
<resources> <resources>
<namedColor name="app底色"> <namedColor name="白色背景色">
<color red="0.94509803921568625" green="0.94509803921568625" blue="0.94509803921568625" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
</resources> </resources>
</document> </document>
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/DriverItemTableViewCell.xib
View file @ af85b98d
...@@ -49,25 +49,15 @@ ...@@ -49,25 +49,15 @@
<color key="textColor" name="灰色字体颜色"/> <color key="textColor" name="灰色字体颜色"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="xAU-Y2-m4K">
<rect key="frame" x="0.0" y="141" width="377" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="oXy-7p-8ik"/>
</constraints>
</view>
</subviews> </subviews>
<constraints> <constraints>
<constraint firstItem="bcL-SK-guN" firstAttribute="leading" secondItem="Wqp-PP-Pfx" secondAttribute="trailing" constant="22" id="7Al-j8-Lyg"/> <constraint firstItem="bcL-SK-guN" firstAttribute="leading" secondItem="Wqp-PP-Pfx" secondAttribute="trailing" constant="22" id="7Al-j8-Lyg"/>
<constraint firstItem="bcL-SK-guN" firstAttribute="bottom" secondItem="Wqp-PP-Pfx" secondAttribute="bottom" id="Ce9-JT-2f6"/> <constraint firstItem="bcL-SK-guN" firstAttribute="bottom" secondItem="Wqp-PP-Pfx" secondAttribute="bottom" id="Ce9-JT-2f6"/>
<constraint firstAttribute="bottom" secondItem="xAU-Y2-m4K" secondAttribute="bottom" id="IrZ-1V-YGv"/>
<constraint firstItem="Wqp-PP-Pfx" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="40" id="Rpj-Y6-gIc"/> <constraint firstItem="Wqp-PP-Pfx" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="40" id="Rpj-Y6-gIc"/>
<constraint firstItem="c3R-LQ-jdQ" firstAttribute="top" secondItem="Wqp-PP-Pfx" secondAttribute="top" id="dNU-hd-aY5"/> <constraint firstItem="c3R-LQ-jdQ" firstAttribute="top" secondItem="Wqp-PP-Pfx" secondAttribute="top" id="dNU-hd-aY5"/>
<constraint firstItem="c3R-LQ-jdQ" firstAttribute="leading" secondItem="Wqp-PP-Pfx" secondAttribute="trailing" constant="22" id="giH-j3-uz0"/> <constraint firstItem="c3R-LQ-jdQ" firstAttribute="leading" secondItem="Wqp-PP-Pfx" secondAttribute="trailing" constant="22" id="giH-j3-uz0"/>
<constraint firstItem="Wqp-PP-Pfx" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="hBt-Bl-2Gz"/> <constraint firstItem="Wqp-PP-Pfx" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="hBt-Bl-2Gz"/>
<constraint firstItem="nhF-X3-1zA" firstAttribute="leading" secondItem="Wqp-PP-Pfx" secondAttribute="trailing" constant="22" id="jwA-BP-bb4"/> <constraint firstItem="nhF-X3-1zA" firstAttribute="leading" secondItem="Wqp-PP-Pfx" secondAttribute="trailing" constant="22" id="jwA-BP-bb4"/>
<constraint firstItem="xAU-Y2-m4K" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="qXW-Po-Ukp"/>
<constraint firstAttribute="trailing" secondItem="xAU-Y2-m4K" secondAttribute="trailing" id="wZd-6Q-6ie"/>
<constraint firstItem="bcL-SK-guN" firstAttribute="top" secondItem="nhF-X3-1zA" secondAttribute="bottom" constant="3" id="zZB-N8-JAA"/> <constraint firstItem="bcL-SK-guN" firstAttribute="top" secondItem="nhF-X3-1zA" secondAttribute="bottom" constant="3" id="zZB-N8-JAA"/>
</constraints> </constraints>
</tableViewCellContentView> </tableViewCellContentView>
...@@ -82,9 +72,6 @@ ...@@ -82,9 +72,6 @@
<namedColor name="标题字颜色"> <namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色字体颜色"> <namedColor name="灰色字体颜色">
<color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/> <color red="0.40000000000000002" green="0.40000000000000002" blue="0.40000000000000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
......
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillAddressItemCell.swift
View file @ af85b98d
...@@ -27,8 +27,8 @@ class WayBillAddressItemCell: UITableViewCell { ...@@ -27,8 +27,8 @@ class WayBillAddressItemCell: UITableViewCell {
super.layoutSubviews() super.layoutSubviews()
self.contentView.setNeedsLayout() self.contentView.setNeedsLayout()
self.contentView.layoutIfNeeded() self.contentView.layoutIfNeeded()
drawLineOfDashByCAShapeLayer(lineView:lineView, lineLength: 5, lineSpacing: 5, lineColor: UIColor.init(named: "虚线分界线颜色")!, isHorizonal: false) drawLineOfDashByCAShapeLayer(lineView:lineView, lineLength: 4, lineSpacing: 4, lineColor: UIColor.init(named: "虚线分界线颜色")!, isHorizonal: false)
drawLineOfDashByCAShapeLayer(lineView:lineTopView, lineLength: 5, lineSpacing: 5, lineColor: UIColor.init(named: "虚线分界线颜色")!, isHorizonal: false) drawLineOfDashByCAShapeLayer(lineView:lineTopView, lineLength: 4, lineSpacing: 4, lineColor: UIColor.init(named: "虚线分界线颜色")!, isHorizonal: false)
} }
override func setSelected(_ selected: Bool, animated: Bool) { override func setSelected(_ selected: Bool, animated: Bool) {
......
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillStautsTableViewCell.swift 0 → 100644
View file @ af85b98d
//
// WayBillStautsTableViewCell.swift
// GeliBusinessPlatform
//
// Created by 刘俊宏 on 2020/7/24.
// Copyright © 2020 junye lu. All rights reserved.
//
import UIKit
class WayBillStautsTableViewCell: UITableViewCell {
override func awakeFromNib() {
super.awakeFromNib()
// Initialization code
}
override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated)
// Configure the view for the selected state
}
}
GeliBusinessPlatform/ViewController/货拉拉/运单详情/cell/WayBillStautsTableViewCell.xib 0 → 100644
View file @ af85b98d
<?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="105" id="KGk-i7-Jjw" customClass="WayBillStautsTableViewCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="329" height="105"/>
<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="329" height="105"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="wancheng" translatesAutoresizingMaskIntoConstraints="NO" id="UfI-eg-vON">
<rect key="frame" x="119.5" y="37.5" width="30" height="30"/>
<constraints>
<constraint firstAttribute="width" constant="30" id="EZS-Hz-bb8"/>
<constraint firstAttribute="height" constant="30" id="eKt-sg-vsR"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="下单成功" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="obx-QZ-ioI">
<rect key="frame" x="159.5" y="42" width="60" height="21"/>
<fontDescription key="fontDescription" name="PingFangSC-Regular" family="PingFang SC" pointSize="15"/>
<color key="textColor" name="蓝色字体颜色"/>
<nil key="highlightedColor"/>
</label>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bhX-0u-Ccj">
<rect key="frame" x="0.0" y="104" width="329" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="Uju-Jz-Q3R"/>
</constraints>
</view>
</subviews>
<constraints>
<constraint firstItem="obx-QZ-ioI" firstAttribute="centerY" secondItem="UfI-eg-vON" secondAttribute="centerY" id="07g-hz-yuD"/>
<constraint firstItem="bhX-0u-Ccj" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" id="0G7-ou-uMm"/>
<constraint firstItem="UfI-eg-vON" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="5Zg-A3-0w8"/>
<constraint firstItem="UfI-eg-vON" firstAttribute="centerX" secondItem="H2p-sc-9uM" secondAttribute="centerX" constant="-30" id="857-XT-Yef"/>
<constraint firstAttribute="bottom" secondItem="bhX-0u-Ccj" secondAttribute="bottom" id="fvT-dp-4F2"/>
<constraint firstItem="obx-QZ-ioI" firstAttribute="leading" secondItem="UfI-eg-vON" secondAttribute="trailing" constant="10" id="oto-a1-qYS"/>
<constraint firstAttribute="trailing" secondItem="bhX-0u-Ccj" secondAttribute="trailing" id="zoD-Np-WNe"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<point key="canvasLocation" x="136.95652173913044" y="173.77232142857142"/>
</tableViewCell>
</objects>
<resources>
<image name="wancheng" width="32" height="32"/>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="蓝色字体颜色">
<color red="0.27843137254901962" green="0.5607843137254902" blue="0.8901960784313725" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources>
</document>
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