From 18c6a415499d8ea7aeadf90dd39675707c62a95a Mon Sep 17 00:00:00 2001 From: Timi Date: Wed, 10 Dec 2025 17:17:57 +0800 Subject: [PATCH] fix location icon --- miniprogram/assets/image/location.png | Bin 638 -> 0 bytes .../journal-detail-panel/index.less | 18 +++++++++++++++--- .../components/journal-detail-panel/index.ts | 14 ++++++++++++++ .../journal-detail-panel/index.wxml | 12 ++++++++++-- miniprogram/pages/main/journal-date/index.ts | 4 ++++ miniprogram/pages/main/journal/index.less | 16 +++++++++++++--- miniprogram/pages/main/journal/index.wxml | 5 ++++- 7 files changed, 60 insertions(+), 9 deletions(-) delete mode 100644 miniprogram/assets/image/location.png diff --git a/miniprogram/assets/image/location.png b/miniprogram/assets/image/location.png deleted file mode 100644 index 306d819b150046fb129182489088f47e87c20dee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 638 zcmV-^0)hRBP)1gh5dP*ADK1jD$OE{bNJBxF%84H#67-iR0K@~}h8iM-D7g+Kka&a;8jw0o!Qw-aL1!FK<_vm^iI+-*Oav1^<1q03^dsM zdiZhkBy~^hhXaqfzV-y4Df>&nZ?b6vYXqQU%0TCEf0zgGEv|i_SkWioE)qK>(3raD zi~=zDK7+rFdQ^lC-*(tD`lJ=rYFh)K;ef%9sqK+EPT!)>OZiqEY5+*^zG~EQ-;ep$ z036tD2sowu2xgzSiWiYBPrFy%i4OpnqS`Ow2-p$_^S$iJeE9AW`3Hy$-pAr9##$Qy zP&y#7Q}``SH)OL>_N5S!pBV77*k7-vPE(AvCg_bQ=OJu|6eA zgZHw-)CInhuK4x)Sc!^{IxmP30ss@hHc%hz5IfbY)}vxep4Uwz@eP$vTtNXquJm7p zvb^#FxAm%-&GWK6;PVa(L;-*_?2xB`EpY2$3%l?)Rks=dvtSMV46r}A)$p_2H*~52 zNX;w`0FT{;)KQ`jGq0ymyKoHM6Cck*+l;zK;02!GIhg;`7j$b1uo>R0ELl24E_SJf8bDA z{tvT5vNz670E(hg*wXK_Y$NfKb)n7x3Z{~g8ZT5fRk{QK0RR6i=jmDi000I_L_t&o Y05~GSF*^&-n*aa+07*qoM6N<$f|FJtR{#J2 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}} +