From d8cc691814441d156c248c2999f2affc27b1d473 Mon Sep 17 00:00:00 2001
From: YangYuhao <YangYuhao>
Date: Thu, 10 Aug 2023 16:43:23 +0800
Subject: [PATCH] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=80=89=E4=B8=AD=E5=B9=B4?=
 =?UTF-8?q?=E4=BC=9A=E5=91=98=E5=92=8C=E6=9F=A5=E7=9C=8B=E8=B5=84=E6=96=99?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tim_uikit_text_field_layout/narrow.dart   |  2 +-
 circle_app/lib/app/circle/logic.dart          |  2 +-
 .../app/circle/widgets/info_list_view.dart    | 26 +++++++++++--------
 circle_app/lib/app/minefragment/view.dart     |  2 +-
 circle_app/lib/app/privacy/view.dart          |  2 +-
 circle_app/lib/app/userinfo/logic.dart        |  2 ++
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart
index 19c073b..c3e1afb 100644
--- a/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart
+++ b/circle_app/lib/app/chat/TIMUIKitChat/TIMUIKitTextField/tim_uikit_text_field_layout/narrow.dart
@@ -790,7 +790,7 @@ class _TIMTextFieldLayoutNarrowState
       Get.bottomSheet(
           Scaffold(
             backgroundColor: Colors.transparent,
-            body: Open_vip_tipPage(false),
+            body: Open_vip_tipPage(true),
           ),
           isScrollControlled: true,
           enableDrag: false);
diff --git a/circle_app/lib/app/circle/logic.dart b/circle_app/lib/app/circle/logic.dart
index 89ac12f..f7126d4 100644
--- a/circle_app/lib/app/circle/logic.dart
+++ b/circle_app/lib/app/circle/logic.dart
@@ -139,7 +139,7 @@ class CircleLogic extends GetxController {
     Get.bottomSheet(
         Scaffold(
           backgroundColor: Colors.transparent,
-          body: Open_vip_tipPage(false),
+          body: Open_vip_tipPage(true),
         ),
         isScrollControlled: true,
         enableDrag: false);
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 8c8f1ce..48d042b 100644
--- a/circle_app/lib/app/circle/widgets/info_list_view.dart
+++ b/circle_app/lib/app/circle/widgets/info_list_view.dart
@@ -218,16 +218,20 @@ class InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClien
     List<JoinUser> urlList = widget.bean.lastJoinUsers;
     List<Widget> widgets = [];
     int i = 0;
-    urlList.forEach((element) {
-      if(widgets.length>2){
-        return;
-      }
-      widgets.add(Positioned(
-        left: 15.sp * i,
-        child: circleWidget(element.avatar,element.id.toString()),
-      ));
-      i++;
-    });
+  //  print(urlList);
+    if(null!=urlList){
+      urlList.forEach((element) {
+        if(widgets.length>2){
+          return;
+        }
+        widgets.add(Positioned(
+          left: 15.sp * i,
+          child: circleWidget(element.avatar??"https://qiniuyun.leyuan666.com/quanzi/avatar/default.png",element.id.toString()),
+        ));
+        i++;
+      });
+    }
+
 
     return ClipRRect(
         borderRadius: BorderRadius.circular(10.sp),
@@ -1173,7 +1177,7 @@ class InfoListViewState extends State<InfoListView> with AutomaticKeepAliveClien
         ),
         ClipOval(
           child: Image.network(
-            url,
+            url??"https://qiniuyun.leyuan666.com/quanzi/avatar/default.png",
             width: (width - 1).sp,
             height: (width - 1).sp,
             fit: BoxFit.cover,
diff --git a/circle_app/lib/app/minefragment/view.dart b/circle_app/lib/app/minefragment/view.dart
index 35ac5bb..da0bb48 100644
--- a/circle_app/lib/app/minefragment/view.dart
+++ b/circle_app/lib/app/minefragment/view.dart
@@ -544,7 +544,7 @@ class MinefragmentPage extends StatelessWidget {
     Get.bottomSheet(
         Scaffold(
           backgroundColor: Colors.transparent,
-          body: Open_vip_tipPage(false),
+          body: Open_vip_tipPage(true),
         ),
         isScrollControlled: true,
         enableDrag: false);
diff --git a/circle_app/lib/app/privacy/view.dart b/circle_app/lib/app/privacy/view.dart
index 26e2361..c0f0531 100644
--- a/circle_app/lib/app/privacy/view.dart
+++ b/circle_app/lib/app/privacy/view.dart
@@ -107,7 +107,7 @@ class PrivacyPage extends StatelessWidget {
     Get.bottomSheet(
         Scaffold(
           backgroundColor: Colors.transparent,
-          body: Open_vip_tipPage(false),
+          body: Open_vip_tipPage(true),
         ),
         isScrollControlled: true,
         enableDrag: false);
diff --git a/circle_app/lib/app/userinfo/logic.dart b/circle_app/lib/app/userinfo/logic.dart
index 6793a16..c959b21 100644
--- a/circle_app/lib/app/userinfo/logic.dart
+++ b/circle_app/lib/app/userinfo/logic.dart
@@ -60,6 +60,8 @@ class UserinfoLogic extends GetxController {
     state.imaglist.clear();
 
     if (userId.isEmpty) {
+      isMe =true;
+      update();
       fetchUserInfo(Api.getUserInfo);
       fetchMyAlbum(Api.getMyAlbum);
     } else {