diff --git a/lib/pages/home/user_information_page.dart b/lib/pages/home/user_information_page.dart index 2ba75d9..2954487 100644 --- a/lib/pages/home/user_information_page.dart +++ b/lib/pages/home/user_information_page.dart @@ -8,6 +8,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_screenutil/flutter_screenutil.dart'; import 'package:get/get.dart'; import 'package:get/get_core/src/get_main.dart'; +import 'package:tdesign_flutter/tdesign_flutter.dart'; class UserInformationPage extends StatefulWidget { final MarriageData userData; @@ -276,66 +277,6 @@ class _UserInformationPageState extends State { color: const Color.fromRGBO(144, 144, 144, 1) ), ), - Spacer(), - Row( - mainAxisAlignment: MainAxisAlignment.spaceBetween, - children: [ - InkWell( - onTap: () { - // 跳转到聊天页面,传递用户ID和用户数据模型 - Get.to(() => ChatPage( - userId: widget.userData.userId, - userData: widget.userData, - )); - }, - child: Container( - width: 246.w, - height: 38.w, - decoration: BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(38.w)), - color: const Color.fromRGBO(51, 51, 51, 1) - ), - child: Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Image.asset( - Assets.imagesChatBtn, - width: 13.w, - height: 12.w, - ), - SizedBox(width: 4.w,), - Text( - "发消息", - style: TextStyle( - fontSize: 15.w, - color: Colors.white, - fontWeight: FontWeight.w500 - ), - ) - ], - ), - ), - ), - Container( - width: 81.w, - height: 38.w, - decoration: BoxDecoration( - borderRadius: BorderRadius.all(Radius.circular(38.w)), - color: const Color.fromRGBO(117, 98, 249, 1) - ), - child: Center( - child: Text( - "关注", - style: TextStyle( - fontSize: 15.w, - color: Colors.white, - fontWeight: FontWeight.w500 - ), - ), - ), - ), - ], - ) ], ), ), @@ -456,6 +397,64 @@ class _UserInformationPageState extends State { ), ], ), + bottomNavigationBar: SafeArea( + child: SizedBox( + height: 48.h, + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + mainAxisAlignment: MainAxisAlignment.center, + children: [ + TDButton( + text: '发消息', + width: 240.w, + size: TDButtonSize.medium, + type: TDButtonType.fill, + shape: TDButtonShape.round, + textStyle: TextStyle(fontSize: 14, color: Colors.white), + iconWidget: Image.asset( + Assets.imagesChatBtn, + width: 17.w, + height: 15.h + ), + style: TDButtonStyle( + textColor: Colors.white, + backgroundColor: Color(0xFF333333), + ), + activeStyle: TDButtonStyle( + textColor: Colors.white, + backgroundColor: Color(0xC3333333), + ), + onTap: (){ + Get.to(() => ChatPage( + userId: widget.userData.userId, + userData: widget.userData, + )); + }, + ), + const SizedBox(width: 10), + TDButton( + text: '关注', + width: 90, + size: TDButtonSize.medium, + type: TDButtonType.fill, + shape: TDButtonShape.round, + textStyle: TextStyle(fontSize: 14, color: Colors.white), + style: TDButtonStyle( + textColor: Colors.white, + backgroundColor: Color(0xFF7562F9), + ), + activeStyle: TDButtonStyle( + textColor: Colors.white, + backgroundColor: Color(0xC37562F9), + ), + onTap: (){ + // controller.tabIndex.value = 1; + }, + ) + ], + ), + ) + ), ); } } diff --git a/lib/pages/mine/user_help_center_page.dart b/lib/pages/mine/user_help_center_page.dart index e0e5cb8..07ac5cb 100644 --- a/lib/pages/mine/user_help_center_page.dart +++ b/lib/pages/mine/user_help_center_page.dart @@ -251,7 +251,7 @@ class _UserHelpCenterPageState extends State { bottomNavigationBar: SafeArea( child: SizedBox( - height: 40.w, + height: 40.h, child: Row( children: [ Expanded(