From 1002d463e0bb75c68f0482918284859d372a3e9f Mon Sep 17 00:00:00 2001
From: Timi <imyeyu6@qq.com>
Date: Mon, 8 Dec 2025 14:56:29 +0800
Subject: [PATCH] update Page obj

---
 miniprogram/pages/main/journal/index.ts   | 23 +++++-------
 miniprogram/pages/main/portfolio/index.ts | 23 +++++-------
 miniprogram/types/Model.ts                | 43 +++++++++++++++++++++++
 3 files changed, 59 insertions(+), 30 deletions(-)
 create mode 100644 miniprogram/types/Model.ts

diff --git a/miniprogram/pages/main/journal/index.ts b/miniprogram/pages/main/journal/index.ts
index 3142f1a..44226e0 100644
--- a/miniprogram/pages/main/journal/index.ts
+++ b/miniprogram/pages/main/journal/index.ts
@@ -3,6 +3,7 @@
 import Time from "../../../utils/Time";
 import config from "../../../config/index"
 import Events from "../../../utils/Events";
+import { QueryPage } from "../../../types/Model";
 
 export type Journal = {
 	date: string;
@@ -24,12 +25,7 @@ export enum JournalItemType {
 }
 
 interface JournalData {
-	page: {
-		index: number;
-		size: number;
-		type: string;
-		orderMap?: object;
-	}
+	page: QueryPage;
 	list: Journal[];
 	dateFilterMin: number;
 	dateFilterMax: number;
@@ -46,9 +42,8 @@ Page({
 		page: {
 			index: 0,
 			size: 8,
-			type: "NORMAL",
-			orderMap: {
-				createdAt: "DESC"
+			likeMap: {
+				type: "NORMAL"
 			}
 		},
 		list: [],
@@ -71,9 +66,8 @@ Page({
 				page: {
 					index: 0,
 					size: 8,
-					type: "NORMAL",
-					orderMap: {
-						createdAt: "DESC"
+					likeMap: {
+						type: "NORMAL"
 					}
 				},
 				list: [],
@@ -181,9 +175,8 @@ Page({
 					page: {
 						index: this.data.page.index + 1,
 						size: 8,
-						type: "NORMAL",
-						orderMap: {
-							createdAt: "DESC"
+						likeMap: {
+							type: "NORMAL"
 						}
 					},
 					list: this.data.list.concat(result),
diff --git a/miniprogram/pages/main/portfolio/index.ts b/miniprogram/pages/main/portfolio/index.ts
index 0faa786..9495749 100644
--- a/miniprogram/pages/main/portfolio/index.ts
+++ b/miniprogram/pages/main/portfolio/index.ts
@@ -1,17 +1,13 @@
 // pages/main/portfolio/index.ts
 
 import config from "../../../config/index";
+import { QueryPage } from "../../../types/Model";
 import Events from "../../../utils/Events";
 import Time from "../../../utils/Time";
 import { Journal, JournalItemType } from "../journal/index";
 
 interface IPortfolioData {
-	page: {
-		index: number;
-		size: number;
-		type: string;
-		orderMap?: object;
-	}
+	page: QueryPage;
 	list: Journal[];
 	isFetching: boolean;
 	isFinished: boolean;
@@ -23,9 +19,8 @@ Page({
 		page: {
 			index: 0,
 			size: 8,
-			type: "PORTFOLIO",
-			orderMap: {
-				createdAt: "DESC"
+			likeMap: {
+				type: "PORTFOLIO"
 			}
 		},
 		list: [],
@@ -39,9 +34,8 @@ Page({
 				page: {
 					index: 0,
 					size: 8,
-					type: "PORTFOLIO",
-					orderMap: {
-						createdAt: "DESC"
+					likeMap: {
+						type: "PORTFOLIO"
 					}
 				},
 				list: [],
@@ -111,9 +105,8 @@ Page({
 					page: {
 						index: this.data.page.index + 1,
 						size: 8,
-						type: "PORTFOLIO",
-						orderMap: {
-							createdAt: "DESC"
+						likeMap: {
+							type: "PORTFOLIO"
 						}
 					},
 					list: this.data.list.concat(result),
diff --git a/miniprogram/types/Model.ts b/miniprogram/types/Model.ts
new file mode 100644
index 0000000..a032ef1
--- /dev/null
+++ b/miniprogram/types/Model.ts
@@ -0,0 +1,43 @@
+// 基本实体模型
+export type Model = {
+	id?: number;
+
+	createdAt?: number;
+	updatedAt?: number;
+	deletedAt?: number;
+}
+
+export type Response = {
+	code: number;
+	msg?: string;
+	data: object;
+}
+
+export type QueryPage = {
+	index: number;
+	size: number;
+	orderMap?: { [key: string]: OrderType };
+	likeMap?: { [key: string]: string | undefined | null };
+}
+
+export enum OrderType {
+	ASC = "ASC",
+	DESC = "DESC"
+}
+
+export type QueryPageResult<T> = {
+	total: number;
+	list: T[];
+}
+
+// 携带验证码的请求体
+export type CaptchaData<T> = {
+	from: string;
+	captcha: string;
+	data: T;
+}
+
+export type KeyValue<T> = {
+	key: string;
+	value: T;
+}