Skip to content

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

LalamoveBillTableViewCell修改完成

parent e91a4282
Hide whitespace changes
Inline Side-by-side
Showing with 212 additions and 92 deletions
GeliBusinessPlatform/View/Cell/LalamoveBillTableViewCell.swift
View file @ 783d8f19
...@@ -7,20 +7,83 @@ ...@@ -7,20 +7,83 @@
// //
import UIKit import UIKit
protocol LalamoveBillTableViewCellDelegate {
func LalamoveBillTableViewCellBtnClick(sender:Int)
}
class LalamoveBillTableViewCell: UITableViewCell { class LalamoveBillTableViewCell: UITableViewCell {
@IBOutlet weak var coverLbl: UILabel!
@IBOutlet weak var imgV2: UIImageView! var delegate:LalamoveBillTableViewCellDelegate?
@IBOutlet weak var imgV1: UIImageView! @objc func imgBtnClick(sender: UITapGestureRecognizer) {
delegate?.LalamoveBillTableViewCellBtnClick(sender: sender.view!.tag)
}
var datasArr:Array<String>?
@IBOutlet weak var rightBtn: UIImageView!
@IBOutlet weak var middleBtn: UIImageView!
@IBOutlet weak var leftBtn: UIImageView!
@IBOutlet weak var nameLbl: UILabel! @IBOutlet weak var nameLbl: UILabel!
override func awakeFromNib() { override func awakeFromNib() {
super.awakeFromNib() super.awakeFromNib()
self.selectionStyle = .none self.selectionStyle = .none
let tap = UITapGestureRecognizer(target: self, action: #selector(imgBtnClick(sender:)))
leftBtn.addGestureRecognizer(tap)
let tap1 = UITapGestureRecognizer(target: self, action: #selector(imgBtnClick(sender:)))
middleBtn.addGestureRecognizer(tap1)
let tap2 = UITapGestureRecognizer(target: self, action: #selector(imgBtnClick(sender:)))
rightBtn.addGestureRecognizer(tap2)
let tap3 = UITapGestureRecognizer(target: self, action: #selector(imgBtnClick(sender:)))
coverLbl.addGestureRecognizer(tap3)
} }
override func layoutSubviews() {
super.layoutSubviews()
if datasArr == nil {
return
}
coverLbl.isHidden = true
switch datasArr?.count {
case 1://SERVERCE_ImageHost +
leftBtn!.sd_setImage(with:URL(string:datasArr![0]), placeholderImage: UIImage.init(named: "worktest1"))
middleBtn.isHidden = true
rightBtn.isHidden = true
break
case 2:
leftBtn!.sd_setImage(with:URL(string: datasArr![0]), placeholderImage: UIImage.init(named: "worktest1"))
middleBtn!.sd_setImage(with:URL(string:datasArr![1]), placeholderImage: UIImage.init(named: "worktest1"))
rightBtn.isHidden = true
break
case 3:
for i in 0 ..< datasArr!.count {
switch i {
case 0:
leftBtn.sd_setImage(with:URL(string: datasArr![i]), placeholderImage: UIImage.init(named: "worktest1"))
break
case 1:
middleBtn.sd_setImage(with:URL(string: datasArr![i]), placeholderImage: UIImage.init(named: "worktest1"))
break
default:
rightBtn.sd_setImage(with:URL(string: datasArr![i]), placeholderImage: UIImage.init(named: "worktest1"))
break
}
}
break
default:
leftBtn!.sd_setImage(with:URL(string: datasArr![0]), placeholderImage: UIImage.init(named: "worktest1"))
middleBtn!.sd_setImage(with:URL(string: datasArr![1]), placeholderImage: UIImage.init(named: "worktest1"))
rightBtn!.sd_setImage(with:URL(string: datasArr![2]), placeholderImage: UIImage.init(named: "worktest1"))
coverLbl.isHidden = false
coverLbl.text = "+\(datasArr!.count)"
break
}
}
override func setSelected(_ selected: Bool, animated: Bool) { override func setSelected(_ selected: Bool, animated: Bool) {
super.setSelected(selected, animated: animated) super.setSelected(selected, animated: animated)
// Configure the view for the selected state // Configure the view for the selected state
} }
......
GeliBusinessPlatform/View/Cell/LalamoveBillTableViewCell.xib
View file @ 783d8f19
<?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="16097" 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.2" 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>
<deployment identifier="iOS"/> <deployment identifier="iOS"/>
...@@ -24,57 +24,70 @@ ...@@ -24,57 +24,70 @@
<color key="textColor" name="标题字颜色"/> <color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/> <nil key="highlightedColor"/>
</label> </label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="7RH-D6-2bx"> <imageView clipsSubviews="YES" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="GU8-JG-hpZ">
<rect key="frame" x="15" y="33.5" width="117" height="75"/> <rect key="frame" x="15" y="38.5" width="95" height="60"/>
<color key="backgroundColor" name="app底色"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="117" id="ZJG-4R-D6X"/> <constraint firstAttribute="height" constant="60" id="hlO-Am-gEr"/>
<constraint firstAttribute="height" constant="75" id="pap-qw-4iT"/>
</constraints> </constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="3"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView> </imageView>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="Peb-o2-hIW"> <imageView clipsSubviews="YES" tag="1" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="IsA-CO-3WT">
<rect key="frame" x="142" y="33.5" width="117" height="75"/> <rect key="frame" x="125" y="38.5" width="95" height="60"/>
<color key="backgroundColor" name="app底色"/>
<constraints> <constraints>
<constraint firstAttribute="width" constant="117" id="AuI-9f-C9C"/> <constraint firstAttribute="height" constant="60" id="3YD-aA-8xg"/>
<constraint firstAttribute="height" constant="75" id="lJ7-KJ-xxS"/>
</constraints> </constraints>
<userDefinedRuntimeAttributes>
<userDefinedRuntimeAttribute type="number" keyPath="cornerRadius">
<real key="value" value="3"/>
</userDefinedRuntimeAttribute>
</userDefinedRuntimeAttributes>
</imageView> </imageView>
<imageView clipsSubviews="YES" tag="2" contentMode="scaleAspectFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" translatesAutoresizingMaskIntoConstraints="NO" id="IA7-sC-hMt">
<rect key="frame" x="235" y="38.5" width="95" height="60"/>
<constraints>
<constraint firstAttribute="height" constant="60" id="DXH-7e-Z6v"/>
</constraints>
</imageView>
<label hidden="YES" opaque="NO" tag="2" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="XGm-vy-hy5">
<rect key="frame" x="235" y="38.5" width="95" height="60"/>
<color key="backgroundColor" name="提示视图背景色"/>
<fontDescription key="fontDescription" name="PingFangSC-Medium" family="PingFang SC" pointSize="17"/>
<color key="textColor" name="白色背景色"/>
<nil key="highlightedColor"/>
</label>
</subviews> </subviews>
<constraints> <constraints>
<constraint firstItem="7RH-D6-2bx" firstAttribute="top" secondItem="sR8-2p-s0j" secondAttribute="bottom" constant="10" id="4RI-AH-9DT"/> <constraint firstItem="IA7-sC-hMt" firstAttribute="top" secondItem="sR8-2p-s0j" secondAttribute="bottom" constant="15" id="1ni-ks-meI"/>
<constraint firstItem="IA7-sC-hMt" firstAttribute="width" secondItem="GU8-JG-hpZ" secondAttribute="width" id="2td-Dy-wKn"/>
<constraint firstItem="IsA-CO-3WT" firstAttribute="width" secondItem="GU8-JG-hpZ" secondAttribute="width" id="6AG-8s-SFF"/>
<constraint firstItem="XGm-vy-hy5" firstAttribute="centerY" secondItem="IA7-sC-hMt" secondAttribute="centerY" id="6uE-Gc-Kv5"/>
<constraint firstItem="XGm-vy-hy5" firstAttribute="centerX" secondItem="IA7-sC-hMt" secondAttribute="centerX" id="D5E-Lk-Ckg"/>
<constraint firstItem="sR8-2p-s0j" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="GuK-M7-Zhv"/> <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="GU8-JG-hpZ" firstAttribute="top" secondItem="sR8-2p-s0j" secondAttribute="bottom" constant="15" id="KdK-79-Vpg"/>
<constraint firstItem="7RH-D6-2bx" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="XOw-ad-VYm"/> <constraint firstItem="GU8-JG-hpZ" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="MdZ-SJ-WZ5"/>
<constraint firstItem="Peb-o2-hIW" firstAttribute="leading" secondItem="7RH-D6-2bx" secondAttribute="trailing" constant="10" id="f6M-Wd-Sy1"/> <constraint firstItem="IsA-CO-3WT" firstAttribute="leading" secondItem="GU8-JG-hpZ" secondAttribute="trailing" constant="15" id="VHv-kM-f4T"/>
<constraint firstItem="XGm-vy-hy5" firstAttribute="width" secondItem="IA7-sC-hMt" secondAttribute="width" id="aYz-5L-N24"/>
<constraint firstItem="IA7-sC-hMt" firstAttribute="leading" secondItem="IsA-CO-3WT" secondAttribute="trailing" constant="15" id="cFA-U6-CiS"/>
<constraint firstItem="IsA-CO-3WT" firstAttribute="top" secondItem="sR8-2p-s0j" secondAttribute="bottom" constant="15" id="eVn-yF-1yX"/>
<constraint firstItem="sR8-2p-s0j" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="5" id="iGe-VU-VAf"/> <constraint firstItem="sR8-2p-s0j" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="5" id="iGe-VU-VAf"/>
<constraint firstAttribute="trailing" secondItem="IA7-sC-hMt" secondAttribute="trailing" constant="15" id="ycD-5s-Dwg"/>
<constraint firstItem="XGm-vy-hy5" firstAttribute="height" secondItem="IA7-sC-hMt" secondAttribute="height" id="zVn-TE-MFp"/>
</constraints> </constraints>
</tableViewCellContentView> </tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/> <viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
<connections> <connections>
<outlet property="imgV1" destination="7RH-D6-2bx" id="lW6-jw-lJ9"/> <outlet property="coverLbl" destination="XGm-vy-hy5" id="hha-EM-Dco"/>
<outlet property="imgV2" destination="Peb-o2-hIW" id="lxb-dX-YXO"/> <outlet property="leftBtn" destination="GU8-JG-hpZ" id="PWv-gZ-hUh"/>
<outlet property="middleBtn" destination="IsA-CO-3WT" id="26C-76-nHY"/>
<outlet property="nameLbl" destination="sR8-2p-s0j" id="kCf-rk-OCp"/> <outlet property="nameLbl" destination="sR8-2p-s0j" id="kCf-rk-OCp"/>
<outlet property="rightBtn" destination="IA7-sC-hMt" id="jsi-ZZ-XA2"/>
</connections> </connections>
<point key="canvasLocation" x="257.24637681159425" y="140.29017857142856"/> <point key="canvasLocation" x="257.24637681159425" y="138.95089285714286"/>
</tableViewCell> </tableViewCell>
</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="0.1803921568627451" green="0.1803921568627451" blue="0.1803921568627451" alpha="0.5" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor> </namedColor>
<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="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
</resources> </resources>
</document> </document>
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift
View file @ 783d8f19
...@@ -15,7 +15,30 @@ import SDWebImage ...@@ -15,7 +15,30 @@ import SDWebImage
import IQKeyboardManagerSwift import IQKeyboardManagerSwift
class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate,AdressSelectCellDelegate,DZGLViewControllerDelegate,XinZengDiZhiViewControllerDelegate,TitleAndTFBtnCellDelegate,WenDuCellDelegate,LogisticalSelectViewDelegate, UIPickerViewDataSource, UIPickerViewDelegate, GLAlertSelectViewDelegate,CLLocationManagerDelegate, CityListViewControllerDelegate,ToAndFormSelectViewControllerDelegate,WayBillAddressCanDelItemCellDelegate,HLLTopCellDelegate,OtherDemandViewControllerDelegate,OnlyViewCellDelegate, XiaDanUserInfoViewControllerDelegate{ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate,AdressSelectCellDelegate,DZGLViewControllerDelegate,XinZengDiZhiViewControllerDelegate,TitleAndTFBtnCellDelegate,WenDuCellDelegate,LogisticalSelectViewDelegate, UIPickerViewDataSource, UIPickerViewDelegate, GLAlertSelectViewDelegate,CLLocationManagerDelegate, CityListViewControllerDelegate,ToAndFormSelectViewControllerDelegate,WayBillAddressCanDelItemCellDelegate,HLLTopCellDelegate,OtherDemandViewControllerDelegate,OnlyViewCellDelegate, XiaDanUserInfoViewControllerDelegate,LalamoveBillTableViewCellDelegate{
let datasArr = ["https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1597299369034&di=e29ff315ddeadcfc8b785c8060995b3c&imgtype=0&src=http%3A%2F%2F5b0988e595225.cdn.sohucs.com%2Fimages%2F20180520%2Fcfc6bc7922824542b3b3186041ba49de.jpeg","https://timgsa.baidu.com/timg?image&quality=80&size=b9999_10000&sec=1597300858041&di=52f336ce7e6b501eb560fbf0848c754b&imgtype=0&src=http%3A%2F%2Fdingyue.ws.126.net%2FxprlH2GfSd8xmPWwqfyILcSqUCcHtdrfYuTBNezAfGJKi1545980365722.jpg","https://ss1.bdstatic.com/70cFuXSh_Q1YnxGkpoWK1HF6hhy/it/u=2992387834,114733111&fm=26&gp=0.jpg","https://ss1.bdstatic.com/70cFvXSh_Q1YnxGkpoWK1HF6hhy/it/u=3177219880,3607934749&fm=26&gp=0.jpg"]
func LalamoveBillTableViewCellBtnClick(sender: Int) {
let browser = JXPhotoBrowser()
browser.numberOfItems = {
self.datasArr.count
}
var url:URL?
browser.pageIndex = sender
//商家协议 SERVERCE_ImageHost
browser.reloadCellAtIndex = { context in
url = URL(string:self.datasArr[context.index])
let browserCell = context.cell as? JXPhotoBrowserImageCell
// 用SDWebImage加载
browserCell?.imageView.sd_setImage(with: url, placeholderImage: nil, options: [], completed: { (_, _, _, _) in
browserCell?.setNeedsLayout()
})
}
browser.show()
}
var xiaDanRenMsg:NSString = "" var xiaDanRenMsg:NSString = ""
func XiaDanUserInfoViewControllerData(str: NSString) { func XiaDanUserInfoViewControllerData(str: NSString) {
xiaDanRenMsg = str xiaDanRenMsg = str
...@@ -40,7 +63,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -40,7 +63,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
var selectAr:Array<Int> = [] var selectAr:Array<Int> = []
var spec_select_arr:Array<Int> = [] var spec_select_arr:Array<Int> = []
func OtherDemandViewControllerResult(strs: Array<spec_req_arr_data>,selectArr:Array<Int>) { func OtherDemandViewControllerResult(strs: Array<spec_req_arr_data>,selectArr:Array<Int>) {
var spec_req_arr_str = "" var spec_req_arr_str = ""
spec_select_arr.removeAll() spec_select_arr.removeAll()
for item in strs{ for item in strs{
...@@ -72,7 +95,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -72,7 +95,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
adrDs.append(dict) adrDs.append(dict)
} }
let lat_lon_arr = dataChangeString(sender: adrDs) let lat_lon_arr = dataChangeString(sender: adrDs)
let fD = adrArr.first! let fD = adrArr.first!
let cityData = fD["adr"] as! cityListDataModel let cityData = fD["adr"] as! cityListDataModel
let params = ["user_token":UserToken as Any, let params = ["user_token":UserToken as Any,
...@@ -131,7 +154,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -131,7 +154,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
let itemModel = item["adr"] as! cityListDataModel let itemModel = item["adr"] as! cityListDataModel
let itemData = (item["detailAdr"] as! NSString).components(separatedBy: "_") let itemData = (item["detailAdr"] as! NSString).components(separatedBy: "_")
let dict = ["name":(itemData.last)! as Any, let dict = ["name":(itemData.last)! as Any,
"addr":itemData[2] as Any, "addr":itemData[2] as Any,
"city_name":itemData.first as Any, "city_name":itemData.first as Any,
...@@ -148,28 +171,28 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -148,28 +171,28 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
let total = YuGuPriceLbl.text! as NSString let total = YuGuPriceLbl.text! as NSString
var spec_select_arr_str = "" var spec_select_arr_str = ""
if spec_select_arr.count > 0 { if spec_select_arr.count > 0 {
spec_select_arr_str = dataChangeString(sender: spec_select_arr) spec_select_arr_str = dataChangeString(sender: spec_select_arr)
} }
let dict1 = ["user_token":UserToken as Any, let dict1 = ["user_token":UserToken as Any,
"nonce_str":String.randomStr(len: 30) as Any, "nonce_str":String.randomStr(len: 30) as Any,
"city_id":firstCity.city_id as Any, "city_id":firstCity.city_id as Any,
"city_info_revision":carModel?.revision as Any, "city_info_revision":carModel?.revision as Any,
"order_vehicle_id":carTypesArr[selectCarType].order_vehicle_id as Any, "order_vehicle_id":carTypesArr[selectCarType].order_vehicle_id as Any,
"std_tag_arr":"" as Any, "std_tag_arr":"" as Any,
"spec_req_arr":spec_select_arr_str as Any, "spec_req_arr":spec_select_arr_str as Any,
"order_time":stime as Any, "order_time":stime as Any,
"total_price_fen":total.floatValue * 100 as Any, "total_price_fen":total.floatValue * 100 as Any,
"contact_name":msgArr.first as Any, "contact_name":msgArr.first as Any,
"contact_phone_no":msgArr[1] as Any, "contact_phone_no":msgArr[1] as Any,
"pay_type":"3" as Any, "pay_type":"3" as Any,
"order_reason":"" as Any, "order_reason":"" as Any,
"remark":msgArr.last as Any, "remark":msgArr.last as Any,
"sale_plat":guanlianPingStr as Any, "sale_plat":guanlianPingStr as Any,
"order_sn":guanlianDingStr as Any, "order_sn":guanlianDingStr as Any,
"addr_info":dataChangeString(sender: addr_info_arr) as Any "addr_info":dataChangeString(sender: addr_info_arr) as Any
] ]
shopsAuthList(dict1, success: { (data) in shopsAuthList(dict1, success: { (data) in
let model = data as! shopsAuthListModel let model = data as! shopsAuthListModel
HUD.flash(.success) HUD.flash(.success)
...@@ -185,7 +208,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -185,7 +208,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
HUD.flash(.label("请选择完整的收发路线"), delay: 1.2) HUD.flash(.label("请选择完整的收发路线"), delay: 1.2)
} }
} }
@IBOutlet weak var YuGuPriceLbl: UILabel! @IBOutlet weak var YuGuPriceLbl: UILabel!
func showScrollUI(){ func showScrollUI(){
//左右按钮 //左右按钮
...@@ -231,9 +254,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -231,9 +254,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
adrDs.append(dict) adrDs.append(dict)
} }
let lat_lon_arr = dataChangeString(sender: adrDs) let lat_lon_arr = dataChangeString(sender: adrDs)
let fD = adrArr.first! let fD = adrArr.first!
let cityData = fD["adr"] as! cityListDataModel let cityData = fD["adr"] as! cityListDataModel
let params = ["user_token":UserToken as Any, let params = ["user_token":UserToken as Any,
...@@ -292,16 +315,16 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -292,16 +315,16 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
self.carTypesArr.append(item) self.carTypesArr.append(item)
} }
if self.carTypesArr.count == 0 { if self.carTypesArr.count == 0 {
HUD.flash(.label("暂无车型可供选择"), delay: 1.2) HUD.flash(.label("暂无车型可供选择"), delay: 1.2)
return return
} }
let view = self.hListView.footerView(forSection: 0) let view = self.hListView.footerView(forSection: 0)
view?.layoutIfNeeded() view?.layoutIfNeeded()
self.setBtnUI(carTypesArr: self.carTypesArr,view: self.topCarBtnSelectView) self.setBtnUI(carTypesArr: self.carTypesArr,view: self.topCarBtnSelectView)
self.hListView.reloadData() self.hListView.reloadData()
HUD.hide() HUD.hide()
}) { (err) in }) { (err) in
} }
...@@ -728,7 +751,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -728,7 +751,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
city_id = item.city_id! city_id = item.city_id!
} }
} }
extractedFunc() extractedFunc()
...@@ -858,7 +881,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -858,7 +881,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
override func viewDidLoad() { override func viewDidLoad() {
super.viewDidLoad() super.viewDidLoad()
checkLocation() checkLocation()
needsLocation() needsLocation()
...@@ -873,6 +896,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -873,6 +896,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
listView.register(UINib(nibName: "PersonCenterCell", bundle: nil), forCellReuseIdentifier: "PersonCenter") listView.register(UINib(nibName: "PersonCenterCell", bundle: nil), forCellReuseIdentifier: "PersonCenter")
listView.register(UINib(nibName: "TitleAndTFBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFBtnCell") listView.register(UINib(nibName: "TitleAndTFBtnCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFBtnCell")
listView.register(UINib(nibName: "WenDuCell", bundle: nil), forCellReuseIdentifier: "WenDu") listView.register(UINib(nibName: "WenDuCell", bundle: nil), forCellReuseIdentifier: "WenDu")
listView.register(UINib(nibName: "LalamoveBillTableViewCell", bundle: nil), forCellReuseIdentifier: "LalamoveBillTableViewCell")
//MARK: - 货拉拉 //MARK: - 货拉拉
hListView.separatorStyle = .none hListView.separatorStyle = .none
hListView.register(UINib(nibName: "TitleAndSwitchCell", bundle: nil), forCellReuseIdentifier: "TitleAndSwitchCell") hListView.register(UINib(nibName: "TitleAndSwitchCell", bundle: nil), forCellReuseIdentifier: "TitleAndSwitchCell")
...@@ -1178,7 +1204,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -1178,7 +1204,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
vc.adrDatasArr = adrDatas vc.adrDatasArr = adrDatas
vc.delegate = self vc.delegate = self
if adrDatas.count > 0 { if adrDatas.count > 0 {
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
} }
} }
...@@ -1205,9 +1231,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -1205,9 +1231,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
if section == 1 { if section == 1 {
return 5 return 5
} }
return 41.5 return 41.5
}else{//货拉拉 }else{//货拉拉
if section == 1 { if section == 1 {
return 49 return 49
} }
...@@ -1220,6 +1247,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -1220,6 +1247,8 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
return 1 return 1
} }
if tableView == listView { if tableView == listView {
// return 4
// //待修改
return 3 return 3
}else{//货拉拉 }else{//货拉拉
return 5 return 5
...@@ -1234,18 +1263,21 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -1234,18 +1263,21 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
switch section { switch section {
case 0:return 2 case 0:return 2
case 1:return 4 case 1:return 4
// //待修改
// case 3:return 1
//注释case 3
default: return 2 default: return 2
} }
}else{//货拉拉 }else{//货拉拉
switch section { switch section {
case 0: case 0:
//MARK: -- 车型附加选项，打开即可使用 //MARK: -- 车型附加选项，打开即可使用
// if carTypesArr.count > 0 { // if carTypesArr.count > 0 {
// let carItem = carTypesArr[selectCarType] // let carItem = carTypesArr[selectCarType]
// if carItem.vehicle_std_arr!.count > 0 { // if carItem.vehicle_std_arr!.count > 0 {
// return 2 // return 2
// } // }
// } // }
return 1 return 1
case 1: case 1:
if adrArr.count < 2 { if adrArr.count < 2 {
...@@ -1391,19 +1423,19 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -1391,19 +1423,19 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
} }
//保障 //保障
if indexPath.row == 3 { if indexPath.row == 3 {
// if glSelectView == nil { // if glSelectView == nil {
// let view = GLAlertSelectView(frame: self.view.bounds) // let view = GLAlertSelectView(frame: self.view.bounds)
// view.delegate = self // view.delegate = self
// view.isBz = true // view.isBz = true
// if bzIdx != 10086 { // if bzIdx != 10086 {
// view.selectNum = bzIdx // view.selectNum = bzIdx
// view.tempNum = view.selectNum // view.tempNum = view.selectNum
// } // }
// view.titleLbl.text = "货物保障" // view.titleLbl.text = "货物保障"
// view.dataArr = bzArr // view.dataArr = bzArr
// self.view.addSubview(view) // self.view.addSubview(view)
// glSelectView = view // glSelectView = view
// } // }
} }
//时间 //时间
if indexPath.row == 0 { if indexPath.row == 0 {
...@@ -1476,6 +1508,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -1476,6 +1508,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
return 93 return 93
} }
} }
return 70 return 70
} }
if indexPath.section == 1{ if indexPath.section == 1{
...@@ -1484,6 +1517,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -1484,6 +1517,9 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
} }
return 49 return 49
} }
if indexPath.section == 3 {
return 128
}
return 49 return 49
}else{//货拉拉 }else{//货拉拉
...@@ -1511,6 +1547,13 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie ...@@ -1511,6 +1547,13 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
if tableView == listView { if tableView == listView {
switch indexPath.section { switch indexPath.section {
case 3:
let cell = tableView.dequeueReusableCell(withIdentifier: "LalamoveBillTableViewCell") as! LalamoveBillTableViewCell
cell.delegate = self
cell.datasArr = datasArr
return cell
case 0: case 0:
let cell = tableView.dequeueReusableCell(withIdentifier: "AdressSelect") as! AdressSelectCell let cell = tableView.dequeueReusableCell(withIdentifier: "AdressSelect") as! AdressSelectCell
cell.titleLbl.text = "寄" cell.titleLbl.text = "寄"
......
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ 783d8f19
...@@ -538,6 +538,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD ...@@ -538,6 +538,7 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
// HUD.flash(.label("敬请期待"),delay: 1.2) // HUD.flash(.label("敬请期待"),delay: 1.2)
let vc = XiaYunDanViewController() let vc = XiaYunDanViewController()
// let vc = WaybillDetailViewController()
self.navigationController?.pushViewController(vc, animated: true) self.navigationController?.pushViewController(vc, animated: true)
return return
case 92: //采购订单管理 case 92: //采购订单管理
......
GeliBusinessPlatform/ViewController/货拉拉/费用明细/LogisticsCostDetailViewController.swift
View file @ 783d8f19
...@@ -24,7 +24,7 @@ class LogisticsCostDetailViewController: BaseViewController { ...@@ -24,7 +24,7 @@ class LogisticsCostDetailViewController: BaseViewController {
navbar.title = "费用明细" navbar.title = "费用明细"
self.view.addSubview(navbar) self.view.addSubview(navbar)
priceLbl.text = "\(model!.data!.total_price_fen!/100)" priceLbl.text = "\(model!.data!.total_price_fen!/100.0)"
roadKM.text = "(总里程\(Double(model!.data!.distance_total!)/1000.0)公里)" roadKM.text = "(总里程\(Double(model!.data!.distance_total!)/1000.0)公里)"
SetTopFrameView(view: contentV, btmView: self.view) SetTopFrameView(view: contentV, btmView: self.view)
......
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