From 4491ce30428394fce2f526358fd3f2c58d6bffba Mon Sep 17 00:00:00 2001
From: cclu <1106109051@qq.com>
Date: Tue, 14 Jan 2025 19:03:35 +0800
Subject: [PATCH] update

---
 pages/index/new_file.js                |    0
 pages/nationalPage/merchantRevenue.vue | 1527 ++++++++++++++++--------
 pages/nationalPage/rankPage.vue        |   99 +-
 pages/nationalPage/springTravel.vue    |  205 ++--
 pages/nationalPage/testPage.vue        |  292 +++--
 5 files changed, 1391 insertions(+), 732 deletions(-)
 create mode 100644 pages/index/new_file.js

diff --git a/pages/index/new_file.js b/pages/index/new_file.js
new file mode 100644
index 0000000..e69de29
diff --git a/pages/nationalPage/merchantRevenue.vue b/pages/nationalPage/merchantRevenue.vue
index f813662..c162d16 100644
--- a/pages/nationalPage/merchantRevenue.vue
+++ b/pages/nationalPage/merchantRevenue.vue
@@ -1,169 +1,506 @@
 <template>
   <div class="main">
-    <div :class="selectFestival===0?'top springTop':
-    selectFestival===1?'top qmTop':
-    selectFestival===2?'top labourTop':
-    selectFestival===3?'top dragonBoatTop':
-    selectFestival===4?'top summerHolidayTop':
-    selectFestival===5?'top midAutumnTop':
-    selectFestival===6?'top nationalDayTop':
-    ''">
-      <div :class="selectFestival===0?'header headerSpring':
-      selectFestival===1?'header headerQm':
-      selectFestival===2?'header headerlabour':
-      selectFestival===3?'header headerDragonBoat':
-      selectFestival===4?'header headerSummerHoliday':
-      selectFestival===5?'header headerMidAutumn':
-      selectFestival===6?'header headerNationalDay':
-      ''" :style="{height:menu.height + menu.top + 'px',top:0+'px'}">
-        <image :style="{bottom: ((statusBarHeight-24)/4)+'px' }" class="backArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg" @click="handleBack"/>
-<!--        <img :style="{bottom: ((statusBarHeight-24)/4)+'px' }" class="detailIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverPartDetail.png">-->
+    <div
+      :class="
+        selectFestival === 1 || selectFestival === 2
+          ? 'top springTop'
+          : selectFestival === 3
+          ? 'top qmTop'
+          : selectFestival ===4
+          ? 'top labourTop'
+          : selectFestival === 5
+          ? 'top dragonBoatTop'
+          : selectFestival === 6
+          ? 'top summerHolidayTop'
+          : selectFestival === 7
+          ? 'top midAutumnTop'
+          : selectFestival === 8
+          ? 'top nationalDayTop'
+          : ''
+      "
+    >
+      <div
+        :class="
+          selectFestival === 1 || selectFestival === 2
+            ? 'header headerSpring'
+            : selectFestival === 3
+            ? 'header headerQm'
+            : selectFestival === 4
+            ? 'header headerlabour'
+            : selectFestival === 5
+            ? 'header headerDragonBoat'
+            : selectFestival === 6
+            ? 'header headerSummerHoliday'
+            : selectFestival === 7
+            ? 'header headerMidAutumn'
+            : selectFestival === 8
+            ? 'header headerNationalDay'
+            : ''
+        "
+        :style="{ height: menu.height + menu.top + 'px', top: 0 + 'px' }"
+      >
+        <image
+          :style="{ bottom: (statusBarHeight - 24) / 4 + 'px' }"
+          class="backArrow"
+          src="https://eshangtech.com/ShopICO/ahyd-BID/examine/leftArrowWhite.svg"
+          @click="handleBack"
+        />
+        <!--        <img :style="{bottom: ((statusBarHeight-24)/4)+'px' }" class="detailIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverPartDetail.png">-->
         <div v-if="showSpring" class="picker" @click="handleGoMap">
           <div class="selectService">
-            <image class="img" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"></image>
+            <image
+              class="img"
+              src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/fixed.svg"
+            ></image>
             <view class="select">
               <view class="content">
-                <view class="uni-input">{{springService.SERVERPART_NAME}}</view>
-                <p class="area" v-if="springService.Serverpart_ID">{{springService.SPREGIONTYPE_NAME}}</p>
-                <image class="rightArrow" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"></image>
+                <view class="uni-input">{{
+                  springService.SERVERPART_NAME
+                }}</view>
+                <p class="area" v-if="springService.Serverpart_ID">
+                  {{ springService.SPREGIONTYPE_NAME }}
+                </p>
+                <image
+                  class="rightArrow"
+                  src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"
+                ></image>
               </view>
             </view>
           </div>
         </div>
 
-        <view v-else class="seachBox" :style="{height: menu.height + 'px'}" @click="handleGoMap">
-          <image class="searchIcon" src="/static/images/seach/searchIcon.svg"/>
+        <view
+          v-else
+          class="seachBox"
+          :style="{ height: menu.height + 'px' }"
+          @click="handleGoMap"
+        >
+          <image class="searchIcon" src="/static/images/seach/searchIcon.svg" />
           <text class="searchText">请输入想看的服务区</text>
         </view>
       </div>
 
-<!--      <scroll-view :style="{top:menu.bottom + 24 + 'px' }" scroll-x="true" class="headerNavList" :scrollIntoView="currentServerPart" :scroll-with-animation="true">-->
-<!--        <div :class="currentServerPart==='ServerPart'+item.value?'scrollItem selectItem':'scrollItem'" v-for="(item,index) in ServerpartList" :key="index" :id="'ServerPart'+item.value" @click="handleChangeServerPart(item.value)">{{item.name.split('服务区')[0]}}</div>-->
-<!--      </scroll-view>-->
+      <!--      <scroll-view :style="{top:menu.bottom + 24 + 'px' }" scroll-x="true" class="headerNavList" :scrollIntoView="currentServerPart" :scroll-with-animation="true">-->
+      <!--        <div :class="currentServerPart==='ServerPart'+item.value?'scrollItem selectItem':'scrollItem'" v-for="(item,index) in ServerpartList" :key="index" :id="'ServerPart'+item.value" @click="handleChangeServerPart(item.value)">{{item.name.split('服务区')[0]}}</div>-->
+      <!--      </scroll-view>-->
     </div>
     <div class="contentPage">
-      <div :class="selectFestival===0?'contentTop springContentTop':
-      selectFestival===1?'contentTop qmContentTop':
-      selectFestival===2?'contentTop labourContentTop':
-      selectFestival===3?'contentTop dragonBoatContentTop':
-      selectFestival===4?'contentTop summerHolidayContentTop':
-      selectFestival===5?'contentTop midAutumnContentTop':
-      selectFestival===6?'contentTop nationalDayContentTop':
-      ''">
+      <div
+        :class="
+          selectFestival === 1 || selectFestival === 2
+            ? 'contentTop springContentTop'
+            : selectFestival === 3
+            ? 'contentTop qmContentTop'
+            : selectFestival === 4
+            ? 'contentTop labourContentTop'
+            : selectFestival === 5
+            ? 'contentTop dragonBoatContentTop'
+            : selectFestival === 6
+            ? 'contentTop summerHolidayContentTop'
+            : selectFestival === 7
+            ? 'contentTop midAutumnContentTop'
+            : selectFestival === 8
+            ? 'contentTop nationalDayContentTop'
+            : ''
+        "
+      >
         <div class="content">
           <div class="left">
-<!--            <img class="detailLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png"/>-->
-            <img class="detailLogo" :src="selectFestival===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png':
-            selectFestival===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmServicepartDetail.png':
-            selectFestival===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourServerPartDetail.png':
-            selectFestival===3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatDetail.png':
-            selectFestival===4?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayDetail.png':
-            selectFestival===5?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnDetail.png':
-            selectFestival===6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayDetail.png':
-            ''"/>
+            <!--            <img class="detailLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png"/>-->
+            <img
+              class="detailLogo"
+              :src="
+                selectFestival === 1 || selectFestival === 2
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png'
+                  : selectFestival === 3
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmServicepartDetail.png'
+                  : selectFestival === 4
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourServerPartDetail.png'
+                  : selectFestival === 5
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatDetail.png'
+                  : selectFestival === 6
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayDetail.png'
+                  : selectFestival === 7
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnDetail.png'
+                  : selectFestival === 8
+                  ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayDetail.png'
+                  : ''
+              "
+            />
             <!--          <text class="modalUnit">{{selectDateText || ''}}</text>-->
             <!--          <text class="modalUnit">{{`/统计到${allDateDay || ''}`}}</text>-->
           </div>
           <div class="right">
             <div class="typeChangeBox">
-              <div :class="pageType===1?'normal select':'normal'" @click="handleChangeType(1)">按天统计</div>
-              <div :class="pageType===2?'normal select':'normal'" @click="handleChangeType(2)">累计统计</div>
+              <div
+                :class="pageType === 1 ? 'normal select' : 'normal'"
+                @click="handleChangeType(1)"
+              >
+                按天统计
+              </div>
+              <div
+                :class="pageType === 2 ? 'normal select' : 'normal'"
+                @click="handleChangeType(2)"
+              >
+                累计统计
+              </div>
             </div>
           </div>
         </div>
       </div>
       <div class="contentBox">
-        <div class="navBigList" v-if="pageType===1">
+        <div class="navBigList" v-if="pageType === 1">
           <!--            <div class="allBox">-->
           <!--              <div :class="currentScroll==='all'?'scrollItem selectItem':'scrollItem'" @click="handleChangeTime('all')">累计</div>-->
           <!--            </div>-->
-          <scroll-view scroll-x="true" :class="selectFestival===0?'navList springNav':
-          selectFestival===1?'navList qmNav':
-          selectFestival===2?'navList labourNav':
-          selectFestival===3?'navList dragonBoatNav':
-          selectFestival===4?'navList summerHolidayNav':
-          selectFestival===5?'navList midAutumnNav':
-          selectFestival===6?'navList nationalDayNav':
-          ''"  :scrollIntoView="currentScroll" :scroll-with-animation="true">
-            <div :class="currentScroll==='item'+item.value?'scrollItem selectItem':'scrollItem'" v-for="(item,index) in scrollList" :key="index" :id="'item'+item.value" @click="handleChangeTime(item.value)">{{item.label}}</div>
+          <scroll-view
+            scroll-x="true"
+            :class="
+              selectFestival === 1 || selectFestival === 2
+                ? 'navList springNav'
+                : selectFestival === 3
+                ? 'navList qmNav'
+                : selectFestival === 4
+                ? 'navList labourNav'
+                : selectFestival === 5
+                ? 'navList dragonBoatNav'
+                : selectFestival === 6
+                ? 'navList summerHolidayNav'
+                : selectFestival === 7
+                ? 'navList midAutumnNav'
+                : selectFestival === 8
+                ? 'navList nationalDayNav'
+                : ''
+            "
+            :scrollIntoView="currentScroll"
+            :scroll-with-animation="true"
+          >
+            <div
+              :class="
+                currentScroll === 'item' + item.value
+                  ? 'scrollItem selectItem'
+                  : 'scrollItem'
+              "
+              v-for="(item, index) in scrollList"
+              :key="index"
+              :id="'item' + item.value"
+              @click="handleChangeTime(item.value)"
+            >
+              {{ item.label }}
+            </div>
           </scroll-view>
         </div>
         <view class="sortBox">
-          <view class="sortItem" style="width: 80rpx;" @click="handleChangeSortName(1)">
+          <view
+            class="sortItem"
+            style="width: 80rpx"
+            @click="handleChangeSortName(1)"
+          >
             <text class="sortText">排序</text>
           </view>
-          <view class="sortItem" :style="{width:'calc(100% - 410rpx)',display:'flex',alignItems:'center',justifyContent:'flex-end'}" @click="handleChangeSortName(1)">
-<!--            <text class="sortText">{{ `24年${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}` }}</text>-->
+          <view
+            class="sortItem"
+            :style="{
+              width: 'calc(100% - 410rpx)',
+              display: 'flex',
+              alignItems: 'center',
+              justifyContent: 'flex-end',
+            }"
+            @click="handleChangeSortName(1)"
+          >
+            <!--            <text class="sortText">{{ `24年${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}` }}</text>-->
             <text class="sortText">{{ `24年` }}</text>
             <view class="sortIconBox" style="margin-right: 60rpx">
-              <image class="upIcon" :style="{transform: sortName===1?sortType===1?``:`rotate(180deg)`:``}" :src="sortType===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg':sortName===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
-              <image class="bottomIcon" :style="{transform: sortName===1?sortType===1?``:`rotate(180deg)`:'rotate(-180deg)'}":src="sortType===1 && sortName===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+              <image
+                class="upIcon"
+                :style="{
+                  transform:
+                    sortName === 1
+                      ? sortType === 1
+                        ? ``
+                        : `rotate(180deg)`
+                      : ``,
+                }"
+                :src="
+                  sortType === 1
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                    : sortName === 1
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                    : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                "
+              />
+              <image
+                class="bottomIcon"
+                :style="{
+                  transform:
+                    sortName === 1
+                      ? sortType === 1
+                        ? ``
+                        : `rotate(180deg)`
+                      : 'rotate(-180deg)',
+                }"
+                :src="
+                  sortType === 1 && sortName === 1
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                    : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                "
+              />
             </view>
           </view>
 
