update 1.6.6

miniprogram/api/JournalApi.ts

@@ -0,0 +1,89 @@
+import { Network } from "../utils/Network";
+import { Journal, JournalPage } from "../types/Journal";
+import { QueryPageResult } from "../types/Model";
+
+/**
+ * Journal 日记 API
+ *
+ * 按业务模块封装网络请求，使代码更清晰、可维护
+ */
+export class JournalApi {
+	/**
+	 * 获取日记详情
+	 *
+	 * @param id - 日记 ID
+	 */
+	static getDetail(id: number | string): Promise<Journal> {
+		return Network.post<Journal>(`/journal/${id}`);
+	}
+
+	/**
+	 * 日记分页列表
+	 *
+	 * @param pageParams - 分页参数
+	 */
+	static getList(pageParams: JournalPage): Promise<QueryPageResult<Journal>> {
+		return Network.post<QueryPageResult<Journal>>("/journal/list", pageParams);
+	}
+
+	/**
+	 * 创建日记
+	 *
+	 * @param data - 日记数据
+	 */
+	static create(data: Partial<Journal> & {
+		pusher?: string;
+		tempFileIds?: string[];
+	}): Promise<Journal> {
+		return Network.post<Journal>("/journal/create", data, {
+			showLoading: true,
+			loadingText: "正在保存.."
+		});
+	}
+
+	/**
+	 * 更新日记
+	 *
+	 * @param data - 日记数据（必须包含 id）
+	 */
+	static update(data: Partial<Journal> & {
+		id: number;
+		attachmentIds?: number[];
+		tempFileIds?: string[];
+	}): Promise<Journal> {
+		return Network.post<Journal>("/journal/update", data, {
+			showLoading: true,
+			loadingText: "正在保存.."
+		});
+	}
+
+	/**
+	 * 删除日记
+	 *
+	 * @param id - 日记 ID
+	 */
+	static delete(id: number): Promise<void> {
+		return Network.post<void>("/journal/delete", { id }, {
+			showLoading: true,
+			loadingText: "删除中..."
+		});
+	}
+
+	/**
+	 * 获取 openId（用于推送）
+	 *
+	 * @param code - 微信登录 code
+	 */
+	static getOpenId(code: string): Promise<string> {
+		return Network.post<string>("/journal/openid", { code });
+	}
+
+	/**
+	 * 根据 ID 列表获取日记
+	 *
+	 * @param ids - 日记 ID 列表
+	 */
+	static getListByIds(ids: number[]): Promise<Journal[]> {
+		return Network.post<Journal[]>("/journal/list/ids", ids);
+	}
+}

miniprogram/api/MomentApi.ts

@@ -0,0 +1,69 @@
+import { Network } from "../utils/Network";
+import { Attachment } from "../types/Attachment";
+
+/**
+ * Moment 瞬间 API
+ *
+ * 管理临时照片/视频上传、归档到日记等操作
+ */
+export class MomentApi {
+	/**
+	 * 获取 moment 列表
+	 */
+	static getList(): Promise<Attachment[]> {
+		return Network.post<Attachment[]>("/journal/moment/list");
+	}
+
+	/**
+	 * MD5 查重过滤
+	 *
+	 * @param md5s - MD5 值数组
+	 * @returns 未重复的 MD5 数组
+	 */
+	static filterByMD5(md5s: string[]): Promise<string[]> {
+		return Network.post<string[]>("/journal/moment/filter", md5s);
+	}
+
+	/**
+	 * 创建 moment 附件
+	 *
+	 * @param tempFileIds - 临时文件 ID 数组
+	 * @returns 创建的附件列表
+	 */
+	static create(tempFileIds: string[]): Promise<Attachment[]> {
+		return Network.post<Attachment[]>("/journal/moment/create", tempFileIds, {
+			showLoading: true,
+			loadingText: "正在保存.."
+		});
+	}
+
+	/**
+	 * 归档 moments 到日记
+	 *
+	 * @param data - 归档数据
+	 */
+	static archive(data: {
+		id?: number;
+		type: string;
+		idea: string;
+		lat?: number;
+		lng?: number;
+		location?: string;
+		pusher: string;
+		thumbIds: number[];
+	}): Promise<void> {
+		return Network.post<void>("/journal/moment/archive", data, {
+			showLoading: true,
+			loadingText: "正在归档.."
+		});
+	}
+
+	/**
+	 * 删除 moments
+	 *
+	 * @param ids - 附件 ID 数组
+	 */
+	static delete(ids: number[]): Promise<void> {
+		return Network.post<void>("/journal/moment/delete", ids);
+	}
+}

miniprogram/api/TravelApi.ts

