diff --git a/circle_app/lib/app/aboutapp/view.dart b/circle_app/lib/app/aboutapp/view.dart index ccda56f..d6f2509 100644 --- a/circle_app/lib/app/aboutapp/view.dart +++ b/circle_app/lib/app/aboutapp/view.dart @@ -30,7 +30,7 @@ class AboutappPage extends StatelessWidget { ), child: Scaffold( backgroundColor: Colors.transparent, - appBar: const MyAppBar(centerTitle: '关于圈子',), + appBar: const MyAppBar(centerTitle: '关于微乐园',), body: Scaffold( backgroundColor: Colors.transparent, // Replace with your desired color @@ -61,7 +61,7 @@ class AboutappPage extends StatelessWidget { ), SizedBox(height: 10.sp), Text( - '圈子', + '微乐园', style: TextStyle( color: const Color(0xFFF7FAFA), fontSize: 16.sp, diff --git a/circle_app/lib/app/circle/widgets/info_list_view.dart b/circle_app/lib/app/circle/widgets/info_list_view.dart index 3b4aa24..8c8f1ce 100644 --- a/circle_app/lib/app/circle/widgets/info_list_view.dart +++ b/circle_app/lib/app/circle/widgets/info_list_view.dart @@ -271,7 +271,7 @@ class InfoListViewState extends State with AutomaticKeepAliveClien return Container( padding: EdgeInsets.only( left: 12.sp, right: 12.sp), - height:urlList.length==0?47.sp: 88.sp, + height:urlList.length==0?47.sp: 108.sp, decoration: BoxDecoration( image: DecorationImage( fit: BoxFit.fill, @@ -284,10 +284,10 @@ class InfoListViewState extends State with AutomaticKeepAliveClien Container( margin: EdgeInsets.only(bottom: 7.sp), width: Get.width, - height: 30.sp, - child: HideText(text: widget.bean.intro,additionText: '查看更多',maxLines: 1,style: TextStyle(color: Colors.white, fontSize: 14.sp),additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 14.sp),onTap: () { + height: 50.sp, + child: HideText(text: widget.bean.intro,additionText: '查看更多',maxLines: 3,style: TextStyle(color: Colors.white, fontSize: 14.sp),additionStyle: TextStyle(color: const Color(0xFFFF4DF6), fontSize: 14.sp),onTap: () { _showTextContentDialog( - context, widget.bean.intro); + context, widget.bean.intro,widget.bean.title); }, )), @@ -471,7 +471,7 @@ class InfoListViewState extends State with AutomaticKeepAliveClien ))); } - void _showTextContentDialog(BuildContext context, String msg) { + void _showTextContentDialog(BuildContext context, String msg,String title) { showDialog( context: context, builder: (BuildContext context) { @@ -506,6 +506,12 @@ class InfoListViewState extends State with AutomaticKeepAliveClien ), ), ), + Positioned( + top: 15, + left: 0, + right: 0, + child: Center(child: Text(title, style: TextStyle( + color: const Color(0xFFF7FAFA), fontSize: 16.sp)),)), Container( margin: EdgeInsets.only(top: 24.sp,bottom: 24.sp), child: Container( diff --git a/circle_app/lib/app/minefragment/view.dart b/circle_app/lib/app/minefragment/view.dart index 833a06f..35ac5bb 100644 --- a/circle_app/lib/app/minefragment/view.dart +++ b/circle_app/lib/app/minefragment/view.dart @@ -438,7 +438,7 @@ class MinefragmentPage extends StatelessWidget { onTap: () { if(logic.userInfoBean!=null){ var imgList = []; - imgList.add(logic.userInfoBean!.avatar); + imgList.add(logic.userInfoBean!.avatarThumb); // Get.toNamed(AppRoutes.Swiper,arguments:imgList); Get.toNamed(AppRoutes.Swiper, arguments: { 'imaglist': imgList, diff --git a/circle_app/lib/app/setup/view.dart b/circle_app/lib/app/setup/view.dart index 19b3f78..12878bf 100644 --- a/circle_app/lib/app/setup/view.dart +++ b/circle_app/lib/app/setup/view.dart @@ -117,7 +117,7 @@ class SetupPage extends StatelessWidget { onTap: () { Get.toNamed(AppRoutes.AboutAppActivity); }, - child: _buildItemRow('关于圈子', getHomeImage("icon_in")), + child: _buildItemRow('关于微乐园', getHomeImage("icon_in")), ), ), ],