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

galaxy/galaxy/Applegate(JPush).swift

@@ -115,7 +115,6 @@ extension AppDelegate: JPUSHRegisterDelegate {
         // 转换到消息tab
         YHLoginManager.shared.needJumpToMsgTabFlag = true
         DispatchQueue.main.asyncAfter(deadline: .now() + 0.25, execute: {
-//            NotificationCenter.default.post(name: YhConstant.YhNotification.didRevMsgNotifiction, object: nil)
             goToMessagePage()
         })
     }

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

@@ -95,14 +95,14 @@ class YHMyViewController: YHBaseViewController, ConstraintRelatableTarget {
         let view = YHUserInfoHeaderView.createView()
         view.settingBlock = {
             [weak self] in
-            guard let self = self else { return }
-            if !checkLogin() { return }
-            let vc = YHMySettingViewController()
-            self.navigationController?.pushViewController(vc)
+//            guard let self = self else { return }
+//            if !checkLogin() { return }
+//            let vc = YHMySettingViewController()
+//            self.navigationController?.pushViewController(vc)
             
             
-//            let vc = YHOfficialApprovalResultVC()
-//            self.navigationController?.pushViewController(vc) //for test hjl
+            let vc = YHOfficialApprovalResultVC()
+            self?.navigationController?.pushViewController(vc) //for test hjl
         }
         view.evaluateBlock = {
             [weak self] in