diff --git a/project.config.json b/project.config.json index 8faa6c0..85391b4 100644 --- a/project.config.json +++ b/project.config.json @@ -36,6 +36,6 @@ "tabIndent": "auto", "tabSize": 2 }, - "appid": "wx636bc46a6570e9fd", + "appid": "wxae3b39ac443fedc3", "simulatorPluginLibVersion": {} } \ No newline at end of file diff --git a/src/api/types.ts b/src/api/types.ts index 7531cf5..30c8b88 100644 --- a/src/api/types.ts +++ b/src/api/types.ts @@ -216,6 +216,7 @@ export interface BannerItem { title: string content: string | null imageUrl: string + videoUrl?: string | null linkUrl: string sortOrder: number category: string | null diff --git a/src/packages/content/pages/scenic-detail.vue b/src/packages/content/pages/scenic-detail.vue index aebfe86..ab58a58 100644 --- a/src/packages/content/pages/scenic-detail.vue +++ b/src/packages/content/pages/scenic-detail.vue @@ -296,7 +296,7 @@ function onHoursClick() { uni.showToast({ title: '营业时间仅供参考', icon: 'none' }) } function onPhoneClick() { - uni.makePhoneCall({ phoneNumber: scenic.value.phone }) + uni.makePhoneCall({ phoneNumber: scenic.value.phone, fail: () => {} }) } function onCopyAddress() { uni.setClipboardData({ diff --git a/src/packages/content/pages/scenic-list.vue b/src/packages/content/pages/scenic-list.vue index 63b06fe..b91c865 100644 --- a/src/packages/content/pages/scenic-list.vue +++ b/src/packages/content/pages/scenic-list.vue @@ -6,10 +6,11 @@ - - - - + ({ } .search-icon { - position: relative; width: 32rpx; height: 32rpx; margin-right: $spacing-2; } -.icon-circle { - width: 20rpx; - height: 20rpx; - border: 3rpx solid $uv-tips-color; - border-radius: 50%; - position: absolute; - top: 0; - left: 0; -} - -.icon-handle { - width: 10rpx; - height: 3rpx; - background: $uv-tips-color; - position: absolute; - bottom: 4rpx; - right: 0; - transform: rotate(45deg); -} - .search-input { flex: 1; font-size: $font-size-base; diff --git a/src/packages/user/pages/douyin-verify.vue b/src/packages/user/pages/douyin-verify.vue index bb750b2..30e75d5 100644 --- a/src/packages/user/pages/douyin-verify.vue +++ b/src/packages/user/pages/douyin-verify.vue @@ -640,7 +640,7 @@ function removePhoto() { } function callService() { - uni.makePhoneCall({ phoneNumber: '0731-88912301' }) + uni.makePhoneCall({ phoneNumber: '0731-88912301', fail: () => {} }) } function closeNoVoucher() { diff --git a/src/packages/user/pages/reserve/list.vue b/src/packages/user/pages/reserve/list.vue index fe52712..0a82036 100644 --- a/src/packages/user/pages/reserve/list.vue +++ b/src/packages/user/pages/reserve/list.vue @@ -63,7 +63,7 @@ @@ -110,7 +110,7 @@ 取消预约 - 确定取消该预约吗?未提前取消且未入园将扣除1次年卡使用次数,权益不可恢复。 + 确定取消 {{ formatReserveDate(cancelRecord?.date) }}{{ cancelRecord?.scenicName }} 的预约吗? @@ -325,6 +325,13 @@ watch(activeTab, () => { fetchRecords() }) +/** 将预约日期(如 2026-08-05)格式化为「2026 年 8 月 5 日」 */ +function formatReserveDate(date?: string): string { + const m = (date || '').match(/(\d{4})[-/年.](\d{1,2})[-/月.](\d{1,2})/) + if (!m) return date || '' + return `${m[1]} 年 ${Number(m[2])} 月 ${Number(m[3])} 日` +} + function showCancelModal(r: ReserveRecord) { cancelRecord.value = r cancelPopup.value?.open() diff --git a/src/pages/profile/index.vue b/src/pages/profile/index.vue index 7ea882f..2ac5f39 100644 --- a/src/pages/profile/index.vue +++ b/src/pages/profile/index.vue @@ -45,7 +45,7 @@ 常见问题 - + @@ -61,11 +61,65 @@ 退出登录 + + + + + 客服热线 + + + 加载中... + + + 暂无客服信息 + + + + + 关闭 + + +