Commit 76537e22 authored by Steven杜宇's avatar Steven杜宇

// 身份

parent 9b21e39b
...@@ -48,7 +48,6 @@ class YHHomeIdentityListVC: YHBaseViewController { ...@@ -48,7 +48,6 @@ class YHHomeIdentityListVC: YHBaseViewController {
tableView.register(YHHomeIdentityCell.self, forCellReuseIdentifier: YHHomeIdentityCell.cellReuseIdentifier) tableView.register(YHHomeIdentityCell.self, forCellReuseIdentifier: YHHomeIdentityCell.cellReuseIdentifier)
tableView.delegate = self tableView.delegate = self
tableView.dataSource = self tableView.dataSource = self
// tableView.bounces = false
tableView.tableHeaderView = self.headerView tableView.tableHeaderView = self.headerView
tableView.separatorStyle = .none tableView.separatorStyle = .none
return tableView return tableView
...@@ -202,35 +201,38 @@ extension YHHomeIdentityListVC: UIScrollViewDelegate { ...@@ -202,35 +201,38 @@ extension YHHomeIdentityListVC: UIScrollViewDelegate {
self.segmentedView.reloadDataWithoutListContainer() self.segmentedView.reloadDataWithoutListContainer()
} }
} }
let gap = 10.0
if scrollView.contentOffset.y > self.scrollContentY+gap { if scrollView.contentOffset.y >= 0 {
self.scrollContentY = scrollView.contentOffset.y let gap = 10.0
printLog("ABCD:\(self.scrollContentY), \(scrollView.contentOffset.y)") if scrollView.contentOffset.y > self.scrollContentY+gap {
if !self.isShowBottomView { self.scrollContentY = scrollView.contentOffset.y
self.isShowBottomView = true printLog("ABCD:\(self.scrollContentY), \(scrollView.contentOffset.y)")
printLog("ABC show: \(self.scrollContentY)") if !self.isShowBottomView {
var model = TabBarShareModel() self.isShowBottomView = true
model.showFlag = true printLog("ABC show: \(self.scrollContentY)")
if let product = self.viewModel.detailModel.products.first { var model = TabBarShareModel()
let path = "/pages/commodityInfo/commodityInfo?categoryId=2&levelId=\(self.detailId)&productId=\(product.id)&from=wxApp" model.showFlag = true
model.shareUrl = path if let product = self.viewModel.detailModel.products.first {
} let path = "/pages/commodityInfo/commodityInfo?categoryId=2&levelId=\(self.detailId)&productId=\(product.id)&from=wxApp"
model.shareTitle = "好友力荐新品,速来围观,不容错过!" model.shareUrl = path
model.codeUrl = self.viewModel.detailModel.imageURLDefault }
model.downloadUrl = self.viewModel.detailModel.imageURLDefaultDownload model.shareTitle = "好友力荐新品,速来围观,不容错过!"
NotificationCenter.default.post(name: YhConstant.YhNotification.changeShareViewStatusOnTabBarNotifiction, object: model) model.codeUrl = self.viewModel.detailModel.imageURLDefault
model.downloadUrl = self.viewModel.detailModel.imageURLDefaultDownload
NotificationCenter.default.post(name: YhConstant.YhNotification.changeShareViewStatusOnTabBarNotifiction, object: model)
} }
} else if scrollView.contentOffset.y < self.scrollContentY-gap { } else if scrollView.contentOffset.y < self.scrollContentY-gap {
printLog("ABCD:\(self.scrollContentY), \(scrollView.contentOffset.y)") printLog("ABCD:\(self.scrollContentY), \(scrollView.contentOffset.y)")
self.scrollContentY = scrollView.contentOffset.y self.scrollContentY = scrollView.contentOffset.y
if self.isShowBottomView { if self.isShowBottomView {
self.isShowBottomView = false self.isShowBottomView = false
printLog("ABC hide: \(self.scrollContentY)") printLog("ABC hide: \(self.scrollContentY)")
var model = TabBarShareModel() var model = TabBarShareModel()
model.showFlag = false model.showFlag = false
NotificationCenter.default.post(name: YhConstant.YhNotification.changeShareViewStatusOnTabBarNotifiction, object: model) NotificationCenter.default.post(name: YhConstant.YhNotification.changeShareViewStatusOnTabBarNotifiction, object: model)
}
} }
} }
} }
......
...@@ -336,11 +336,6 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource { ...@@ -336,11 +336,6 @@ extension YHMyViewController : UITableViewDelegate, UITableViewDataSource {
return return
} }
if true {
let vc = YHMyTestViewController()
self.navigationController?.pushViewController(vc)
}
// if true { // if true {
// let vc = YHCertificateAppointViewController() // let vc = YHCertificateAppointViewController()
// vc.orderId = 151090 // vc.orderId = 151090
......
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