From 9679520dd3a731f6e6111477437cf69be0a6fd63 Mon Sep 17 00:00:00 2001
From: YangYuhao <YangYuhao>
Date: Thu, 10 Aug 2023 16:09:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B0=8F=E7=BB=86=E8=8A=82=20=E5=92=8C?=
 =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=9C=88=E5=AD=90=E4=BB=8B=E7=BB=8D=E7=9A=84?=
 =?UTF-8?q?=E8=A1=8C=E6=95=B0=20=E8=BF=98=E6=9C=89=E5=BC=B9=E7=AA=97?=
 =?UTF-8?q?=E5=8A=A0title?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 circle_app/lib/app/aboutapp/view.dart            |  4 ++--
 .../lib/app/circle/widgets/info_list_view.dart   | 16 +++++++++++-----
 circle_app/lib/app/minefragment/view.dart        |  2 +-
 circle_app/lib/app/setup/view.dart               |  2 +-
 4 files changed, 15 insertions(+), 9 deletions(-)

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<InfoListView> 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<InfoListView> 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<InfoListView> 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<InfoListView> 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 = <String>[];
-            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")),
                   ),
                 ),
               ],