Merge branch 'fix' into alpha

lib/http/user.dart

@@ -238,7 +238,7 @@ class UserHttp {
     var res = await Request().post(
       Api.delHistory,
       queryParameters: {
-        'kid': 'archive_$kid',
+        'kid': kid,
         'jsonp': 'jsonp',
         'csrf': await Request.getCsrf(),
       },

lib/pages/history/controller.dart

@@ -123,8 +123,15 @@ class HistoryController extends GetxController {
   }
 
   // 删除某条历史记录
-  Future delHistory(kid) async {
-    var res = await UserHttp.delHistory(kid);
+  Future delHistory(kid, business) async {
+    String resKid = 'archive_$kid';
+    if (business == 'live') {
+      resKid = 'live_$kid';
+    } else if (business.contains('article')) {
+      resKid = 'article_$kid';
+    }
+
+    var res = await UserHttp.delHistory(resKid);
     if (res['status']) {
       historyList.removeWhere((e) => e.kid == kid);
       SmartDialog.showToast(res['msg']);
@@ -136,7 +143,8 @@ class HistoryController extends GetxController {
     List<HisListItem> result =
         historyList.where((e) => e.progress == -1).toList();
     for (HisListItem i in result) {
-      await UserHttp.delHistory(i.kid);
+      String resKid = 'archive_${i.kid}';
+      await UserHttp.delHistory(resKid);
       historyList.removeWhere((e) => e.kid == i.kid);
     }
     SmartDialog.showToast('操作完成');

lib/pages/history/widgets/item.dart

@@ -247,10 +247,6 @@ class VideoContent extends StatelessWidget {
                           Theme.of(context).textTheme.labelMedium!.fontSize,
                       color: Theme.of(context).colorScheme.outline),
                 ),
-                if (videoItem.badge != '番剧' &&
-                    !videoItem.tagName.contains('动画') &&
-                    videoItem.history.business != 'live' &&
-                    !videoItem.history.business.contains('article'))
                 SizedBox(
                   width: 24,
                   height: 24,
@@ -267,6 +263,10 @@ class VideoContent extends StatelessWidget {
                     onSelected: (String type) {},
                     itemBuilder: (BuildContext context) =>
                         <PopupMenuEntry<String>>[
+                      if (videoItem.badge != '番剧' &&
+                          !videoItem.tagName.contains('动画') &&
+                          videoItem.history.business != 'live' &&
+                          !videoItem.history.business.contains('article'))
                         PopupMenuItem<String>(
                           onTap: () async {
                             var res = await UserHttp.toViewLater(
@@ -284,7 +284,8 @@ class VideoContent extends StatelessWidget {
                           ),
                         ),
                       PopupMenuItem<String>(
-                          onTap: () => ctr!.delHistory(videoItem.kid),
+                        onTap: () => ctr!.delHistory(
+                            videoItem.kid, videoItem.history.business),
                         value: 'pause',
                         height: 35,
                         child: const Row(

lib/pages/mine/view.dart

@@ -294,7 +294,7 @@ class _MinePageState extends State<MinePage> {
                       ),
                     ),
                     InkWell(
-                      onTap: () => _mineController.pushFollow(),
+                      onTap: () => _mineController.pushFans(),
                       borderRadius: StyleString.mdRadius,
                       child: Column(
                         mainAxisAlignment: MainAxisAlignment.center,