Merge branch 'ios' of http://git.qniao.cn/dating-agency/dating_touchme_app into ios

lib/pages/home/user_information_page.dart

@@ -718,7 +718,7 @@ class UserInformationPage extends StatelessWidget {
               ),
             ],
           ),
-          bottomNavigationBar: false && miId != GlobalData().userData!.id ? SafeArea(
+          bottomNavigationBar: miId != GlobalData().userData!.id ? SafeArea(
               child: SizedBox(
                 height: 48.h,
                 child: Row(

lib/pages/main/main_page.dart

@@ -39,7 +39,7 @@ class _MainPageState extends State<MainPage> {
   late RealHomePage homePage;
   late DiscoverPage discoverPage;
   late TimelinePage timelinePage;
-  late TimelineTrend messagePage;
+  late MessagePage messagePage;
   late MinePage minePage;
 
   @override
@@ -50,7 +50,7 @@ class _MainPageState extends State<MainPage> {
     homePage = RealHomePage();
     // discoverPage = DiscoverPage();
     timelinePage = TimelinePage(goMessage: goMessage,);
-    messagePage = TimelineTrend();
+    messagePage = MessagePage();
     minePage = MinePage();
 
     // 初始化UserController并调用获取环信用户token的方法