diff --git a/miniprogram/assets/image/location.png b/miniprogram/assets/image/location.png
deleted file mode 100644
index 306d819..0000000
Binary files a/miniprogram/assets/image/location.png and /dev/null differ
diff --git a/miniprogram/components/journal-detail-panel/index.less b/miniprogram/components/journal-detail-panel/index.less
index d6848ea..90c0f3f 100644
--- a/miniprogram/components/journal-detail-panel/index.less
+++ b/miniprogram/components/journal-detail-panel/index.less
@@ -35,8 +35,8 @@
margin-bottom: 8rpx;
.icon {
- width: 32rpx;
- height: 32rpx;
+ color: var(--theme-wx);
+ font-size: 48rpx;
margin-right: 8rpx;
}
}
@@ -81,9 +81,21 @@
align-items: baseline;
.location {
+ gap: 8rpx;
color: #666;
- flex-basis: 100%;
+ display: flex;
font-size: 24rpx;
+ flex-basis: 100%;
+ align-items: center;
+
+ .icon {
+ color: var(--theme-wx);
+ font-size: 32rpx;
+ }
+
+ .text {
+ font-size: 24rpx;
+ }
}
.date {
diff --git a/miniprogram/components/journal-detail-panel/index.ts b/miniprogram/components/journal-detail-panel/index.ts
index a410862..eefb080 100644
--- a/miniprogram/components/journal-detail-panel/index.ts
+++ b/miniprogram/components/journal-detail-panel/index.ts
@@ -4,6 +4,8 @@ interface JournalInfo {
id: number;
date: string;
time: string;
+ lat?: number;
+ lng?: number;
location?: string;
idea?: string;
items: Array<{
@@ -79,6 +81,18 @@ Component({
currentJournalIndex: e.detail.current
});
},
+
+ openLocation(e: WechatMiniprogram.BaseEvent) {
+ const { journalIndex } = e.currentTarget.dataset;
+ const journals = this.properties.journals as JournalInfo[];
+ const journal = journals[journalIndex];
+ if (journal.lat && journal.lng) {
+ wx.openLocation({
+ latitude: journal.lat,
+ longitude: journal.lng,
+ });
+ }
+ },
/** 预览媒体 */
previewMedia(e: WechatMiniprogram.BaseEvent) {
diff --git a/miniprogram/components/journal-detail-panel/index.wxml b/miniprogram/components/journal-detail-panel/index.wxml
index 9129119..7e64eec 100644
--- a/miniprogram/components/journal-detail-panel/index.wxml
+++ b/miniprogram/components/journal-detail-panel/index.wxml
@@ -10,7 +10,7 @@