-          <view class="sortItem" style="width: 110rpx;" @click="handleChangeSortName(2)">
-<!--            <text class="sortText">{{ `23年${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}` }}</text>-->
+          <view
+            class="sortItem"
+            style="width: 110rpx"
+            @click="handleChangeSortName(2)"
+          >
+            <!--            <text class="sortText">{{ `23年${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}` }}</text>-->
             <text class="sortText">{{ `23年` }}</text>
             <view class="sortIconBox">
-              <image class="upIcon" :style="{transform: sortName===2?sortType===1?``:`rotate(180deg)`:``}" :src="sortType===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg':sortName===2?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
-              <image class="bottomIcon" :style="{transform: sortName===2?sortType===1?``:`rotate(180deg)`:'rotate(-180deg)'}":src="sortType===1 && sortName===2?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+              <image
+                class="upIcon"
+                :style="{
+                  transform:
+                    sortName === 2
+                      ? sortType === 1
+                        ? ``
+                        : `rotate(180deg)`
+                      : ``,
+                }"
+                :src="
+                  sortType === 1
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                    : sortName === 2
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                    : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                "
+              />
+              <image
+                class="bottomIcon"
+                :style="{
+                  transform:
+                    sortName === 2
+                      ? sortType === 1
+                        ? ``
+                        : `rotate(180deg)`
+                      : 'rotate(-180deg)',
+                }"
+                :src="
+                  sortType === 1 && sortName === 2
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                    : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                "
+              />
             </view>
           </view>
 
-          <view class="sortItem" style="width: 110rpx;" @click="handleChangeSortName(3)">
-<!--            <text class="sortText">{{ `${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}增长` }}</text>-->
+          <view
+            class="sortItem"
+            style="width: 110rpx"
+            @click="handleChangeSortName(3)"
+          >
+            <!--            <text class="sortText">{{ `${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}增长` }}</text>-->
             <text class="sortText">{{ `增长` }}</text>
             <view class="sortIconBox">
-              <image class="upIcon" :style="{transform: sortName===3?sortType===1?``:`rotate(180deg)`:``}" :src="sortType===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg':sortName===3?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
-              <image class="bottomIcon" :style="{transform: sortName===3?sortType===1?``:`rotate(180deg)`:'rotate(-180deg)'}":src="sortType===1 && sortName===3?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+              <image
+                class="upIcon"
+                :style="{
+                  transform:
+                    sortName === 3
+                      ? sortType === 1
+                        ? ``
+                        : `rotate(180deg)`
+                      : ``,
+                }"
+                :src="
+                  sortType === 1
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                    : sortName === 3
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                    : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                "
+              />
+              <image
+                class="bottomIcon"
+                :style="{
+                  transform:
+                    sortName === 3
+                      ? sortType === 1
+                        ? ``
+                        : `rotate(180deg)`
+                      : 'rotate(-180deg)',
+                }"
+                :src="
+                  sortType === 1 && sortName === 3
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                    : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                "
+              />
             </view>
           </view>
 
-          <view class="sortItem" style="width: 110rpx;" @click="handleChangeSortName(4)">
-<!--            <text class="sortText">{{ `${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}增幅` }}</text>-->
+          <view
+            class="sortItem"
+            style="width: 110rpx"
+            @click="handleChangeSortName(4)"
+          >
+            <!--            <text class="sortText">{{ `${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}增幅` }}</text>-->
             <text class="sortText">{{ `增幅` }}</text>
             <view class="sortIconBox">
-              <image class="upIcon" :style="{transform: sortName===4?sortType===1?``:`rotate(180deg)`:``}" :src="sortType===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg':sortName===4?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
-              <image class="bottomIcon" :style="{transform: sortName===4?sortType===1?``:`rotate(180deg)`:'rotate(-180deg)'}":src="sortType===1 && sortName===4?'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'"/>
+              <image
+                class="upIcon"
+                :style="{
+                  transform:
+                    sortName === 4
+                      ? sortType === 1
+                        ? ``
+                        : `rotate(180deg)`
+                      : ``,
+                }"
+                :src="
+                  sortType === 1
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                    : sortName === 4
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                    : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                "
+              />
+              <image
+                class="bottomIcon"
+                :style="{
+                  transform:
+                    sortName === 4
+                      ? sortType === 1
+                        ? ``
+                        : `rotate(180deg)`
+                      : 'rotate(-180deg)',
+                }"
+                :src="
+                  sortType === 1 && sortName === 4
+                    ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/downDesc.svg'
+                    : 'https://eshangtech.com/ShopICO/ahyd-BID/car/upDesc.svg'
+                "
+              />
             </view>
           </view>
         </view>
 
         <div class="scrollBox">
-          <scroll-view :scroll-y="true"  class="typeFirst" v-if="dataList && dataList.length>0">
-            <div class="listItem" v-for="(item,index) in dataList" :key="index">
-              <div class="noItem" style="width: 80rpx;align-items: center">
-                <img v-if="index<=2" class="noIcon" :src="index===0?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/first.png':index===1?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/second.png':index===2?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/third.png':''"/>
-                <text class="noOther" v-else>{{index + 1}}</text>
+          <scroll-view
+            :scroll-y="true"
+            class="typeFirst"
+            v-if="dataList && dataList.length > 0"
+          >
+            <div
+              class="listItem"
+              v-for="(item, index) in dataList"
+              :key="index"
+            >
+              <div class="noItem" style="width: 80rpx; align-items: center">
+                <img
+                  v-if="index <= 2"
+                  class="noIcon"
+                  :src="
+                    index === 0
+                      ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/first.png'
+                      : index === 1
+                      ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/second.png'
+                      : index === 2
+                      ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/third.png'
+                      : ''
+                  "
+                />
+                <text class="noOther" v-else>{{ index + 1 }}</text>
               </div>
-              <div class="firstItem" :style="{width:'calc(100% - 440rpx)',textAlign:'left'}">
+              <div
+                class="firstItem"
+                :style="{ width: 'calc(100% - 440rpx)', textAlign: 'left' }"
+              >
                 <div class="itemIcon">
-                  <img class="itemImg" v-if="item.Brand_ICO" :src="item.Brand_ICO "/>
-                  <img class="itemImg" v-else src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/defaultShopIcon.png"/>
+                  <img
+                    class="itemImg"
+                    v-if="item.Brand_ICO"
+                    :src="item.Brand_ICO"
+                  />
+                  <img
+                    class="itemImg"
+                    v-else
+                    src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/defaultShopIcon.png"
+                  />
                 </div>
-                <div class="itemRight" :style="{width:'calc(100% - 128rpx)'}">
-                  <span class="firstItemText">{{item.ServerpartShopName || '-'}}</span>
-                  <span>{{item.RevenueINC.curYearData?item.RevenueINC.curYearData<100?`${item.RevenueINC.curYearData}(元)`:$util.getMoney(item.RevenueINC.curYearData / 10000):'' }}</span>
+                <div
+                  class="itemRight"
+                  :style="{ width: 'calc(100% - 128rpx)' }"
+                >
+                  <span class="firstItemText">{{
+                    item.ServerpartShopName || "-"
+                  }}</span>
+                  <span>{{
+                    item.RevenueINC.curYearData
+                      ? item.RevenueINC.curYearData < 100
+                        ? `${item.RevenueINC.curYearData}(元)`
+                        : $util.getMoney(item.RevenueINC.curYearData / 10000)
+                      : ""
+                  }}</span>
                 </div>
-
               </div>
-<!--              <div class="item" style="width: 110rpx"></div>-->
-              <div class="item" style="width: 110rpx">{{item.RevenueINC.lYearData?item.RevenueINC.lYearData<100?`${item.RevenueINC.lYearData}(元)`:$util.getMoney(item.RevenueINC.lYearData / 10000):''  }}</div>
-              <div class="item" style="width: 110rpx">{{item.RevenueINC.increaseData?item.RevenueINC.increaseData<100 && item.RevenueINC.increaseData>0?`${item.RevenueINC.increaseData}(元)`:$util.getMoney(item.RevenueINC.increaseData / 10000):''  }}</div>
-              <div class="item"  style="width: 110rpx">
-                 <span :style="{color: item.RevenueINC.increaseData>0?'#E83944':item.RevenueINC.increaseRate<0?'#0E9976':''}">
-                      {{item.RevenueINC.increaseRate>0?'+':''}}
-                    </span>
-                <span :style="{color: item.RevenueINC.increaseRate>0?'#E83944':item.RevenueINC.increaseRate<0?'#0E9976':''}">
-                      {{item.RevenueINC.increaseRate?item.RevenueINC.increaseRate+'%':''}}
-                    </span>
+              <!--              <div class="item" style="width: 110rpx"></div>-->
+              <div class="item" style="width: 110rpx">
+                {{
+                  item.RevenueINC.lYearData
+                    ? item.RevenueINC.lYearData < 100
+                      ? `${item.RevenueINC.lYearData}(元)`
+                      : $util.getMoney(item.RevenueINC.lYearData / 10000)
+                    : ""
+                }}
+              </div>
+              <div class="item" style="width: 110rpx">
+                {{
+                  item.RevenueINC.increaseData
+                    ? item.RevenueINC.increaseData < 100 &&
+                      item.RevenueINC.increaseData > 0
+                      ? `${item.RevenueINC.increaseData}(元)`
+                      : $util.getMoney(item.RevenueINC.increaseData / 10000)
+                    : ""
+                }}
+              </div>
+              <div class="item" style="width: 110rpx">
+                <span
+                  :style="{
+                    color:
+                      item.RevenueINC.increaseData > 0
+                        ? '#E83944'
+                        : item.RevenueINC.increaseRate < 0
+                        ? '#0E9976'
+                        : '',
+                  }"
+                >
+                  {{ item.RevenueINC.increaseRate > 0 ? "+" : "" }}
+                </span>
+                <span
+                  :style="{
+                    color:
+                      item.RevenueINC.increaseRate > 0
+                        ? '#E83944'
+                        : item.RevenueINC.increaseRate < 0
+                        ? '#0E9976'
+                        : '',
+                  }"
+                >
+                  {{
+                    item.RevenueINC.increaseRate
+                      ? item.RevenueINC.increaseRate + "%"
+                      : ""
+                  }}
+                </span>
               </div>
-
             </div>
           </scroll-view>
 
           <view class="noDataBox" v-else>
-            <img class="noDataImg" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/noData.svg"/>
+            <img
+              class="noDataImg"
+              src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/noData.svg"
+            />
             <text class="noDataText">暂无数据</text>
           </view>
         </div>
@@ -172,68 +509,114 @@
   </div>
 </template>
 <script>
-import request from '@/util/index.js'
+import request from "@/util/index.js";
 import moment from "moment";
 export default {
   name: "merchantRevenue",
   data() {
     return {
-      statusBarHeight:0,// 胶囊按钮高度
-      menu:'', // 手机属性
-      pageType:1, // 一天还是累计
-      scrollList:[], // 横向滑动日期
-      currentScroll:'', // 选中的日期
-      lastDay:'', // 最近有效日期
-      sortType: 1,// 正序降序 0正序  1降序
-      sortName: 3,// 排序字段 1 24年营收 2 23年营收 3营收增长 4营收增幅
-      dataList:[],
-      type:0,// 判断是要查询哪个数据 1销售   2营收   3车流
-      ServerpartId:'',// 服务区id
-      useInfo:{},
-      ServerpartList:[],
-      currentServerPart:'',
+      statusBarHeight: 0, // 胶囊按钮高度
+      menu: "", // 手机属性
+      pageType: 1, // 一天还是累计
+      scrollList: [], // 横向滑动日期
+      currentScroll: "", // 选中的日期
+      lastDay: "", // 最近有效日期
+      sortType: 1, // 正序降序 0正序  1降序
+      sortName: 3, // 排序字段 1 24年营收 2 23年营收 3营收增长 4营收增幅
+      dataList: [],
+      type: 0, // 判断是要查询哪个数据 1销售   2营收   3车流
+      ServerpartId: "", // 服务区id
+      useInfo: {},
+      ServerpartList: [],
+      currentServerPart: "",
       showSpring: false,
-      springService:null,// 当前选中的服务区
-      selectFestival: 0,// 选择的服务区
-    }
+      springService: null, // 当前选中的服务区
+      selectFestival: 0, // 选择的服务区
+      festivalObj: {},
+    };
   },
