Merge branch 'main' into feature-minePage

2024-10-16 14:17:24 +08:00
parent 676b2f18eb
commit 174eff7151
62 changed files with 1738 additions and 1371 deletions
--- a/lib/pages/search_panel/controller.dart
+++ b/lib/pages/search_panel/controller.dart
@ -24,7 +24,9 @@ class SearchPanelController extends GetxController {
      searchType: searchType!,
      keyword: keyword!,
      page: page.value,
-      order: searchType!.type != 'video' ? null : order.value,
+      order: !['video', 'article'].contains(searchType!.type)
+          ? null
+          : (order.value == '' ? null : order.value),
      duration: searchType!.type != 'video' ? null : duration.value,
      tids: searchType!.type != 'video' ? null : tids.value,
    );