Skip to content

G
galaxy-iOS
Commit 7c7a1ff7 authored by Steven杜宇's avatar Steven杜宇
Browse files
Options

Merge branch 'develop' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS into develop

parents 342ac43b aea12088
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 109 deletions
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceOrderListViewController.swift
View file @ 7c7a1ff7
......@@ -256,12 +256,19 @@ extension YHServiceOrderListView : UITableViewDelegate,UITableViewDataSource {
//赴港时间预约
} else if model.type == 24 {
//电子签字缴费
let vc = YHVisaPaymentVC()
vc.orderID = orderID
navigationController?.pushViewController(vc)
} else if model.type == 25 {
//赴港行程指引
} else if model.type == 26 {
//旅行证件准备
} else if model.type == 27 {
//上传过关证件
let vc = YHUploadCertificateVC()
navigationController?.pushViewController(vc)
}
}
}
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/UploadCertificate(7上传过关证件)/C/YHUploadCertificateVC.swift
View file @ 7c7a1ff7
......@@ -10,7 +10,7 @@ import UIKit
class YHUploadCertificateVC: YHBaseViewController {
var items: [String] = ["1", "1"] //for test hjl
var items: [String] = ["1", "1"]
lazy var tableView: UITableView = {
let tableView = UITableView(frame:.zero, style:.grouped)
......
galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/CustomerService/Certificate(办证段)/VisaPayment(4电子签字缴费)/C/YHVisaPaymentVC.swift
View file @ 7c7a1ff7
......@@ -11,6 +11,9 @@ import UIKit
class YHVisaPaymentVC: YHBaseViewController {
let items : [String] = ["1","2","3"]
var orderID: Int = 0
lazy var viewModel: YHVisaPaymentViewModel = {
let vm = YHVisaPaymentViewModel()
return vm
......@@ -74,57 +77,43 @@ class YHVisaPaymentVC: YHBaseViewController {
private extension YHVisaPaymentVC {
func loadData() {
if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
// let id = orderID
let id = 133874//for test hjl
let params: [String : Any] = ["order_id": id]
viewModel.getVisaPaymentList(params) { success, error in
if success {
} else {
}
self.tableView.reloadData()
let params: [String : Any] = ["order_id": orderID]
viewModel.getVisaPaymentList(params) { success, error in
if success {
} else {
self.getPayUpdateStatus()
}
self.tableView.reloadData()
self.getPayUpdateStatus()
}
}
func postPaymentResult() {
if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
// let id = orderID
let id = 133874//for test hjl
let params: [String : Any] = ["order_id": id]//for test hjl
viewModel.postPaymentResult(params) { success, error in
if success {
YHHUD.flash(message: "预计会在1个工作日内更新缴费结果")
} else {
}
self.getPayUpdateStatus()
let params: [String : Any] = ["order_id": orderID]
viewModel.postPaymentResult(params) { success, error in
if success {
YHHUD.flash(message: "预计会在1个工作日内更新缴费结果")
} else {
}
self.getPayUpdateStatus()
}
}
func getPayUpdateStatus() {
if let orderID = UserDefaults.standard.value(forKey: "orderIdForPreview") {
// let id = orderID
let id = 133874//for test hjl
let params: [String : Any] = ["order_id": id]//for test hjl
viewModel.getPaymentUpdateStatus(params) { success, error in
if success {
} else {
}
self.setButtonRightStatus()
let params: [String : Any] = ["order_id": orderID]
viewModel.getPaymentUpdateStatus(params) { success, error in
if success {
} else {
}
self.setButtonRightStatus()
}
}
......@@ -136,6 +125,14 @@ private extension YHVisaPaymentVC {
gk_navBackgroundColor = .white
view.backgroundColor = UIColor.contentBkgColor
if orderID == 0 {
if let id = UserDefaults.standard.value(forKey: "orderIdForPreview") {
self.orderID = (id as? Int) ?? 0
}
}
orderID = 133874//for test hjl
view.addSubview(tableView)
view.addSubview(bottomView)
bottomView.snp.makeConstraints { make in
......
galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyViewController.swift
View file @ 7c7a1ff7
......@@ -120,39 +120,37 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
view.likeClick = {
[weak self] in
guard let self = self else { return }
// if !checkLogin() { return }
// let vc = YHMyLikeActivityViewController()
// vc.myDefaultNavItemIndex = 0
// self.navigationController?.pushViewController(vc)
print("点赞")
let vc = YHVisaPaymentVC()
self.navigationController?.pushViewController(vc) //for test hjl
if !checkLogin() { return }
let vc = YHMyLikeActivityViewController()
vc.myDefaultNavItemIndex = 0
self.navigationController?.pushViewController(vc)
}
view.collectClick = {
[weak self] in
guard let self = self else { return }
// if !checkLogin() { return }
// let vc = YHMyLikeActivityViewController()
// vc.myDefaultNavItemIndex = 1
// self.navigationController?.pushViewController(vc)
// print("收藏")
let vc = YHUploadCertificateVC()
self.navigationController?.pushViewController(vc) //for test hjl
if !checkLogin() { return }
let vc = YHMyLikeActivityViewController()
vc.myDefaultNavItemIndex = 1
self.navigationController?.pushViewController(vc)
print("收藏")
}
view.recentScanClick = {
[weak self] in
guard let self = self else { return }
// if !checkLogin() { return }
// let vc = YHMyLikeActivityViewController()
// vc.myDefaultNavItemIndex = 2
// self.navigationController?.pushViewController(vc)
// print("最近浏览")
if !checkLogin() { return }
let vc = YHMyLikeActivityViewController()
vc.myDefaultNavItemIndex = 2
self.navigationController?.pushViewController(vc)
print("最近浏览")
let view = YHRangeDatePickerSheetView.sheetView()
view.show() //for test hjl
// let view = YHRangeDatePickerSheetView.sheetView()
// view.block = { (startDate,endDate) in
// print("选择的日期是：")
// print(startDate)
// print(endDate)
// }
// view.show() //for test hjl
}
return view
......
galaxy/galaxy/Classes/Tools/RangeDatePicker/YHRangeDatePickerSheetView.swift
View file @ 7c7a1ff7
......@@ -9,7 +9,10 @@
import UIKit
class YHRangeDatePickerSheetView: UIView {
static let contentViewH : CGFloat = YHRangeDatePickerView.viewH + 98 + 112 + 12
static let contentViewH : CGFloat = (16 + 24) + (12 + 1) + (12 + 32) + YHRangeDatePickerView.viewH + 98
typealias Block = (Date,Date) -> ()
var block: Block?
lazy var blackMaskView: UIView = {
let view = UIView()
......@@ -79,13 +82,6 @@ class YHRangeDatePickerSheetView: UIView {
return button
}()
// lazy var myScrollView: UIScrollView = {
// let view = UIScrollView()
// view.backgroundColor = .clear
// view.showsVerticalScrollIndicator = false
// return view
// }()
lazy var datePickView : YHRangeDatePickerView = {
let view = YHRangeDatePickerView()
return view
......@@ -121,7 +117,7 @@ extension YHRangeDatePickerSheetView {
UIApplication.shared.yhKeyWindow()?.addSubview(self)
UIView.animate(withDuration: 0.5) {
let whiteHeight = YHHKCardTemplateView.contentViewH
let whiteHeight = YHRangeDatePickerSheetView.contentViewH
self.whiteContentView.frame = CGRect(x: 0, y: KScreenHeight - whiteHeight, width: KScreenWidth, height: whiteHeight)
}
}
......@@ -131,7 +127,27 @@ extension YHRangeDatePickerSheetView {
}
@objc func clickSureBtn() {
dismiss()
if isChooseOk() {
if let date1 = datePickView.startDate,let date2 = datePickView.endDate {
self.block?(date1,date2)
}
dismiss()
} else {
YHHUD.flash(message: "选择开始/结束日期")
}
}
func isChooseOk()->Bool {
if datePickView.startDate != nil,datePickView.endDate != nil {
return true
}
return false
}
}
......@@ -197,36 +213,10 @@ private extension YHRangeDatePickerSheetView {
whiteContentView.addSubview(datePickView)
warnImageV.snp.makeConstraints { make in
make.top.equalTo(titleLable.snp.bottom).offset(12)
datePickView.snp.makeConstraints { make in
make.top.equalTo(warnImageV.snp.bottom)
make.left.right.equalToSuperview()
make.height.equalTo(YHRangeDatePickerView.viewH)
}
// whiteContentView.addSubview(myScrollView)
// myScrollView.snp.makeConstraints { make in
// make.top.equalTo(lineView.snp.bottom).offset(21)
// make.right.equalToSuperview().offset(-21)
// make.width.equalTo(KScreenWidth - 21 * 2)
// make.height.equalTo(whiteHeight-98 - 16 - 24 - 12 - 1 - 21)
// }
//
//
// if let tmpImage = UIImage(named:"hkCard_template") {
// let scale = Double(tmpImage.size.height / tmpImage.size.width)
// let imageH = scale * (KScreenWidth - 21 * 2)
//
//
// myScrollView.addSubview(bkgImageV)
// bkgImageV.snp.makeConstraints { make in
// make.top.equalToSuperview()
// make.left.equalToSuperview()
// make.width.equalTo(KScreenWidth - 21 * 2)
// make.height.equalTo(imageH)
// }
// myScrollView.contentSize = CGSize(width: KScreenWidth - 21 * 2, height: imageH)
// }
}
}
galaxy/galaxy/Classes/Tools/RangeDatePicker/YHRangeDatePickerView.swift
View file @ 7c7a1ff7
......@@ -50,7 +50,7 @@ class YHRangeDatePickerView: UIView,FSCalendarDataSource, FSCalendarDelegate, FS
calendar.appearance.weekdayTextColor = UIColor(red: 0.071, green: 0.102, blue: 0.149, alpha: 1)
//日历内容 默认颜色
calendar.appearance.titleDefaultColor = UIColor(red: 0.071, green: 0.102, blue: 0.149, alpha: 1)
// calendar.appearance.titleDefaultColor = UIColor(red: 0.071, green: 0.102, blue: 0.149, alpha: 1)
//日历内容 字体
calendar.appearance.titleFont = UIFont(name: "PingFangSC-Medium", size: 16)
......@@ -59,9 +59,14 @@ class YHRangeDatePickerView: UIView,FSCalendarDataSource, FSCalendarDelegate, FS
//日历内容 选择时 颜色
calendar.appearance.titleSelectionColor = .white
calendar.appearance.subtitleSelectionColor = .white
// calendar.appearance.todayColor = UIColor(red: 0, green: 0.275, blue: 0.706, alpha: 1)
// calendar.appearance.todaySelectionColor = .white
// calendar.appearance.titleTodayColor = UIColor(red: 0, green: 0.275, blue: 0.706, alpha: 1)
//非当月日期 颜色
calendar.appearance.titlePlaceholderColor = UIColor(red: 0.071, green: 0.102, blue: 0.149, alpha: 0.7)
calendar.appearance.titlePlaceholderColor = UIColor(red: 0.071, green: 0.102, blue: 0.149, alpha: 0.2)
//日期 横线
calendar.appearance.separators = .none
......@@ -116,13 +121,16 @@ extension YHRangeDatePickerView {
return nil
}
func calendar(_ calendar: FSCalendar, titleFor date: Date) -> String? {
return self.gregorian.isDateInToday(date) ? "今" : nil
}
func minimumDate(for calendar: FSCalendar) -> Date {
return (dateFormatter.date(from: "2023-07-01"))!
return self.gregorian.date(byAdding: .day, value: 1, to: Date())!
}
func maximumDate(for calendar: FSCalendar) -> Date {
return (dateFormatter.date(from: "2025-07-01"))!
return self.gregorian.date(byAdding: .day, value: 365, to: Date())!
}
func calendar(_ calendar: FSCalendar, cellFor date: Date, at monthPosition: FSCalendarMonthPosition) -> FSCalendarCell {
......@@ -134,9 +142,12 @@ extension YHRangeDatePickerView {
configureCell(cell, for: date, at: monthPosition)
}
func calendar(_ calendar: FSCalendar, boundingRectWillChange bounds: CGRect, animated: Bool) {
self.calendar.frame.size.height = bounds.height
}
// MARK: - FSCalendarDelegate
func calendar(_ calendar: FSCalendar, shouldSelect date: Date, at monthPosition: FSCalendarMonthPosition) -> Bool {
// return monthPosition == .current
return true
}
......@@ -164,13 +175,6 @@ extension YHRangeDatePickerView {
configureVisibleCells()
}
// func calendar(_ calendar: FSCalendar, appearance: FSCalendarAppearance, eventDefaultColorsFor date: Date) -> [UIColor]? {
// if (gregorian.isDateInToday(date)) {
// return [UIColor.orange]
// }
// return [appearance.eventDefaultColor]
// }
}
// MARK: - Private methods
......@@ -187,6 +191,7 @@ private extension YHRangeDatePickerView {
func tapOneDate(_ date : Date) {
if startDate == nil {
startDate = date
YHHUD.flash(message: "开始选择结束日期")
} else if endDate == nil {
// 比较结果
let comparisonResult = gregorian.compare(startDate!, to: date, toGranularity: .day)
......@@ -208,6 +213,7 @@ private extension YHRangeDatePickerView {
calendar.deselect(endDate!)
startDate = date
endDate = nil
YHHUD.flash(message: "开始选择结束日期")
}
}
......
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