@@ -3,22 +3,22 @@ import { Travel } from "../types/Travel";
 import { QueryPage, QueryPageResult } from "../types/Model";
 
 /**
- * Travel 旅行计划 API
+ * Travel 出行计划 API
  *
  * 按业务模块封装网络请求，使代码更清晰、可维护
  */
 export class TravelApi {
 	/**
-	 * 获取旅行详情
+	 * 获取出行详情
 	 *
-	 * @param id - 旅行 ID
+	 * @param id - 出行 ID
 	 */
 	static getDetail(id: number | string): Promise<Travel> {
 		return Network.get<Travel>(`/journal/travel/${id}`);
 	}
 
 	/**
-	 * 旅行分页列表
+	 * 出行分页列表
 	 *
 	 * @param pageParams - 分页参数
 	 */
@@ -27,9 +27,9 @@ export class TravelApi {
 	}
 
 	/**
-	 * 创建旅行
+	 * 创建出行
 	 *
-	 * @param data - 旅行数据
+	 * @param data - 出行数据
 	 */
 	static create(data: Partial<Travel>): Promise<Travel> {
 		return Network.post<Travel>("/journal/travel/create", data, {
@@ -39,9 +39,9 @@ export class TravelApi {
 	}
 
 	/**
-	 * 更新旅行
+	 * 更新出行
 	 *
-	 * @param data - 旅行数据（必须包含 id）
+	 * @param data - 出行数据（必须包含 id）
 	 */
 	static update(data: Partial<Travel> & { id: number }): Promise<Travel> {
 		return Network.post<Travel>("/journal/travel/update", data, {
@@ -51,9 +51,9 @@ export class TravelApi {
 	}
 
 	/**
-	 * 删除旅行
+	 * 删除出行
 	 *
-	 * @param id - 旅行 ID
+	 * @param id - 出行 ID
 	 */
 	static delete(id: number): Promise<void> {
 		return Network.post<void>("/journal/travel/delete", { id });

miniprogram/api/TravelLocationApi.ts

@@ -3,13 +3,13 @@ import { TravelLocation } from "../types/Travel";
 import { QueryPage, QueryPageResult } from "../types/Model";
 
 /**
- * TravelLocation 旅行地点 API
+ * TravelLocation 出行地点 API
  *
  * 按业务模块封装网络请求，使代码更清晰、可维护
  */
 export class TravelLocationApi {
 	/**
-	 * 获取旅行地点详情
+	 * 获取出行地点详情
 	 *
 	 * @param id - 地点 ID
 	 */
@@ -18,7 +18,7 @@ export class TravelLocationApi {
 	}
 
 	/**
-	 * 获取旅行地点分页列表
+	 * 获取出行地点分页列表
 	 *
 	 * @param pageParams - 分页参数（通常包含 travelId 筛选）
 	 */
@@ -27,7 +27,7 @@ export class TravelLocationApi {
 	}
 
 	/**
-	 * 创建旅行地点
+	 * 创建出行地点
 	 *
 	 * @param data - 地点数据
 	 */
@@ -39,7 +39,7 @@ export class TravelLocationApi {
 	}
 
 	/**
-	 * 更新旅行地点
+	 * 更新出行地点
 	 *
 	 * @param data - 地点数据（必须包含 id）
 	 */
@@ -51,7 +51,7 @@ export class TravelLocationApi {
 	}
 
 	/**
-	 * 删除旅行地点
+	 * 删除出行地点
 	 *
 	 * @param id - 地点 ID
 	 */
@@ -60,7 +60,7 @@ export class TravelLocationApi {
 	}
 
 	/**
-	 * 批量获取旅行地点
+	 * 批量获取出行地点
 	 *
 	 * @param ids - 地点 ID 数组
 	 */

miniprogram/app.json

@@ -49,7 +49,7 @@
 				"selectedIconPath": "@tabBarIconMomentActive"
 			},
 			{
-				"text": "旅行",
+				"text": "出行",
 				"pagePath": "pages/main/travel/index",
 				"iconPath": "@tabBarIconTravel",
 				"selectedIconPath": "@tabBarIconTravelActive"

miniprogram/components/background/snowflake/index.json

@@ -1,4 +1,6 @@
 {
 	"component": true,
-	"usingComponents": {}
+	"usingComponents": {
+		"t-icon": "tdesign-miniprogram/icon/icon"
+	}
 }

miniprogram/components/background/snowflake/index.less

@@ -23,31 +23,9 @@ page {
 	}
 
 	.snowflake {
-		width: 10px;
-		height: 10px;
+		color: var(--theme-brand-gao);
 		display: block;
 		position: absolute;
 		animation: snowflakeFall linear infinite;
-
-		&::before,
-		&::after {
-			content: '';
-			position: absolute;
-			background: var(--theme-brand-gao);
-			opacity: .8;
-		}
-		
-		&::before {
-			top: 45%;
-			left: 0;
-			width: 100%;
-			height: 10%;
-		}
-		
-		&::after {
-			left: 45%;
-			width: 10%;
-			height: 100%;
-		}
 	}
 }

miniprogram/components/background/snowflake/index.ts

@@ -20,7 +20,7 @@ Component({
 		createSnowflake() {
 			const snowflake = {
 				x: Toolkit.random(0, this.data.docWidth),
-				s: Toolkit.random(6, 20),
+				s: Toolkit.random(16, 64),
 				speed: Toolkit.random(14, 26)
 			};
 			this.setData({

miniprogram/components/background/snowflake/index.wxml

@@ -1,9 +1,10 @@
 <!--components/background/snow/index.wxml-->
 <view class="snowflakes" style="width: {{docWidth}}px; height: {{docHeight}}px;">
-	<view
+	<t-icon
 		class="snowflake"
 		wx:for="{{snowflakes}}"
 		wx:key="index"
-		style="left: {{item.x}}px; width: {{item.s}}px; height: {{item.s}}px; animation-duration: {{item.speed}}s;"
-	></view>
+		style="left: {{item.x}}px; font-size: {{item.s}}rpx; animation-duration: {{item.speed}}s;"
+		name="snowflake"
+	/>
 </view>

miniprogram/components/journal-detail-popup/index.less

@@ -57,7 +57,7 @@
 					padding: 4rpx 12rpx;
 					font-size: 24rpx;
 					font-weight: bold;
-					background: var(--theme-bg-journal);
+					background: var(--theme-bg-card);
 					border-radius: 12rpx;
 				}
 			}

miniprogram/components/journal-detail-popup/index.ts

@@ -2,9 +2,10 @@
 import { Journal } from "../../types/Journal";
 import config from "../../config/index";
 import Toolkit from "../../utils/Toolkit";
-import { ImageMetadata, MediaAttachExt, MediaAttachType } from "../../types/Attachment";
+import { MediaAttachType, PreviewImageMetadata } from "../../types/Attachment";
 import { MediaItem, MediaItemType } from "../../types/UI";
 import Time from "../../utils/Time";
+import { JournalApi } from "../../api/JournalApi";
 
 interface JournalDetailPanelData {
 	journals: Journal[];
@@ -35,24 +36,7 @@ Component({
 			if (visible && ids && 0 < ids.length) {
 				wx.showLoading({ title: "加载中...", mask: true });
 				try {
-					const journals: Journal[] = await new Promise((resolve, reject) => {
-						wx.request({
-							url: `${config.url}/journal/list/ids`,
-							method: "POST",
-							header: {
-								Key: wx.getStorageSync("key")
-							},
-							data: ids,
-							success: (resp: any) => {
-								if (resp.data.code === 20000) {
-									resolve(resp.data.data);
-								} else {
-									reject(new Error(resp.data.message || "加载失败"));
-								}
-							},
-							fail: reject
-						});
-					}) || [];
+					const journals = await JournalApi.getListByIds(ids);
 					journals.forEach(journal => {
 						journal.date = Time.toPassedDate(journal.createdAt);
 						journal.time = Time.toTime(journal.createdAt);
@@ -63,12 +47,12 @@ Component({
 							return;
 						}
 						const mediaItems: MediaItem[] = thumbItems.map((thumbItem, index) => {
-							const metadata = thumbItem.metadata as ImageMetadata;
-							const ext = thumbItem.ext = JSON.parse(thumbItem.ext!.toString()) as MediaAttachExt;
+							const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
 							const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
-							const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`;
+							const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
+							const isVideo = metadata.sourceMimeType?.startsWith("video/");
 							return {
-								type: ext.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
+								type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
 								thumbURL,
 								sourceURL,
 								size: thumbItem.size || 0,

miniprogram/components/journal-list/index.less

@@ -57,7 +57,7 @@
 		.loading,
 		.finished {
 			color: var(--td-text-color-placeholder);
-			padding: 32rpx 0;
+			padding: 32rpx 0 64rpx 0;
 			font-size: 24rpx;
 			text-align: center;
 		}

miniprogram/components/journal-list/index.ts

@@ -4,6 +4,7 @@ import { JournalPage, JournalPageType } from "../../types/Journal";
 import { OrderType } from "../../types/Model";
 import Time from "../../utils/Time";
 import Toolkit from "../../utils/Toolkit";
+import { JournalApi } from "../../api/JournalApi";
 
 export type JournalListItem = {
 	id: number;
@@ -19,14 +20,10 @@ interface JournalListData {
 	isFinished: boolean;
 	page: JournalPage;
 	searchValue: string;
+	debouncedSearch?: any;
 }
 
-// 组件实例类型扩展
-interface ComponentInstance {
-	debouncedSearch?: ((keyword: string) => void) & { cancel(): void };
-}
-
-Component<JournalListData, {}, {}, ComponentInstance>({
+Component({
 	options: {
 		styleIsolation: 'apply-shared'
 	},
@@ -64,25 +61,28 @@ Component<JournalListData, {}, {}, ComponentInstance>({
 				createdAt: OrderType.DESC
 			}
 		},
-		searchValue: ""
+		searchValue: "",
+		debouncedSearch: undefined
 	},
 	lifetimes: {
 		ready() {
 			// 创建防抖搜索函数
-			this.debouncedSearch = Toolkit.debounce(
-				(keyword: string) => {
-					this.resetAndSearch(keyword);
-				},
-				false, // 不立即执行，等待输入停止
-				400    // 400ms 延迟
-			);
+			this.setData({
+				debouncedSearch: Toolkit.debounce(
+					(keyword: string) => {
+						this.resetAndSearch(keyword);
+					},
+					false, // 不立即执行，等待输入停止
+					400    // 400ms 延迟
+				)
+			})
 			// 组件加载时就获取数据
 			this.fetch();
 		},
 		detached() {
 			// 组件销毁时取消防抖
-			if (this.debouncedSearch) {
-				this.debouncedSearch.cancel();
+			if (this.data.debouncedSearch) {
+				this.data.debouncedSearch.cancel();
 			}
 		}
 	},
@@ -125,77 +125,74 @@ Component<JournalListData, {}, {}, ComponentInstance>({
 			});
 		},
 		/** 获取数据 */
-		fetch() {
+		async fetch() {
 			if (this.data.isFetching || this.data.isFinished) {
 				return;
 			}
 			this.setData({ isFetching: true });
-			wx.request({
-				url: `${config.url}/journal/list`,
-				method: "POST",
-				header: {
-					Key: wx.getStorageSync("key")
-				},
-				data: this.data.page,
-				success: (resp: any) => {
-					const list = resp.data.data.list;
-					if (!list || list.length === 0) {
-						this.setData({ isFinished: true });
-						return;
-					}
-					const result = list.map((journal: any) => {
-						const firstThumb = journal.items.find((item: any) => item.attachType === "THUMB");
-						return {
-							id: journal.id,
-							date: Time.toPassedDate(journal.createdAt),
-							idea: journal.idea,
-							location: journal.location,
-							thumbUrl: firstThumb ? `${config.url}/attachment/read/${firstThumb.mongoId}` : undefined
-						} as JournalListItem;
-					});
+			try {
+				const pageResult = await JournalApi.getList(this.data.page);
+				const list = pageResult.list;
+				if (!list || list.length === 0) {
 					this.setData({
-						page: {
-							...this.data.page,
-							index: this.data.page.index + 1,
-							type: JournalPageType.PREVIEW,
-							equalsExample: this.data.page.equalsExample,
-							likeExample: this.data.page.likeExample,
-							orderMap: {
-								createdAt: OrderType.DESC
-							}
-						},
-						list: this.data.list.concat(result),
-						isFinished: list.length < this.data.page.size
+						isFinished: true,
+						isFetching: false
 					});
-				},
-				complete: () => {
-					this.setData({ isFetching: false });
+					return;
 				}
-			});
+				const result = list.map((journal: any) => {
+					const firstThumb = journal.items.find((item: any) => item.attachType === "THUMB");
+					return {
+						id: journal.id,
+						date: Time.toPassedDate(journal.createdAt),
+						idea: journal.idea,
+						location: journal.location,
+						thumbUrl: firstThumb ? `${config.url}/attachment/read/${firstThumb.mongoId}` : undefined
+					} as JournalListItem;
+				});
+				this.setData({
+					page: {
+						...this.data.page,
+						index: this.data.page.index + 1,
+						type: JournalPageType.PREVIEW,
+						equalsExample: this.data.page.equalsExample,
+						likeExample: this.data.page.likeExample,
+						orderMap: {
+							createdAt: OrderType.DESC
+						}
+					},
+					list: this.data.list.concat(result),
+					isFinished: list.length < this.data.page.size,
+					isFetching: false
+				});
+			} catch (error) {
+				console.error("加载日记列表失败:", error);
+				this.setData({ isFetching: false });
+			}
 		},
 		/** 输入搜索 */
 		onSearchChange(e: WechatMiniprogram.CustomEvent) {
 			const value = e.detail.value.trim();
 			this.setData({ searchValue: value });
 			// 使用防抖自动搜索（包括清空的情况）
-			if (this.debouncedSearch) {
-				this.debouncedSearch(value);
+			if (this.data.debouncedSearch) {
+				this.data.debouncedSearch(value);
 			}
 		},
 		/** 提交搜索 */
 		onSearchSubmit(e: WechatMiniprogram.CustomEvent) {
 			const value = e.detail.value.trim();
 			// 立即搜索，取消防抖
-			if (this.debouncedSearch) {
-				this.debouncedSearch.cancel();
+			if (this.data.debouncedSearch) {
+				this.data.debouncedSearch.cancel();
 			}
 			this.resetAndSearch(value);
 		},
 		/** 清空搜索 */
 		onSearchClear() {
 			// 取消防抖，立即搜索
-			if (this.debouncedSearch) {
-				this.debouncedSearch.cancel();
+			if (this.data.debouncedSearch) {
+				this.data.debouncedSearch.cancel();
 			}
 			this.resetAndSearch("");
 		},

miniprogram/components/travel-location-popup/index.less

@@ -81,7 +81,7 @@
 					padding: 4rpx 12rpx;
 					font-size: 24rpx;
 					font-weight: bold;
-					background: var(--theme-bg-journal);
+					background: var(--theme-bg-card);
 					border-radius: 12rpx;
 				}
 			}

miniprogram/components/travel-location-popup/index.ts

@@ -1,7 +1,7 @@
 // components/travel-location-popup/index.ts
 import { TravelLocation, TravelLocationTypeLabel, TravelLocationTypeIcon } from "../../types/Travel";
 import { TravelLocationApi } from "../../api/TravelLocationApi";
-import { MediaAttachExt, MediaAttachType } from "../../types/Attachment";
+import { MediaAttachType, PreviewImageMetadata } from "../../types/Attachment";
 import { MediaItem, MediaItemType } from "../../types/UI";
 import config from "../../config/index";
 import Toolkit from "../../utils/Toolkit";
@@ -39,16 +39,16 @@ Component({
 
 						// 处理附件数据
 						const attachments = location.items || [];
-						const thumbItems = attachments.filter((item: any) => item.attachType === MediaAttachType.THUMB);
+						const thumbItems = attachments.filter(item => item.attachType === MediaAttachType.THUMB);
 
 						if (0 < thumbItems.length) {
-							const mediaItems: MediaItem[] = thumbItems.map((thumbItem: any, index: number) => {
-								const metadata = thumbItem.metadata;
-								const ext = typeof thumbItem.ext === "string" ? JSON.parse(thumbItem.ext) : thumbItem.ext;
+							const mediaItems: MediaItem[] = thumbItems.map((thumbItem, index) => {
+								const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
 								const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
-								const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`;
+								const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
+								const isVideo = metadata.sourceMimeType?.startsWith("video/");
 								return {
-									type: ext.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
+									type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
 									thumbURL,
 									sourceURL,
 									size: thumbItem.size || 0,

miniprogram/components/travel-location-popup/index.wxml

@@ -43,9 +43,6 @@
 									<t-tag wx:if="{{item.importance}}" theme="success" variant="outline">
 										重要性 {{item.importance}}
 									</t-tag>
-									<t-tag wx:if="{{item.travelCount > 0}}" theme="default" variant="outline">
-										已出行 {{item.travelCount}} 次
-									</t-tag>
 									<t-tag wx:if="{{item.requireIdCard}}" theme="danger" variant="outline">
 										需要身份证
 									</t-tag>

miniprogram/config/index.ts

@@ -1,6 +1,12 @@
 const envArgs = {
 	develop: {
-		url: "http://192.168.3.137:8091"
+		url: "http://localhost:8091"
+		// url: "https://api.imyeyu.dev"
+		// url: "https://api.imyeyu.com"
+		// url: "http://192.168.3.123:8091"
+		// url: "http://192.168.3.137:8091"
+		// url: "http://192.168.3.173:8091"
+		// url: "http://192.168.3.174:8091"
 	},
 	trial: {
 		url: "https://api.imyeyu.com"

miniprogram/pages/index/index.ts

@@ -1,7 +1,6 @@
 // index.ts
-
-import config from "../../config/index"
-import { JournalPage, JournalPageType } from "../../types/Journal";
+import { JournalPageType } from "../../types/Journal";
+import { JournalApi } from "../../api/JournalApi";
 
 interface IndexData {
 	key: string;
@@ -19,32 +18,23 @@ Page({
 			});
 		}
 	},
-	navigateToMain() {
-		wx.request({
-			url: `${config.url}/journal/list`,
-			method: "POST",
-			header: {
-				Key: this.data.key
-			},
-			data: <JournalPage> {
+	async navigateToMain() {
+		try {
+			wx.setStorageSync("key", this.data.key);
+			await JournalApi.getList({
 				index: 0,
 				size: 1,
 				type: JournalPageType.PREVIEW
-			},
-			success: (resp) => {
-				const data = resp.data as any;
-				if (data.code === 20000) {
-					wx.setStorageSync("key", this.data.key);
-					wx.switchTab({
-						url: "/pages/main/journal/index",
-					})
-				} else if (data.code === 40100) {
-					wx.showToast({ title: "密码错误", icon: "error" });
-				} else {
-					wx.showToast({ title: "服务异常", icon: "error" });
-				}
-			},
-			fail: () => wx.showToast({ title: "验证失败", icon: "error" })
-		});
+			});
+			wx.switchTab({
+				url: "/pages/main/journal/index",
+			})
+		} catch (error: any) {
+			if (error?.code === 40100) {
+				wx.showToast({ title: "密码错误", icon: "error" });
+			} else {
+				wx.showToast({ title: "验证失败", icon: "error" });
+			}
+		}
 	}
 })

miniprogram/pages/main/about/index.less

@@ -1,7 +1,6 @@
 /* pages/info/info.less */
 page {
 	display: flex;
-	background: var(--theme-bg-wx);
 	flex-direction: column;
 }
 

miniprogram/pages/main/about/index.wxml

@@ -26,7 +26,7 @@
 			</view>
 			<view class="item">
 				<text class="label">版本：</text>
-				<text>1.6.1</text>
+				<text>1.6.6</text>
 			</view>
 			<view class="item copyright">
 				<text>{{copyright}}</text>

miniprogram/pages/main/journal-date/index.ts

@@ -1,7 +1,7 @@
 // pages/main/journal-date/index.ts
-import config from "../../../config/index";
 import { Journal, JournalPageType } from "../../../types/Journal";
 import Time from "../../../utils/Time";
+import { JournalApi } from "../../../api/JournalApi";
 
 interface JournalDateData {
 	// 存储每个日期的日记 id 列表
@@ -27,28 +27,12 @@ Page({
 	async loadJournals() {
 		this.setData({ isLoading: true });
 		try {
-			const list: Journal[] = await new Promise((resolve, reject) => {
-				wx.request({
-					url: `${config.url}/journal/list`,
-					method: "POST",
-					header: {
-						Key: wx.getStorageSync("key")
-					},
-					data: {
-						page: 0,
-						size: 9007199254740992,
-						type: JournalPageType.PREVIEW
-					},
-					success: (resp: any) => {
-						if (resp.data.code === 20000) {
-							resolve(resp.data.data.list);
-						} else {
-							reject(new Error(resp.data.message || "加载失败"));
-						}
-					},
-					fail: reject
-				});
-			}) || [];
+			const pageResult = await JournalApi.getList({
+				index: 0,
+				size: 9007199254740992,
+				type: JournalPageType.PREVIEW
+			});
+			const list: Journal[] = pageResult.list || [];
 			// 按日期分组，只存储 id
 			const journalMap: Record<string, number[]> = {};
 			list.forEach((journal: any) => {

miniprogram/pages/main/journal-editor/index.less

@@ -26,6 +26,7 @@
 				display: flex;
 
 				.radio {
+					background: transparent;
 					margin-right: 1em;
 				}
 			}

miniprogram/pages/main/journal-editor/index.ts

@@ -4,9 +4,10 @@ import Time from "../../../utils/Time";
 import Toolkit from "../../../utils/Toolkit";
 import config from "../../../config/index";
 import { Location, MediaItem, MediaItemType, WechatMediaItem } from "../../../types/UI";
-import { Journal, JournalType } from "../../../types/Journal";
-import { MediaAttachExt, MediaAttachType } from "../../../types/Attachment";
+import { JournalType } from "../../../types/Journal";
+import { MediaAttachType, PreviewImageMetadata } from "../../../types/Attachment";
 import IOSize, { Unit } from "../../../utils/IOSize";
+import { JournalApi } from "../../../api/JournalApi";
 
 interface JournalEditorData {
 	/** 模式：create 或 edit */
@@ -77,7 +78,7 @@ Page({
 	async onLoad(options: any) {
 		// 授权定位
 		const setting = await wx.getSetting();
-		wx.setStorageSync("isAuthLocation", setting.authSetting["scope.userLocation"]);
+		wx.setStorageSync("isAuthLocation", setting.authSetting["scope.userLocation"] || false);
 		let isAuthLocation = JSON.parse(wx.getStorageSync("isAuthLocation"));
 		this.setData({ isAuthLocation });
 		if (!isAuthLocation) {
@@ -148,35 +149,19 @@ Page({
 	},
 	/** 加载日记详情（编辑模式） */
 	async loadJournalDetail(id: number) {
-		wx.showLoading({ title: "加载中...", mask: true });
 		try {
-			const journal: Journal = await new Promise((resolve, reject) => {
-				wx.request({
-					url: `${config.url}/journal/${id}`,
-					method: "POST",
-					header: {
-						Key: wx.getStorageSync("key")
-					},
-					success: (res: any) => {
-						if (res.data.code === 20000) {
-							resolve(res.data.data);
-						} else {
-							reject(new Error(res.data.message || "加载失败"));
-						}
-					},
-					fail: reject
-				});
-			});
+			const journal = await JournalApi.getDetail(id);
 
 			const items = journal.items || [];
 			const thumbItems = items.filter((item) => item.attachType === MediaAttachType.THUMB);
 
 			const mediaList: MediaItem[] = thumbItems.map((thumbItem) => {
-				const ext = thumbItem.ext = JSON.parse(thumbItem.ext!.toString()) as MediaAttachExt;
+				const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
 				const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
-				const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`;
+				const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
+				const isVideo = metadata.sourceMimeType?.startsWith("video/");
 				return {
-					type: ext.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
+					type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
 					thumbURL,
 					sourceURL,
 					size: thumbItem.size || 0,
@@ -293,7 +278,7 @@ Page({
 			// 创建模式：只有 mediaList
 			const sources = (this.data.mediaList as WechatMediaItem[]).map(item => ({
 				url: item.path,
-				type: MediaItemType[item.type].toLowerCase()
+				type: item.type.toLowerCase()
 			}));
 
 			const total = sources.length;
@@ -309,11 +294,11 @@ Page({
 			// 编辑模式：mediaList + newMediaList
 			const sources = (this.data.mediaList as MediaItem[]).map(item => ({
 				url: item.sourceURL,
-				type: MediaItemType[item.type].toLowerCase()
+				type: item.type
 			}));
 			const newSources = this.data.newMediaList.map(item => ({
 				url: item.path,
-				type: MediaItemType[item.type].toLowerCase()
+				type: item.type
 			}));
 			const allSources = [...sources, ...newSources];
 			const itemIndex = isNewMedia ? this.data.mediaList.length + index : index;
@@ -392,45 +377,21 @@ Page({
 		this.executeDelete();
 	},
 	/** 执行删除 */
-	executeDelete() {
-		wx.showLoading({ title: "删除中...", mask: true });
-		wx.request({
-			url: `${config.url}/journal/delete`,
-			method: "POST",
-			header: {
-				Key: wx.getStorageSync("key"),
-				"Content-Type": "application/json"
-			},
-			data: {
-				id: this.data.id
-			},
-			success: (res: any) => {
-				wx.hideLoading();
-				if (res.data.code === 20000 || res.statusCode === 200) {
-					Events.emit("JOURNAL_REFRESH");
-					Events.emit("JOURNAL_LIST_REFRESH");
-					wx.showToast({
-						title: "删除成功",
-						icon: "success"
-					});
-					setTimeout(() => {
-						wx.navigateBack();
-					}, 1000);
-				} else {
-					wx.showToast({
-						title: res.data.message || "删除失败",
-						icon: "error"
-					});
-				}
-			},
-			fail: () => {
-				wx.hideLoading();
-				wx.showToast({
-					title: "删除失败",
-					icon: "error"
-				});
-			}
-		});
+	async executeDelete() {
+		try {
+			await JournalApi.delete(this.data.id!);
+			Events.emit("JOURNAL_REFRESH");
+			Events.emit("JOURNAL_LIST_REFRESH");
+			wx.showToast({
+				title: "删除成功",
+				icon: "success"
+			});
+			setTimeout(() => {
+				wx.navigateBack();
+			}, 1000);
+		} catch (error) {
+			console.error("删除日记失败:", error);
+		}
 	},
 	/** 提交/保存 */
 	submit() {
@@ -441,10 +402,9 @@ Page({
 		}
 	},
 	/** 创建日记 */
-	createJournal() {
+	async createJournal() {
 		const handleFail = () => {
 			wx.showToast({ title: "上传失败", icon: "error" });
-			wx.hideLoading();
 			this.setData({
 				isSaving: false
 			});
@@ -452,83 +412,64 @@ Page({
 		this.setData({
 			isSaving: true
 		});
-		// 获取 openId
-		const getOpenId = new Promise<string>((resolve, reject) => {
-			wx.login({
-				success: (res) => {
-					if (res.code) {
-						wx.request({
-							url: `${config.url}/journal/openid`,
-							method: "POST",
-							header: {
-								Key: wx.getStorageSync("key")
-							},
-							data: {
-								code: res.code
-							},
-							success: (resp) => {
-								const data = resp.data as any;
-								if (data.code === 20000) {
-									resolve(data.data);
-								} else {
-									reject(new Error("获取 openId 失败"));
-								}
-							},
-							fail: () => reject(new Error("获取 openId 请求失败"))
-						});
-					} else {
-						reject(new Error("获取登录凭证失败"));
-					}
-				},
-				fail: () => reject(new Error("登录失败"))
+		try {
+			// 获取 openId
+			const getOpenId = new Promise<string>((resolve, reject) => {
+				wx.login({
+					success: async (res) => {
+						if (res.code) {
+							try {
+								const openId = await JournalApi.getOpenId(res.code);
+								resolve(openId);
+							} catch (error) {
+								reject(new Error("获取 openId 失败"));
+							}
+						} else {
+							reject(new Error("获取登录凭证失败"));
+						}
+					},
+					fail: () => reject(new Error("登录失败"))
+				});
 			});
-		});
-		// 文件上传
-		const uploadFiles = this.uploadMediaFiles(this.data.mediaList as WechatMediaItem[]);
-		// 并行执行获取 openId 和文件上传
-		Promise.all([getOpenId, uploadFiles]).then(([openId, tempFileIds]) => {
-			wx.showLoading({ title: "正在保存..", mask: true });
-			wx.request({
-				url: `${config.url}/journal/create`,
-				method: "POST",
-				header: {
-					Key: wx.getStorageSync("key")
-				},
-				data: {
-					idea: this.data.idea,
-					type: this.data.type,
-					lat: this.data.location?.lat,
-					lng: this.data.location?.lng,
-					location: this.data.location?.text,
-					pusher: openId,
-					createdAt: Date.parse(`${this.data.date} ${this.data.time}`),
-					tempFileIds
-				},
-				success: async () => {
-					Events.emit("JOURNAL_REFRESH");
-					wx.showToast({ title: "提交成功", icon: "success" });
-					this.setData({
-						idea: "",
-						mediaList: [],
-						isSaving: false,
-						uploaded: "0",
-						uploadTotal: "0 MB",
-						uploadProgress: 0
-					});
-					await Toolkit.sleep(1000);
-					wx.switchTab({
-						url: "/pages/main/journal/index"
-					});
-				},
-				fail: handleFail
+			// 文件上传
+			const uploadFiles = this.uploadMediaFiles(this.data.mediaList as WechatMediaItem[]);
+			// 并行执行获取 openId 和文件上传
+			const [openId, tempFileIds] = await Promise.all([getOpenId, uploadFiles]);
+
+			await JournalApi.create({
+				idea: this.data.idea,
+				type: this.data.type,
+				lat: this.data.location?.lat,
+				lng: this.data.location?.lng,
+				location: this.data.location?.text,
+				pusher: openId,
+				createdAt: Date.parse(`${this.data.date} ${this.data.time}`),
+				tempFileIds
 			});
-		}).catch(handleFail);
+
+			Events.emit("JOURNAL_REFRESH");
+			wx.showToast({ title: "提交成功", icon: "success" });
+			this.setData({
+				idea: "",
+				mediaList: [],
+				isSaving: false,
+				uploaded: "0",
+				uploadTotal: "0 MB",
+				uploadProgress: 0
+			});
+			await Toolkit.sleep(1000);
+			wx.switchTab({
+				url: "/pages/main/journal/index"
+			});
+		} catch (error) {
+			console.error("创建日记失败:", error);
+			handleFail();
+		}
 	},
 	/** 更新日记 */
-	updateJournal() {
+	async updateJournal() {
 		const handleFail = () => {
 			wx.showToast({ title: "保存失败", icon: "error" });
-			wx.hideLoading();
 			this.setData({
 				isSaving: false
 			});
@@ -536,53 +477,39 @@ Page({
 		this.setData({
 			isSaving: true
 		});
-		// 收集保留的附件 ID（缩略图 ID）
-		const attachmentIds = (this.data.mediaList as MediaItem[]).map(item => item.attachmentId);
-		// 上传新媒体文件
-		const uploadFiles = this.uploadMediaFiles(this.data.newMediaList);
+		try {
+			// 收集保留的附件 ID（缩略图 ID）
+			const attachmentIds = (this.data.mediaList as MediaItem[]).map(item => item.attachmentId);
+			// 上传新媒体文件
+			const tempFileIds = await this.uploadMediaFiles(this.data.newMediaList);
 
-		// 提交保存
-		uploadFiles.then((tempFileIds) => {
-			wx.showLoading({ title: "正在保存..", mask: true });
-			wx.request({
-				url: `${config.url}/journal/update`,
-				method: "POST",
-				header: {
-					Key: wx.getStorageSync("key")
-				},
-				data: {
-					id: this.data.id,
-					idea: this.data.idea,
-					type: this.data.type,
-					lat: this.data.location?.lat,
-					lng: this.data.location?.lng,
-					location: this.data.location?.text,
-					createdAt: new Date(`${this.data.date}T${this.data.time}:00`).getTime(),
-					// 保留的现有附件 ID
-					attachmentIds,
-					// 新上传的临时文件 ID
-					tempFileIds
-				},
-				success: async (resp: any) => {
-					if (resp.data.code === 20000 || resp.statusCode === 200) {
-						Events.emit("JOURNAL_REFRESH");
-						Events.emit("JOURNAL_LIST_REFRESH");
-						wx.showToast({ title: "保存成功", icon: "success" });
-						this.setData({
-							isSaving: false,
-							uploaded: "0",
-							uploadTotal: "0 MB",
-							uploadProgress: 0
-						});
-						await Toolkit.sleep(1000);
-						wx.navigateBack();
-					} else {
-						handleFail();
-					}
-				},
-				fail: handleFail
+			await JournalApi.update({
+				id: this.data.id!,
+				idea: this.data.idea,
+				type: this.data.type,
+				lat: this.data.location?.lat,
+				lng: this.data.location?.lng,
+				location: this.data.location?.text,
+				createdAt: new Date(`${this.data.date}T${this.data.time}:00`).getTime(),
+				attachmentIds,
+				tempFileIds
 			});
-		}).catch(handleFail);
+
+			Events.emit("JOURNAL_REFRESH");
+			Events.emit("JOURNAL_LIST_REFRESH");
+			wx.showToast({ title: "保存成功", icon: "success" });
+			this.setData({
+				isSaving: false,
+				uploaded: "0",
+				uploadTotal: "0 MB",
+				uploadProgress: 0
+			});
+			await Toolkit.sleep(1000);
+			wx.navigateBack();
+		} catch (error) {
+			console.error("更新日记失败:", error);
+			handleFail();
+		}
 	},
 	/** 上传媒体文件 */
 	uploadMediaFiles(mediaList: WechatMediaItem[]): Promise<string[]> {

miniprogram/pages/main/journal-map/index.less

@@ -8,75 +8,74 @@
 	.map {
 		width: 100%;
 		height: 100%;
-	}
 
-	.custom-callout {
-		width: fit-content;
-		min-width: 350rpx;
-		max-width: 450rpx;
-		background: #fff;
-		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, .15);
-		border-radius: 6rpx;
-
-		.callout-content {
-			display: flex;
-			padding: 8rpx 16rpx 8rpx 8rpx;
-			align-items: flex-start;
-
-			.thumb-container {
-				width: 72rpx;
-				height: 72rpx;
-				position: relative;
-				flex-shrink: 0;
-				margin-right: 12rpx;
-				overflow: hidden;
-				border-radius: 6rpx;
-
-				.thumb {
-					width: 100%;
-					height: 100%;
-				}
-
-				.count-badge {
-					top: 4rpx;
-					right: 4rpx;
-					color: #fff;
-					padding: 2rpx 6rpx;
-					position: absolute;
-					font-size: 20rpx;
-					background: rgba(0, 0, 0, .7);
-					border-radius: 8rpx;
-				}
-			}
-
-			.text-container {
-				flex: 1;
+		.location {
+			width: fit-content;
+			background: var(--theme-bg-card);
+			box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, .15);
+			border-radius: 6rpx;
+	
+			.content {
 				display: flex;
-				overflow: hidden;
-				flex-direction: column;
-
-				.location {
-					color: #333;
+				padding: 8rpx 16rpx 8rpx 8rpx;
+				align-items: flex-start;
+	
+				.thumb {
+					width: 72rpx;
+					height: 72rpx;
+					position: relative;
+					flex-shrink: 0;
+					margin-right: 12rpx;
 					overflow: hidden;
-					font-size: 30rpx;
-					white-space: nowrap;
-					text-overflow: ellipsis;
-					margin-bottom: 4rpx;
-				}
-
-				.date-count {
-					display: flex;
-
-					.date {
-						color: #999;
-						font-size: 24rpx;
-						margin-right: 16rpx;
+					border-radius: 6rpx;
+	
+					.img {
+						width: 100%;
+						height: 100%;
 					}
-
-					.count {
-						color: var(--theme-wx);
-						font-size: 24rpx;
-						font-weight: 600;
+	
+					.badge {
+						top: 4rpx;
+						right: 4rpx;
+						color: #fff;
+						padding: 2rpx 6rpx;
+						position: absolute;
+						font-size: 20rpx;
+						background: rgba(0, 0, 0, .7);
+						border-radius: 8rpx;
+					}
+				}
+	
+				.text {
+					flex: 1;
+					display: flex;
+					overflow: hidden;
+					flex-direction: column;
+	
+					.value {
+						color: var(--theme-text-primary);
+						width: calc(var(--title-length) * 30rpx);
+						overflow: hidden;
+						font-size: 30rpx;
+						white-space: nowrap;
+						text-overflow: ellipsis;
+						margin-bottom: 4rpx;
+					}
+	
+					.date-count {
+						display: flex;
+	
+						.date {
+							color: var(--theme-text-secondary);
+							font-size: 24rpx;
+							margin-right: 16rpx;
+						}
+	
+						.count {
+							color: var(--theme-wx);
+							font-size: 24rpx;
+							font-weight: 600;
+						}
 					}
 				}
 			}

miniprogram/pages/main/journal-map/index.ts

@@ -1,21 +1,10 @@
 // pages/main/journal-map/index.ts
 import config from "../../../config/index";
 import Time from "../../../utils/Time";
-import { Journal, JournalPageType } from "../../../types/Journal";
+import { JournalPageType } from "../../../types/Journal";
 import Toolkit from "../../../utils/Toolkit";
-
-interface MapMarker {
-	id: number;
-	latitude: number;
-	longitude: number;
-	width: number;
-	height: number;
-	customCallout: {
-		anchorY: number;
-		anchorX: number;
-		display: string;
-	};
-}
+import { MapMarker } from "../../../types/UI";
+import { JournalApi } from "../../../api/JournalApi";
 
 interface LocationMarker {
 	locationKey: string; // 位置键 "lat,lng"
@@ -62,28 +51,12 @@ Page({
 	async loadJournals() {
 		this.setData({ isLoading: true });
 		try {
-			const list: Journal[] = await new Promise((resolve, reject) => {
-				wx.request({
-					url: `${config.url}/journal/list`,
-					method: "POST",
-					header: {
-						Key: wx.getStorageSync("key")
-					},
-					data: {
-						page: 0,
-						size: 9007199254740992,
-						type: JournalPageType.PREVIEW
-					},
-					success: (resp: any) => {
-						if (resp.data.code === 20000) {
-							resolve(resp.data.data.list);
-						} else {
-							reject(new Error(resp.data.message || "加载失败"));
-						}
-					},
-					fail: reject
-				});
-			}) || [];
+			const result = await JournalApi.getList({
+				index: 0,
+				size: 9007199254740992,
+				type: JournalPageType.PREVIEW
+			});
+			const list = result.list || [];
 			// 过滤有位置信息的记录，并按位置分组
 			const locationMap = new Map<string, LocationMarker>();
 			list.filter((journal: any) => journal.lat && journal.lng).forEach((journal: any) => {

miniprogram/pages/main/journal-map/index.wxml

@@ -13,23 +13,28 @@
 		bindcallouttap="onCalloutTap"
 	>
 		<cover-view slot="callout">
-			<block wx:for="{{locations}}" wx:key="locationKey" wx:for-index="markerIndex">
-				<cover-view class="custom-callout" marker-id="{{markerIndex}}">
-					<cover-view class="callout-content">
-						<cover-view wx:if="{{item.previewThumb}}" class="thumb-container">
-							<cover-image class="thumb" src="{{item.previewThumb}}" />
-							<cover-view wx:if="{{item.count > 1}}" class="count-badge">{{item.count}}</cover-view>
-						</cover-view>
-						<cover-view class="text-container">
-							<cover-view wx:if="{{item.location}}" class="location">{{item.location}}</cover-view>
-							<cover-view class="date-count">
-								<cover-view class="date">{{item.date}}</cover-view>
-								<cover-view wx:if="{{item.count > 1}}" class="count">{{item.count}} 条日记</cover-view>
-							</cover-view>
+			<cover-view
+				class="location"
+				wx:for="{{locations}}"
+				wx:key="locationKey"
+				wx:for-index="locationIndex"
+				marker-id="{{locationIndex}}"
+				style="{{'--title-length: ' + item.location.length}}"
+			>
+				<cover-view class="content">
+					<cover-view wx:if="{{item.previewThumb}}" class="thumb">
+						<cover-image class="img" src="{{item.previewThumb}}" />
+						<cover-view wx:if="{{1 < item.count}}" class="badge">{{item.count}}</cover-view>
+					</cover-view>
+					<cover-view class="text">
+						<cover-view wx:if="{{item.location}}" class="value">{{item.location}}</cover-view>
+						<cover-view class="date-count">
+							<cover-view class="date">{{item.date}}</cover-view>
+							<cover-view wx:if="{{1 < item.count}}" class="count">{{item.count}} 条日记</cover-view>
 						</cover-view>
 					</cover-view>
 				</cover-view>
-			</block>
+			</cover-view>
 		</cover-view>
 	</map>
 	<view wx:if="{{isLoading}}" class="loading">

miniprogram/pages/main/journal-search/index.less

@@ -1,8 +1,21 @@
 page {
+	height: 100vh;
 	background: var(--td-bg-color-page);
 }
 
-.content {
-	width: 100vw;
-	height: calc(100vh - var(--navbar-height, 88rpx));
+.page-container {
+	width: 100%;
+	height: 100%;
+	display: flex;
+	overflow: hidden;
+	flex-direction: column;
+
+	.navbar {
+		flex-shrink: 0;
+	}
+
+	.content {
+		flex: 1;
+		overflow: hidden;
+	}
 }

miniprogram/pages/main/journal-search/index.wxml

@@ -1,12 +1,13 @@
-<view class="custom-navbar">
-	<t-navbar title="列表查找" left-arrow />
-</view>
-
-<view class="content">
-	<journal-list
-		id="listRef"
-		searchable="{{true}}"
-		mode="navigate"
-		bind:navigate="onNavigateItem"
-	/>
+<view class="page-container">
+	<view class="navbar">
+		<t-navbar title="列表查找" left-arrow />
+	</view>
+	<view class="content">
+		<journal-list
+			id="listRef"
+			searchable="{{true}}"
+			mode="navigate"
+			bind:navigate="onNavigateItem"
+		/>
+	</view>
 </view>

miniprogram/pages/main/journal/index.ts

@@ -5,9 +5,10 @@ import config from "../../../config/index"
 import Events from "../../../utils/Events";
 import Toolkit from "../../../utils/Toolkit";
 import { Journal, JournalPage, JournalPageType } from "../../../types/Journal";
-import { OrderType, QueryPageResult } from "../../../types/Model";
-import { ImageMetadata, MediaAttachExt } from "../../../types/Attachment";
+import { OrderType } from "../../../types/Model";
+import { PreviewImageMetadata } from "../../../types/Attachment";
 import { MediaItem, MediaItemType } from "../../../types/UI";
+import { JournalApi } from "../../../api/JournalApi";
 
 interface JournalData {
 	page: JournalPage;
@@ -143,79 +144,71 @@ Page({
 			url: "/pages/main/journal-date/index"
 		})
 	},
-	fetch() {
+	async fetch() {
 		if (this.data.isFetching || this.data.isFinished) {
 			return;
 		}
 		this.setData({
 			isFetching: true
 		});
-		wx.request({
-			url: `${config.url}/journal/list`,
-			method: "POST",
-			header: {
-				Key: wx.getStorageSync("key")
-			},
-			data: this.data.page,
-			success: async (resp: any) => {
-				const pageResult = resp.data.data as QueryPageResult<Journal>;
-				const list = pageResult.list;
-				if (!list || list.length === 0) {
-					this.setData({
-						isFinished: true
-					})
-					return;
-				}
-				list.forEach(journal => {
-					const mediaItems = journal.items!.filter((item) => item.attachType === "THUMB").map((thumbItem, index) => {
-						const metadata = thumbItem.metadata as ImageMetadata;
-						const ext = thumbItem.ext = JSON.parse(thumbItem.ext!.toString()) as MediaAttachExt;
-						const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
-						const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`;
-						return {
-							type: ext.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
-							thumbURL,
-							sourceURL,
-							size: thumbItem.size || 0,
-							attachmentId: thumbItem.id,
-							width: metadata.width,
-							height: metadata.height,
-							originalIndex: index
-						} as MediaItem;
-					});
-					journal.date = Time.toDate(journal.createdAt);
-					journal.time = Time.toTime(journal.createdAt);
-					journal.datetime = Time.toPassedDateTime(journal.createdAt);
-					journal.mediaItems = mediaItems;
-					journal.columnedItems = Toolkit.splitItemsIntoColumns(mediaItems, 3, (item) => {
-						if (item.width && item.height && 0 < item.width) {
-							return item.height / item.width;
-						}
-						return 1;
-					})
-				})
-				this.setData({
-					page: {
-						index: this.data.page.index + 1,
-						size: 8,
-						type: JournalPageType.NORMAL,
-						equalsExample: {
-							type: "NORMAL"
-						},
-						orderMap: {
-							createdAt: OrderType.DESC
-						}
-					},
-					list: this.data.list.concat(list),
-					isFinished: list.length < this.data.page.size
-				});
-			},
-			complete: () => {
+		try {
+			const pageResult = await JournalApi.getList(this.data.page);
+			const list = pageResult.list;
+			if (!list || list.length === 0) {
 				this.setData({
+					isFinished: true,
 					isFetching: false
 				});
+				return;
 			}
-		});
+			list.forEach(journal => {
+				const mediaItems = journal.items!.filter((item) => item.attachType === "THUMB").map((thumbItem, index) => {
+					const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
+					const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
+					const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
+					const isVideo = metadata.sourceMimeType?.startsWith("video/");
+					return {
+						type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
+						thumbURL,
+						sourceURL,
+						size: thumbItem.size || 0,
+						attachmentId: thumbItem.id,
+						width: metadata.width,
+						height: metadata.height,
+						originalIndex: index
+					} as MediaItem;
+				});
+				journal.date = Time.toDate(journal.createdAt);
+				journal.time = Time.toTime(journal.createdAt);
+				journal.datetime = Time.toPassedDateTime(journal.createdAt);
+				journal.mediaItems = mediaItems;
+				journal.columnedItems = Toolkit.splitItemsIntoColumns(mediaItems, 3, (item) => {
+					if (item.width && item.height && 0 < item.width) {
+						return item.height / item.width;
+					}
+					return 1;
+				})
+			});
+			this.setData({
+				page: {
+					index: this.data.page.index + 1,
+					size: 8,
+					type: JournalPageType.NORMAL,
+					equalsExample: {
+						type: "NORMAL"
+					},
+					orderMap: {
+						createdAt: OrderType.DESC
+					}
+				},
+				list: this.data.list.concat(list),
+				isFinished: list.length < this.data.page.size,
+				isFetching: false
+			});
+		} catch (error) {
+			console.error("加载日记失败:", error);
+			this.setData({ isFetching: false });
+		}
 	},
 	preview(e: WechatMiniprogram.BaseEvent) {
 		const { journalIndex, itemIndex } = e.currentTarget.dataset;

miniprogram/pages/main/journal/index.wxml

@@ -41,7 +41,7 @@
 			<view wx:for="{{journal.columnedItems}}" wx:for-item="column" wx:for-index="columnIndex" wx:key="columnIndex" class="column">
 				<block wx:for="{{column}}" wx:for-item="item" wx:for-index="itemIndex" wx:key="attachmentId">
 					<image
-						class="item thumbnail {{item.type === 0 ? 'image' : 'video'}}"
+						class="item thumbnail {{item.type}}"
 						src="{{item.thumbURL}}"
 						mode="widthFix"
 						bindtap="preview"

miniprogram/pages/main/moment/index.ts

@@ -4,22 +4,20 @@ import Events from "../../../utils/Events";
 import IOSize, { Unit } from "../../../utils/IOSize";
 import Time from "../../../utils/Time";
 import Toolkit from "../../../utils/Toolkit";
-import type { Location } from "../../../types/UI";
+import { Location, MediaItemType } from "../../../types/UI";
+import { PreviewImageMetadata } from "../../../types/Attachment";
+import { MomentApi } from "../../../api/MomentApi";
+import { JournalApi } from "../../../api/JournalApi";
+import { Network } from "../../../utils/Network";
 
 type Item = {
 	id: number;
-	type: ItemType;
-	mongoId: string;
-	thumbUrl: string;
-	sourceMongoId: string;
+	type: MediaItemType;
+	thumbURL: string;
+	sourceURL: string;
 	checked: boolean;
 }
 
-enum ItemType {
-	IMAGE,
-	VIDEO
-}
-
 type MD5Result = {
 	path: string;
 	md5: string;
@@ -73,7 +71,7 @@ Page({
 
 		// 授权定位
 		const setting = await wx.getSetting();
-		wx.setStorageSync("isAuthLocation", setting.authSetting["scope.userLocation"]);
+		wx.setStorageSync("isAuthLocation", setting.authSetting["scope.userLocation"] || false);
 		let isAuthLocation = JSON.parse(wx.getStorageSync("isAuthLocation"));
 		this.setData({ isAuthLocation });
 		if (!isAuthLocation) {
@@ -128,33 +126,30 @@ Page({
 			}
 		});
 	},
-	fetch() {
-		wx.request({
-			url: `${config.url}/journal/moment/list`,
-			method: "POST",
-			header: {
-				Key: wx.getStorageSync("key")
-			},
-			success: async (resp: any) => {
-				const list = resp.data.data;
-				if (!list || list.length === 0) {
-					return;
-				}
-				this.setData({
-					list: list.map((item: any) => {
-						const extData = JSON.parse(item.ext);
-						return {
-							id: item.id,
-							type: extData.isImage ? ItemType.IMAGE : ItemType.VIDEO,
-							mongoId: item.mongoId,
-							thumbUrl: `${config.url}/attachment/read/${item.mongoId}`,
-							sourceMongoId: extData.sourceMongoId,
-							checked: false
-						} as Item;
-					})
-				});
+	async fetch() {
+		try {
+			const list = await MomentApi.getList();
+			if (!list || list.length === 0) {
+				return;
 			}
-		});
+			this.setData({
+				list: list.map((item: any) => {
+					const metadata = (typeof item.metadata === "string" ? JSON.parse(item.metadata) : item.metadata) as PreviewImageMetadata;
+					const thumbURL = `${config.url}/attachment/read/${item.mongoId}`;
+					const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
+					const isImage = metadata.sourceMimeType?.startsWith("image/");
+					return {
+						id: item.id,
+						type: isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO,
+						thumbURL,
+						sourceURL,
+						checked: false
+					} as Item;
+				})
+			});
+		} catch (error) {
+			console.error("加载 moment 列表失败:", error);
+		}
 	},
 	updateHasChecked() {
 		this.setData({ hasChecked: this.data.list.some(item => item.checked) });
@@ -176,8 +171,8 @@ Page({
 
 		const sources = this.data.list.slice(startIndex, endIndex).map((item: Item) => {
 			return {
-				url: `${config.url}/attachment/read/${item.sourceMongoId}`,
-				type: item.type === 0 ? "image" : "video"
+				url: item.sourceURL,
+				type: item.type.toLowerCase()
 			}
 		}) as any;
 		wx.previewMedia({
@@ -230,154 +225,66 @@ Page({
 					} as MD5Result);
 				}));
 				// 查重
-				const filterMD5Result: string[] = await new Promise((resolve, reject) => {
-					wx.request({
-						url: `${config.url}/journal/moment/filter`,
-						method: "POST",
-						header: {
-							Key: wx.getStorageSync("key")
-						},
-						data: md5Results.map(item => item.md5),
-						success: async (resp: any) => {
-							resolve(resp.data.data);
-						},
-						fail: reject
-					});
-				});
+				const filterMD5Result: string[] = await MomentApi.filterByMD5(
+					md5Results.map(item => item.md5)
+				);
 				// 过滤文件
 				const filterPath = md5Results.filter(item => filterMD5Result.indexOf(item.md5) !== -1)
 					.map(item => item.path);
 				files = files.filter(file => filterPath.indexOf(file.tempFilePath) !== -1);
 				if (files.length === 0) {
 					wx.hideLoading();
+					that.setData({ isUploading: false });
 					return;
 				}
-				wx.showLoading({
-					title: "正在上传..",
-					mask: true
-				})
-				// 计算上传大小
-				const sizePromises = files.map(file => {
-					return new Promise<number>((sizeResolve, sizeReject) => {
-						wx.getFileSystemManager().getFileInfo({
-							filePath: file.tempFilePath,
-							success: (res) => sizeResolve(res.size),
-							fail: (err) => sizeReject(err)
-						});
-					});
-				});
-				Promise.all(sizePromises).then(fileSizes => {
-					const totalSize = fileSizes.reduce((acc, size) => acc + size, 0);
-					const uploadTasks: WechatMiniprogram.UploadTask[] = [];
-					let uploadedSize = 0;
-					let lastUploadedSize = 0;
 
+				// 使用 Network.uploadFiles 上传文件
+				try {
+					const tempFileIds = await Network.uploadFiles({
+						mediaList: files.map(file => ({
+							path: file.tempFilePath,
+							size: file.size
+						})),
+						onProgress: (progress) => {
+							that.setData({
+								uploaded: IOSize.formatWithoutUnit(progress.uploaded, 2, Unit.MB),
+								uploadTotal: IOSize.format(progress.total, 2, Unit.MB),
+								uploadSpeed: `${IOSize.format(progress.speed)} / s`,
+								uploadProgress: progress.percent
+							});
+						},
+						showLoading: true
+					});
+
+					// 上传完成转附件
+					const list = await MomentApi.create(tempFileIds);
+					wx.showToast({ title: "上传成功", icon: "success" });
+					const added = list.map((item: any) => {
+						const metadata = (typeof item.metadata === "string" ? JSON.parse(item.metadata) : item.metadata) as PreviewImageMetadata;
+						const thumbURL = `${config.url}/attachment/read/${item.mongoId}`;
+						const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
+						const isImage = item.mimeType?.startsWith("image/");
+						return {
+							id: item.id,
+							type: isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO,
+							thumbURL,
+							sourceURL,
+							checked: false
+						} as Item;
+					});
+					// 前插列表
+					that.data.list.unshift(...added);
 					that.setData({
-						uploadTotal: IOSize.format(totalSize, 2, Unit.MB)
+						list: that.data.list,
+						isUploading: false,
+						uploaded: "0",
+						uploadTotal: "0 MB",
+						uploadProgress: 0
 					});
-
-					// 计算上传速度
-					const speedUpdateInterval = setInterval(() => {
-						const chunkSize = uploadedSize - lastUploadedSize;
-						that.setData({
-							uploadSpeed: `${IOSize.format(chunkSize)} / s`
-						});
-						lastUploadedSize = uploadedSize;
-					}, 1000);
-					// 上传文件
-					const uploadPromises = files.map(file => {
-						return new Promise<string>((uploadResolve, uploadReject) => {
-							const task = wx.uploadFile({
-								url: `${config.url}/temp/file/upload`,
-								filePath: file.tempFilePath,
-								name: "file",
-								success: (resp) => {
-									const result = JSON.parse(resp.data);
-									if (result && result.code === 20000) {
-										// 更新进度
-										const progress = totalSize > 0 ? uploadedSize / totalSize : 1;
-										that.setData({
-											uploadProgress: Math.round(progress * 10000) / 100
-										});
-										uploadResolve(result.data[0].id);
-									} else {
-										uploadReject(new Error(`文件上传失败: ${result?.message || "未知错误"}`));
-									}
-								},
-								fail: (err) => uploadReject(new Error(`文件上传失败: ${err.errMsg}`))
-							});
-							// 监听上传进度事件
-							let prevProgress = 0;
-							task.onProgressUpdate((res) => {
-								const fileUploaded = (res.totalBytesExpectedToSend * res.progress) / 100;
-								const delta = fileUploaded - prevProgress;
-								uploadedSize += delta;
-								// 保存当前进度
-								prevProgress = fileUploaded;
-								// 更新进度条
-								that.setData({
-									uploaded: IOSize.formatWithoutUnit(uploadedSize, 2, Unit.MB),
-									uploadProgress: Math.round((uploadedSize / totalSize) * 10000) / 100
-								});
-							});
-							uploadTasks.push(task);
-						});
-					});
-					Promise.all(uploadPromises).then((tempFileIds) => {
-						wx.showLoading({
-							title: "正在保存..",
-							mask: true
-						})
-						// 清除定时器
-						clearInterval(speedUpdateInterval);
-						uploadTasks.forEach(task => task.offProgressUpdate());
-						that.setData({
-							uploadProgress: 100,
-							uploadSpeed: "0 MB / s"
-						});
-						// 上传完成转附件
-						wx.request({
-							url: `${config.url}/journal/moment/create`,
-							method: "POST",
-							header: {
-								Key: wx.getStorageSync("key")
-							},
-							data: tempFileIds,
-							success: async (resp: any) => {
-								wx.showToast({ title: "上传成功", icon: "success" });
-								const list = resp.data.data;
-								const added = list.map((item: any) => {
-									const extData = JSON.parse(item.ext);
-									return {
-										id: item.id,
-										type: extData.isImage ? ItemType.IMAGE : ItemType.VIDEO,
-										mongoId: item.mongoId,
-										thumbUrl: `${config.url}/attachment/read/${item.mongoId}`,
-										sourceMongoId: extData.sourceMongoId,
-										checked: false
-									} as Item;
-								});
-								// 前插列表
-								that.data.list.unshift(...added);
-								that.setData({
-									list: that.data.list,
-									isUploading: false,
-									uploaded: "0",
-									uploadTotal: "0 MB",
-									uploadProgress: 0
-								});
-								that.updateHasChecked();
-								wx.hideLoading();
-							},
-							fail: handleFail
-						});
-					}).catch((e: Error) => {
-						// 取消所有上传任务
-						uploadTasks.forEach(task => task.abort());
-						that.updateHasChecked();
-						handleFail(e);
-					});
-				}).catch(handleFail);
+					that.updateHasChecked();
+				} catch (error) {
+					handleFail(error);
+				}
 			}
 		})
 	},
@@ -453,27 +360,14 @@ Page({
 		})
 		const openId = await new Promise<string>((resolve, reject) => {
 			wx.login({
-				success: (res) => {
+				success: async (res) => {
 					if (res.code) {
-						wx.request({
-							url: `${config.url}/journal/openid`,
-							method: "POST",
-							header: {
-								Key: wx.getStorageSync("key")
-							},
-							data: {
-								code: res.code
-							},
-							success: (resp) => {
-								const data = resp.data as any;
-								if (data.code === 20000) {
-									resolve(data.data);
-								} else {
-									reject(new Error("获取 openId 失败"));
-								}
-							},
-							fail: () => reject(new Error("获取 openId 请求失败"))
-						});
+						try {
+							const openId = await JournalApi.getOpenId(res.code);
+							resolve(openId);
+						} catch (error) {
+							reject(new Error("获取 openId 失败"));
+						}
 					} else {
 						reject(new Error("获取登录凭证失败"));
 					}
@@ -494,36 +388,23 @@ Page({
 		if (this.data.selectedJournalId) {
 			archiveData.id = this.data.selectedJournalId;
 		}
-		wx.request({
-			url: `${config.url}/journal/moment/archive`,
-			method: "POST",
-			header: {
-				Key: wx.getStorageSync("key")
-			},
-			data: archiveData,
-			success: async (resp: any) => {
-				if (resp.data && resp.data.code === 20000) {
-					Events.emit("JOURNAL_REFRESH");
-					wx.showToast({ title: "归档成功", icon: "success" });
-					this.setData({
-						idea: "",
-						list: [],
-						hasChecked: false,
-						isArchiving: false,
-						selectedJournalId: undefined,
-						isVisibleArchivePopup: false
-					});
-					await Toolkit.sleep(1000);
-					this.fetch();
-				} else {
-					wx.showToast({ title: "归档失败", icon: "error" });
-					this.setData({
-						isArchiving: false
-					});
-				}
-			},
-			fail: handleFail
-		});
+		try {
+			await MomentApi.archive(archiveData);
+			Events.emit("JOURNAL_REFRESH");
+			wx.showToast({ title: "归档成功", icon: "success" });
+			this.setData({
+				idea: "",
+				list: [],
+				hasChecked: false,
+				isArchiving: false,
+				selectedJournalId: undefined,
+				isVisibleArchivePopup: false
+			});
+			await Toolkit.sleep(1000);
+			this.fetch();
+		} catch (error) {
+			handleFail();
+		}
 	},
 	allChecked() {
 		this.data.list.forEach(item => item.checked = true);
@@ -559,27 +440,21 @@ Page({
 			confirmText: "删除已选",
 			confirmColor: "#E64340",
 			cancelText: "取消",
-			success: res => {
+			success: async (res) => {
 				if (res.confirm) {
 					const selected = this.data.list.filter(item => item.checked);
-					wx.request({
-						url: `${config.url}/journal/moment/delete`,
-						method: "POST",
-						header: {
-							Key: wx.getStorageSync("key")
-						},
-						data: selected.map(item => item.id),
-						success: async (resp: any) => {
-							if (resp.data && resp.data.code === 20000) {
-								wx.showToast({ title: "删除成功", icon: "success" });
-								const list = this.data.list.filter(item => !item.checked);
-								this.setData({
-									list
-								});
-								this.updateHasChecked();
-							}
-						},
-					});
+					try {
+						await MomentApi.delete(selected.map(item => item.id));
+						wx.showToast({ title: "删除成功", icon: "success" });
+						const list = this.data.list.filter(item => !item.checked);
+						this.setData({
+							list
+						});
+						this.updateHasChecked();
+					} catch (error) {
+						console.error("删除 moment 失败:", error);
+						wx.showToast({ title: "删除失败", icon: "error" });
+					}
 				}
 			}
 		})

miniprogram/pages/main/moment/index.wxml

@@ -63,8 +63,8 @@
 	<view class="items">
 		<view class="item" wx:for="{{list}}" wx:key="mongoId">
 			<image
-				class="thumbnail {{item.type === 0 ? 'image' : 'video'}}"
-				src="{{item.thumbUrl}}"
+				class="thumbnail {{item.type}}"
+				src="{{item.thumbURL}}"
 				mode="widthFix"
 				bind:tap="preview"
 				data-index="{{index}}"

miniprogram/pages/main/portfolio/index.ts

@@ -5,9 +5,10 @@ import config from "../../../config/index"
 import Events from "../../../utils/Events";
 import Toolkit from "../../../utils/Toolkit";
 import { Journal, JournalPage, JournalPageType } from "../../../types/Journal";
-import { OrderType, QueryPageResult } from "../../../types/Model";
-import { ImageMetadata, MediaAttachExt } from "../../../types/Attachment";
+import { OrderType, } from "../../../types/Model";
+import { PreviewImageMetadata } from "../../../types/Attachment";
 import { MediaItem, MediaItemType } from "../../../types/UI";
+import { JournalApi } from "../../../api/JournalApi";
 
 interface IPortfolioData {
 	page: JournalPage;
@@ -72,79 +73,71 @@ Page({
 			this.setData({ stickyOffset: height });
 		});
 	},
-	fetch() {
+	async fetch() {
 		if (this.data.isFetching || this.data.isFinished) {
 			return;
 		}
 		this.setData({
 			isFetching: true
 		});
-		wx.request({
-			url: `${config.url}/journal/list`,
-			method: "POST",
-			header: {
-				Key: wx.getStorageSync("key")
-			},
-			data: this.data.page,
-			success: async (resp: any) => {
-				const pageResult = resp.data.data as QueryPageResult<Journal>;
-				const list = pageResult.list;
-				if (!list || list.length === 0) {
-					this.setData({
-						isFinished: true
-					})
-					return;
-				}
-				list.forEach(journal => {
-					const mediaItems = journal.items!.filter((item) => item.attachType === "THUMB").map((thumbItem, index) => {
-						const metadata = thumbItem.metadata as ImageMetadata;
-						const ext = thumbItem.ext = JSON.parse(thumbItem.ext!.toString()) as MediaAttachExt;
-						const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
-						const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`;
-						return {
-							type: ext.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
-							thumbURL,
-							sourceURL,
-							size: thumbItem.size || 0,
-							attachmentId: thumbItem.id,
-							width: metadata.width,
-							height: metadata.height,
-							originalIndex: index
-						} as MediaItem;
-					});
-					journal.date = Time.toDate(journal.createdAt);
-					journal.time = Time.toTime(journal.createdAt);
-					journal.datetime = Time.toPassedDateTime(journal.createdAt);
-					journal.mediaItems = mediaItems;
-					journal.columnedItems = Toolkit.splitItemsIntoColumns(mediaItems, 3, (item) => {
-						if (item.width && item.height && 0 < item.width) {
-							return item.height / item.width;
-						}
-						return 1;
-					})
-				})
-				this.setData({
-					page: {
-						index: this.data.page.index + 1,
-						size: 8,
-						type: JournalPageType.NORMAL,
-						equalsExample: {
-							type: "PORTFOLIO"
-						},
-						orderMap: {
-							createdAt: OrderType.DESC
-						}
-					},
-					list: this.data.list.concat(list),
-					isFinished: list.length < this.data.page.size
-				});
-			},
-			complete: () => {
+		try {
+			const pageResult = await JournalApi.getList(this.data.page);
+			const list = pageResult.list;
+			if (!list || list.length === 0) {
 				this.setData({
+					isFinished: true,
 					isFetching: false
-				});
+				})
+				return;
 			}
-		});
+			list.forEach(journal => {
+				const mediaItems = journal.items!.filter((item) => item.attachType === "THUMB").map((thumbItem, index) => {
+					const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
+					const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
+					const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
+					const isVideo = metadata.sourceMimeType?.startsWith("video/");
+					return {
+						type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
+						thumbURL,
+						sourceURL,
+						size: thumbItem.size || 0,
+						attachmentId: thumbItem.id,
+						width: metadata.width,
+						height: metadata.height,
+						originalIndex: index
+					} as MediaItem;
+				});
+				journal.date = Time.toDate(journal.createdAt);
+				journal.time = Time.toTime(journal.createdAt);
+				journal.datetime = Time.toPassedDateTime(journal.createdAt);
+				journal.mediaItems = mediaItems;
+				journal.columnedItems = Toolkit.splitItemsIntoColumns(mediaItems, 3, (item) => {
+					if (item.width && item.height && 0 < item.width) {
+						return item.height / item.width;
+					}
+					return 1;
+				})
+			})
+			this.setData({
+				page: {
+					index: this.data.page.index + 1,
+					size: 8,
+					type: JournalPageType.NORMAL,
+					equalsExample: {
+						type: "PORTFOLIO"
+					},
+					orderMap: {
+						createdAt: OrderType.DESC
+					}
+				},
+				list: this.data.list.concat(list),
+				isFinished: list.length < this.data.page.size,
+				isFetching: false
+			});
+		} catch (error) {
+			console.error("加载 portfolio 列表失败:", error);
+			this.setData({ isFetching: false });
+		}
 	},
 	preview(e: WechatMiniprogram.BaseEvent) {
 		const { journalIndex, itemIndex } = e.currentTarget.dataset;

miniprogram/pages/main/portfolio/index.wxml

@@ -18,7 +18,7 @@
 				<view wx:for="{{journal.columnedItems}}" wx:for-item="column" wx:for-index="columnIndex" wx:key="columnIndex" class="column">
 					<block wx:for="{{column}}" wx:for-item="item" wx:for-index="itemIndex" wx:key="attachmentId">
 						<image
-							class="item thumbnail {{item.type === 0 ? 'image' : 'video'}}"
+							class="item thumbnail {{item.type.toLowerCase()}}"
 							src="{{item.thumbURL}}"
 							mode="widthFix"
 							bindtap="preview"

miniprogram/pages/main/travel-detail/index.less

@@ -40,12 +40,57 @@
 
 			&.locations {
 
-				.action {
-					gap: 32rpx;
-					display: flex;
+				.header {
+					padding: 16rpx 32rpx;
+
+					.left-actions {
+						gap: 16rpx;
+						display: flex;
+						align-items: center;
+
+						.type-picker {
+
+							.picker-button {
+								gap: 8rpx;
+								color: var(--theme-wx);
+								border: 1px solid var(--theme-wx);
+								display: flex;
+								padding: 14rpx 24rpx 14rpx 32rpx;
+								font-size: 26rpx;
+								background: var(--theme-bg-card);
+								align-items: center;
+								border-radius: 16rpx;
+							}
+						}
+					}
 				}
 
 				.location {
+					.thumb {
+						width: 96rpx;
+						height: 96rpx;
+						border: 1px solid var(--theme-border-light);
+						overflow: hidden;
+						background: var(--theme-bg-page);
+						flex-shrink: 0;
+						border-radius: 16rpx;
+					}
+
+					.thumb-img {
+						width: 100%;
+						height: 100%;
+					}
+
+					.thumb-placeholder {
+						color: var(--theme-text-secondary);
+						width: 100%;
+						height: 100%;
+						display: flex;
+						font-size: 24rpx;
+						background: var(--theme-bg-page);
+						align-items: center;
+						justify-content: center;
+					}
 
 					.note {
 						width: 2em;

miniprogram/pages/main/travel-detail/index.ts

@@ -3,17 +3,23 @@
 import Time from "../../../utils/Time";
 import { TravelApi } from "../../../api/TravelApi";
 import { TravelLocationApi } from "../../../api/TravelLocationApi";
-import { Travel, TravelStatusLabel, TravelStatusIcon, TransportationTypeLabel, TravelLocation, TravelLocationTypeLabel, TravelLocationTypeIcon } from "../../../types/Travel";
+import config from "../../../config/index";
+import { Travel, TravelStatusLabel, TravelStatusIcon, TransportationTypeLabel, TravelLocation, TravelLocationTypeLabel, TravelLocationTypeIcon, TransportationTypeIcon, TravelLocationType } from "../../../types/Travel";
+
+interface TravelLocationView extends TravelLocation {
+	/** 预览图 */
+	previewThumb?: string;
+}
 
 interface TravelDetailData {
-	/** 旅行详情 */
+	/** 出行详情 */
 	travel: Travel | null;
-	/** 旅行 ID */
+	/** 出行 ID */
 	travelId: string;
 	/** 是否正在加载 */
 	isLoading: boolean;
 	/** 地点列表 */
-	locations: TravelLocation[];
+	locations: TravelLocationView[];
 	/** 是否正在加载地点 */
 	isLoadingLocations: boolean;
 	/** 状态标签映射 */
@@ -22,10 +28,16 @@ interface TravelDetailData {
 	statusIcons: typeof TravelStatusIcon;
 	/** 交通类型标签映射 */
 	transportLabels: typeof TransportationTypeLabel;
+	/** 交通类型图标映射 */
+	transportIcons: typeof TransportationTypeIcon;
 	/** 地点类型标签映射 */
 	locationTypeLabels: typeof TravelLocationTypeLabel;
 	/** 地点类型图标映射 */
 	locationTypeIcons: typeof TravelLocationTypeIcon;
+	/** 地点类型选项 */
+	locationTypes: string[];
+	/** 选中的地点类型索引 */
+	selectedLocationTypeIndex: number;
 	/** 删除对话框可见性 */
 	deleteDialogVisible: boolean;
 	/** 删除确认文本 */
@@ -42,8 +54,11 @@ Page({
 		statusLabels: TravelStatusLabel,
 		statusIcons: TravelStatusIcon,
 		transportLabels: TransportationTypeLabel,
+		transportIcons: TransportationTypeIcon,
 		locationTypeLabels: TravelLocationTypeLabel,
 		locationTypeIcons: TravelLocationTypeIcon,
+		locationTypes: ["全部", ...Object.values(TravelLocationTypeLabel)],
+		selectedLocationTypeIndex: 0,
 		deleteDialogVisible: false,
 		deleteConfirmText: ""
 	},
@@ -71,7 +86,7 @@ Page({
 		}
 	},
 
-	/** 获取旅行详情 */
+	/** 获取出行详情 */
 	async fetchDetail(id: string) {
 		this.setData({ isLoading: true });
 
@@ -88,7 +103,7 @@ Page({
 			// 获取地点列表
 			this.fetchLocations(id);
 		} catch (error) {
-			console.error("获取旅行详情失败:", error);
+			console.error("获取出行详情失败:", error);
 			wx.showToast({
 				title: "加载失败",
 				icon: "error"
@@ -106,15 +121,39 @@ Page({
 		this.setData({ isLoadingLocations: true });
 
 		try {
+			const { selectedLocationTypeIndex, locationTypes } = this.data;
+
+			// 构建查询条件
+			const equalsExample: { [key: string]: number | string } = {
+				travelId: Number(travelId)
+			};
+
+			// 添加类型过滤（索引 0 表示"全部"）
+			if (0 < selectedLocationTypeIndex) {
+				const selectedTypeLabel = locationTypes[selectedLocationTypeIndex];
+				const selectedType = Object.keys(TravelLocationTypeLabel).find(
+					key => TravelLocationTypeLabel[key as TravelLocationType] === selectedTypeLabel
+				) as TravelLocationType | undefined;
+
+				if (selectedType) {
+					equalsExample.type = selectedType;
+				}
+			}
+
 			const result = await TravelLocationApi.getList({
 				index: 0,
-				size: 100,
-				equalsExample: {
-					travelId: Number(travelId)
-				}
+				size: 999,
+				equalsExample
 			});
 
-			this.setData({ locations: result.list });
+			const locations = result.list.map((location) => {
+				const previewItem = location.items && 0 < location.items.length ? location.items[0] : undefined;
+				return {
+					...location,
+					previewThumb: previewItem ? `${config.url}/attachment/read/${previewItem.mongoId}` : undefined
+				};
+			});
+			this.setData({ locations });
 		} catch (error) {
 			console.error("获取地点列表失败:", error);
 		} finally {
@@ -122,7 +161,15 @@ Page({
 		}
 	},
 
-	/** 编辑旅行 */
+	/** 地点类型改变 */
+	onLocationTypeChange(e: WechatMiniprogram.PickerChange) {
+		const index = Number(e.detail.value);
+		this.setData({ selectedLocationTypeIndex: index });
+		// 重新从接口获取过滤后的数据
+		this.fetchLocations(this.data.travelId);
+	},
+
+	/** 编辑出行 */
 	toEdit() {
 		const { travel } = this.data;
 		if (travel && travel.id) {
@@ -163,7 +210,7 @@ Page({
 		}
 	},
 
-	/** 删除旅行 */
+	/** 删除出行 */
 	deleteTravel() {
 		this.setData({
 			deleteDialogVisible: true,

miniprogram/pages/main/travel-detail/index.wxml

@@ -1,6 +1,6 @@
 <!--pages/main/travel-detail/index.wxml-->
 <view class="custom-navbar">
-	<t-navbar title="旅行详情" leftArrow bind:go-back="goBack">
+	<t-navbar title="出行详情" leftArrow bind:go-back="goBack">
 		<view slot="right" class="edit-btn" bind:tap="toEdit">
 			<t-icon name="edit" size="24px" />
 		</view>
@@ -24,7 +24,7 @@
 			</t-tag>
 		</view>
 		<!-- 标题 -->
-		<view class="section title">{{travel.title || '未命名旅行'}}</view>
+		<view class="section title">{{travel.title || '未命名出行'}}</view>
 		<!-- 基本信息 -->
 		<t-cell-group class="section info">
 			<view slot="title" class="title">基本信息</view>
@@ -34,28 +34,34 @@
 					<text wx:else class="undecided-value">未定</text>
 				</view>
 			</t-cell>
-			<t-cell left-icon="calendar" title="旅行天数">
+			<t-cell left-icon="calendar" title="出行天数">
 				<view slot="note">
 					<text wx:if="{{travel.days}}">{{travel.days}} 天</text>
 					<text wx:else class="undecided-value">未定</text>
 				</view>
 			</t-cell>
-			<t-cell left-icon="{{travel.transportationType === 'PLANE' ? 'flight-takeoff' : travel.transportationType === 'TRAIN' ? 'map-route' : travel.transportationType === 'SELF_DRIVING' ? 'control-platform' : 'location'}}" title="交通方式">
+			<t-cell left-icon="{{transportIcons[travel.transportationType]}}" title="交通方式">
 				<view slot="note">{{transportLabels[travel.transportationType]}}</view>
 			</t-cell>
 		</t-cell-group>
-		<!-- 旅行内容 -->
-		<t-cell-group class="section">
+		<!-- 出行内容 -->
+		<t-cell-group wx:if="{{travel.content}}" class="section">
 			<view slot="title" class="title">详细说明</view>
 			<t-cell title="{{travel.content}}" />
 		</t-cell-group>
 		<t-cell-group class="section locations">
 			<view slot="title" class="title">地点列表</view>
-			<t-cell>
-				<view slot="right-icon" class="action">
-					<t-icon name="map" size="20px" color="var(--theme-wx)" bind:tap="toMap" />
-					<t-icon name="add" size="20px" color="var(--theme-wx)" bind:tap="toAddLocation" />
+			<t-cell class="header">
+				<view slot="left-icon" class="left-actions">
+					<t-button theme="primary" icon="map" size="small" bind:tap="toMap">地图浏览</t-button>
+					<picker class="type-picker" mode="selector" range="{{locationTypes}}" value="{{selectedLocationTypeIndex}}" bind:change="onLocationTypeChange">
+						<view class="picker-button">
+							<text>{{locationTypes[selectedLocationTypeIndex]}}</text>
+							<t-icon class="icon" name="chevron-down" size="16px" />
+						</view>
+					</picker>
 				</view>
+				<t-icon slot="right-icon" name="add" size="20px" color="var(--theme-wx)" bind:tap="toAddLocation" />
 			</t-cell>
 			<t-cell wx:if="{{isLoadingLocations}}" class="loading">
 				<t-loading slot="title" theme="dots" size="40rpx" />
@@ -65,22 +71,31 @@
 					class="location"
 					wx:for="{{locations}}"
 					wx:key="id"
-					left-icon="{{locationTypeIcons[item.type]}}"
 					title="{{item.title || '未命名地点'}}"
 					bind:tap="toLocationDetail"
 					data-id="{{item.id}}"
 					arrow
 				>
+					<view slot="left-icon" class="thumb">
+						<image wx:if="{{item.previewThumb}}" class="thumb-img" src="{{item.previewThumb}}" mode="aspectFill" />
+						<view wx:else class="thumb-placeholder">
+							<t-icon name="{{locationTypeIcons[item.type]}}" size="28px" color="var(--theme-wx)" />
+						</view>
+					</view>
 					<view slot="note" class="note">{{locationTypeLabels[item.type]}}</view>
 					<view slot="description" class="description">
-						<view wx:if="{{item.amount}}" class="item">
-							<t-icon name="money" size="14px" />
-							<text>¥{{item.amount}}</text>
-						</view>
 						<view wx:if="{{item.requireIdCard}}" class="item">
 							<t-icon name="user" size="14px" />
 							<text>需要身份证</text>
 						</view>
+						<view wx:if="{{item.requireAppointment}}" class="item">
+							<t-icon name="user" size="14px" />
+							<text>需要预约</text>
+						</view>
+						<view wx:if="{{item.amount}}" class="item">
+							<t-icon name="money" size="14px" />
+							<text>¥{{item.amount}}</text>
+						</view>
 						<view wx:if="{{item.importance}}" class="item">
 							<t-icon name="chart-bubble" size="14px" />
 							<text>重要程度</text>
@@ -97,6 +112,7 @@
 					</view>
 				</t-cell>
 			</block>
+			<t-cell wx:else class="empty-state" description="暂无地点信息" />
 		</t-cell-group>
 		<!-- 操作按钮 -->
 		<view class="section action">
@@ -117,7 +133,7 @@
 				t-class="edit"
 				bind:tap="toEdit"
 			>
-				编辑旅行计划
+				编辑出行计划
 			</t-button>
 		</view>
 	</view>
@@ -126,7 +142,7 @@
 <!-- 删除确认对话框 -->
 <t-dialog
 	visible="{{deleteDialogVisible}}"
-	title="删除旅行计划"
+	title="删除出行计划"
 	confirm-btn="{{ {content: '删除', variant: 'text', theme: 'danger'} }}"
 	cancel-btn="取消"
 	bind:confirm="confirmDelete"

miniprogram/pages/main/travel-editor/index.less

@@ -1,9 +1,8 @@
 // pages/main/travel-editor/index.less
 
-.container {
+.travel-editor {
 	width: 100vw;
 	min-height: 100vh;
-	background: var(--theme-bg-secondary);
 
 	.content {
 		padding-bottom: 64rpx;
@@ -24,12 +23,23 @@
 		.section {
 			margin-top: 48rpx;
 
+			> .title {
+				color: var(--theme-text-secondary);
+				padding: 0 32rpx;
+				font-size: 28rpx;
+				line-height: 64rpx;
+			}
+
 			.picker .slot {
 				gap: 16rpx;
 				display: flex;
 				align-items: center;
 			}
 
+			.note {
+				color: var(--theme-text-primary);
+			}
+
 			.travel-at-content,
 			.days-content {
 				gap: 16rpx;
@@ -55,9 +65,16 @@
 				}
 			}
 
-			.days-stepper {
-				display: flex;
-				align-items: center;
+			.days {
+
+				&.decided {
+					--td-cell-vertical-padding: 24rpx;
+
+					.t-cell__title {
+						display: flex;
+						align-items: center;
+					}
+				}
 			}
 		}
 

miniprogram/pages/main/travel-editor/index.ts

@@ -7,7 +7,7 @@ import { TravelStatus, TransportationType } from "../../../types/Travel";
 interface TravelEditorData {
 	/** 模式：create 或 edit */
 	mode: "create" | "edit";
-	/** 旅行 ID（编辑模式） */
+	/** 出行 ID（编辑模式） */
 	id?: number;
 	/** 标题 */
 	title: string;
@@ -105,7 +105,7 @@ Page({
 			});
 		}
 	},
-	/** 加载旅行详情（编辑模式） */
+	/** 加载出行详情（编辑模式） */
 	async loadTravelDetail(id: number) {
 		wx.showLoading({ title: "加载中...", mask: true });
 		try {
@@ -230,7 +230,7 @@ Page({
 			this.updateTravel();
 		}
 	},
-	/** 创建旅行 */
+	/** 创建出行 */
 	async createTravel() {
 		this.setData({ isSaving: true });
 
@@ -238,9 +238,7 @@ Page({
 			await TravelApi.create({
 				title: this.data.title.trim(),
 				content: this.data.content.trim(),
-				travelAt: this.data.travelAtUndecided
-					? null
-					: new Date(`${this.data.date}T${this.data.time}:00`).getTime(),
+				travelAt: this.data.travelAtUndecided ? null : Time.now(),
 				days: this.data.daysUndecided ? null : this.data.days,
 				transportationType: this.data.transportationType,
 				status: this.data.status
@@ -256,7 +254,7 @@ Page({
 			this.setData({ isSaving: false });
 		}
 	},
-	/** 更新旅行 */
+	/** 更新出行 */
 	async updateTravel() {
 		this.setData({ isSaving: true });
 		try {
@@ -283,7 +281,7 @@ Page({
 			this.setData({ isSaving: false });
 		}
 	},
-	/** 删除旅行 */
+	/** 删除出行 */
 	deleteTravel() {
 		this.setData({
 			deleteDialogVisible: true,

miniprogram/pages/main/travel-editor/index.wxml

@@ -1,9 +1,9 @@
 <!--pages/main/travel-editor/index.wxml-->
-<t-navbar title="{{mode === 'create' ? '新建旅行' : '编辑旅行'}}">
+<t-navbar title="{{mode === 'create' ? '新建出行' : '编辑出行'}}">
 	<text slot="left" bindtap="cancel">取消</text>
 </t-navbar>
 
-<scroll-view class="container" type="custom" scroll-y show-scrollbar="{{false}}">
+<scroll-view class="travel-editor setting-bg" type="custom" scroll-y show-scrollbar="{{false}}">
 	<view class="content">
 		<view wx:if="{{isLoading}}" class="loading">
 			<t-loading theme="dots" size="40rpx" />
@@ -11,12 +11,12 @@
 		</view>
 		<block wx:else>
 			<t-cell-group class="section">
+				<view slot="title" class="title">基本信息</view>
 				<t-input
 					class="input"
-					placeholder="请输入旅行标题"
+					placeholder="请输入出行标题"
 					model:value="{{title}}"
 					maxlength="50"
-					borderless
 				>
 					<text slot="label">标题</text>
 				</t-input>
@@ -31,6 +31,7 @@
 				</t-textarea>
 			</t-cell-group>
 			<t-cell-group class="section">
+				<view slot="title" class="title">详细信息</view>
 				<t-cell class="travel-at" title="出行时间">
 					<view slot="right-icon" class="travel-at-content">
 						<picker wx:if="{{!travelAtUndecided}}" class="picker" mode="date" model:value="{{date}}">
@@ -51,13 +52,13 @@
 						/>
 					</view>
 				</t-cell>
-				<t-cell title="旅行天数" t-class="days-cell">
+				<t-cell title="出行天数" class="days {{daysUndecided ? 'undecided' : 'decided'}}">
 					<view slot="right-icon" class="days-content">
 						<t-stepper
 							wx:if="{{!daysUndecided}}"
 							theme="filled"
 							model:value="{{days}}"
-							size="medium"
+							size="large"
 							min="{{1}}"
 							max="{{999}}"
 							t-class="stepper"
@@ -74,40 +75,28 @@
 						/>
 					</view>
 				</t-cell>
-				<t-cell title="交通方式">
-					<view slot="right-icon">
-						<picker
-							class="picker"
-							mode="selector"
-							range="{{transportationTypes}}"
-							range-key="label"
-							value="{{transportationTypeIndex}}"
-							bindchange="onChangeTransportationType"
-						>
-							<view class="slot">
-								<text>{{transportationTypes[transportationTypeIndex].label}}</text>
-								<t-icon name="chevron-right" size="20px" class="icon" />
-							</view>
-						</picker>
-					</view>
-				</t-cell>
-				<t-cell title="状态">
-					<view slot="right-icon">
-						<picker
-							class="picker"
-							mode="selector"
-							range="{{statuses}}"
-							range-key="label"
-							value="{{statusIndex}}"
-							bindchange="onChangeStatus"
-						>
-							<view class="slot">
-								<text>{{statuses[statusIndex].label}}</text>
-								<t-icon name="chevron-right" size="20px" class="icon" />
-							</view>
-						</picker>
-					</view>
-				</t-cell>
+				<picker
+					mode="selector"
+					range="{{transportationTypes}}"
+					range-key="label"
+					value="{{transportationTypeIndex}}"
+					bindchange="onChangeTransportationType"
+				>
+					<t-cell title="交通方式" arrow>
+						<view slot="note" class="note">{{transportationTypes[transportationTypeIndex].label}}</view>
+					</t-cell>
+				</picker>
+				<picker
+					mode="selector"
+					range="{{statuses}}"
+					range-key="label"
+					value="{{statusIndex}}"
+					bindchange="onChangeStatus"
+				>
+					<t-cell title="状态" arrow>
+						<view slot="note" class="note">{{statuses[statusIndex].label}}</view>
+					</t-cell>
+				</picker>
 			</t-cell-group>
 			<view wx:if="{{mode === 'create'}}" class="submit-section">
 				<t-button
@@ -117,7 +106,7 @@
 					bind:tap="submit"
 					disabled="{{isSaving}}"
 				>
-					创建旅行
+					创建出行
 				</t-button>
 			</view>
 			<view wx:else class="submit-section horizontal">
@@ -148,7 +137,7 @@
 <!-- 删除确认对话框 -->
 <t-dialog
 	visible="{{deleteDialogVisible}}"
-	title="删除旅行计划"
+	title="删除出行计划"
 	confirm-btn="{{ {content: '删除', variant: 'text', theme: 'danger'} }}"
 	cancel-btn="取消"
 	bind:confirm="confirmDelete"

miniprogram/pages/main/travel-location-detail/index.json

@@ -1,7 +1,6 @@
 {
 	"component": true,
 	"usingComponents": {
-		"t-tag": "tdesign-miniprogram/tag/tag",
 		"t-cell": "tdesign-miniprogram/cell/cell",
 		"t-rate": "tdesign-miniprogram/rate/rate",
 		"t-icon": "tdesign-miniprogram/icon/icon",

miniprogram/pages/main/travel-location-detail/index.less

@@ -2,7 +2,6 @@
 .travel-location-detail {
 	width: 100vw;
 	min-height: 100vh;
-	background: var(--theme-bg-page);
 	box-sizing: border-box;
 
 	.status-card {
@@ -25,12 +24,6 @@
 				line-height: 64rpx;
 			}
 
-			&.status {
-				display: flex;
-				margin-top: 24rpx;
-				justify-content: center;
-			}
-
 			&.title {
 				color: var(--theme-text-primary);
 				padding: 24rpx;
@@ -62,11 +55,24 @@
 
 				.map {
 					padding: 0;
-				}
 
-				.mini-map {
-					width: 100%;
-					height: 520rpx;
+					.instance {
+						width: 100%;
+						height: 520rpx;
+
+						.marker {
+							width: calc(var(--title-length) * 28rpx);
+							color: var(--theme-text-primary);
+							padding: 8rpx;
+							overflow: hidden;
+							font-size: 28rpx;
+							background: var(--theme-bg-card);
+							box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, .15);
+							white-space: nowrap;
+							border-radius: 8rpx;
+							text-overflow: ellipsis;
+						}
+					}
 				}
 			}
 
@@ -78,11 +84,10 @@
 					grid-template-columns: repeat(3, 1fr);
 
 					.media-item {
-						width: 100%;
-						height: 200rpx;
+						width: 220rpx;
+						height: 220rpx;
 						overflow: hidden;
 						position: relative;
-						border-radius: 12rpx;
 
 						.thumbnail {
 							width: 100%;
@@ -113,12 +118,13 @@
 
 			&.navigate {
 				padding: 0 16rpx;
+				margin-top: 90rpx;
 			}
 
 			&.action {
 				gap: 24rpx;
 				display: flex;
-				padding: 24rpx 16rpx 0 16rpx;
+				padding: 0 16rpx;
 
 				.edit {
 					flex: 2;

miniprogram/pages/main/travel-location-detail/index.ts

@@ -1,18 +1,13 @@
 // pages/main/travel-location-detail/index.ts
 
-import Time from "../../../utils/Time";
 import config from "../../../config/index";
 import { TravelLocationApi } from "../../../api/TravelLocationApi";
 import { TravelLocation, TravelLocationTypeIcon, TravelLocationTypeLabel } from "../../../types/Travel";
-import { MediaAttachExt, MediaAttachType } from "../../../types/Attachment";
-import { MediaItem, MediaItemType } from "../../../types/UI";
+import { MediaAttachType, PreviewImageMetadata } from "../../../types/Attachment";
+import { MapMarker, MediaItem, MediaItemType } from "../../../types/UI";
 import Toolkit from "../../../utils/Toolkit";
 
 interface TravelLocationView extends TravelLocation {
-	/** 首次出行时间 */
-	firstTravelTime?: string;
-	/** 最近出行时间 */
-	lastTravelTime?: string;
 	/** 媒体列表 */
 	mediaItems?: MediaItem[];
 }
@@ -22,7 +17,7 @@ interface TravelLocationDetailData {
 	location: TravelLocationView | null;
 	/** 地点 ID */
 	locationId: string;
-	/** 旅行 ID */
+	/** 出行 ID */
 	travelId: string;
 	/** 是否正在加载 */
 	isLoading: boolean;
@@ -35,7 +30,7 @@ interface TravelLocationDetailData {
 	/** 媒体类型枚举 */
 	mediaItemTypeEnum: typeof MediaItemType;
 	/** 地图标记 */
-	mapMarkers: WechatMiniprogram.MapMarker[];
+	mapMarkers: MapMarker[];
 	/** 删除对话框可见性 */
 	deleteDialogVisible: boolean;
 	/** 删除确认文本 */
@@ -100,55 +95,42 @@ Page({
 
 			thumbItems.forEach((thumbItem) => {
 				try {
-					const extStr = thumbItem.ext ? thumbItem.ext.toString() : "";
-					if (!extStr) {
-						return;
-					}
-					const ext = JSON.parse(extStr) as MediaAttachExt;
+					const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
 					const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
-					const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`;
+					const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
+					const isVideo = metadata.sourceMimeType?.startsWith("video/");
 					mediaItems.push({
-						type: ext.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
+						type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
 						thumbURL,
 						sourceURL,
 						size: thumbItem.size || 0,
 						attachmentId: thumbItem.id!
 					});
 				} catch (parseError) {
-					console.warn("解析附件扩展信息失败", parseError);
+					console.warn("解析附件元数据失败", parseError);
 				}
 			});
 
 			// 构建地图标记
-			const mapMarkers: WechatMiniprogram.MapMarker[] = [];
+			const mapMarkers: MapMarker[] = [];
 			if (location.lat !== undefined && location.lng !== undefined) {
 				mapMarkers.push({
 					id: 0,
 					latitude: location.lat,
 					longitude: location.lng,
-					width: 30,
+					width: 24,
 					height: 30,
-					callout: {
-						content: location.title || "地点",
-						display: "ALWAYS",
-						padding: 10,
-						borderRadius: 5,
-						bgColor: "#FFFFFF",
-						color: "#333333",
-						fontSize: 12,
-						textAlign: "center"
+					customCallout: {
+						anchorY: -2,
+						anchorX: 0,
+						display: "ALWAYS"
 					}
 				});
 			}
-
-			console.log(mediaItems);
-			
 			this.setData({
 				location: {
 					...location,
-					mediaItems,
-					firstTravelTime: location.firstTraveledAt ? Time.toDateTime(location.firstTraveledAt) : "",
-					lastTravelTime: location.lastTraveledAt ? Time.toDateTime(location.lastTraveledAt) : ""
+					mediaItems
 				},
 				travelId: location.travelId ? String(location.travelId) : this.data.travelId,
 				mapMarkers
@@ -214,7 +196,7 @@ Page({
 
 		const sources = location.mediaItems.map(item => ({
 			url: item.sourceURL,
-			type: MediaItemType[item.type].toLowerCase()
+			type: item.type
 		}));
 
 		const total = sources.length;

miniprogram/pages/main/travel-location-detail/index.wxml

@@ -20,12 +20,6 @@
 		<t-empty icon="location" description="暂无地点信息" />
 	</view>
 	<view wx:else class="content">
-		<!-- 类型标签 -->
-		<view class="section status">
-			<t-tag size="large" theme="primary" variant="light" icon="{{locationTypeIcons[location.type]}}">
-				{{locationTypeLabels[location.type]}}
-			</t-tag>
-		</view>
 		<!-- 标题 -->
 		<view class="section title">
 			<text class="title-text">{{location.title || '未命名地点'}}</text>
@@ -33,16 +27,27 @@
 		<!-- 位置信息 -->
 		<t-cell-group wx:if="{{location.lat !== undefined && location.lng !== undefined}}" class="section location">
 			<view slot="title" class="title">位置信息</view>
+			<t-cell
+				left-icon="{{locationTypeIcons[location.type]}}"
+				title="类型"
+				note="{{locationTypeLabels[location.type]}}"
+			/>
 			<t-cell class="map">
 				<map
 					slot="description"
-					class="mini-map"
+					class="instance"
 					latitude="{{location.lat}}"
 					longitude="{{location.lng}}"
 					markers="{{mapMarkers}}"
 					scale="15"
 					show-location
-				></map>
+				>
+					<cover-view slot="callout">
+						<cover-view class="marker" marker-id="0" style="--title-length: {{location.title.length}}">
+							{{location.title || '地点'}}
+						</cover-view>
+					</cover-view>
+				</map>
 			</t-cell>
 			<t-cell
 				left-icon="location"
@@ -57,13 +62,13 @@
 			<t-cell wx:if="{{location.amount !== undefined && location.amount !== null}}" left-icon="money" title="费用">
 				<view slot="note">¥{{location.amount}}</view>
 			</t-cell>
-			<t-cell left-icon="verify" title="需要身份证">
+			<t-cell left-icon="verify" title="身份证">
 				<view slot="note" class="{{location.requireIdCard ? 'red' : ''}}">
 					{{location.requireIdCard ? '需要' : '无需'}}
 				</view>
 			</t-cell>
-			<t-cell left-icon="calendar" title="需要预约">
-				<view slot="note" class="{{location.requireAppointment ? 'warning' : ''}}">
+			<t-cell left-icon="calendar" title="预约">
+				<view slot="note" class="{{location.requireAppointment ? 'red' : ''}}">
 					{{location.requireAppointment ? '需要' : '无需'}}
 				</view>
 			</t-cell>
@@ -78,19 +83,6 @@
 				</view>
 			</t-cell>
 		</t-cell-group>
-		<!-- 出行记录 -->
-		<t-cell-group class="section">
-			<view slot="title" class="title">出行记录</view>
-			<t-cell left-icon="flag" title="首次出行">
-				<view slot="note">{{location.firstTravelTime || '未记录'}}</view>
-			</t-cell>
-			<t-cell left-icon="calendar-1" title="最近出行">
-				<view slot="note">{{location.lastTravelTime || '未记录'}}</view>
-			</t-cell>
-			<t-cell left-icon="chart" title="累计次数">
-				<view slot="note">{{location.travelCount || 0}} 次</view>
-			</t-cell>
-		</t-cell-group>
 		<!-- 详细说明 -->
 		<t-cell-group wx:if="{{location.description}}" class="section">
 			<view slot="title" class="title">详细说明</view>
@@ -98,9 +90,9 @@
 		</t-cell-group>
 		<!-- 照片/视频 -->
 		<t-cell-group wx:if="{{location.mediaItems && 0 < location.mediaItems.length}}" class="section media">
-			<view slot="title" class="title">照片/视频</view>
+			<view slot="title" class="title">照片视频</view>
 			<t-cell>
-				<view class="media-grid">
+				<view slot="title" class="media-grid">
 					<view
 						wx:for="{{location.mediaItems}}"
 						wx:key="attachmentId"

miniprogram/pages/main/travel-location-editor/index.json

@@ -7,13 +7,11 @@
 		"t-input": "tdesign-miniprogram/input/input",
 		"t-button": "tdesign-miniprogram/button/button",
 		"t-dialog": "tdesign-miniprogram/dialog/dialog",
-		"t-picker": "tdesign-miniprogram/picker/picker",
 		"t-navbar": "tdesign-miniprogram/navbar/navbar",
 		"t-loading": "tdesign-miniprogram/loading/loading",
 		"t-stepper": "tdesign-miniprogram/stepper/stepper",
 		"t-textarea": "tdesign-miniprogram/textarea/textarea",
-		"t-cell-group": "tdesign-miniprogram/cell-group/cell-group",
-		"t-picker-item": "tdesign-miniprogram/picker-item/picker-item"
+		"t-cell-group": "tdesign-miniprogram/cell-group/cell-group"
 	},
 	"styleIsolation": "shared"
 }

miniprogram/pages/main/travel-location-editor/index.less

@@ -3,7 +3,6 @@
 .travel-location-editor {
 	width: 100vw;
 	min-height: 100vh;
-	background: var(--theme-bg-secondary);
 
 	.content {
 		padding-bottom: 64rpx;
@@ -24,6 +23,34 @@
 		.section {
 			margin-top: 48rpx;
 
+			.rate-cell {
+
+				&.decided {
+
+					.rate {
+						display: block;
+						gap: 16rpx;
+						display: flex;
+						align-items: center;
+					}
+					
+					.text {
+						display: none;
+					}
+				}
+
+				&.undecided {
+
+					.rate {
+						display: none;
+					}
+					
+					.text {
+						display: block;
+					}
+				}
+			}
+
 			> .title {
 				color: var(--theme-text-secondary);
 				padding: 0 32rpx;
@@ -31,17 +58,18 @@
 				line-height: 64rpx;
 			}
 
-			.location {
+			&.location {
 
-				.title {
-					width: 2em;
+				.note {
+					color: var(--theme-text-primary);
 				}
-			}
 
-			.picker .slot {
-				gap: 16rpx;
-				display: flex;
-				align-items: center;
+				.value {
+
+					.title {
+						width: 2em;
+					}
+				}
 			}
 
 			&.media {
@@ -53,8 +81,8 @@
 					grid-template-columns: repeat(3, 1fr);
 
 					.item {
-						width: 240rpx;
-						height: 240rpx;
+						width: 220rpx;
+						height: 220rpx;
 						position: relative;
 						overflow: hidden;
 						background: var(--theme-bg-card);
@@ -128,103 +156,36 @@
 					}
 				}
 			}
-		}
 
-		.media-section {
-			margin-top: 48rpx;
-			padding: 32rpx;
-			background: var(--theme-bg-card);
+			&.upload {
+				gap: 16rpx;
+				display: flex;
+				padding: 24rpx 32rpx;
+				margin-top: 24rpx;
+				align-items: center;
+				border-radius: 12rpx;
+				background: var(--theme-bg-card);
 
-			.section-title {
-				color: var(--theme-text-primary);
-				margin-bottom: 24rpx;
-				font-size: 32rpx;
-				font-weight: bold;
+				.text {
+					color: var(--theme-text-secondary);
+					font-size: 28rpx;
+				}
 			}
 
-			.media-grid {
+			&.action {
 				gap: 24rpx;
-				display: grid;
-				grid-template-columns: repeat(3, 1fr);
-
-				.media-item {
-					width: 100%;
-					height: 200rpx;
-					overflow: hidden;
-					position: relative;
-					border-radius: 12rpx;
-
-					.media-img {
-						width: 100%;
-						height: 100%;
-					}
-
-					.video-badge {
-						top: 50%;
-						left: 50%;
-						display: flex;
-						position: absolute;
-						transform: translate(-50%, -50%);
-						align-items: center;
-						justify-content: center;
-					}
-
-					.media-delete {
-						top: 8rpx;
-						right: 8rpx;
-						width: 48rpx;
-						height: 48rpx;
-						display: flex;
-						position: absolute;
-						background: rgba(0, 0, 0, .5);
-						align-items: center;
-						border-radius: 50%;
-						justify-content: center;
-					}
+				display: flex;
+				padding: 24rpx 16rpx 48rpx 16rpx;
+	
+				.delete {
+					flex: .6;
 				}
-
-				.media-add {
-					width: 100%;
-					height: 200rpx;
-					display: flex;
-					align-items: center;
-					border-radius: 12rpx;
-					justify-content: center;
-					background: var(--theme-bg-page);
-					border: 2rpx dashed var(--theme-border);
+	
+				.submit {
+					flex: 1;
 				}
 			}
 		}
-
-		.upload-info {
-			gap: 16rpx;
-			display: flex;
-			padding: 24rpx 32rpx;
-			margin-top: 24rpx;
-			align-items: center;
-			border-radius: 12rpx;
-			background: var(--theme-bg-card);
-
-			.upload-text {
-				color: var(--theme-text-secondary);
-				font-size: 28rpx;
-			}
-		}
-
-		.submit-section {
-			gap: 24rpx;
-			display: flex;
-			padding: 24rpx 16rpx 48rpx 16rpx;
-			margin-top: 64rpx;
-
-			.delete-btn {
-				flex: .6;
-			}
-
-			.submit-btn {
-				flex: 1;
-			}
-		}
 	}
 }
 

miniprogram/pages/main/travel-location-editor/index.ts

@@ -2,17 +2,17 @@
 
 import { Network, WechatMediaItem } from "../../../utils/Network";
 import { TravelLocationApi } from "../../../api/TravelLocationApi";
-import { TravelLocationType } from "../../../types/Travel";
-import { MediaAttachExt, MediaAttachType } from "../../../types/Attachment";
+import { TravelLocationType, TravelLocationTypeLabel } from "../../../types/Travel";
+import { MediaAttachType, PreviewImageMetadata } from "../../../types/Attachment";
 import config from "../../../config/index";
 import { MediaItem, MediaItemType } from "../../../types/UI";
 
 interface TravelLocationEditorData {
 	/** 模式：create 或 edit */
 	mode: "create" | "edit";
-	/** 旅行地点 ID（编辑模式） */
+	/** 出行地点 ID（编辑模式） */
 	id?: number;
-	/** 关联的旅行计划 ID */
+	/** 关联的出行计划 ID */
 	travelId: number;
 	/** 地点类型 */
 	type: TravelLocationType;
@@ -32,16 +32,14 @@ interface TravelLocationEditorData {
 	requireIdCard: boolean;
 	/** 是否需要预约 */
 	requireAppointment: boolean;
-	/** 首次出行时间戳 */
-	firstTraveledAt: number;
-	/** 上次出行时间戳 */
-	lastTraveledAt: number;
-	/** 出行次数 */
-	travelCount: number;
 	/** 评分 */
 	score: number;
+	/** 评分是否未定 */
+	scoreUndecided: boolean;
 	/** 重要程度 */
 	importance: number;
+	/** 重要程度是否未定 */
+	importanceUndecided: boolean;
 	/** 媒体列表（创建和编辑模式使用） */
 	mediaList: (MediaItem | WechatMediaItem)[];
 	/** 新媒体列表（编辑模式使用） */
@@ -55,11 +53,11 @@ interface TravelLocationEditorData {
 	/** 上传进度信息 */
 	uploadInfo: string;
 	/** 地点类型选项 */
-	locationTypes: { label: string; value: TravelLocationType }[];
+	locationTypes: string[];
+	/** 地点类型值数组 */
+	locationTypeValues: TravelLocationType[];
 	/** 地点类型选中索引 */
 	locationTypeIndex: number;
-	/** 地点类型选择器可见性 */
-	locationTypePickerVisible: boolean;
 	/** 删除对话框可见性 */
 	deleteDialogVisible: boolean;
 	/** 删除确认文本 */
@@ -73,7 +71,7 @@ Page({
 		mode: "create",
 		id: undefined,
 		travelId: 0,
-		type: TravelLocationType.ATTRACTION,
+		type: TravelLocationType.FOOD,
 		title: "",
 		description: "",
 		location: "",
@@ -82,11 +80,10 @@ Page({
 		amount: 0,
 		requireIdCard: false,
 		requireAppointment: false,
-		firstTraveledAt: 0,
-		lastTraveledAt: 0,
-		travelCount: 0,
 		score: 3,
+		scoreUndecided: true,
 		importance: 1,
+		importanceUndecided: true,
 		mediaList: [],
 		newMediaList: [],
 		isLoading: false,
@@ -96,16 +93,17 @@ Page({
 		mediaItemTypeEnum: {
 			...MediaItemType
 		},
-		locationTypes: [
-			{ label: "景点", value: TravelLocationType.ATTRACTION },
-			{ label: "酒店", value: TravelLocationType.HOTEL },
-			{ label: "餐厅", value: TravelLocationType.RESTAURANT },
-			{ label: "交通站点", value: TravelLocationType.TRANSPORT },
-			{ label: "购物", value: TravelLocationType.SHOPPING },
-			{ label: "其他", value: TravelLocationType.OTHER }
+		locationTypes: Object.values(TravelLocationTypeLabel),
+		locationTypeValues: [
+			TravelLocationType.FOOD,
+			TravelLocationType.HOTEL,
+			TravelLocationType.TRANSPORT,
+			TravelLocationType.ATTRACTION,
+			TravelLocationType.SHOPPING,
+			TravelLocationType.PLAY,
+			TravelLocationType.LIFE
 		],
 		locationTypeIndex: 0,
-		locationTypePickerVisible: false,
 		deleteDialogVisible: false,
 		deleteConfirmText: ""
 	},
@@ -115,7 +113,7 @@ Page({
 		const travelId = options.travelId ? parseInt(options.travelId) : 0;
 		if (!travelId) {
 			wx.showToast({
-				title: "缺少旅行计划 ID",
+				title: "缺少出行计划 ID",
 				icon: "error"
 			});
 			setTimeout(() => {
@@ -155,19 +153,20 @@ Page({
 
 			// 计算地点类型索引
 			const type = location.type || TravelLocationType.ATTRACTION;
-			const locationTypeIndex = this.data.locationTypes.findIndex(
-				item => item.value === type
+			const locationTypeIndex = this.data.locationTypeValues.findIndex(
+				item => item === type
 			);
 
 			const items = location.items || [];
 			const thumbItems = items.filter((item) => item.attachType === MediaAttachType.THUMB);
 
 			const mediaList: MediaItem[] = thumbItems.map((thumbItem) => {
-				const ext = thumbItem.ext = JSON.parse(thumbItem.ext!.toString()) as MediaAttachExt;
+				const metadata = (typeof thumbItem.metadata === "string" ? JSON.parse(thumbItem.metadata) : thumbItem.metadata) as PreviewImageMetadata;
 				const thumbURL = `${config.url}/attachment/read/${thumbItem.mongoId}`;
-				const sourceURL = `${config.url}/attachment/read/${ext.sourceMongoId}`;
+				const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
+				const isVideo = metadata.sourceMimeType?.startsWith("video/");
 				return {
-					type: ext.isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
+					type: isVideo ? MediaItemType.VIDEO : MediaItemType.IMAGE,
 					thumbURL,
 					sourceURL,
 					size: thumbItem.size || 0,
@@ -175,6 +174,14 @@ Page({
 				} as MediaItem;
 			});
 
+			// 判断评分是否未定
+			const scoreUndecided = location.score === null || location.score === undefined;
+			const score = location.score !== null && location.score !== undefined ? location.score : 3;
+
+			// 判断重要程度是否未定
+			const importanceUndecided = location.importance === null || location.importance === undefined;
+			const importance = location.importance !== null && location.importance !== undefined ? location.importance : 1;
+
 			this.setData({
 				type,
 				locationTypeIndex: locationTypeIndex >= 0 ? locationTypeIndex : 0,
@@ -186,11 +193,10 @@ Page({
 				amount: location.amount || 0,
 				requireIdCard: location.requireIdCard || false,
 				requireAppointment: location.requireAppointment || false,
-				firstTraveledAt: location.firstTraveledAt || 0,
-				lastTraveledAt: location.lastTraveledAt || 0,
-				travelCount: location.travelCount || 0,
-				score: location.score !== undefined ? location.score : 3,
-				importance: location.importance !== undefined ? location.importance : 1,
+				score,
+				scoreUndecided,
+				importance,
+				importanceUndecided,
 				mediaList,
 				isLoading: false
 			});
@@ -212,30 +218,10 @@ Page({
 		const index = e.detail.value;
 		this.setData({
 			locationTypeIndex: index,
-			type: this.data.locationTypes[index].value
+			type: this.data.locationTypeValues[index]
 		});
 	},
 
-	/** 显示地点类型选择器 */
-	showLocationTypePicker() {
-		this.setData({ locationTypePickerVisible: true });
-	},
-
-	/** Picker 确认 */
-	onPickerConfirm(e: any) {
-		const index = e.detail.value;
-		this.setData({
-			locationTypeIndex: index,
-			type: this.data.locationTypes[index].value,
-			locationTypePickerVisible: false
-		});
-	},
-
-	/** Picker 取消 */
-	onPickerCancel() {
-		this.setData({ locationTypePickerVisible: false });
-	},
-
 	/** 改变是否需要身份证 */
 	onChangeRequireIdCard(e: any) {
 		this.setData({ requireIdCard: e.detail.value });
@@ -256,6 +242,32 @@ Page({
 		this.setData({ importance: e.detail.value });
 	},
 
+	/** 清除评分 */
+	clearScore() {
+		this.setData({ scoreUndecided: true });
+	},
+
+	/** 清除重要程度 */
+	clearImportance() {
+		this.setData({ importanceUndecided: true });
+	},
+
+	/** 点击未定文字选择评分 */
+	selectScore() {
+		this.setData({
+			scoreUndecided: false,
+			score: 3
+		});
+	},
+
+	/** 点击未定文字选择重要程度 */
+	selectImportance() {
+		this.setData({
+			importanceUndecided: false,
+			importance: 1
+		});
+	},
+
 	/** 选择位置 */
 	chooseLocation() {
 		wx.chooseLocation({
@@ -355,7 +367,7 @@ Page({
 			// 创建模式：只有 mediaList
 			const sources = (this.data.mediaList as WechatMediaItem[]).map(item => ({
 				url: item.path,
-				type: MediaItemType[item.type].toLowerCase()
+				type: item.type!.toLowerCase()
 			}));
 
 			const total = sources.length;
@@ -371,11 +383,11 @@ Page({
 			// 编辑模式：mediaList + newMediaList
 			const sources = (this.data.mediaList as MediaItem[]).map(item => ({
 				url: item.sourceURL,
-				type: MediaItemType[item.type].toLowerCase()
+				type: item.type.toLowerCase()
 			}));
 			const newSources = this.data.newMediaList.map(item => ({
 				url: item.path,
-				type: MediaItemType[item.type].toLowerCase()
+				type: item.type!.toLowerCase()
 			}));
 			const allSources = [...sources, ...newSources];
 			const itemIndex = isNewMedia ? this.data.mediaList.length + index : index;
@@ -514,11 +526,8 @@ Page({
 				amount: this.data.amount,
 				requireIdCard: this.data.requireIdCard,
 				requireAppointment: this.data.requireAppointment,
-				firstTraveledAt: this.data.firstTraveledAt,
-				lastTraveledAt: this.data.lastTraveledAt,
-				travelCount: this.data.travelCount,
-				score: this.data.score,
-				importance: this.data.importance,
+				score: this.data.scoreUndecided ? null : this.data.score,
+				importance: this.data.importanceUndecided ? null : this.data.importance,
 				tempFileIds
 			});
 			wx.showToast({
@@ -573,11 +582,8 @@ Page({
 				amount: this.data.amount,
 				requireIdCard: this.data.requireIdCard,
 				requireAppointment: this.data.requireAppointment,
-				firstTraveledAt: this.data.firstTraveledAt,
-				lastTraveledAt: this.data.lastTraveledAt,
-				travelCount: this.data.travelCount,
-				score: this.data.score,
-				importance: this.data.importance,
+				score: this.data.scoreUndecided ? null : this.data.score,
+				importance: this.data.importanceUndecided ? null : this.data.importance,
 				attachmentIds,
 				tempFileIds
 			});

miniprogram/pages/main/travel-location-editor/index.wxml

@@ -3,21 +3,23 @@
 	<text slot="left" bindtap="cancel">取消</text>
 </t-navbar>
 
-<scroll-view class="travel-location-editor" type="custom" scroll-y show-scrollbar="{{false}}">
+<scroll-view class="travel-location-editor setting-bg" type="custom" scroll-y show-scrollbar="{{false}}">
 	<view class="content">
 		<view wx:if="{{isLoading}}" class="loading">
 			<t-loading theme="dots" size="40rpx" />
 			<text class="text">加载中...</text>
 		</view>
 		<block wx:else>
-			<t-cell-group class="section">
+			<t-cell-group class="section location">
 				<view slot="title" class="title">位置信息</view>
-				<t-cell title="地点类型" arrow bind:click="showLocationTypePicker">
-					<view slot="note" class="black">{{locationTypes[locationTypeIndex].label}}</view>
-				</t-cell>
-				<t-cell class="location" required arrow bind:click="chooseLocation">
+				<picker mode="selector" range="{{locationTypes}}" value="{{locationTypeIndex}}" bindchange="onChangeLocationType">
+					<t-cell title="地点类型" arrow>
+						<view slot="note" class="note">{{locationTypes[locationTypeIndex]}}</view>
+					</t-cell>
+				</picker>
+				<t-cell class="value" required arrow bind:click="chooseLocation">
 					<view slot="title" class="title">位置</view>
-					<view slot="note" class="black">{{location}}</view>
+					<view slot="note" class="note">{{location}}</view>
 				</t-cell>
 			</t-cell-group>
 			<t-cell-group class="section">
@@ -46,6 +48,7 @@
 					placeholder="0"
 					label="费用"
 					suffix="元"
+					type="digit"
 					align="right"
 				/>
 				<t-cell title="需要身份证">
@@ -58,84 +61,98 @@
 						<switch checked="{{requireAppointment}}" bindchange="onChangeRequireAppointment" />
 					</view>
 				</t-cell>
-				<t-cell title="重要程度">
-					<view slot="right-icon">
-						<t-rate
-							value="{{importance}}"
-							count="{{5}}"
-							size="24px"
-							bind:change="onChangeImportance"
-						/>
+				<t-cell title="重要程度" class="rate-cell importance {{importanceUndecided ? 'undecided' : 'decided'}}">
+					<view slot="note">
+						<view class="rate">
+							<t-rate
+								value="{{importance}}"
+								count="{{5}}"
+								size="20px"
+								bind:change="onChangeImportance"
+							/>
+							<t-icon
+								name="close-circle-filled"
+								size="20px"
+								class="clear-icon"
+								bindtap="clearImportance"
+							/>
+						</view>
+						<view class="text" bindtap="selectImportance">
+							未定
+						</view>
 					</view>
 				</t-cell>
-				<t-cell title="评分">
-					<view slot="right-icon">
-						<t-rate
-							value="{{score}}"
-							count="{{5}}"
-							size="24px"
-							bind:change="onChangeScore"
-						/>
+				<t-cell title="评分" class="rate-cell score {{scoreUndecided ? 'undecided' : 'decided'}}">
+					<view slot="note">
+						<view class="rate">
+							<t-rate
+								value="{{score}}"
+								count="{{5}}"
+								size="20px"
+								bind:change="onChangeScore"
+							/>
+							<t-icon
+								name="close-circle-filled"
+								size="20px"
+								class="clear-icon"
+								bindtap="clearScore"
+							/>
+						</view>
+						<view class="text" bindtap="selectScore">
+							未定
+						</view>
 					</view>
 				</t-cell>
 			</t-cell-group>
-			<view class="section media">
-				<view class="gallery">
-					<!-- 创建模式：mediaList 显示新选择的媒体 -->
-					<block wx:if="{{mode === 'create'}}">
-						<block wx:for="{{mediaList}}" wx:key="index">
-							<view class="item">
-								<!-- 图片 -->
-								<image
-									wx:if="{{item.type === mediaItemTypeEnum.IMAGE}}"
-									src="{{item.path}}"
-									class="thumbnail"
-									mode="aspectFill"
-									bindtap="preview"
-									data-index="{{index}}"
-									data-new-media="{{true}}"
-								></image>
-								<!-- 视频 -->
-								<view wx:if="{{item.type === mediaItemTypeEnum.VIDEO}}" class="video-container">
+			<t-cell-group class="section media">
+				<view slot="title" class="title">图片视频</view>
+				<t-cell>
+					<view slot="title" class="gallery">
+						<!-- 创建模式：mediaList 显示新选择的媒体 -->
+						<block wx:if="{{mode === 'create'}}">
+							<block wx:for="{{mediaList}}" wx:key="index">
+								<view class="item">
+									<!-- 图片 -->
 									<image
-										src="{{item.thumbPath}}"
+										wx:if="{{item.type === mediaItemTypeEnum.IMAGE}}"
+										src="{{item.path}}"
 										class="thumbnail"
 										mode="aspectFill"
 										bindtap="preview"
 										data-index="{{index}}"
 										data-new-media="{{true}}"
 									></image>
-									<t-icon class="play-icon" name="play" />
+									<!-- 视频 -->
+									<view wx:if="{{item.type === mediaItemTypeEnum.VIDEO}}" class="video-container">
+										<image
+											src="{{item.thumbPath}}"
+											class="thumbnail"
+											mode="aspectFill"
+											bindtap="preview"
+											data-index="{{index}}"
+											data-new-media="{{true}}"
+										></image>
+										<t-icon class="play-icon" name="play" />
+									</view>
+									<!-- 删除 -->
+									<t-icon
+										class="delete"
+										name="close"
+										bindtap="deleteMedia"
+										data-index="{{index}}"
+										data-new-media="{{true}}"
+									/>
 								</view>
-								<!-- 删除 -->
-								<t-icon
-									class="delete"
-									name="close"
-									bindtap="deleteMedia"
-									data-index="{{index}}"
-									data-new-media="{{true}}"
-								/>
-							</view>
+							</block>
 						</block>
-					</block>
-					<!-- 编辑模式：mediaList 显示现有附件，newMediaList 显示新添加的附件 -->
-					<block wx:else>
-						<!-- 现有附件 -->
-						<block wx:for="{{mediaList}}" wx:key="attachmentId">
-							<view class="item">
-								<!-- 图片 -->
-								<image
-									wx:if="{{item.type === mediaItemTypeEnum.IMAGE}}"
-									src="{{item.thumbURL}}"
-									class="thumbnail"
-									mode="aspectFill"
-									bindtap="preview"
-									data-index="{{index}}"
-									data-new-media="{{false}}"
-								></image>
-								<!-- 视频 -->
-								<view wx:if="{{item.type === mediaItemTypeEnum.VIDEO}}" class="video-container">
+						<!-- 编辑模式：mediaList 显示现有附件，newMediaList 显示新添加的附件 -->
+						<block wx:else>
+							<!-- 现有附件 -->
+							<block wx:for="{{mediaList}}" wx:key="attachmentId">
+								<view class="item">
+									<!-- 图片 -->
 									<image
+										wx:if="{{item.type === mediaItemTypeEnum.IMAGE}}"
 										src="{{item.thumbURL}}"
 										class="thumbnail"
 										mode="aspectFill"
@@ -143,80 +160,91 @@
 										data-index="{{index}}"
 										data-new-media="{{false}}"
 									></image>
-									<t-icon class="play-icon" name="play" />
+									<!-- 视频 -->
+									<view wx:if="{{item.type === mediaItemTypeEnum.VIDEO}}" class="video-container">
+										<image
+											src="{{item.thumbURL}}"
+											class="thumbnail"
+											mode="aspectFill"
+											bindtap="preview"
+											data-index="{{index}}"
+											data-new-media="{{false}}"
+										></image>
+										<t-icon class="play-icon" name="play" />
+									</view>
+									<!-- 删除 -->
+									<t-icon
+										class="delete"
+										name="close"
+										bindtap="deleteMedia"
+										data-index="{{index}}"
+										data-new-media="{{false}}"
+									/>
 								</view>
-								<!-- 删除 -->
-								<t-icon
-									class="delete"
-									name="close"
-									bindtap="deleteMedia"
-									data-index="{{index}}"
-									data-new-media="{{false}}"
-								/>
-							</view>
-						</block>
-						<!-- 新选择附件 -->
-						<block wx:for="{{newMediaList}}" wx:key="index">
-							<view class="item new-item">
-								<!-- 图片 -->
-								<image
-									wx:if="{{item.type === mediaItemTypeEnum.IMAGE}}"
-									src="{{item.path}}"
-									class="thumbnail"
-									mode="aspectFill"
-									bindtap="preview"
-									data-index="{{index}}"
-									data-new-media="{{true}}"
-								></image>
-								<!-- 视频 -->
-								<view wx:if="{{item.type === mediaItemTypeEnum.VIDEO}}" class="video-container">
+							</block>
+							<!-- 新选择附件 -->
+							<block wx:for="{{newMediaList}}" wx:key="index">
+								<view class="item new-item">
+									<!-- 图片 -->
 									<image
-										src="{{item.thumbPath}}"
+										wx:if="{{item.type === mediaItemTypeEnum.IMAGE}}"
+										src="{{item.path}}"
 										class="thumbnail"
 										mode="aspectFill"
 										bindtap="preview"
 										data-index="{{index}}"
 										data-new-media="{{true}}"
 									></image>
-									<t-icon class="play-icon" name="play" />
+									<!-- 视频 -->
+									<view wx:if="{{item.type === mediaItemTypeEnum.VIDEO}}" class="video-container">
+										<image
+											src="{{item.thumbPath}}"
+											class="thumbnail"
+											mode="aspectFill"
+											bindtap="preview"
+											data-index="{{index}}"
+											data-new-media="{{true}}"
+										></image>
+										<t-icon class="play-icon" name="play" />
+									</view>
+									<!-- 新增标识 -->
+									<t-icon class="new-badge" name="add" />
+									<!-- 删除 -->
+									<t-icon
+										class="delete"
+										name="close"
+										bindtap="deleteNewMedia"
+										data-index="{{index}}"
+										data-new-media="{{true}}"
+									/>
 								</view>
-								<!-- 新增标识 -->
-								<t-icon class="new-badge" name="add" />
-								<!-- 删除 -->
-								<t-icon
-									class="delete"
-									name="close"
-									bindtap="deleteNewMedia"
-									data-index="{{index}}"
-									data-new-media="{{true}}"
-								/>
-							</view>
+							</block>
 						</block>
-					</block>
-					<!-- 添加按钮 -->
-					<t-button
-						class="item add"
-						theme="primary"
-						plain="true"
-						disabled="{{isSaving}}"
-						bind:tap="addMedia"
-					>
-						<t-icon name="add" />
-					</t-button>
-				</view>
-			</view>
+						<!-- 添加按钮 -->
+						<t-button
+							class="item add"
+							theme="primary"
+							plain="true"
+							disabled="{{isSaving}}"
+							bind:tap="addMedia"
+						>
+							<t-icon name="add" />
+						</t-button>
+					</view>
+				</t-cell>
+			</t-cell-group>
 
 			<!-- 上传进度提示 -->
-			<view wx:if="{{isUploading}}" class="upload-info">
+			<view wx:if="{{isUploading}}" class="section upload">
 				<t-loading theme="circular" size="32rpx" />
-				<text class="upload-text">{{uploadInfo}}</text>
+				<text class="text">{{uploadInfo}}</text>
 			</view>
 
 			<!-- 按钮 -->
-			<view class="submit-section">
+			<view class="section action">
 				<t-button
 					wx:if="{{mode === 'edit'}}"
-					class="delete-btn"
+					class="delete"
 					theme="danger"
 					variant="outline"
 					size="large"
@@ -226,7 +254,7 @@
 					删除
 				</t-button>
 				<t-button
-					class="submit-btn"
+					class="submit"
 					theme="primary"
 					size="large"
 					bind:tap="submit"
@@ -240,18 +268,6 @@
 	</view>
 </scroll-view>
 
-<!-- 地点类型选择器 -->
-<t-picker
-	visible="{{locationTypePickerVisible}}"
-	value="{{locationTypeIndex}}"
-	cancelBtn="取消"
-	confirmBtn="确认"
-	bind:confirm="onPickerConfirm"
-	bind:cancel="onPickerCancel"
->
-	<t-picker-item options="{{locationTypes}}" />
-</t-picker>
-
 <!-- 删除确认对话框 -->
 <t-dialog
 	visible="{{deleteDialogVisible}}"

miniprogram/pages/main/travel-location-map/index.less

@@ -8,46 +8,40 @@
 	.map {
 		width: 100%;
 		height: 100%;
-	}
 
-	.custom-callout {
-		width: fit-content;
-		padding: 12rpx 16rpx;
-		display: flex;
-		min-width: 300rpx;
-		max-width: 400rpx;
-		background: #fff;
-		box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, .15);
-		border-radius: 6rpx;
-		flex-direction: column;
-
-		.location-item {
+		.marker {
+			width: fit-content;
 			display: flex;
-			padding: 6rpx 0;
-			align-items: center;
-
-			&:not(:last-child) {
-				border-bottom: 1px solid #eee;
-			}
-
-			.type {
-				color: #fff;
-				padding: 2rpx 8rpx;
-				font-size: 24rpx;
-				flex-shrink: 0;
-				background: var(--theme-wx, #07c160);
-				margin-right: 12rpx;
-				border-radius: 4rpx;
-			}
-
-			.title {
-				flex: 1;
-				color: #333;
-				overflow: hidden;
-				font-size: 28rpx;
-				font-weight: bold;
-				white-space: nowrap;
-				text-overflow: ellipsis;
+			background: var(--theme-bg-card);
+			box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, .15);
+			border-radius: 6rpx;
+			flex-direction: column;
+	
+			.location {
+				display: flex;
+				padding: 8rpx 16rpx 8rpx 8rpx;
+				align-items: center;
+	
+				.type {
+					color: #fff;
+					padding: 4rpx 12rpx 6rpx 12rpx;
+					font-size: 28rpx;
+					flex-shrink: 0;
+					background: var(--theme-wx, #07c160);
+					margin-right: 12rpx;
+					border-radius: 4rpx;
+				}
+	
+				.title {
+					flex: 1;
+					width: calc(var(--title-length) * 28rpx);
+					color: var(--theme-text-primary, #333);
+					overflow: hidden;
+					font-size: 28rpx;
+					font-weight: bold;
+					white-space: nowrap;
+					text-overflow: ellipsis;
+				}
 			}
 		}
 	}
@@ -60,9 +54,9 @@
 		transform: translate(-50%, -50%);
 
 		.loading-text {
-			color: #666;
+			color: var(--theme-text-secondary, #666);
 			padding: 24rpx 48rpx;
-			background: #FFF;
+			background: var(--theme-bg-card, #fff);
 			border-radius: 8rpx;
 			box-shadow: 0 4rpx 12rpx rgba(0, 0, 0, .15);
 		}

miniprogram/pages/main/travel-location-map/index.ts

@@ -2,6 +2,7 @@
 
 import { TravelLocationApi } from "../../../api/TravelLocationApi";
 import { TravelLocation, TravelLocationTypeLabel } from "../../../types/Travel";
+import Toolkit from "../../../utils/Toolkit";
 
 interface MapMarker {
 	id: number;
@@ -110,7 +111,8 @@ Page({
 				height: 30,
 				customCallout: {
 					anchorY: -2,
-					anchorX: 0,
+					// 随机错位避免近距离重叠
+					anchorX: Toolkit.random(-10, 10),
 					display: "ALWAYS"
 				},
 				locations: locs

miniprogram/pages/main/travel-location-map/index.wxml

@@ -13,16 +13,25 @@
 		bindcallouttap="onCalloutTap"
 	>
 		<cover-view slot="callout">
-			<block wx:for="{{markers}}" wx:key="id" wx:for-index="markerIndex">
-				<cover-view class="custom-callout" marker-id="{{markerIndex}}">
-					<block wx:for="{{item.locations}}" wx:key="id" wx:for-item="location">
-						<cover-view class="location-item">
-							<cover-view wx:if="{{location.typeLabel}}" class="type">{{location.typeLabel}}</cover-view>
-							<cover-view class="title">{{location.title || '未命名地点'}}</cover-view>
-						</cover-view>
-					</block>
+			<cover-view
+				class="marker"
+				wx:for="{{markers}}"
+				wx:key="id"
+				wx:for-item="marker"
+				wx:for-index="markerIndex"
+				marker-id="{{markerIndex}}"
+			>
+				<cover-view
+					class="location"
+					wx:for="{{marker.locations}}"
+					wx:key="id"
+					wx:for-item="location"
+					style="{{'--title-length: ' + location.title.length}}"
+				>
+					<cover-view wx:if="{{location.typeLabel}}" class="type">{{location.typeLabel}}</cover-view>
+					<cover-view class="title">{{location.title || '未命名地点'}}</cover-view>
 				</cover-view>
-			</block>
+			</cover-view>
 		</cover-view>
 	</map>
 	<view wx:if="{{isLoading}}" class="loading">

miniprogram/pages/main/travel/index.less

@@ -66,7 +66,7 @@
 			}
 
 			.meta {
-				gap: 16rpx;
+				gap: 32rpx;
 				display: flex;
 				flex-wrap: wrap;
 

miniprogram/pages/main/travel/index.ts

@@ -2,13 +2,12 @@
 
 import Time from "../../../utils/Time";
 import { TravelApi } from "../../../api/TravelApi";
-import { Travel, TravelPage, TravelStatus, TravelStatusLabel, TravelStatusIcon, TransportationTypeLabel } from "../../../types/Travel";
-import { OrderType } from "../../../types/Model";
+import { Travel, TravelPage, TravelStatus, TravelStatusLabel, TravelStatusIcon, TransportationTypeLabel, TransportationTypeIcon } from "../../../types/Travel";
 
 interface TravelData {
 	/** 分页参数 */
 	page: TravelPage;
-	/** 旅行列表 */
+	/** 出行列表 */
 	list: Travel[];
 	/** 当前筛选状态 */
 	currentStatus: TravelStatus | "ALL";
@@ -27,16 +26,15 @@ interface TravelData {
 	statusIcons: typeof TravelStatusIcon;
 	/** 交通类型标签映射 */
 	transportLabels: typeof TransportationTypeLabel;
+	/** 交通类型图标映射 */
+	transportIcons: typeof TransportationTypeIcon;
 }
 
 Page({
 	data: <TravelData>{
 		page: {
 			index: 0,
-			size: 10,
-			orderMap: {
-				travelAt: OrderType.DESC
-			}
+			size: 10
 		},
 		list: [],
 		currentStatus: "ALL",
@@ -47,11 +45,18 @@ Page({
 		menuLeft: 0,
 		statusLabels: TravelStatusLabel,
 		statusIcons: TravelStatusIcon,
-		transportLabels: TransportationTypeLabel
+		transportLabels: TransportationTypeLabel,
+		transportIcons: TransportationTypeIcon
 	},
 	onLoad() {
 		this.resetAndFetch();
 	},
+	onShow() {
+		// 页面显示时刷新数据（从编辑页返回时）
+		if (0 < this.data.list.length) {
+			this.resetAndFetch();
+		}
+	},
 	onHide() {
 		this.setData({
 			isShowFilterMenu: false
@@ -70,9 +75,6 @@ Page({
 			page: {
 				index: 0,
 				size: 10,
-				orderMap: {
-					travelAt: OrderType.DESC
-				},
 				equalsExample: this.data.currentStatus === "ALL" ? undefined : {
 					status: this.data.currentStatus as TravelStatus
 				}
@@ -83,7 +85,7 @@ Page({
 		});
 		this.fetch();
 	},
-	/** 获取旅行列表 */
+	/** 获取出行列表 */
 	async fetch() {
 		if (this.data.isFetching || this.data.isFinished) {
 			return;
@@ -117,7 +119,7 @@ Page({
 				isFinished: list.length < this.data.page.size
 			});
 		} catch (error) {
-			console.error("获取旅行列表失败:", error);
+			console.error("获取出行列表失败:", error);
 		} finally {
 			this.setData({ isFetching: false });
 		}
@@ -158,7 +160,7 @@ Page({
 		});
 		this.resetAndFetch();
 	},
-	/** 新建旅行 */
+	/** 新建出行 */
 	toCreate() {
 		wx.navigateTo({
 			url: "/pages/main/travel-editor/index"

miniprogram/pages/main/travel/index.wxml

@@ -1,6 +1,6 @@
 <!--pages/main/travel/index.wxml-->
 <view class="custom-navbar">
-	<t-navbar title="旅行计划">
+	<t-navbar title="出行计划">
 		<view slot="left" class="filter-btn" bind:tap="toggleFilterMenu">
 			<t-icon name="filter" size="24px" />
 		</view>
@@ -46,13 +46,13 @@
 	</t-cell-group>
 </view>
 
-<!-- 旅行列表 -->
+<!-- 出行列表 -->
 <view class="travels">
 	<!-- 空状态 -->
 	<t-empty
 		wx:if="{{!isFetching && list.length === 0}}"
 		icon="travel"
-		description="暂无旅行计划"
+		description="暂无出行计划"
 	/>
 	<!-- 列表内容 -->
 	<view
@@ -74,19 +74,19 @@
 			</t-tag>
 		</view>
 		<view class="body">
-			<view class="title">{{travel.title || '未命名旅行'}}</view>
+			<view class="title">{{travel.title || '未命名出行'}}</view>
 			<view wx:if="{{travel.content}}" class="content">{{travel.content}}</view>
 			<view class="meta">
-				<view class="item">
+				<view wx:if="{{travel.travelDate}}" class="item">
 					<t-icon name="time" size="16px" class="icon" />
-					<text class="text">{{travel.travelDate}} {{travel.travelTime}}</text>
+					<text class="text">{{travel.travelDate}}</text>
 				</view>
 				<view wx:if="{{travel.days}}" class="item">
 					<t-icon name="calendar" size="16px" class="icon" />
 					<text class="text">{{travel.days}} 天</text>
 				</view>
 				<view wx:if="{{travel.transportationType}}" class="item">
-					<t-icon name="{{travel.transportationType === 'PLANE' ? 'flight-takeoff' : travel.transportationType === 'TRAIN' ? 'map-route' : travel.transportationType === 'SELF_DRIVING' ? 'control-platform' : 'location'}}" size="16px" class="icon" />
+					<t-icon name="{{transportIcons[travel.transportationType]}}" size="16px" class="icon" />
 					<text class="text">{{transportLabels[travel.transportationType]}}</text>
 				</view>
 			</view>

miniprogram/tdesign.less

@@ -256,10 +256,10 @@ page {
     --td-font-size-l: var(--td-font-size-title-large);
     --td-font-size-xl: var(--td-font-size-title-extra-large);
     --td-font-size-xxl: var(--td-font-size-headline-large);
-    --td-radius-small: 2px;
-    --td-radius-default: 4px;
-    --td-radius-large: 6px;
-    --td-radius-extraLarge: 7px;
-    --td-radius-round: 999px;
+    --td-radius-small: 8rpx;
+    --td-radius-default: 16rpx;
+    --td-radius-large: 24px;
+    --td-radius-extraLarge: 32rpx;
+    --td-radius-round: 9999rpx;
     --td-radius-circle: 50%;
 }

miniprogram/theme.less

@@ -13,6 +13,7 @@ page {
 	--theme-bg-primary: #FFF;
 	--theme-bg-secondary: #F5F5F5;
 	--theme-bg-card: #FFF;
+	--theme-bg-card-secondary: #F4F4F4;
 	--theme-bg-journal: #FFF2C8;
 	--theme-bg-overlay: rgba(0, 0, 0, .1);
 	--theme-bg-menu: rgba(255, 255, 255, .95);
@@ -67,8 +68,9 @@ page {
 		--theme-bg-wx: #111;
 		--theme-bg-primary: #1A1A1A;
 		--theme-bg-secondary: #2A2A2A;
-		--theme-bg-card: #2C2C2C;
-		--theme-bg-journal: #3A3A2E;
+		--theme-bg-card: #3D3D3D;
+		--theme-bg-card-secondary: #525252;
+		--theme-bg-journal: #4B4B4B;
 		--theme-bg-overlay: rgba(0, 0, 0, .3);
 		--theme-bg-menu: rgba(40, 40, 40, .95);
 

miniprogram/types/Attachment.ts

@@ -17,7 +17,7 @@ export type Attachment = {
 
 	mimeType?: string;
 
-	metadata?: string | ImageMetadata;
+	metadata?: string | ImageMetadata | PreviewImageMetadata;
 
 	/** 文件 MD5 */
 	md5: string;
@@ -27,9 +27,6 @@ export type Attachment = {
 
 	/** 大小 */
 	size: number;
-
-	/** 扩展数据 */
-	ext?: string | MediaAttachExt;
 } & Model;
 
 /** 媒体附件类型 */
@@ -52,8 +49,7 @@ export type ImageMetadata = {
 	height: number;
 }
 
-/** 媒体附件扩展数据 */
-export type MediaAttachExt = {
+export type PreviewImageMetadata = {
 
 	/** 原文件附件 ID */
 	sourceId: number;
@@ -61,15 +57,6 @@ export type MediaAttachExt = {
 	/** 原文件访问 mongoId */
 	sourceMongoId: string;
 
-	/** true 为图片 */
-	isImage: boolean;
-
-	/** true 为视频 */
-	isVideo: boolean;
-
-	/** 原图宽度（像素） */
-	width?: number;
-
-	/** 原图高度（像素） */
-	height?: number;
-}
+	/** 原文件 MimeType */
+	sourceMimeType: string;
+} & ImageMetadata;

miniprogram/types/Travel.ts

@@ -22,28 +22,38 @@ export const TransportationTypeLabel: Record<TransportationType, string> = {
 	[TransportationType.OTHER]: "其他"
 };
 
-/** 旅行状态 */
+/** 交通类型图标映射 */
+export const TransportationTypeIcon: Record<TransportationType, string> = {
+	[TransportationType.PLANE]: "flight-takeoff",
+	[TransportationType.TRAIN]: "map-route",
+	[TransportationType.CAR]: "vehicle",
+	[TransportationType.SHIP]: "anchor",
+	[TransportationType.SELF_DRIVING]: "vehicle",
+	[TransportationType.OTHER]: "compass"
+};
+
+/** 出行状态 */
 export enum TravelStatus {
 	PLANNING = "PLANNING",
 	ONGOING = "ONGOING",
 	COMPLETED = "COMPLETED"
 }
 
-/** 旅行状态中文映射 */
+/** 出行状态中文映射 */
 export const TravelStatusLabel: Record<TravelStatus, string> = {
 	[TravelStatus.PLANNING]: "计划中",
 	[TravelStatus.ONGOING]: "进行中",
 	[TravelStatus.COMPLETED]: "已完成"
 };
 
-/** 旅行状态图标映射 */
+/** 出行状态图标映射 */
 export const TravelStatusIcon: Record<TravelStatus, string> = {
 	[TravelStatus.PLANNING]: "calendar",
 	[TravelStatus.ONGOING]: "play-circle",
 	[TravelStatus.COMPLETED]: "check-circle"
 };
 
-/** 旅行计划实体 */
+/** 出行计划实体 */
 export interface Travel extends Model {
 	/** 交通类型 */
 	transportationType?: TransportationType;
@@ -55,10 +65,10 @@ export interface Travel extends Model {
 	content?: string;
 
 	/** 出行时间戳 */
-	travelAt?: number;
+	travelAt?: number | null;
 
 	/** 天数 */
-	days?: number;
+	days?: number | null;
 
 	/** 状态 */
 	status?: TravelStatus;
@@ -70,7 +80,7 @@ export interface Travel extends Model {
 	travelTime?: string;
 }
 
-/** 旅行分页查询 */
+/** 出行分页查询 */
 export interface TravelPage extends QueryPage {
 	/** 条件过滤 */
 	equalsExample?: {
@@ -80,37 +90,43 @@ export interface TravelPage extends QueryPage {
 
 /** 地点类型 */
 export enum TravelLocationType {
-	ATTRACTION = "ATTRACTION",
+	FOOD = "FOOD",
 	HOTEL = "HOTEL",
-	RESTAURANT = "RESTAURANT",
 	TRANSPORT = "TRANSPORT",
+	ATTRACTION = "ATTRACTION",
+	MALL = "MALL",
 	SHOPPING = "SHOPPING",
-	OTHER = "OTHER"
+	PLAY = "PLAY",
+	LIFE = "LIFE"
 }
 
 /** 地点类型中文映射 */
 export const TravelLocationTypeLabel: Record<TravelLocationType, string> = {
-	[TravelLocationType.ATTRACTION]: "景点",
+	[TravelLocationType.FOOD]: "美食",
 	[TravelLocationType.HOTEL]: "酒店",
-	[TravelLocationType.RESTAURANT]: "餐厅",
-	[TravelLocationType.TRANSPORT]: "交通站点",
+	[TravelLocationType.TRANSPORT]: "交通",
+	[TravelLocationType.ATTRACTION]: "景点",
+	[TravelLocationType.MALL]: "商场",
 	[TravelLocationType.SHOPPING]: "购物",
-	[TravelLocationType.OTHER]: "其他"
+	[TravelLocationType.PLAY]: "玩乐",
+	[TravelLocationType.LIFE]: "生活"
 };
 
 /** 地点类型图标映射 */
 export const TravelLocationTypeIcon: Record<TravelLocationType, string> = {
-	[TravelLocationType.ATTRACTION]: "location",
-	[TravelLocationType.HOTEL]: "home",
-	[TravelLocationType.RESTAURANT]: "shop",
-	[TravelLocationType.TRANSPORT]: "map-route",
-	[TravelLocationType.SHOPPING]: "cart",
-	[TravelLocationType.OTHER]: "ellipsis"
+	[TravelLocationType.FOOD]: "chicken",
+	[TravelLocationType.HOTEL]: "city-8",
+	[TravelLocationType.TRANSPORT]: "map-route-planning",
+	[TravelLocationType.ATTRACTION]: "image-1",
+	[TravelLocationType.MALL]: "chart-3d",
+	[TravelLocationType.SHOPPING]: "shop",
+	[TravelLocationType.PLAY]: "ferris-wheel",
+	[TravelLocationType.LIFE]: "location"
 };
 
-/** 旅行地点实体 */
+/** 出行地点实体 */
 export interface TravelLocation extends Model {
-	/** 关联的旅行计划 ID */
+	/** 关联的出行计划 ID */
 	travelId?: number;
 
 	/** 地点类型 */
@@ -140,20 +156,11 @@ export interface TravelLocation extends Model {
 	/** 是否需要预约 */
 	requireAppointment?: boolean;
 
-	/** 首次出行时间戳 */
-	firstTraveledAt?: number;
-
-	/** 上次出行时间戳 */
-	lastTraveledAt?: number;
-
-	/** 出行次数 */
-	travelCount?: number;
-
 	/** 评分 */
-	score?: number;
+	score?: number | null;
 
 	/** 重要程度 */
-	importance?: number;
+	importance?: number | null;
 
 	/** 附件 */
 	items?: Attachment[];

miniprogram/types/UI.ts

@@ -55,10 +55,10 @@ export type WechatMediaItem = {
 export enum MediaItemType {
 	
 	/** 图片 */
-	IMAGE,
+	IMAGE = "image",
 
 	/** 视频 */
-	VIDEO
+	VIDEO = "video"
 }
 
 /** 位置 */
@@ -79,4 +79,17 @@ export enum JournalDetailType {
 	DATE = "DATE",
 
 	LOCATION = "LOCATION"
-}
+}
+
+export interface MapMarker {
+	id: number;
+	latitude: number;
+	longitude: number;
+	width: number;
+	height: number;
+	customCallout: {
+		anchorY: number;
+		anchorX: number;
+		display: string;
+	};
+}

miniprogram/utils/Network.ts

@@ -1,5 +1,6 @@
 import config from "../config/index";
 import { Response, QueryPage, QueryPageResult, TempFileResponse } from "../types/Model";
+import { MediaItemType } from "../types/UI";
 
 /** 微信媒体项（用于上传） */
 export interface WechatMediaItem {
@@ -13,7 +14,7 @@ export interface WechatMediaItem {
 	size?: number;
 
 	/** 媒体类型 */
-	type?: string;
+	type?: MediaItemType;
 }
 
 /** 请求选项 */