-  onLoad(query){
-    console.log('query',query)
+  onLoad(query) {
+    console.log("query", query);
     //  获取手机参数对页面进行适配
-    let systemInfo = uni.getSystemInfoSync()
-    this.statusBarHeight = Number(systemInfo.statusBarHeight)
-    this.menu = uni.getMenuButtonBoundingClientRect()
+    let systemInfo = uni.getSystemInfoSync();
+    this.statusBarHeight = Number(systemInfo.statusBarHeight);
+    this.menu = uni.getMenuButtonBoundingClientRect();
 
-    if (query.ServerpartId){
-      this.ServerpartId = query.ServerpartId
-      this.currentServerPart = `ServerPart` + query.ServerpartId
+    if (query.ServerpartId) {
+      this.ServerpartId = query.ServerpartId;
+      this.currentServerPart = `ServerPart` + query.ServerpartId;
     }
-    if (query.type){
-      this.type = Number(query.type)
+    if (query.type) {
+      this.type = Number(query.type);
     }
-    if (query.festivalType){
-      this.selectFestival = Number(query.festivalType)
+    if (query.festivalType) {
+      this.selectFestival = Number(query.festivalType);
     }
+    if (query.currentScroll) {
+      this.currentScroll = query.currentScroll;
+    }
+    if (query.festivalObj) {
+      this.festivalObj = JSON.parse(query.festivalObj);
+    }
+    this.lastDay = uni.getStorageSync("lastDay");
+    const currentDate = new Date(this.lastDay);
+    let nowTime = currentDate.getTime();
+    let dayList = [];
+    if (
+      new Date(this.festivalObj.startTime).getTime() <= nowTime &&
+      new Date(this.festivalObj.endTime).getTime() > nowTime
+    ) {
+      let dayNumber = moment(this.lastDay).diff(
+        this.festivalObj.startTime,
+        "days"
+      );
+      console.log("dayNumber", dayNumber);
+      if (dayNumber > 0) {
+        for (let i = 0; i < dayNumber; i++) {
+          dayList.push({
+            label: `第${i + 1}天`,
+            value: moment(this.festivalObj.startTime)
+              .add(i, "days")
+              .format("YYYY-MM-DD"),
+          });
+        }
+      }
+    } else if (new Date(this.festivalObj.endTime).getTime() < nowTime) {
+      // 当前时间已经过了这个时间范围了
+      let dayNumber =
+        moment(this.festivalObj.endTime).diff(
+          this.festivalObj.startTime,
+          "days"
+        ) + 1;
+      console.log("dayNumber", dayNumber);
+      if (dayNumber > 0) {
+        for (let i = 0; i < dayNumber; i++) {
+          dayList.push({
+            label: `第${i + 1}天`,
+            value: moment(this.festivalObj.startTime)
+              .add(i, "days")
+              .format("YYYY-MM-DD"),
+          });
+        }
+      }
+    }
+    this.scrollList = dayList;
+    return;
 
     // if (query.serverPartList){
     //   this.ServerpartList = JSON.parse(query.serverPartList)
     // }
     // 获取用户信息
-    let userInfo = uni.getStorageSync('vuex')
-    userInfo = JSON.parse(userInfo)
-    this.useInfo = JSON.parse(JSON.stringify(userInfo))
+    let userInfo = uni.getStorageSync("vuex");
+    userInfo = JSON.parse(userInfo);
+    this.useInfo = JSON.parse(JSON.stringify(userInfo));
 
-    this.lastDay = uni.getStorageSync('lastDay')
+    this.lastDay = uni.getStorageSync("lastDay");
     // this.lastDay = '2024-04-03'
-	console.log('query',query)
-    if (this.selectFestival===0){
-      if (query.currentScroll){
-        this.currentScroll = query.currentScroll
-      }else{
-        this.currentScroll = 'item'+ '2024-03-05'
-      }
-    }else{
-      this.currentScroll = 'item'+  this.lastDay
+    console.log("query", query);
+    if (this.selectFestival === 0) {
+    } else {
+      this.currentScroll = "item" + this.lastDay;
     }
     // else if(this.selectFestival===1){
     //   this.currentScroll = 'item'+  this.lastDay
@@ -243,101 +626,123 @@ export default {
     //   this.currentScroll = 'item'+ this.lastDay
     // }
 
-
     // 拿到是春运开始的第几天
-    let dayNumber = 0
-    const lastDate = new Date(this.lastDay)
-    let y = lastDate.getFullYear()
-    this.curYear = y
-    this.compareYear = y - 1
-    let lastMonth =  lastDate.getMonth() + 1
-    let lastDays = lastDate.getDate()
-    this.allDateDay = `${lastMonth<10?'0'+lastMonth:lastMonth}月${lastDays<10?'0'+lastDays:lastDays}日`
+    let dayNumber = 0;
+    const lastDate = new Date(this.lastDay);
+    let y = lastDate.getFullYear();
+    this.curYear = y;
+    this.compareYear = y - 1;
+    let lastMonth = lastDate.getMonth() + 1;
+    let lastDays = lastDate.getDate();
+    this.allDateDay = `${lastMonth < 10 ? "0" + lastMonth : lastMonth}月${
+      lastDays < 10 ? "0" + lastDays : lastDays
+    }日`;
     // 24年春运开始时间为 1.26
     // if (lastMonth === 1){
     //   dayNumber = lastDays - 26 + 1
     // }else{
     //   dayNumber = 6 + lastDays
     // }
-    if (this.selectFestival===0){
-      dayNumber = moment().diff("2024-01-26", "days")
-      this.howDayNumber = dayNumber<=40?dayNumber:40
-    }else if(this.selectFestival===1){
-      dayNumber = moment().diff("2024-04-03", "days")
-      if (dayNumber<=5){
-        this.howDayNumber = dayNumber
-      }else{
-        this.howDayNumber = 5
-        this.currentScroll = 'item'+ '2024-04-07'
-        this.allDateDay = '2024-04-07'
+    if (this.selectFestival === 0) {
+      dayNumber = moment().diff("2024-01-26", "days");
+      this.howDayNumber = dayNumber <= 40 ? dayNumber : 40;
+    } else if (this.selectFestival === 1) {
+      dayNumber = moment().diff("2024-04-03", "days");
+      if (dayNumber <= 5) {
+        this.howDayNumber = dayNumber;
+      } else {
+        this.howDayNumber = 5;
+        this.currentScroll = "item" + "2024-04-07";
+        this.allDateDay = "2024-04-07";
       }
-    }else if (this.selectFestival===2){
-      dayNumber = moment().diff("2024-04-30", "days")// 劳动
-      if (dayNumber<=7){
-        this.howDayNumber = dayNumber
-      }else{
-        this.howDayNumber = 7
-        this.currentScroll = 'item'+ '2024-05-06'
-        this.lastDay = '2024-05-06'
-        this.allDateDay = '2024-05-06'
+    } else if (this.selectFestival === 2) {
+      dayNumber = moment().diff("2024-04-30", "days"); // 劳动
+      if (dayNumber <= 7) {
+        this.howDayNumber = dayNumber;
+      } else {
+        this.howDayNumber = 7;
+        this.currentScroll = "item" + "2024-05-06";
+        this.lastDay = "2024-05-06";
+        this.allDateDay = "2024-05-06";
       }
-    }else if (this.selectFestival===3){
-      dayNumber = moment().diff("2024-06-07", "days")
-      if (dayNumber<=5){
-        this.howDayNumber = dayNumber
-      }else{
-        this.howDayNumber = 5
-        this.currentScroll = 'item'+ '2024-06-11'
-        this.allDateDay = '2024-06-11'
+    } else if (this.selectFestival === 3) {
+      dayNumber = moment().diff("2024-06-07", "days");
+      if (dayNumber <= 5) {
+        this.howDayNumber = dayNumber;
+      } else {
+        this.howDayNumber = 5;
+        this.currentScroll = "item" + "2024-06-11";
+        this.allDateDay = "2024-06-11";
       }
-    }else if (this.selectFestival===4){
-      dayNumber = moment().diff("2024-07-01", "days")// 暑期
-      if (dayNumber<=62){
-        this.howDayNumber = dayNumber
-      }else{
-        this.howDayNumber = 62
-        this.currentScroll = 'item'+ '2024-08-31'
-        this.lastDay = '2024-08-31'
-        this.allDateDay = '2024-09-01'
+    } else if (this.selectFestival === 4) {
+      dayNumber = moment().diff("2024-07-01", "days"); // 暑期
+      if (dayNumber <= 62) {
+        this.howDayNumber = dayNumber;
+      } else {
+        this.howDayNumber = 62;
+        this.currentScroll = "item" + "2024-08-31";
+        this.lastDay = "2024-08-31";
+        this.allDateDay = "2024-09-01";
       }
-    }else if (this.selectFestival===5){
-      dayNumber = moment().diff("2024-09-14", "days")// 中秋
-      if (dayNumber<=5){
-        this.howDayNumber = dayNumber
-      }else{
-        this.howDayNumber = 5
-        this.currentScroll = 'item'+ '2024-09-18'
-        this.lastDay = '2024-09-18'
-        this.allDateDay = '2024-09-18'
+    } else if (this.selectFestival === 5) {
+      dayNumber = moment().diff("2024-09-14", "days"); // 中秋
+      if (dayNumber <= 5) {
+        this.howDayNumber = dayNumber;
+      } else {
+        this.howDayNumber = 5;
+        this.currentScroll = "item" + "2024-09-18";
+        this.lastDay = "2024-09-18";
+        this.allDateDay = "2024-09-18";
       }
-    }else if (this.selectFestival===6){
-      dayNumber = moment().diff("2024-09-30", "days")// 国庆
-      if (dayNumber<=9){
-        this.howDayNumber = dayNumber
-      }else{
-        this.howDayNumber = 9
-        this.currentScroll = 'item'+ '2024-10-08'
-        this.lastDay = '2024-10-08'
-        this.allDateDay = '2024-10-08'
+    } else if (this.selectFestival === 6) {
+      dayNumber = moment().diff("2024-09-30", "days"); // 国庆
+      if (dayNumber <= 9) {
+        this.howDayNumber = dayNumber;
+      } else {
+        this.howDayNumber = 9;
+        this.currentScroll = "item" + "2024-10-08";
+        this.lastDay = "2024-10-08";
+        this.allDateDay = "2024-10-08";
       }
     }
 
-    let dateList = []
-    for (let i = 1;i<=this.howDayNumber;i++){
-      if (this.selectFestival===0){
-        dateList.push({label:`第${i}天`,value:moment("2024-01-25").add(i, 'days').format("YYYY-MM-DD")})
-      }else if(this.selectFestival===1){
-        dateList.push({label:`第${i}天`,value:moment("2024-04-02").add(i, 'days').format("YYYY-MM-DD")})
-      }else if (this.selectFestival===2){
-        dateList.push({label:`第${i}天`,value:moment("2024-04-29").add(i, 'days').format("YYYY-MM-DD")})
-      }else if (this.selectFestival===3){
-        dateList.push({label:`第${i}天`,value:moment("2024-06-06").add(i, 'days').format("YYYY-MM-DD")})
-      }else if (this.selectFestival===4){
-        dateList.push({label:`第${i}天`,value:moment("2024-06-30").add(i, 'days').format("YYYY-MM-DD")})// 端午
-      }else if (this.selectFestival===5){
-        dateList.push({label:`第${i}天`,value:moment("2024-09-13").add(i, 'days').format("YYYY-MM-DD")})// 端午
-      }else if (this.selectFestival===6){
-        dateList.push({label:`第${i}天`,value:moment("2024-09-29").add(i, 'days').format("YYYY-MM-DD")})// 端午
+    let dateList = [];
+    for (let i = 1; i <= this.howDayNumber; i++) {
+      if (this.selectFestival === 0) {
+        dateList.push({
+          label: `第${i}天`,
+          value: moment("2024-01-25").add(i, "days").format("YYYY-MM-DD"),
+        });
+      } else if (this.selectFestival === 1) {
+        dateList.push({
+          label: `第${i}天`,
+          value: moment("2024-04-02").add(i, "days").format("YYYY-MM-DD"),
+        });
+      } else if (this.selectFestival === 2) {
+        dateList.push({
+          label: `第${i}天`,
+          value: moment("2024-04-29").add(i, "days").format("YYYY-MM-DD"),
+        });
+      } else if (this.selectFestival === 3) {
+        dateList.push({
+          label: `第${i}天`,
+          value: moment("2024-06-06").add(i, "days").format("YYYY-MM-DD"),
+        });
+      } else if (this.selectFestival === 4) {
+        dateList.push({
+          label: `第${i}天`,
+          value: moment("2024-06-30").add(i, "days").format("YYYY-MM-DD"),
+        }); // 端午
+      } else if (this.selectFestival === 5) {
+        dateList.push({
+          label: `第${i}天`,
+          value: moment("2024-09-13").add(i, "days").format("YYYY-MM-DD"),
+        }); // 端午
+      } else if (this.selectFestival === 6) {
+        dateList.push({
+          label: `第${i}天`,
+          value: moment("2024-09-29").add(i, "days").format("YYYY-MM-DD"),
+        }); // 端午
       }
       // if (i<7){
       //   dateList.push({label:`第${i}天`,value:`2024-01-${26+i-1}`})
@@ -345,231 +750,323 @@ export default {
       //   dateList.push({label:`第${i}天`,value:`2024-02-${i - 7 + 1<10?`0${i - 7 + 1}`:i - 7 + 1}`})
       // }
     }
-    this.scrollList = dateList
-    console.log('dateList',dateList)
+    this.scrollList = dateList;
+    console.log("dateList", dateList);
     // this.handleGetPageData()
   },
-  onShow(){
-    let seat = uni.getStorageSync('springService')
-    if (seat){
-      this.springService = seat
-      this.showSpring = true
-      this.dataList = []
-      this.handleGetPageData()
-    }else{
-      this.showSpring = false
+  onShow() {
+    let seat = uni.getStorageSync("springService");
+    if (seat) {
+      this.springService = seat;
+      this.showSpring = true;
+      this.dataList = [];
+      this.handleGetPageData();
+    } else {
+      this.showSpring = false;
     }
   },
-  methods:{
-    handleChangeType(value){
-      this.pageType = value
-      if (value===2){
-        this.handleGetPageData('all')
-      }else{
-        this.handleGetPageData()
+  methods: {
+    handleChangeType(value) {
+      this.pageType = value;
+      if (value === 2) {
+        this.handleGetPageData("all");
+      } else {
+        this.handleGetPageData();
       }
     },
-    handleGoMap(){
-      this.$util.toNextRoute('navigateTo', '/pages/map/index?type=springTravel')
+    handleGoMap() {
+      this.$util.toNextRoute(
+        "navigateTo",
+        "/pages/map/index?type=springTravel"
+      );
     },
     // 拿到页面表格数据
-    async handleGetPageData(date){
+    async handleGetPageData(date) {
       uni.showLoading({
-        title: '正在加载...'
-      })
-      let time = date?
-          date==='all'?this.lastDay:
-              this.currentScroll.split('item')[1]:
-          this.currentScroll.split('item')[1]
+        title: "正在加载...",
+      });
+      let time = date
+        ? date === "all"
+          ? this.festivalObj.endTime
+          : this.currentScroll.split("item")[1]
+        : this.currentScroll.split("item")[1];
       const req = {
-        calcType:this.pageType,
-        pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
-        curYear: this.curYear,
-        compareYear: this.compareYear,
-        HolidayType:this.selectFestival===0?2:this.selectFestival===1?3:this.selectFestival===2?4:this.selectFestival===3?5:this.selectFestival===4?6:this.selectFestival===5?7:this.selectFestival===6?8:'',
+        calcType: this.pageType,
+        pushProvinceCode: "340000",
+        curYear: this.festivalObj.curYear,
+        compareYear: this.festivalObj.compareYear,
+        HolidayType: this.selectFestival,
+        // this.selectFestival === 0
+        //   ? 2
+        //   : this.selectFestival === 1
+        //   ? 3
+        //   : this.selectFestival === 2
+        //   ? 4
+        //   : this.selectFestival === 3
+        //   ? 5
+        //   : this.selectFestival === 4
+        //   ? 6
+        //   : this.selectFestival === 5
+        //   ? 7
+        //   : this.selectFestival === 6
+        //   ? 8
+        //   : "",
         StatisticsDate: time,
         ServerpartId: this.springService.Serverpart_ID || this.ServerpartId,
-        SortStr:`${this.type===1?'revenue':this.type===2?'account':this.type===3?'bayonet':''} ${this.sortType===0?'asc':'desc'}`,
-      }
+        SortStr: `${
+          this.type === 1
+            ? "revenue"
+            : this.type === 2
+            ? "account"
+            : this.type === 3
+            ? "bayonet"
+            : ""
+        } ${this.sortType === 0 ? "asc" : "desc"}`,
+      };
       // this.dataList
-      const data = await request.$webGet('CommercialApi/Revenue/GetShopINCAnalysis',req)
-      if (data.Result_Data){
-        if(data.Result_Code===100){
-          this.dataList = this.handleGetSort(data.Result_Data.ShopINCList)
-        }else{
-          this.dataList = []
+      const data = await request.$webGet(
+        "CommercialApi/Revenue/GetShopINCAnalysis",
+        req
+      );
+      if (data.Result_Data) {
+        if (data.Result_Code === 100) {
+          this.dataList = this.handleGetSort(data.Result_Data.ShopINCList);
+        } else {
+          this.dataList = [];
         }
       }
-      uni.hideLoading()
+      uni.hideLoading();
     },
-    handleChangeTime(date){
-      if (date==='all'){
-        this.currentScroll = 'all'
-        const time = new Date(this.lastDay)
-        let m = time.getMonth()+1
-        let d = time.getDate()
-        this.allDateDay = `${m<10?'0'+m:m}月${d<10?'0' + d:d}日`
-      }else{
-        this.currentScroll = 'item'+ date
-        const time = new Date(date)
-        let m = time.getMonth()+1
-        let d = time.getDate()
-        this.allDateDay = `${m<10?'0'+m:m}月${d<10?'0' + d:d}日`
+    handleChangeTime(date) {
+      if (date === "all") {
+        this.currentScroll = "all";
+        const time = new Date(this.lastDay);
+        let m = time.getMonth() + 1;
+        let d = time.getDate();
+        this.allDateDay = `${m < 10 ? "0" + m : m}月${d < 10 ? "0" + d : d}日`;
+      } else {
+        this.currentScroll = "item" + date;
+        const time = new Date(date);
+        let m = time.getMonth() + 1;
+        let d = time.getDate();
+        this.allDateDay = `${m < 10 ? "0" + m : m}月${d < 10 ? "0" + d : d}日`;
       }
 
-      this.handleGetPageData(date)
+      this.handleGetPageData(date);
     },
     // 修改排序字段
-    handleChangeSortName(value){
+    handleChangeSortName(value) {
       uni.showLoading({
-        title: '正在加载...'
-      })
-      if (value===this.sortName){
-        if (this.sortType===1){
-          this.sortType=0
-        }else{
-          this.sortType=1
+        title: "正在加载...",
+      });
+      if (value === this.sortName) {
+        if (this.sortType === 1) {
+          this.sortType = 0;
+        } else {
+          this.sortType = 1;
         }
-      }else{
-        this.sortName = value
-        this.sortType=1
+      } else {
+        this.sortName = value;
+        this.sortType = 1;
       }
-      let list = this.handleGetSort(this.dataList)
-      this.dataList = list
-      this.$forceUpdate()
-      uni.hideLoading()
+      let list = this.handleGetSort(this.dataList);
+      this.dataList = list;
+      this.$forceUpdate();
+      uni.hideLoading();
     },
     // 排序方法
-    handleGetSort(list){
+    handleGetSort(list) {
       var len = list.length;
 
       for (var i = 0; i < len - 1; i++) {
         for (var j = 0; j < len - 1 - i; j++) {
           // 判断按照那个排序
-          if (this.type===1 || this.type===2){
+          if (this.type === 1 || this.type === 2) {
             // 正序
-            if (this.sortType===0){
+            if (this.sortType === 0) {
               // 24年营收
-              if (this.sortName===1){
-                if (list[j].RevenueINC.curYearData > list[j + 1].RevenueINC.curYearData) { // 比较相邻元素大小并交换位置
+              if (this.sortName === 1) {
+                if (
+                  list[j].RevenueINC.curYearData >
+                  list[j + 1].RevenueINC.curYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 23年营收
-              }else if(this.sortName===2){
-                if (list[j].RevenueINC.lYearData > list[j + 1].RevenueINC.lYearData) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 2) {
+                if (
+                  list[j].RevenueINC.lYearData >
+                  list[j + 1].RevenueINC.lYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增长
-              }else if(this.sortName===3){
-                if (list[j].RevenueINC.increaseData > list[j + 1].RevenueINC.increaseData) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 3) {
+                if (
+                  list[j].RevenueINC.increaseData >
+                  list[j + 1].RevenueINC.increaseData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增幅
-              }else if(this.sortName===4){
-                if (list[j].RevenueINC.increaseRate  > list[j + 1].RevenueINC.increaseRate ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 4) {
+                if (
+                  list[j].RevenueINC.increaseRate >
+                  list[j + 1].RevenueINC.increaseRate
+                ) {
+                  // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+              }
+            } else {
+              // 降序
+              // 24年营收
+              if (this.sortName === 1) {
+                if (
+                  list[j].RevenueINC.curYearData <
+                  list[j + 1].RevenueINC.curYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 23年营收
+              } else if (this.sortName === 2) {
+                if (
+                  list[j].RevenueINC.lYearData <
+                  list[j + 1].RevenueINC.lYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 营收增长
+              } else if (this.sortName === 3) {
+                if (
+                  list[j].RevenueINC.increaseData <
+                  list[j + 1].RevenueINC.increaseData
+                ) {
+                  // 比较相邻元素大小并交换位置
+                  var temp = list[j];
+                  list[j] = list[j + 1];
+                  list[j + 1] = temp;
+                }
+                // 营收增幅
+              } else if (this.sortName === 4) {
+                if (
+                  list[j].RevenueINC.increaseRate <
+                  list[j + 1].RevenueINC.increaseRate
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
               }
             }
-            else{
-              // 降序
-              // 24年营收
-              if (this.sortName===1){
-                if (list[j].RevenueINC.curYearData < list[j + 1].RevenueINC.curYearData) { // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-                // 23年营收
-              }else if(this.sortName===2){
-                if (list[j].RevenueINC.lYearData < list[j + 1].RevenueINC.lYearData) { // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-                // 营收增长
-              }else if(this.sortName===3){
-                if (list[j].RevenueINC.increaseData < list[j + 1].RevenueINC.increaseData) { // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-                // 营收增幅
-              }else if(this.sortName===4){
-                if (list[j].RevenueINC.increaseRate  < list[j + 1].RevenueINC.increaseRate ) { // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-              }
-            }
-          }
-          else if(this.type===3){
+          } else if (this.type === 3) {
             // 正序
-            if (this.sortType===0){
+            if (this.sortType === 0) {
               // 24年车流
-              if (this.sortName===1){
-                if (list[j].BayonetINC.curYearData > list[j + 1].BayonetINC.curYearData) { // 比较相邻元素大小并交换位置
+              if (this.sortName === 1) {
+                if (
+                  list[j].BayonetINC.curYearData >
+                  list[j + 1].BayonetINC.curYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 23年营收
-              }else if(this.sortName===2){
-                if (list[j].BayonetINC.lYearData  > list[j + 1].BayonetINC.lYearData ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 2) {
+                if (
+                  list[j].BayonetINC.lYearData >
+                  list[j + 1].BayonetINC.lYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增长
-              }else if(this.sortName===3){
-                if (list[j].BayonetINC.increaseData   > list[j + 1].BayonetINC.increaseData  ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 3) {
+                if (
+                  list[j].BayonetINC.increaseData >
+                  list[j + 1].BayonetINC.increaseData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增幅
-              }else if(this.sortName===4){
-                if (list[j].BayonetINC.increaseRate > list[j + 1].BayonetINC.increaseRate) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 4) {
+                if (
+                  list[j].BayonetINC.increaseRate >
+                  list[j + 1].BayonetINC.increaseRate
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
               }
-            }else{
+            } else {
               // 降序
               // 24年车流
-              if (this.sortName===1){
-                if (list[j].BayonetINC.curYearData < list[j + 1].BayonetINC.curYearData) { // 比较相邻元素大小并交换位置
+              if (this.sortName === 1) {
+                if (
+                  list[j].BayonetINC.curYearData <
+                  list[j + 1].BayonetINC.curYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 23年营收
-              }else if(this.sortName===2){
-                if (list[j].BayonetINC.lYearData  < list[j + 1].BayonetINC.lYearData ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 2) {
+                if (
+                  list[j].BayonetINC.lYearData <
+                  list[j + 1].BayonetINC.lYearData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增长
-              }else if(this.sortName===3){
-                if (list[j].BayonetINC.increaseData  < list[j + 1].BayonetINC.increaseData  ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 3) {
+                if (
+                  list[j].BayonetINC.increaseData <
+                  list[j + 1].BayonetINC.increaseData
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增幅
-              }else if(this.sortName===4){
-                if (list[j].BayonetINC.increaseRate < list[j + 1].BayonetINC.increaseRate) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 4) {
+                if (
+                  list[j].BayonetINC.increaseRate <
+                  list[j + 1].BayonetINC.increaseRate
+                ) {
+                  // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
@@ -581,19 +1078,19 @@ export default {
       }
       return list;
     },
-    handleBack(){
+    handleBack() {
       uni.navigateBack({
-        delta: 1
+        delta: 1,
       });
     },
-  //   选择服务区
-    handleChangeServerPart(value){
-      this.ServerpartId = value
-      this.currentServerPart = `ServerPart` + value
-      this.handleGetPageData(null)
-    }
-  }
-}
+    //   选择服务区
+    handleChangeServerPart(value) {
+      this.ServerpartId = value;
+      this.currentServerPart = `ServerPart` + value;
+      this.handleGetPageData(null);
+    },
+  },
+};
 </script>
 
 <style scoped lang="scss">
@@ -601,28 +1098,28 @@ export default {
   width: 100%;
   height: 100%;
   background: #fff;
-  .springTop{
+  .springTop {
     background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rankBg.png");
   }
-  .qmTop{
+  .qmTop {
     background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBackground.png");
   }
-  .labourTop{
+  .labourTop {
     background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png");
   }
-  .dragonBoatTop{
-    background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatBg.png");
+  .dragonBoatTop {
+    background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatBg.png");
   }
-  .summerHolidayTop{
-    background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayBg.png");
+  .summerHolidayTop {
+    background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayBg.png");
   }
-  .midAutumnTop{
-    background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnBg.png") !important;
+  .midAutumnTop {
+    background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnBg.png") !important;
   }
-  .nationalDayTop{
-    background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important;
+  .nationalDayTop {
+    background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important;
   }
-  .top{
+  .top {
     width: 100%;
     height: 324rpx;
     //background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rankBg.png");
@@ -631,28 +1128,28 @@ export default {
     background-position: 0 0;
     background-size: 100% 100%;
     position: relative;
-    .headerSpring{
+    .headerSpring {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rankBg.png");
     }
-    .headerQm{
+    .headerQm {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBackground.png");
     }
-    .headerlabour{
+    .headerlabour {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png");
     }
-    .headerDragonBoat{
+    .headerDragonBoat {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatBg.png");
     }
-    .headerSummerHoliday{
-      background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayBg.png");
+    .headerSummerHoliday {
+      background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayBg.png");
     }
-    .headerMidAutumn{
-      background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnBg.png") !important;
+    .headerMidAutumn {
+      background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnBg.png") !important;
     }
-    .headerNationalDay{
-      background-image:url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important;
+    .headerNationalDay {
+      background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important;
     }
-    .header{
+    .header {
       position: fixed;
       width: 100%;
       padding: 0 16px;
@@ -665,20 +1162,20 @@ export default {
       display: flex;
       align-items: center;
       z-index: 3;
-      .backArrow{
+      .backArrow {
         width: 24px;
         height: 24px;
         margin-right: 16px;
         position: absolute;
       }
-      .detailIcon{
+      .detailIcon {
         width: 230rpx;
         height: 48rpx;
         margin-left: 16rpx;
         position: absolute;
         left: 40px;
       }
-      .seachBox{
+      .seachBox {
         position: absolute;
         bottom: 0;
         left: 60px;
@@ -690,45 +1187,45 @@ export default {
         padding: 10rpx 20rpx;
         display: flex;
         align-items: center;
-        .searchIcon{
+        .searchIcon {
           width: 32rpx;
           height: 32rpx;
           margin-right: 8rpx;
         }
-        .searchText{
+        .searchText {
           font-size: 28rpx;
           font-family: PingFangSC, PingFang SC;
           font-weight: 400;
-          color: #B6BACB;
+          color: #b6bacb;
           line-height: 40rpx;
           white-space: nowrap;
         }
       }
-      .picker{
+      .picker {
         position: absolute;
         bottom: 0;
         left: 40px;
-        .selectService{
+        .selectService {
           display: flex;
           align-items: center;
-          .img{
+          .img {
             width: 40px;
             height: 40px;
             z-index: 2;
           }
-          .select{
+          .select {
             height: 32px;
-            background: #F8F8FA;
+            background: #f8f8fa;
             border-radius: 0 16px 16px 0;
             transform: translateX(-20px);
             box-sizing: border-box;
             padding-left: 25px;
             display: flex;
             align-items: center;
-            .content{
+            .content {
               display: flex;
               align-items: center;
-              .uni-input{
+              .uni-input {
                 padding: 0;
                 background: transparent;
                 font-size: 14px;
@@ -736,25 +1233,24 @@ export default {
                 font-weight: 600;
                 color: #160002;
               }
-              .area{
+              .area {
                 font-size: 12px;
                 font-family: PingFangSC-Regular, PingFang SC;
                 font-weight: 400;
-                color: #786B6C;
+                color: #786b6c;
                 line-height: 40px;
                 margin-left: 4px;
               }
-              .rightArrow{
+              .rightArrow {
                 width: 24px;
                 height: 12px;
               }
             }
-
           }
         }
       }
     }
-    .headerNavList{
+    .headerNavList {
       position: absolute;
       width: 100%;
       height: 60rpx;
@@ -763,63 +1259,91 @@ export default {
       white-space: nowrap;
       box-sizing: border-box;
       padding-left: 32rpx;
-      .scrollItem{
+      .scrollItem {
         display: inline-block;
         height: 40rpx;
         font-size: 28rpx;
         font-family: PingFangSC, PingFang SC;
         font-weight: 600;
-        color: #E8A29A;
+        color: #e8a29a;
         line-height: 40rpx;
         margin-right: 40rpx;
       }
-      .selectItem{
+      .selectItem {
         font-size: 28rpx;
         font-family: PingFangSC, PingFang SC;
         font-weight: 600;
-        color: #FFFFFF;
+        color: #ffffff;
         line-height: 40rpx;
         position: relative;
       }
-      .selectItem:after{
-        content:'';
+      .selectItem:after {
+        content: "";
         display: inline-block;
         width: 56rpx;
         height: 6rpx;
         background-color: #fff;
         position: absolute;
-        bottom:  -8rpx;
+        bottom: -8rpx;
         left: 0px;
       }
     }
   }
-  .contentPage{
+  .contentPage {
     width: 100%;
     transform: translateY(-32rpx);
     background: #fff;
     border-radius: 32rpx 32rpx 0rpx 0rpx;
-    .springContentTop{
-      background: linear-gradient(360deg, rgba(255,200,198,0) 0%, #FFC8C6 100%);
+    .springContentTop {
+      background: linear-gradient(
+        360deg,
+        rgba(255, 200, 198, 0) 0%,
+        #ffc8c6 100%
+      );
     }
-    .qmContentTop{
-      background: linear-gradient(360deg, rgba(204,231,224,0) 0%, #CCE7E0 100%);
+    .qmContentTop {
+      background: linear-gradient(
+        360deg,
+        rgba(204, 231, 224, 0) 0%,
+        #cce7e0 100%
+      );
     }
-    .labourContentTop{
-      background: linear-gradient( 360deg, rgba(255,236,208,0) 0%, #FFECD0 100%);
+    .labourContentTop {
+      background: linear-gradient(
+        360deg,
+        rgba(255, 236, 208, 0) 0%,
+        #ffecd0 100%
+      );
     }
-    .dragonBoatContentTop{
-      background: linear-gradient( 360deg, rgba(225,241,237,0) 0%, #E1F1ED 100%);
+    .dragonBoatContentTop {
+      background: linear-gradient(
+        360deg,
+        rgba(225, 241, 237, 0) 0%,
+        #e1f1ed 100%
+      );
     }
-    .summerHolidayContentTop{
-      background:  linear-gradient( 360deg, rgba(214,238,243,0) 0%, #D1E9EE 100%);
+    .summerHolidayContentTop {
+      background: linear-gradient(
+        360deg,
+        rgba(214, 238, 243, 0) 0%,
+        #d1e9ee 100%
+      );
     }
-    .midAutumnContentTop{
-      background: linear-gradient( 360deg, rgba(255,215,180,0) 0%, #FFF3E9 100%);
+    .midAutumnContentTop {
+      background: linear-gradient(
+        360deg,
+        rgba(255, 215, 180, 0) 0%,
+        #fff3e9 100%
+      );
     }
-    .nationalDayContentTop{
-      background: linear-gradient( 360deg, rgba(255,218,210,0) 0%, #FFF2F0 100%);
+    .nationalDayContentTop {
+      background: linear-gradient(
+        360deg,
+        rgba(255, 218, 210, 0) 0%,
+        #fff2f0 100%
+      );
     }
-    .contentTop{
+    .contentTop {
       width: 100%;
       height: 120rpx;
       //background: linear-gradient(360deg, rgba(255,200,198,0) 0%, #FFC8C6 100%);
@@ -827,100 +1351,99 @@ export default {
       border-radius: 32rpx 32rpx 0rpx 0rpx;
       box-sizing: border-box;
       padding: 24rpx 24rpx 0;
-      .content{
+      .content {
         width: 100%;
         box-sizing: border-box;
         display: flex;
         align-items: center;
         justify-content: space-between;
-        .left{
-          .detailLogo{
+        .left {
+          .detailLogo {
             width: 178rpx;
             height: 32rpx;
           }
-          .modalUnit{
+          .modalUnit {
             font-size: 24rpx;
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
-            color: #9A9A9A;
+            color: #9a9a9a;
             line-height: 36rpx;
           }
         }
-        .right{
-          .typeChangeBox{
+        .right {
+          .typeChangeBox {
             display: flex;
             align-items: center;
-            background: #FFFFFF;
+            background: #ffffff;
             border-radius: 6rpx;
             box-sizing: border-box;
             padding: 4rpx;
-            .normal{
+            .normal {
               font-size: 24rpx;
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
-              color: #786B6C;
+              color: #786b6c;
               line-height: 36rpx;
               padding: 6rpx 16rpx;
             }
-            .select{
+            .select {
               font-size: 24rpx;
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
               color: #160002;
               line-height: 36rpx;
-              background: #F5EFEF;
+              background: #f5efef;
               border-radius: 6rpx;
             }
           }
         }
       }
     }
-    .contentBox{
+    .contentBox {
       width: 100%;
       box-sizing: border-box;
       padding: 0 32rpx;
-      .navBigList{
+      .navBigList {
         width: 100%;
         height: 40rpx;
         display: flex;
         align-items: center;
         padding-bottom: 24rpx;
-        border-bottom: 1px solid #F5F4F4;
-        .allBox{
+        border-bottom: 1px solid #f5f4f4;
+        .allBox {
           width: 70rpx;
           height: 100%;
-          .scrollItem{
+          .scrollItem {
             font-size: 28rpx;
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
-            color: #A69E9F;
+            color: #a69e9f;
             line-height: 40rpx;
           }
-          .selectItem{
+          .selectItem {
             font-size: 28rpx;
             font-family: PingFangSC, PingFang SC;
             font-weight: 600;
-            color: #ED3E48;
+            color: #ed3e48;
             line-height: 40rpx;
           }
-
         }
-        .navList{
+        .navList {
           width: 100%;
           height: 40rpx;
           display: flex;
           align-items: center;
           white-space: nowrap;
-          .scrollItem{
+          .scrollItem {
             font-size: 28rpx;
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
-            color: #A69E9F;
+            color: #a69e9f;
             line-height: 40rpx;
             margin-right: 32rpx;
             display: inline-block;
           }
-          .selectItem{
+          .selectItem {
             font-size: 28rpx;
             font-family: PingFangSC, PingFang SC;
             font-weight: 600;
@@ -928,165 +1451,167 @@ export default {
             line-height: 40rpx;
           }
         }
-        .springNav{
+        .springNav {
           .selectItem {
-            color: #ED3E48!important;
+            color: #ed3e48 !important;
           }
         }
-        .qmNav{
+        .qmNav {
           .selectItem {
-            color: #226C61!important;
+            color: #226c61 !important;
           }
         }
-        .labourNav{
-          .selectItem{
-            color: #D14702;
-          }
-        }
-        .dragonBoatNav{
+        .labourNav {
           .selectItem {
-            color: #3E8958!important;
+            color: #d14702;
           }
         }
-        .summerHolidayNav{
+        .dragonBoatNav {
           .selectItem {
-            color: #007797!important;
+            color: #3e8958 !important;
           }
         }
-        .midAutumnNav{
-          .selectItem{
-            color: #DA5015;
+        .summerHolidayNav {
+          .selectItem {
+            color: #007797 !important;
           }
         }
-        .nationalDayNav{
-          .selectItem{
-            color: #D52020;
+        .midAutumnNav {
+          .selectItem {
+            color: #da5015;
+          }
+        }
+        .nationalDayNav {
+          .selectItem {
+            color: #d52020;
           }
         }
       }
 
-      .sortBox{
+      .sortBox {
         display: flex;
         align-items: center;
         justify-content: space-between;
         margin-bottom: 16rpx;
         margin-top: 24rpx;
-        .sortItem{
+        .sortItem {
           display: flex;
           align-items: center;
-          .sortText{
+          .sortText {
             font-size: 24rpx;
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
-            color: #9A9A9A;
+            color: #9a9a9a;
             line-height: 36rpx;
             white-space: nowrap;
           }
-          .sortIconBox{
+          .sortIconBox {
             display: flex;
             flex-direction: column;
             margin-left: 16rpx;
-            .upIcon{
+            .upIcon {
               width: 16rpx;
               height: 12rpx;
               margin-bottom: 4rpx;
             }
-            .bottomIcon{
+            .bottomIcon {
               width: 16rpx;
               height: 12rpx;
             }
           }
         }
       }
-      .scrollBox{
-        .typeFirst{
+      .scrollBox {
+        .typeFirst {
           height: calc(100vh - 300px);
-          .listItem{
+          .listItem {
             width: 100%;
             display: flex;
             //align-items: center;
             align-items: flex-end;
             padding: 16rpx 0;
-            .noItem{
+            .noItem {
               display: flex;
               height: 120rpx;
               align-items: center;
-              .noIcon{
+              .noIcon {
                 width: 40rpx;
                 height: 40rpx;
               }
-              .noOther{
+              .noOther {
                 width: 40rpx;
                 height: 40rpx;
                 display: flex;
                 align-items: center;
                 justify-content: center;
-                background: linear-gradient(141deg, #BABCC3 0%, #CBCCD1 45%, #B5B6BA 100%);
+                background: linear-gradient(
+                  141deg,
+                  #babcc3 0%,
+                  #cbccd1 45%,
+                  #b5b6ba 100%
+                );
                 border-radius: 50%;
                 font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 500;
-                color: #FFFFFF;
+                color: #ffffff;
                 line-height: 24rpx;
               }
             }
-            .item{
+            .item {
               text-align: center;
               font-size: 28rpx;
               font-family: PingFangSC, PingFang SC;
               font-weight: 500;
-              color: #9A9A9A;
+              color: #9a9a9a;
               line-height: 40rpx;
-
             }
-            .firstItem{
+            .firstItem {
               display: flex;
-              .itemIcon{
+              .itemIcon {
                 width: 120rpx;
                 height: 120rpx;
                 border-radius: 16rpx;
                 overflow: hidden;
                 margin-right: 8rpx;
-                .itemImg{
+                .itemImg {
                   width: 100%;
                   height: 100%;
                 }
               }
-              .itemRight{
+              .itemRight {
                 height: 120rpx;
                 display: flex;
                 flex-direction: column;
                 justify-content: space-between;
-                color: #9A9A9A;
-                .firstItemText{
+                color: #9a9a9a;
+                .firstItemText {
                   width: 100%;
                   text-align: left;
                   font-size: 28rpx;
                   font-family: PingFangSC, PingFang SC;
                   font-weight: 500;
-                  color: #9A9A9A;
+                  color: #9a9a9a;
                   overflow: hidden;
                   white-space: nowrap;
                   text-overflow: ellipsis;
                 }
               }
-
             }
           }
         }
-        .noDataBox{
+        .noDataBox {
           width: 100%;
           height: calc(100vh - 300px);
           display: flex;
           flex-direction: column;
           align-items: center;
           justify-content: center;
-          .noDataImg{
+          .noDataImg {
             width: 120rpx;
             height: 120rpx;
           }
-          .noDataText{
-
+          .noDataText {
           }
         }
       }
diff --git a/pages/nationalPage/rankPage.vue b/pages/nationalPage/rankPage.vue
index 522ac80..e5c54c6 100644
--- a/pages/nationalPage/rankPage.vue
+++ b/pages/nationalPage/rankPage.vue
@@ -728,12 +728,60 @@ export default {
     if (query.type) {
       this.type = Number(query.type);
     }
-    if (query.festivalType) {
-      this.selectFestival = Number(query.festivalType);
+    if (query.festivalObj) {
+      this.festivalObj = JSON.parse(query.festivalObj);
+      console.log("this.festivalObj", this.festivalObj);
+      this.selectFestival = this.festivalObj.HolidayType;
     }
     if (query.time) {
       this.currentScroll = "item" + query.time;
+      this.allDateDay = this.currentScroll.split("item")[1];
     }
+
+    this.lastDay = uni.getStorageSync("lastDay");
+    const currentDate = new Date(this.lastDay);
+    let nowTime = currentDate.getTime();
+    let dayList = [];
+    if (
+      new Date(this.festivalObj.startTime).getTime() <= nowTime &&
+      new Date(this.festivalObj.endTime).getTime() > nowTime
+    ) {
+      let dayNumber = moment(this.lastDay).diff(
+        this.festivalObj.startTime,
+        "days"
+      );
+      console.log("dayNumber", dayNumber);
+      if (dayNumber > 0) {
+        for (let i = 0; i < dayNumber; i++) {
+          dayList.push({
+            label: `第${i + 1}天`,
+            value: moment(this.festivalObj.startTime)
+              .add(i, "days")
+              .format("YYYY-MM-DD"),
+          });
+        }
+      }
+    } else if (new Date(this.festivalObj.endTime).getTime() < nowTime) {
+      // 当前时间已经过了这个时间范围了
+      let dayNumber =
+        moment(this.festivalObj.endTime).diff(
+          this.festivalObj.startTime,
+          "days"
+        ) + 1;
+      console.log("dayNumber", dayNumber);
+      if (dayNumber > 0) {
+        for (let i = 0; i < dayNumber; i++) {
+          dayList.push({
+            label: `第${i + 1}天`,
+            value: moment(this.festivalObj.startTime)
+              .add(i, "days")
+              .format("YYYY-MM-DD"),
+          });
+        }
+      }
+    }
+    this.scrollList = dayList;
+    this.handleGetData();
     return;
 
     this.lastDay = uni.getStorageSync("lastDay");
@@ -909,7 +957,7 @@ export default {
         const time = new Date(date);
         let m = time.getMonth() + 1;
         let d = time.getDate();
-        this.allDateDay = `${m < 10 ? "0" + m : m}月${d < 10 ? "0" + d : d}日`;
+        this.allDateDay = date;
       }
 
       this.handleGetData(date);
@@ -926,26 +974,26 @@ export default {
         : this.currentScroll.split("item")[1];
       const req = {
         calcType: this.pageType,
-        pushProvinceCode: this.useInfo.userData.ProvinceCode || "340000",
-        curYear: this.curYear,
-        compareYear: this.compareYear,
-        HolidayType:
-          this.selectFestival === 0
-            ? 2
-            : this.selectFestival === 1
-            ? 3
-            : this.selectFestival === 2
-            ? 4
-            : this.selectFestival === 3
-            ? 5
-            : this.selectFestival === 4
-            ? 6
-            : this.selectFestival === 5
-            ? 7
-            : this.selectFestival === 6
-            ? 8
-            : "",
-        StatisticsDate: time,
+        pushProvinceCode: "340000",
+        curYear: this.festivalObj.curYear,
+        compareYear: this.festivalObj.compareYear,
+        HolidayType: this.selectFestival,
+        // this.selectFestival === 0
+        //   ? 2
+        //   : this.selectFestival === 1
+        //   ? 3
+        //   : this.selectFestival === 2
+        //   ? 4
+        //   : this.selectFestival === 3
+        //   ? 5
+        //   : this.selectFestival === 4
+        //   ? 6
+        //   : this.selectFestival === 5
+        //   ? 7
+        //   : this.selectFestival === 6
+        //   ? 8
+        //   : "",
+        StatisticsDate: this.allDateDay,
         businessRegion: 1,
         SortStr: `${
           this.type === 1
@@ -1320,12 +1368,13 @@ export default {
         Serverpart_ID: obj.ServerpartId,
       };
       uni.setStorageSync("springService", springObj); //当前选中服务区信息
+      console.log("obj", obj);
       this.$util.toNextRoute(
         "navigateTo",
         `/pages/nationalPage/merchantRevenue?ServerpartId=${
           obj.ServerpartId
-        }&type=${this.type}&serverPartList=${JSON.stringify(
-          this.serverPartList
+        }&type=${this.type}&festivalObj=${JSON.stringify(
+          this.festivalObj
         )}&currentScroll=${this.currentScroll}&festivalType=${
           this.selectFestival
         }`
diff --git a/pages/nationalPage/springTravel.vue b/pages/nationalPage/springTravel.vue
index bab7bba..f626307 100644
--- a/pages/nationalPage/springTravel.vue
+++ b/pages/nationalPage/springTravel.vue
@@ -86,14 +86,29 @@
         class="pick"
         @change="handleChangeFestival($event)"
         :value="currentIndex"
-        :range="defaultFestivalList"
+        :range="canSelectFestivalList"
         range-key="label"
       >
+        <!-- :range="defaultFestivalList" -->
         <div
           class="festivalChangeBox"
           :style="{ paddingTop: menu.bottom + 32 + 'px' }"
         >
-          <image
+          <div class="newChangeBox">
+            <image
+              class="changeIcon"
+              src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stDateTime.svg"
+            />
+             <!-- defaultFestivalList[currentIndex].label -->
+            <span class="festivalName">{{
+              canSelectFestivalList[currentIndex].label
+            }}</span>
+            <image
+              class="changeIcon"
+              src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/rightArrow.svg"
+            />
+          </div>
+          <!-- <image
             :style="{
               width:
                 selectFestival === 1 || selectFestival===2
@@ -146,8 +161,8 @@
                 ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayTitleIcon.png'
                 : ''
             "
-          />
-          <image
+          /> -->
+          <!-- <image
             class="changeIcon"
             :src="
               selectFestival === 1 || selectFestival===2
@@ -166,7 +181,7 @@
                 ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayRightArrow.png'
                 : ''
             "
-          />
+          /> -->
         </div>
       </picker>
     </div>
@@ -177,7 +192,7 @@
           <!--  对客营收 -->
           <div
             :class="
-              selectFestival === 1 || selectFestival===2
+              selectFestival === 1 || selectFestival === 2
                 ? 'overAllDataTop springTop'
                 : selectFestival === 3
                 ? 'overAllDataTop qmTop'
@@ -200,7 +215,7 @@
                 <img
                   class="titleImg"
                   :src="
-                    selectFestival === 1 || selectFestival===2
+                    selectFestival === 1 || selectFestival === 2
                       ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allDataTitle.png'
                       : selectFestival === 3
                       ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmSumData.png'
@@ -217,7 +232,10 @@
                       : ''
                   "
                 />
-                <text
+                <text class="titleNotice"
+                  >/共统计节日数据{{ currentHoliday }}天</text
+                >
+                <!-- <text
                   class="titleNotice"
                   v-if="!isShowWarningTime && selectFestival === 0"
                   >{{ `/统计到${StatisticsDate}` }}</text
@@ -241,7 +259,7 @@
                   class="titleNotice"
                   v-if="!isShowWarningTime && selectFestival === 4"
                   >{{ `/统计到${StatisticsDate}` }}</text
-                >
+                > -->
               </div>
               <div class="typeChangeBox" v-if="!showSpring">
                 <div
@@ -325,7 +343,7 @@
             <div class="pkBox">
               <div
                 :class="
-                  selectFestival === 1 || selectFestival===2
+                  selectFestival === 1 || selectFestival === 2
                     ? 'leftBox springLeftBox'
                     : selectFestival === 3
                     ? 'leftBox qmLeftBox'
@@ -351,11 +369,11 @@
               </div>
               <div
                 :class="
-                  selectFestival === 1 || selectFestival===2
+                  selectFestival === 1 || selectFestival === 2
                     ? 'rightBox springRightBox'
                     : selectFestival === 3
                     ? 'rightBox qmRightBox'
-                    : selectFestival ===4
+                    : selectFestival === 4
                     ? 'rightBox labourRightBox'
                     : selectFestival === 5
                     ? 'rightBox dragonBoatRightBox'
@@ -378,7 +396,7 @@
               <img
                 class="pkLogo"
                 :src="
-                  selectFestival === 1 || selectFestival===2
+                  selectFestival === 1 || selectFestival === 2
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/vs.png'
                     : selectFestival === 3
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk1st.png'
@@ -1125,7 +1143,7 @@
             <div class="pkBox">
               <div
                 :class="
-                  selectFestival === 1 || selectFestival===2
+                  selectFestival === 1 || selectFestival === 2
                     ? 'leftBox revenueLeft'
                     : selectFestival === 3
                     ? 'leftBox qmRevenueLeft'
@@ -1137,7 +1155,7 @@
                     ? 'leftBox summerHolidayRevenueLeft'
                     : selectFestival === 7
                     ? 'leftBox midAutumnRevenueLeft'
-                    : selectFestival ===8
+                    : selectFestival === 8
                     ? 'leftBox nationalDayRevenueLeft'
                     : ''
                 "
@@ -1151,7 +1169,7 @@
               </div>
               <div
                 :class="
-                  selectFestival === 1 || selectFestival===2
+                  selectFestival === 1 || selectFestival === 2
                     ? 'rightBox revenueRight'
                     : selectFestival === 3
                     ? 'rightBox qmRevenueRight'
@@ -1178,7 +1196,7 @@
               <img
                 class="pkLogo"
                 :src="
-                  selectFestival === 1 || selectFestival===2
+                  selectFestival === 1 || selectFestival === 2
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueVS.png'
                     : selectFestival === 3
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk2st.png'
@@ -1722,9 +1740,9 @@
             <div class="pkBox" style="margin-bottom: 20px">
               <div
                 :class="
-                  selectFestival === 1 || selectFestival===2
+                  selectFestival === 1 || selectFestival === 2
                     ? 'leftBox carLeft'
-                    : selectFestival ===3
+                    : selectFestival === 3
                     ? 'leftBox qmCarLeft'
                     : selectFestival === 4
                     ? 'leftBox labourCarLeft'
@@ -1748,11 +1766,11 @@
               </div>
               <div
                 :class="
-                  selectFestival === 1 || selectFestival===2
+                  selectFestival === 1 || selectFestival === 2
                     ? 'rightBox carRight'
                     : selectFestival === 3
                     ? 'rightBox qmCarRight'
-                    : selectFestival ===4
+                    : selectFestival === 4
                     ? 'rightBox labourCarRight'
                     : selectFestival === 5
                     ? 'rightBox dragonBoatCarRight'
@@ -1775,7 +1793,7 @@
               <img
                 class="pkLogo"
                 :src="
-                  selectFestival === 1 || selectFestival===2
+                  selectFestival === 1 || selectFestival === 2
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/carVS.png'
                     : selectFestival === 3
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPk3st.png'
@@ -1905,7 +1923,7 @@
         <div class="revenueDetail">
           <div
             :class="
-              selectFestival === 1 || selectFestival===2
+              selectFestival === 1 || selectFestival === 2
                 ? 'springTitleBox revenueDetailTitleBox'
                 : selectFestival === 3
                 ? 'qmTitleBox revenueDetailTitleBox'
@@ -1926,7 +1944,7 @@
             <img
               class="detailLogo"
               :src="
-                selectFestival === 1 || selectFestival===2
+                selectFestival === 1 || selectFestival === 2
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueDetailLogo.png'
                   : selectFestival === 3
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmDaily.png'
@@ -1946,7 +1964,7 @@
             <img
               class="detailIcon"
               :src="
-                selectFestival === 1 || selectFestival===2
+                selectFestival === 1 || selectFestival === 2
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueDetailIcon.png'
                   : selectFestival === 3
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmDetailIcon.png'
@@ -1973,7 +1991,7 @@
               class="goTest"
               @click="handleGoTest"
               :src="
-                selectFestival === 1 || selectFestival===2
+                selectFestival === 1 || selectFestival === 2
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/springTravelBtn.png'
                   : selectFestival === 3
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmPic.png'
@@ -1995,7 +2013,7 @@
             <scroll-view
               scroll-x="true"
               :class="
-                selectFestival === 1 || selectFestival===2
+                selectFestival === 1 || selectFestival === 2
                   ? 'navList springNav'
                   : selectFestival === 3
                   ? 'navList qmNav'
@@ -2039,13 +2057,13 @@
                     class="modalIndex"
                     :style="{
                       background:
-                        selectFestival === 1 || selectFestival===2
+                        selectFestival === 1 || selectFestival === 2
                           ? '#DB6465'
                           : selectFestival === 3
                           ? '#3B9285'
-                          : selectFestival ===4
+                          : selectFestival === 4
                           ? '#D14702'
-                          : selectFestival ===5
+                          : selectFestival === 5
                           ? '#3E8958'
                           : selectFestival === 6
                           ? '#007797'
@@ -2064,7 +2082,7 @@
                     class="moreText"
                     :style="{
                       color:
-                        selectFestival === 1 || selectFestival===2
+                        selectFestival === 1 || selectFestival === 2
                           ? '#ED3E48'
                           : selectFestival === 3
                           ? '#226C61'
@@ -2086,13 +2104,13 @@
                   <img
                     class="moreIcon"
                     :src="
-                      selectFestival === 1 || selectFestival===2
+                      selectFestival === 1 || selectFestival === 2
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png'
                         : selectFestival === 3
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
                         : selectFestival === 4
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
-                        : selectFestival ===5
+                        : selectFestival === 5
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRight.png'
                         : selectFestival === 6
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayRight.png'
@@ -2114,7 +2132,7 @@
                     class="modalIndex"
                     :style="{
                       background:
-                        selectFestival === 1 || selectFestival===2
+                        selectFestival === 1 || selectFestival === 2
                           ? '#DB6465'
                           : selectFestival === 3
                           ? '#3B9285'
@@ -2139,7 +2157,7 @@
                     class="moreText"
                     :style="{
                       color:
-                        selectFestival === 1 || selectFestival===2
+                        selectFestival === 1 || selectFestival === 2
                           ? '#ED3E48'
                           : selectFestival === 3
                           ? '#226C61'
@@ -2161,11 +2179,11 @@
                   <img
                     class="moreIcon"
                     :src="
-                      selectFestival === 1 || selectFestival===2
+                      selectFestival === 1 || selectFestival === 2
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png'
                         : selectFestival === 3
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
-                        : selectFestival ===4
+                        : selectFestival === 4
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
                         : selectFestival === 5
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatRight.png'
@@ -2693,7 +2711,7 @@
                     class="modalIndex"
                     :style="{
                       background:
-                        selectFestival === 1 || selectFestival===2
+                        selectFestival === 1 || selectFestival === 2
                           ? '#DB6465'
                           : selectFestival === 3
                           ? '#3B9285'
@@ -2718,11 +2736,11 @@
                     class="moreText"
                     :style="{
                       color:
-                       selectFestival === 1 || selectFestival===2
+                        selectFestival === 1 || selectFestival === 2
                           ? '#ED3E48'
                           : selectFestival === 3
                           ? '#226C61'
-                          : selectFestival ===4
+                          : selectFestival === 4
                           ? '#D14702'
                           : selectFestival === 5
                           ? '#226C61'
@@ -2740,7 +2758,7 @@
                   <img
                     class="moreIcon"
                     :src="
-                      selectFestival === 1 || selectFestival===2
+                      selectFestival === 1 || selectFestival === 2
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png'
                         : selectFestival === 3
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
@@ -2778,7 +2796,7 @@
                     class="modalIndex"
                     :style="{
                       background:
-                        selectFestival === 1 || selectFestival===2
+                        selectFestival === 1 || selectFestival === 2
                           ? '#DB6465'
                           : selectFestival === 3
                           ? '#3B9285'
@@ -2803,7 +2821,7 @@
                     class="moreText"
                     :style="{
                       color:
-                        selectFestival === 1 || selectFestival===2
+                        selectFestival === 1 || selectFestival === 2
                           ? '#ED3E48'
                           : selectFestival === 3
                           ? '#226C61'
@@ -2825,7 +2843,7 @@
                   <img
                     class="moreIcon"
                     :src="
-                      selectFestival === 1 || selectFestival===2
+                      selectFestival === 1 || selectFestival === 2
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png'
                         : selectFestival === 3
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
@@ -3359,7 +3377,7 @@
                     class="modalIndex"
                     :style="{
                       background:
-                        selectFestival === 1 || selectFestival===2
+                        selectFestival === 1 || selectFestival === 2
                           ? '#DB6465'
                           : selectFestival === 3
                           ? '#3B9285'
@@ -3384,7 +3402,7 @@
                     class="moreText"
                     :style="{
                       color:
-                        selectFestival === 1 || selectFestival===2
+                        selectFestival === 1 || selectFestival === 2
                           ? '#ED3E48'
                           : selectFestival === 3
                           ? '#226C61'
@@ -3406,9 +3424,9 @@
                   <img
                     class="moreIcon"
                     :src="
-                      selectFestival === 1 || selectFestival===2
+                      selectFestival === 1 || selectFestival === 2
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png'
-                        : selectFestival ===3
+                        : selectFestival === 3
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
                         : selectFestival === 4
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourRight.png'
@@ -3444,7 +3462,7 @@
                     class="modalIndex"
                     :style="{
                       background:
-                        selectFestival === 1 || selectFestival===2
+                        selectFestival === 1 || selectFestival === 2
                           ? '#DB6465'
                           : selectFestival === 3
                           ? '#3B9285'
@@ -3452,7 +3470,7 @@
                           ? '#D14702'
                           : selectFestival === 5
                           ? '#3E8958'
-                          : selectFestival ===6
+                          : selectFestival === 6
                           ? '#007797'
                           : selectFestival === 7
                           ? '#DA5015'
@@ -3469,7 +3487,7 @@
                     class="moreText"
                     :style="{
                       color:
-                        selectFestival === 1 || selectFestival===2
+                        selectFestival === 1 || selectFestival === 2
                           ? '#ED3E48'
                           : selectFestival === 3
                           ? '#226C61'
@@ -3491,7 +3509,7 @@
                   <img
                     class="moreIcon"
                     :src="
-                      selectFestival === 1 || selectFestival===2
+                      selectFestival === 1 || selectFestival === 2
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/redRightArrow.png'
                         : selectFestival === 3
                         ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/greenRightArrow.png'
@@ -3861,7 +3879,7 @@ export default {
           HolidayType: 2,
           curYear: 2025,
           compareYear: 2024,
-          startTime: "2025-01-13",
+          startTime: "2025-01-14",
           endTime: "2025-02-23",
           lastYearStart: "2024/01/26",
           lastYearEnd: "2024/03/05",
@@ -3906,9 +3924,9 @@ export default {
           curYear: 2025,
           compareYear: 2024,
           startTime: "2025-06-30",
-          endTime: "2025-09-01",
+          endTime: "2025-08-31",
           lastYearStart: "2024/06/30",
-          lastYearEnd: "2024/09/01",
+          lastYearEnd: "2024/08/31",
         },
         // {
         //   label: "25年中秋",
@@ -3991,9 +4009,9 @@ export default {
           curYear: 2024,
           compareYear: 2023,
           startTime: "2024-06-30",
-          endTime: "2024-09-01",
+          endTime: "2024-08-31",
           lastYearStart: "2023/06/30",
-          lastYearEnd: "2023/09/01",
+          lastYearEnd: "2023/08/31",
         },
         {
           label: "24年中秋",
@@ -4021,6 +4039,8 @@ export default {
       currentFestival: {}, // 当前节日的对象
       currentIndex: 0, // 当前节日的索引
       StatisticsDate: "", // 请求时间
+      currentHoliday: 0, // 当前时间是这个节日的第几天
+      canSelectFestivalList:[], // 可以选择的节日列表
     };
   },
   async onLoad(query) {
@@ -4042,15 +4062,24 @@ export default {
     let nowTime = currentDate.getTime(); // 当前的时间戳 来拿到现在的时间 是过了哪个节日 没到哪个节日
     let currentIndex = 0; // 当前节日的索引
     let currentObj = {}; // 当前节日的对象
+
+    let nowBeforeList = [];
+
     this.defaultFestivalList.forEach((item, index) => {
+      if (new Date(item.startTime).getTime() <= nowTime) {
+        nowBeforeList.push(item);
+      }
+
       if (
-        new Date(item.startTime).getTime() < nowTime &&
+        new Date(item.startTime).getTime() <= nowTime &&
         new Date(item.endTime).getTime() > nowTime
       ) {
         currentIndex = index;
         currentObj = item;
       }
     });
+    console.log("nowBeforeList", nowBeforeList);
+    this.canSelectFestivalList = nowBeforeList
     // 如果当前时间不在任何一个节日范围内 那么 currentObj 肯定是空的  那我们就找已经过了 且最时间最大的
     // 因为默认的节日列表 要25年先  所以还得排序出时间大的
     if (!currentObj.label) {
@@ -4086,10 +4115,11 @@ export default {
     if (currentObj) {
       // 当前时间 在这个节日时间范围内
       if (
-        new Date(currentObj.startTime).getTime() < nowTime &&
+        new Date(currentObj.startTime).getTime() <= nowTime &&
         new Date(currentObj.endTime).getTime() > nowTime
       ) {
-        let dayNumber = moment(this.lastDay).diff(currentObj.startTime, "days");
+        let dayNumber =
+          moment(this.lastDay).diff(currentObj.startTime, "days") + 1;
         console.log("dayNumber", dayNumber);
         if (dayNumber > 0) {
           for (let i = 0; i < dayNumber; i++) {
@@ -4101,6 +4131,7 @@ export default {
             });
           }
         }
+        this.currentHoliday = dayNumber;
         this.currentScroll = "item" + this.lastDay;
         this.StatisticsDate = this.lastDay;
       } else if (new Date(currentObj.endTime).getTime() < nowTime) {
@@ -4118,6 +4149,7 @@ export default {
             });
           }
         }
+        this.currentHoliday = dayNumber;
         this.currentScroll = "item" + currentObj.endTime;
         this.StatisticsDate = currentObj.endTime;
       }
@@ -4370,21 +4402,21 @@ export default {
       let currentObj = this.defaultFestivalList[Number(e.detail.value)];
       this.selectFestival = currentObj.HolidayType;
       this.currentFestival = currentObj;
+      console.log("this.currentFestival", this.currentFestival);
       this.currentIndex = Number(e.detail.value);
       const currentDate = new Date(this.lastDay);
       let nowTime = currentDate.getTime(); // 当前的时间戳 来拿到现在的时间 是过了哪个节日 没到哪个节日
-
+      console.log("currentObj", currentObj);
+      console.log("this.lastDay", this.lastDay);
       let dayList = [];
       if (currentObj) {
         // 当前时间 在这个节日时间范围内
         if (
-          new Date(currentObj.startTime).getTime() < nowTime &&
+          new Date(currentObj.startTime).getTime() <= nowTime &&
           new Date(currentObj.endTime).getTime() > nowTime
         ) {
-          let dayNumber = moment(this.lastDay).diff(
-            currentObj.startTime,
-            "days"
-          );
+          let dayNumber =
+            moment(this.lastDay).diff(currentObj.startTime, "days") + 1;
           console.log("dayNumber", dayNumber);
           if (dayNumber > 0) {
             for (let i = 0; i < dayNumber; i++) {
@@ -4396,6 +4428,7 @@ export default {
               });
             }
           }
+          this.currentHoliday = dayNumber;
           this.currentScroll = "item" + this.lastDay;
           this.StatisticsDate = this.lastDay;
         } else if (new Date(currentObj.endTime).getTime() < nowTime) {
@@ -4413,6 +4446,7 @@ export default {
               });
             }
           }
+          this.currentHoliday = dayNumber;
           this.currentScroll = "item" + currentObj.endTime;
           this.StatisticsDate = currentObj.endTime;
         }
@@ -5465,7 +5499,9 @@ export default {
       let time = this.currentScroll.split("item")[1];
       this.$util.toNextRoute(
         "navigateTo",
-        `/pages/nationalPage/rankPage?type=${type}&time=${time}&festivalType=${this.currentFestival.HolidayType}`
+        `/pages/nationalPage/rankPage?type=${type}&time=${time}&festivalObj=${JSON.stringify(
+          this.currentFestival
+        )}`
       );
     },
     handleGoTest(type) {
@@ -5709,15 +5745,34 @@ export default {
       width: 100%;
       box-sizing: border-box;
       padding: 32rpx;
-      .festivalImg {
-        width: 168rpx;
-        height: 68rpx;
-      }
-      .changeIcon {
-        width: 32rpx;
-        height: 32rpx;
-        margin-left: 12rpx;
+      .newChangeBox {
+        background: #fff;
+        padding: 16rpx 16rpx 16rpx 32rpx;
+        border-radius: 32rpx;
+        display: flex;
+        align-items: center;
+        .festivalName {
+          margin: 0 16rpx;
+          font-size: 28rpx;
+          font-family: PingFangSC, PingFang SC;
+          font-weight: 400;
+          color: #160002;
+          line-height: 36rpx;
+        }
+        .changeIcon {
+          width: 32rpx;
+          height: 32rpx;
+        }
       }
+      // .festivalImg {
+      //   width: 168rpx;
+      //   height: 68rpx;
+      // }
+      // .changeIcon {
+      //   width: 32rpx;
+      //   height: 32rpx;
+      //   margin-left: 12rpx;
+      // }
     }
   }
 
diff --git a/pages/nationalPage/testPage.vue b/pages/nationalPage/testPage.vue
index b0d788f..d161c3f 100644
--- a/pages/nationalPage/testPage.vue
+++ b/pages/nationalPage/testPage.vue
@@ -51,7 +51,7 @@
                   : ''
               "
             />
-            <div class="contentText" v-if="selectFestival === 1">
+            <div class="contentText" v-if="selectFestival === 2">
               根据历史大数据显示：<br />
               <div style="text-indent: 2rem; font-size: 24rpx">
                 服务区会在春运前至农历小年夜前（<span class="red"
@@ -70,13 +70,13 @@
         <div
           class="noticeBox"
           style="height: 500rpx"
-          v-if="selectFestival === 3"
+          v-if="selectFestival === 4"
         >
           <div
             :class="
               selectFestival === 1 || selectFestival === 2
                 ? 'boxBg springBox'
-                : selectFestival ===3
+                : selectFestival === 3
                 ? 'boxBg qmBox'
                 : selectFestival === 4
                 ? 'boxBg labourBox'
@@ -99,7 +99,7 @@
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/imgDesc.png'
                   : selectFestival === 3
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/trendChart.png'
-                  : selectFestival ===4
+                  : selectFestival === 4
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/larburTrendChart.png'
                   : selectFestival === 5
                   ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatChart.png'
@@ -165,7 +165,7 @@
                 :src="
                   selectFestival === 1 || selectFestival === 2
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/allDataTitle.png'
-                    : selectFestival ===3
+                    : selectFestival === 3
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmSumData.png'
                     : selectFestival === 4
                     ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourAllData.png'
@@ -216,7 +216,7 @@
                     ? 'rightBox qmRightBox'
                     : selectFestival === 4
                     ? 'rightBox labourRightBox'
-                    : selectFestival ===5
+                    : selectFestival === 5
                     ? 'rightBox dragonBoatRightBox'
                     : selectFestival === 6
                     ? 'rightBox summerHolidayRightBox'
@@ -609,72 +609,82 @@ export default {
         let realCompareList = [];
 
         if (dataObj && dataObj.compareList && dataObj.compareList.length > 0) {
+          dataObj.compareList.forEach((item) => {
+            realCompareList.push(Number(item.value));
+            compareList.push(Number(item.value) / 10000);
+            const date = new Date(item.name);
+            let m = date.getMonth() + 1;
+            let d = date.getDate();
+            let dateText = `${m}.${d}`;
+            item.easyDate = dateText;
+            compareDateList.push(moment(item.name).format("YYYY-MM-DD"));
+          });
           // 根据字段 拿到开始结束时间 月日  因为年份不好添加 所以只能用月日 来筛选开始结束时间
           console.log("type", typeof dataObj.compareHoliday);
           let startIndex = 0;
           let endIndex = 0;
-          if (dataObj.compareHoliday.indexOf("-") === -1) {
-            let midIndex = 0;
-            let time = dataObj.compareHoliday.replace(".", "/");
-            dataObj.compareList.forEach((item, index) => {
-              let date = new Date(item.name);
-              let dateM = date.getMonth() + 1;
-              if (dateM < 10) {
-                dateM = "0" + dateM;
-              }
-              let dateD = date.getDate();
-              if (dateD < 10) {
-                dateD = "0" + dateD;
-              }
-              let monthDay = `${dateM}/${dateD}`;
-              if (monthDay === time) {
-                midIndex = index;
-              }
-            });
-            startIndex = midIndex - 1;
-            endIndex = midIndex + 1;
-          } else {
-            let [start, end] = dataObj.compareHoliday.split("-");
-            start = start.replace(".", "/");
-            end = end.replace(".", "/");
-            console.log("start", start);
-            console.log("end", end);
-            // 拿到开始结束时间的索引 因为年份不好添加 不好用开始结束时间去判断 所以直接用索引去取
+          // if (dataObj.compareHoliday.indexOf("-") === -1) {
+          //   let midIndex = 0;
+          //   let time = dataObj.compareHoliday.replace(".", "/");
+          //   dataObj.compareList.forEach((item, index) => {
+          //     let date = new Date(item.name);
+          //     let dateM = date.getMonth() + 1;
+          //     if (dateM < 10) {
+          //       dateM = "0" + dateM;
+          //     }
+          //     let dateD = date.getDate();
+          //     if (dateD < 10) {
+          //       dateD = "0" + dateD;
+          //     }
+          //     let monthDay = `${dateM}/${dateD}`;
+          //     if (monthDay === time) {
+          //       midIndex = index;
+          //     }
+          //   });
+          //   startIndex = midIndex - 1;
+          //   endIndex = midIndex + 1;
+          // } else {
+          //   let [start, end] = dataObj.compareHoliday.split("-");
+          //   start = start.replace(".", "/");
+          //   end = end.replace(".", "/");
+          //   console.log("start", start);
+          //   console.log("end", end);
+          //   // 拿到开始结束时间的索引 因为年份不好添加 不好用开始结束时间去判断 所以直接用索引去取
 
-            dataObj.compareList.forEach((item, index) => {
-              let date = new Date(item.name);
-              let dateM = date.getMonth() + 1;
-              if (dateM < 10) {
-                dateM = "0" + dateM;
-              }
-              let dateD = date.getDate();
-              if (dateD < 10) {
-                dateD = "0" + dateD;
-              }
-              let monthDay = `${dateM}/${dateD}`;
-              if (monthDay === start) {
-                startIndex = index;
-              }
-              if (monthDay === end) {
-                endIndex = index;
-              }
-            });
-          }
+          //   dataObj.compareList.forEach((item, index) => {
+          //     let date = new Date(item.name);
+          //     let dateM = date.getMonth() + 1;
+          //     if (dateM < 10) {
+          //       dateM = "0" + dateM;
+          //     }
+          //     let dateD = date.getDate();
+          //     if (dateD < 10) {
+          //       dateD = "0" + dateD;
+          //     }
+          //     let monthDay = `${dateM}/${dateD}`;
+          //     if (monthDay === start) {
+          //       startIndex = index;
+          //     }
+          //     if (monthDay === end) {
+          //       endIndex = index;
+          //     }
+          //   });
+          // }
 
-          // 截取出来的实际数据数组
-          let list = dataObj.compareList.slice(startIndex, endIndex + 1);
-          if (list && list.length > 0) {
-            list.forEach((item) => {
-              realCompareList.push(Number(item.value));
-              compareList.push(Number(item.value) / 10000);
-              const date = new Date(item.name);
-              let m = date.getMonth() + 1;
-              let d = date.getDate();
-              let dateText = `${m}.${d}`;
-              item.easyDate = dateText;
-              compareDateList.push(moment(item.name).format("YYYY-MM-DD"));
-            });
-          }
+          // // 截取出来的实际数据数组
+          // let list = dataObj.compareList.slice(startIndex, endIndex + 1);
+          // if (list && list.length > 0) {
+          //   list.forEach((item) => {
+          //     realCompareList.push(Number(item.value));
+          //     compareList.push(Number(item.value) / 10000);
+          //     const date = new Date(item.name);
+          //     let m = date.getMonth() + 1;
+          //     let d = date.getDate();
+          //     let dateText = `${m}.${d}`;
+          //     item.easyDate = dateText;
+          //     compareDateList.push(moment(item.name).format("YYYY-MM-DD"));
+          //   });
+          // }
         }
         // 今年的具体日期
         let curDateList = [];
@@ -686,71 +696,83 @@ export default {
         let startIndex = 0;
         let endIndex = 0;
         if (dataObj && dataObj.curList && dataObj.curList.length > 0) {
-          if (dataObj.curHoliday.indexOf("-") === -1) {
-            let midIndex = 0;
-            let time = dataObj.curHoliday.replace(".", "/");
-            dataObj.curList.forEach((item, index) => {
-              let date = new Date(item.name);
-              let dateM = date.getMonth() + 1;
-              if (dateM < 10) {
-                dateM = "0" + dateM;
-              }
-              let dateD = date.getDate();
-              if (dateD < 10) {
-                dateD = "0" + dateD;
-              }
-              let monthDay = `${dateM}/${dateD}`;
-              if (monthDay === time) {
-                midIndex = index;
-              }
-            });
-            startIndex = midIndex - 1;
-            endIndex = midIndex + 1;
-          } else {
-            // 根据字段 拿到开始结束时间 月日  因为年份不好添加 所以只能用月日 来筛选开始结束时间
-            let [start, end] = dataObj.curHoliday.split("-");
-            start = start.replace(".", "/");
-            end = end.replace(".", "/");
-            console.log("start", start);
-            console.log("end", end);
+          dataObj.curList.forEach((item) => {
+            realCurList.push(Number(item.value));
+            curListList.push(Number(item.value) / 10000);
+            const date = new Date(item.name);
+            let m = date.getMonth() + 1;
+            let d = date.getDate();
+            let dateText = `${m}.${d}`;
+            item.easyDate = dateText;
+            curDateList.push(moment(item.name).format("YYYY-MM-DD"));
+          });
 
-            dataObj.curList.forEach((item, index) => {
-              let date = new Date(item.name);
-              let dateM = date.getMonth() + 1;
-              if (dateM < 10) {
-                dateM = "0" + dateM;
-              }
-              let dateD = date.getDate();
-              if (dateD < 10) {
-                dateD = "0" + dateD;
-              }
-              let monthDay = `${dateM}/${dateD}`;
-              if (monthDay === start) {
-                startIndex = index;
-              }
-              if (monthDay === end) {
-                endIndex = index;
-              }
-            });
-            // 截取出来的实际数据数组
-            let list = dataObj.curList.slice(startIndex, endIndex + 1);
-            if (list && list.length > 0) {
-              list.forEach((item) => {
-                realCurList.push(Number(item.value));
-                curListList.push(Number(item.value) / 10000);
-                const date = new Date(item.name);
-                let m = date.getMonth() + 1;
-                let d = date.getDate();
-                let dateText = `${m}.${d}`;
-                item.easyDate = dateText;
-                curDateList.push(moment(item.name).format("YYYY-MM-DD"));
-              });
-            }
+          // if (dataObj.curHoliday.indexOf("-") === -1) {
+          //   let midIndex = 0;
+          //   let time = dataObj.curHoliday.replace(".", "/");
+          //   dataObj.curList.forEach((item, index) => {
+          //     let date = new Date(item.name);
+          //     let dateM = date.getMonth() + 1;
+          //     if (dateM < 10) {
+          //       dateM = "0" + dateM;
+          //     }
+          //     let dateD = date.getDate();
+          //     if (dateD < 10) {
+          //       dateD = "0" + dateD;
+          //     }
+          //     let monthDay = `${dateM}/${dateD}`;
+          //     if (monthDay === time) {
+          //       midIndex = index;
+          //     }
+          //   });
+          //   startIndex = midIndex - 1;
+          //   endIndex = midIndex + 1;
+          // } else {
+          //   // 根据字段 拿到开始结束时间 月日  因为年份不好添加 所以只能用月日 来筛选开始结束时间
+          //   let [start, end] = dataObj.curHoliday.split("-");
+          //   start = start.replace(".", "/");
+          //   end = end.replace(".", "/");
+          //   console.log("start", start);
+          //   console.log("end", end);
 
-            console.log("startIndex", startIndex);
-            console.log("endIndex", endIndex);
-            console.log("list", list);
-          }
+          //   dataObj.curList.forEach((item, index) => {
+          //     let date = new Date(item.name);
+          //     let dateM = date.getMonth() + 1;
+          //     if (dateM < 10) {
+          //       dateM = "0" + dateM;
+          //     }
+          //     let dateD = date.getDate();
+          //     if (dateD < 10) {
+          //       dateD = "0" + dateD;
+          //     }
+          //     let monthDay = `${dateM}/${dateD}`;
+          //     if (monthDay === start) {
+          //       startIndex = index;
+          //     }
+          //     if (monthDay === end) {
+          //       endIndex = index;
+          //     }
+          //   });
+
+          //   console.log("startIndex", startIndex);
+          //   console.log("endIndex", endIndex);
+          //   console.log("list", list);
+          // }
+
+          // // 截取出来的实际数据数组
+          // let list = dataObj.curList.slice(startIndex, endIndex + 1);
+          // if (list && list.length > 0) {
+          //   list.forEach((item) => {
+          //     realCurList.push(Number(item.value));
+          //     curListList.push(Number(item.value) / 10000);
+          //     const date = new Date(item.name);
+          //     let m = date.getMonth() + 1;
+          //     let d = date.getDate();
+          //     let dateText = `${m}.${d}`;
+          //     item.easyDate = dateText;
+          //     curDateList.push(moment(item.name).format("YYYY-MM-DD"));
+          //   });
+          // }
         }
         console.log("compareDateMax", compareDateMax);
         console.log("compareDateList", compareDateList);
@@ -789,6 +811,7 @@ export default {
       }
 
       this.res = normalData;
+      this.res2 = normalData;
       this.opts = {
         categories: normalData.categories,
         series: normalData.series,
@@ -840,7 +863,11 @@ export default {
           },
         },
       };
+      let phoneInfo = uni.getStorageSync("phoneInfo");
+      console.log("phoneInfo", phoneInfo);
       this.opts2 = {
+        width: phoneInfo.screenHeight + "px",
+        height: 2 * phoneInfo.screenWidth + "px",
         categories: normalData.categories,
         series: normalData.series,
         animation: false,
@@ -883,6 +910,8 @@ export default {
           },
         },
       };
+      console.log("this.opts2", this.opts2);
+      console.log("this.res2", this.res2);
       uni.hideLoading();
       return;
       // let dateList = [];
@@ -1213,8 +1242,8 @@ export default {
         },
       };
 
-      let phoneInfo = uni.getStorageSync("phoneInfo");
-      console.log("phoneInfo", phoneInfo);
+      // let phoneInfo = uni.getStorageSync("phoneInfo");
+      // console.log("phoneInfo", phoneInfo);
       let _this = this;
       this.opts2 = {
         // width:phoneInfo.screenHeight+'px',
@@ -1266,6 +1295,7 @@ export default {
     },
     handleShowAllScreen() {
       this.allScreen = !this.allScreen;
+      console.log("this.allScreen", this.allScreen);
     },
     getSplitNumber(value) {
       if (value === 0 || value < 5) {