timi/gaoYuJournal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: timi:3b091c4f1814261c9b7a45b8da3675d9c5d60f7e
Branches Tags
timi:master
...
compare: timi:master
Branches Tags
timi:master

8 Commits
3b091c4f18 ... master

Author SHA1 Message Date
Timi
8adc28ae9c update 1.6.6 2026-01-04 19:09:52 +08:00
Timi
e31a3432a0 remove PreviewImageMetadata.isImage/isVideo 2026-01-04 19:09:28 +08:00
Timi
2c6478c729 merge Attachment metadata/ext 2026-01-04 17:41:02 +08:00
Timi
f4232e8752 udpate 1.6.5 2025-12-23 16:18:23 +08:00
Timi
41e2959a72 fix travel location type 2025-12-23 16:18:16 +08:00
Timi
bf5deff045 update 1.6.4 2025-12-23 14:57:37 +08:00
Timi
f94cf05f62 preview travel location attach in list 2025-12-23 14:45:15 +08:00
Timi
9538a21e42 add MALL travel type 2025-12-23 14:27:51 +08:00
15 changed files with 104 additions and 65 deletions
Expand all files Collapse all files

10
miniprogram/components/journal-detail-popup/index.ts
View File

@ -2,7 +2,7 @@
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";
@ -47,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,

10
miniprogram/components/travel-location-popup/index.ts
View File

