diff --git a/lib/common/widgets/dialog/dialog.dart b/lib/common/widgets/dialog/dialog.dart
index db2805102..bc89da12d 100644
--- a/lib/common/widgets/dialog/dialog.dart
+++ b/lib/common/widgets/dialog/dialog.dart
@@ -65,42 +65,43 @@ void showPgcFollowDialog({
   }
 
   showDialog(
-      context: context,
-      builder: (context) => AlertDialog(
-            clipBehavior: Clip.hardEdge,
-            contentPadding: const EdgeInsets.symmetric(vertical: 12),
-            content: Column(
-              mainAxisSize: MainAxisSize.min,
-              children: [
-                ...[
-                  {'followStatus': 3, 'title': '看过'},
-                  {'followStatus': 2, 'title': '在看'},
-                  {'followStatus': 1, 'title': '想看'},
-                ].map(
-                  (Map item) => statusItem(
-                    enabled: followStatus != item['followStatus'],
-                    text: item['title'],
-                    onTap: () {
-                      Get.back();
-                      onUpdateStatus(item['followStatus']);
-                    },
-                  ),
-                ),
-                ListTile(
-                  dense: true,
-                  title: Padding(
-                    padding: const EdgeInsets.only(left: 10),
-                    child: Text(
-                      '取消$type',
-                      style: const TextStyle(fontSize: 14),
-                    ),
-                  ),
-                  onTap: () {
-                    Get.back();
-                    onUpdateStatus(-1);
-                  },
-                )
-              ],
+    context: context,
+    builder: (context) => AlertDialog(
+      clipBehavior: Clip.hardEdge,
+      contentPadding: const EdgeInsets.symmetric(vertical: 12),
+      content: Column(
+        mainAxisSize: MainAxisSize.min,
+        children: [
+          ...const [
+            (followStatus: 3, title: '看过'),
+            (followStatus: 2, title: '在看'),
+            (followStatus: 1, title: '想看'),
+          ].map(
+            (item) => statusItem(
+              enabled: followStatus != item.followStatus,
+              text: item.title,
+              onTap: () {
+                Get.back();
+                onUpdateStatus(item.followStatus);
+              },
             ),
-          ));
+          ),
+          ListTile(
+            dense: true,
+            title: Padding(
+              padding: const EdgeInsets.only(left: 10),
+              child: Text(
+                '取消$type',
+                style: const TextStyle(fontSize: 14),
+              ),
+            ),
+            onTap: () {
+              Get.back();
+              onUpdateStatus(-1);
+            },
+          )
+        ],
+      ),
+    ),
+  );
 }
diff --git a/lib/common/widgets/dialog/report_member.dart b/lib/common/widgets/dialog/report_member.dart
index 05b5da079..626eae8ef 100644
--- a/lib/common/widgets/dialog/report_member.dart
+++ b/lib/common/widgets/dialog/report_member.dart
@@ -51,7 +51,7 @@ class _MemberReportPanelState extends State<MemberReportPanel> {
                   _reason.remove(index + 1);
                 }
               },
-              ['头像违规', '昵称违规', '签名违规'][index],
+              const ['头像违规', '昵称违规', '签名违规'][index],
             ),
           ),
           const Text('举报理由（单选，非必选）'),
diff --git a/lib/http/dynamics.dart b/lib/http/dynamics.dart
index fda945a31..6e777958a 100644
--- a/lib/http/dynamics.dart
+++ b/lib/http/dynamics.dart
@@ -167,7 +167,7 @@ class DynamicsHttp {
                 "type": 1,
                 "biz_id": "",
               },
-              if (extraContent != null) ...extraContent,
+              ...?extraContent,
             ],
             if (title?.isNotEmpty == true) 'title': title,
           },
diff --git a/lib/pages/dynamics_topic/controller.dart b/lib/pages/dynamics_topic/controller.dart
index 964d703c1..ca8e5b28f 100644
--- a/lib/pages/dynamics_topic/controller.dart
+++ b/lib/pages/dynamics_topic/controller.dart
@@ -39,9 +39,10 @@ class DynTopicController
   Future<void> queryTop() async {
     topState.value = await DynamicsHttp.topicTop(topicId: topicId);
     if (topState.value.isSuccess) {
-      topicName = topState.value.data!.topicItem!.name!;
-      isFav.value = topState.value.data!.topicItem!.isFav;
-      isLike.value = topState.value.data!.topicItem!.isLike;
+      var topicItem = topState.value.data!.topicItem!;
+      topicName = topicItem.name!;
+      isFav.value = topicItem.isFav;
+      isLike.value = topicItem.isLike;
     }
   }
 
diff --git a/lib/pages/fav/pgc/child_view.dart b/lib/pages/fav/pgc/child_view.dart
index 9ecf306db..c97787f06 100644
--- a/lib/pages/fav/pgc/child_view.dart
+++ b/lib/pages/fav/pgc/child_view.dart
@@ -111,7 +111,7 @@ class _FavPgcChildPageState extends State<FavPgcChildPage>
                         ),
                       ),
                       const Spacer(),
-                      ...const <({int followStatus, String title})>[
+                      ...const [
                         (followStatus: 1, title: '想看'),
                         (followStatus: 2, title: '在看'),
                         (followStatus: 3, title: '看过'),
diff --git a/lib/pages/member/widget/user_info_card.dart b/lib/pages/member/widget/user_info_card.dart
index f0fbf96eb..22c57944c 100644
--- a/lib/pages/member/widget/user_info_card.dart
+++ b/lib/pages/member/widget/user_info_card.dart
@@ -240,16 +240,15 @@ class UserInfoCard extends StatelessWidget {
                   ),
                 ),
               ),
-              if (!card.spaceTag.isNullOrEmpty)
-                ...card.spaceTag!.map(
-                  (item) => Text(
-                    item.title ?? '',
-                    style: TextStyle(
-                      fontSize: 12,
-                      color: theme.colorScheme.outline,
-                    ),
+              ...?card.spaceTag?.map(
+                (item) => Text(
+                  item.title ?? '',
+                  style: TextStyle(
+                    fontSize: 12,
+                    color: theme.colorScheme.outline,
                   ),
                 ),
+              ),
             ],
           ),
         ),
diff --git a/lib/utils/app_scheme.dart b/lib/utils/app_scheme.dart
index fc0358c94..ade223b10 100644
--- a/lib/utils/app_scheme.dart
+++ b/lib/utils/app_scheme.dart
@@ -834,7 +834,7 @@ class PiliScheme {
       '/webview',
       parameters: {
         'url': url,
-        if (parameters != null) ...parameters,
+        ...?parameters,
       },
       off: off,
     );
diff --git a/lib/utils/page_utils.dart b/lib/utils/page_utils.dart
index 66f43d8a3..0071e3a68 100644
--- a/lib/utils/page_utils.dart
+++ b/lib/utils/page_utils.dart
@@ -596,7 +596,7 @@ class PageUtils {
           '/webview',
           parameters: {
             'url': url,
-            if (parameters != null) ...parameters,
+            ...?parameters,
           },
         );
       } else {