完善时间选择器

GeliBusinessPlatform/AppDelegate.swift

@@ -241,7 +241,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate,loginDelegate, UITabBarCon
         tabBarC = tabBarController
         
         let v1 = OrderListViewController()
-        let v2 = CRKListVC()
+        let v2 = GoodsManageListVC()
         let v3 = WorkCViewController()
         let v4 = WarehoseMangementListVC()
         let v5 = PersonCenterViewController()

GeliBusinessPlatform/View/TimeSelectView/ShowTimeSelectView.swift

@@ -109,11 +109,18 @@ class ShowTimeSelectView: UIView ,TimeSelectViewDelgate{
     var beginDateByWork: Date? = nil {
         didSet {
             calendarV.beginDateByWork = beginDateByWork
+            if BeginDate != nil && EndDate != nil {
+                calendarV.setOldDate(beginD: BeginDate, endD: EndDate)
+                let timeInterval:TimeInterval = BeginDate.timeIntervalSince1970
+                let timeIntervalEnd:TimeInterval = EndDate.timeIntervalSince1970
+                timeLbl.text = dayByDouble(sender: timeInterval) + "-" + dayByDouble(sender: timeIntervalEnd)
+            }
+
         }
     }
 
     var BeginDate: Date! = nil
-    var EndDate: Date! = nil
+    var EndDate: Date! = nil 
     func selectMoreDate(beginDate: Date, endginDate: Date) {
         print("选择日期·····")
         let timeInterval:TimeInterval = beginDate.timeIntervalSince1970

GeliBusinessPlatform/ViewController/商品详情/EPViewController.swift

@@ -1054,6 +1054,12 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
         if cell.nameLbl.text == "预设预付定金时间段" {
             print("定金时间段")
             let timeSelectV = ShowTimeSelectView(frame: self.view.window!.bounds)
+            if dj_time_start != 0 &&  dj_time_end != 0{
+                var time = TimeInterval(exactly: dj_time_start!)
+                timeSelectV.BeginDate = Date(timeIntervalSince1970: time!)
+                time = TimeInterval(exactly: dj_time_end!)
+                timeSelectV.EndDate = Date(timeIntervalSince1970: time!)
+            }
             timeSelectV.beginDateByWork = Date()
             timeSelectV.titleLbl.text = "预设预付定金时间段"
             timeSelectV.delegate = self
@@ -1070,6 +1076,12 @@ class EPViewController: BaseViewController,UITableViewDelegate,UITableViewDataSo
             let timeSelectV = ShowTimeSelectView(frame: self.view.window!.bounds)
             timeSelectV.titleLbl.text = "预设预付尾款时间段"
             timeSelectV.delegate = self
+            if wk_time_start != 0 &&  wk_time_end != 0{
+                 var time = TimeInterval(exactly: wk_time_start!)
+                 timeSelectV.BeginDate = Date(timeIntervalSince1970: time!)
+                 time = TimeInterval(exactly: wk_time_end!)
+                 timeSelectV.EndDate = Date(timeIntervalSince1970: time!)
+             }
             let dijitime:TimeInterval = TimeInterval(exactly: (dj_time_start! + (24 * 60 * 60)))!
             let beginDate = Date(timeIntervalSince1970: dijitime)
             timeSelectV.beginDateByWork = beginDate

GeliBusinessPlatform/ViewController/商品详情/ProductDetailViewController.swift

@@ -632,6 +632,12 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
         if cell.nameLbl.text == "预设预付定金时间段" {
             print("定金时间段")
             let timeSelectV = ShowTimeSelectView(frame: self.view.window!.bounds)
+            if dj_time_start != 0 &&  dj_time_end != 0{
+                var time = TimeInterval(exactly: dj_time_start!)
+                timeSelectV.BeginDate = Date(timeIntervalSince1970: time!)
+                time = TimeInterval(exactly: dj_time_end!)
+                timeSelectV.EndDate = Date(timeIntervalSince1970: time!)
+            }
             timeSelectV.beginDateByWork = Date()
             timeSelectV.titleLbl.text = "预设预付定金时间段"
             timeSelectV.delegate = self
@@ -648,6 +654,12 @@ class ProductDetailViewController: BaseViewController,UITableViewDelegate,UITabl
             let timeSelectV = ShowTimeSelectView(frame: self.view.window!.bounds)
             timeSelectV.titleLbl.text = "预设预付尾款时间段"
             timeSelectV.delegate = self
+            if wk_time_start != 0 &&  wk_time_end != 0{
+                var time = TimeInterval(exactly: wk_time_start!)
+                timeSelectV.BeginDate = Date(timeIntervalSince1970: time!)
+                time = TimeInterval(exactly: wk_time_end!)
+                timeSelectV.EndDate = Date(timeIntervalSince1970: time!)
+            }
             let dijitime:TimeInterval = TimeInterval(exactly: (dj_time_start! + (24 * 60 * 60)))!
             let beginDate = Date(timeIntervalSince1970: dijitime)
             timeSelectV.beginDateByWork = beginDate

GeliBusinessPlatform/ViewController/工作中心/WorkCViewController.swift

@@ -46,7 +46,8 @@ class WorkCViewController: BaseViewController, UITableViewDelegate, UITableViewD
     //MARK:--二维码方法
     @IBAction func codeAction(_ sender: UIButton) {
         print("二维码方法")//加一个透明的显示弹窗
-        
+        print("指定日期当天的开始时间：", Date().dateAtStartOf(.day).date)
+        print("指定日期当天的结束时间：", Date().dateAtEndOf(.day).date)
     }
     //MARK:--头部按钮方法
     let selectV = WorkSelectTimeView()

GeliBusinessPlatform/ViewController/订单列表/OrderListViewController.swift

@@ -160,8 +160,8 @@ class OrderListViewController: BaseViewController ,UISearchBarDelegate, SearchBa
                 vc.endTime = 0
             }else{
                 let timeInterval:TimeInterval = BeginDate!.timeIntervalSince1970
-                  let timeIntervalEnd:TimeInterval = EndDate!.timeIntervalSince1970
-      
+                let timeIntervalEnd:TimeInterval = EndDate!.timeIntervalSince1970
+                
                 vc.startTime = Int(timeInterval)
                 vc.endTime = Int(timeIntervalEnd)
             }