diff --git a/miniprogram/pages/main/journal/index.ts b/miniprogram/pages/main/journal/index.ts index 4ed079b..840b2c9 100644 --- a/miniprogram/pages/main/journal/index.ts +++ b/miniprogram/pages/main/journal/index.ts @@ -68,7 +68,7 @@ Page({ index: 0, size: 8, type: JournalPageType.NORMAL, - equealsExample: { + equalsExample: { type: "NORMAL" } }, @@ -178,7 +178,7 @@ Page({ index: this.data.page.index + 1, size: 8, type: JournalPageType.NORMAL, - equealsExample: { + equalsExample: { type: "NORMAL" } }, @@ -229,11 +229,9 @@ Page({ "url": "/pages/main/journal-creater/index?from=journal" }) }, - toDetail() { - wx.showToast({ - title: "此功能暂不可用", - icon: "none", - duration: 2000 + toSearch() { + wx.navigateTo({ + url: "/pages/main/journal-search/index" }) } }); diff --git a/miniprogram/pages/main/portfolio/index.ts b/miniprogram/pages/main/portfolio/index.ts index 9495749..b22a7af 100644 --- a/miniprogram/pages/main/portfolio/index.ts +++ b/miniprogram/pages/main/portfolio/index.ts @@ -1,13 +1,14 @@ // pages/main/portfolio/index.ts import config from "../../../config/index"; +import { JournalPage, JournalPageType } from "../../../types/Journal"; import { QueryPage } from "../../../types/Model"; import Events from "../../../utils/Events"; import Time from "../../../utils/Time"; import { Journal, JournalItemType } from "../journal/index"; interface IPortfolioData { - page: QueryPage; + page: JournalPage; list: Journal[]; isFetching: boolean; isFinished: boolean; @@ -19,7 +20,8 @@ Page({ page: { index: 0, size: 8, - likeMap: { + type: JournalPageType.NORMAL, + equalsExample: { type: "PORTFOLIO" } }, @@ -34,7 +36,8 @@ Page({ page: { index: 0, size: 8, - likeMap: { + type: JournalPageType.NORMAL, + equalsExample: { type: "PORTFOLIO" } }, @@ -105,7 +108,8 @@ Page({ page: { index: this.data.page.index + 1, size: 8, - likeMap: { + type: JournalPageType.NORMAL, + equalsExample: { type: "PORTFOLIO" } }, diff --git a/miniprogram/types/Model.ts b/miniprogram/types/Model.ts index ef4c8f9..a764b3e 100644 --- a/miniprogram/types/Model.ts +++ b/miniprogram/types/Model.ts @@ -17,7 +17,7 @@ export type QueryPage = { index: number; size: number; orderMap?: { [key: string]: OrderType }; - equealsExample?: { [key: string]: string | undefined | null }; + equalsExample?: { [key: string]: string | undefined | null }; likeExample?: { [key: string]: string | undefined | null }; }