Merge commit '49538dfc' into xiezhaolin

galaxy/galaxy/Classes/Modules/Home(首页)/V/YHHomeBannerIndicatorView.swift

@@ -75,6 +75,7 @@ extension YHHomeBannerIndicatorView {
                         make.top.bottom.equalToSuperview()
                         make.width.equalTo(16)
                     }
+                    view.backgroundColor = selectedColor
                 } else if i == indicatorItems - 1 {
                     view.snp.makeConstraints { make in
                         make.left.equalTo(tagView!.snp.right).offset(3)

galaxy/galaxy/Classes/Modules/Home(首页)/VM/YHHomePageViewModel.swift

@@ -70,6 +70,7 @@ extension YHHomePageViewModel {
                     return
                 }
                 
+                
                 for item in result.data {
                     item.calHeightParam()
                 }
@@ -77,7 +78,9 @@ extension YHHomePageViewModel {
                 if firstPageFlag {
                     self.totalCount = result.total
                     self.arrHomeNewsData = result.data
+                    curPageIndex = 1
                 } else {
+                    curPageIndex = curPageIndex + 1
                     self.arrHomeNewsData?.append(contentsOf: result.data)
                 }
                 

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/MySignature(我的签字)/V/YHCommonAlertView.swift

@@ -13,6 +13,7 @@ class YHCommonAlertView: UIView {
     var agreeBlock: AgreeBlock?
     var centerView: UIView!
     var titleLabel: UILabel!
+    var lineView: UIView!
     var messageLabel: UILabel!
     var agreeButton: UIButton!
     var disAgressButton: UIButton!
@@ -149,6 +150,17 @@ class YHCommonAlertView: UIView {
             make.height.equalTo(45)
         }
         
+        lineView = {
+            let line = UIView()
+            line.backgroundColor = UIColor(hex: 0xF0F0F0)
+            return line
+        }()
+        centerView.addSubview(lineView)
+        lineView.snp.makeConstraints { make in
+            make.left.right.equalTo(0)
+            make.height.equalTo(1)
+            make.top.equalTo(titleLabel.snp.bottom).offset(12)
+        }
     }
     
     @objc func agree() {

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHInformationFillVC.swift

@@ -25,6 +25,9 @@ class YHInformationFillVC: YHBaseViewController {
         bar.rightBtnClick = {
             [weak self] in
             guard let self = self else { return }
+            YHCommonAlertView.show("清除未读", "确定要清除所有未读提示吗？", "取消", "确认") {
+                
+            }
         }
         return bar
     }()

galaxy/galaxy/Classes/Modules/Message(消息)/C/YHMsgViewController.swift

@@ -40,6 +40,9 @@ class YHMsgViewController: YHBaseViewController {
         bar.rightBtnClick = {
             [weak self] in
             guard let self = self else { return }
+            YHCommonAlertView.show("清除未读", "确定要清除所有未读提示吗？", "取消", "确认") {
+                
+            }
         }
         return bar
     }()

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

@@ -64,6 +64,12 @@ extension YHMyNotifySettingVC: UITableViewDelegate, UITableViewDataSource {
     
     func tableView(_ tableView: UITableView, didSelectRowAt indexPath: IndexPath) {
        
+        let url = URL(string: UIApplication.openSettingsURLString)
+        if let url = url, UIApplication .shared.canOpenURL(url) {
+            UIApplication .shared.open(url, options: [:], completionHandler: {
+                (success) in
+            })
+        }
     }
 
     private func tableView(_ tableView: UITableView, viewForHeaderInSection section: Int) -> CGFloat {