Merge branch 'develop'

* develop:
  我的  UI  删除评测
  解决没有更多的显示问题
  处理一处展示颜色

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHFourKingViewController.swift

@@ -50,6 +50,10 @@ extension YHFourKingViewController {
                         self.homeViewModel.getList(true, classifyID) {[weak self] success, error in
                             guard let self = self else { return }
                             self.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
+                            if self.homeViewModel.hasMoreForHomeNews == false {
+                                self.tableFootView.myCollectView.es.noticeNoMoreData()
+                                self.tableFootView.myCollectView.footer?.alpha = 1
+                            }
                         }
                     }
                 }
@@ -84,6 +88,7 @@ extension YHFourKingViewController {
                     self.dataSouce = self.homeViewModel.arrHomeNewsData ?? []
                     if self.homeViewModel.hasMoreForHomeNews == false {
                         self.tableFootView.myCollectView.es.noticeNoMoreData()
+                        self.tableFootView.myCollectView.footer?.alpha = 1
                     }
                 }
             }

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHKEventViewController.swift

@@ -114,7 +114,7 @@ extension YHHKEventViewController {
 
 extension YHHKEventViewController {
     func saveImageToPhotoLib() {
-        var urlString  = self.picUrl
+        let urlString  = self.picUrl
         guard let url = URL(string: urlString) else {
             YHHUD.flash(message: "参数错误,保存失败")
             return

galaxy/galaxy/Classes/Modules/Home(首页)/C/YHHomePageViewController.swift

@@ -95,6 +95,7 @@ private extension YHHomePageViewController {
                     self.homeCollectView.es.stopLoadingMore()
                     if self.viewModel.hasMoreForHomeNews == false {
                         self.homeCollectView.es.noticeNoMoreData()
+                        self.homeCollectView.footer?.alpha = 1
                     }
                 })
             }
@@ -111,6 +112,7 @@ private extension YHHomePageViewController {
                     self.homeCollectView.es.stopPullToRefresh()
                     if self.viewModel.hasMoreForHomeNews == false {
                         self.homeCollectView.es.noticeNoMoreData()
+                        self.homeCollectView.footer?.alpha = 1
                     }
                     
                     CATransaction.setDisableActions(true)

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MyCertificates(我的证书)/V/YHCertificateEntryCell.swift

@@ -60,7 +60,7 @@ extension YHCertificateEntryCell {
         var color : UIColor = .failColor
         if dataModel.checkStatus == 0 {
             title = "审核中"
-            color = UIColor.labelTextColor2
+            color = UIColor.warnColor
         } else if dataModel.checkStatus == 1 {
             title = "已完成"
             color = UIColor.labelTextColor2

galaxy/galaxy/Classes/Modules/Mine（我的）/C/YHMyLikeViewController.swift

@@ -59,6 +59,7 @@ extension YHMyLikeViewController {
                 self.dataSouce = self.viewModel.arrHomeNewsData ?? []
                 if self.viewModel.hasMoreForHomeNews == false {
                     self.tableFootView.myCollectView.es.noticeNoMoreData()
+                    self.tableFootView.myCollectView.footer?.alpha = 1
                 }
             }
         } else {
@@ -74,6 +75,7 @@ extension YHMyLikeViewController {
                 self.dataSouce = self.viewModel.arrHomeNewsData ?? []
                 if self.viewModel.hasMoreForHomeNews == false {
                     self.tableFootView.myCollectView.es.noticeNoMoreData()
+                    self.tableFootView.myCollectView.footer?.alpha = 1
                 }
             })
         }
@@ -97,6 +99,7 @@ extension YHMyLikeViewController {
                             self.tableFootView.myCollectView.es.stopLoadingMore()
                             if self.viewModel.hasMoreForHomeNews == false {
                                 self.tableFootView.myCollectView.es.noticeNoMoreData()
+                                self.tableFootView.myCollectView.footer?.alpha = 1
                             }
                         })
                     }
@@ -110,6 +113,7 @@ extension YHMyLikeViewController {
                             self.tableFootView.myCollectView.es.stopLoadingMore()
                             if self.viewModel.hasMoreForHomeNews == false {
                                 self.tableFootView.myCollectView.es.noticeNoMoreData()
+                                self.tableFootView.myCollectView.footer?.alpha = 1
                             }
                         })
                     })

galaxy/galaxy/Classes/Modules/Mine（我的）/V/YHUserInfoHeaderView.swift

@@ -174,7 +174,7 @@ class YHUserInfoHeaderView: UIView {
     }
     
     static func createView() -> YHUserInfoHeaderView {
-       let view = YHUserInfoHeaderView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height:310+k_Height_StatusBar))
+       let view = YHUserInfoHeaderView(frame: CGRect(x: 0, y: 0, width: KScreenWidth, height:310+k_Height_StatusBar-98))
        return view
     }
     
@@ -208,7 +208,7 @@ class YHUserInfoHeaderView: UIView {
         self.addSubview(line1View)
         self.addSubview(line2View)
 
-        self.addSubview(evaluateView)
+//        self.addSubview(evaluateView)
         evaluateView.addSubview(evaluateBgImgView)
         evaluateView.addSubview(evaluateLabel)
         evaluateView.addSubview(evaluateBtn)
@@ -281,12 +281,12 @@ class YHUserInfoHeaderView: UIView {
         }
         scanLabel.setContentCompressionResistancePriority(.required, for: .horizontal)
 
-        evaluateView.snp.makeConstraints { make in
-            make.left.equalToSuperview().offset(10)
-            make.right.equalToSuperview().offset(-7)
-            make.height.equalTo(98)
-            make.top.equalTo(likeLabel.snp.bottom).offset(17.0)
-        }
+//        evaluateView.snp.makeConstraints { make in
+//            make.left.equalToSuperview().offset(10)
+//            make.right.equalToSuperview().offset(-7)
+//            make.height.equalTo(98)
+//            make.top.equalTo(likeLabel.snp.bottom).offset(17.0)
+//        }
         
         evaluateBgImgView.snp.makeConstraints { make in
             make.edges.equalToSuperview()