Skip to content

G
GeliBusinessPlatform
Commit c4f7ec41 authored by lujunye's avatar lujunye
Browse files
Options

Merge branch 'master' of http://git.gelifood.com/ljy/gelibusinessplatform

parents 4581a4ee 5d56066b
Hide whitespace changes
Inline Side-by-side
Showing with 103 additions and 56 deletions
GeliBusinessPlatform/Model/LalamoveInterface/LalamoveModel.swift
View file @ c4f7ec41
......@@ -636,7 +636,7 @@ class getHllOrderDetailsOrderDetailItemDataModel: Mappable {//订单明细信息
class specReqPriceArrDataModel: Mappable { //订单额外服务项及费用信息
var type : Int?//
var name : String?//例：拍照回单
var price_fen : Int?//费用
var price_fen : Float?//费用
var price_type : Int?//费用
var price_value_fen : Int?
......
GeliBusinessPlatform/ViewController/货拉拉/运单详情/WaybillDetailViewController.swift
View file @ c4f7ec41
......@@ -44,10 +44,11 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
bottomLheight.constant = 0
bottomLbl.isHidden = true
bottomBtn.isHidden = true
// setPaymentUI(data:datas)
setPaymentUI(data:datas)
}
@objc func loadData(){
indexNext = 0
HUD.flash(.progress)
let UserToken = UserDefaults.standard.value(forKey: "user_token")
......@@ -146,9 +147,16 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
return 2
}
if section == 4 {
if (dataModel?.order_detail_item?.spec_req_price_arr?.count)! > 0 && (dataModel?.order_detail_item?.bill_price_arr?.count)! > 0 {
return (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! + (dataModel?.order_detail_item?.bill_price_arr?.count)! + (dataModel?.order_detail_item?.spec_req_price_arr?.count)!
}
if (dataModel?.order_detail_item?.spec_req_price_arr?.count)! > 0 {
return (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! + (dataModel?.order_detail_item?.spec_req_price_arr?.count)!
}
if (dataModel?.order_detail_item?.bill_price_arr?.count)! > 0 {
return (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! + 1 + (dataModel?.order_detail_item?.bill_price_arr?.count)!
return (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! + (dataModel?.order_detail_item?.bill_price_arr?.count)!
}
return (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)!
}
return (dataModel?.order_detail_item?.order_item?.addr_info_arr!.count)!
......@@ -202,6 +210,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
return UITableView.automaticDimension
}
var indexNext = 0
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if tableView.tag == 99 {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
......@@ -268,37 +277,43 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
cell.line.isHidden = true
if indexPath.section == 4 {
if (dataModel?.order_detail_item?.bill_price_arr?.count)! > 0 {
if indexPath.row == (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleHeaderCell") as! TitleHeaderCell
return cell
if indexPath.row < ((dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! - indexNext) {
var rowModel = dataModel?.order_detail_item?.order_item?.order_price_arr![indexPath.row + indexNext]
if rowModel?.type == 4 || rowModel?.type == 8 {
if (indexPath.row + 1) < (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! {
rowModel = dataModel?.order_detail_item?.order_item?.order_price_arr![indexPath.row + 1]
indexNext = indexNext + 1
if rowModel?.type == 4 || rowModel?.type == 8 {
if (indexPath.row + 1) < (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! {
rowModel = dataModel?.order_detail_item?.order_item?.order_price_arr![indexPath.row + 1]
indexNext = indexNext + 1
}
}
}
}
}
if indexPath.row < (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! {
let rowModel = dataModel?.order_detail_item?.order_item?.order_price_arr![indexPath.row]
cell.nameLbl.text = ""
cell.textTF.text = "¥" + String(format: "%.2f", (rowModel?.price_fen)!)
switch rowModel?.type {
case 1:
cell.nameLbl.text = "起步价" + "(" + (dataModel?.order_detail_item?.order_item?.vehicle_type_name)! + ")"
case 2:
let distance = -(dataModel?.order_detail_item?.exceed_distance)!
let distance = (dataModel?.order_detail_item?.exceed_distance)!
cell.nameLbl.text = "超里程价" + "(" + String(format: "%.d", distance) + ")"
cell.nameLbl.text = "超里程价" + "(" + String(format: "%.d", distance) + "公里" + ")"
case 3:
cell.nameLbl.text = "拉拉券扣减"
case 4:
cell.nameLbl.text = "额外需求产生的费用"
case 5:
cell.nameLbl.text = "小费"
case 6:
cell.nameLbl.text = "规格"
case 7:
cell.nameLbl.text = "平台订单补贴"
case 8:
cell.nameLbl.text = "司机添加的额外费用"
case 15:
cell.nameLbl.text = "货物保障（0元最高保5万）"
case 21:
......@@ -314,29 +329,70 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
default:
break
}
cell.textTF.text = "¥" + String(format: "%.2f", (rowModel?.price_fen)!)
}
if indexPath.row > (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! {
let rowModel = dataModel?.order_detail_item?.bill_price_arr![(indexPath.row - (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)!) - 1]
cell.nameLbl.text = ""
switch rowModel?.bill_type {
case 1:
cell.nameLbl.text = "过桥费"
case 2:
cell.nameLbl.text = "停车费"
case 3:
cell.nameLbl.text = "搬运费"
case 5:
cell.nameLbl.text = "逾时等候费"
default:
break
if (dataModel?.order_detail_item?.spec_req_price_arr?.count)! > 0 {
if indexPath.row == (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! - indexNext {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleHeaderCell") as! TitleHeaderCell
cell.nameLbl.text = "额外需求产生的费用"
return cell
}else if (indexPath.row > (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! - indexNext) && indexPath.row < (((dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! - indexNext) + (dataModel?.order_detail_item?.spec_req_price_arr?.count)! + 1) {
let rowModel = dataModel?.order_detail_item?.spec_req_price_arr![(indexPath.row - (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! - indexNext) + 1]
cell.nameLbl.text = rowModel?.name
cell.textTF.text = "¥" + String(format: "%.2f", (rowModel?.price_fen)!)
}
cell.textTF.text = "¥" + String(format: "%.2f", (rowModel?.price_fen)!)
}
if (dataModel?.order_detail_item?.spec_req_price_arr?.count)! == 0 && (dataModel?.order_detail_item?.bill_price_arr?.count)! > 0 {
if indexPath.row == (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! - indexNext {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleHeaderCell") as! TitleHeaderCell
cell.nameLbl.text = "司机添加的额外费用"
return cell
}else if (indexPath.row > (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! - indexNext) && indexPath.row < (((dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! - indexNext) + (dataModel?.order_detail_item?.bill_price_arr?.count)! + 1) {
let rowModel = dataModel?.order_detail_item?.bill_price_arr![(indexPath.row - (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! - indexNext) + 1]
cell.nameLbl.text = ""
switch rowModel?.bill_type {
case 1:
cell.nameLbl.text = "过桥费"
case 2:
cell.nameLbl.text = "停车费"
case 3:
cell.nameLbl.text = "搬运费"
case 5:
cell.nameLbl.text = "逾时等候费"
default:
break
}
cell.textTF.text = "¥" + String(format: "%.2f", (rowModel?.price_fen)!)
}
}
if (dataModel?.order_detail_item?.spec_req_price_arr?.count)! > 0 && (dataModel?.order_detail_item?.bill_price_arr?.count)! > 0 {
if indexPath.row == (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! + (dataModel?.order_detail_item?.spec_req_price_arr?.count)! - 1 {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleHeaderCell") as! TitleHeaderCell
cell.nameLbl.text = "司机添加的额外费用"
return cell
}else if indexPath.row > (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! + (dataModel?.order_detail_item?.spec_req_price_arr?.count)! - 1 {
let rowModel = dataModel?.order_detail_item?.bill_price_arr![indexPath.row - (dataModel?.order_detail_item?.order_item?.order_price_arr?.count)! - (dataModel?.order_detail_item?.spec_req_price_arr?.count)!]
cell.nameLbl.text = ""
switch rowModel?.bill_type {
case 1:
cell.nameLbl.text = "过桥费"
case 2:
cell.nameLbl.text = "停车费"
case 3:
cell.nameLbl.text = "搬运费"
case 5:
cell.nameLbl.text = "逾时等候费"
default:
break
}
cell.textTF.text = "¥" + String(format: "%.2f", (rowModel?.price_fen)!)
}
}
cell.nameLbl.textColor = UIColor.init(named: "灰色字体颜色")
cell.textTF.textColor = UIColor.init(named: "标题字颜色")
......@@ -467,7 +523,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
make.left.top.right.bottom.equalTo(0);
}
if section == 2 {
headerV.titleLbl.text = dataModel?.order_detail_item?.order_item?.create_time
headerV.titleLbl.text = dataModel?.order_detail_item?.order_item?.order_time
headerV.fuTitleLbl.text = "#" + (dataModel?.order_detail_item?.order_item?.order_display_id!)!
}
if section == 4 {
......@@ -617,7 +673,7 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
pView?.addSubview(line)
let titleLbl = UILabel(frame: CGRect(x: 15, y: line.frame.maxY+15, width: fullScreenWidth, height: 21))
titleLbl.text = "还需支付"
titleLbl.text = "需支付"
titleLbl.textColor = UIColor(named: "标题字颜色")
titleLbl.font = UIFont(name: "PingFangSC-Medium", size: 15)
pView?.addSubview(titleLbl)
......@@ -654,23 +710,14 @@ class WaybillDetailViewController: BaseViewController ,UITableViewDelegate,UITab
leftBtn.addTarget(self, action: #selector(btnAc(sender:)), for: .touchUpInside)
pView?.addSubview(leftBtn)
let leftBtnTitle = UILabel(frame: CGRect(x: 15, y: listV.frame.maxY+8, width: fullScreenWidth, height: 15))
leftBtnTitle.text = "费用有疑问？"
leftBtnTitle.textColor = UIColor(named: "按钮渐变色上")
leftBtnTitle.font = UIFont.systemFont(ofSize: 13)
pView?.addSubview(leftBtnTitle)
let rightBtn = UIButton(frame: CGRect(x: fullScreenWidth * 0.7, y: listV.frame.maxY, width: fullScreenWidth * 0.3, height: 44))
rightBtn.tag = 1
rightBtn.addTarget(self, action: #selector(btnAc(sender:)), for: .touchUpInside)
pView?.addSubview(rightBtn)
let tishiLbl = UILabel(frame: CGRect(x: 15, y: listV.frame.maxY+8, width: fullScreenWidth - 30, height: 40))
tishiLbl.text = "若产生消费、高速费、停车费、逾时等候费和搬运费，需要您额外支付。额外费用不可使用赠金支付"
tishiLbl.numberOfLines = 0
tishiLbl.textColor = UIColor.init(named: "提示语字体颜色")
tishiLbl.font = UIFont.init(name: "PingFang SC", size: 11)
pView?.addSubview(tishiLbl)
let rightBtnTitle = UILabel(frame: CGRect(x: 0, y: leftBtnTitle.frame.minY, width: fullScreenWidth-15, height: 15))
rightBtnTitle.text = "费用明细"
rightBtnTitle.textColor = UIColor(named: "按钮渐变色上")
rightBtnTitle.font = UIFont.systemFont(ofSize: 13)
rightBtnTitle.textAlignment = .right
pView?.addSubview(rightBtnTitle)
}
cBtn?.isHidden = false
......
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