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 @@ - + {{title}} @@ -26,7 +26,15 @@ - 📍 {{item.location}} + + + {{item.location}} + {{item.date}} {{item.idea}} diff --git a/miniprogram/pages/main/journal-date/index.ts b/miniprogram/pages/main/journal-date/index.ts index b9f130a..546603f 100644 --- a/miniprogram/pages/main/journal-date/index.ts +++ b/miniprogram/pages/main/journal-date/index.ts @@ -8,6 +8,8 @@ interface JournalInfo { id: number; date: string; time: string; + lat?: number; + lng?: number; location?: string; idea?: string; items: Array<{ @@ -145,6 +147,8 @@ Page({ id: journal.id, date: Time.toPassedDateTime(journal.createdAt), time: `${String(date.getHours()).padStart(2, '0')}:${String(date.getMinutes()).padStart(2, '0')}`, + lat: journal.lat, + lng: journal.lng, location: journal.location, idea: journal.idea, items: journal.items diff --git a/miniprogram/pages/main/journal/index.less b/miniprogram/pages/main/journal/index.less index ec2c849..7e16f0b 100644 --- a/miniprogram/pages/main/journal/index.less +++ b/miniprogram/pages/main/journal/index.less @@ -34,7 +34,7 @@ font-size: 14px; } - .text { + > .text { color: var(--theme-text-primary); width: calc(100% - 32px - 2rem); padding: 8px 16px; @@ -64,8 +64,18 @@ } .location { - color: var(--theme-text-secondary); - text-align: right; + gap: 6rpx; + display: flex; + align-items: center; + justify-content: flex-end; + + .icon { + color: var(--theme-wx); + } + + .text { + color: var(--theme-text-secondary); + } } } diff --git a/miniprogram/pages/main/journal/index.wxml b/miniprogram/pages/main/journal/index.wxml index 4bf4a8b..11fba5d 100644 --- a/miniprogram/pages/main/journal/index.wxml +++ b/miniprogram/pages/main/journal/index.wxml @@ -27,7 +27,10 @@ class="location" bind:tap="openLocation" data-journal-index="{{journalIndex}}" - >📍 {{journal.location}} + > + + {{journal.location}} +