From 08999c608db99e60c94da6d9c9fa0efdd7ab0a83 Mon Sep 17 00:00:00 2001
From: Cxx0822 <1556464090@qq.com>
Date: Mon, 6 Apr 2026 22:21:11 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E5=B8=83=E5=B1=80?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/styles/home/life.detail.module.scss |  1 +
 src/views/period/calendar.vue           | 12 ++++++++----
 src/views/travel/recordForm.vue         |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/styles/home/life.detail.module.scss b/src/styles/home/life.detail.module.scss
index 9290c2c..c399aec 100644
--- a/src/styles/home/life.detail.module.scss
+++ b/src/styles/home/life.detail.module.scss
@@ -11,6 +11,7 @@
   }
 
   section {
+    width: 100%;
     .info-container, .record-container {
       .info-item {
         padding: 1vh 1vw;
diff --git a/src/views/period/calendar.vue b/src/views/period/calendar.vue
index eacd541..9d70263 100644
--- a/src/views/period/calendar.vue
+++ b/src/views/period/calendar.vue
@@ -110,6 +110,14 @@ const calculatePeriodDay = (date: string, cycleLength = 28, duration = 5) => {
   for (const dateStr of allDates) {
     const currentDate = dayjs(dateStr)
 
+    if (dailyInfo.menstruateDateList.includes(formatDate(currentDate))) {
+      continue
+    }
+
+    if (dailyInfo.sexDateList.includes(formatDate(currentDate))) {
+      continue
+    }
+
     // 判断月经期，跳过
     if (currentDate.isSame(startDate, 'day') || checkIsMenstruateDate(currentDate, startDate, duration)) {
       if (!dailyInfo.menstruateDateList.includes(dateStr)) {
@@ -122,10 +130,6 @@ const calculatePeriodDay = (date: string, cycleLength = 28, duration = 5) => {
       continue
     }
 
-    if (dailyInfo.sexDateList.includes(formatDate(currentDate))) {
-      continue
-    }
-
     // 判断排卵日
     if (currentDate.isSame(ovulationDate, 'day')) {
       dailyInfo.attrs.push({
diff --git a/src/views/travel/recordForm.vue b/src/views/travel/recordForm.vue
index abd0804..009f289 100644
--- a/src/views/travel/recordForm.vue
+++ b/src/views/travel/recordForm.vue
@@ -19,7 +19,7 @@
       <el-form-item label="旅行日期" prop="date">
         <el-date-picker
             v-model="travelStore.currentTravelRecord.date"
-            type="date" placeholder="请选择日期"
+            type="date" placeholder="请选择日期" :editable="false"
             value-format="YYYY-MM-DD"/>
       </el-form-item>