Skip to content

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

asdfasdfasfd asasd asdfasf asd

parent 8e2bcd87
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 429 additions and 68 deletions
GeliBusinessPlatform.xcodeproj/project.pbxproj
View file @ aaee33d5
......@@ -70,6 +70,8 @@
E0206331246CE303007A40C4 /* OrderDViewSumFooter.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0206330246CE303007A40C4 /* OrderDViewSumFooter.xib */; };
E0206333246CE450007A40C4 /* HeaderOnlyTitleView.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0206332246CE450007A40C4 /* HeaderOnlyTitleView.swift */; };
E0206335246CE45A007A40C4 /* HeaderOnlyTitleView.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0206334246CE45A007A40C4 /* HeaderOnlyTitleView.xib */; };
E02189932616AEAE007FF8BC /* CZ_Vc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E02189912616AEAE007FF8BC /* CZ_Vc.swift */; };
E02189942616AEAE007FF8BC /* CZ_Vc.xib in Resources */ = {isa = PBXBuildFile; fileRef = E02189922616AEAE007FF8BC /* CZ_Vc.xib */; };
E0228BB0246FDA9A005812FA /* TitleAndLblCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0228BAE246FDA9A005812FA /* TitleAndLblCell.swift */; };
E0228BB1246FDA9A005812FA /* TitleAndLblCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E0228BAF246FDA9A005812FA /* TitleAndLblCell.xib */; };
E0239202249069FD00C4C632 /* CGDXQVc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E0239200249069FD00C4C632 /* CGDXQVc.swift */; };
......@@ -230,6 +232,8 @@
E07337F92579E8660039767A /* GYS_FX_Product_ListVc.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07337F72579E8660039767A /* GYS_FX_Product_ListVc.xib */; };
E074B69C24DD305600777003 /* TitleHeaderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = E074B69A24DD305500777003 /* TitleHeaderCell.swift */; };
E074B69D24DD305600777003 /* TitleHeaderCell.xib in Resources */ = {isa = PBXBuildFile; fileRef = E074B69B24DD305500777003 /* TitleHeaderCell.xib */; };
E07723032616B78C00344F11 /* P_P_H_Time_Select_View.swift in Sources */ = {isa = PBXBuildFile; fileRef = E07723022616B78C00344F11 /* P_P_H_Time_Select_View.swift */; };
E07723082616B79400344F11 /* P_P_H_Time_Select_View.xib in Resources */ = {isa = PBXBuildFile; fileRef = E07723072616B79400344F11 /* P_P_H_Time_Select_View.xib */; };
E077DC5F255124B8000B0DA5 /* GYS_HZ_Vc.swift in Sources */ = {isa = PBXBuildFile; fileRef = E077DC5D255124B8000B0DA5 /* GYS_HZ_Vc.swift */; };
E077DC60255124B8000B0DA5 /* GYS_HZ_Vc.xib in Resources */ = {isa = PBXBuildFile; fileRef = E077DC5E255124B8000B0DA5 /* GYS_HZ_Vc.xib */; };
E077DC6A25512E94000B0DA5 /* FX_Product_GuanLiVC.swift in Sources */ = {isa = PBXBuildFile; fileRef = E077DC6825512E94000B0DA5 /* FX_Product_GuanLiVC.swift */; };
......@@ -840,6 +844,8 @@
E0206330246CE303007A40C4 /* OrderDViewSumFooter.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = OrderDViewSumFooter.xib; sourceTree = "<group>"; };
E0206332246CE450007A40C4 /* HeaderOnlyTitleView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = HeaderOnlyTitleView.swift; sourceTree = "<group>"; };
E0206334246CE45A007A40C4 /* HeaderOnlyTitleView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = HeaderOnlyTitleView.xib; sourceTree = "<group>"; };
E02189912616AEAE007FF8BC /* CZ_Vc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CZ_Vc.swift; sourceTree = "<group>"; };
E02189922616AEAE007FF8BC /* CZ_Vc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = CZ_Vc.xib; sourceTree = "<group>"; };
E0228BAE246FDA9A005812FA /* TitleAndLblCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleAndLblCell.swift; sourceTree = "<group>"; };
E0228BAF246FDA9A005812FA /* TitleAndLblCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TitleAndLblCell.xib; sourceTree = "<group>"; };
E0239200249069FD00C4C632 /* CGDXQVc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = CGDXQVc.swift; sourceTree = "<group>"; };
......@@ -1007,6 +1013,8 @@
E07337F72579E8660039767A /* GYS_FX_Product_ListVc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GYS_FX_Product_ListVc.xib; sourceTree = "<group>"; };
E074B69A24DD305500777003 /* TitleHeaderCell.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TitleHeaderCell.swift; sourceTree = "<group>"; };
E074B69B24DD305500777003 /* TitleHeaderCell.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = TitleHeaderCell.xib; sourceTree = "<group>"; };
E07723022616B78C00344F11 /* P_P_H_Time_Select_View.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = P_P_H_Time_Select_View.swift; sourceTree = "<group>"; };
E07723072616B79400344F11 /* P_P_H_Time_Select_View.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = P_P_H_Time_Select_View.xib; sourceTree = "<group>"; };
E077DC5D255124B8000B0DA5 /* GYS_HZ_Vc.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = GYS_HZ_Vc.swift; sourceTree = "<group>"; };
E077DC5E255124B8000B0DA5 /* GYS_HZ_Vc.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = GYS_HZ_Vc.xib; sourceTree = "<group>"; };
E077DC6825512E94000B0DA5 /* FX_Product_GuanLiVC.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FX_Product_GuanLiVC.swift; sourceTree = "<group>"; };
......@@ -2135,6 +2143,10 @@
E05AEFAC2615976200FB7CF4 /* P_P_H_YDLB_VC.xib */,
E063A7572616A5EF0020EEDC /* WXTS_View.swift */,
E063A75C2616A5F80020EEDC /* WXTS_View.xib */,
E02189912616AEAE007FF8BC /* CZ_Vc.swift */,
E02189922616AEAE007FF8BC /* CZ_Vc.xib */,
E07723022616B78C00344F11 /* P_P_H_Time_Select_View.swift */,
E07723072616B79400344F11 /* P_P_H_Time_Select_View.xib */,
);
path = "拼拼货group";
sourceTree = "<group>";
......@@ -3932,6 +3944,7 @@
F9A4AB6F24C927E900094BD1 /* LogisticsCostDetailViewController.xib in Resources */,
E0B5307F247266F400FFCC15 /* DKXDAdrCell.xib in Resources */,
E0A409D12464041200CFF109 /* ThirdCell.xib in Resources */,
E07723082616B79400344F11 /* P_P_H_Time_Select_View.xib in Resources */,
F9A4AB7424C933A700094BD1 /* XiaDanUserInfoViewController.xib in Resources */,
E027E36A25B5686D00CBCA65 /* print_top_btn_cell.xib in Resources */,
F9A4F25024C9689600D1DD13 /* OtherDemandViewController.xib in Resources */,
......@@ -4064,6 +4077,7 @@
E0A409CD2464026B00CFF109 /* SecondCell.xib in Resources */,
F90D37E825528D72001F3AED /* GLAlertTbAddView.xib in Resources */,
F95A9EEA24558B8800867849 /* ShowAlGoodsViewController.xib in Resources */,
E02189942616AEAE007FF8BC /* CZ_Vc.xib in Resources */,
E030DF3C248651A5002764D3 /* NewRKVc.xib in Resources */,
F96E48A424CA79D4000AB8D4 /* WayBillAddressItemCell.xib in Resources */,
F969BF08244EC38000C79953 /* GoodsCollectionViewCell.xib in Resources */,
......@@ -4375,6 +4389,7 @@
E019E98124A975920086C565 /* brandListModel.swift in Sources */,
F94A315724628AC600FEC38E /* WorkItemCollectionViewCell.swift in Sources */,
F950FDA52451453A00C40530 /* ShopInfoModel.swift in Sources */,
E02189932616AEAE007FF8BC /* CZ_Vc.swift in Sources */,
F96A585024790E300070A057 /* TFHpple.m in Sources */,
E027E36925B5686D00CBCA65 /* print_top_btn_cell.swift in Sources */,
E06B1AEC25B52725002F3C65 /* PrintViewController.swift in Sources */,
......@@ -4510,6 +4525,7 @@
E0D197C22448431C002B080C /* BabyRhythm.m in Sources */,
F924B3962497241500A913CD /* GetBindUserModel.swift in Sources */,
F956D5A1246A2D9C003FF510 /* LMNToolBar.m in Sources */,
E07723032616B78C00344F11 /* P_P_H_Time_Select_View.swift in Sources */,
F9011C1024CE6FB200AAF4F5 /* LogisticalSelectView.swift in Sources */,
E0A804B325B81A000082F56B /* printOrderModel.swift in Sources */,
F950FDDC24518B9500C40530 /* FSCalendar.m in Sources */,
......
GeliBusinessPlatform/AppDelegate.swift
View file @ aaee33d5
......@@ -282,8 +282,8 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate,UITabBarCont
let v2 = GoodsManageListVC()
// let v3 = WorkCViewController()
let v3 = P_P_H_Adr_VC()
let v3 = WorkCViewController()
// let v3 = CZ_Vc()
let v4 = WarehoseMangementListVC()
......
GeliBusinessPlatform/ViewController/供应商管理/GYSGLViewController.swift
View file @ aaee33d5
......@@ -108,7 +108,30 @@ class GYSGLViewController: BaseViewController,UITableViewDelegate,UITableViewDat
}
var delegate:GYSGLViewControllerDelegate?
func SJMapViewControllerSelectArd(adr: String) {
func SJMapViewControllerSelectArd(adr: String,cityData:String) {
dzStr = cityData
let arr = cityData.components(separatedBy: "-")
for i in 0 ..< addressArray.count {
let provinceData = addressArray[i] as! Dictionary<String,Any>
if provinceData["area_name"] as! String == arr.first! {
let cityArr = provinceData["city_list"] as! Array<Dictionary<String,Any>>
for j in 0 ..< cityArr.count {
let cityData = cityArr[j]
if cityData["area_name"] as! String == arr[1] {
let areaArr = cityData["district_list"] as! Array<Dictionary<String,Any>>
for k in 0 ..< areaArr.count {
let areaData = areaArr[k]
if areaData["area_name"] as! String == arr.last {
provinceIndex = i
cityIndex = j
areaIndex = k
}
}
}
}
}
}
detailDzStr = adr
listView.reloadData()
}
......
GeliBusinessPlatform/ViewController/地图/SJMapViewController.swift
View file @ aaee33d5
......@@ -16,12 +16,12 @@ import IQKeyboardManagerSwift
protocol SJMapViewControllerDelegate {
func SJMapViewControllerSelectArd(adr:String)
func SJMapViewControllerSelectArd(adr:String,cityData:String)
}
class SJMapViewController: UIViewController,AMapLocationManagerDelegate,MAMapViewDelegate,AMapSearchDelegate,UISearchBarDelegate,SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource, CLLocationManagerDelegate{
class SJMapViewController: UIViewController,NavBarViewDelegate,AMapLocationManagerDelegate,MAMapViewDelegate,AMapSearchDelegate,UISearchBarDelegate,SearchBarViewDelegate,UITableViewDelegate,UITableViewDataSource, CLLocationManagerDelegate{
var isPPH = false
var delegate:SJMapViewControllerDelegate?
let navbar = NavBarView(frame: NavCGRect)
var mapView: MAMapView!
var search: AMapSearchAPI!
var lat:CLLocationDegrees = 0
......@@ -50,11 +50,38 @@ class SJMapViewController: UIViewController,AMapLocationManagerDelegate,MAMapVie
initMapView(lat: coo.latitude, lng: coo.longitude)
initSearch()
initUI()
// initUI()
}
func backAction() {
self.navigationController?.popViewController(animated: true)
}
override func viewDidLoad() {
super.viewDidLoad()
navbar.deleagte = self
navbar.title = "地址选择"
self.view.addSubview(navbar)
let searchBGView = UIView()
searchBGView.backgroundColor = UIColor.white
self.view.addSubview(searchBGView)
searchBGView.snp.makeConstraints { (make) in
make.top.equalTo(navbar.snp_bottom)
make.left.right.equalTo(0)
make.height.equalTo(44)
}
let searchBr = SearchBarView.init()
searchBGView.addSubview(searchBr)
searchBr.snp.makeConstraints { (make) in
make.left.equalTo(10)
make.right.equalTo(-10)
make.centerY.equalToSuperview()
make.height.equalTo(30)
}
searchV = searchBr
searchBr.placeholderStr = "搜索地点"
searchBr.cornerRadius = 35/2.0
searchBr.delegate = self
searchBr.delegateL = self
AMapServices.shared().apiKey = "ca417b43e3d031db9c29382cc09a174a"
manger.delegate = self
......@@ -83,13 +110,13 @@ class SJMapViewController: UIViewController,AMapLocationManagerDelegate,MAMapVie
@objc func backToCenter(){
mapView.setCenter(CLLocationCoordinate2DMake(lat, lng), animated: false)
}
@objc func backAction(){
self.navigationController?.popViewController(animated: true)
}
// @objc func backAction(){
// self.navigationController?.popViewController(animated: true)
// }
@objc func submitAction(){
if adrStr != nil {
delegate?.SJMapViewControllerSelectArd(adr: adrStr!)
delegate?.SJMapViewControllerSelectArd(adr: adrStr!,cityData: cityData!)
self.navigationController?.popViewController(animated: true)
}else{
HUD.flash(.label("请选择地址"), delay: 1.2)
......@@ -184,10 +211,12 @@ class SJMapViewController: UIViewController,AMapLocationManagerDelegate,MAMapVie
if indexPath == idx {
cell.imgView.isHidden = false
adrStr = poi.name
cityData = poi.province + "-" + poi.city + "-" + poi.district
}
return cell
}
var cityData:String?
var adrStr:String?
func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
if idx == indexPath {
......@@ -244,47 +273,60 @@ class SJMapViewController: UIViewController,AMapLocationManagerDelegate,MAMapVie
}
}
func initBtmView(view:UIView){
let searchBGView = UIView()
searchBGView.backgroundColor = UIColor.white
view.addSubview(searchBGView)
searchBGView.snp.makeConstraints { (make) in
make.top.left.right.equalTo(0)
make.height.equalTo(44)
}
let tbv = UITableView()
tbv.separatorStyle = .none
tbv.delegate = self
tbv.dataSource = self
view.addSubview(tbv)
listView = tbv
var btnH = 49
if IS_IPHONE_X {
btnH = 83
}
tbv.snp.makeConstraints { (make) in
make.top.equalTo(searchBGView.snp_bottom)
make.bottom.left.right.equalTo(0)
make.top.left.right.equalTo(0)
make.bottom.equalTo(btnH * -1)
}
listView?.register(UINib(nibName: "SJMapCell", bundle: nil), forCellReuseIdentifier: "SJMapCell")
let searchBr = SearchBarView.init()
searchBGView.addSubview(searchBr)
searchBr.snp.makeConstraints { (make) in
make.left.equalTo(10)
make.right.equalTo(-10)
make.centerY.equalToSuperview()
make.height.equalTo(30)
let submit_btn = LGButton()
view.addSubview(submit_btn)
submit_btn.gradientStartColor = UIColor(named: "按钮渐变色上")
submit_btn.gradientEndColor = UIColor(named: "按钮渐变色下,字体颜色")
submit_btn.gradientHorizontal = true
if isPPH {
submit_btn.gradientStartColor = UIColor(named: "green")
submit_btn.gradientEndColor = UIColor(named: "green")
}
submit_btn.addTarget(self, action: #selector(submitAction), for: .touchUpInside)
submit_btn.snp.makeConstraints { (make) in
make.bottom.left.right.equalTo(0)
make.height.equalTo(btnH)
}
let lbl = UILabel()
view.addSubview(lbl)
lbl.textAlignment = .center
lbl.font = UIFont(name: "PingFangSC-Medium", size: 17)
lbl.text = "确定"
lbl.textColor = UIColor.white
lbl.snp.makeConstraints { (make) in
make.top.equalTo(tbv.snp_bottom)
make.left.right.equalTo(0)
make.height.equalTo(49)
}
searchV = searchBr
searchBr.placeholderStr = "搜索地点"
searchBr.cornerRadius = 35/2.0
searchBr.delegate = self
searchBr.delegateL = self
}
let locationM = AMapLocationManager()
func initMapView(lat:CLLocationDegrees,lng:CLLocationDegrees) {
let btmView = UIView()
self.view.addSubview(btmView)
var btmH = 255
if IS_IPHONE_X {
btmH = 289
}
btmView.snp.makeConstraints { (make) in
make.bottom.right.left.equalTo(0)
make.height.equalTo(260)
make.height.equalTo(btmH)
}
initBtmView(view: btmView)
......@@ -296,7 +338,8 @@ class SJMapViewController: UIViewController,AMapLocationManagerDelegate,MAMapVie
mapView.setCenter(CLLocationCoordinate2D(latitude: lat, longitude: lng), animated: false)
self.view.addSubview(mapView!)
mapView.snp.makeConstraints { (make) in
make.top.left.right.equalTo(0)
make.top.equalTo(NavHeight + 44)
make.left.right.equalTo(0)
make.bottom.equalTo(btmView.snp_top)
}
mapView.subviews.forEach { (item) in
......
GeliBusinessPlatform/ViewController/地址管理/XinZengDiZhiViewController.swift
View file @ aaee33d5
......@@ -178,7 +178,6 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
for k in 0 ..< districts.count{
let dItem = districts[k]
if dItem["area_id"] as! Int == areaIndex{
print("id === ",k,dItem["area_id"],areaIndex)
provinceIndex = i
cityIndex = j
areaIndex = k
......@@ -245,7 +244,6 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
}
}
var selectAdr = proName
if cityName.count > 0 {
selectAdr = proName + "-" + cityName
......@@ -552,7 +550,33 @@ class XinZengDiZhiViewController: BaseViewController,UITableViewDelegate,UITable
return genderLbl
}
func SJMapViewControllerSelectArd(adr: String) {
func SJMapViewControllerSelectArd(adr: String,cityData:String) {
holderArr.insert(cityData, at: 1)
holderArr.remove(at: 2)
let arr = cityData.components(separatedBy: "-")
for i in 0 ..< addressArray.count {
let provinceData = addressArray[i] as! Dictionary<String,Any>
if provinceData["area_name"] as! String == arr.first! {
let cityArr = provinceData["city_list"] as! Array<Dictionary<String,Any>>
for j in 0 ..< cityArr.count {
let cityData = cityArr[j]
if cityData["area_name"] as! String == arr[1] {
print("city -- ",cityData["area_name"])
let areaArr = cityData["district_list"] as! Array<Dictionary<String,Any>>
for k in 0 ..< areaArr.count {
let areaData = areaArr[k]
if areaData["area_name"] as! String == arr.last {
provinceIndex = i
cityIndex = j
areaIndex = k
}
}
}
}
}
}
adrStr = adr
listView.reloadData()
}
......
GeliBusinessPlatform/ViewController/客户管理/KeHuXQViewController.swift
View file @ aaee33d5
......@@ -227,8 +227,8 @@ class KeHuXQViewController: BaseViewController,UITableViewDelegate,UITableViewDa
let selectV = WorkSelectTimeView()
var selelctIndex = 1001
var isShowSelectTimeV:Bool = false
var endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
var starTime = DateInRegion().dateAt(.startOfDay).date - 8.hours
var endTime = DateInRegion().dateAt(.endOfDay).date
var starTime = DateInRegion().dateAt(.startOfDay).date
func rightBtnClick() {
print("日期筛选按钮")
if isShowSelectTimeV {
......@@ -253,18 +253,18 @@ class KeHuXQViewController: BaseViewController,UITableViewDelegate,UITableViewDa
isShowSelectTimeV = false
switch sender {
case 1001:
endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
starTime = DateInRegion().dateAt(.startOfDay).date - 8.hours //今天开始时间
endTime = DateInRegion().dateAt(.endOfDay).date
starTime = DateInRegion().dateAt(.startOfDay).date //今天开始时间
btmListView.mj_header?.beginRefreshing()
break
case 1002:
endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
starTime = DateInRegion().dateAt(.startOfWeek).date + 1.days - 8.hours //当周周一开始时间
endTime = DateInRegion().dateAt(.endOfDay).date
starTime = DateInRegion().dateAt(.startOfWeek).date + 1.days //当周周一开始时间
btmListView.mj_header?.beginRefreshing()
break
case 1003:
endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
starTime = DateInRegion().dateAt(.startOfMonth).date - 9.hours - 1.minutes - 1.seconds //本月开始时间
endTime = DateInRegion().dateAt(.endOfDay).date
starTime = DateInRegion().dateAt(.startOfMonth).date //本月开始时间
btmListView.mj_header?.beginRefreshing()
break
case 1004:
......
GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift
View file @ aaee33d5
......@@ -103,20 +103,20 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
switch sender {
case 1001:
topNavBtn.setTitle("今日", for: .normal)
endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
starTime = DateInRegion().dateAt(.startOfDay).date - 8.hours //今天开始时间
endTime = DateInRegion().dateAt(.endOfDay).date
starTime = DateInRegion().dateAt(.startOfDay).date //今天开始时间
loadData()
break
case 1002:
topNavBtn.setTitle("本周", for: .normal)
endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
starTime = DateInRegion().dateAt(.startOfWeek).date + 1.days - 8.hours //当周周一开始时间
endTime = DateInRegion().dateAt(.endOfDay).date
starTime = DateInRegion().dateAt(.startOfWeek).date + 1.days //当周周一开始时间
loadData()
break
case 1003:
topNavBtn.setTitle("本月", for: .normal)
endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
starTime = DateInRegion().dateAt(.startOfMonth).date - 9.hours - 1.minutes - 1.seconds //本月开始时间
endTime = DateInRegion().dateAt(.endOfDay).date
starTime = DateInRegion().dateAt(.startOfMonth).date //本月开始时间
loadData()
break
case 1004:
......@@ -173,15 +173,15 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
func updateTheNowTime(){
switch topNavBtn.titleLabel?.text {
case "今日":
endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
starTime = DateInRegion().dateAt(.startOfDay).date - 8.hours //今天开始时间
endTime = DateInRegion().dateAt(.endOfDay).date
starTime = DateInRegion().dateAt(.startOfDay).date //今天开始时间
break
case "本周":
endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
starTime = DateInRegion().dateAt(.startOfWeek).date + 1.days - 8.hours //当周周一开始时间
endTime = DateInRegion().dateAt(.endOfDay).date
starTime = DateInRegion().dateAt(.startOfWeek).date + 1.days //当周周一开始时间
case "本月":
endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
starTime = DateInRegion().dateAt(.startOfMonth).date - 9.hours - 1.minutes - 1.seconds //本月开始时间
endTime = DateInRegion().dateAt(.endOfDay).date
starTime = DateInRegion().dateAt(.startOfMonth).date //本月开始时间
break
default:
break
......
GeliBusinessPlatform/ViewController/拼拼货group/CZ_Vc.swift 0 → 100644
View file @ aaee33d5
//
// CZ_Vc.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/4/2.
// Copyright © 2021 junye lu. All rights reserved.
//
import UIKit
class CZ_Vc: BaseViewController {
@IBOutlet weak var bank_number: UILabel!
@IBOutlet weak var bank_account_number: UILabel!
@IBOutlet weak var bank_adr: UILabel!
@IBOutlet weak var bank_name: UILabel!
@IBOutlet weak var user_account: UILabel!
@IBAction func copy_action(_ sender: UIButton) {
// let pastboard = UIPasteboard.general
// pastboard.string = bank_account_number.text
// HUD.flash(.success, delay: 0.5)
let view = P_P_H_Time_Select_View(frame: self.view.bounds)
self.view.addSubview(view)
}
override func viewDidLoad() {
super.viewDidLoad()
// Do any additional setup after loading the view.
}
/*
// MARK: - Navigation
// In a storyboard-based application, you will often want to do a little preparation before navigation
override func prepare(for segue: UIStoryboardSegue, sender: Any?) {
// Get the new view controller using segue.destination.
// Pass the selected object to the new view controller.
}
*/
}
GeliBusinessPlatform/ViewController/拼拼货group/CZ_Vc.xib 0 → 100644
View file @ aaee33d5
This diff is collapsed.
GeliBusinessPlatform/ViewController/拼拼货group/P_P_H_Time_Select_View.swift 0 → 100644
View file @ aaee33d5
//
// P_P_H_Time_Select_View.swift
// GeliBusinessPlatform
//
// Created by junye lu on 2021/4/2.
// Copyright © 2021 junye lu. All rights reserved.
//
import UIKit
import SwiftDate
protocol P_P_H_Time_Select_View_Delegate {
func P_P_H_Time_Select_View_Time_Select(time:String)
}
class P_P_H_Time_Select_View: UIView,UIPickerViewDelegate,UIPickerViewDataSource {
var contentView:UIView!
var time_str = ""
@IBOutlet weak var picker_view: UIPickerView!
var delegate:P_P_H_Time_Select_View_Delegate?
@IBAction func close_action(_ sender: UIButton) {
self.removeFromSuperview()
}
@IBAction func submitAction(_ sender: Any) {
delegate?.P_P_H_Time_Select_View_Time_Select(time: time_str)
self.removeFromSuperview()
}
var dayArr:Array<String> = []
var hourArr:Array<String> = []
var minArr:Array<String> = []
func numberOfComponents(in pickerView: UIPickerView) -> Int {
return 3
}
var daySelect = 0
var hourSelect = 0
var minSelect = 0
func pickerView(_ pickerView: UIPickerView, numberOfRowsInComponent component: Int) -> Int {
switch component {
case 0:
return dayArr.count
case 1:
return hourArr.count
default:
return minArr.count
}
}
//设置选择框各选项的内容，继承于UIPickerViewDelegate协议
func pickerView(_ pickerView: UIPickerView, titleForRow row: Int,
forComponent component: Int) -> String? {
switch component {
case 0:
return dayArr[row]
case 1:
return hourArr[row]
default:
return minArr[row]
}
}
func pickerView(_ pickerView: UIPickerView, didSelectRow row: Int,
inComponent component: Int) {
//根据列、行索引判断需要改变数据的区域
switch (component) {
case 0:
daySelect = row;
currentTime()
pickerView.reloadComponent(1);
pickerView.reloadComponent(2);
pickerView.selectRow(hourSelect, inComponent: 1, animated: false)
pickerView.selectRow(minSelect, inComponent: 2, animated: false)
case 1:
hourSelect = row;
currentTime()
pickerView.reloadComponent(2);
pickerView.selectRow(minSelect, inComponent: 2, animated: false)
case 2:
minSelect = row;
default:
break;
}
}
//初始化时将xib中的view添加进来
override init(frame: CGRect) {
super.init(frame: frame)
contentView = loadViewFromNib()
addSubview(contentView)
contentView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
getTimeSet()
}
func getTimeSet(){
picker_view.delegate = self
picker_view.dataSource = self
getDayArr()
currentTime()
}
func currentTime() {
hourArr.removeAll()
minArr.removeAll()
   let dateformatter = DateFormatter()
    dateformatter.dateFormat = "YYYY-MM-dd~HH:mm"
let arr = dateformatter.string(from: Date()).components(separatedBy: "~")
let str = arr.last
let arr2 = str!.components(separatedBy: ":")
//分钟
let min = arr2.last! as! NSString
//小时
let hour = arr2.first as! NSString
if daySelect == 0 {
let num = 24 - hour.integerValue
if min.integerValue < 50 {
for i in 0 ..< num {
hourArr.append("\(hour.integerValue + i)点")
}
}else{
for i in 0 ..< num - 1 {
hourArr.append("\(hour.integerValue + i + 1)点")
}
}
}else{
for i in 0 ..< 24 {
hourArr.append("\(i)点")
}
}
print(min)
let selectHour = hourArr[hourSelect] as! NSString
if selectHour.integerValue > hour.integerValue {
for i in 0 ..< 6 {
minArr.append("\(i * 10)")
}
}else{
var tempArr:Array<NSString> = []
for i in 0 ..< 6 {
tempArr.append("\(i * 10)" as NSString)
}
tempArr.forEach { (item) in
if item.integerValue > min.integerValue {
minArr.append(item as String)
}
}
}
}
func getDayArr(){
let monEndDay = DateInRegion().dateAt(.endOfMonth).date.day
let today = DateInRegion().dateAt(.startOfDay).date.day
let dayCount = monEndDay - today
if dayCount >= 28 {
for i in 0 ..< dayCount {
if i == 0 {
dayArr.append("今天")
}else if i == 1 {
dayArr.append("明天")
}else{
dayArr.append("\(i + today)")
}
}
}else{
for i in 0 ..< dayCount {
if i == 0 {
dayArr.append("今天")
}else if i == 1 {
dayArr.append("明天")
}else{
dayArr.append("\(i + today)")
}
}
let nextMonth = 28 - dayCount
for i in 0 ..< nextMonth{
dayArr.append("\(i + 1)")
}
}
}
///初始化时将xib中的view添加进来
required init?(coder aDecoder: NSCoder) {
super.init(coder: aDecoder)
contentView = loadViewFromNib()
addSubview(contentView)
contentView.snp.makeConstraints { (make) in
make.left.top.right.bottom.equalToSuperview()
}
getTimeSet()
}
//加载xib
func loadViewFromNib() -> UIView {
let className = type(of: self)
let bundle = Bundle(for: className)
let name = NSStringFromClass(className).components(separatedBy: ".").last
let nib = UINib(nibName: name!, bundle: bundle)
let view = nib.instantiate(withOwner: self, options: nil).first as! UIView
return view
}
}
GeliBusinessPlatform/ViewController/收支统计/ShouZhiTongJiViewController.swift
View file @ aaee33d5
......@@ -128,8 +128,8 @@ class ShouZhiTongJiViewController: BaseViewController,UITableViewDelegate,UITabl
let selectV = WorkSelectTimeView()
var selelctIndex = 1001
var isShowSelectTimeV:Bool = false
var endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
var starTime = DateInRegion().dateAt(.startOfDay).date - 8.hours
var endTime = DateInRegion().dateAt(.endOfDay).date
var starTime = DateInRegion().dateAt(.startOfDay).date
func rightBtnClick() {
print("日期筛选按钮")
if isShowSelectTimeV {
......@@ -153,20 +153,20 @@ class ShouZhiTongJiViewController: BaseViewController,UITableViewDelegate,UITabl
switch sender {
case 1001:
// topNavBtn.setTitle("今日", for: .normal)
endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
starTime = DateInRegion().dateAt(.startOfDay).date - 8.hours //今天开始时间
endTime = DateInRegion().dateAt(.endOfDay).date
starTime = DateInRegion().dateAt(.startOfDay).date //今天开始时间
loadData()
break
case 1002:
// topNavBtn.setTitle("本周", for: .normal)
endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
starTime = DateInRegion().dateAt(.startOfWeek).date + 1.days - 8.hours //当周周一开始时间
endTime = DateInRegion().dateAt(.endOfDay).date
starTime = DateInRegion().dateAt(.startOfWeek).date + 1.days //当周周一开始时间
loadData()
break
case 1003:
// topNavBtn.setTitle("本月", for: .normal)
endTime = DateInRegion().dateAt(.endOfDay).date - 8.hours
starTime = DateInRegion().dateAt(.startOfMonth).date - 9.hours - 1.minutes - 1.seconds //本月开始时间
endTime = DateInRegion().dateAt(.endOfDay).date
starTime = DateInRegion().dateAt(.startOfMonth).date //本月开始时间
loadData()
break
case 1004:
......
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