From 21f06093a49c825e944f5f6e344a619bebdf4528 Mon Sep 17 00:00:00 2001
From: yezi <yeqiling@users.noreply.github.com>
Date: Sat, 3 May 2025 23:47:47 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix:=20=E6=8E=92=E8=A1=8C=E6=A6=9C=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E4=BF=AE=E6=AD=A3=20(rid=E5=8F=98=E5=8A=A8),=20?=
 =?UTF-8?q?=E7=A7=BB=E9=99=A4"=E5=9B=BD=E5=88=9B","=E7=94=9F=E6=B4=BB"tab?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/models/common/rank_type.dart | 51 +++++++++-----------------------
 1 file changed, 14 insertions(+), 37 deletions(-)

diff --git a/lib/models/common/rank_type.dart b/lib/models/common/rank_type.dart
index 07be15c23..ecd27b81c 100644
--- a/lib/models/common/rank_type.dart
+++ b/lib/models/common/rank_type.dart
@@ -3,7 +3,6 @@ import 'package:pilipala/pages/rank/zone/index.dart';
 
 enum RandType {
   all,
-  creation,
   animation,
   music,
   dance,
@@ -12,7 +11,6 @@ enum RandType {
   technology,
   sport,
   car,
-  life,
   food,
   animal,
   madness,
@@ -26,7 +24,6 @@ enum RandType {
 extension RankTypeDesc on RandType {
   String get description => [
         '全站',
-        '国创相关',
         '动画',
         '音乐',
         '舞蹈',
@@ -35,7 +32,6 @@ extension RankTypeDesc on RandType {
         '科技',
         '运动',
         '汽车',
-        '生活',
         '美食',
         '动物圈',
         '鬼畜',
@@ -46,7 +42,6 @@ extension RankTypeDesc on RandType {
 
   String get id => [
         'all',
-        'creation',
         'animation',
         'music',
         'dance',
@@ -75,15 +70,6 @@ List tabsConfig = [
     'type': RandType.all,
     'page': const ZonePage(rid: 0),
   },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '国创相关',
-    'type': RandType.creation,
-    'page': const ZonePage(rid: 168),
-  },
   {
     'icon': const Icon(
       Icons.live_tv_outlined,
@@ -91,7 +77,7 @@ List tabsConfig = [
     ),
     'label': '动画',
     'type': RandType.animation,
-    'page': const ZonePage(rid: 1),
+    'page': const ZonePage(rid: 1005),
   },
   {
     'icon': const Icon(
@@ -100,7 +86,7 @@ List tabsConfig = [
     ),
     'label': '音乐',
     'type': RandType.music,
-    'page': const ZonePage(rid: 3),
+    'page': const ZonePage(rid: 1003),
   },
   {
     'icon': const Icon(
@@ -109,7 +95,7 @@ List tabsConfig = [
     ),
     'label': '舞蹈',
     'type': RandType.dance,
-    'page': const ZonePage(rid: 129),
+    'page': const ZonePage(rid: 1004),
   },
   {
     'icon': const Icon(
@@ -118,7 +104,7 @@ List tabsConfig = [
     ),
     'label': '游戏',
     'type': RandType.game,
-    'page': const ZonePage(rid: 4),
+    'page': const ZonePage(rid: 1008),
   },
   {
     'icon': const Icon(
@@ -127,7 +113,7 @@ List tabsConfig = [
     ),
     'label': '知识',
     'type': RandType.knowledge,
-    'page': const ZonePage(rid: 36),
+    'page': const ZonePage(rid: 1010),
   },
   {
     'icon': const Icon(
@@ -136,7 +122,7 @@ List tabsConfig = [
     ),
     'label': '科技',
     'type': RandType.technology,
-    'page': const ZonePage(rid: 188),
+    'page': const ZonePage(rid: 1012),
   },
   {
     'icon': const Icon(
@@ -145,7 +131,7 @@ List tabsConfig = [
     ),
     'label': '运动',
     'type': RandType.sport,
-    'page': const ZonePage(rid: 234),
+    'page': const ZonePage(rid: 1018),
   },
   {
     'icon': const Icon(
@@ -154,16 +140,7 @@ List tabsConfig = [
     ),
     'label': '汽车',
     'type': RandType.car,
-    'page': const ZonePage(rid: 223),
-  },
-  {
-    'icon': const Icon(
-      Icons.live_tv_outlined,
-      size: 15,
-    ),
-    'label': '生活',
-    'type': RandType.life,
-    'page': const ZonePage(rid: 160),
+    'page': const ZonePage(rid: 1013),
   },
   {
     'icon': const Icon(
@@ -172,7 +149,7 @@ List tabsConfig = [
     ),
     'label': '美食',
     'type': RandType.food,
-    'page': const ZonePage(rid: 211),
+    'page': const ZonePage(rid: 1020),
   },
   {
     'icon': const Icon(
@@ -181,7 +158,7 @@ List tabsConfig = [
     ),
     'label': '动物圈',
     'type': RandType.animal,
-    'page': const ZonePage(rid: 217),
+    'page': const ZonePage(rid: 1024),
   },
   {
     'icon': const Icon(
@@ -190,7 +167,7 @@ List tabsConfig = [
     ),
     'label': '鬼畜',
     'type': RandType.madness,
-    'page': const ZonePage(rid: 119),
+    'page': const ZonePage(rid: 1007),
   },
   {
     'icon': const Icon(
@@ -199,7 +176,7 @@ List tabsConfig = [
     ),
     'label': '时尚',
     'type': RandType.fashion,
-    'page': const ZonePage(rid: 155),
+    'page': const ZonePage(rid: 1014),
   },
   {
     'icon': const Icon(
@@ -208,7 +185,7 @@ List tabsConfig = [
     ),
     'label': '娱乐',
     'type': RandType.entertainment,
-    'page': const ZonePage(rid: 5),
+    'page': const ZonePage(rid: 1002),
   },
   {
     'icon': const Icon(
@@ -217,6 +194,6 @@ List tabsConfig = [
     ),
     'label': '影视',
     'type': RandType.film,
-    'page': const ZonePage(rid: 181),
+    'page': const ZonePage(rid: 1001),
   }
 ];

From 6908f708cc50bab3d07ea3bc3ab48b5e6637bc9e Mon Sep 17 00:00:00 2001
From: yezi <yeqiling@users.noreply.github.com>
Date: Sun, 4 May 2025 00:39:06 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix:=20=E7=A7=BB=E9=99=A4=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84RandType=E4=B8=8ERankTypeDesc?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/models/common/rank_type.dart | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/models/common/rank_type.dart b/lib/models/common/rank_type.dart
index ecd27b81c..730ae27a4 100644
--- a/lib/models/common/rank_type.dart
+++ b/lib/models/common/rank_type.dart
@@ -16,9 +16,7 @@ enum RandType {
   madness,
   fashion,
   entertainment,
-  film,
-  origin,
-  rookie
+  film
 }
 
 extension RankTypeDesc on RandType {
@@ -50,7 +48,6 @@ extension RankTypeDesc on RandType {
         'technology',
         'sport',
         'car',
-        'life',
         'food',
         'animal',
         'madness',