Commit 86bd1034 authored by David黄金龙's avatar David黄金龙

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

* '630-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  细节优化
  细节修复
parents a348c840 74702579
...@@ -89,7 +89,7 @@ private extension YHHomeBannerCollectionViewCell { ...@@ -89,7 +89,7 @@ private extension YHHomeBannerCollectionViewCell {
visualEffectView.isHidden = false visualEffectView.isHidden = false
if let url = URL(string: model.img_url) { if let url = URL(string: model.img_url) {
if let avifUrl = URL(string: model.img_url) { if let avifUrl = URL(string: model.img_url_compress) {
bannerImagV.kf.setImage(with: avifUrl, placeholder: UIImage(named: "global_default_image")) { result in bannerImagV.kf.setImage(with: avifUrl, placeholder: UIImage(named: "global_default_image")) { result in
switch result { switch result {
case .success: break case .success: break
......
...@@ -183,7 +183,7 @@ extension YHHomeCollectionViewCell { ...@@ -183,7 +183,7 @@ extension YHHomeCollectionViewCell {
make.height.equalTo(listModel.img_height_use) make.height.equalTo(listModel.img_height_use)
} }
if let url = URL(string: listModel.img_url) { if let url = URL(string: listModel.img_url) {
if let avifUrl = URL(string: listModel.img_url) { if let avifUrl = URL(string: listModel.img_url_compress) {
titleImageView.kf.setImage(with: avifUrl, placeholder: UIImage(named: "global_default_image")) { result in titleImageView.kf.setImage(with: avifUrl, placeholder: UIImage(named: "global_default_image")) { result in
switch result { switch result {
case .success: break case .success: break
......
...@@ -58,7 +58,7 @@ class YHOrderTipsItemView: UIView { ...@@ -58,7 +58,7 @@ class YHOrderTipsItemView: UIView {
let time = (distance/60).int let time = (distance/60).int
return "\(time)分钟前" return "\(time)分钟前"
} else if distance < 24 * 60 * 60 { } else if distance < 24 * 60 * 60 {
let time = (distance/24/60).int let time = (distance/60/60).int
return "\(time)小时前" return "\(time)小时前"
} else if distance < 48 * 60 * 60 { } else if distance < 48 * 60 * 60 {
return "昨天" return "昨天"
......
...@@ -227,7 +227,7 @@ private extension YHServiceBannerCollectionViewCell { ...@@ -227,7 +227,7 @@ private extension YHServiceBannerCollectionViewCell {
} else { } else {
bannerTitleLable.isHidden = false bannerTitleLable.isHidden = false
if let url = URL(string: model.img_url) { if let url = URL(string: model.img_url) {
if let avifUrl = URL(string: model.img_url) { if let avifUrl = URL(string: model.img_url_compress) {
bannerImagV.kf.setImage(with: avifUrl, placeholder: UIImage(named: "global_default_image")) { result in bannerImagV.kf.setImage(with: avifUrl, placeholder: UIImage(named: "global_default_image")) { result in
switch result { switch result {
case .success: break case .success: break
......
...@@ -114,8 +114,15 @@ class YHEditInterestViewController: YHBaseViewController { ...@@ -114,8 +114,15 @@ class YHEditInterestViewController: YHBaseViewController {
guard let self = self else { return } guard let self = self else { return }
if let text = text { if let text = text {
if let index = normalItems.firstIndex(where: {$0.name == text}) {
YHHUD.flash(message: "请不要添加重复的标签噢")
return
}
if let index = likeItems.firstIndex(where: {$0.name == text}) { YHHUD.flash(message: "请不要添加重复的标签噢")
return
}
let model = YHInterestModel(name: text, isNormal: false, isSelect: false) let model = YHInterestModel(name: text, isNormal: false, isSelect: false)
self.likeItems.insert(model, at: likeItems.count - 1) self.likeItems.insert(model, at: 0)
self.collectionView.reloadData() self.collectionView.reloadData()
} }
} }
......
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