From 936328b8c7dbc161baf60c040dea5189ebfd4d2e Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Thu, 11 Apr 2024 11:13:47 +0800
Subject: [PATCH] update

---
 pages/index/index.vue               |  6 +++---
 pages/nationalPage/springTravel.vue | 17 +++++++++++++++--
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/pages/index/index.vue b/pages/index/index.vue
index 7ed58c6..d6e69de 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1031,9 +1031,9 @@
 <!--              <image class="funIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/springTravelLogo.svg"/>-->
               <image class="funIcon" :src="isShowFestival==='spring'?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/springTravelLogo.svg':isShowFestival==='qm'?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmIcon.png':''"/>
             </view>
-            <!--            <text class="funText">节日特刊</text>-->
+                        <text class="funText">节日特刊</text>
 <!--            <text class="funText">平安春运</text>-->
-            <text class="funText">{{ isShowFestival==='spring'?'平安春运':isShowFestival==='qm'?'清明节':'' }}</text>
+<!--            <text class="funText">{{ isShowFestival==='spring'?'平安春运':isShowFestival==='qm'?'清明节':'' }}</text>-->
           </view>
         </view>
 
@@ -1599,7 +1599,7 @@ export default {
       currentMoney:'',
       showMoreFixed:false,// 显示悬浮框
       profitSharingList:[],// 分润占比旁边的list
-      isShowFestival:'qm',// 显示的节日
+      isShowFestival:'spring',// 显示的节日
       oldSwiperIndex: 0,// 移动swiper 等待1秒钟 如果保持一致就请求 不一致就return
     }
   },
diff --git a/pages/nationalPage/springTravel.vue b/pages/nationalPage/springTravel.vue
index 118fb31..759925a 100644
--- a/pages/nationalPage/springTravel.vue
+++ b/pages/nationalPage/springTravel.vue
@@ -1031,12 +1031,14 @@ export default {
     }
     if (this.selectFestival===0){
       this.howDayNumber = dayNumber<=40?dayNumber:40
+      this.lastDay = '2024-03-05'
     }else if (this.selectFestival===1){
       if (dayNumber<=5){
         this.howDayNumber = dayNumber
       }else{
         this.howDayNumber = 5
         this.currentScroll = 'item'+ '2024-04-07'
+        this.lastDay = '2024-04-07'
       }
 
     }
@@ -1112,9 +1114,20 @@ export default {
         dayNumber = moment().diff("2024-04-03", "days")
       }
       if (this.selectFestival===0){
-        this.howDayNumber = dayNumber<=40?dayNumber:40
+        if (dayNumber<=40){
+          this.howDayNumber = dayNumber
+        }else{
+          this.howDayNumber = 40
+          this.lastDay = '2024-03-05'
+        }
       }else if (this.selectFestival===1){
-        this.howDayNumber = dayNumber<=3?dayNumber:3
+        // this.howDayNumber = dayNumber<=3?dayNumber:3
+        if (dayNumber<=3){
+          this.howDayNumber = dayNumber
+        }else{
+          this.howDayNumber = 3
+          this.lastDay = '2024-04-07'
+        }
       }
       let dateList = []
       for (let i = 1;i<=this.howDayNumber;i++) {