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

* 'youhua-dev' of http://gitlab.galaxy-immi.com/mobile-group/galaxy-iOS:
  //  UI走查
  修改细节
  // UI走查

galaxy/galaxy/AppDelegate.swift

@@ -42,6 +42,7 @@ class AppDelegate: UIResponder, UIApplicationDelegate, WXApiDelegate {
         WXApi.startLog(by: .detail) { string in
             print("\(string)")
         }
+        YHOSSManager.share.getOSSID()
         //1.设置主窗口
         setupRootVC()
         return true

galaxy/galaxy/Applegate(JPush).swift

@@ -89,6 +89,7 @@ extension AppDelegate: JPUSHRegisterDelegate {
             // 请求消息页面通知权限通知
             NotificationCenter.default.post(name: YhConstant.YhNotification.didReqeustNotifyPermissionNotification, object: nil)
         }
+        YHOSSManager.share.getOSSID()
     }
     
     func jpushNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: ((Int) -> Void)) {

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

@@ -40,7 +40,7 @@ class YHSearchInfoBar: UIView {
         textField.attributedPlaceholder = NSAttributedString(string: "香港身份".local, attributes: [NSAttributedString.Key.foregroundColor : UIColor(hex: 0x94A3B8)])
         textField.font = UIFont.PFSC_M(ofSize: 12)
         textField.tintColor = UIColor.brandMainColor
-        textField.textColor = UIColor.mainTextColor30
+        textField.textColor = UIColor.mainTextColor
         textField.clearButtonMode = .whileEditing
         textField.addTarget(self, action: #selector(textFieldChanged(textField:)), for: .editingChanged)
         textField.delegate = self

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/C/YHServiceCenterMainViewController.swift

@@ -308,9 +308,9 @@ extension YHServiceCenterMainViewController {
         view.addSubview(noDataView)
         noDataView.snp.makeConstraints { make in
             make.centerX.equalToSuperview()
-            make.centerY.equalToSuperview()
+            make.top.equalTo(236)
             make.width.equalTo(KScreenWidth)
-            make.height.equalTo(225)
+            make.height.equalTo(265)
         }
         
         controllerOne.type = 0

galaxy/galaxy/Classes/Modules/IntelligentService(服务中心)/V/YHServiceOrderProgressTableViewCell.swift

@@ -127,6 +127,7 @@ extension YHServiceOrderProgressTableViewCell {
                     let aa: ASAttributedString = .init(NSAttributedString(string: "驳回"), .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor.failColor))
                     let aaa: ASAttributedString = .init("了哦～", .font(UIFont.PFSC_M(ofSize: 13)),.foreground(UIColor(hex: 0x94a3b8)))
                     messageLabel.attributed.text = a + aa + aaa
+                    buttonLabel.text = "去修改"
                 }
             }
             if model.type == 3 {

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

@@ -65,7 +65,7 @@ class YHMessageDetailListVC: YHBaseViewController {
     
     lazy var emptyDataTipsView: YHEmptyDataView = {
         let view = YHEmptyDataView.createView("暂无消息", kEmptyMessageBgName)
-        let topMargin = (KScreenHeight-k_Height_NavigationtBarAndStatuBar-k_Height_TabBar-124.0)/2.0
+        let topMargin = 310-k_Height_NavigationtBarAndStatuBar
         view.topMargin = topMargin
         view.isHidden = true
         return view

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

@@ -63,7 +63,7 @@ class YHMessageListVC: YHBaseViewController {
     
     lazy var emptyDataTipsView: YHEmptyDataView = {
         let view = YHEmptyDataView.createView("暂无消息", kEmptyMessageBgName)
-        let topMargin = (KScreenHeight-k_Height_NavigationtBarAndStatuBar-k_Height_TabBar-124.0)/2.0
+        let topMargin = 310-k_Height_NavigationtBarAndStatuBar
         view.topMargin = topMargin
         view.isHidden = true
         return view