From 26f490de6eb170f75e52d05b2a9796c3721775d7 Mon Sep 17 00:00:00 2001
From: Echo <1711788888@qq.com>
Date: Tue, 19 Aug 2025 15:35:25 +0800
Subject: [PATCH] =?UTF-8?q?:art:=20=E4=BC=98=E5=8C=96home=E9=A1=B5?=
=?UTF-8?q?=E9=9D=A2=E5=92=8C=E7=BA=AA=E5=BF=B5=E6=97=A5=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages.json | 2 +-
src/pages/anniversary/anniversary.vue | 104 +++++++++++++++++++-------
src/pages/anniversary/detail.vue | 51 ++++++++++---
src/pages/home/home.vue | 2 +-
4 files changed, 123 insertions(+), 36 deletions(-)
diff --git a/src/pages.json b/src/pages.json
index 4dce022..728f704 100644
--- a/src/pages.json
+++ b/src/pages.json
@@ -131,7 +131,7 @@
"selectedIconPath": "./static/images/home-active.png"
},
{
- "pagePath": "pages/recipe/recipe",
+ "pagePath": "pages/order/order",
"text": "菜谱",
"iconPath": "./static/images/recipe.png",
"selectedIconPath": "./static/images/recipe-active.png"
diff --git a/src/pages/anniversary/anniversary.vue b/src/pages/anniversary/anniversary.vue
index 613ecb2..b3fd02c 100644
--- a/src/pages/anniversary/anniversary.vue
+++ b/src/pages/anniversary/anniversary.vue
@@ -73,7 +73,7 @@
-
+
@@ -97,18 +97,30 @@
>
+
+ 纪念日类型
+
+ 恋爱纪念日
+ 生日
+ 其他
+
+
+
纪念日期
-
-
- 当前日期值: {{ formData.date }}
-
- 测试设置日期
+
+ {{ formData.date || '请选择日期' }}
+
+
+
@@ -131,11 +143,13 @@ const anniversaryList = ref([])
const showDialog = ref(false)
const isEdit = ref(false)
const popup = ref(null)
+const calendarRef = ref(null)
const formData = ref({
id: null,
user_id: null,
lover_id: null,
title: '',
+ type: 3,
date: ''
})
@@ -195,11 +209,13 @@ const showAddDialog = () => {
user_id: 1, // 这里应该从用户信息中获取
lover_id: 2, // 这里应该从情侣信息中获取
title: '',
+ type: 3,
date: currentDate // 默认设置为当前日期
}
showDialog.value = true
popup.value.open()
+ // 悬浮按钮由 v-show 受 showDialog 控制自动隐藏
console.log('显示弹窗状态:', showDialog.value)
console.log('设置的默认日期:', currentDate)
}
@@ -212,6 +228,7 @@ const editAnniversary = (item) => {
user_id: item.user_id,
lover_id: item.lover_id,
title: item.title,
+ type: Number(item.type) || 3,
date: item.date
}
@@ -360,13 +377,18 @@ const getCountdownClass = (item) => {
}
const goBack = () => {
- uni.navigateBack()
+ const pages = getCurrentPages()
+ if (pages.length > 1) {
+ uni.navigateBack()
+ } else {
+ uni.switchTab({ url: '/pages/home/home' })
+ }
}
-const testSetDate = () => {
- console.log('手动设置日期为 2023-10-27')
- formData.value.date = '2023-10-27'
- console.log('设置后的日期:', formData.value.date)
+const openCalendar = () => {
+ if (calendarRef.value && calendarRef.value.open) {
+ calendarRef.value.open()
+ }
}
const getCurrentDate = () => {
@@ -379,9 +401,8 @@ const getCurrentDate = () => {
return currentDate
}
-const onDateChange = (e) => {
- console.log('日期选择器已选择:', e.value)
- formData.value.date = e.value
+const onCalendarConfirm = (e) => {
+ formData.value.date = e.fulldate || e.value || ''
}
@@ -668,13 +689,46 @@ const onDateChange = (e) => {
font-weight: bold;
}
- .form-input {
- background: #f8f8f8;
- border-radius: 10rpx;
- padding: 20rpx;
- }
+ .form-input {
+ background: #f8f8f8;
+ border-radius: 10rpx;
+ padding: 20rpx;
+ }
- .debug-info {
+ .type-group {
+ display: flex;
+ gap: 20rpx;
+ }
+
+ .type-item {
+ padding: 14rpx 22rpx;
+ border-radius: 12rpx;
+ border: 1rpx solid #ddd;
+ color: #666;
+ background: #f8f8f8;
+ }
+
+ .type-item.active {
+ color: #fff;
+ border-color: transparent;
+ background: linear-gradient(135deg, #FF6B9D 0%, #FF8E9E 100%);
+ }
+
+ .date-input {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ background: #f8f8f8;
+ border-radius: 10rpx;
+ padding: 20rpx;
+ }
+
+ .date-text {
+ font-size: 28rpx;
+ color: #333;
+ }
+
+ .debug-info {
font-size: 20rpx;
color: #999;
margin-top: 10rpx;
diff --git a/src/pages/anniversary/detail.vue b/src/pages/anniversary/detail.vue
index e4a2f40..4295760 100644
--- a/src/pages/anniversary/detail.vue
+++ b/src/pages/anniversary/detail.vue
@@ -71,12 +71,19 @@
纪念日期
-
+
+ {{ editForm.date || '请选择日期' }}
+
+
+
@@ -113,6 +120,7 @@ const anniversary = ref({})
const isEditing = ref(false)
const showCalendar = ref(false)
const editForm = ref({})
+const calendarRef = ref(null)
// 纪念日类型
const anniversaryTypes = [
@@ -188,8 +196,14 @@ const cancelEdit = () => {
}
}
-const onDateChange = (e) => {
- editForm.value.date = e.value
+const openCalendar = () => {
+ if (calendarRef.value && calendarRef.value.open) {
+ calendarRef.value.open()
+ }
+}
+
+const onCalendarConfirm = (e) => {
+ editForm.value.date = e.fulldate || e.value || ''
}
const saveChanges = async () => {
@@ -268,7 +282,12 @@ const deleteAnniversary = () => {
}
const goBack = () => {
- uni.navigateBack()
+ const pages = getCurrentPages()
+ if (pages.length > 1) {
+ uni.navigateBack()
+ } else {
+ uni.switchTab({ url: '/pages/home/home' })
+ }
}
const getIconByType = (type) => {
@@ -488,6 +507,20 @@ const getCountdownText = (item) => {
color: #333;
}
}
+
+ .date-input {
+ display: flex;
+ align-items: center;
+ justify-content: space-between;
+ background: #f8f8f8;
+ border-radius: 10rpx;
+ padding: 20rpx;
+ }
+
+ .date-text {
+ font-size: 28rpx;
+ color: #333;
+ }
}
.form-actions {
diff --git a/src/pages/home/home.vue b/src/pages/home/home.vue
index e0b24dc..2b5b963 100644
--- a/src/pages/home/home.vue
+++ b/src/pages/home/home.vue
@@ -297,7 +297,7 @@ const goToDiary = () => {
}
const goToOrder = () => {
- uni.switchTab({ url: '/pages/order/order' })
+ uni.navigateTo({ url: '/pages/order/order' })
}
const addAnniversary = () => {