Skip to content

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

订单列表筛选改单选

parent f0e9a186
Hide whitespace changes
Inline Side-by-side
Showing with 467 additions and 93 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ 70ac3d07
......@@ -123,6 +123,8 @@
E03984942468F2CA00DFA56F /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E03984932468F2CA00DFA56F /* UIKit.framework */; };
E03984962468F2D100DFA56F /* Photos.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E03984952468F2D100DFA56F /* Photos.framework */; };
E03984982468F2DA00DFA56F /* SafariServices.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = E03984972468F2DA00DFA56F /* SafariServices.framework */; };
E040399624D14D37008CF965 /* LalamoveModel.swift in Sources */ = {isa = PBXBuildFile; fileRef = E040399524D14D37008CF965 /* LalamoveModel.swift */; };
E040399824D14E0E008CF965 /* LalamoveInterface.swift in Sources */ = {isa = PBXBuildFile; fileRef = E040399724D14E0E008CF965 /* LalamoveInterface.swift */; };
E0404F822476355500D9ACE8 /* SDWebImage in Frameworks */ = {isa = PBXBuildFile; productRef = E0404F812476355500D9ACE8 /* SDWebImage */; };
E0404F842476355500D9ACE8 /* SDWebImageMapKit in Frameworks */ = {isa = PBXBuildFile; productRef = E0404F832476355500D9ACE8 /* SDWebImageMapKit */; };
E042F730245272FF00CDFA12 /* XiaYunDanViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = E042F72E245272FF00CDFA12 /* XiaYunDanViewController.swift */; };
......@@ -731,6 +733,8 @@
E03984932468F2CA00DFA56F /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; };
E03984952468F2D100DFA56F /* Photos.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Photos.framework; path = System/Library/Frameworks/Photos.framework; sourceTree = SDKROOT; };
E03984972468F2DA00DFA56F /* SafariServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SafariServices.framework; path = System/Library/Frameworks/SafariServices.framework; sourceTree = SDKROOT; };
E040399524D14D37008CF965 /* LalamoveModel.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LalamoveModel.swift; sourceTree = "<group>"; };
E040399724D14E0E008CF965 /* LalamoveInterface.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = LalamoveInterface.swift; sourceTree = "<group>"; };
E042F72E245272FF00CDFA12 /* XiaYunDanViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = XiaYunDanViewController.swift; sourceTree = "<group>"; };
E042F72F245272FF00CDFA12 /* XiaYunDanViewController.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = XiaYunDanViewController.xib; sourceTree = "<group>"; };
E042F732245274F200CDFA12 /* YunDanLieBiaoCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = YunDanLieBiaoCell.swift; sourceTree = "<group>"; };
......@@ -1636,6 +1640,14 @@
path = "客户管理";
sourceTree = "<group>";
};
E040399424D14D1F008CF965 /* LalamoveInterface */ = {
isa = PBXGroup;
children = (
E040399524D14D37008CF965 /* LalamoveModel.swift */,
);
path = LalamoveInterface;
sourceTree = "<group>";
};
E042F72B245272AC00CDFA12 /* 代客下单（货运） */ = {
isa = PBXGroup;
children = (
......@@ -1843,6 +1855,7 @@
E09B03A92445B09200211A51 /* Model */ = {
isa = PBXGroup;
children = (
E040399424D14D1F008CF965 /* LalamoveInterface */,
E0E4456724B00F6400EF788E /* Logistics */,
E019E97F24A975710086C565 /* pinPai */,
E05FAD282498A5E800D8C90D /* yfzkModel */,
......@@ -1858,6 +1871,7 @@
F956D5BD246A3629003FF510 /* PersonCenterModel */,
F956D5BC246A35DB003FF510 /* GoodsManageMoel */,
F9171EFB245128B200359C2B /* Interface.swift */,
E040399724D14E0E008CF965 /* LalamoveInterface.swift */,
E0E4456A24B0221500EF788E /* LogisticsInterface.swift */,
E019E98224A9763A0086C565 /* BrandListInterface.swift */,
E05FAD262498A5E500D8C90D /* accountsPayableInterface.swift */,
......@@ -3575,6 +3589,7 @@
F96E9D5D246656A700B5B94A /* HGImagePickerController.swift in Sources */,
F969BF1E244EE67900C79953 /* GoodsManageListVC.swift in Sources */,
E0273DD824551B4C00B3FCAE /* SendTimeSelectView.swift in Sources */,
E040399624D14D37008CF965 /* LalamoveModel.swift in Sources */,
E08A7AE024652E2C00F934F2 /* BingDingKeHuViewController.swift in Sources */,
F96E9D5A246656A700B5B94A /* HGImageCollectionViewController.swift in Sources */,
E0AA3A91248F626400CBFC27 /* XinCaiGouViewController.swift in Sources */,
......@@ -3641,6 +3656,7 @@
F956D59E246A2D9C003FF510 /* LMNTextStorage+Export.m in Sources */,
E0337EF12464F69000952EF4 /* YingFuZKListViewController.swift in Sources */,
E099B588246BF8FA009F587F /* OrderDViewController.swift in Sources */,
E040399824D14E0E008CF965 /* LalamoveInterface.swift in Sources */,
F933F6CE2452C68B00189561 /* PKHUDSquareBaseView.swift in Sources */,
E0B5308424728D7E00FFCC15 /* ShopWarehouseListModel.swift in Sources */,
E06524F524580BB600CA22E2 /* BaoZhiQiCell.swift in Sources */,
......
GeliBusinessPlatform/Interface/Interface_Z.plist
View file @ 70ac3d07
......@@ -224,5 +224,7 @@
<string>Logistics/getAddr</string>
<key>提交运单</key>
<string>Logistics/addLogisticsOrder</string>
<key>获取已开通城市列表</key>
<string>Lalamove/cityList</string>
</dict>
</plist>
GeliBusinessPlatform/Model/LalamoveInterface.swift 0 → 100644
View file @ 70ac3d07
//
// LalamoveInterface.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/7/29.
// Copyright © 2020 junye lu. All rights reserved.
//
import Foundation
import Alamofire
import SwiftyJSON
import ObjectMapper
//MARK:--获取已开通城市列表
//params-key(user_name(用户名),pwd(密码))
func cityList(_ params:[String:Any],success:@escaping (_ res:Any)->(),failture:@escaping(_ error:Error)->()) {
NetworkRequest.sharedInstance.postRequest("获取已开通城市列表", params, { (rep:DataResponse<cityListModel>) in
}, success: { (data) in
success(data)
}) { (error) in
failture(error)
}
}
GeliBusinessPlatform/Model/LalamoveInterface/LalamoveModel.swift 0 → 100644
View file @ 70ac3d07
//
// LalamoveInterface.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2020/7/29.
// Copyright © 2020 junye lu. All rights reserved.
//
import Foundation
import ObjectMapper
//MARK: - 运单列表
class cityListModel: Mappable {
var code:Int?
var message : String?
var data :Array<cityListDataModel>?
required init?( map: Map) {
}
func mapping(map: Map) {
code <- map["code"]
message <- map["message"]
data <- map["data"]
}
}
class cityListDataModel: Mappable {
var name : String?
var lat_lon : Array<Double>?
var city_id : Int?
var name_en : String?
required init?( map: Map) {
}
func mapping(map: Map) {
name <- map["name"]
lat_lon <- map["lat_lon"]
city_id <- map["city_id"]
name_en <- map["name_en"]
}
}
GeliBusinessPlatform/View/Cell/TitleAndLblCell.xib
View file @ 70ac3d07
......@@ -11,55 +11,58 @@
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
<placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" id="KGk-i7-Jjw" customClass="TitleAndLblCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
<tableViewCell contentMode="scaleToFill" selectionStyle="default" indentationWidth="10" rowHeight="157" id="KGk-i7-Jjw" customClass="TitleAndLblCell" customModule="TestClass" customModuleProvider="target">
<rect key="frame" x="0.0" y="0.0" width="333" height="157"/>
<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="320" height="44"/>
<rect key="frame" x="0.0" y="0.0" width="333" height="157"/>
<autoresizingMask key="autoresizingMask"/>
<subviews>
<view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FhC-zl-Pqx">
<rect key="frame" x="15" y="43" width="305" height="1"/>
<rect key="frame" x="15" y="156" width="318" height="1"/>
<color key="backgroundColor" name="灰色分界线"/>
<constraints>
<constraint firstAttribute="height" constant="1" id="7hZ-vt-9DW"/>
</constraints>
</view>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="标题" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yit-1Y-dYH">
<rect key="frame" x="15" y="13" width="27" height="18.5"/>
<constraints>
<constraint firstAttribute="height" constant="18.5" id="U31-tG-pjN"/>
</constraints>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<imageView clipsSubviews="YES" userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="delS" translatesAutoresizingMaskIntoConstraints="NO" id="pmc-vU-Uf4">
<rect key="frame" x="305" y="14.5" width="0.0" height="15"/>
<rect key="frame" x="318" y="71" width="0.0" height="15"/>
<constraints>
<constraint firstAttribute="width" id="HMa-Pi-Faw"/>
<constraint firstAttribute="height" constant="15" id="veV-Pg-H0Y"/>
</constraints>
</imageView>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="View.tishiLbl.text = &quot;&quot;View.tishiLbl.text = &quot;&quot;View.tishiLbl.text = &quot;&quot;" textAlignment="right" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zee-Po-sID">
<rect key="frame" x="57" y="15" width="248" height="13"/>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" usesAttributedText="YES" lineBreakMode="tailTruncation" numberOfLines="0" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zee-Po-sID">
<rect key="frame" x="57" y="61.5" width="246" height="34.5"/>
<attributedString key="attributedText">
<fragment content="View.tishiLbl.text = &quot;&quot;View.tishiLbl.text = &quot;&quot;View.tishiLbl.text = &quot;&quot;">
<attributes>
<color key="NSColor" name="标题字颜色"/>
<font key="NSFont" metaFont="system"/>
<paragraphStyle key="NSParagraphStyle" alignment="right" lineBreakMode="wordWrapping" baseWritingDirection="natural" lineSpacing="3" tighteningFactorForTruncation="0.0"/>
</attributes>
</fragment>
</attributedString>
<nil key="highlightedColor"/>
</label>
<label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" text="标题" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="yit-1Y-dYH">
<rect key="frame" x="15" y="70.5" width="27" height="16"/>
<fontDescription key="fontDescription" type="system" pointSize="13"/>
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
</subviews>
<constraints>
<constraint firstItem="pmc-vU-Uf4" firstAttribute="leading" secondItem="zee-Po-sID" secondAttribute="trailing" id="3x0-4l-7Mq"/>
<constraint firstItem="zee-Po-sID" firstAttribute="top" secondItem="H2p-sc-9uM" secondAttribute="top" constant="15" id="GwD-l1-HuW"/>
<constraint firstAttribute="trailing" secondItem="FhC-zl-Pqx" secondAttribute="trailing" id="If6-Gs-gZd"/>
<constraint firstItem="pmc-vU-Uf4" firstAttribute="leading" secondItem="zee-Po-sID" secondAttribute="trailing" constant="15" id="JnM-Iz-OpH"/>
<constraint firstAttribute="bottom" secondItem="FhC-zl-Pqx" secondAttribute="bottom" id="LYe-vI-oas"/>
<constraint firstItem="zee-Po-sID" firstAttribute="leading" secondItem="yit-1Y-dYH" secondAttribute="trailing" constant="15" id="Pj9-aB-1Dx"/>
<constraint firstItem="yit-1Y-dYH" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="OJc-GC-Jrq"/>
<constraint firstAttribute="trailing" secondItem="pmc-vU-Uf4" secondAttribute="trailing" constant="15" id="Qok-R2-hO0"/>
<constraint firstItem="pmc-vU-Uf4" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="VxE-7o-zqj"/>
<constraint firstItem="yit-1Y-dYH" firstAttribute="centerY" secondItem="H2p-sc-9uM" secondAttribute="centerY" id="g9y-AH-qVF"/>
<constraint firstItem="FhC-zl-Pqx" firstAttribute="top" secondItem="zee-Po-sID" secondAttribute="bottom" constant="15" id="gMg-Md-ISS"/>
<constraint firstItem="yit-1Y-dYH" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="YOe-m8-0fd"/>
<constraint firstItem="zee-Po-sID" firstAttribute="centerY" secondItem="yit-1Y-dYH" secondAttribute="centerY" id="f9d-5w-jXw"/>
<constraint firstItem="FhC-zl-Pqx" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="jug-3M-ccD"/>
<constraint firstItem="yit-1Y-dYH" firstAttribute="leading" secondItem="H2p-sc-9uM" secondAttribute="leading" constant="15" id="te9-wX-58V"/>
<constraint firstItem="zee-Po-sID" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="yit-1Y-dYH" secondAttribute="trailing" constant="15" id="pbP-fH-zAa"/>
</constraints>
</tableViewCellContentView>
<viewLayoutGuide key="safeArea" id="njF-e1-oar"/>
......@@ -67,11 +70,10 @@
<outlet property="btmLine" destination="FhC-zl-Pqx" id="q0E-2a-h3I"/>
<outlet property="btmW" destination="HMa-Pi-Faw" id="htd-Lp-MF8"/>
<outlet property="contentLbl" destination="zee-Po-sID" id="GmM-kp-g5c"/>
<outlet property="contentRight" destination="3x0-4l-7Mq" id="MWO-ix-mMP"/>
<outlet property="imgRight" destination="Qok-R2-hO0" id="aeV-7Q-HFP"/>
<outlet property="nameLbl" destination="yit-1Y-dYH" id="S4K-8f-ncw"/>
</connections>
<point key="canvasLocation" x="131.8840579710145" y="105.80357142857143"/>
<point key="canvasLocation" x="141.30434782608697" y="143.63839285714286"/>
</tableViewCell>
</objects>
<resources>
......@@ -79,6 +81,9 @@
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="标题字颜色">
<color red="0.18000000715255737" green="0.18000000715255737" blue="0.18000000715255737" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
<namedColor name="灰色分界线">
<color red="0.92941176470588238" green="0.92941176470588238" blue="0.92941176470588238" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
</namedColor>
......
GeliBusinessPlatform/ViewController/代客下单（货运）/下运单/XiaYunDanViewController.swift
View file @ 70ac3d07
......@@ -10,7 +10,7 @@ import UIKit
import WebKit
import MAMapKit
class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate,AdressSelectCellDelegate,DZGLViewControllerDelegate,XinZengDiZhiViewControllerDelegate,TitleAndTFBtnCellDelegate,WenDuCellDelegate,LogisticalSelectViewDelegate, CLLocationManagerDelegate{
class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableViewDataSource,JiTuoWuXinXiViewDelegate,JiPaiFangShiViewControllerDelegate,ZengZhiServicesViewControllerDelegate,AdressSelectCellDelegate,DZGLViewControllerDelegate,XinZengDiZhiViewControllerDelegate,TitleAndTFBtnCellDelegate,WenDuCellDelegate,LogisticalSelectViewDelegate{
......@@ -235,6 +235,7 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
@IBAction func selectAction(_ sender: UIButton) {
if rightBtn == sender {
rightBtn.isSelected = true
leftBtn.isSelected = false
lineV.frame.origin.x = fullScreenWidth * 0.5
......@@ -277,33 +278,10 @@ class XiaYunDanViewController: BaseViewController,UITableViewDelegate,UITableVie
@objc func locSelect(){
print("locSelect")
}
// var manger:CLLocationManager = CLLocationManager()
// func locationManager(_ manager: CLLocationManager, didUpdateLocations locations: [CLLocation]) {
// print("test===")
// manger.stopUpdatingLocation()
// let location = locations.last
//
// CLGeocoder().reverseGeocodeLocation(location!) { (placemarks, error) in
// if error != nil {
// return
// }
// if placemarks!.count > 0 {
// let pm = (placemarks?.first)! as CLPlacemark
// print("pm == ",pm.locality)
// }else{
// print("Problem with the data received from geocoder")
// }
// }
// }
override func viewDidLoad() {
super.viewDidLoad()
// manger.delegate = self
// manger.startUpdatingLocation()
locBtn.isUserInteractionEnabled = false
navbar.title = "运单列表"
......
GeliBusinessPlatform/ViewController/代客下单（货运）/运单详情/YunDanXiangQingViewController.swift
View file @ 70ac3d07
......@@ -22,10 +22,11 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
self.view.addSubview(navbar)
listView.separatorStyle = .none
SetTopFrameView(view: listView, btmView: btmView)
listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
// listView.register(UINib(nibName: "TitleAndTFCell", bundle: nil), forCellReuseIdentifier: "TitleAndTFCell")
listView.register(UINib(nibName: "XiaDanCGDiZhiCell", bundle: nil), forCellReuseIdentifier: "XiaDanCGDiZhiCell")
listView.register(UINib(nibName: "JiBenXinXiCell", bundle: nil), forCellReuseIdentifier: "JiBenXinXiCell")
listView.register(UINib(nibName: "TitleAndLblCell", bundle: nil), forCellReuseIdentifier: "TitleAndLblCell")
for i in 0 ..< btnTitleArr.count {
let btn = UIButton()
let idx = btnTitleArr.count-i-1
......@@ -81,6 +82,7 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
func tableView(_ tableView: UITableView, heightForHeaderInSection section: Int) -> CGFloat {
switch section {
case 0:return 0.001
case 1:return 10
default:
return 36
}
......@@ -89,40 +91,59 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> UIView? {
switch section {
case 0:return UIView()
default:
case 2:
let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 36))
view.backgroundColor = UIColor.white
let lbl = UILabel()
lbl.text = "货物信息"
lbl.textColor = UIColor(named: "标题字颜色")
lbl.font = UIFont.boldSystemFont(ofSize: 15)
view.addSubview(lbl)
lbl.snp.makeConstraints { (make) in
make.top.left.right.equalTo(15)
make.height.equalTo(21)
}
return view
default:
let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 10))
view.backgroundColor = UIColor.white
let lbl = UILabel()
lbl.text = "货物信息"
lbl.textColor = UIColor(named: "标题字颜色")
lbl.font = UIFont.boldSystemFont(ofSize: 15)
view.addSubview(lbl)
lbl.snp.makeConstraints { (make) in
make.top.left.right.equalTo(15)
make.height.equalTo(21)
}
return view
return view
}
}
func tableView(_ tableView: UITableView, viewForFooterInSection section: Int) -> UIView? {
if section == 1 {
let view = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 20))
let line = UIView(frame: CGRect(x: 0, y: 0, width: fullScreenWidth, height: 10))
line.backgroundColor = UIColor.white
view.addSubview(line)
return view
}
return UIView()
}
func tableView(_ tableView: UITableView, heightForFooterInSection section: Int) -> CGFloat {
if section == 0 {
return 0.001
}
if section == 1 {
return 20
}
return 10
}
func numberOfSections(in tableView: UITableView) -> Int {
if dataModel == nil {
return 0
}
return 2
return 3
}
func tableView(_ tableView: UITableView, numberOfRowsInSection section: Int) -> Int {
if dataModel == nil {
return 0
}
if section == 0 {
return 7
return 3
}
if section == 1 {
return 4
}
return 9
}
......@@ -131,15 +152,21 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
switch indexPath.row {
case 0:
return 86
case 1,2:
return 66
default:
return 30
return 66
}
}
if indexPath.section == 1 {
return 30
}
if indexPath.section == 2 {
if indexPath.row == 8 {
return UITableView.automaticDimension
}
}
return 30
}
let p2Arr = ["0","0","0","关联平台：","关联订单号：","运费：","运费支付方式："]
let p2Arr = ["关联平台：","关联订单号：","运费：","运费支付方式："]
let p3Arr = ["寄托物：","总重量：","总件数：","体积：","温控范围：","寄件方式：","派件方式：","保价（元人民币）：","备注："]
func tableView(_ tableView: UITableView, cellForRowAt indexPath: IndexPath) -> UITableViewCell {
if indexPath.section == 0 {
......@@ -164,25 +191,24 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
}
return cell
default:
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
break
}
}
if indexPath.section == 1 {
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
cell.nameLbl.text = p2Arr[indexPath.row]
var arrStr:[String] = []
arrStr.append("")
arrStr.append("")
arrStr.append("")
arrStr.append((dataModel?.sale_plat)!)
arrStr.append((dataModel?.order_sn)!)
arrStr.append(String(format: "%.2f", (dataModel?.freight_pre)!))
arrStr.append((dataModel?.fc_flag_cn)!)
cell.textTF.text = arrStr[indexPath.row]
cell.textTF.isUserInteractionEnabled = false
cell.line.isHidden = true
print("sadkf == ",arrStr[indexPath.row])
cell.contentLbl.text = arrStr[indexPath.row]
// cell.textTF.isUserInteractionEnabled = false
cell.btmLine.isHidden = true
return cell
}
}
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndTFCell") as! TitleAndTFCell
let cell = tableView.dequeueReusableCell(withIdentifier: "TitleAndLblCell") as! TitleAndLblCell
cell.nameLbl.text = p3Arr[indexPath.row]
var arrStr:[String] = []
arrStr.append((dataModel?.express_item_name)!)
......@@ -193,11 +219,12 @@ class YunDanXiangQingViewController: BaseViewController,UITableViewDelegate,UITa
arrStr.append((dataModel?.home_delivery_on_cn)!)
arrStr.append((dataModel?.site_delivery_cn)!)
arrStr.append(String(format: "%.2f", (dataModel?.guarantee_value)!))
arrStr.append((dataModel?.remark)!)
// arrStr.append((dataModel?.remark)!)
arrStr.append("jsaldkfja;sldfja;sldjfa;lsjdfasl;kjdfasl;dfjsaldfjasldfjasldfjasl;dfjasldfsjaldfj")
cell.textTF.text = arrStr[indexPath.row]
cell.textTF.isUserInteractionEnabled = false
cell.line.isHidden = true
cell.contentLbl.text = arrStr[indexPath.row]
// cell.textTF.isUserInteractionEnabled = false
cell.btmLine.isHidden = true
return cell
}
}
GeliBusinessPlatform/ViewController/代客下单（货运）/运单详情/YunDanXiangQingViewController.xib
View file @ 70ac3d07
<?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.2" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
<device id="retina6_1" orientation="portrait" appearance="light"/>
<dependencies>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="15704"/>
<deployment identifier="iOS"/>
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="16087"/>
<capability name="Named colors" minToolsVersion="9.0"/>
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
<capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
</dependencies>
<objects>
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="YunDanXiangQingViewController" customModule="GeliBusinessPlatform" customModuleProvider="target">
<placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="YunDanXiangQingViewController" customModule="TestClass" customModuleProvider="target">
<connections>
<outlet property="btmView" destination="aKi-sa-aRb" id="QKe-z7-dzE"/>
<outlet property="listView" destination="QVe-VE-lfz" id="slI-bE-Qhf"/>
......@@ -45,7 +46,7 @@
<constraint firstItem="8z7-ME-rA7" firstAttribute="leading" secondItem="aKi-sa-aRb" secondAttribute="leading" id="gVO-DO-mNZ"/>
</constraints>
</view>
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="28" sectionFooterHeight="28" translatesAutoresizingMaskIntoConstraints="NO" id="QVe-VE-lfz">
<tableView clipsSubviews="YES" contentMode="scaleToFill" alwaysBounceVertical="YES" showsHorizontalScrollIndicator="NO" showsVerticalScrollIndicator="NO" style="plain" separatorStyle="default" rowHeight="-1" estimatedRowHeight="-1" sectionHeaderHeight="-1" estimatedSectionHeaderHeight="-1" sectionFooterHeight="-1" estimatedSectionFooterHeight="-1" translatesAutoresizingMaskIntoConstraints="NO" id="QVe-VE-lfz">
<rect key="frame" x="0.0" y="44" width="414" height="768"/>
<color key="backgroundColor" name="app底色"/>
<connections>
......
GeliBusinessPlatform/ViewController/运单列表/YDLBVc.swift
View file @ 70ac3d07
......@@ -15,6 +15,7 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
print("调用筛选列表")
blackBtn.isHidden = !blackBtn.isHidden
preView.isHidden = !preView.isHidden
removeBlackBtnView()
}
......@@ -39,9 +40,79 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
var keyWord = ""
var wlgsArr:Array<UIButton> = []
var zfztArr:Array<UIButton> = []
var dyztArr:Array<UIButton> = []
var ydztArr:Array<UIButton> = []
func setBtnArr(){
for item in contentView.subviews {
if item.isKind(of: UIButton.self){
let btn = item as! UIButton
switch btn.titleLabel!.text {
case "顺丰":
wlgsArr.append(btn)
break
case "货拉拉":
wlgsArr.append(btn)
break
case "京东":
wlgsArr.append(btn)
break
case "已付款":
zfztArr.append(btn)
break
case "未付款":
zfztArr.append(btn)
break
case "已退款":
zfztArr.append(btn)
break
case "全部":
if btn.tag == 99 {
//运单状态
ydztArr.append(btn)
}else if btn.tag == 101{
wlgsArr.append(btn)
//物流公司
}else{
dyztArr.append(btn)
//打印状态
}
break
case "已打印":
dyztArr.append(btn)
break
case "未打印":
dyztArr.append(btn)
break
case "下单完成":
ydztArr.append(btn)
break
case "揽收成功":
ydztArr.append(btn)
break
case "运输中":
ydztArr.append(btn)
break
case "已签收":
ydztArr.append(btn)
break
case "已取消":
ydztArr.append(btn)
break
default:
break
}
}
}
}
override func viewDidLoad() {
super.viewDidLoad()
setBtnArr()
orderNumTF.tag = 1
orderNumTF.delegate = self
standerTF.delegate = self
......@@ -82,45 +153,224 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
btn.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
@IBAction func btnClick(_ sender: UIButton) {
if sender.titleLabel!.text != "重置" && sender.titleLabel!.text != "确定"{
btnUISet(btn: sender)
}
// if sender.titleLabel!.text != "重置" && sender.titleLabel!.text != "确定"{
// btnUISet(btn: sender)
// }
switch sender.titleLabel?.text {
case "顺丰":
for item in wlgsArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
break
case "货拉拉":
break
case "全部":
for item in wlgsArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
break
case "京东":
for item in wlgsArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
break
case "已付款":
for item in zfztArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
break
case "未付款":
for item in zfztArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
break
case "已退款":
for item in zfztArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
break
case "全部":
if sender.tag == 99 {
//运单状态
for item in ydztArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
}else if sender.tag == 101{
//物流公司
for item in wlgsArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
}else{
//打印状态
for item in dyztArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
}
break
case "已打印":
for item in dyztArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
break
case "未打印":
for item in dyztArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
break
case "下单完成":
for item in ydztArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
break
case "揽收成功":
for item in ydztArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
break
case "运输中":
for item in ydztArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
break
case "已签收":
for item in ydztArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
break
case "已取消":
for item in ydztArr {
if item.titleLabel!.text == sender.titleLabel?.text{
item.isSelected = true
item.setTitleColor(UIColor.white, for: .normal)
item.backgroundColor = UIColor(named: "按钮渐变色上")
}else{
item.isSelected = false
item.setTitleColor(UIColor(named: "个人中心灰色字体"), for: .normal)
item.backgroundColor = UIColor(named: "多选按钮背景颜色")
}
}
break
case "重置":
print("12")
......@@ -145,11 +395,39 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
preView.isHidden = true
blackBtn.isHidden = true
listView.mj_header?.beginRefreshing()
var wlgsStr = ""
var zfztStr = ""
var dyztStr = ""
var ydztStr = ""
for item in wlgsArr {
if item.isSelected {
wlgsStr = item.titleLabel?.text as! String
}
}
for item in zfztArr {
if item.isSelected {
zfztStr = item.titleLabel?.text as! String
}
}
for item in dyztArr {
if item.isSelected {
dyztStr = item.titleLabel?.text as! String
}
}
for item in ydztArr {
if item.isSelected {
ydztStr = item.titleLabel?.text as! String
}
}
print(wlgsStr,zfztStr,dyztStr,ydztStr)
break
default:
break
}
}
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
let vc = YunDanXiangQingViewController()
self.navigationController?.pushViewController(vc, animated: true)
......@@ -169,6 +447,8 @@ class YDLBVc: BaseViewController,UITableViewDelegate,UITableViewDataSource,UISea
var blackBtnView:UIButton! = nil
func searchBarShouldBeginEditing(_ searchBar: UISearchBar) -> Bool {
print("调起搜索后添加个蒙版本")
blackBtn.isHidden = true
preView.isHidden = true
blackBtnView = UIButton ()
blackBtnView.backgroundColor = UIColor.init(named: "提示视图背景色")
......
GeliBusinessPlatform/ViewController/运单列表/YDLBVc.xib
View file @ 70ac3d07
......@@ -209,7 +209,7 @@
<color key="textColor" name="标题字颜色"/>
<nil key="highlightedColor"/>
</label>
<button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5af-3I-E0X">
<button opaque="NO" tag="101" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="5af-3I-E0X">
<rect key="frame" x="15" y="135" width="73" height="30"/>
<color key="backgroundColor" name="多选按钮背景颜色"/>
<constraints>
......
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