fix: 修复源类型展示

mgz0227 · Jul 21, 2024 · 16a2648 · 16a2648
1 parent 15c5879
commit 16a2648
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 11 deletions.
diff --git a/entry/src/main/ets/componets/source/SourceView.ets b/entry/src/main/ets/componets/source/SourceView.ets
@@ -44,7 +44,7 @@ export default struct SourceView {
 
   getList() {
     BookSourceDao.flowSearch({
-      type: this.type,
+      type: [0, 2, 1][this.type],
       searchKey: this.searchValue,
       enabled: this.index === 0
     }).then(data => {

diff --git a/entry/src/main/ets/database/entities/BookSource.ets b/entry/src/main/ets/database/entities/BookSource.ets
@@ -91,8 +91,8 @@ export const GRADE_TYPE: Record<number, string> = {
 
 export const BOOK_SOURCE_TYPE: Record<number, string> = {
   0 : '小说',
-  1 : '漫画',
-  2 : '有声'
+  2 : '漫画',
+  1 : '有声'
 }
 
 export interface BookSourceDb extends Omit<BookSource, 'ruleExplore' | 'ruleSearch' | 'ruleBookInfo' | 'ruleToc' | 'ruleContent' | 'ruleReview'> {

diff --git a/entry/src/main/ets/pages/view/Find/BookSource/AddSourcePage.ets b/entry/src/main/ets/pages/view/Find/BookSource/AddSourcePage.ets
@@ -264,7 +264,7 @@ struct AddSourcePage {
               .borderRadius(4)
               .fontColor(this.formModel.bookSourceType !== undefined ? '#E0000000' : '#73000000')
               .onSelect((index: number, text?: string | undefined) => {
-                this.formModel.bookSourceType = index
+                this.formModel.bookSourceType = [0, 2, 1][index]
               })
               .backgroundColor('#f5f5f5')
               .layoutWeight(1)

diff --git a/entry/src/main/ets/pages/view/Find/BookSource/components/SourceView.ets b/entry/src/main/ets/pages/view/Find/BookSource/components/SourceView.ets
@@ -95,7 +95,7 @@ export default struct SourceView {
   getList() {
     this.refreshCount += 1
     BookSourceDao.flowSearch({
-      type: this.index,
+      type: [0, 2, 1][this.index],
       searchKey: this.searchValue
     }).then(data => {
       const bookSource = data ?? []

diff --git a/entry/src/main/ets/pages/view/Find/components/BodyContent.ets b/entry/src/main/ets/pages/view/Find/components/BodyContent.ets
@@ -20,7 +20,7 @@ export default struct BodyContent {
   @Prop currentIndex: number
   @StorageLink(CommonConstants.HAS_EXPLORE_URL) @Watch('getList') hasExploreUrl?: boolean = undefined
   tabsBodyController: TabsController = new TabsController();
-  @StorageLink('refreshCount') @Watch('getList')refreshCount: number = 0
+  @StorageLink('refreshCount') @Watch('getList') refreshCount: number = 0
 
   aboutToAppear() {
     this.getList()
@@ -33,7 +33,7 @@ export default struct BodyContent {
   getList() {
     this.loading = true
     BookSourceDao.search({
-      type: this.currentIndex,
+      type: [0, 2, 1][this.currentIndex],
       enabled: true,
       hasExploreUrl: this.hasExploreUrl
     }).then(bookSources => {
@@ -88,9 +88,8 @@ export default struct BodyContent {
 
         Row() {
           Image($r('app.media.more_search')).width(24).height(24)
-        }.width(
-          '10%'
-        )
+        }
+        .width(34)
         .onClick(() => {
           if (this.sourceList.length) {
             this.isShowDialog = true
@@ -105,7 +104,7 @@ export default struct BodyContent {
           }
         })
       }
-      .margin({ left: 15 })
+      .margin({ left: 20, right: 10 })
 
 
       if (this.loading) {