@ -1,7 +1,7 @@
// components/travel-location-popup/index.ts
import { TravelLocation, TravelLocationTypeLabel, TravelLocationTypeIcon } from "../../types/Travel";
import { TravelLocationApi } from "../../api/TravelLocationApi";
import { ImageMetadata, 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";
@ -43,12 +43,12 @@ Component({
if (0 < thumbItems.length) {
const mediaItems: MediaItem[] = thumbItems.map((thumbItem, index) => {
const metadata = thumbItem.metadata as ImageMetadata;
const ext = typeof thumbItem.ext === "string" ? JSON.parse(thumbItem.ext) : thumbItem.ext;
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,

3
miniprogram/config/index.ts
View File

@ -1,11 +1,12 @@
const envArgs = {
develop: {
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"
// url: "http://192.168.3.174:8091"
},
trial: {
url: "https://api.imyeyu.com"

2
miniprogram/pages/main/about/index.wxml
View File

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

9
miniprogram/pages/main/journal-editor/index.ts
View File

@ -5,7 +5,7 @@ import Toolkit from "../../../utils/Toolkit";
import config from "../../../config/index";
import { Location, MediaItem, MediaItemType, WechatMediaItem } from "../../../types/UI";
import { JournalType } from "../../../types/Journal";
import { MediaAttachExt, MediaAttachType } from "../../../types/Attachment";
import { MediaAttachType, PreviewImageMetadata } from "../../../types/Attachment";
import IOSize, { Unit } from "../../../utils/IOSize";
import { JournalApi } from "../../../api/JournalApi";
@ -156,11 +156,12 @@ Page({
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,

10
miniprogram/pages/main/journal/index.ts
View File

@ -6,7 +6,7 @@ import Events from "../../../utils/Events";
import Toolkit from "../../../utils/Toolkit";
import { Journal, JournalPage, JournalPageType } from "../../../types/Journal";
import { OrderType } from "../../../types/Model";
import { ImageMetadata, MediaAttachExt } from "../../../types/Attachment";
import { PreviewImageMetadata } from "../../../types/Attachment";
import { MediaItem, MediaItemType } from "../../../types/UI";
import { JournalApi } from "../../../api/JournalApi";
@ -163,12 +163,12 @@ Page({
}
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 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,

16
miniprogram/pages/main/moment/index.ts
View File

@ -5,7 +5,7 @@ import IOSize, { Unit } from "../../../utils/IOSize";
import Time from "../../../utils/Time";
import Toolkit from "../../../utils/Toolkit";
import { Location, MediaItemType } from "../../../types/UI";
import { MediaAttachExt } from "../../../types/Attachment";
import { PreviewImageMetadata } from "../../../types/Attachment";
import { MomentApi } from "../../../api/MomentApi";
import { JournalApi } from "../../../api/JournalApi";
import { Network } from "../../../utils/Network";
@ -134,12 +134,13 @@ Page({
}
this.setData({
list: list.map((item: any) => {
const ext = JSON.parse(item.ext) as MediaAttachExt;
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/${ext.sourceMongoId}`;
const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isImage = metadata.sourceMimeType?.startsWith("image/");
return {
id: item.id,
type: ext.isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO,
type: isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO,
thumbURL,
sourceURL,
checked: false
@ -259,12 +260,13 @@ Page({
const list = await MomentApi.create(tempFileIds);
wx.showToast({ title: "上传成功", icon: "success" });
const added = list.map((item: any) => {
const ext = JSON.parse(item.ext) as MediaAttachExt;
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/${ext.sourceMongoId}`;
const sourceURL = `${config.url}/attachment/read/${metadata.sourceMongoId}`;
const isImage = item.mimeType?.startsWith("image/");
return {
id: item.id,
type: ext.isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO,
type: isImage ? MediaItemType.IMAGE : MediaItemType.VIDEO,
thumbURL,
sourceURL,
checked: false

10
miniprogram/pages/main/portfolio/index.ts
View File

@ -6,7 +6,7 @@ import Events from "../../../utils/Events";
import Toolkit from "../../../utils/Toolkit";
import { Journal, JournalPage, JournalPageType } from "../../../types/Journal";
import { OrderType, } from "../../../types/Model";
import { ImageMetadata, MediaAttachExt } from "../../../types/Attachment";
import { PreviewImageMetadata } from "../../../types/Attachment";
import { MediaItem, MediaItemType } from "../../../types/UI";
import { JournalApi } from "../../../api/JournalApi";
@ -92,12 +92,12 @@ Page({
}
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 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,

25
miniprogram/pages/main/travel-detail/index.less
View File

@ -66,6 +66,31 @@
}
.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;

17
miniprogram/pages/main/travel-detail/index.ts
View File

@ -3,8 +3,14 @@
import Time from "../../../utils/Time";
import { TravelApi } from "../../../api/TravelApi";
import { TravelLocationApi } from "../../../api/TravelLocationApi";
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;
@ -13,7 +19,7 @@ interface TravelDetailData {
/** 是否正在加载 */
isLoading: boolean;
/** 地点列表 */
locations: TravelLocation[];
locations: TravelLocationView[];
/** 是否正在加载地点 */
isLoadingLocations: boolean;
/** 状态标签映射 */
@ -140,7 +146,14 @@ Page({
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 {

7
miniprogram/pages/main/travel-detail/index.wxml
View File

@ -71,12 +71,17 @@
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.requireIdCard}}" class="item">

11
miniprogram/pages/main/travel-location-detail/index.ts
View File

@ -3,7 +3,7 @@
import config from "../../../config/index";
import { TravelLocationApi } from "../../../api/TravelLocationApi";
import { TravelLocation, TravelLocationTypeIcon, TravelLocationTypeLabel } from "../../../types/Travel";
import { MediaAttachExt, MediaAttachType } from "../../../types/Attachment";
import { MediaAttachType, PreviewImageMetadata } from "../../../types/Attachment";
import { MapMarker, MediaItem, MediaItemType } from "../../../types/UI";
import Toolkit from "../../../utils/Toolkit";
@ -95,18 +95,19 @@ Page({
thumbItems.forEach((thumbItem) => {
try {
const 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/");
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);
}
});

13
miniprogram/pages/main/travel-location-editor/index.ts
View File

@ -2,8 +2,8 @@
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";
@ -93,7 +93,7 @@ Page({
mediaItemTypeEnum: {
...MediaItemType
},
locationTypes: ["美食", "酒店", "交通", "景点", "购物", "玩乐", "生活"],
locationTypes: Object.values(TravelLocationTypeLabel),
locationTypeValues: [
TravelLocationType.FOOD,
TravelLocationType.HOTEL,
@ -161,11 +161,12 @@ Page({
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,

23
miniprogram/types/Attachment.ts
View File

@ -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;

3
miniprogram/types/Travel.ts
View File

@ -94,6 +94,7 @@ export enum TravelLocationType {
HOTEL = "HOTEL",
TRANSPORT = "TRANSPORT",
ATTRACTION = "ATTRACTION",
MALL = "MALL",
SHOPPING = "SHOPPING",
PLAY = "PLAY",
LIFE = "LIFE"
@ -105,6 +106,7 @@ export const TravelLocationTypeLabel: Record<TravelLocationType, string> = {
[TravelLocationType.HOTEL]: "酒店",
[TravelLocationType.TRANSPORT]: "交通",
[TravelLocationType.ATTRACTION]: "景点",
[TravelLocationType.MALL]: "商场",
[TravelLocationType.SHOPPING]: "购物",
[TravelLocationType.PLAY]: "玩乐",
[TravelLocationType.LIFE]: "生活"
@ -116,6 +118,7 @@ export const TravelLocationTypeIcon: Record<TravelLocationType, string> = {
[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"