From 2fc99587bf2da489322ebdd0295d409b3ba81158 Mon Sep 17 00:00:00 2001
From: ylj20011123 <YLJ>
Date: Tue, 20 Jan 2026 13:40:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=9B=91=E7=AE=A1=20?=
 =?UTF-8?q?=E5=8F=8C=E4=BA=8C=E7=BB=B4=E7=A0=81=E7=9A=84=E5=8C=BA=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/earlyWarning/projectWarning.vue         |  780 +++--
 pages/earlyWarning/projectWarningDetail.vue   | 1275 ++++----
 pages/index/index.vue                         |  301 +-
 pages/nationalPage/merchantRevenue.vue        | 1080 +++----
 pages/nationalPage/rankPage.vue               | 1269 +++-----
 pages/nationalPage/springTravel.vue           |  244 +-
 pages/revenueStatistics/index.vue             |  119 +-
 pages/revenueStatistics/servicePartList.vue   |  683 +++--
 .../components/businessPortrait.vue           |   10 +-
 .../components/carPortrait.vue                |    4 +-
 .../components/manager/revenueTrends.vue      |    8 +-
 .../components/components/sliderPage.vue      |   11 +-
 .../components/guestPortrait.vue              |   26 +-
 .../components/managePortrait.vue             | 2620 +++++++++--------
 14 files changed, 4232 insertions(+), 4198 deletions(-)

diff --git a/pages/earlyWarning/projectWarning.vue b/pages/earlyWarning/projectWarning.vue
index c1125a2..9877f24 100644
--- a/pages/earlyWarning/projectWarning.vue
+++ b/pages/earlyWarning/projectWarning.vue
@@ -1,15 +1,15 @@
 <template>
   <view class="projectWarningBox">
-    <view class="earlyTop" :style="{height: `calc(${menu.bottom}px + 850rpx)`}">
+    <view class="earlyTop" :style="{ height: `calc(${menu.bottom}px + 850rpx)` }">
       <view class="earlyTopBg"></view>
-      <view class="headerBox" :style="{paddingTop: menu.top + 'px',height:menu.bottom + 4 +'px'}">
-        <view :style="{height:menu.height +'px',display: 'flex',alignItems: 'center',paddingLeft:'32rpx'}">
+      <view class="headerBox" :style="{ paddingTop: menu.top + 'px', height: menu.bottom + 4 + 'px' }">
+        <view :style="{ height: menu.height + 'px', display: 'flex', alignItems: 'center', paddingLeft: '32rpx' }">
           <view class="backIconBox" @click="handleBack">
-            <image class="backIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg"/>
+            <image class="backIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg" />
           </view>
           <view class="timeBox">
             <view class="timeIconBox">
-              <image class="timeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/merchantAccount/selectIcon.svg"/>
+              <image class="timeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/merchantAccount/selectIcon.svg" />
             </view>
             <text class="timeText" @click="handleShowPopup">
               {{ `${startDate}${endDate === startDate ? '' : `-${endDate}`}` }}
@@ -18,23 +18,26 @@
             <!--          <picker class="timeSelect" mode="date" fields="month" :end="end" onChange="handleGetStartTime(e)">{{startDate}}</picker>-->
             <!--          <span class="timeSelect" style="margin: 0 4rpx">-</span>-->
             <!--          <picker class="timeSelect" mode="date" fields="month" :end="end">{{endDate}}</picker>-->
-            <image class="downIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/merchantAccount/downIcon.svg"/>
+            <image class="downIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/merchantAccount/downIcon.svg" />
           </view>
         </view>
       </view>
 
-      <view class="errorWarning" :style="{top: menu.bottom + 18 + 'px'}">
+      <view class="errorWarning" :style="{ top: menu.bottom + 18 + 'px' }">
         <view class="errorTitle">
-          <image class="warningIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/warningIcon.png"/>
+          <image class="warningIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/warningIcon.png" />
           <text class="title">经营项目预警</text>
         </view>
-        <view class="errorContent" >
-          <view v-for="(item,index) in topTabList" :key="index" :class="selectTab===index+1?'errorItem selectErrorItem':'errorItem'" @click="handleChangeTab(index+1)">
+        <view class="errorContent">
+          <view v-for="(item, index) in topTabList" :key="index"
+            :class="selectTab === index + 1 ? 'errorItem selectErrorItem' : 'errorItem'"
+            @click="handleChangeTab(index + 1)">
             <view class="itemLeft">
-              <image class="itemLogo" :src="'https://eshangtech.com/ShopICO/ahyd-BID/warning/error' + (index+1) + 'st.png'"/>
+              <image class="itemLogo"
+                :src="'https://eshangtech.com/ShopICO/ahyd-BID/warning/error' + (index + 1) + 'st.png'" />
             </view>
             <view class="itemRight">
-              <text class="itemValue">{{item.value  || '-'}}</text>
+              <text class="itemValue">{{ item.value || '-' }}</text>
               <text class="itemLabel">{{ item.label || '' }}</text>
             </view>
           </view>
@@ -42,7 +45,7 @@
 
           <view class="messageBox">
             <view style="display: flex;align-items: center">
-              <image class="messageIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error6st.png"/>
+              <image class="messageIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error6st.png" />
               <text class="messageType">{{ warningNameObj[selectTab] }}</text>
             </view>
             <view style="margin-top: 16rpx">
@@ -50,87 +53,87 @@
             </view>
           </view>
 
-<!--          <view :class="selectTab===1?'errorItem selectErrorItem':'errorItem'" @click="handleChangeTab(1)">-->
-<!--            <view class="itemLeft">-->
-<!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error1st.png"/>-->
-<!--            </view>-->
-<!--            <view class="itemRight">-->
-<!--              <text class="itemValue">{{sumObj[1] || '-'}}</text>-->
-<!--              <text class="itemLabel">项目未有营业</text>-->
-<!--            </view>-->
-<!--          </view>-->
+          <!--          <view :class="selectTab===1?'errorItem selectErrorItem':'errorItem'" @click="handleChangeTab(1)">-->
+          <!--            <view class="itemLeft">-->
+          <!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error1st.png"/>-->
+          <!--            </view>-->
+          <!--            <view class="itemRight">-->
+          <!--              <text class="itemValue">{{sumObj[1] || '-'}}</text>-->
+          <!--              <text class="itemLabel">项目未有营业</text>-->
+          <!--            </view>-->
+          <!--          </view>-->
 
-<!--          <view :class="selectTab===2?'errorItem selectErrorItem':'errorItem'" @click="handleChangeTab(2)">-->
-<!--            <view class="itemLeft">-->
-<!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error2st.png"/>-->
-<!--            </view>-->
-<!--            <view class="itemRight">-->
-<!--              <text class="itemValue">{{sumObj[2] || '-'}}</text>-->
-<!--              <text class="itemLabel">项目利润过低</text>-->
-<!--            </view>-->
-<!--          </view>-->
+          <!--          <view :class="selectTab===2?'errorItem selectErrorItem':'errorItem'" @click="handleChangeTab(2)">-->
+          <!--            <view class="itemLeft">-->
+          <!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error2st.png"/>-->
+          <!--            </view>-->
+          <!--            <view class="itemRight">-->
+          <!--              <text class="itemValue">{{sumObj[2] || '-'}}</text>-->
+          <!--              <text class="itemLabel">项目利润过低</text>-->
+          <!--            </view>-->
+          <!--          </view>-->
 
-<!--          <view  :class="selectTab===3?'errorItem selectErrorItem':'errorItem'" @click="handleChangeTab(3)">-->
-<!--            <view class="itemLeft">-->
-<!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error4st.png"/>-->
-<!--            </view>-->
-<!--            <view class="itemRight">-->
-<!--              <text class="itemValue">{{sumObj[3] || '-'}}</text>-->
-<!--              <text class="itemLabel">商家退场告警</text>-->
-<!--            </view>-->
-<!--          </view>-->
+          <!--          <view  :class="selectTab===3?'errorItem selectErrorItem':'errorItem'" @click="handleChangeTab(3)">-->
+          <!--            <view class="itemLeft">-->
+          <!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error4st.png"/>-->
+          <!--            </view>-->
+          <!--            <view class="itemRight">-->
+          <!--              <text class="itemValue">{{sumObj[3] || '-'}}</text>-->
+          <!--              <text class="itemLabel">商家退场告警</text>-->
+          <!--            </view>-->
+          <!--          </view>-->
 
-<!--          <view  :class="selectTab===4?'errorItem selectErrorItem':'errorItem'" @click="handleChangeTab(4)">-->
-<!--            <view class="itemLeft">-->
-<!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error3st.png"/>-->
-<!--            </view>-->
-<!--            <view class="itemRight">-->
-<!--              <text class="itemValue">{{sumObj[4] || '-'}}</text>-->
-<!--              <text class="itemLabel">项目预亏预警</text>-->
-<!--            </view>-->
-<!--          </view>-->
+          <!--          <view  :class="selectTab===4?'errorItem selectErrorItem':'errorItem'" @click="handleChangeTab(4)">-->
+          <!--            <view class="itemLeft">-->
+          <!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error3st.png"/>-->
+          <!--            </view>-->
+          <!--            <view class="itemRight">-->
+          <!--              <text class="itemValue">{{sumObj[4] || '-'}}</text>-->
+          <!--              <text class="itemLabel">项目预亏预警</text>-->
+          <!--            </view>-->
+          <!--          </view>-->
 
 
 
-<!--          <view  :class="selectTab===5?'errorItem selectErrorItem':'errorItem'" @click="handleChangeTab(5)">-->
-<!--            <view class="itemLeft">-->
-<!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error5st.png"/>-->
-<!--            </view>-->
-<!--            <view class="itemRight">-->
-<!--              <text class="itemValue">{{sumObj[5] || '-'}}</text>-->
-<!--              <text class="itemLabel">商家退场预警</text>-->
-<!--            </view>-->
-<!--          </view>-->
+          <!--          <view  :class="selectTab===5?'errorItem selectErrorItem':'errorItem'" @click="handleChangeTab(5)">-->
+          <!--            <view class="itemLeft">-->
+          <!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error5st.png"/>-->
+          <!--            </view>-->
+          <!--            <view class="itemRight">-->
+          <!--              <text class="itemValue">{{sumObj[5] || '-'}}</text>-->
+          <!--              <text class="itemLabel">商家退场预警</text>-->
+          <!--            </view>-->
+          <!--          </view>-->
 
-<!--          <view  :class="selectTab===6?'errorItem selectErrorItem':'errorItem'" @click="handleChangeTab(6)">-->
-<!--            <view class="itemLeft">-->
-<!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error6st.png"/>-->
-<!--            </view>-->
-<!--            <view class="itemRight">-->
-<!--              <text class="itemValue">{{sumObj[6] || '-'}}</text>-->
-<!--              <text class="itemLabel">租金提成偏低</text>-->
-<!--            </view>-->
-<!--          </view>-->
+          <!--          <view  :class="selectTab===6?'errorItem selectErrorItem':'errorItem'" @click="handleChangeTab(6)">-->
+          <!--            <view class="itemLeft">-->
+          <!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error6st.png"/>-->
+          <!--            </view>-->
+          <!--            <view class="itemRight">-->
+          <!--              <text class="itemValue">{{sumObj[6] || '-'}}</text>-->
+          <!--              <text class="itemLabel">租金提成偏低</text>-->
+          <!--            </view>-->
+          <!--          </view>-->
 
-<!--          <view  :class="selectTab===7?'errorItem selectErrorItem':'errorItem'" style="margin-bottom: 0" @click="handleChangeTab(7)">-->
-<!--            <view class="itemLeft">-->
-<!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error7st.png"/>-->
-<!--            </view>-->
-<!--            <view class="itemRight">-->
-<!--              <text class="itemValue">{{sumObj[7] || '-'}}</text>-->
-<!--              <text class="itemLabel">保底租金过高</text>-->
-<!--            </view>-->
-<!--          </view>-->
+          <!--          <view  :class="selectTab===7?'errorItem selectErrorItem':'errorItem'" style="margin-bottom: 0" @click="handleChangeTab(7)">-->
+          <!--            <view class="itemLeft">-->
+          <!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error7st.png"/>-->
+          <!--            </view>-->
+          <!--            <view class="itemRight">-->
+          <!--              <text class="itemValue">{{sumObj[7] || '-'}}</text>-->
+          <!--              <text class="itemLabel">保底租金过高</text>-->
+          <!--            </view>-->
+          <!--          </view>-->
 
-<!--          <view  :class="selectTab===8?'errorItem selectErrorItem':'errorItem'" style="margin-bottom: 0" @click="handleChangeTab(8)">-->
-<!--            <view class="itemLeft">-->
-<!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error8st.png"/>-->
-<!--            </view>-->
-<!--            <view class="itemRight">-->
-<!--              <text class="itemValue">{{sumObj[8] || '-'}}</text>-->
-<!--              <text class="itemLabel">业态缺失告警</text>-->
-<!--            </view>-->
-<!--          </view>-->
+          <!--          <view  :class="selectTab===8?'errorItem selectErrorItem':'errorItem'" style="margin-bottom: 0" @click="handleChangeTab(8)">-->
+          <!--            <view class="itemLeft">-->
+          <!--              <image class="itemLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error8st.png"/>-->
+          <!--            </view>-->
+          <!--            <view class="itemRight">-->
+          <!--              <text class="itemValue">{{sumObj[8] || '-'}}</text>-->
+          <!--              <text class="itemLabel">业态缺失告警</text>-->
+          <!--            </view>-->
+          <!--          </view>-->
         </view>
       </view>
     </view>
@@ -138,14 +141,14 @@
     <view class="servicepartContent">
       <view class="contentTitle">
         <view style="display: flex;align-items: center">
-          <image class="contentIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/foodIcon.png"/>
+          <image class="contentIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/foodIcon.png" />
           <view class="titleBox">
             <text class="title">商家数据</text>
           </view>
         </view>
         <view class="fixedRight" @click="handleShowPopup">
-          <view v-if="searchCount>0" class="searchCountBox">{{searchCount}}</view>
-          <image v-else class="filterIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/filter.png"/>
+          <view v-if="searchCount > 0" class="searchCountBox">{{ searchCount }}</view>
+          <image v-else class="filterIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/filter.png" />
           筛选
         </view>
       </view>
@@ -153,62 +156,62 @@
 
 
       <view class="selectBox" v-if="false">
-        <scroll-view 	scroll-x="true"  class="scrollBox">
-<!--          topTabList-->
+        <scroll-view scroll-x="true" class="scrollBox">
+          <!--          topTabList-->
           <view style="display: inline-block">
-            <view :class="selectTab===1?'scrollItem selectScroll':'scrollItem'" @click="handleChangeTab(1)">
-              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error1st.png"/>
+            <view :class="selectTab === 1 ? 'scrollItem selectScroll' : 'scrollItem'" @click="handleChangeTab(1)">
+              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error1st.png" />
               <text class="text">未营业</text>
             </view>
           </view>
           <view style="display: inline-block">
-            <view :class="selectTab===2?'scrollItem selectScroll':'scrollItem'" @click="handleChangeTab(2)">
-              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error2st.png"/>
+            <view :class="selectTab === 2 ? 'scrollItem selectScroll' : 'scrollItem'" @click="handleChangeTab(2)">
+              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error2st.png" />
               <text class="text">利润低</text>
             </view>
           </view>
           <view style="display: inline-block">
-            <view :class="selectTab===3?'scrollItem selectScroll':'scrollItem'" @click="handleChangeTab(3)">
-              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error3st.png"/>
+            <view :class="selectTab === 3 ? 'scrollItem selectScroll' : 'scrollItem'" @click="handleChangeTab(3)">
+              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error3st.png" />
               <text class="text">退场告警</text>
             </view>
           </view>
           <view style="display: inline-block">
-            <view :class="selectTab===4?'scrollItem selectScroll':'scrollItem'" @click="handleChangeTab(4)">
-              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error4st.png"/>
+            <view :class="selectTab === 4 ? 'scrollItem selectScroll' : 'scrollItem'" @click="handleChangeTab(4)">
+              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error4st.png" />
               <text class="text">预亏</text>
             </view>
           </view>
           <view style="display: inline-block">
-            <view :class="selectTab===5?'scrollItem selectScroll':'scrollItem'" @click="handleChangeTab(5)">
-              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error5st.png"/>
+            <view :class="selectTab === 5 ? 'scrollItem selectScroll' : 'scrollItem'" @click="handleChangeTab(5)">
+              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error5st.png" />
               <text class="text">退场预警</text>
             </view>
           </view>
           <view style="display: inline-block">
-            <view :class="selectTab===6?'scrollItem selectScroll':'scrollItem'" @click="handleChangeTab(6)">
-              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error6st.png"/>
+            <view :class="selectTab === 6 ? 'scrollItem selectScroll' : 'scrollItem'" @click="handleChangeTab(6)">
+              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error6st.png" />
               <text class="text">提成低</text>
             </view>
           </view>
           <view style="display: inline-block">
-            <view :class="selectTab===7?'scrollItem selectScroll':'scrollItem'" @click="handleChangeTab(7)">
-              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error7st.png"/>
+            <view :class="selectTab === 7 ? 'scrollItem selectScroll' : 'scrollItem'" @click="handleChangeTab(7)">
+              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error7st.png" />
               <text class="text">租金高</text>
             </view>
           </view>
           <view style="display: inline-block">
-            <view :class="selectTab===8?'scrollItem selectScroll':'scrollItem'" @click="handleChangeTab(8)">
-              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error8st.png"/>
+            <view :class="selectTab === 8 ? 'scrollItem selectScroll' : 'scrollItem'" @click="handleChangeTab(8)">
+              <image class="itemImg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error8st.png" />
               <text class="text">业态缺失</text>
             </view>
           </view>
         </scroll-view>
-<!--        <view class="fixedRight" @click="handleShowPopup">-->
-<!--          <view v-if="searchCount>0" class="searchCountBox">{{searchCount}}</view>-->
-<!--          <image v-else class="filterIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/filter.png"/>-->
-<!--          筛选-->
-<!--        </view>-->
+        <!--        <view class="fixedRight" @click="handleShowPopup">-->
+        <!--          <view v-if="searchCount>0" class="searchCountBox">{{searchCount}}</view>-->
+        <!--          <image v-else class="filterIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/filter.png"/>-->
+        <!--          筛选-->
+        <!--        </view>-->
       </view>
 
       <view class="dataList">
@@ -220,28 +223,34 @@
           <view class="sortItem" style="width: 25%;justify-content: flex-end" @click="handleChangeSortName(1)">
             <text class="sortName">营收金额</text>
             <view class="sortIconBox">
-              <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: 25%;justify-content: flex-end" @click="handleChangeSortName(2)">
             <text class="sortName">盈利金额</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>
 
         <view class="listContent">
-          <view class="listItem" v-for="(item,index) in dataList" :key="index" @click="handleGoDetail(item)">
-            <image class="bg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/shopItemBg.png"/>
+          <view class="listItem" v-for="(item, index) in dataList" :key="index" @click="handleGoDetail(item)">
+            <image class="bg" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/shopItemBg.png" />
             <view class="listItemLeft">
               <view class="picBox">
-                <image class="shopLogo" :src="item.Brand_ICO"/>
+                <image class="shopLogo" :src="item.Brand_ICO" />
               </view>
 
-              <view class="stateBox" v-if="item.BUSINESS_STATE===3000">
+              <view class="stateBox" v-if="item.BUSINESS_STATE === 3000">
                 <view class="stateIcon"></view>
                 <text class="stateText">关闭</text>
               </view>
@@ -249,18 +258,19 @@
             <view class="listItemRight">
               <view class="rightTop">
                 <view class="rightTopLeft">
-                  <image v-if="index<=2" class="sortIcon" :src="index===0?'https://eshangtech.com/ShopICO/ahyd-BID/warning/sort1st.png':index===1?'https://eshangtech.com/ShopICO/ahyd-BID/warning/sort2st.png':index===2?'https://eshangtech.com/ShopICO/ahyd-BID/warning/sort3st.png':''"/>
-                  <view class="otherIcon" v-else>{{index + 1}}</view>
+                  <image v-if="index <= 2" class="sortIcon"
+                    :src="index === 0 ? 'https://eshangtech.com/ShopICO/ahyd-BID/warning/sort1st.png' : index === 1 ? 'https://eshangtech.com/ShopICO/ahyd-BID/warning/sort2st.png' : index === 2 ? 'https://eshangtech.com/ShopICO/ahyd-BID/warning/sort3st.png' : ''" />
+                  <view class="otherIcon" v-else>{{ index + 1 }}</view>
                   <text class="shopName">{{ item.SERVERPARTSHOP_NAME || '' }}</text>
                 </view>
                 <view class="rightTopRight">
-                  <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
+                  <image class="moreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg" />
                 </view>
               </view>
               <view class="MERCHANTS_NAMEBox">
-                <text class="MERCHANTS_NAME">{{item.MERCHANTS_NAME || ''}}</text>
-<!--                style="margin-right: 12rpx"-->
-                <text class="type" >{{ businessTypeObj[item.BUSINESS_TYPE] }}</text>
+                <text class="MERCHANTS_NAME">{{ item.MERCHANTS_NAME || '' }}</text>
+                <!--                style="margin-right: 12rpx"-->
+                <text class="type">{{ businessTypeObj[item.BUSINESS_TYPE] }}</text>
               </view>
               <view class="rightBottom">
                 <text class="endTime">{{ `项目期数：${item.PERIOD_INDEX}， ${item.STARTDATE}-${item.ENDDATE}` }}</text>
@@ -268,17 +278,25 @@
               <view class="rightBottomMoney">
                 <view style="width: 50%">
                   <view class="moneyItem">
-                    <text class="value">{{item.REVENUE_AMOUNT?$util.getMoney(item.REVENUE_AMOUNT / 10000):'-'}}</text>
+                    <text class="value">{{ item.REVENUE_AMOUNT ? $util.getMoney(item.REVENUE_AMOUNT / 10000) : '-'
+                    }}</text>
                     <text class="unit">营收 /万元</text>
                   </view>
                 </view>
                 <view style="width: 50%;position: relative" @click.stop="handleShowDetail(item)">
                   <view class="moneyItem">
-                    <text class="value">{{item.PROFIT_AMOUNT?$util.getMoney(item.PROFIT_AMOUNT / 10000):'-'}}</text>
+                    <text class="value">{{ item.PROFIT_AMOUNT ? $util.getMoney(item.PROFIT_AMOUNT / 10000) : '-'
+                    }}</text>
                     <text class="unit">盈利 /万元</text>
                   </view>
                   <view class="moneyDetailFixed" v-if="item.showDetail" @click.stop="handleCloseDetail(item)">
-                    {{`营业金额（${item.REVENUE_AMOUNT ? $util.getMoney(item.REVENUE_AMOUNT / 10000) : 0}万元）-甲方利润（${item.ROYALTY_THEORY ? $util.getMoney(item.ROYALTY_THEORY / 10000) : 0}万元）- 商家成本预估(20%营业额；${item.LABOURS_COUNT?`员工${item.LABOURS_COUNT || 0}人；`:''}${item.LABOURS_WAGE?`月均${item.LABOURS_WAGE || 0}元/人；`:''}${item.DEPRECIATION_EXPENSE?`折旧费${item.DEPRECIATION_EXPENSE || 0}万元/3年；`:''}${item.OTHER_EXPENSE?`其他运营成本${item.OTHER_EXPENSE || 0}万元`:''})（${$util.getMoney(item.COST_AMOUNT /10000)  || 0}万元）`}}
+                    {{ `营业金额（${item.REVENUE_AMOUNT ? $util.getMoney(item.REVENUE_AMOUNT / 10000) :
+                      0}万元）-甲方利润（${item.ROYALTY_THEORY ? $util.getMoney(item.ROYALTY_THEORY / 10000) : 0}万元）-
+                    商家成本预估(20%营业额；${item.LABOURS_COUNT ? `员工${item.LABOURS_COUNT ||
+                        0}人；` : ''}${item.LABOURS_WAGE ? `月均${item.LABOURS_WAGE ||
+                          0}元/人；` : ''}${item.DEPRECIATION_EXPENSE ? `折旧费${item.DEPRECIATION_EXPENSE ||
+                            0}万元/3年；` : ''}${item.OTHER_EXPENSE ? `其他运营成本${item.OTHER_EXPENSE ||
+                              0}万元` : ''})（${$util.getMoney(item.COST_AMOUNT / 10000) || 0}万元）` }}
                   </view>
                 </view>
               </view>
@@ -292,35 +310,46 @@
       <view class="uniPopup">
         <view class="uniPopupTop">
           <text class="uniPopupTitle">筛选</text>
-          <image @click="hidePopup" class="close" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/close.svg"></image>
+          <image @click="hidePopup" class="close" src="https://eshangtech.com/ShopICO/ahyd-BID/examine/close.svg">
+          </image>
         </view>
 
         <view class="filterBox">
           <view class="filterTitle">统计时间</view>
           <view class="filterTimeBox">
-            <picker class="timeSelect" mode="date" fields="month" :value="$moment(startDate).format('YYYY-MM')" :start="'2024-01-01'" :end="end" @change="handleGetStartTime">{{startDate}}</picker>
+            <picker class="timeSelect" mode="date" fields="month" :value="$moment(startDate).format('YYYY-MM')"
+              :start="'2024-01-01'" :end="end" @change="handleGetStartTime">{{ startDate }}</picker>
             <span class="timeSelect" style="margin: 0 4rpx">-</span>
-            <picker class="timeSelect" mode="date" fields="month" :value="$moment(endDate).format('YYYY-MM')" :start="start" :end="end" @change="handleGetEndTime">{{endDate}}</picker>
+            <picker class="timeSelect" mode="date" fields="month" :value="$moment(endDate).format('YYYY-MM')"
+              :start="start" :end="end" @change="handleGetEndTime">{{ endDate }}</picker>
           </view>
         </view>
 
         <view class="filterBox" style="margin-top: 48rpx">
           <view class="filterTitle">经营状态</view>
           <view class="filterItemList">
-            <view :class="businessStatus===1000?'filterItem selectFilterItem':'filterItem'" @click="handleChangeBusinessStatus(1000)">运营中</view>
-            <view :class="businessStatus===1010?'filterItem selectFilterItem':'filterItem'" @click="handleChangeBusinessStatus(1010)">待运营</view>
-            <view :class="businessStatus===2000?'filterItem selectFilterItem':'filterItem'" @click="handleChangeBusinessStatus(2000)">暂停</view>
-            <view :class="businessStatus===3000?'filterItem selectFilterItem':'filterItem'" @click="handleChangeBusinessStatus(3000)">关闭</view>
+            <view :class="businessStatus === 1000 ? 'filterItem selectFilterItem' : 'filterItem'"
+              @click="handleChangeBusinessStatus(1000)">运营中</view>
+            <view :class="businessStatus === 1010 ? 'filterItem selectFilterItem' : 'filterItem'"
+              @click="handleChangeBusinessStatus(1010)">待运营</view>
+            <view :class="businessStatus === 2000 ? 'filterItem selectFilterItem' : 'filterItem'"
+              @click="handleChangeBusinessStatus(2000)">暂停</view>
+            <view :class="businessStatus === 3000 ? 'filterItem selectFilterItem' : 'filterItem'"
+              @click="handleChangeBusinessStatus(3000)">关闭</view>
           </view>
         </view>
 
         <view class="filterBox" style="margin-top: 48rpx">
           <view class="filterTitle">经营模式</view>
           <view class="filterItemList">
-            <view :class="businessType===1000?'filterItem selectFilterItem':'filterItem'" @click="handleChangeBusinessType(1000)">合作经营</view>
-            <view :class="businessType===2000?'filterItem selectFilterItem':'filterItem'" @click="handleChangeBusinessType(2000)">固定租金</view>
-            <view :class="businessType===3000?'filterItem selectFilterItem':'filterItem'" @click="handleChangeBusinessType(3000)">保底采购</view>
-            <view :class="businessType===4000?'filterItem selectFilterItem':'filterItem'" @click="handleChangeBusinessType(4000)">业主自营</view>
+            <view :class="businessType === 1000 ? 'filterItem selectFilterItem' : 'filterItem'"
+              @click="handleChangeBusinessType(1000)">合作经营</view>
+            <view :class="businessType === 2000 ? 'filterItem selectFilterItem' : 'filterItem'"
+              @click="handleChangeBusinessType(2000)">固定租金</view>
+            <view :class="businessType === 3000 ? 'filterItem selectFilterItem' : 'filterItem'"
+              @click="handleChangeBusinessType(3000)">保底采购</view>
+            <view :class="businessType === 4000 ? 'filterItem selectFilterItem' : 'filterItem'"
+              @click="handleChangeBusinessType(4000)">业主自营</view>
           </view>
         </view>
 
@@ -336,21 +365,21 @@ import request from '@/util/index.js'
 
 export default {
   name: "projectWarning",
-  components: {UniPopup},
-  data(){
+  components: { UniPopup },
+  data() {
     return {
-      menu:{},
-      showPop:false,// 弹出框
-      startDate: moment().subtract(1,'months').format('YYYY/MM'),//开始时间
-      endDate: moment().subtract(1,'months').format('YYYY/MM'),// 结束时间
-      start:  moment().subtract(1,'months').format('YYYY/MM'),// 结束时间开始范围
+      menu: {},
+      showPop: false,// 弹出框
+      startDate: moment().subtract(1, 'months').format('YYYY/MM'),//开始时间
+      endDate: moment().subtract(1, 'months').format('YYYY/MM'),// 结束时间
+      start: moment().subtract(1, 'months').format('YYYY/MM'),// 结束时间开始范围
       end: moment().format('YYYY/MM'),// 结束的时间范围
       businessStatus: 0,// 经营状态
       businessType: 0,// 经营模式
-      allServerPartId:'',// 所有服务区的id
+      allServerPartId: '',// 所有服务区的id
       selectTab: 1,
       dataList: [],
-      businessTypeObj:{
+      businessTypeObj: {
         1000: "合作经营",
         2000: "固定租金",
         3000: "保底采购",
@@ -359,13 +388,13 @@ export default {
       searchCount: 0,// 搜索条件数量
       sortName: 1,// 1是营收金额 2是盈利金额
       sortType: 1,// 1是降序 2是升序
-      sumObj:{},
-      warningNameObj:{},// 预警类型名称对象
-      warningDescObj:{},// 预警类型备注对象
-      topTabList:[],// 顶部的tab选择列表
+      sumObj: {},
+      warningNameObj: {},// 预警类型名称对象
+      warningDescObj: {},// 预警类型备注对象
+      topTabList: [],// 顶部的tab选择列表
     }
   },
-  onLoad(){
+  onLoad() {
     let systemInfo = uni.getSystemInfoSync()
     this.menu = uni.getMenuButtonBoundingClientRect()
     let userInfo = uni.getStorageSync('vuex')
@@ -373,75 +402,75 @@ export default {
     let useInfoObj = JSON.parse(JSON.stringify(userInfo))
     let serverList = useInfoObj.userData.serverPartList
     let serverPartId = ''
-    console.log('useInfoObj',useInfoObj)
-    if (serverList && serverList.length>0){
-      serverList.forEach(item=>{
-        if (serverPartId){
-          serverPartId +=`,${item.value}`
-        }else{
+    console.log('useInfoObj', useInfoObj)
+    if (serverList && serverList.length > 0) {
+      serverList.forEach(item => {
+        if (serverPartId) {
+          serverPartId += `,${item.value}`
+        } else {
           serverPartId = item.value
         }
       })
     }
     this.allServerPartId = serverPartId
-    console.log('this.allServerPartId',this.allServerPartId)
+    console.log('this.allServerPartId', this.allServerPartId)
     this.handleGetWarningType()
     this.handleGetWarningSum()
 
     this.handleGetPageData()
     this.handleGetSearchCount()
   },
-  methods:{
+  methods: {
     // 展示盈利具体是怎么算的
-    handleShowDetail(obj){
-      console.log('obj',obj)
+    handleShowDetail(obj) {
+      console.log('obj', obj)
       let list = JSON.parse(JSON.stringify(this.dataList))
-      console.log('list',list)
-      list.forEach(item=>{
-        if(item.BUSINESSPROJECT_ID === obj.BUSINESSPROJECT_ID){
+      console.log('list', list)
+      list.forEach(item => {
+        if (item.BUSINESSPROJECT_ID === obj.BUSINESSPROJECT_ID) {
           item.showDetail = true
         }
       })
       this.dataList = list
     },
     // 关闭盈利
-    handleCloseDetail(obj){
-      console.log('obj',obj)
+    handleCloseDetail(obj) {
+      console.log('obj', obj)
       let list = JSON.parse(JSON.stringify(this.dataList))
-      console.log('list',list)
-      list.forEach(item=>{
-        if(item.BUSINESSPROJECT_ID === obj.BUSINESSPROJECT_ID){
+      console.log('list', list)
+      list.forEach(item => {
+        if (item.BUSINESSPROJECT_ID === obj.BUSINESSPROJECT_ID) {
           item.showDetail = false
         }
       })
       this.dataList = list
     },
     // 修改排序
-    handleChangeSortName(value){
-      if (value===this.sortName){
-        if (this.sortType===1){
-          this.sortType=0
-        }else{
-          this.sortType=1
+    handleChangeSortName(value) {
+      if (value === this.sortName) {
+        if (this.sortType === 1) {
+          this.sortType = 0
+        } else {
+          this.sortType = 1
         }
-      }else{
+      } else {
         this.sortName = value
-        this.sortType=1
+        this.sortType = 1
       }
       this.dataList = this.handleSortList(this.dataList)
     },
-    async handleGetWarningType(){
+    async handleGetWarningType() {
       const req = {
         FieldexPlain_Field: 'WARNING_TYPE'
       }
-      const data = await request.$webGet('/EShangApiMain/Dictionary/GetFieEnumList',req)
+      const data = await request.$webGet('/EShangApiMain/Dictionary/GetFieEnumList', req)
       let list = data.Result_Data.List
 
-      console.log('list',list)
+      console.log('list', list)
       let nameObj = {}
       let descObj = {}
-      if (list && list.length>0){
-        list.forEach(item=>{
+      if (list && list.length > 0) {
+        list.forEach(item => {
           nameObj[Number(item.FieldEnum_Value)] = item.FieldEnum_Name
           descObj[Number(item.FieldEnum_Value)] = item.FieldEnum_Desc
         })
@@ -450,77 +479,77 @@ export default {
       this.warningDescObj = descObj
     },
     // 查询条件有多少个
-    handleGetSearchCount(){
+    handleGetSearchCount() {
       // 多少个查询条件
       let num = 0
-      if (this.startDate || this.endDate){
-        num+=1
+      if (this.startDate || this.endDate) {
+        num += 1
       }
-      if (this.businessStatus>0){
-        num+=1
+      if (this.businessStatus > 0) {
+        num += 1
       }
-      if (this.businessType>0){
-        num+=1
+      if (this.businessType > 0) {
+        num += 1
       }
 
       this.searchCount = num
     },
-    handleSubmit(){
+    handleSubmit() {
       this.handleGetSearchCount()
       this.showPop = false
       this.handleGetWarningSum()
       this.handleGetPageData()
     },
     // 切换tab
-    handleChangeTab(e){
+    handleChangeTab(e) {
       this.selectTab = e
       this.dataList = []
       this.handleGetPageData()
     },
     // 显示弹出框
-    handleShowPopup(){
+    handleShowPopup() {
       this.showPop = true
     },
     // 隐藏弹出框
-    hidePopup(){
+    hidePopup() {
       this.showPop = false
     },
     // 返回上一级
-    handleBack(){
+    handleBack() {
       uni.navigateBack({
         delta: 1
       })
     },
-    handleChangeBusinessStatus(e){
-      if (this.businessStatus === e){
+    handleChangeBusinessStatus(e) {
+      if (this.businessStatus === e) {
         this.businessStatus = 0
-      }else{
+      } else {
         this.businessStatus = e
       }
     },
-    handleChangeBusinessType(e){
-      if (this.businessType === e){
+    handleChangeBusinessType(e) {
+      if (this.businessType === e) {
         this.businessType = 0
-      }else{
+      } else {
         this.businessType = e
       }
     },
     // 修改开始时间
-    handleGetStartTime(e){
-      console.log('e',e)
+    handleGetStartTime(e) {
+      console.log('e', e)
       this.start = e.detail.value
       this.startDate = moment(e.detail.value).format('YYYY/MM')
     },
     // 修改结束时间
-    handleGetEndTime(e){
+    handleGetEndTime(e) {
       this.endDate = moment(e.detail.value).format('YYYY/MM')
     },
     // 跳转详情
-    handleGoDetail(obj){
+    handleGoDetail(obj) {
       this.$util.toNextRoute('navigateTo', `/pages/earlyWarning/projectWarningDetail?obj=${JSON.stringify(obj)}`)
     },
     // 请求页面数据
-    async handleGetPageData(){
+    async handleGetPageData() {
       uni.showLoading({
         title: '正在加载...'
       })
@@ -531,13 +560,13 @@ export default {
         BusinessState: this.businessStatus || '',
         WarningType: this.selectTab
       }
-      const data = await request.$webGet('EShangApiMain/BusinessProject/GetAccountWarningList',req)
+      const data = await request.$webGet('EShangApiMain/BusinessProject/GetAccountWarningList', req)
       this.dataList = this.handleSortList(data.Result_Data.List)
-      console.log('this.dataList',this.dataList)
+      console.log('this.dataList', this.dataList)
       uni.hideLoading()
     },
     // 拿到合计的方法
-    async handleGetWarningSum(){
+    async handleGetWarningSum() {
       const req = {
         ServerpartId: this.allServerPartId,
         Business_Type: this.businessType || '',
@@ -545,45 +574,45 @@ export default {
         BusinessState: this.businessStatus || '',
         WarningType: this.selectTab
       }
-      const data = await request.$webGet('EShangApiMain/BusinessProject/GetAccountWarningListSummary',req)
-      console.log('data2312312',data)
+      const data = await request.$webGet('EShangApiMain/BusinessProject/GetAccountWarningListSummary', req)
+      console.log('data2312312', data)
       let list = data.Result_Data.List
       this.topTabList = list
       let obj = {}
-      if (list && list.length>0){
-        list.forEach(item=>{
+      if (list && list.length > 0) {
+        list.forEach(item => {
           obj[item.pid] = item.value
         })
       }
       this.sumObj = obj
     },
     // 排序方法
-    handleSortList(list){
+    handleSortList(list) {
       var len = list.length;
       for (var i = 0; i < len - 1; i++) {
         for (var j = 0; j < len - 1 - i; j++) {
-          if (this.sortType === 1){
-            if (this.sortName ===1){
+          if (this.sortType === 1) {
+            if (this.sortName === 1) {
               if (list[j].REVENUE_AMOUNT < list[j + 1].REVENUE_AMOUNT) { // 比较相邻元素大小并交换位置
                 var temp = list[j];
                 list[j] = list[j + 1];
                 list[j + 1] = temp;
               }
-            }else if(this.sortName===2){
+            } else if (this.sortName === 2) {
               if (list[j].PROFIT_AMOUNT < list[j + 1].PROFIT_AMOUNT) { // 比较相邻元素大小并交换位置
                 var temp = list[j];
                 list[j] = list[j + 1];
                 list[j + 1] = temp;
               }
             }
-          }else{
-            if (this.sortName ===1){
+          } else {
+            if (this.sortName === 1) {
               if (list[j].REVENUE_AMOUNT > list[j + 1].REVENUE_AMOUNT) { // 比较相邻元素大小并交换位置
                 var temp = list[j];
                 list[j] = list[j + 1];
                 list[j + 1] = temp;
               }
-            }else if(this.sortName===2){
+            } else if (this.sortName === 2) {
               if (list[j].PROFIT_AMOUNT > list[j + 1].PROFIT_AMOUNT) { // 比较相邻元素大小并交换位置
                 var temp = list[j];
                 list[j] = list[j + 1];
@@ -600,50 +629,59 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.projectWarningBox{
+.projectWarningBox {
   background: #F3F3F3;
-  .earlyTop{
+
+  .earlyTop {
     width: 100%;
     background: #F3F3F3;
     position: relative;
-    .earlyTopBg{
+
+    .earlyTopBg {
       width: 100%;
       height: 430rpx;
-      background: linear-gradient( 180deg, #D8E3FF 0%, #F3F3F3 100%);
+      background: linear-gradient(180deg, #D8E3FF 0%, #F3F3F3 100%);
     }
-    .headerBox{
+
+    .headerBox {
       width: 100%;
       position: fixed;
       left: 0;
       top: 0;
       z-index: 20;
       box-sizing: border-box;
-      background: linear-gradient( 180deg, #D8E3FF 0%, #E5EBF9 100%);
+      background: linear-gradient(180deg, #D8E3FF 0%, #E5EBF9 100%);
       //padding: 32rpx;
       display: flex;
       align-items: center;
-      .backIconBox{
+
+      .backIconBox {
         width: 48rpx;
         height: 48rpx;
         margin-right: 18rpx;
-        .backIcon{
+
+        .backIcon {
           width: 100%;
           height: 100%;
         }
       }
-      .timeBox{
+
+      .timeBox {
         display: flex;
         align-items: center;
-        .timeIconBox{
+
+        .timeIconBox {
           width: 40rpx;
           height: 40rpx;
           margin-right: 12rpx;
-          .timeIcon{
+
+          .timeIcon {
             width: 100%;
             height: 100%;
           }
         }
-        .timeText{
+
+        .timeText {
           font-family: AlimamaShuHeiTi, AlimamaShuHeiTi;
           font-weight: bold;
           font-size: 32rpx;
@@ -652,7 +690,8 @@ export default {
           text-align: left;
           font-style: normal;
         }
-        .timeSelect{
+
+        .timeSelect {
           font-family: AlimamaShuHeiTi, AlimamaShuHeiTi;
           font-weight: bold;
           font-size: 32rpx;
@@ -661,35 +700,40 @@ export default {
           text-align: left;
           font-style: normal;
         }
-        .downIcon{
+
+        .downIcon {
           width: 30rpx;
           height: 24rpx;
           margin-right: 8rpx;
         }
       }
     }
-    .errorWarning{
+
+    .errorWarning {
       width: 100%;
       box-sizing: border-box;
       padding: 0 32rpx;
       position: absolute;
       left: 0;
-      .errorTitle{
+
+      .errorTitle {
         width: 100%;
         height: 88rpx;
-        background: linear-gradient( 180deg, #F2F3FF 0%, #F7F8FF 100%);
+        background: linear-gradient(180deg, #F2F3FF 0%, #F7F8FF 100%);
         border-top-right-radius: 16rpx;
         border-top-left-radius: 16rpx;
         display: flex;
         align-items: center;
         box-sizing: border-box;
         padding: 24rpx;
-        .warningIcon{
+
+        .warningIcon {
           width: 40rpx;
           height: 40rpx;
           margin-right: 8rpx;
         }
-        .title{
+
+        .title {
           font-family: PingFangSC, PingFang SC;
           font-weight: 600;
           font-size: 28rpx;
@@ -699,7 +743,8 @@ export default {
           font-style: normal;
         }
       }
-      .errorContent{
+
+      .errorContent {
         width: 100%;
         background: #FFFFFF;
         border-bottom-right-radius: 16rpx;
@@ -709,7 +754,8 @@ export default {
         display: flex;
         justify-content: space-between;
         flex-wrap: wrap;
-        .errorItem{
+
+        .errorItem {
           width: 50%;
           display: flex;
           align-items: center;
@@ -717,7 +763,8 @@ export default {
           box-sizing: border-box;
           padding: 12rpx;
           border-radius: 16rpx;
-          .itemLeft{
+
+          .itemLeft {
             width: 88rpx;
             height: 88rpx;
             background: #ECF3FE;
@@ -726,16 +773,19 @@ export default {
             display: flex;
             align-items: center;
             justify-content: center;
-            .itemLogo{
+
+            .itemLogo {
               width: 56rpx;
               height: 56rpx;
             }
           }
-          .itemRight{
+
+          .itemRight {
             margin-left: 16rpx;
             display: flex;
             flex-direction: column;
-            .itemValue{
+
+            .itemValue {
               font-family: DINAlternate, DINAlternate;
               font-weight: bold;
               font-size: 28rpx;
@@ -744,7 +794,8 @@ export default {
               text-align: left;
               font-style: normal;
             }
-            .itemLabel{
+
+            .itemLabel {
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
               font-size: 26rpx;
@@ -755,17 +806,26 @@ export default {
             }
           }
         }
-        .selectErrorItem{
+
+        .selectErrorItem {
           background: #D9E9FF;
         }
-        .messageBox{
+
+        .messageBox {
           margin-top: 16rpx;
-          .messageIcon{
+          background: #F8F8F8;
+          border-radius: 16rpx;
+          box-sizing: border-box;
+          padding: 16rpx;
+          width: 100%;
+
+          .messageIcon {
             width: 48rpx;
             height: 48rpx;
             margin-right: 8rpx;
           }
-          .messageType{
+
+          .messageType {
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             font-size: 28rpx;
@@ -779,7 +839,8 @@ export default {
             margin-right: 16rpx;
             white-space: nowrap;
           }
-          .messageDesc{
+
+          .messageDesc {
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             font-size: 28rpx;
@@ -794,7 +855,7 @@ export default {
     }
   }
 
-  .servicepartContent{
+  .servicepartContent {
     width: 100%;
     //height: calc(100vh - 616rpx);
     //margin-top: 24rpx;
@@ -803,25 +864,30 @@ export default {
     background: #fff;
     box-sizing: border-box;
     padding: 24rpx 32rpx;
-    .contentTitle{
+
+    .contentTitle {
       width: 100%;
       display: flex;
       align-items: center;
       justify-content: space-between;
-      .contentIcon{
+
+      .contentIcon {
         width: 48rpx;
         height: 48rpx;
       }
-      .titleBox{
+
+      .titleBox {
         margin-left: 12rpx;
-        .title{
+
+        .title {
           font-size: 32rpx;
           font-family: PingFangSC, PingFang SC;
           font-weight: 600;
           color: #160002;
           line-height: 44rpx;
         }
-        .desc{
+
+        .desc {
           font-size: 24rpx;
           font-family: PingFangSC, PingFang SC;
           font-weight: 400;
@@ -831,7 +897,7 @@ export default {
         }
       }
 
-      .fixedRight{
+      .fixedRight {
         width: 138rpx;
         //height: 72rpx;
         background: #fff;
@@ -847,12 +913,14 @@ export default {
         line-height: 40rpx;
         text-align: left;
         font-style: normal;
-        .filterIcon{
+
+        .filterIcon {
           width: 24rpx;
           height: 28rpx;
           margin-right: 4rpx;
         }
-        .searchCountBox{
+
+        .searchCountBox {
           width: 28rpx;
           height: 28rpx;
           background: #2363FF;
@@ -871,14 +939,17 @@ export default {
         }
       }
     }
-    .messageBox{
+
+    .messageBox {
       margin-top: 16rpx;
-      .messageIcon{
+
+      .messageIcon {
         width: 48rpx;
         height: 48rpx;
         margin-right: 8rpx;
       }
-      .messageType{
+
+      .messageType {
         font-family: PingFangSC, PingFang SC;
         font-weight: 400;
         font-size: 28rpx;
@@ -892,7 +963,8 @@ export default {
         margin-right: 16rpx;
         white-space: nowrap;
       }
-      .messageDesc{
+
+      .messageDesc {
         font-family: PingFangSC, PingFang SC;
         font-weight: 400;
         font-size: 28rpx;
@@ -903,31 +975,36 @@ export default {
         white-space: nowrap;
       }
     }
-    .selectBox{
+
+    .selectBox {
       width: 100%;
       height: 72rpx;
       display: flex;
       align-items: center;
       margin-top: 28rpx;
-      .scrollBox{
+
+      .scrollBox {
         //width: calc(100% - 140rpx);
         width: calc(100% - 32rpx);
         height: 72rpx;
         display: flex;
         white-space: nowrap;
-        .scrollItem{
+
+        .scrollItem {
           background: #F5F5F5;
           border-radius: 8rpx;
           margin-right: 16rpx;
           padding: 16rpx;
           display: flex;
           align-items: center;
-          .itemImg{
+
+          .itemImg {
             width: 48rpx;
             height: 48rpx;
             margin-right: 8rpx;
           }
-          .text{
+
+          .text {
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             font-size: 28rpx;
@@ -937,14 +1014,17 @@ export default {
             font-style: normal;
           }
         }
-        .selectScroll{
-          background: #ECF2FF!important;
-          .text{
-            color: #2363FF!important;
+
+        .selectScroll {
+          background: #ECF2FF !important;
+
+          .text {
+            color: #2363FF !important;
           }
         }
       }
-      .fixedRight{
+
+      .fixedRight {
         width: 138rpx;
         height: 72rpx;
         background: #fff;
@@ -959,12 +1039,14 @@ export default {
         line-height: 40rpx;
         text-align: left;
         font-style: normal;
-        .filterIcon{
+
+        .filterIcon {
           width: 24rpx;
           height: 28rpx;
           margin-right: 4rpx;
         }
-        .searchCountBox{
+
+        .searchCountBox {
           width: 28rpx;
           height: 28rpx;
           background: #2363FF;
@@ -983,16 +1065,19 @@ export default {
         }
       }
     }
-    .dataList{
+
+    .dataList {
       width: 100%;
       //height: calc(100% - 200rpx);
       margin-top: 24rpx;
-      .listTitle{
+
+      .listTitle {
         display: flex;
         align-items: center;
         border-bottom: 1px solid #F1F1F1;
         padding-bottom: 16rpx;
-        .titleName{
+
+        .titleName {
           font-family: PingFangSC, PingFang SC;
           font-weight: 400;
           font-size: 28rpx;
@@ -1001,37 +1086,44 @@ export default {
           text-align: left;
           font-style: normal;
         }
-        .sortItem{
+
+        .sortItem {
           display: flex;
           align-items: center;
-          .sortName{
+
+          .sortName {
             font-size: 24rpx;
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             color: #9A9A9A;
             line-height: 36rpx;
           }
-          .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;
             }
           }
         }
       }
-      .listContent{
+
+      .listContent {
         width: 100%;
         height: calc(100% - 60rpx);
         margin-top: 24rpx;
-        .listItem{
+
+        .listItem {
           width: 100%;
           margin-bottom: 24rpx;
           background: #F7F8FA;
@@ -1042,39 +1134,45 @@ export default {
           align-items: flex-start;
           position: relative;
           margin-bottom: 24rpx;
-          .bg{
+
+          .bg {
             width: 144rpx;
             height: 144rpx;
             position: absolute;
             right: 0;
             bottom: 0;
           }
-          .listItemLeft{
-            .picBox{
+
+          .listItemLeft {
+            .picBox {
               width: 96rpx;
               height: 96rpx;
               border-radius: 16rpx;
               margin-right: 16rpx;
               overflow: hidden;
-              .shopLogo{
+
+              .shopLogo {
                 width: 96rpx;
                 height: 96rpx;
               }
             }
-            .stateBox{
+
+            .stateBox {
               margin-top: 40rpx;
               display: flex;
               align-items: center;
               justify-content: center;
               width: 96rpx;
-              .stateIcon{
+
+              .stateIcon {
                 width: 12rpx;
                 height: 12rpx;
                 border-radius: 50%;
                 background: #ff4d4f;
                 margin-right: 12rpx;
               }
-              .stateText{
+
+              .stateText {
                 font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
@@ -1083,23 +1181,28 @@ export default {
               }
             }
           }
-          .listItemRight{
+
+          .listItemRight {
             width: calc(100% - 100rpx);
-            .rightTop{
+
+            .rightTop {
               display: flex;
               align-items: center;
               justify-content: space-between;
               width: 100%;
-              .rightTopLeft{
+
+              .rightTopLeft {
                 width: calc(100% - 32rpx);
                 display: flex;
                 align-items: center;
-                .sortIcon{
+
+                .sortIcon {
                   width: 40rpx;
                   height: 40rpx;
                   margin-right: 12rpx;
                 }
-                .otherIcon{
+
+                .otherIcon {
                   width: 40rpx;
                   height: 40rpx;
                   border-radius: 50%;
@@ -1118,7 +1221,8 @@ export default {
                   font-style: normal;
                   margin-right: 12rpx;
                 }
-                .shopName{
+
+                .shopName {
                   font-size: 28rpx;
                   font-family: PingFangSC, PingFang SC;
                   font-weight: 400;
@@ -1131,19 +1235,22 @@ export default {
                   overflow: hidden;
                 }
               }
-              .rightTopRight{
-                .moreIcon{
+
+              .rightTopRight {
+                .moreIcon {
                   width: 32rpx;
                   height: 32rpx;
                 }
               }
             }
-            .MERCHANTS_NAMEBox{
+
+            .MERCHANTS_NAMEBox {
               width: 100%;
               display: flex;
               align-items: center;
               justify-content: space-between;
-              .MERCHANTS_NAME{
+
+              .MERCHANTS_NAME {
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
                 font-size: 24rpx;
@@ -1160,7 +1267,8 @@ export default {
                 text-overflow: ellipsis;
                 overflow: hidden;
               }
-              .type{
+
+              .type {
                 max-width: 25%;
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
@@ -1176,9 +1284,10 @@ export default {
               }
             }
 
-            .rightBottom{
+            .rightBottom {
               margin-top: 12rpx;
-              .type{
+
+              .type {
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
                 font-size: 24rpx;
@@ -1191,7 +1300,8 @@ export default {
                 background: #E3EFFF;
                 border-radius: 4rpx;
               }
-              .endTime{
+
+              .endTime {
                 background: #FFEFEA;
                 border-radius: 4rpx;
                 padding: 2rpx 8rpx;
@@ -1204,14 +1314,17 @@ export default {
                 font-style: normal;
               }
             }
-            .rightBottomMoney{
+
+            .rightBottomMoney {
               display: flex;
               align-items: center;
               margin-top: 32rpx;
-              .moneyItem{
+
+              .moneyItem {
                 display: flex;
                 flex-direction: column;
-                .value{
+
+                .value {
                   font-size: 28rpx;
                   font-family: DINAlternate, DINAlternate;
                   font-weight: bold;
@@ -1219,7 +1332,8 @@ export default {
                   line-height: 32rpx;
                   margin-top: 8rpx;
                 }
-                .unit{
+
+                .unit {
                   font-size: 24rpx;
                   font-family: PingFangSC, PingFang SC;
                   font-weight: 400;
@@ -1227,13 +1341,15 @@ export default {
                   line-height: 36rpx;
                 }
               }
-              .moneyDetailFixed{
+
+              .moneyDetailFixed {
                 position: absolute;
                 display: inline-block;
                 background: #fff;
                 padding: 12rpx;
                 border-radius: 12rpx;
-                bottom: 40rpx;right: 10%;
+                bottom: 40rpx;
+                right: 10%;
                 width: 80vw;
                 box-shadow: 0rpx 2rpx 8rpx 0rpx rgba(231, 231, 231, 0.67);
               }
@@ -1244,17 +1360,19 @@ export default {
     }
   }
 
-  .uniPopup{
+  .uniPopup {
     width: 100%;
     height: 976rpx;
     box-sizing: border-box;
     padding: 32rpx;
-    .uniPopupTop{
+
+    .uniPopupTop {
       width: 100%;
       display: flex;
       align-items: center;
       justify-content: space-between;
-      .uniPopupTitle{
+
+      .uniPopupTitle {
         font-family: PingFangSC, PingFang SC;
         font-weight: 600;
         font-size: 32rpx;
@@ -1263,15 +1381,17 @@ export default {
         text-align: left;
         font-style: normal;
       }
-      .close{
+
+      .close {
         width: 40rpx;
         height: 40rpx;
       }
     }
 
-    .filterBox{
+    .filterBox {
       margin-top: 40rpx;
-      .filterTitle{
+
+      .filterTitle {
         font-family: PingFangSC, PingFang SC;
         font-weight: 600;
         font-size: 28rpx;
@@ -1280,11 +1400,13 @@ export default {
         text-align: left;
         font-style: normal;
       }
-      .filterItemList{
+
+      .filterItemList {
         margin: 24rpx;
         display: flex;
         flex-wrap: wrap;
-        .filterItem{
+
+        .filterItem {
           width: calc((100% - 32rpx)/3);
           display: flex;
           align-items: center;
@@ -1302,26 +1424,30 @@ export default {
           border-radius: 8rpx;
           padding: 12rpx 0;
         }
-        .filterItem:nth-child(3){
+
+        .filterItem:nth-child(3) {
           margin-right: 0;
         }
-        .selectFilterItem{
+
+        .selectFilterItem {
           color: #2363FF;
           background: #ECF2FF;
         }
       }
-      .filterTimeBox{
+
+      .filterTimeBox {
         display: flex;
         align-items: center;
         justify-content: space-between;
         margin-top: 24rpx;
-        .timeSelect{
+
+        .timeSelect {
           width: calc((100% - 20px)/2);
         }
       }
     }
 
-    .button{
+    .button {
       background: #2363FF;
       border-radius: 8rpx;
       width: calc(100% - 64rpx);
diff --git a/pages/earlyWarning/projectWarningDetail.vue b/pages/earlyWarning/projectWarningDetail.vue
index 15262b9..9d02635 100644
--- a/pages/earlyWarning/projectWarningDetail.vue
+++ b/pages/earlyWarning/projectWarningDetail.vue
@@ -3,39 +3,41 @@
     <view class="meng" v-if="showNotice || showQuestion" @click="handleCloseNotice"></view>
 
 
-    <view class="earlyTop" :style="{height: detail.BUSINESS_ENDDATE?`calc(${menu.bottom}px + 570rpx)`:`calc(${menu.bottom}px + 490rpx)`}">
+    <view class="earlyTop"
+      :style="{ height: detail.BUSINESS_ENDDATE ? `calc(${menu.bottom}px + 570rpx)` : `calc(${menu.bottom}px + 490rpx)` }">
       <view class="earlyTopBg"></view>
-      <view class="headerBox" :style="{paddingTop: menu.top + 'px',height:menu.bottom + 4 +'px'}">
-        <view :style="{height:menu.height +'px',display: 'flex',alignItems: 'center',justifyContent:'space-between',padding:'0 32rpx',width:'100%'}">
+      <view class="headerBox" :style="{ paddingTop: menu.top + 'px', height: menu.bottom + 4 + 'px' }">
+        <view
+          :style="{ height: menu.height + 'px', display: 'flex', alignItems: 'center', justifyContent: 'space-between', padding: '0 32rpx', width: '100%' }">
           <view class="backIconBox" @click="handleBack">
-            <image class="backIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg"/>
+            <image class="backIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/navigation-left.svg" />
           </view>
           <view class="pageTitle">商家详情</view>
           <view class="default"></view>
         </view>
       </view>
 
-      <view class="detailBox" :style="{top: `calc(${menu.bottom}px + 38rpx)`}">
+      <view class="detailBox" :style="{ top: `calc(${menu.bottom}px + 38rpx)` }">
         <view class="contentBox">
           <view class="contentTop">
             <view class="topLeft">
-              <image class="logo" :src="detail.Brand_ICO"/>
+              <image class="logo" :src="detail.Brand_ICO" />
             </view>
             <view class="topRight">
               <view class="rightTop">
-                <text class="shopName">{{ detail.SERVERPARTSHOP_NAME || ''}}</text>
+                <text class="shopName">{{ detail.SERVERPARTSHOP_NAME || '' }}</text>
                 <view class="fixedBox">
-                  <image class="fixed" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/fixed.png"/>
+                  <image class="fixed" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/fixed.png" />
                   <text class="serverPartName">{{ detail.SERVERPART_NAME || '' }}</text>
                 </view>
               </view>
               <view class="rightBottom">
                 <text class="type">{{ businessTypeObj[detail.BUSINESS_TYPE] }}</text>
-<!--                <text class="type" style="margin-left: 12rpx">{{ `${detail.ENDDATE}结束` }}</text>-->
+                <!--                <text class="type" style="margin-left: 12rpx">{{ `${detail.ENDDATE}结束` }}</text>-->
               </view>
 
               <view class="MERCHANTS_NAMERightBox">
-                <text class="MERCHANTS_NAME">{{detail.MERCHANTS_NAME || ''}}</text>
+                <text class="MERCHANTS_NAME">{{ detail.MERCHANTS_NAME || '' }}</text>
               </view>
             </view>
           </view>
@@ -43,30 +45,33 @@
             <view class="moneyBox">
               <view style="width: 50%;display: inline-block">
                 <view class="moneyItem">
-                  <text class="value">{{detail.REVENUE_AMOUNT?$util.getMoney(detail.REVENUE_AMOUNT / 10000):'-'}}</text>
+                  <text class="value">{{ detail.REVENUE_AMOUNT ? $util.getMoney(detail.REVENUE_AMOUNT / 10000) : '-'
+                  }}</text>
                   <text class="unit">营收 /万元</text>
                 </view>
               </view>
               <view style="width: 50%;display: inline-block">
                 <view class="moneyItem">
-                  <text class="value">{{detail.PROFIT_AMOUNT?$util.getMoney(detail.PROFIT_AMOUNT / 10000):'-'}}</text>
+                  <text class="value">{{ detail.PROFIT_AMOUNT ? $util.getMoney(detail.PROFIT_AMOUNT / 10000) : '-'
+                  }}</text>
                   <text class="unit">盈利 /万元</text>
                 </view>
               </view>
             </view>
             <view class="messageBox">
               <view style="display: flex;align-items: center">
-                <image class="messageIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error6st.png"/>
+                <image class="messageIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/error6st.png" />
                 <text class="messageType">{{ warningNameObj[detail.WARNING_TYPE] }}</text>
               </view>
-              <view :style="{marginTop:'16rpx',marginBottom: detail.BUSINESS_ENDDATE?'':'16rpx'}">
+              <view :style="{ marginTop: '16rpx', marginBottom: detail.BUSINESS_ENDDATE ? '' : '16rpx' }">
                 <text class="messageDesc">{{ warningDescObj[detail.WARNING_TYPE] }}</text>
               </view>
             </view>
 
             <view class="line" v-if="detail.BUSINESS_ENDDATE"></view>
-            <view v-if="detail.BUSINESS_ENDDATE" style="padding: 16rpx 0 24rpx 0;display: flex;align-items: center;justify-content: space-between">
-              <text class="overTime" >{{ `门店关闭：${detail.BUSINESS_ENDDATE}` }}</text>
+            <view v-if="detail.BUSINESS_ENDDATE"
+              style="padding: 16rpx 0 24rpx 0;display: flex;align-items: center;justify-content: space-between">
+              <text class="overTime">{{ `门店关闭：${detail.BUSINESS_ENDDATE}` }}</text>
               <text class="type" style="margin-left: 12rpx">{{ `项目到期：${detail.ENDDATE}结束` }}</text>
             </view>
           </view>
@@ -74,542 +79,608 @@
       </view>
     </view>
 
-    <view class="detailContentBox" >
-<!--      :style="{height: `calc(100vh - ${menu.bottom}px - 510rpx)`}"-->
+    <view class="detailContentBox">
+      <!--      :style="{height: `calc(100vh - ${menu.bottom}px - 510rpx)`}"-->
       <view class="contentBox">
         <view class="tabBox">
-          <view :class="selectTab===1?'tabItem selectItemLeft':'tabItem'" @click="handleChangeTab(1)">
-            <image class="tabItemIcon" :src="selectTab===1?'https://eshangtech.com/ShopICO/ahyd-BID/warning/tab1Select.png':'https://eshangtech.com/ShopICO/ahyd-BID/warning/tab1NOSelect.png'"/>
+          <view :class="selectTab === 1 ? 'tabItem selectItemLeft' : 'tabItem'" @click="handleChangeTab(1)">
+            <image class="tabItemIcon"
+              :src="selectTab === 1 ? 'https://eshangtech.com/ShopICO/ahyd-BID/warning/tab1Select.png' : 'https://eshangtech.com/ShopICO/ahyd-BID/warning/tab1NOSelect.png'" />
             <text class="tabText">综合分析</text>
           </view>
-          <view :class="selectTab===2?'tabItem selectItemRight':'tabItem'" @click="handleChangeTab(2)">
-            <image class="tabItemIcon" :src="selectTab===2?'https://eshangtech.com/ShopICO/ahyd-BID/warning/tab2Select.png':'https://eshangtech.com/ShopICO/ahyd-BID/warning/tab2NoSelect.png'"/>
+          <view :class="selectTab === 2 ? 'tabItem selectItemRight' : 'tabItem'" @click="handleChangeTab(2)">
+            <image class="tabItemIcon"
+              :src="selectTab === 2 ? 'https://eshangtech.com/ShopICO/ahyd-BID/warning/tab2Select.png' : 'https://eshangtech.com/ShopICO/ahyd-BID/warning/tab2NoSelect.png'" />
             <text class="tabText">经营情况</text>
           </view>
         </view>
 
-        <view class="descBox" v-if="selectTab===1 && firstTabDetail.Profit">
-          <image class="descIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/warningLight.png"/>
+        <view class="descBox" v-if="selectTab === 1 && firstTabDetail.Profit">
+          <image class="descIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/warningLight.png" />
           <view class="desc">
             <text class="descText">
-              {{firstTabDetail.Profit / 10000< 0 ?'商家存在':
-                    firstTabDetail.Profit / 10000 <= 10 && firstTabDetail.Profit / 10000 > 0?'商家存在':
-                        firstTabDetail.Profit / 10000 > 10 && firstTabDetail.Profit / 10000 < 100?'商家经营状态':
-                            firstTabDetail.Profit / 10000 >= 100?'商家存在':''
-              }}
-               <text class="big">{{
-                firstTabDetail.Profit / 10000< 0 ?'退场风险':
-                    firstTabDetail.Profit / 10000 <= 10 && firstTabDetail.Profit / 10000 > 0?'较大经营风险':
-                        firstTabDetail.Profit / 10000 > 10 && firstTabDetail.Profit / 10000 < 100?'良好':
-                            firstTabDetail.Profit / 10000 >= 100?'较大的盈利优势':''
-              }}</text>{{
-              firstTabDetail.Profit / 10000< 0 ?'，请密切关注此项目经营状态！':
-              firstTabDetail.Profit / 10000 <= 10 && firstTabDetail.Profit / 10000 > 0?'，请关注此项目经营状态！':
-              firstTabDetail.Profit / 10000 > 10 && firstTabDetail.Profit / 10000 < 100?'，能较好的进行持续经营！':
-              firstTabDetail.Profit / 10000 >= 100?'，建议后期项目调整保底提成！':''
+              {{ firstTabDetail.Profit / 10000 < 0 ? '商家存在' : firstTabDetail.Profit / 10000 <= 10 &&
+                firstTabDetail.Profit / 10000 > 0 ? '商家存在' :
+                firstTabDetail.Profit / 10000 > 10 && firstTabDetail.Profit / 10000 < 100 ? '商家经营状态' :
+                  firstTabDetail.Profit / 10000 >= 100 ? '商家存在' : ''
               }}
+                  <text class="big">{{
+                    firstTabDetail.Profit / 10000 < 0 ? '退场风险' : firstTabDetail.Profit / 10000 <= 10 &&
+                      firstTabDetail.Profit / 10000 > 0 ? '较大经营风险' :
+                      firstTabDetail.Profit / 10000 > 10 && firstTabDetail.Profit / 10000 < 100 ? '良好' :
+                        firstTabDetail.Profit / 10000 >= 100 ? '较大的盈利优势' : ''
+                  }}</text>{{
+                          firstTabDetail.Profit / 10000 < 0 ? '，请密切关注此项目经营状态！' : firstTabDetail.Profit / 10000 <= 10 &&
+                            firstTabDetail.Profit / 10000 > 0 ? '，请关注此项目经营状态！' :
+                            firstTabDetail.Profit / 10000 > 10 && firstTabDetail.Profit / 10000 < 100 ? '，能较好的进行持续经营！' :
+                              firstTabDetail.Profit / 10000 >= 100 ? '，建议后期项目调整保底提成！' : ''
+                        }}
             </text>
             <view style="display: inline-block">
               <view class="noticeBox" @click="handleShowNotice">
-                <image class="noticeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/noticeIcon.png"/>
+                <image class="noticeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/noticeIcon.png" />
                 <view class="noticeDesc" v-if="showNotice" @click.stop="handleCloseNotice">
-                  <view>{{ `1、预计盈利<${0}万元，商家存在退场风险，请密切关注此项目经营状态！`}}</view>
-                  <view>{{ `2、预计盈利=<${10}万元且>${0}万元，商家存在较大经营风险，请关注此项目经营状态！` }}</view>
-                  <view>{{ `3、预计盈利>${10}万元且<${100}万元，商家经营状态良好，能较好的进行持续经营！` }}</view>
-                  <view>{{ `4、预计盈利>=${100}万元，商家存在较大的盈利优势，建议后期项目调整保底提成！` }}</view>
-                </view>
-              </view>
-            </view>
-          </view>
-        </view>
-
-        <view class="firstContent" v-if="selectTab===1">
-          <view v-if="firstTabDetail.BUSINESS_TRADE">
-            <view class="contentTitle">
-              在<text class="yellowText">统一时间</text>口径下：
-            </view>
-            <view class="contentItem" style="display: flex;align-items: center">
-              年度统计周期内：
-              <image class="date" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/dateIcon.png"/>
-              <text class="time">{{`${firstTabDetail.STATISTICS_STARTDATE}-${firstTabDetail.STATISTICS_ENDDATE}`}}</text>
-            </view>
-
-            <view class="contentItem">
-              对客营收
-              <text class="money">{{ firstTabDetail.PROJECT_REVENUE?$util.getMoney(firstTabDetail.PROJECT_REVENUE / 10000):'-'}}</text>
-              <text class="unit">/万元</text>
-              ，商家入账
-              <text class="money">{{ firstTabDetail.SUBROYALTY_AMOUNT?$util.getMoney(firstTabDetail.SUBROYALTY_AMOUNT / 10000):'-'}}</text>
-              <text class="unit">/万元</text>
-            </view>
-
-            <view class="contentItem">
-              按合同约定支付驿达租金
-              <text class="money">{{ firstTabDetail.ROYALTY_THEORY?$util.getMoney(firstTabDetail.ROYALTY_THEORY / 10000):'-'}}</text>
-              <text class="unit">/万元</text>
-            </view>
-
-<!--            <view class="contentItem">-->
-<!--              按对客销售的 <text style="color: #FE7628;margin: 0 8rpx">40%</text>成本预估经营成本需-->
-<!--              <text class="money">{{ firstTabDetail.PROJECT_REVENUE?$util.getMoney(firstTabDetail.PROJECT_REVENUE * 0.4 / 10000):'-'}}</text>-->
-<!--              <text class="unit">/万元</text>-->
-<!--            </view>-->
-
-            <view class="contentItem">
-              按对客销售的<text style="color: #FE7628;margin: 0 8rpx">{{ detail.COST_RATE ? `${detail.COST_RATE}%` : '-' }}</text>成本预估经营成本需
-              <text class="money">{{ firstTabDetail.PROJECT_REVENUE ? $util.getMoney(firstTabDetail.PROJECT_REVENUE * (detail.COST_RATE ? detail.COST_RATE / 100 : 0) / 10000) : '' }}</text><text class="unit">/万元</text>
-            </view>
-            <view class="contentItem" v-if="firstTabDetail.PROJECT_REVENUE">
-              人工成本，按<text style="color: #FE7628;margin: 0 8rpx">{{ detail.LABOURS_COUNT || '' }}</text>个人，平均工资<text style="color: #FE7628;margin: 0 8rpx">{{ detail.LABOURS_WAGE || '' }}</text>元/月，实际发生
-              <text style="color: #FE7628;margin: 0 8rpx">{{ detail.MONTH_COUNT || '' }}</text>个月，合计人工成本<text class="money">{{$util.getMoney((detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT) / 10000)}}</text>万元
-            </view>
-            <view class="contentItem" v-if="firstTabDetail.PROJECT_REVENUE">
-              折旧费用，按总投入<text style="color: #FE7628;margin: 0 8rpx">{{detail.DEPRECIATION_EXPENSE || ''}}</text>万元，<text style="color: #FE7628;margin: 0 8rpx">{{detail.DEPRECIATION_YEAR || ''}}</text>
-              年折旧，实际发生<text style="color: #FE7628;margin: 0 8rpx">{{detail.MONTH_COUNT || ''}}</text>月，合计折旧费用<text class="money">{{$util.getMoney((detail.DEPRECIATION_EXPENSE / detail.DEPRECIATION_YEAR / 12) * detail.MONTH_COUNT)}}</text>万元
-            </view>
-            <view class="contentItem" v-if="firstTabDetail.PROJECT_REVENUE">
-              其他经营费用，按每年综合经营费用<text class="money">{{detail.OTHER_EXPENSE || ''}}</text>万元预估
-            </view>
-            <view class="contentItem" v-if="firstTabDetail.PROJECT_REVENUE">
-              <text class="unit">实际商家经营成本 = 经营成本 + 人工成本 + 折旧费用 + 其他经营费用 = </text><text class="money">
-              {{$util.getMoney( (firstTabDetail.PROJECT_REVENUE * (detail.COST_RATE ? detail.COST_RATE / 100 : 0) / 10000) + ((detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT) / 10000) + ((detail.DEPRECIATION_EXPENSE / detail.DEPRECIATION_YEAR / 12) * detail.MONTH_COUNT) + detail.OTHER_EXPENSE )}}
-              </text>万元
-            </view>
-
-            <view class="contentItem">
-              商家<text style="color: #FE7628;margin: 0 8rpx">{{ firstTabDetail.SUBROYALTY_AMOUNT - ( (firstTabDetail.PROJECT_REVENUE * (detail.COST_RATE ? detail.COST_RATE / 100 : 0) ) + ((detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT)) + ((detail.DEPRECIATION_EXPENSE / detail.DEPRECIATION_YEAR / 12) * detail.MONTH_COUNT) + detail.OTHER_EXPENSE )<0?'预计预亏':'预计盈利' }}</text>
-              <text class="money">{{ firstTabDetail.SUBROYALTY_AMOUNT?
-                  $util.getMoney(Math.abs(
-                      ((firstTabDetail.SUBROYALTY_AMOUNT - ( (firstTabDetail.PROJECT_REVENUE * (detail.COST_RATE ? detail.COST_RATE / 100 : 0)) + (detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT) + ((detail.DEPRECIATION_EXPENSE / detail.DEPRECIATION_YEAR / 12) * detail.MONTH_COUNT * 10000) + (detail.OTHER_EXPENSE * 10000) ) )) / 10000)
-                  ):'-'}}</text><text class="unit">/万元</text>
-            </view>
-
-            <view class="contentItem" style="margin-bottom: 8rpx">
-              <text class="yellowBgText">{{`${BusinessTradeIdsObj[firstTabDetail.BUSINESS_TRADE]}/${BusinessTradeIdsBigObj[firstTabDetail.BUSINESS_PTRADE]}`}}</text>：
-              <!--            地方特色小吃/休闲小吃-->
-              <text class="yellowBgText">{{ firstTabDetail.SHOPSHORTNAME || '' }}</text>
-            </view>
-
-            <view class="contentItem" style="display: flex;align-items: center;flex-wrap: wrap;margin-bottom: 0">
-              {{ firstTabDetail.ACCOUNT_RATE>=80?'优于':
-                firstTabDetail.ACCOUNT_RATE< 80 && firstTabDetail.ACCOUNT_RATE>= 50?'优于':
-                    firstTabDetail.ACCOUNT_RATE< 50?'租赁收入低于':''
-              }}<text style="color: #FE7628;margin: 0 8rpx">{{ firstTabDetail.ACCOUNT_RATE?`${firstTabDetail.ACCOUNT_RATE}%`:'' }}</text>
-              的经营业态项目
-              <view style="display: flex;align-items: center;vertical-align: top;margin-left: 8rpx">
-                <image class="stateIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/Like.png"/>
-                <!--              https://eshangtech.com/ShopICO/ahyd-BID/warning/stateIcon.png-->
-                <text class="stateText">{{
-                    firstTabDetail.ACCOUNT_RATE>=80?'优秀':
-                        firstTabDetail.ACCOUNT_RATE<80 && firstTabDetail.ACCOUNT_RATE>= 50?'良好':
-                            firstTabDetail.ACCOUNT_RATE< 50?'请关注此项目经营状况！':''
-                  }}</text>
-                <view class="questionBox">
-                  <image class="questionIcon" @click="handleShowQuestion" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/noticeIcon.svg"/>
-                  <view class="questionContent" @click="handleCloseNotice" v-if="showQuestion">
-                    <view>{{ `>=${80} %，优秀` }}</view>
-                    <view>{{ `<= ${80} % 且 >= ${50} %，良好` }}</view>
-                    <view>{{ `<${50} %，请关注此项目经营状态` }}</view>
+                  <view>{{ `1、预计盈利<${0}万元，商家存在退场风险，请密切关注此项目经营状态！` }}</view>
+                      <view>{{ `2、预计盈利=<${10}万元且>${0}万元，商家存在较大经营风险，请关注此项目经营状态！` }}</view>
+                      <view>{{ `3、预计盈利>${10}万元且<${100}万元，商家经营状态良好，能较好的进行持续经营！` }}</view>
+                          <view>{{ `4、预计盈利>=${100}万元，商家存在较大的盈利优势，建议后期项目调整保底提成！` }}</view>
+                      </view>
                   </view>
                 </view>
               </view>
             </view>
 
-            <view class="contentTitle" style="margin-top: 40rpx">
-              在<text class="typeText">{{SERVERPARTTYPEOBJ[firstTabDetail.SERVERPART_TYPE]}}</text>口径下：
-            </view>
-
-            <view class="contentItem">
-              获客能力排名第
-              <text class="money">{{ firstTabDetail.TRADEREVENUE_RANK_TYPE }}</text>
-              <text class="unit">/{{ firstTabDetail.TRADE_COUNT_TYPE }}</text>
-            </view>
-            <view class="contentItem">
-              租金交付能力排名第
-              <text class="money">{{ firstTabDetail.TRADEACCOUNT_RANK_TYPE }}</text>
-              <text class="unit">/{{ firstTabDetail.TRADE_COUNT_TYPE }}</text>
-            </view>
-
-            <view class="contentTitle" style="padding-left: 14rpx;margin-top: 40rpx;display: flex;align-items: center">
-              在所有
-              <view class="YdBox">
-                <image class="YDLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/tabBar/company_active.png"/>
-                <text style="color: red;text-indent: 0">驿达旗下</text>
-              </view> 服务区中：
-            </view>
-            <view class="contentItem">
-              获客能力排名第
-              <text class="money">{{ firstTabDetail.TRADEREVENUE_RANK }}</text>
-              <text class="unit">/{{ firstTabDetail.TRADE_COUNT }}</text>
-            </view>
-            <view class="contentItem">
-              租金交付能力排名第
-              <text class="money">{{ firstTabDetail.TRADEACCOUNT_RANK }}</text>
-              <text class="unit">/{{ firstTabDetail.TRADE_COUNT }}</text>
-            </view>
-          </view>
-          <view style="color: red" v-else >未对项目进行设置业态，无法分析！</view>
-        </view>
-
-        <view class="secondContent" v-if="selectTab===2">
-          <view v-for="(item,index) in secondTabList" :key="index" style="margin-bottom: 48rpx">
-            <view class="contentItem" style="display: flex;align-items: center;margin-bottom: 16rpx">
-              <text class="indexDesc">{{ item.BUSINESS_PERIOD || ''}}</text>
-              <view class="timeBox">
-                <image class="dateIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/dateIcon.png"/>
-                <text class="dateText" style="white-space: nowrap">{{
-                    `${item.STARTDATE ? $moment(item.STARTDATE).format('YYYY年MM月DD日') : ''} 至${item.ENDDATE ? $moment(item.ENDDATE).format('YYYY年MM月DD日') : ''}`
+            <view class="firstContent" v-if="selectTab === 1">
+              <view v-if="firstTabDetail.BUSINESS_TRADE">
+                <view class="contentTitle">
+                  在<text class="yellowText">统一时间</text>口径下：
+                </view>
+                <view class="contentItem" style="display: flex;align-items: center">
+                  年度统计周期内：
+                  <image class="date" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/dateIcon.png" />
+                  <text class="time">{{ `${firstTabDetail.STATISTICS_STARTDATE}-${firstTabDetail.STATISTICS_ENDDATE}`
                   }}</text>
+                </view>
+
+                <view class="contentItem">
+                  对客营收
+                  <text class="money">{{ firstTabDetail.PROJECT_REVENUE ? $util.getMoney(firstTabDetail.PROJECT_REVENUE
+                    /
+                    10000) : '-' }}</text>
+                  <text class="unit">/万元</text>
+                  ，商家入账
+                  <text class="money">{{
+                    firstTabDetail.SUBROYALTY_AMOUNT ? $util.getMoney(firstTabDetail.SUBROYALTY_AMOUNT /
+                      10000) : '-' }}</text>
+                  <text class="unit">/万元</text>
+                </view>
+
+                <view class="contentItem">
+                  按合同约定支付驿达租金
+                  <text class="money">{{ firstTabDetail.ROYALTY_THEORY ? $util.getMoney(firstTabDetail.ROYALTY_THEORY /
+                    10000) : '-' }}</text>
+                  <text class="unit">/万元</text>
+                </view>
+
+                <!--            <view class="contentItem">-->
+                <!--              按对客销售的 <text style="color: #FE7628;margin: 0 8rpx">40%</text>成本预估经营成本需-->
+                <!--              <text class="money">{{ firstTabDetail.PROJECT_REVENUE?$util.getMoney(firstTabDetail.PROJECT_REVENUE * 0.4 / 10000):'-'}}</text>-->
+                <!--              <text class="unit">/万元</text>-->
+                <!--            </view>-->
+
+                <view class="contentItem">
+                  按对客销售的<text style="color: #FE7628;margin: 0 8rpx">{{ detail.COST_RATE ? `${detail.COST_RATE}%` : '-'
+                  }}</text>成本预估经营成本需
+                  <text class="money">{{ firstTabDetail.PROJECT_REVENUE ? $util.getMoney(firstTabDetail.PROJECT_REVENUE
+                    * (detail.COST_RATE ? detail.COST_RATE / 100 : 0) / 10000) : '' }}</text><text
+                    class="unit">/万元</text>
+                </view>
+                <view class="contentItem" v-if="firstTabDetail.PROJECT_REVENUE">
+                  人工成本，按<text style="color: #FE7628;margin: 0 8rpx">{{ detail.LABOURS_COUNT || '' }}</text>个人，平均工资<text
+                    style="color: #FE7628;margin: 0 8rpx">{{ detail.LABOURS_WAGE || '' }}</text>元/月，实际发生
+                  <text style="color: #FE7628;margin: 0 8rpx">{{ detail.MONTH_COUNT || '' }}</text>个月，合计人工成本<text
+                    class="money">{{ $util.getMoney((detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT) /
+                      10000) }}</text>万元
+                </view>
+                <view class="contentItem" v-if="firstTabDetail.PROJECT_REVENUE">
+                  折旧费用，按总投入<text style="color: #FE7628;margin: 0 8rpx">{{ detail.DEPRECIATION_EXPENSE ||
+                    '' }}</text>万元，<text style="color: #FE7628;margin: 0 8rpx">{{ detail.DEPRECIATION_YEAR || ''
+                    }}</text>
+                  年折旧，实际发生<text style="color: #FE7628;margin: 0 8rpx">{{ detail.MONTH_COUNT || '' }}</text>月，合计折旧费用<text
+                    class="money">{{ $util.getMoney((detail.DEPRECIATION_EXPENSE / detail.DEPRECIATION_YEAR / 12) *
+                      detail.MONTH_COUNT) }}</text>万元
+                </view>
+                <view class="contentItem" v-if="firstTabDetail.PROJECT_REVENUE">
+                  其他经营费用，按每年综合经营费用<text class="money">{{ detail.OTHER_EXPENSE || '' }}</text>万元预估
+                </view>
+                <view class="contentItem" v-if="firstTabDetail.PROJECT_REVENUE">
+                  <text class="unit">实际商家经营成本 = 经营成本 + 人工成本 + 折旧费用 + 其他经营费用 = </text><text class="money">
+                    {{ $util.getMoney((firstTabDetail.PROJECT_REVENUE * (detail.COST_RATE ? detail.COST_RATE / 100 : 0)
+                      / 10000) + ((detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT) / 10000) +
+                      ((detail.DEPRECIATION_EXPENSE / detail.DEPRECIATION_YEAR / 12) * detail.MONTH_COUNT) +
+                      detail.OTHER_EXPENSE) }}
+                  </text>万元
+                </view>
+
+                <view class="contentItem">
+                  商家<text style="color: #FE7628;margin: 0 8rpx">{{ firstTabDetail.SUBROYALTY_AMOUNT - (
+                    (firstTabDetail.PROJECT_REVENUE * (detail.COST_RATE ? detail.COST_RATE / 100 : 0)) +
+                    ((detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT)) + ((detail.DEPRECIATION_EXPENSE
+                      / detail.DEPRECIATION_YEAR / 12) * detail.MONTH_COUNT) + detail.OTHER_EXPENSE) < 0 ? '预计预亏' : '预计盈利'
+                  }}</text>
+                      <text class="money">{{ firstTabDetail.SUBROYALTY_AMOUNT ?
+                        $util.getMoney(Math.abs(
+                          ((firstTabDetail.SUBROYALTY_AMOUNT - ((firstTabDetail.PROJECT_REVENUE * (detail.COST_RATE ?
+                            detail.COST_RATE / 100 : 0)) + (detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT)
+                            + ((detail.DEPRECIATION_EXPENSE / detail.DEPRECIATION_YEAR / 12) * detail.MONTH_COUNT * 10000) +
+                            (detail.OTHER_EXPENSE * 10000)))) / 10000)
+                        ) : '-' }}</text><text class="unit">/万元</text>
+                </view>
+
+                <view class="contentItem" style="margin-bottom: 8rpx">
+                  <text class="yellowBgText">{{
+                    `${BusinessTradeIdsObj[firstTabDetail.BUSINESS_TRADE]}/${BusinessTradeIdsBigObj[firstTabDetail.BUSINESS_PTRADE]}`
+                  }}</text>：
+                  <!--            地方特色小吃/休闲小吃-->
+                  <text class="yellowBgText">{{ firstTabDetail.SHOPSHORTNAME || '' }}</text>
+                </view>
+
+                <view class="contentItem" style="display: flex;align-items: center;flex-wrap: wrap;margin-bottom: 0">
+                  {{ firstTabDetail.ACCOUNT_RATE >= 80 ? '优于' :
+                    firstTabDetail.ACCOUNT_RATE < 80 && firstTabDetail.ACCOUNT_RATE >= 50 ? '优于' :
+                      firstTabDetail.ACCOUNT_RATE < 50 ? '租赁收入低于' : '' }}<text style="color: #FE7628;margin: 0 8rpx">{{
+                      firstTabDetail.ACCOUNT_RATE ? `${firstTabDetail.ACCOUNT_RATE}%` : '' }}</text>
+                      的经营业态项目
+                      <view style="display: flex;align-items: center;vertical-align: top;margin-left: 8rpx">
+                        <image class="stateIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/Like.png" />
+                        <!--              https://eshangtech.com/ShopICO/ahyd-BID/warning/stateIcon.png-->
+                        <text class="stateText">{{
+                          firstTabDetail.ACCOUNT_RATE >= 80 ? '优秀' :
+                            firstTabDetail.ACCOUNT_RATE < 80 && firstTabDetail.ACCOUNT_RATE >= 50 ? '良好' :
+                              firstTabDetail.ACCOUNT_RATE < 50 ? '请关注此项目经营状况！' : '' }}</text>
+                              <view class="questionBox">
+                                <image class="questionIcon" @click="handleShowQuestion"
+                                  src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/noticeIcon.svg" />
+                                <view class="questionContent" @click="handleCloseNotice" v-if="showQuestion">
+                                  <view>{{ `>=${80} %，优秀` }}</view>
+                                  <view>{{ `<= ${80} % 且>= ${50} %，良好` }}</view>
+                                  <view>{{ `<${50} %，请关注此项目经营状态` }}</view>
+                                  </view>
+                                </view>
+                              </view>
+                      </view>
+
+                      <view class="contentTitle" style="margin-top: 40rpx">
+                        在<text class="typeText">{{ SERVERPARTTYPEOBJ[firstTabDetail.SERVERPART_TYPE] }}</text>口径下：
+                      </view>
+
+                      <view class="contentItem">
+                        获客能力排名第
+                        <text class="money">{{ firstTabDetail.TRADEREVENUE_RANK_TYPE }}</text>
+                        <text class="unit">/{{ firstTabDetail.TRADE_COUNT_TYPE }}</text>
+                      </view>
+                      <view class="contentItem">
+                        租金交付能力排名第
+                        <text class="money">{{ firstTabDetail.TRADEACCOUNT_RANK_TYPE }}</text>
+                        <text class="unit">/{{ firstTabDetail.TRADE_COUNT_TYPE }}</text>
+                      </view>
+
+                      <view class="contentTitle"
+                        style="padding-left: 14rpx;margin-top: 40rpx;display: flex;align-items: center">
+                        在所有
+                        <view class="YdBox">
+                          <image class="YDLogo"
+                            src="https://eshangtech.com/ShopICO/ahyd-BID/tabBar/company_active.png" />
+                          <text style="color: red;text-indent: 0">驿达旗下</text>
+                        </view> 服务区中：
+                      </view>
+                      <view class="contentItem">
+                        获客能力排名第
+                        <text class="money">{{ firstTabDetail.TRADEREVENUE_RANK }}</text>
+                        <text class="unit">/{{ firstTabDetail.TRADE_COUNT }}</text>
+                      </view>
+                      <view class="contentItem">
+                        租金交付能力排名第
+                        <text class="money">{{ firstTabDetail.TRADEACCOUNT_RANK }}</text>
+                        <text class="unit">/{{ firstTabDetail.TRADE_COUNT }}</text>
+                      </view>
+                </view>
+                <view style="color: red" v-else>未对项目进行设置业态，无法分析！</view>
+              </view>
+
+              <view class="secondContent" v-if="selectTab === 2">
+                <view v-for="(item, index) in secondTabList" :key="index" style="margin-bottom: 48rpx">
+                  <view class="contentItem" style="display: flex;align-items: center;margin-bottom: 16rpx">
+                    <text class="indexDesc">{{ item.BUSINESS_PERIOD || '' }}</text>
+                    <view class="timeBox">
+                      <image class="dateIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/dateIcon.png" />
+                      <text class="dateText" style="white-space: nowrap">{{
+                        `${item.STARTDATE ? $moment(item.STARTDATE).format('YYYY年MM月DD日') : ''} 至${item.ENDDATE ?
+                          $moment(item.ENDDATE).format('YYYY年MM月DD日') : ''}`
+                      }}</text>
+                    </view>
+                  </view>
+
+                  <view class="contentItem">
+                    {{ new Date().getTime() < new Date($moment(item.ENDDATE).format('YYYY-MM-DD')).getTime()
+                      ? '项目履约中...' : '项目已完成...' }} <text class="orangeText">{{ item.SUBROYALTY_PRICE >= item.MINTURNOVER
+                        ? '保底租金已交付' : '未完成保底额' }}</text>
+                  </view>
+
+                  <view class="contentItem">
+                    对客销售总额<text class="money">{{ item.REVENUE_AMOUNT ? $util.getMoney(item.REVENUE_AMOUNT /
+                      10000) : '-' }}</text>
+                    <text class="unit">/万元</text>
+                    ，商家入账<text class="money">{{ item.SUBROYALTY_THEORY ? $util.getMoney(item.SUBROYALTY_THEORY /
+                      10000) : '-' }}</text>
+                    <text class="unit">/万元</text>
+                  </view>
+
+                  <view class="contentItem">
+                    按合同约定支付驿达租金<text class="money">{{ item.ROYALTY_THEORY ? $util.getMoney(item.ROYALTY_THEORY /
+                      10000) : '-' }}</text>
+                    <text class="unit">/万元</text>
+                  </view>
+
+                  <!--            <view class="contentItem">-->
+                  <!--              按对客销售的<text class="orangeText" style="margin: 0 8rpx">40%</text>-->
+                  <!--              成本预估经营成本需-->
+                  <!--              <text class="money">{{ item.costEstimation?$util.getMoney(item.costEstimation / 10000):'-'}}</text>-->
+                  <!--              <text class="unit">/万元</text>-->
+                  <!--            </view>-->
+                  <view class="contentItem">
+                    按对客销售的<text style="color: #FE7628;margin: 0 8rpx">{{ detail.COST_RATE ? `${detail.COST_RATE}%` : '-'
+                    }}</text>成本预估经营成本需
+                    <text class="money">{{ item.REVENUE_AMOUNT ? $util.getMoney(item.REVENUE_AMOUNT * (detail.COST_RATE
+                      ? detail.COST_RATE / 100 : 0) / 10000) : '' }}</text><text class="unit">/万元</text>
+                  </view>
+                  <view class="contentItem" v-if="item.REVENUE_AMOUNT">
+                    人工成本，按<text style="color: #FE7628;margin: 0 8rpx">{{ detail.LABOURS_COUNT || ''
+                    }}</text>个人，平均工资<text style="color: #FE7628;margin: 0 8rpx">{{ detail.LABOURS_WAGE || ''
+                      }}</text>元/月，实际发生
+                    <text style="color: #FE7628;margin: 0 8rpx">{{ detail.MONTH_COUNT || '' }}</text>个月，合计人工成本<text
+                      class="money">{{ $util.getMoney((detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT)
+                        /
+                        10000) }}</text>万元
+                  </view>
+                  <view class="contentItem" v-if="item.REVENUE_AMOUNT">
+                    折旧费用，按总投入<text style="color: #FE7628;margin: 0 8rpx">{{ detail.DEPRECIATION_EXPENSE ||
+                      '' }}</text>万元，<text style="color: #FE7628;margin: 0 8rpx">{{ detail.DEPRECIATION_YEAR ||
+                        '' }}</text>
+                    年折旧，实际发生<text style="color: #FE7628;margin: 0 8rpx">{{ detail.howMonth || ''
+                    }}</text>元/月，合计折旧费用<text class="money">{{ $util.getMoney((detail.DEPRECIATION_EXPENSE /
+                        detail.DEPRECIATION_YEAR / 12) *
+                        detail.MONTH_COUNT) }}</text>万元
+                  </view>
+                  <view class="contentItem" v-if="item.REVENUE_AMOUNT">
+                    其他经营费用，按每年综合经营费用<text class="money">{{ detail.OTHER_EXPENSE || '' }}</text>万元预估
+                  </view>
+                  <view class="contentItem" v-if="item.REVENUE_AMOUNT">
+                    <text class="unit">实际商家经营成本 = 经营成本 + 人工成本 + 折旧费用 + 其他经营费用 = </text><text class="money">
+                      {{ $util.getMoney((item.REVENUE_AMOUNT * (detail.COST_RATE ? detail.COST_RATE / 100 : 0) / 10000)
+                        + ((detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT) / 10000) +
+                        ((detail.DEPRECIATION_EXPENSE / detail.DEPRECIATION_YEAR / 12) * detail.MONTH_COUNT) +
+                        detail.OTHER_EXPENSE) }}
+                    </text>万元
+                  </view>
+
+                  <view class="contentItem">
+                    商家<text style="color: #FE7628;margin: 0 8rpx">{{ item.SUBROYALTY_THEORY - ((item.REVENUE_AMOUNT *
+                      (detail.COST_RATE ? detail.COST_RATE / 100 : 0)) + ((detail.LABOURS_COUNT * detail.LABOURS_WAGE *
+                        detail.MONTH_COUNT)) + ((detail.DEPRECIATION_EXPENSE / detail.DEPRECIATION_YEAR / 12) *
+                          detail.MONTH_COUNT) + detail.OTHER_EXPENSE) < 0 ? '预计预亏' : '预计盈利' }}</text>
+                        <text class="money">{{ item.SUBROYALTY_THEORY ?
+                          $util.getMoney(Math.abs(
+                            ((item.SUBROYALTY_THEORY - ((item.REVENUE_AMOUNT * (detail.COST_RATE ? detail.COST_RATE / 100
+                              : 0)) + (detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT) +
+                              ((detail.DEPRECIATION_EXPENSE / detail.DEPRECIATION_YEAR / 12) * detail.MONTH_COUNT * 10000) +
+                              (detail.OTHER_EXPENSE * 10000)))) / 10000)
+                          ) : '-' }}</text><text class="unit">/万元</text>
+                  </view>
+
+                  <view class="contentItem">
+                    项目进度完成
+                    <text class="money">{{ item.daySuccess ? item.daySuccess > 100 ? 100 : item.daySuccess + '%' : ''
+                    }}</text>
+                  </view>
+
+                  <view class="contentItem">
+                    租金交付已完成
+                    <text class="money">{{ item.rentDelivery ? item.rentDelivery > 100 ? 100 : item.rentDelivery + '%' :
+                      '-'
+                    }}</text>
+                  </view>
+
+                  <view class="contentItem">
+                    租金交付进度 <text class="orangeText" style="margin: 0 8rpx">{{ item.rentDelivery > item.daySuccess ? '优于'
+                      : item.rentDelivery < item.daySuccess ? '低于' : '等于' }}</text> 项目进度
+                  </view>
+
+                  <view class="resultBox" v-if="item.daySuccess < 100">
+                    <image class="warningLight"
+                      src="https://eshangtech.com/ShopICO/ahyd-BID/warning/warningLight.png" />
+                    {{ item.progressDifference <= 10 ? '项目保底' : item.progressDifference > 10 && item.progressDifference
+                      <= 40 ? '项目能' : item.progressDifference > 40 ? '项目' :
+                      item.progressDifference <= 0 && item.progressDifference >= -10 ? '项目保底完成' :
+                        item.progressDifference <= -10 && item.progressDifference >= -40 ? '商家' :
+                          item.progressDifference < -40 ? '项目' : '' }} <text class="blueText">
+                              {{ item.progressDifference <= 10 ? '基本能实现' : item.progressDifference > 10 &&
+                                item.progressDifference <= 40 ? '较好的完成' : item.progressDifference > 40 ? '超预期' :
+                                item.progressDifference <= 0 && item.progressDifference >= -10 ? '存在困难' :
+                                  item.progressDifference <= -10 && item.progressDifference >= -40 ? '存在经营困难' :
+                                    item.progressDifference < -40 ? '超预期' : '' }} </text>
+                                        {{ item.progressDifference <= 10 ? '' : item.progressDifference > 10 &&
+                                          item.progressDifference <= 40 ? '保底且实现盈利' : item.progressDifference > 40
+                                          ? '后续项目可以适当提升保底营收' :
+                                          item.progressDifference <= 0 && item.progressDifference >= -10 ? '，请保持关注' :
+                                            item.progressDifference <= -10 && item.progressDifference >= -40
+                                              ? '，请密切保持关注' :
+                                              item.progressDifference < -40 ? '，商家存在退场风险' : '' }} </view>
+                  </view>
+
+                </view>
               </view>
             </view>
-
-            <view class="contentItem">
-              {{new Date().getTime() < new Date($moment(item.ENDDATE).format('YYYY-MM-DD')).getTime() ? '项目履约中...' : '项目已完成...'}}
-              <text class="orangeText">{{ item.SUBROYALTY_PRICE >= item.MINTURNOVER ?'保底租金已交付':'未完成保底额' }}</text>
-            </view>
-
-            <view class="contentItem">
-              对客销售总额<text class="money">{{ item.REVENUE_AMOUNT?$util.getMoney(item.REVENUE_AMOUNT / 10000):'-'}}</text>
-              <text class="unit">/万元</text>
-              ，商家入账<text class="money">{{ item.SUBROYALTY_THEORY?$util.getMoney(item.SUBROYALTY_THEORY / 10000):'-'}}</text>
-              <text class="unit">/万元</text>
-            </view>
-
-            <view class="contentItem">
-              按合同约定支付驿达租金<text class="money">{{ item.ROYALTY_THEORY?$util.getMoney(item.ROYALTY_THEORY / 10000):'-'}}</text>
-              <text class="unit">/万元</text>
-            </view>
-
-<!--            <view class="contentItem">-->
-<!--              按对客销售的<text class="orangeText" style="margin: 0 8rpx">40%</text>-->
-<!--              成本预估经营成本需-->
-<!--              <text class="money">{{ item.costEstimation?$util.getMoney(item.costEstimation / 10000):'-'}}</text>-->
-<!--              <text class="unit">/万元</text>-->
-<!--            </view>-->
-            <view class="contentItem">
-              按对客销售的<text style="color: #FE7628;margin: 0 8rpx">{{ detail.COST_RATE ? `${detail.COST_RATE}%` : '-' }}</text>成本预估经营成本需
-              <text class="money">{{ item.REVENUE_AMOUNT ? $util.getMoney(item.REVENUE_AMOUNT * (detail.COST_RATE ? detail.COST_RATE / 100 : 0) / 10000) : '' }}</text><text class="unit">/万元</text>
-            </view>
-            <view class="contentItem" v-if="item.REVENUE_AMOUNT">
-              人工成本，按<text style="color: #FE7628;margin: 0 8rpx">{{ detail.LABOURS_COUNT || '' }}</text>个人，平均工资<text style="color: #FE7628;margin: 0 8rpx">{{ detail.LABOURS_WAGE || '' }}</text>元/月，实际发生
-              <text style="color: #FE7628;margin: 0 8rpx">{{ detail.MONTH_COUNT || '' }}</text>个月，合计人工成本<text class="money">{{$util.getMoney((detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT) / 10000)}}</text>万元
-            </view>
-            <view class="contentItem" v-if="item.REVENUE_AMOUNT">
-              折旧费用，按总投入<text style="color: #FE7628;margin: 0 8rpx">{{detail.DEPRECIATION_EXPENSE || ''}}</text>万元，<text style="color: #FE7628;margin: 0 8rpx">{{detail.DEPRECIATION_YEAR || ''}}</text>
-              年折旧，实际发生<text style="color: #FE7628;margin: 0 8rpx">{{detail.howMonth || ''}}</text>元/月，合计折旧费用<text class="money">{{$util.getMoney((detail.DEPRECIATION_EXPENSE / detail.DEPRECIATION_YEAR / 12) * detail.MONTH_COUNT)}}</text>万元
-            </view>
-            <view class="contentItem" v-if="item.REVENUE_AMOUNT">
-              其他经营费用，按每年综合经营费用<text class="money">{{detail.OTHER_EXPENSE || ''}}</text>万元预估
-            </view>
-            <view class="contentItem" v-if="item.REVENUE_AMOUNT">
-              <text class="unit">实际商家经营成本 = 经营成本 + 人工成本 + 折旧费用 + 其他经营费用 = </text><text class="money">
-              {{$util.getMoney( (item.REVENUE_AMOUNT * (detail.COST_RATE ? detail.COST_RATE / 100 : 0) / 10000) + ((detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT) / 10000) + ((detail.DEPRECIATION_EXPENSE / detail.DEPRECIATION_YEAR / 12) * detail.MONTH_COUNT) + detail.OTHER_EXPENSE )}}
-            </text>万元
-            </view>
-
-            <view class="contentItem">
-              商家<text style="color: #FE7628;margin: 0 8rpx">{{ item.SUBROYALTY_THEORY - ( (item.REVENUE_AMOUNT * (detail.COST_RATE ? detail.COST_RATE / 100 : 0) ) + ((detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT)) + ((detail.DEPRECIATION_EXPENSE / detail.DEPRECIATION_YEAR / 12) * detail.MONTH_COUNT) + detail.OTHER_EXPENSE )<0?'预计预亏':'预计盈利' }}</text>
-              <text class="money">{{ item.SUBROYALTY_THEORY?
-                  $util.getMoney(Math.abs(
-                      ((item.SUBROYALTY_THEORY - ( (item.REVENUE_AMOUNT * (detail.COST_RATE ? detail.COST_RATE / 100 : 0)) + (detail.LABOURS_COUNT * detail.LABOURS_WAGE * detail.MONTH_COUNT) + ((detail.DEPRECIATION_EXPENSE / detail.DEPRECIATION_YEAR / 12) * detail.MONTH_COUNT * 10000) + (detail.OTHER_EXPENSE * 10000) ) )) / 10000)
-                  ):'-'}}</text><text class="unit">/万元</text>
-            </view>
-
-            <view class="contentItem">
-              项目进度完成
-              <text class="money">{{ item.daySuccess ?item.daySuccess > 100 ? 100 : item.daySuccess +'%':'' }}</text>
-            </view>
-
-            <view class="contentItem">
-              租金交付已完成
-              <text class="money">{{ item.rentDelivery ?item.rentDelivery > 100 ? 100 : item.rentDelivery +'%':'-' }}</text>
-            </view>
-
-            <view class="contentItem">
-              租金交付进度 <text class="orangeText" style="margin: 0 8rpx">{{ item.rentDelivery > item.daySuccess ? '优于' : item.rentDelivery < item.daySuccess ? '低于' : '等于' }}</text> 项目进度
-            </view>
-
-            <view class="resultBox" v-if="item.daySuccess < 100">
-              <image class="warningLight" src="https://eshangtech.com/ShopICO/ahyd-BID/warning/warningLight.png"/>
-              {{  item.progressDifference <= 10 ? '项目保底' :
-                item.progressDifference > 10 && item.progressDifference <= 40 ?'项目能':
-                    item.progressDifference > 40 ?'项目':
-              item.progressDifference <= 0 && item.progressDifference >= -10 ?'项目保底完成':
-              item.progressDifference <= -10 && item.progressDifference >= -40 ?'商家':
-              item.progressDifference < -40 ?'项目':''
-              }}
-              <text class="blueText">
-                {{  item.progressDifference <= 10 ? '基本能实现' :
-                  item.progressDifference > 10 && item.progressDifference <= 40 ?'较好的完成':
-                      item.progressDifference > 40 ?'超预期':
-                          item.progressDifference <= 0 && item.progressDifference >= -10 ?'存在困难':
-                              item.progressDifference <= -10 && item.progressDifference >= -40 ?'存在经营困难':
-                                  item.progressDifference < -40 ?'超预期':''
-                }}
-              </text>
-              {{  item.progressDifference <= 10 ? '' :
-                item.progressDifference > 10 && item.progressDifference <= 40 ?'保底且实现盈利':
-                    item.progressDifference > 40 ?'后续项目可以适当提升保底营收':
-                        item.progressDifference <= 0 && item.progressDifference >= -10 ?'，请保持关注':
-                            item.progressDifference <= -10 && item.progressDifference >= -40 ?'，请密切保持关注':
-                                item.progressDifference < -40 ?'，商家存在退场风险':''
-              }}
-            </view>
           </view>
-
-        </view>
-      </view>
-    </view>
-  </view>
 </template>
 <script>
 import request from '@/util/index.js'
 import moment from "moment";
 import numeral from 'numeral'
 
-import {wrapTreeNode} from "../../util/dateTime";
-  export default {
-    name: "projectWarningDetail",
-    data(){
-      return {
-        menu:{},
-        serviceInfo:{},// 当前选中服务区
-        selectTab: 1,// 选中的tab
-        detail:{},// 详情内容
-        businessTypeObj:{
-          1000: "合作经营",
-          2000: "固定租金",
-          3000: "保底采购",
-          4000: "业主自营",
-        },
-        firstTabDetail:{},// 选项卡为第一个的详情数据
-        secondTabList:[],// 选项卡为第二个的时候的数组
-        BusinessTradeIdsObj:{},// 枚举对象
-        BusinessTradeIdsBigObj:{},// 枚举对象
-        SERVERPARTTYPEOBJ:{},// 枚举对象
-        warningNameObj:{},// 预警类型名称对象
-        warningDescObj:{},// 预警类型备注对象
-        showNotice: false,// 第一个问号的悬浮框
-        showQuestion: false,// 优秀的悬浮框
-      }
+import { wrapTreeNode } from "../../util/dateTime";
+export default {
+  name: "projectWarningDetail",
+  data() {
+    return {
+      menu: {},
+      serviceInfo: {},// 当前选中服务区
+      selectTab: 1,// 选中的tab
+      detail: {},// 详情内容
+      businessTypeObj: {
+        1000: "合作经营",
+        2000: "固定租金",
+        3000: "保底采购",
+        4000: "业主自营",
+      },
+      firstTabDetail: {},// 选项卡为第一个的详情数据
+      secondTabList: [],// 选项卡为第二个的时候的数组
+      BusinessTradeIdsObj: {},// 枚举对象
+      BusinessTradeIdsBigObj: {},// 枚举对象
+      SERVERPARTTYPEOBJ: {},// 枚举对象
+      warningNameObj: {},// 预警类型名称对象
+      warningDescObj: {},// 预警类型备注对象
+      showNotice: false,// 第一个问号的悬浮框
+      showQuestion: false,// 优秀的悬浮框
+    }
+  },
+  async onLoad(query) {
+    let systemInfo = uni.getSystemInfoSync()
+    this.menu = uni.getMenuButtonBoundingClientRect()
+    let seat = uni.getStorageSync('currentService')
+    this.serviceInfo = seat
+    if (query.obj) {
+      this.detail = JSON.parse(query.obj)
+    }
+    console.log('this.detail', this.detail)
+    uni.showLoading({
+      title: '正在加载...'
+    })
+
+    this.handleGetField()
+    this.handleGetSERVERPART_TYPE()
+    this.handleGetWarningType()
+
+    await this.handleGetFirstTab()
+
+    await this.handleGetSecondTab()
+    uni.hideLoading()
+  },
+  methods: {
+    // 显示悬浮框注释
+    handleShowNotice() {
+      this.showNotice = true
     },
-    async onLoad(query){
-      let systemInfo = uni.getSystemInfoSync()
-      this.menu = uni.getMenuButtonBoundingClientRect()
-      let seat = uni.getStorageSync('currentService')
-      this.serviceInfo = seat
-      if (query.obj){
-        this.detail = JSON.parse(query.obj)
-      }
-      console.log('this.detail',this.detail)
-      uni.showLoading({
-        title: '正在加载...'
-      })
-
-      this.handleGetField()
-      this.handleGetSERVERPART_TYPE()
-      this.handleGetWarningType()
-
-      await this.handleGetFirstTab()
-
-      await this.handleGetSecondTab()
-      uni.hideLoading()
+    handleShowQuestion() {
+      this.showQuestion = true
     },
-    methods:{
-      // 显示悬浮框注释
-      handleShowNotice(){
-        this.showNotice = true
-      },
-      handleShowQuestion(){
-        this.showQuestion = true
-      },
-      // 显示悬浮框注释
-      handleCloseNotice(){
-        this.showNotice = false
-        this.showQuestion = false
-      },
-      async handleGetWarningType(){
-        const req = {
-          FieldexPlain_Field: 'WARNING_TYPE'
-        }
-        const data = await request.$webGet('/EShangApiMain/Dictionary/GetFieEnumList',req)
-        let list = data.Result_Data.List
-        console.log('list',list)
-        let nameObj = {}
-        let descObj = {}
-        if (list && list.length>0){
-          list.forEach(item=>{
-            nameObj[Number(item.FieldEnum_Value)] = item.FieldEnum_Name
-            descObj[Number(item.FieldEnum_Value)] = item.FieldEnum_Desc
-          })
-        }
-        this.warningNameObj = nameObj
-        this.warningDescObj = descObj
-        console.log('nameObj',nameObj)
-        console.log('descObj',descObj)
-      },
-      // 返回上一级
-      handleBack(){
-        uni.navigateBack({
-          delta: 1
+    // 显示悬浮框注释
+    handleCloseNotice() {
+      this.showNotice = false
+      this.showQuestion = false
+    },
+    async handleGetWarningType() {
+      const req = {
+        FieldexPlain_Field: 'WARNING_TYPE'
+      }
+      const data = await request.$webGet('/EShangApiMain/Dictionary/GetFieEnumList', req)
+      let list = data.Result_Data.List
+      console.log('list', list)
+      let nameObj = {}
+      let descObj = {}
+      if (list && list.length > 0) {
+        list.forEach(item => {
+          nameObj[Number(item.FieldEnum_Value)] = item.FieldEnum_Name
+          descObj[Number(item.FieldEnum_Value)] = item.FieldEnum_Desc
         })
-      },
-      // 拿到BusinessTradeIdsObj的枚举
-      async handleGetField(){
-        const req = {
-          FieldExplainField: 'BusinessTradeIds'
-        }
-        const data = await request.$webGet('/EShangApiMain/FrameWork/GetFieldEnumTree',req)
-        let list = wrapTreeNode(data.Result_Data.List)
-        let bigObj = {}
-        let obj = {}
-        if (list && list.length>0){
-          list.forEach(item=>{
-            bigObj[item.value] = item.label
-            if (item.children && item.children.length>0){
-              item.children.forEach(subItem=>{
-                obj[subItem.value] = subItem.label
-              })
-            }
-          })
-        }
-        console.log('data231231',list)
-        this.BusinessTradeIdsBigObj = bigObj
-        this.BusinessTradeIdsObj = obj
-      },
-      // 拿到BusinessTradeIdsBigObj的枚举
-      async handleGetSERVERPART_TYPE(){
-        const req = {
-          FieldExplainField: 'SERVERPART_TYPE'
-        }
-        const data = await request.$webGet('/EShangApiMain/FrameWork/GetFieldEnumTree',req)
-        let list = wrapTreeNode(data.Result_Data.List)
-        let obj = {}
-        if (list && list.length>0){
-          list.forEach(item=>{
-            obj[item.value] = item.label
-          })
-        }
-        console.log('data231231',list)
-        this.SERVERPARTTYPEOBJ = obj
-      },
-      // 改变选项卡
-      handleChangeTab(e){
-        this.selectTab = e
-      },
-      async handleGetFirstTab(){
-        const req = {
-          ServerpartId: this.detail.SERVERPART_ID,
-          ServerpartShopId: this.detail.SERVERPARTSHOP_ID
-        }
-        const bottomData = await request.$webGet('/EShangApiMain/Revenue/GetBusinessTradeAnalysis',req)
-        const bottomData2 = await request.$webGet('/EShangApiMain/Revenue/GetBrandAnalysis',req)
-        let thirdObj = {}
-        let fourthObj = {}
-        if (bottomData.Result_Data.List && bottomData.Result_Data.List.length>0){
-          thirdObj = bottomData.Result_Data.List[0]
-        }
-        if (bottomData2.Result_Data.List && bottomData2.Result_Data.List.length>0){
-          fourthObj = bottomData2.Result_Data.List[0]
-        }
-        this.firstTabDetail = {
-          ...thirdObj,
-          ...fourthObj,
-        }
-      },
-      async handleGetSecondTab(){
-        const req = {
-          DataType: 2,
-          BusinessProjectId: this.detail.BUSINESSPROJECT_ID
-        }
-        const data = await request.$webGet('/EShangApiMain/BusinessProject/GetAnnualSplit',req)
-        const shopTime = await request.$webGet('/EShangApiMain/Revenue/GetBusinessDate',{ServerpartShopIds:this.detail.BUSINESSPROJECT_ID})
-        let list = data.Result_Data.List
-        list.reverse()
-        const shopEndTime = shopTime.Result_Data.value
-        console.log('shopEndTime',shopEndTime)
-        let beforeList = []
-        let futerObj = {}
-        list.forEach(item=>{
-          if (item.PERIOD_INDEX){
-            if (new Date(item.STARTDATE).getTime()<new Date(shopEndTime).getTime() && new Date(item.ENDDATE).getTime()>new Date(shopEndTime).getTime()){
-              item.showMore = true
-              // 项目一共多少天
-              const startTime = moment(item.STARTDATE)
-              const endTime = moment(item.ENDDATE)
-              const nowTime = moment()
-              item.projectDaySum = endTime.diff(startTime,'days') + 1
-              // 距离今天是多少天
-              item.projectBetween = nowTime.diff(startTime,'days') + 1
-              // 完成率
-              item.daySuccess = numeral((item.projectBetween / item.projectDaySum) * 100).format('0.00')
-              item.costEstimation = item.REVENUE_AMOUNT * 0.4
-              item.profitEstimate = item.SUBROYALTY_THEORY - (item.REVENUE_AMOUNT * 0.4)
-              item.rentDelivery = item.SUBROYALTY_PRICE / item.MINTURNOVER > 1 ? 100 : (item.SUBROYALTY_PRICE / item.MINTURNOVER)*100
-              item.daySuccessNumber = (item.projectBetween / item.projectDaySum) * 100
-              item.progressDifference = item.rentDelivery - item.daySuccessNumber
-              beforeList.push(item)
-            }else if(new Date(item.STARTDATE).getTime() > new Date().getTime()){
-              futerObj = item
-            }else{
-              item.daySuccess = 100
-              item.daySuccessNumber = 100
-              item.costEstimation = item.REVENUE_AMOUNT * 0.4
-              item.rentDelivery = item.SUBROYALTY_PRICE / item.MINTURNOVER > 1 ? 100 : (item.SUBROYALTY_PRICE / item.MINTURNOVER)*100
-              item.profitEstimate = item.SUBROYALTY_THEORY - (item.REVENUE_AMOUNT * 0.4)
-              beforeList.push(item)
-            }
+      }
+      this.warningNameObj = nameObj
+      this.warningDescObj = descObj
+      console.log('nameObj', nameObj)
+      console.log('descObj', descObj)
+    },
+    // 返回上一级
+    handleBack() {
+      uni.navigateBack({
+        delta: 1
+      })
+    },
+    // 拿到BusinessTradeIdsObj的枚举
+    async handleGetField() {
+      const req = {
+        FieldExplainField: 'BusinessTradeIds'
+      }
+      const data = await request.$webGet('/EShangApiMain/FrameWork/GetFieldEnumTree', req)
+      let list = wrapTreeNode(data.Result_Data.List)
+      let bigObj = {}
+      let obj = {}
+      if (list && list.length > 0) {
+        list.forEach(item => {
+          bigObj[item.value] = item.label
+          if (item.children && item.children.length > 0) {
+            item.children.forEach(subItem => {
+              obj[subItem.value] = subItem.label
+            })
           }
         })
-        beforeList.push(futerObj)
-        this.secondTabList = beforeList
-        console.log('this.secondTabList',this.secondTabList)
       }
+      console.log('data231231', list)
+      this.BusinessTradeIdsBigObj = bigObj
+      this.BusinessTradeIdsObj = obj
+    },
+    // 拿到BusinessTradeIdsBigObj的枚举
+    async handleGetSERVERPART_TYPE() {
+      const req = {
+        FieldExplainField: 'SERVERPART_TYPE'
+      }
+      const data = await request.$webGet('/EShangApiMain/FrameWork/GetFieldEnumTree', req)
+      let list = wrapTreeNode(data.Result_Data.List)
+      let obj = {}
+      if (list && list.length > 0) {
+        list.forEach(item => {
+          obj[item.value] = item.label
+        })
+      }
+      console.log('data231231', list)
+      this.SERVERPARTTYPEOBJ = obj
+    },
+    // 改变选项卡
+    handleChangeTab(e) {
+      this.selectTab = e
+    },
+    async handleGetFirstTab() {
+      const req = {
+        ServerpartId: this.detail.SERVERPART_ID,
+        ServerpartShopId: this.detail.SERVERPARTSHOP_ID
+      }
+      const bottomData = await request.$webGet('/EShangApiMain/Revenue/GetBusinessTradeAnalysis', req)
+      const bottomData2 = await request.$webGet('/EShangApiMain/Revenue/GetBrandAnalysis', req)
+      let thirdObj = {}
+      let fourthObj = {}
+      if (bottomData.Result_Data.List && bottomData.Result_Data.List.length > 0) {
+        thirdObj = bottomData.Result_Data.List[0]
+      }
+      if (bottomData2.Result_Data.List && bottomData2.Result_Data.List.length > 0) {
+        fourthObj = bottomData2.Result_Data.List[0]
+      }
+      this.firstTabDetail = {
+        ...thirdObj,
+        ...fourthObj,
+      }
+      console.log('this.firstTabDetailthis.firstTabDetail', this.firstTabDetail);
+
+    },
+    async handleGetSecondTab() {
+      const req = {
+        DataType: 2,
+        BusinessProjectId: this.detail.BUSINESSPROJECT_ID
+      }
+      const data = await request.$webGet('/EShangApiMain/BusinessProject/GetAnnualSplit', req)
+      const shopTime = await request.$webGet('/EShangApiMain/Revenue/GetBusinessDate', { ServerpartShopIds: this.detail.BUSINESSPROJECT_ID })
+      let list = data.Result_Data.List
+      list.reverse()
+      const shopEndTime = shopTime.Result_Data.value
+      console.log('shopEndTime', shopEndTime)
+      let beforeList = []
+      let futerObj = {}
+      list.forEach(item => {
+        if (item.PERIOD_INDEX) {
+          if (new Date(item.STARTDATE).getTime() < new Date(shopEndTime).getTime() && new Date(item.ENDDATE).getTime() > new Date(shopEndTime).getTime()) {
+            item.showMore = true
+            // 项目一共多少天
+            const startTime = moment(item.STARTDATE)
+            const endTime = moment(item.ENDDATE)
+            const nowTime = moment()
+            item.projectDaySum = endTime.diff(startTime, 'days') + 1
+            // 距离今天是多少天
+            item.projectBetween = nowTime.diff(startTime, 'days') + 1
+            // 完成率
+            item.daySuccess = numeral((item.projectBetween / item.projectDaySum) * 100).format('0.00')
+            item.costEstimation = item.REVENUE_AMOUNT * 0.4
+            item.profitEstimate = item.SUBROYALTY_THEORY - (item.REVENUE_AMOUNT * 0.4)
+            item.rentDelivery = item.SUBROYALTY_PRICE / item.MINTURNOVER > 1 ? 100 : (item.SUBROYALTY_PRICE / item.MINTURNOVER) * 100
+            item.daySuccessNumber = (item.projectBetween / item.projectDaySum) * 100
+            item.progressDifference = item.rentDelivery - item.daySuccessNumber
+            beforeList.push(item)
+          } else if (new Date(item.STARTDATE).getTime() > new Date().getTime()) {
+            futerObj = item
+          } else {
+            item.daySuccess = 100
+            item.daySuccessNumber = 100
+            item.costEstimation = item.REVENUE_AMOUNT * 0.4
+            item.rentDelivery = item.SUBROYALTY_PRICE / item.MINTURNOVER > 1 ? 100 : (item.SUBROYALTY_PRICE / item.MINTURNOVER) * 100
+            item.profitEstimate = item.SUBROYALTY_THEORY - (item.REVENUE_AMOUNT * 0.4)
+            beforeList.push(item)
+          }
+        }
+      })
+      beforeList.push(futerObj)
+      this.secondTabList = beforeList
+      console.log('this.secondTabList', this.secondTabList)
     }
   }
+}
 </script>
 <style scoped lang="scss">
-.projectWarningDetail{
+.projectWarningDetail {
   width: 100%;
   background: #F3F3F3;
-  .meng{
+
+  .meng {
     width: 100vw;
     height: 100vh;
     position: fixed;
-    top: 0;left: 0;
+    top: 0;
+    left: 0;
     z-index: 21;
   }
-  .earlyTop{
+
+  .earlyTop {
     width: 100%;
     background: #F3F3F3;
     position: relative;
-    .earlyTopBg{
+
+    .earlyTopBg {
       width: 100%;
       height: 430rpx;
-      background: linear-gradient( 180deg, #D8E3FF 0%, #F3F3F3 100%);
+      background: linear-gradient(180deg, #D8E3FF 0%, #F3F3F3 100%);
     }
-    .headerBox{
+
+    .headerBox {
       width: 100%;
       position: fixed;
       left: 0;
       top: 0;
       z-index: 20;
       box-sizing: border-box;
-      background: linear-gradient( 180deg, #D8E3FF 0%, #E5EBF9 100%);
+      background: linear-gradient(180deg, #D8E3FF 0%, #E5EBF9 100%);
       //padding: 32rpx;
       display: flex;
       align-items: center;
       justify-content: space-between;
-      .backIconBox{
+
+      .backIconBox {
         width: 48rpx;
         height: 48rpx;
         margin-right: 18rpx;
-        .backIcon{
+
+        .backIcon {
           width: 100%;
           height: 100%;
         }
       }
-      .pageTitle{
+
+      .pageTitle {
         font-family: PingFangTC, PingFangTC;
         font-weight: 600;
         font-size: 34rpx;
@@ -618,13 +689,14 @@ import {wrapTreeNode} from "../../util/dateTime";
         text-align: center;
         font-style: normal;
       }
-      .default{
+
+      .default {
         width: 48rpx;
         height: 48rpx;
       }
     }
 
-    .detailBox{
+    .detailBox {
       width: calc(100% - 48rpx);
       left: 24rpx;
       position: absolute;
@@ -632,7 +704,8 @@ import {wrapTreeNode} from "../../util/dateTime";
       border-radius: 16rpx;
       box-sizing: border-box;
       padding: 2rpx;
-      .contentBox{
+
+      .contentBox {
         width: 100%;
         //height: 480rpx;
         background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/warning/detailBg.svg");
@@ -642,28 +715,34 @@ import {wrapTreeNode} from "../../util/dateTime";
         border-radius: 14rpx;
         box-sizing: border-box;
         padding: 24rpx 24rpx 0 24rpx;
-        .contentTop{
+
+        .contentTop {
           display: flex;
           //align-items: center;
           justify-content: space-between;
-          .topLeft{
+
+          .topLeft {
             width: 96rpx;
             height: 96rpx;
             border-radius: 16rpx;
             overflow: hidden;
-            .logo{
+
+            .logo {
               width: 100%;
               height: 100%;
             }
           }
-          .topRight{
+
+          .topRight {
             width: calc(100% - 100rpx);
             margin-left: 16rpx;
-            .rightTop{
+
+            .rightTop {
               display: flex;
               align-items: flex-start;
               justify-content: space-between;
-              .shopName{
+
+              .shopName {
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 600;
                 font-size: 32rpx;
@@ -678,15 +757,18 @@ import {wrapTreeNode} from "../../util/dateTime";
                 overflow: hidden;
                 -webkit-line-clamp: 2;
               }
-              .fixedBox{
+
+              .fixedBox {
                 display: flex;
                 align-items: center;
-                .fixed{
+
+                .fixed {
                   width: 32rpx;
                   height: 32rpx;
                   margin-right: 4rpx;
                 }
-                .serverPartName{
+
+                .serverPartName {
                   font-family: PingFangSC, PingFang SC;
                   font-weight: 400;
                   font-size: 28rpx;
@@ -700,8 +782,8 @@ import {wrapTreeNode} from "../../util/dateTime";
               }
             }
 
-            .rightBottom{
-              .type{
+            .rightBottom {
+              .type {
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
                 font-size: 24rpx;
@@ -714,10 +796,12 @@ import {wrapTreeNode} from "../../util/dateTime";
                 border-radius: 4rpx;
               }
             }
-            .MERCHANTS_NAMERightBox{
+
+            .MERCHANTS_NAMERightBox {
               display: flex;
               justify-content: flex-end;
-              .MERCHANTS_NAME{
+
+              .MERCHANTS_NAME {
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
                 font-size: 24rpx;
@@ -732,14 +816,17 @@ import {wrapTreeNode} from "../../util/dateTime";
             }
           }
         }
-        .contentBottom{
-          .moneyBox{
+
+        .contentBottom {
+          .moneyBox {
             width: 100%;
             margin-top: 48rpx;
-            .moneyItem{
+
+            .moneyItem {
               display: flex;
               flex-direction: column;
-              .value{
+
+              .value {
                 font-family: DINAlternate, DINAlternate;
                 font-weight: bold;
                 font-size: 36rpx;
@@ -748,7 +835,8 @@ import {wrapTreeNode} from "../../util/dateTime";
                 text-align: left;
                 font-style: normal;
               }
-              .unit{
+
+              .unit {
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
                 font-size: 28rpx;
@@ -759,14 +847,17 @@ import {wrapTreeNode} from "../../util/dateTime";
               }
             }
           }
-          .messageBox{
+
+          .messageBox {
             margin-top: 16rpx;
-            .messageIcon{
+
+            .messageIcon {
               width: 48rpx;
               height: 48rpx;
               margin-right: 8rpx;
             }
-            .messageType{
+
+            .messageType {
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
               font-size: 28rpx;
@@ -780,7 +871,8 @@ import {wrapTreeNode} from "../../util/dateTime";
               margin-right: 16rpx;
               white-space: nowrap;
             }
-            .messageDesc{
+
+            .messageDesc {
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
               font-size: 28rpx;
@@ -791,13 +883,15 @@ import {wrapTreeNode} from "../../util/dateTime";
               white-space: nowrap;
             }
           }
-          .line{
+
+          .line {
             width: 100%;
             height: 2rpx;
             background: #F3F3F3;
             margin: 12rpx 0 0 0;
           }
-          .overTime{
+
+          .overTime {
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             font-size: 24rpx;
@@ -806,7 +900,8 @@ import {wrapTreeNode} from "../../util/dateTime";
             text-align: left;
             font-style: normal;
           }
-          .type{
+
+          .type {
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             font-size: 24rpx;
@@ -823,18 +918,20 @@ import {wrapTreeNode} from "../../util/dateTime";
     }
   }
 
-  .detailContentBox{
+  .detailContentBox {
     width: 100%;
     background: #fff;
     padding: 2rpx;
     border-radius: 32rpx 32rpx 0rpx 0rpx;
     box-sizing: border-box;
     margin-top: 32rpx;
-    .contentBox{
-     width: 100%;
+
+    .contentBox {
+      width: 100%;
       //background: #fff;
       padding-bottom: 40rpx;
-      .tabBox{
+
+      .tabBox {
         width: 100%;
         height: 108rpx;
         display: flex;
@@ -844,19 +941,22 @@ import {wrapTreeNode} from "../../util/dateTime";
         background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/warning/grayBg.png");
         background-repeat: no-repeat;
         background-size: 100% 100%;
-        .tabItem{
+
+        .tabItem {
           width: 50%;
           height: 108rpx;
           display: flex;
           align-items: center;
           justify-content: center;
-          background: linear-gradient( 180deg, #F3F4F8 0%, #FFFFFF 100%);
-          .tabItemIcon{
+          background: linear-gradient(180deg, #F3F4F8 0%, #FFFFFF 100%);
+
+          .tabItemIcon {
             width: 40rpx;
             height: 40rpx;
             margin-right: 8rpx;
           }
-          .tabText{
+
+          .tabText {
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             font-size: 32rpx;
@@ -866,11 +966,13 @@ import {wrapTreeNode} from "../../util/dateTime";
             font-style: normal;
           }
         }
-        .selectItemLeft{
+
+        .selectItemLeft {
           background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/warning/selectLeft.png");
           background-repeat: no-repeat;
           background-size: 100% 100%;
-          .tabText{
+
+          .tabText {
             font-family: PingFangSC, PingFang SC;
             font-weight: 600;
             font-size: 32rpx;
@@ -880,11 +982,13 @@ import {wrapTreeNode} from "../../util/dateTime";
             font-style: normal;
           }
         }
-        .selectItemRight{
+
+        .selectItemRight {
           background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/warning/selectRight.png");
           background-repeat: no-repeat;
           background-size: 100% 100%;
-          .tabText{
+
+          .tabText {
             font-family: PingFangSC, PingFang SC;
             font-weight: 600;
             font-size: 32rpx;
@@ -896,7 +1000,7 @@ import {wrapTreeNode} from "../../util/dateTime";
         }
       }
 
-      .descBox{
+      .descBox {
         background: #F7F8FA;
         border-radius: 8rpx;
         width: calc(100% - 64rpx);
@@ -904,13 +1008,16 @@ import {wrapTreeNode} from "../../util/dateTime";
         box-sizing: border-box;
         padding: 16rpx 24rpx;
         display: flex;
-        .descIcon{
+
+        .descIcon {
           width: 48rpx;
           height: 48rpx;
         }
-        .desc{
+
+        .desc {
           flex: 1;
-          .descText{
+
+          .descText {
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             font-size: 28rpx;
@@ -919,23 +1026,28 @@ import {wrapTreeNode} from "../../util/dateTime";
             text-align: left;
             font-style: normal;
             vertical-align: top;
-            .big{
+
+            .big {
               color: #2363FF;
               font-weight: 400;
               font-size: 30rpx;
             }
           }
-          .noticeBox{
+
+          .noticeBox {
             position: relative;
             display: flex;
             align-items: center;
-            .noticeIcon{
+
+            .noticeIcon {
               width: 32rpx;
               height: 32rpx;
             }
-            .noticeDesc{
+
+            .noticeDesc {
               position: absolute;
-              top: 32rpx;left: 0;
+              top: 32rpx;
+              left: 0;
               display: inline-block;
               transform: translateX(-40px);
               width: 70vw;
@@ -957,11 +1069,12 @@ import {wrapTreeNode} from "../../util/dateTime";
         }
       }
 
-      .firstContent{
+      .firstContent {
         width: calc(100% - 64rpx);
         margin-left: 32rpx;
         margin-top: 40rpx;
-        .contentTitle{
+
+        .contentTitle {
           font-family: PingFangSC, PingFang SC;
           font-weight: 400;
           font-size: 28rpx;
@@ -972,7 +1085,8 @@ import {wrapTreeNode} from "../../util/dateTime";
           position: relative;
           text-indent: 1rem;
           margin-bottom: 20rpx;
-          .yellowText{
+
+          .yellowText {
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             font-size: 28rpx;
@@ -985,23 +1099,27 @@ import {wrapTreeNode} from "../../util/dateTime";
             border-radius: 4rpx;
             margin: 0 8rpx;
           }
-          .typeText{
-            background: linear-gradient( 134deg, #FFEED1 0%, #FFE1CD 100%);
+
+          .typeText {
+            background: linear-gradient(134deg, #FFEED1 0%, #FFE1CD 100%);
             border-radius: 4rpx;
             padding: 2rpx 8rpx;
             color: #FF7E05;
             margin: 0 12rpx;
           }
-          .YdBox{
+
+          .YdBox {
             display: flex;
             align-items: center;
             margin: 0 12rpx;
-            .YDLogo{
+
+            .YDLogo {
               width: 48rpx;
               height: 48rpx;
               margin-right: 8rpx;
             }
-            .YDText{
+
+            .YDText {
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
               font-size: 28rpx;
@@ -1012,16 +1130,19 @@ import {wrapTreeNode} from "../../util/dateTime";
             }
           }
         }
-        .contentTitle:before{
-          content:'';
+
+        .contentTitle:before {
+          content: '';
           width: 6rpx;
           height: 28rpx;
           background: #3973FB;
           position: absolute;
-          left: 0;top: 50%;
+          left: 0;
+          top: 50%;
           transform: translateY(-50%);
         }
-        .contentItem{
+
+        .contentItem {
           font-family: PingFangSC, PingFang SC;
           font-weight: 400;
           font-size: 28rpx;
@@ -1030,12 +1151,14 @@ import {wrapTreeNode} from "../../util/dateTime";
           text-align: left;
           font-style: normal;
           margin-bottom: 16rpx;
-          .date{
+
+          .date {
             width: 32rpx;
             height: 32rpx;
             margin: 0 8rpx;
           }
-          .time{
+
+          .time {
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             font-size: 28rpx;
@@ -1044,7 +1167,8 @@ import {wrapTreeNode} from "../../util/dateTime";
             text-align: left;
             font-style: normal;
           }
-          .money{
+
+          .money {
             font-family: DINAlternate, DINAlternate;
             font-weight: bold;
             font-size: 28rpx;
@@ -1054,7 +1178,8 @@ import {wrapTreeNode} from "../../util/dateTime";
             font-style: normal;
             margin: 0 4rpx;
           }
-          .unit{
+
+          .unit {
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             font-size: 28rpx;
@@ -1063,7 +1188,8 @@ import {wrapTreeNode} from "../../util/dateTime";
             text-align: left;
             font-style: normal;
           }
-          .yellowBgText{
+
+          .yellowBgText {
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             font-size: 28rpx;
@@ -1075,12 +1201,14 @@ import {wrapTreeNode} from "../../util/dateTime";
             background: #FCF1D3;
             border-radius: 4rpx;
           }
-          .stateIcon{
+
+          .stateIcon {
             width: 35rpx;
             height: 35rpx;
             margin-right: 8rpx;
           }
-          .stateText{
+
+          .stateText {
             font-family: PingFangSC, PingFang SC;
             font-weight: 600;
             font-size: 26rpx;
@@ -1089,7 +1217,8 @@ import {wrapTreeNode} from "../../util/dateTime";
             text-align: left;
             font-style: normal;
           }
-          .questionBox{
+
+          .questionBox {
             width: 20px;
             height: 20px;
             cursor: pointer;
@@ -1098,13 +1227,16 @@ import {wrapTreeNode} from "../../util/dateTime";
             align-items: center;
             justify-content: center;
             margin-left: 9px;
-            .questionIcon{
+
+            .questionIcon {
               width: 20px;
               height: 20px;
             }
-            .questionContent{
+
+            .questionContent {
               position: absolute;
-              top: 32rpx;right: 0;
+              top: 32rpx;
+              right: 0;
               display: inline-block;
               transform: translateX(40px);
               width: 70vw;
@@ -1125,11 +1257,13 @@ import {wrapTreeNode} from "../../util/dateTime";
           }
         }
       }
-      .secondContent{
+
+      .secondContent {
         width: calc(100% - 64rpx);
         margin-left: 32rpx;
         margin-top: 8rpx;
-        .contentItem{
+
+        .contentItem {
           margin-bottom: 20rpx;
           font-family: PingFangSC, PingFang SC;
           font-weight: 400;
@@ -1138,7 +1272,8 @@ import {wrapTreeNode} from "../../util/dateTime";
           line-height: 40rpx;
           text-align: left;
           font-style: normal;
-          .indexDesc{
+
+          .indexDesc {
             background: #E1F3E6;
             border-radius: 4rpx;
             padding: 2rpx 16rpx;
@@ -1151,15 +1286,18 @@ import {wrapTreeNode} from "../../util/dateTime";
             font-style: normal;
             margin-right: 18rpx;
           }
-          .timeBox{
+
+          .timeBox {
             display: flex;
             align-items: center;
-            .dateIcon{
+
+            .dateIcon {
               width: 32rpx;
               height: 32rpx;
               margin-right: 8rpx;
             }
-            .dateText{
+
+            .dateText {
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
               font-size: 28rpx;
@@ -1169,7 +1307,8 @@ import {wrapTreeNode} from "../../util/dateTime";
               font-style: normal;
             }
           }
-          .orangeText{
+
+          .orangeText {
             font-family: PingFangSC, PingFang SC;
             font-weight: 600;
             font-size: 28rpx;
@@ -1178,7 +1317,8 @@ import {wrapTreeNode} from "../../util/dateTime";
             text-align: left;
             font-style: normal;
           }
-          .money{
+
+          .money {
             font-family: DINAlternate, DINAlternate;
             font-weight: bold;
             font-size: 28rpx;
@@ -1188,7 +1328,8 @@ import {wrapTreeNode} from "../../util/dateTime";
             font-style: normal;
             margin: 0 4rpx;
           }
-          .unit{
+
+          .unit {
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             font-size: 28rpx;
@@ -1198,7 +1339,8 @@ import {wrapTreeNode} from "../../util/dateTime";
             font-style: normal;
           }
         }
-        .resultBox{
+
+        .resultBox {
           width: 100%;
           background: #F7F8FA;
           border-radius: 8rpx;
@@ -1207,12 +1349,13 @@ import {wrapTreeNode} from "../../util/dateTime";
           display: flex;
           align-items: center;
 
-          .warningLight{
+          .warningLight {
             width: 48rpx;
             height: 48rpx;
             margin-right: 8rpx;
           }
-          .blueText{
+
+          .blueText {
             color: #2363FF;
             margin-left: 8rpx;
           }
diff --git a/pages/index/index.vue b/pages/index/index.vue
index 94c97cb..6d0ccfd 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -169,16 +169,16 @@
                 height: menu.height + 'px',
                 marginLeft: '10rpx',
               }">
-                <UniDataSelect :localdata="localdata" :value="selectVersion" :clear="false"
+                <!-- <UniDataSelect :localdata="localdata" :value="selectVersion" :clear="false"
                   @change="handleChangeVersion">
-                  <template v-slot:content>
-                    <!--              @click="goOldIndexPage"-->
-                    <view class="searchIconBox">
-                      <image class="dateIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/pageLogo.png" />
-                      <!--            <text class="searchIconText">数智驿达</text>-->
-                    </view>
-                  </template>
-                </UniDataSelect>
+                  <template v-slot:content> -->
+                <!--              @click="goOldIndexPage"-->
+                <view class="searchIconBox">
+                  <image class="dateIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/pageLogo.png" />
+                  <!--            <text class="searchIconText">数智驿达</text>-->
+                </view>
+                <!-- </template> -->
+                <!-- </UniDataSelect> -->
                 <view class="seachBox" :style="{ height: menu.height + 'px' }" @click="handleGoMap">
                   <image class="searchIcon"
                     src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/searchIconService.svg" />
@@ -234,77 +234,6 @@
                                 <view class="moreIcon" @click.stop="changeShowRealBox">
                                   <image class="noticeIcon"
                                     src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/noticeIcon.svg" />
-                                  <view v-if="showRealBox" class="realBox" @click.stop="changeShowRealBox">
-                                    <div style="
-                                  width: 100%;
-                                  display: flex;
-                                  justify-content: space-between;
-                                  align-items: center;
-                                ">
-                                      <span class="noticeText">注解词说明：</span>
-                                      <img class="closeIcon"
-                                        src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/closeIcon.svg"
-                                        @click.stop="changeShowRealBox" />
-                                    </div>
-                                    <span class="noticeText" style="text-indent: 2rem">
-                                      对客销售（对客营收、营业额）
-                                      ----服务区所有经营实体与客户发生的交易金额，一般统计消费总量，多用于外部口径；</span>
-                                    <span class="noticeText" style="text-indent: 2rem">
-                                      同期服务区的对客销售额与入区车流量和服务区营效变化会呈现较强关联性，属于显性短周指标。</span>
-                                    <span class="noticeText" style="text-indent: 2rem">
-                                      自营销售（自营经营额）
-                                      ----驿达自主经营的实体与客户发生的真实交易金额；</span>
-                                    <span class="noticeText" style="text-indent: 2rem">
-                                      外租销售 (商铺经营额）
-                                      ----合作商户经营的实体与客户发生的真实交易金额；</span>
-                                    <span class="noticeText" style="text-indent: 2rem">
-                                      应用场景：口径多用与服务区同行或行业相关部门交流，体现服务区商业服务能力，也是考核旗下服务区商业管理水平提升的重要指标。</span>
-                                    <span class="noticeText" style="text-indent: 2rem">
-                                      营业收入（经营收入）---驿达通过服务区场景获得的真实收入，包括自主经营项目、外租经营项目、油站充电桩等租赁收入等，多用于内部口径；</span>
-                                    <span class="noticeText" style="text-indent: 2rem">
-                                      因商户租赁收入和其他固定项目收入，存在财务确认时间滞后情况，数字变化一般晚于对客销售额，属于长周期指标；</span>
-                                    <span class="noticeText" style="text-indent: 2rem">
-                                      自营营业收入
-                                      ---指的是驿达自有经营门店的实际交易金额；</span>
-                                    <span class="noticeText" style="text-indent: 2rem">
-                                      租赁营业收入
-                                      ---指的是驿达通过租赁商铺，通过商铺交易金额按比例来获取租金的收入；</span>
-
-                                    <span class="noticeText"
-                                      style="margin-top: 8px">一般情况下，收入单纯代表交易金额，如果对内财务口径一般需要后面（除税）来表达。</span>
-                                    <span class="noticeText" style="text-indent: 2rem">
-                                      应用场景：口径多用与内部分子公司任务拆解考核和集团的任务指标完成汇报，是整个管理团队的长期阶段性指标结果。</span>
-                                    <span class="noticeText" style="text-indent: 2rem">
-                                      同比，指的是一段时间内与全年同期的数据比较，一般用于反映长线经营趋势的波动；</span>
-                                    <span class="noticeText" style="text-indent: 2rem">
-                                      环比，指的是一段时间内与上月同期的数值比较，一般用于反映短期经营趋势的比较。</span>
-                                    <span class="noticeText" style="text-indent: 2rem">
-                                      因为服务区的特殊性，有节假日条件约束，较多会用同比来形容指标波动。</span>
-                                    <!--                            <view class="field">-->
-                                    <!--                              <view class="label">对客销售：</view>-->
-                                    <!--                              <view class="value">{{showTableData.CashPay?$util.fmoney($util.getMoney(showTableData.CashPay),2):'-'}}</view>-->
-                                    <!--                            </view>-->
-                                    <!--                            <view class="field">-->
-                                    <!--                              <view class="label">自营销售：</view>-->
-                                    <!--                              <view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[0].value),2) : '-'}}</view>-->
-                                    <!--                            </view>-->
-                                    <!--                            <view class="field">-->
-                                    <!--                              <view class="label" style="padding-left: 20rpx">便利店：</view>-->
-                                    <!--                              <view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[2].value),2) : '-'}}</view>-->
-                                    <!--                            </view>-->
-                                    <!--                            <view class="field">-->
-                                    <!--                              <view class="label" style="padding-left: 20rpx">餐饮客房：</view>-->
-                                    <!--                              <view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[3].value),2) : '-'}}</view>-->
-                                    <!--                            </view>-->
-                                    <!--                            <view class="field">-->
-                                    <!--                              <view class="label">外租收入：</view>-->
-                                    <!--                              <view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[1].value),2) : '-'}}</view>-->
-                                    <!--                            </view>-->
-                                    <!--                            <view class="field">-->
-                                    <!--                              <view class="label" style="padding-left: 20rpx">商铺租赁：</view>-->
-                                    <!--                              <view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[4].value),2) : '-'}}</view>-->
-                                    <!--                            </view>-->
-                                  </view>
                                 </view>
                               </view>
                               <view class="haveMore" @click="goToRevenueStatic">
@@ -762,77 +691,7 @@
                               <view class="moreIcon" @click.stop="changeShowRealBox">
                                 <image class="noticeIcon"
                                   src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/noticeIcon.svg" />
-                                <view v-if="showRealBox" class="realBox" @click.stop="changeShowRealBox">
-                                  <div style="
-                                width: 100%;
-                                display: flex;
-                                justify-content: space-between;
-                                align-items: center;
-                              ">
-                                    <span class="noticeText">注解词说明：</span>
-                                    <img class="closeIcon"
-                                      src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/closeIcon.svg"
-                                      @click.stop="changeShowRealBox" />
-                                  </div>
-                                  <span class="noticeText" style="text-indent: 2rem">
-                                    对客销售（对客营收、营业额）
-                                    ----服务区所有经营实体与客户发生的交易金额，一般统计消费总量，多用于外部口径；</span>
-                                  <span class="noticeText" style="text-indent: 2rem">
-                                    同期服务区的对客销售额与入区车流量和服务区营效变化会呈现较强关联性，属于显性短周指标。</span>
-                                  <span class="noticeText" style="text-indent: 2rem">
-                                    自营销售（自营经营额）
-                                    ----驿达自主经营的实体与客户发生的真实交易金额；</span>
-                                  <span class="noticeText" style="text-indent: 2rem">
-                                    外租销售 (商铺经营额）
-                                    ----合作商户经营的实体与客户发生的真实交易金额；</span>
-                                  <span class="noticeText" style="text-indent: 2rem">
-                                    应用场景：口径多用与服务区同行或行业相关部门交流，体现服务区商业服务能力，也是考核旗下服务区商业管理水平提升的重要指标。</span>
-                                  <span class="noticeText" style="text-indent: 2rem">
-                                    营业收入（经营收入）---驿达通过服务区场景获得的真实收入，包括自主经营项目、外租经营项目、油站充电桩等租赁收入等，多用于内部口径；</span>
-                                  <span class="noticeText" style="text-indent: 2rem">
-                                    因商户租赁收入和其他固定项目收入，存在财务确认时间滞后情况，数字变化一般晚于对客销售额，属于长周期指标；</span>
-                                  <span class="noticeText" style="text-indent: 2rem">
-                                    自营营业收入
-                                    ---指的是驿达自有经营门店的实际交易金额；</span>
-                                  <span class="noticeText" style="text-indent: 2rem">
-                                    租赁营业收入
-                                    ---指的是驿达通过租赁商铺，通过商铺交易金额按比例来获取租金的收入；</span>
 
-                                  <span class="noticeText"
-                                    style="margin-top: 8px">一般情况下，收入单纯代表交易金额，如果对内财务口径一般需要后面（除税）来表达。</span>
-                                  <span class="noticeText" style="text-indent: 2rem">
-                                    应用场景：口径多用与内部分子公司任务拆解考核和集团的任务指标完成汇报，是整个管理团队的长期阶段性指标结果。</span>
-                                  <span class="noticeText" style="text-indent: 2rem">
-                                    同比，指的是一段时间内与全年同期的数据比较，一般用于反映长线经营趋势的波动；</span>
-                                  <span class="noticeText" style="text-indent: 2rem">
-                                    环比，指的是一段时间内与上月同期的数值比较，一般用于反映短期经营趋势的比较。</span>
-                                  <span class="noticeText" style="text-indent: 2rem">
-                                    因为服务区的特殊性，有节假日条件约束，较多会用同比来形容指标波动。</span>
-                                  <!--                            <view class="field">-->
-                                  <!--                              <view class="label">对客销售：</view>-->
-                                  <!--                              <view class="value">{{showTableData.CashPay?$util.fmoney($util.getMoney(showTableData.CashPay),2):'-'}}</view>-->
-                                  <!--                            </view>-->
-                                  <!--                            <view class="field">-->
-                                  <!--                              <view class="label">自营销售：</view>-->
-                                  <!--                              <view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[0].value),2) : '-'}}</view>-->
-                                  <!--                            </view>-->
-                                  <!--                            <view class="field">-->
-                                  <!--                              <view class="label" style="padding-left: 20rpx">便利店：</view>-->
-                                  <!--                              <view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[2].value),2) : '-'}}</view>-->
-                                  <!--                            </view>-->
-                                  <!--                            <view class="field">-->
-                                  <!--                              <view class="label" style="padding-left: 20rpx">餐饮客房：</view>-->
-                                  <!--                              <view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[3].value),2) : '-'}}</view>-->
-                                  <!--                            </view>-->
-                                  <!--                            <view class="field">-->
-                                  <!--                              <view class="label">外租收入：</view>-->
-                                  <!--                              <view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[1].value),2) : '-'}}</view>-->
-                                  <!--                            </view>-->
-                                  <!--                            <view class="field">-->
-                                  <!--                              <view class="label" style="padding-left: 20rpx">商铺租赁：</view>-->
-                                  <!--                              <view class="value">{{typeList && typeList.length>0?$util.fmoney($util.getMoney(typeList[4].value),2) : '-'}}</view>-->
-                                  <!--                            </view>-->
-                                </view>
                               </view>
                             </view>
                             <view class="haveMore" @click="goToRevenueStatic">
@@ -3475,12 +3334,20 @@
               </view>
 
               <!-- 财务报表-->
-              <view class="funItem" @click="handleMoney">
+              <!-- <view class="funItem" @click="handleMoney">
                 <view class="funItemContent">
                   <view class="funIconBox">
                     <image class="funIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/financialState.svg" />
                   </view>
                   <text class="funText">财务报表</text>
+                </view> 
+              </view> -->
+              <view v-if="projectWarning" class="funItem" @click="goToRobot">
+                <view class="funItemContent">
+                  <view class="funIconBox">
+                    <image class="funIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/statistics.svg" />
+                  </view>
+                  <text class="funText">数智助手</text>
                 </view>
               </view>
               <!-- 节日特刊-->
@@ -3553,14 +3420,7 @@
                 </view>
               </view>
 
-              <view v-if="projectWarning" class="funItem" style="margin-top: 32rpx" @click="goToRobot">
-                <view class="funItemContent">
-                  <view class="funIconBox">
-                    <image class="funIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/statistics.svg" />
-                  </view>
-                  <text class="funText">数智助手</text>
-                </view>
-              </view>
+
 
               <view class="funItem" style="margin-top: 32rpx" v-if="false" @click="goToBillLading">
                 <view class="funItemContent">
@@ -3984,6 +3844,49 @@
             </div>
           </view>
 
+
+          <view v-if="showRealBox" class="realBoxPage" @click.stop="changeShowRealBox"
+            :style="{ left: realBoxPageX + 'px', top: realBoxPageY + 'px' }">
+            <div style="width: 100%;display: flex;justify-content: space-between; align-items: center;">
+              <span class="noticeText">注解词说明：</span>
+              <img class="closeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/closeIcon.svg"
+                @click.stop="changeShowRealBox" />
+            </div>
+            <span class="noticeText" style="text-indent: 2rem">
+              对客销售（对客营收、营业额）
+              ----服务区所有经营实体与客户发生的交易金额，一般统计消费总量，多用于外部口径；</span>
+            <span class="noticeText" style="text-indent: 2rem">
+              同期服务区的对客销售额与入区车流量和服务区营效变化会呈现较强关联性，属于显性短周指标。</span>
+            <span class="noticeText" style="text-indent: 2rem">
+              自营销售（自营经营额）
+              ----驿达自主经营的实体与客户发生的真实交易金额；</span>
+            <span class="noticeText" style="text-indent: 2rem">
+              外租销售 (商铺经营额）
+              ----合作商户经营的实体与客户发生的真实交易金额；</span>
+            <span class="noticeText" style="text-indent: 2rem">
+              应用场景：口径多用与服务区同行或行业相关部门交流，体现服务区商业服务能力，也是考核旗下服务区商业管理水平提升的重要指标。</span>
+            <span class="noticeText" style="text-indent: 2rem">
+              营业收入（经营收入）---驿达通过服务区场景获得的真实收入，包括自主经营项目、外租经营项目、油站充电桩等租赁收入等，多用于内部口径；</span>
+            <span class="noticeText" style="text-indent: 2rem">
+              因商户租赁收入和其他固定项目收入，存在财务确认时间滞后情况，数字变化一般晚于对客销售额，属于长周期指标；</span>
+            <span class="noticeText" style="text-indent: 2rem">
+              自营营业收入
+              ---指的是驿达自有经营门店的实际交易金额；</span>
+            <span class="noticeText" style="text-indent: 2rem">
+              租赁营业收入
+              ---指的是驿达通过租赁商铺，通过商铺交易金额按比例来获取租金的收入；</span>
+
+            <span class="noticeText" style="margin-top: 8px">一般情况下，收入单纯代表交易金额，如果对内财务口径一般需要后面（除税）来表达。</span>
+            <span class="noticeText" style="text-indent: 2rem">
+              应用场景：口径多用与内部分子公司任务拆解考核和集团的任务指标完成汇报，是整个管理团队的长期阶段性指标结果。</span>
+            <span class="noticeText" style="text-indent: 2rem">
+              同比，指的是一段时间内与全年同期的数据比较，一般用于反映长线经营趋势的波动；</span>
+            <span class="noticeText" style="text-indent: 2rem">
+              环比，指的是一段时间内与上月同期的数值比较，一般用于反映短期经营趋势的比较。</span>
+            <span class="noticeText" style="text-indent: 2rem">
+              因为服务区的特殊性，有节假日条件约束，较多会用同比来形容指标波动。</span>
+          </view>
+
           <!--通知框-->
           <!--    -->
           <div class="notice" v-if="isShow" style="bottom: 200px">
@@ -4336,6 +4239,8 @@ export default {
       allselectVersion3Obj: {}, //累计
       selectVersion3Obj: {}, //正常
       smallTab: 1, // 演示版的几个显示样式
+      realBoxPageX: 0, // 注释说明弹出框的x位置
+      realBoxPageY: 0, // 注释说明弹出框的y位置
     };
   },
   watch: {
@@ -4728,18 +4633,18 @@ export default {
     },
     // 选择的版本
     handleChangeVersion(e) {
-      this.selectVersion = e;
-      uni.setStorageSync("version", this.selectVersion);
-      if (this.selectVersion === 2) {
-        this.$util.addUserBehavior({
-          intoRoute: `/pages/index/old/index`,
-        });
-        uni.redirectTo({
-          url: `/pages/index/old/index`,
-        });
-      } else if (this.selectVersion === 3) {
-        this.handleGetSelectVersion3Data(this.oldSwiperIndex);
-      }
+      // this.selectVersion = e;
+      // uni.setStorageSync("version", this.selectVersion);
+      // if (this.selectVersion === 2) {
+      //   this.$util.addUserBehavior({
+      //     intoRoute: `/pages/index/old/index`,
+      //   });
+      //   uni.redirectTo({
+      //     url: `/pages/index/old/index`,
+      //   });
+      // } else if (this.selectVersion === 3) {
+      //   this.handleGetSelectVersion3Data(this.oldSwiperIndex);
+      // }
     },
     // 版本选择到3的时候要调用拿到数据的方法
     async handleGetSelectVersion3Data(month) {
@@ -4991,7 +4896,10 @@ export default {
     handleShowHaveNoticeBox() {
       this.showHaveNotice = !this.showHaveNotice;
     },
-    changeShowRealBox() {
+    changeShowRealBox(e) {
+      console.log('eee', e);
+      this.realBoxPageX = e.detail.x;
+      this.realBoxPageY = e.detail.y;
       this.showRealBox = !this.showRealBox;
     },
     handleGoOtherFun(val) {
@@ -6804,7 +6712,7 @@ $iphoneHeight: env(safe-area-inset-bottom);
                         box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(244, 138, 143, 0.21);
                         z-index: 22;
                         width: 75vw;
-                        height: 250px;
+                        height: 70vh;
                         overflow-y: scroll;
                         white-space: pre-wrap;
 
@@ -11070,5 +10978,52 @@ $iphoneHeight: env(safe-area-inset-bottom);
       }
     }
   }
+
+  .realBoxPage {
+    position: fixed;
+    // left: 5%;
+    // top: 10px;
+    transform: translateX(-50%);
+    //right: 0;bottom: 0;
+    display: inline-block;
+    padding: 5px 10px;
+    background: #fff;
+    border-radius: 10rpx;
+    box-shadow: 0rpx 0rpx 40rpx 0rpx rgba(244, 138, 143, 0.21);
+    z-index: 22;
+    width: 75vw;
+    height: 70vh;
+    // height: 250px;
+    overflow-y: scroll;
+    white-space: pre-wrap;
+
+    .noticeText {
+      font-size: 12px;
+      color: #000;
+      display: block;
+    }
+
+    .closeIcon {
+      width: 16px;
+      height: 16px;
+    }
+
+    .field {
+      text-align: right;
+      display: flex;
+
+      .label {
+        display: inline-block;
+        width: 160rpx;
+        text-align: left;
+        box-sizing: border-box;
+      }
+
+      .value {
+        width: 200rpx;
+        text-align: right;
+      }
+    }
+  }
 }
 </style>
diff --git a/pages/nationalPage/merchantRevenue.vue b/pages/nationalPage/merchantRevenue.vue
index 85fd281..bfe1574 100644
--- a/pages/nationalPage/merchantRevenue.vue
+++ b/pages/nationalPage/merchantRevenue.vue
@@ -1,80 +1,59 @@
 <template>
   <div class="main">
-    <div
-      :class="
-        selectFestival === 1 || selectFestival === 2
-          ? 'top springTop'
-          : selectFestival === 3
-          ? 'top qmTop'
-          : selectFestival === 4
+    <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
+            ? '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"
-        />
+              ? '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>
+                  }}</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>
+                <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"
-        >
+        <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>
@@ -85,63 +64,50 @@
       <!--      </scroll-view>-->
     </div>
     <div class="contentPage">
-      <div
-        :class="
-          selectFestival === 1 || selectFestival === 2
-            ? 'contentTop springContentTop'
-            : selectFestival === 3
-            ? 'contentTop qmContentTop'
-            : selectFestival === 4
+      <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'
-            : ''
-        "
-      >
+              ? '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 === 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
+            <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'
-                  : ''
-              "
-            />
+                    ? '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 :class="pageType === 1 ? 'normal select' : 'normal'" @click="handleChangeType(1)">
                 按天统计
               </div>
-              <div
-                :class="pageType === 2 ? 'normal select' : 'normal'"
-                @click="handleChangeType(2)"
-              >
+              <div :class="pageType === 2 ? 'normal select' : 'normal'" @click="handleChangeType(2)">
                 累计统计
               </div>
             </div>
@@ -153,358 +119,249 @@
           <!--            <div class="allBox">-->
           <!--              <div :class="currentScroll==='all'?'scrollItem selectItem':'scrollItem'" @click="handleChangeTime('all')">累计</div>-->
           <!--            </div>-->
-          <scroll-view
-            scroll-x="true"
-            :class="
-              selectFestival === 1 || selectFestival === 2
-                ? 'navList springNav'
-                : selectFestival === 3
-                ? 'navList qmNav'
-                : selectFestival === 4
+          <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)"
-            >
+                  ? '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)"
-          >
+          <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">{{
               `${curYear.toString().slice(2, 4)}年`
-            }}</text>
+              }}</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)"
-          >
+          <view class="sortItem" style="width: 110rpx" @click="handleChangeSortName(2)">
             <!--            <text class="sortText">{{ `23年${type === 1 ? '销售' : type === 2 ? '营收' : type === 3 ? '车流' : ''}` }}</text>-->
             <text class="sortText">{{
               `${compareYear.toString().slice(2, 4)}年`
-            }}</text>
+              }}</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)"
-          >
+          <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)"
-          >
+          <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"
-            >
+          <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
+                <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% - 120rpx)', textAlign: 'left' }">
+                <!-- :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">{{
+                <div class="itemRight" :style="{ width: 'calc(100% - 128rpx)' }">
+                  <div 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 style="display: flex;">
+                    <div class="item" style="width: 110rpx">{{
+                      item.RevenueINC.curYearData
+                        ? item.RevenueINC.curYearData < 100 ? `${item.RevenueINC.curYearData}(元)` :
+                          $util.getMoney(item.RevenueINC.curYearData / 10000) : "" }}</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>
+                    </div>
+                  </div>
                 </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>
-            </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>
@@ -642,9 +499,8 @@ export default {
     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
-    }日`;
+    this.allDateDay = `${lastMonth < 10 ? "0" + lastMonth : lastMonth}月${lastDays < 10 ? "0" + lastDays : lastDays
+      }日`;
     // 24年春运开始时间为 1.26
     // if (lastMonth === 1){
     //   dayNumber = lastDays - 26 + 1
@@ -821,15 +677,14 @@ export default {
         //   : "",
         StatisticsDate: time,
         ServerpartId: this.springService.Serverpart_ID || this.ServerpartId,
-        SortStr: `${
-          this.type === 1
-            ? "revenue"
-            : this.type === 2
+        SortStr: `${this.type === 1
+          ? "revenue"
+          : this.type === 2
             ? "account"
             : this.type === 3
-            ? "bayonet"
-            : ""
-        } ${this.sortType === 0 ? "asc" : "desc"}`,
+              ? "bayonet"
+              : ""
+          } ${this.sortType === 0 ? "asc" : "desc"}`,
       };
       // this.dataList
       const data = await request.$webGet(
@@ -882,209 +737,39 @@ export default {
       this.$forceUpdate();
       uni.hideLoading();
     },
-    // 排序方法
+    // 排序方法 - 优化版(分组排序:有值数据排序后,无值数据放最后)
     handleGetSort(list) {
-      var len = list.length;
+      // 1. 确定数据源和字段
+      const dataSource = this.type === 1 ? 'RevenueINC'
+        : this.type === 2 ? 'AccountINC'
+          : 'BayonetINC';
 
-      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.sortType === 0) {
-              // 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) {
-            // 正序
-            if (this.sortType === 0) {
-              // 24年车流
-              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
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  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
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  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
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-              }
-            } else {
-              // 降序
-              // 24年车流
-              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
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  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
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  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
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-              }
-            }
-          }
-        }
-      }
-      return list;
+      const field = this.sortName === 1 ? 'curYearData'
+        : this.sortName === 2 ? 'lYearData'
+          : this.sortName === 3 ? 'increaseData'
+            : 'increaseRate';
+
+      // 2. 分组:有值 vs 无值(null/undefined 算无值,0 算有值)
+      const hasValue = list.filter(item => {
+        const value = item[dataSource]?.[field];
+        return value !== null && value !== undefined;
+      });
+
+      const noValue = list.filter(item => {
+        const value = item[dataSource]?.[field];
+        return value === null || value === undefined;
+      });
+
+      // 3. 对有值组排序
+      hasValue.sort((a, b) => {
+        const aValue = a[dataSource][field];
+        const bValue = b[dataSource][field];
+        // 根据 sortType 决定升序或降序
+        return this.sortType === 0 ? aValue - bValue : bValue - aValue;
+      });
+
+      // 4. 合并:有值组 + 无值组
+      return [...hasValue, ...noValue];
     },
     handleBack() {
       uni.navigateBack({
@@ -1106,27 +791,35 @@ export default {
   width: 100%;
   height: 100%;
   background: #fff;
+
   .springTop {
     background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rankBg.png");
   }
+
   .qmTop {
     background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBackground.png");
   }
+
   .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");
   }
+
   .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;
   }
+
   .nationalDayTop {
     background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important;
   }
+
   .top {
     width: 100%;
     height: 324rpx;
@@ -1136,27 +829,35 @@ export default {
     background-position: 0 0;
     background-size: 100% 100%;
     position: relative;
+
     .headerSpring {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rankBg.png");
     }
+
     .headerQm {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/qmBackground.png");
     }
+
     .headerlabour {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png");
     }
+
     .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");
     }
+
     .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;
     }
+
     .header {
       position: fixed;
       width: 100%;
@@ -1170,12 +871,14 @@ export default {
       display: flex;
       align-items: center;
       z-index: 3;
+
       .backArrow {
         width: 24px;
         height: 24px;
         margin-right: 16px;
         position: absolute;
       }
+
       .detailIcon {
         width: 230rpx;
         height: 48rpx;
@@ -1183,6 +886,7 @@ export default {
         position: absolute;
         left: 40px;
       }
+
       .seachBox {
         position: absolute;
         bottom: 0;
@@ -1195,11 +899,13 @@ export default {
         padding: 10rpx 20rpx;
         display: flex;
         align-items: center;
+
         .searchIcon {
           width: 32rpx;
           height: 32rpx;
           margin-right: 8rpx;
         }
+
         .searchText {
           font-size: 28rpx;
           font-family: PingFangSC, PingFang SC;
@@ -1209,18 +915,22 @@ export default {
           white-space: nowrap;
         }
       }
+
       .picker {
         position: absolute;
         bottom: 0;
         left: 40px;
+
         .selectService {
           display: flex;
           align-items: center;
+
           .img {
             width: 40px;
             height: 40px;
             z-index: 2;
           }
+
           .select {
             height: 32px;
             background: #f8f8fa;
@@ -1230,9 +940,11 @@ export default {
             padding-left: 25px;
             display: flex;
             align-items: center;
+
             .content {
               display: flex;
               align-items: center;
+
               .uni-input {
                 padding: 0;
                 background: transparent;
@@ -1241,6 +953,7 @@ export default {
                 font-weight: 600;
                 color: #160002;
               }
+
               .area {
                 font-size: 12px;
                 font-family: PingFangSC-Regular, PingFang SC;
@@ -1249,6 +962,7 @@ export default {
                 line-height: 40px;
                 margin-left: 4px;
               }
+
               .rightArrow {
                 width: 24px;
                 height: 12px;
@@ -1258,6 +972,7 @@ export default {
         }
       }
     }
+
     .headerNavList {
       position: absolute;
       width: 100%;
@@ -1267,6 +982,7 @@ export default {
       white-space: nowrap;
       box-sizing: border-box;
       padding-left: 32rpx;
+
       .scrollItem {
         display: inline-block;
         height: 40rpx;
@@ -1277,6 +993,7 @@ export default {
         line-height: 40rpx;
         margin-right: 40rpx;
       }
+
       .selectItem {
         font-size: 28rpx;
         font-family: PingFangSC, PingFang SC;
@@ -1285,6 +1002,7 @@ export default {
         line-height: 40rpx;
         position: relative;
       }
+
       .selectItem:after {
         content: "";
         display: inline-block;
@@ -1297,60 +1015,55 @@ export default {
       }
     }
   }
+
   .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%
-      );
+      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%
-      );
+      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%
-      );
+      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%
-      );
+      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%
-      );
+      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%
-      );
+      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%
-      );
+      background: linear-gradient(360deg,
+          rgba(255, 218, 210, 0) 0%,
+          #fff2f0 100%);
     }
+
     .contentTop {
       width: 100%;
       height: 120rpx;
@@ -1359,17 +1072,20 @@ export default {
       border-radius: 32rpx 32rpx 0rpx 0rpx;
       box-sizing: border-box;
       padding: 24rpx 24rpx 0;
+
       .content {
         width: 100%;
         box-sizing: border-box;
         display: flex;
         align-items: center;
         justify-content: space-between;
+
         .left {
           .detailLogo {
             width: 178rpx;
             height: 32rpx;
           }
+
           .modalUnit {
             font-size: 24rpx;
             font-family: PingFangSC, PingFang SC;
@@ -1378,6 +1094,7 @@ export default {
             line-height: 36rpx;
           }
         }
+
         .right {
           .typeChangeBox {
             display: flex;
@@ -1386,6 +1103,7 @@ export default {
             border-radius: 6rpx;
             box-sizing: border-box;
             padding: 4rpx;
+
             .normal {
               font-size: 24rpx;
               font-family: PingFangSC, PingFang SC;
@@ -1394,6 +1112,7 @@ export default {
               line-height: 36rpx;
               padding: 6rpx 16rpx;
             }
+
             .select {
               font-size: 24rpx;
               font-family: PingFangSC, PingFang SC;
@@ -1407,10 +1126,12 @@ export default {
         }
       }
     }
+
     .contentBox {
       width: 100%;
       box-sizing: border-box;
       padding: 0 32rpx;
+
       .navBigList {
         width: 100%;
         height: 40rpx;
@@ -1418,9 +1139,11 @@ export default {
         align-items: center;
         padding-bottom: 24rpx;
         border-bottom: 1px solid #f5f4f4;
+
         .allBox {
           width: 70rpx;
           height: 100%;
+
           .scrollItem {
             font-size: 28rpx;
             font-family: PingFangSC, PingFang SC;
@@ -1428,6 +1151,7 @@ export default {
             color: #a69e9f;
             line-height: 40rpx;
           }
+
           .selectItem {
             font-size: 28rpx;
             font-family: PingFangSC, PingFang SC;
@@ -1436,12 +1160,14 @@ export default {
             line-height: 40rpx;
           }
         }
+
         .navList {
           width: 100%;
           height: 40rpx;
           display: flex;
           align-items: center;
           white-space: nowrap;
+
           .scrollItem {
             font-size: 28rpx;
             font-family: PingFangSC, PingFang SC;
@@ -1451,6 +1177,7 @@ export default {
             margin-right: 32rpx;
             display: inline-block;
           }
+
           .selectItem {
             font-size: 28rpx;
             font-family: PingFangSC, PingFang SC;
@@ -1459,36 +1186,43 @@ export default {
             line-height: 40rpx;
           }
         }
+
         .springNav {
           .selectItem {
             color: #ed3e48 !important;
           }
         }
+
         .qmNav {
           .selectItem {
             color: #226c61 !important;
           }
         }
+
         .labourNav {
           .selectItem {
             color: #d14702;
           }
         }
+
         .dragonBoatNav {
           .selectItem {
             color: #3e8958 !important;
           }
         }
+
         .summerHolidayNav {
           .selectItem {
             color: #007797 !important;
           }
         }
+
         .midAutumnNav {
           .selectItem {
             color: #da5015;
           }
         }
+
         .nationalDayNav {
           .selectItem {
             color: #d52020;
@@ -1502,9 +1236,11 @@ export default {
         justify-content: space-between;
         margin-bottom: 16rpx;
         margin-top: 24rpx;
+
         .sortItem {
           display: flex;
           align-items: center;
+
           .sortText {
             font-size: 24rpx;
             font-family: PingFangSC, PingFang SC;
@@ -1513,15 +1249,18 @@ export default {
             line-height: 36rpx;
             white-space: nowrap;
           }
+
           .sortIconBox {
             display: flex;
             flex-direction: column;
             margin-left: 16rpx;
+
             .upIcon {
               width: 16rpx;
               height: 12rpx;
               margin-bottom: 4rpx;
             }
+
             .bottomIcon {
               width: 16rpx;
               height: 12rpx;
@@ -1529,35 +1268,38 @@ export default {
           }
         }
       }
+
       .scrollBox {
         .typeFirst {
           height: calc(100vh - 300px);
+
           .listItem {
             width: 100%;
             display: flex;
             //align-items: center;
             align-items: flex-end;
             padding: 16rpx 0;
+
             .noItem {
               display: flex;
               height: 120rpx;
               align-items: center;
+
               .noIcon {
                 width: 40rpx;
                 height: 40rpx;
               }
+
               .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;
@@ -1566,6 +1308,7 @@ export default {
                 line-height: 24rpx;
               }
             }
+
             .item {
               text-align: center;
               font-size: 28rpx;
@@ -1574,40 +1317,60 @@ export default {
               color: #9a9a9a;
               line-height: 40rpx;
             }
+
             .firstItem {
               display: flex;
+
               .itemIcon {
                 width: 120rpx;
                 height: 120rpx;
                 border-radius: 16rpx;
                 overflow: hidden;
                 margin-right: 8rpx;
+
                 .itemImg {
                   width: 100%;
                   height: 100%;
                 }
               }
+
               .itemRight {
                 height: 120rpx;
                 display: flex;
                 flex-direction: column;
                 justify-content: space-between;
                 color: #9a9a9a;
+
                 .firstItemText {
                   width: 100%;
                   text-align: left;
                   font-size: 28rpx;
+                  line-height: 36rpx;
                   font-family: PingFangSC, PingFang SC;
                   font-weight: 500;
                   color: #9a9a9a;
+                  display: -webkit-box;
+                  -webkit-box-orient: vertical;
+                  -webkit-line-clamp: 2;
                   overflow: hidden;
-                  white-space: nowrap;
-                  text-overflow: ellipsis;
+                  // overflow: hidden;
+                  // white-space: nowrap;
+                  // text-overflow: ellipsis;
+                }
+
+                .item {
+                  text-align: center;
+                  font-size: 28rpx;
+                  font-family: PingFangSC, PingFang SC;
+                  font-weight: 500;
+                  color: #9a9a9a;
+                  line-height: 40rpx;
                 }
               }
             }
           }
         }
+
         .noDataBox {
           width: 100%;
           height: calc(100vh - 300px);
@@ -1615,12 +1378,13 @@ export default {
           flex-direction: column;
           align-items: center;
           justify-content: center;
+
           .noDataImg {
             width: 120rpx;
             height: 120rpx;
           }
-          .noDataText {
-          }
+
+          .noDataText {}
         }
       }
     }
diff --git a/pages/nationalPage/rankPage.vue b/pages/nationalPage/rankPage.vue
index 9fb2476..030bef4 100644
--- a/pages/nationalPage/rankPage.vue
+++ b/pages/nationalPage/rankPage.vue
@@ -1,110 +1,86 @@
 <template>
   <div class="main">
-    <div
-      :class="
-        selectFestival === 1 || selectFestival === 2
-          ? 'top springTop'
-          : selectFestival === 3
-          ? 'top qmTop'
-          : selectFestival === 4
+    <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
+            ? '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 summerHolidayBoat'
-            : selectFestival === 7
-            ? 'header midAutumnBoat'
-            : selectFestival === 8
-            ? 'header nationalDayBoat'
-            : ''
-        "
-        :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"
-        />
+              ? 'header headerDragonBoat'
+              : selectFestival === 6
+                ? 'header summerHolidayBoat'
+                : selectFestival === 7
+                  ? 'header midAutumnBoat'
+                  : selectFestival === 8
+                    ? 'header nationalDayBoat'
+                    : ''
+        " :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" />
       </div>
     </div>
 
     <div class="contentPage">
       <div class="revenueDetail">
-        <div
-          :class="
-            selectFestival === 1 || selectFestival === 2
-              ? 'revenueDetailTitleBox springTitleBox'
-              : selectFestival === 3
-              ? 'revenueDetailTitleBox qmTitleBox'
-              : selectFestival === 4
+        <div :class="selectFestival === 1 || selectFestival === 2
+          ? 'revenueDetailTitleBox springTitleBox'
+          : selectFestival === 3
+            ? 'revenueDetailTitleBox qmTitleBox'
+            : selectFestival === 4
               ? 'revenueDetailTitleBox labourTitleBox'
               : selectFestival === 5
-              ? 'revenueDetailTitleBox dragonBoatTitleBox'
-              : selectFestival === 6
-              ? 'revenueDetailTitleBox summerHolidayTitleBox'
-              : selectFestival === 7
-              ? 'revenueDetailTitleBox midAutumnTitleBox'
-              : selectFestival === 8
-              ? 'revenueDetailTitleBox nationalDayTitleBox'
-              : ''
-          "
-        >
+                ? 'revenueDetailTitleBox dragonBoatTitleBox'
+                : selectFestival === 6
+                  ? 'revenueDetailTitleBox summerHolidayTitleBox'
+                  : selectFestival === 7
+                    ? 'revenueDetailTitleBox midAutumnTitleBox'
+                    : selectFestival === 8
+                      ? 'revenueDetailTitleBox nationalDayTitleBox'
+                      : ''
+          ">
           <div class="left">
-            <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
+            <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'
-                  : ''
-              "
-            />
+                    ? '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 :class="pageType === 1 ? 'normal select' : 'normal'" @click="handleChangeType(1)">
                 按天统计
               </div>
-              <div
-                :class="pageType === 2 ? 'normal select' : 'normal'"
-                @click="handleChangeType(2)"
-              >
+              <div :class="pageType === 2 ? 'normal select' : 'normal'" @click="handleChangeType(2)">
                 累计统计
               </div>
             </div>
@@ -115,39 +91,27 @@
             <!--            <div class="allBox">-->
             <!--              <div :class="currentScroll==='all'?'scrollItem selectItem':'scrollItem'" @click="handleChangeTime('all')">累计</div>-->
             <!--            </div>-->
-            <scroll-view
-              scroll-x="true"
-              :class="
-                selectFestival === 1 || selectFestival === 2
-                  ? 'navList springNav'
-                  : selectFestival === 3
-                  ? 'navList qmNav'
-                  : selectFestival === 4
+            <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)"
-              >
+                    ? '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>
@@ -155,244 +119,194 @@
           <!--            <span class="dateText">{{selectDateText || ''}}</span>-->
           <div class="modalBox">
             <div class="modalTitleBox">
-              <div
-                class="modalTitleItem"
-                :style="{ width: 'calc(100% - 390rpx)', textAlign: 'left' }"
-              >
-                <div
-                  class="modalIndex"
-                  :style="{
-                    background:
-                      selectFestival === 1 || selectFestival === 2
-                        ? '#DB6465'
-                        : selectFestival === 3
+              <div class="modalTitleItem" :style="{ width: 'calc(100% - 390rpx)', textAlign: 'left' }">
+                <div class="modalIndex" :style="{
+                  background:
+                    selectFestival === 1 || selectFestival === 2
+                      ? '#DB6465'
+                      : selectFestival === 3
                         ? '#3B9285'
                         : selectFestival === 4
-                        ? '#D14702'
-                        : selectFestival === 5
-                        ? '#3E8958'
-                        : selectFestival === 6
-                        ? '#007797'
-                        : selectFestival === 7
-                        ? '#3E8958'
-                        : selectFestival === 8
-                        ? '#3E8958'
-                        : '',
-                  }"
-                ></div>
+                          ? '#D14702'
+                          : selectFestival === 5
+                            ? '#3E8958'
+                            : selectFestival === 6
+                              ? '#007797'
+                              : selectFestival === 7
+                                ? '#3E8958'
+                                : selectFestival === 8
+                                  ? '#3E8958'
+                                  : '',
+                }"></div>
                 <text class="modalText">{{
                   type === 1
                     ? "对客销售"
                     : type === 2
-                    ? "营业收入"
-                    : type === 3
-                    ? "入区车流"
-                    : ""
+                      ? "营业收入"
+                      : type === 3
+                        ? "入区车流"
+                        : ""
                 }}</text>
                 <text class="modalUnit">{{
                   type === 3 ? "/万辆" : "/万元"
-                }}</text>
+                  }}</text>
               </div>
             </div>
 
             <view class="sortBox">
               <view class="sortItem" @click="handleChangeSortName(1)">
                 <text class="sortText">{{
-                  `${curYear}年${
-                    type === 1
-                      ? "销售"
-                      : type === 2
+                  `${curYear}年${type === 1
+                    ? "销售"
+                    : type === 2
                       ? "营收"
                       : type === 3
-                      ? "车流"
-                      : ""
+                        ? "车流"
+                        : ""
                   }`
                 }}</text>
                 <view class="sortIconBox">
-                  <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" @click="handleChangeSortName(2)">
                 <text class="sortText">{{
-                  `${compareYear}年${
-                    type === 1
-                      ? "销售"
-                      : type === 2
+                  `${compareYear}年${type === 1
+                    ? "销售"
+                    : type === 2
                       ? "营收"
                       : type === 3
-                      ? "车流"
-                      : ""
+                        ? "车流"
+                        : ""
                   }`
                 }}</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" @click="handleChangeSortName(3)">
                 <text class="sortText">{{
-                  `${
-                    type === 1
-                      ? "销售"
-                      : type === 2
+                  `${type === 1
+                    ? "销售"
+                    : type === 2
                       ? "营收"
                       : type === 3
-                      ? "车流"
-                      : ""
+                        ? "车流"
+                        : ""
                   }增长`
                 }}</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" @click="handleChangeSortName(4)">
                 <text class="sortText">{{
-                  `${
-                    type === 1
-                      ? "销售"
-                      : type === 2
+                  `${type === 1
+                    ? "销售"
+                    : type === 2
                       ? "营收"
                       : type === 3
-                      ? "车流"
-                      : ""
+                        ? "车流"
+                        : ""
                   }增幅`
                 }}</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>
@@ -406,16 +320,9 @@
               <!--                <div class="titleItem"  style="width: 110rpx">增幅</div>-->
               <!--              </div>-->
               <scroll-view :scroll-y="true" class="typeFirst">
-                <div
-                  class="listItem"
-                  v-for="(item, index) in dataList"
-                  :key="index"
-                >
+                <div class="listItem" v-for="(item, index) in dataList" :key="index">
                   <div class="itemLeft">
-                    <image
-                      class="bg"
-                      src="https://eshangtech.com/ShopICO/ahyd-BID/car/itemLeftBg.svg"
-                    />
+                    <image class="bg" src="https://eshangtech.com/ShopICO/ahyd-BID/car/itemLeftBg.svg" />
                     <view class="nameBox">
                       <text class="serviceName">{{
                         item.ServerpartName
@@ -428,91 +335,82 @@
                   <div class="contentRight">
                     <div class="rightTop">
                       <view class="rightTopLeft">
-                        <view
-                          class="indexBox"
-                          :style="{
-                            backgroundImage: `url(${
-                              index === 0
-                                ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/1stBg.svg'
-                                : index === 1
-                                ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/2stBg.svg'
-                                : index === 2
+                        <view class="indexBox" :style="{
+                          backgroundImage: `url(${index === 0
+                            ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/1stBg.svg'
+                            : index === 1
+                              ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/2stBg.svg'
+                              : index === 2
                                 ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/3stBg.svg'
                                 : 'https://eshangtech.com/ShopICO/ahyd-BID/car/4stBg.svg'
                             })`,
-                          }"
-                          >{{ index + 1 }}</view
-                        >
+                        }">{{ index + 1 }}</view>
                       </view>
                       <view class="rightTopRight">
                         <text class="entryRateLabel">增幅</text>
                         <div class="entryRateValue">
-                          <span
-                            :style="{
-                              color:
-                                type === 1
-                                  ? item.RevenueINC.increaseRate > 0
-                                    ? '#E83944'
-                                    : '#0E9976'
-                                  : type === 2
+                          <span :style="{
+                            color:
+                              type === 1
+                                ? item.RevenueINC.increaseRate > 0
+                                  ? '#E83944'
+                                  : '#0E9976'
+                                : type === 2
                                   ? item.AccountINC.increaseRate > 0
                                     ? '#E83944'
                                     : '#0E9976'
                                   : type === 3
-                                  ? item.BayonetINC.increaseRate > 0
-                                    ? '#E83944'
-                                    : '#0E9976'
-                                  : '-',
-                            }"
-                          >
+                                    ? item.BayonetINC.increaseRate > 0
+                                      ? '#E83944'
+                                      : '#0E9976'
+                                    : '-',
+                          }">
                             {{
                               type === 1
                                 ? item.RevenueINC.increaseRate > 0
                                   ? "+"
                                   : ""
                                 : type === 2
-                                ? item.AccountINC.increaseRate > 0
-                                  ? "+"
-                                  : ""
-                                : type === 3
-                                ? item.BayonetINC.increaseRate > 0
-                                  ? "+"
-                                  : ""
-                                : "-"
+                                  ? item.AccountINC.increaseRate > 0
+                                    ? "+"
+                                    : ""
+                                  : type === 3
+                                    ? item.BayonetINC.increaseRate > 0
+                                      ? "+"
+                                      : ""
+                                    : "-"
                             }}
                           </span>
-                          <span
-                            :style="{
-                              color:
-                                type === 1
-                                  ? item.RevenueINC.increaseRate > 0
-                                    ? '#E83944'
-                                    : '#0E9976'
-                                  : type === 2
+                          <span :style="{
+                            color:
+                              type === 1
+                                ? item.RevenueINC.increaseRate > 0
+                                  ? '#E83944'
+                                  : '#0E9976'
+                                : type === 2
                                   ? item.AccountINC.increaseRate > 0
                                     ? '#E83944'
                                     : '#0E9976'
                                   : type === 3
-                                  ? item.BayonetINC.increaseRate > 0
-                                    ? '#E83944'
-                                    : '#0E9976'
-                                  : '-',
-                            }"
-                          >
+                                    ? item.BayonetINC.increaseRate > 0
+                                      ? '#E83944'
+                                      : '#0E9976'
+                                    : '-',
+                          }">
                             {{
                               type === 1
                                 ? item.RevenueINC.increaseRate
                                   ? item.RevenueINC.increaseRate
                                   : "-"
                                 : type === 2
-                                ? item.AccountINC.increaseRate
                                   ? item.AccountINC.increaseRate
-                                  : "-"
-                                : type === 3
-                                ? item.BayonetINC.increaseRate
-                                  ? item.BayonetINC.increaseRate
-                                  : "-"
-                                : "-"
+                                    ? item.AccountINC.increaseRate
+                                    : "-"
+                                  : type === 3
+                                    ? item.BayonetINC.increaseRate
+                                      ? item.BayonetINC.increaseRate
+                                      : "-"
+                                    : "-"
                             }}%
                           </span>
                         </div>
@@ -526,22 +424,22 @@
                             type === 1
                               ? item.RevenueINC.curYearData
                                 ? $util.getMoney(
-                                    item.RevenueINC.curYearData / 10000
-                                  )
+                                  item.RevenueINC.curYearData / 10000
+                                )
                                 : "0.00"
                               : type === 2
-                              ? item.AccountINC.curYearData
-                                ? $util.getMoney(
+                                ? item.AccountINC.curYearData
+                                  ? $util.getMoney(
                                     item.AccountINC.curYearData / 10000
                                   )
-                                : "0.00"
-                              : type === 3
-                              ? item.BayonetINC.curYearData
-                                ? $util.getMoney(
-                                    item.BayonetINC.curYearData / 10000
-                                  )
-                                : "0.00"
-                              : "-"
+                                  : "0.00"
+                                : type === 3
+                                  ? item.BayonetINC.curYearData
+                                    ? $util.getMoney(
+                                      item.BayonetINC.curYearData / 10000
+                                    )
+                                    : "0.00"
+                                  : "-"
                           }}
                         </text>
                       </view>
@@ -552,22 +450,22 @@
                             type === 1
                               ? item.RevenueINC.lYearData
                                 ? $util.getMoney(
-                                    item.RevenueINC.lYearData / 10000
-                                  )
+                                  item.RevenueINC.lYearData / 10000
+                                )
                                 : "0.00"
                               : type === 2
-                              ? item.AccountINC.lYearData
-                                ? $util.getMoney(
+                                ? item.AccountINC.lYearData
+                                  ? $util.getMoney(
                                     item.AccountINC.lYearData / 10000
                                   )
-                                : "0.00"
-                              : type === 3
-                              ? item.BayonetINC.lYearData
-                                ? $util.getMoney(
-                                    item.BayonetINC.lYearData / 10000
-                                  )
-                                : "0.00"
-                              : "-"
+                                  : "0.00"
+                                : type === 3
+                                  ? item.BayonetINC.lYearData
+                                    ? $util.getMoney(
+                                      item.BayonetINC.lYearData / 10000
+                                    )
+                                    : "0.00"
+                                  : "-"
                           }}
                         </text>
                       </view>
@@ -578,22 +476,22 @@
                             type === 1
                               ? item.RevenueINC.increaseData
                                 ? $util.getMoney(
-                                    item.RevenueINC.increaseData / 10000
-                                  )
+                                  item.RevenueINC.increaseData / 10000
+                                )
                                 : "0.00"
                               : type === 2
-                              ? item.AccountINC.increaseData
-                                ? $util.getMoney(
+                                ? item.AccountINC.increaseData
+                                  ? $util.getMoney(
                                     item.AccountINC.increaseData / 10000
                                   )
-                                : "0.00"
-                              : type === 3
-                              ? item.BayonetINC.increaseData
-                                ? $util.getMoney(
-                                    item.BayonetINC.increaseData / 10000
-                                  )
-                                : "0.00"
-                              : "-"
+                                  : "0.00"
+                                : type === 3
+                                  ? item.BayonetINC.increaseData
+                                    ? $util.getMoney(
+                                      item.BayonetINC.increaseData / 10000
+                                    )
+                                    : "0.00"
+                                  : "-"
                           }}
                         </text>
                       </view>
@@ -602,38 +500,34 @@
                     <div class="otherCarBox" v-if="type !== 3">
                       <div class="left">
                         <span class="carLabel">车流增幅</span>
-                        <span
-                          :style="{
-                            color:
-                              item.BayonetINC.increaseRate > 1000
-                                ? ''
-                                : item.BayonetINC.increaseRate > 0
+                        <span :style="{
+                          color:
+                            item.BayonetINC.increaseRate > 1000
+                              ? ''
+                              : item.BayonetINC.increaseRate > 0
                                 ? '#E83944'
                                 : item.BayonetINC.increaseRate < 0
-                                ? '#0E9976'
-                                : '',
-                          }"
-                        >
+                                  ? '#0E9976'
+                                  : '',
+                        }">
                           {{
                             item.BayonetINC.increaseRate > 1000
                               ? ""
                               : item.BayonetINC.increaseRate > 0
-                              ? "+"
-                              : ""
+                                ? "+"
+                                : ""
                           }}
                         </span>
-                        <span
-                          :style="{
-                            color:
-                              item.BayonetINC.increaseRate > 1000
-                                ? ''
-                                : item.BayonetINC.increaseRate > 0
+                        <span :style="{
+                          color:
+                            item.BayonetINC.increaseRate > 1000
+                              ? ''
+                              : item.BayonetINC.increaseRate > 0
                                 ? '#E83944'
                                 : item.BayonetINC.increaseRate < 0
-                                ? '#0E9976'
-                                : '',
-                          }"
-                        >
+                                  ? '#0E9976'
+                                  : '',
+                        }">
                           {{
                             item.BayonetINC.increaseRate
                               ? item.BayonetINC.increaseRate > 1000
@@ -643,14 +537,8 @@
                           }}%
                         </span>
                       </div>
-                      <div
-                        class="MoreBox"
-                        @click="handleGoServerPartDetail(item)"
-                      >
-                        <img
-                          class="goMoreIcon"
-                          src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"
-                        />
+                      <div class="MoreBox" @click="handleGoServerPartDetail(item)">
+                        <img class="goMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg" />
                       </div>
                     </div>
                   </div>
@@ -719,7 +607,6 @@ export default {
     };
   },
   onLoad(query) {
-    console.log("query", query);
     //  获取手机参数对页面进行适配
     let systemInfo = uni.getSystemInfoSync();
     this.statusBarHeight = Number(systemInfo.statusBarHeight);
@@ -730,7 +617,6 @@ export default {
     }
     if (query.festivalObj) {
       this.festivalObj = JSON.parse(query.festivalObj);
-      console.log("this.festivalObj", this.festivalObj);
       this.selectFestival = this.festivalObj.HolidayType;
       this.curYear = this.festivalObj.curYear;
       this.compareYear = this.festivalObj.compareYear;
@@ -767,7 +653,6 @@ export default {
           this.festivalObj.startTime,
           "days"
         ) + 1;
-      console.log("dayNumber", dayNumber);
       if (dayNumber > 0) {
         for (let i = 0; i < dayNumber; i++) {
           dayList.push({
@@ -820,9 +705,8 @@ export default {
     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
-    }日`;
+    this.allDateDay = `${lastMonth < 10 ? "0" + lastMonth : lastMonth}月${lastDays < 10 ? "0" + lastDays : lastDays
+      }日`;
     // 24年春运开始时间为 1.26
     // if (lastMonth === 1){
     //   dayNumber = lastDays - 26 + 1
@@ -994,23 +878,20 @@ export default {
         //   : "",
         StatisticsDate: this.allDateDay,
         businessRegion: 1,
-        SortStr: `${
-          this.type === 1
-            ? "revenue"
-            : this.type === 2
+        SortStr: `${this.type === 1
+          ? "revenue"
+          : this.type === 2
             ? "account"
             : this.type === 3
-            ? "bayonet"
-            : ""
-        } ${this.sortType === 0 ? "asc" : "desc"}`,
+              ? "bayonet"
+              : ""
+          } ${this.sortType === 0 ? "asc" : "desc"}`,
       };
-      console.log("req", req);
       // this.dataList
       const data = await request.$webGet(
         "CommercialApi/Revenue/GetServerpartINCAnalysis",
         req
       );
-      console.log("data", data);
       if (data.Result_Data) {
         this.dataList = this.handleGetSort(data.Result_Data.List);
         let list = [];
@@ -1040,7 +921,6 @@ export default {
       }
       let list = this.handleGetSort(this.dataList);
       this.dataList = list;
-      console.log("this.dataList", this.dataList);
       this.$forceUpdate();
       uni.hideLoading();
     },
@@ -1058,306 +938,39 @@ export default {
         delta: 1,
       });
     },
-    // 排序方法
+    // 排序方法 - 优化版(分组排序:有值数据排序后,无值数据放最后)
     handleGetSort(list) {
-      var len = list.length;
+      // 1. 确定数据源和字段
+      const dataSource = this.type === 1 ? 'RevenueINC'
+        : this.type === 2 ? 'AccountINC'
+          : 'BayonetINC';
 
-      for (var i = 0; i < len - 1; i++) {
-        for (var j = 0; j < len - 1 - i; j++) {
-          // 判断按照那个排序
-          if (this.type === 1) {
-            // 正序
-            if (this.sortType === 0) {
-              // 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 === 2) {
-            // 正序
-            if (this.sortType === 0) {
-              // 24年营收
-              if (this.sortName === 1) {
-                if (
-                  list[j].AccountINC.curYearData >
-                  list[j + 1].AccountINC.curYearData
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-                // 23年营收
-              } else if (this.sortName === 2) {
-                if (
-                  list[j].AccountINC.lYearData >
-                  list[j + 1].AccountINC.lYearData
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-                // 营收增长
-              } else if (this.sortName === 3) {
-                if (
-                  list[j].AccountINC.increaseData >
-                  list[j + 1].AccountINC.increaseData
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-                // 营收增幅
-              } else if (this.sortName === 4) {
-                if (
-                  list[j].AccountINC.increaseRate >
-                  list[j + 1].AccountINC.increaseRate
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-              }
-            }
-            // 降序
-            else {
-              // 24年营收
-              if (this.sortName === 1) {
-                if (
-                  list[j].AccountINC.curYearData <
-                  list[j + 1].AccountINC.curYearData
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-                // 23年营收
-              } else if (this.sortName === 2) {
-                if (
-                  list[j].AccountINC.lYearData <
-                  list[j + 1].AccountINC.lYearData
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-                // 营收增长
-              } else if (this.sortName === 3) {
-                if (
-                  list[j].AccountINC.increaseData <
-                  list[j + 1].AccountINC.increaseData
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-                // 营收增幅
-              } else if (this.sortName === 4) {
-                if (
-                  list[j].AccountINC.increaseRate <
-                  list[j + 1].AccountINC.increaseRate
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-              }
-            }
-          } else if (this.type === 3) {
-            // 正序
-            if (this.sortType === 0) {
-              // 24年车流
-              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
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  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
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  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
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-              }
-            } else {
-              // 降序
-              // 24年车流
-              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
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  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
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  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
-                ) {
-                  // 比较相邻元素大小并交换位置
-                  var temp = list[j];
-                  list[j] = list[j + 1];
-                  list[j + 1] = temp;
-                }
-              }
-            }
-          }
-        }
-      }
-      return list;
+      const field = this.sortName === 1 ? 'curYearData'
+        : this.sortName === 2 ? 'lYearData'
+          : this.sortName === 3 ? 'increaseData'
+            : 'increaseRate';
+
+      // 2. 分组:有值 vs 无值(null/undefined 算无值,0 算有值)
+      const hasValue = list.filter(item => {
+        const value = item[dataSource]?.[field];
+        return value !== null && value !== undefined;
+      });
+
+      const noValue = list.filter(item => {
+        const value = item[dataSource]?.[field];
+        return value === null || value === undefined;
+      });
+
+      // 3. 对有值组排序
+      hasValue.sort((a, b) => {
+        const aValue = a[dataSource][field];
+        const bValue = b[dataSource][field];
+        // 根据 sortType 决定升序或降序
+        return this.sortType === 0 ? aValue - bValue : bValue - aValue;
+      });
+
+      // 4. 合并:有值组 + 无值组
+      return [...hasValue, ...noValue];
     },
     // 跳转去看服务区排名
     handleGoServerPartDetail(obj) {
@@ -1368,15 +981,12 @@ export default {
         Serverpart_ID: obj.ServerpartId,
       };
       uni.setStorageSync("springService", springObj); //当前选中服务区信息
-      console.log("obj", obj);
       this.$util.toNextRoute(
         "navigateTo",
-        `/pages/nationalPage/merchantRevenue?ServerpartId=${
-          obj.ServerpartId
+        `/pages/nationalPage/merchantRevenue?ServerpartId=${obj.ServerpartId
         }&type=${this.type}&festivalObj=${JSON.stringify(
           this.festivalObj
-        )}&currentScroll=${this.currentScroll}&festivalType=${
-          this.selectFestival
+        )}&currentScroll=${this.currentScroll}&festivalType=${this.selectFestival
         }`
       );
     },
@@ -1389,27 +999,35 @@ export default {
 .main {
   width: 100%;
   background: #fff;
+
   .springTop {
     background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rankBg.png");
   }
+
   .qmTop {
     background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/smallQmBg.png");
   }
+
   .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");
   }
+
   .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;
   }
+
   .nationalDayTop {
     background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important;
   }
+
   .top {
     width: 100%;
     height: 324rpx;
@@ -1418,27 +1036,35 @@ export default {
     background-repeat: no-repeat;
     background-position: 0 0;
     background-size: 100% 100%;
+
     .headerSpring {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rankBg.png");
     }
+
     .headerQm {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/smallQmBg.png");
     }
+
     .headerLabour {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/labourBg.png");
     }
+
     .headerDragonBoat {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/dragonBoatBg.png");
     }
+
     .summerHolidayBoat {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/summerHolidayBg.png");
     }
+
     .midAutumnBoat {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/midAutumnBg.png") !important;
     }
+
     .nationalDayBoat {
       background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/nationalDayBg.png") !important;
     }
+
     .header {
       position: fixed;
       width: 100%;
@@ -1452,6 +1078,7 @@ export default {
       display: flex;
       align-items: center;
       z-index: 2;
+
       .backArrow {
         width: 24px;
         height: 24px;
@@ -1460,10 +1087,12 @@ export default {
       }
     }
   }
+
   .contentPage {
     width: 100%;
     box-sizing: border-box;
     transform: translateY(-120rpx);
+
     .revenueDetail {
       width: 100%;
       background: #fff;
@@ -1471,54 +1100,47 @@ export default {
       box-sizing: border-box;
       padding: 2rpx;
       margin-top: 24rpx;
+
       .springTitleBox {
-        background: linear-gradient(
-          360deg,
-          rgba(255, 200, 198, 0) 0%,
-          #ffc8c6 100%
-        );
+        background: linear-gradient(360deg,
+            rgba(255, 200, 198, 0) 0%,
+            #ffc8c6 100%);
       }
+
       .qmTitleBox {
-        background: linear-gradient(
-          360deg,
-          rgba(204, 231, 224, 0) 0%,
-          #cce7e0 100%
-        );
+        background: linear-gradient(360deg,
+            rgba(204, 231, 224, 0) 0%,
+            #cce7e0 100%);
       }
+
       .labourTitleBox {
-        background: linear-gradient(
-          360deg,
-          rgba(255, 236, 208, 0) 0%,
-          #ffecd0 100%
-        );
+        background: linear-gradient(360deg,
+            rgba(255, 236, 208, 0) 0%,
+            #ffecd0 100%);
       }
+
       .dragonBoatTitleBox {
-        background: linear-gradient(
-          360deg,
-          rgba(225, 241, 237, 0) 0%,
-          #e1f1ed 100%
-        );
+        background: linear-gradient(360deg,
+            rgba(225, 241, 237, 0) 0%,
+            #e1f1ed 100%);
       }
+
       .summerHolidayTitleBox {
-        background: linear-gradient(
-          360deg,
-          rgba(214, 238, 243, 0) 0%,
-          #d1e9ee 100%
-        );
+        background: linear-gradient(360deg,
+            rgba(214, 238, 243, 0) 0%,
+            #d1e9ee 100%);
       }
+
       .midAutumnTitleBox {
-        background: linear-gradient(
-          360deg,
-          rgba(255, 215, 180, 0) 0%,
-          #fff3e9 100%
-        );
+        background: linear-gradient(360deg,
+            rgba(255, 215, 180, 0) 0%,
+            #fff3e9 100%);
       }
+
       .nationalDayTitleBox {
-        background: linear-gradient(
-          360deg,
-          rgba(255, 218, 210, 0) 0%,
-          #fff2f0 100%
-        );
+        background: linear-gradient(360deg,
+            rgba(255, 218, 210, 0) 0%,
+            #fff2f0 100%);
       }
 
       .revenueDetailTitleBox {
@@ -1533,11 +1155,13 @@ export default {
         display: flex;
         align-items: center;
         justify-content: space-between;
+
         .left {
           .detailLogo {
             width: 178rpx;
             height: 32rpx;
           }
+
           .modalUnit {
             font-size: 24rpx;
             font-family: PingFangSC, PingFang SC;
@@ -1549,6 +1173,7 @@ export default {
             top: 30rpx;
           }
         }
+
         .right {
           .typeChangeBox {
             display: flex;
@@ -1557,6 +1182,7 @@ export default {
             border-radius: 6rpx;
             box-sizing: border-box;
             padding: 4rpx;
+
             .normal {
               font-size: 24rpx;
               font-family: PingFangSC, PingFang SC;
@@ -1565,6 +1191,7 @@ export default {
               line-height: 36rpx;
               padding: 6rpx 16rpx;
             }
+
             .select {
               font-size: 24rpx;
               font-family: PingFangSC, PingFang SC;
@@ -1577,19 +1204,23 @@ export default {
           }
         }
       }
+
       .revenueContent {
         width: 100%;
         box-sizing: border-box;
         padding: 0 32rpx 24rpx;
+
         .navBigList {
           width: 100%;
           height: 40rpx;
           display: flex;
           align-items: center;
           margin-top: 32rpx;
+
           .allBox {
             width: 70rpx;
             height: 100%;
+
             .scrollItem {
               font-size: 28rpx;
               font-family: PingFangSC, PingFang SC;
@@ -1597,6 +1228,7 @@ export default {
               color: #a69e9f;
               line-height: 40rpx;
             }
+
             .selectItem {
               font-size: 28rpx;
               font-family: PingFangSC, PingFang SC;
@@ -1614,6 +1246,7 @@ export default {
             white-space: nowrap;
             padding-bottom: 24rpx;
             border-bottom: 1px solid #f5f4f4;
+
             .scrollItem {
               font-size: 28rpx;
               font-family: PingFangSC, PingFang SC;
@@ -1623,6 +1256,7 @@ export default {
               margin-right: 32rpx;
               display: inline-block;
             }
+
             .selectItem {
               font-size: 28rpx;
               font-family: PingFangSC, PingFang SC;
@@ -1632,42 +1266,50 @@ export default {
               line-height: 40rpx;
             }
           }
+
           .springNav {
             .selectItem {
               color: #ed3e48 !important;
             }
           }
+
           .qmNav {
             .selectItem {
               color: #226c61 !important;
             }
           }
+
           .labourNav {
             .selectItem {
               color: #d14702 !important;
             }
           }
+
           .dragonBoatNav {
             .selectItem {
               color: #3e8958 !important;
             }
           }
+
           .summerHolidayNav {
             .selectItem {
               color: #007797 !important;
             }
           }
+
           .midAutumnNav {
             .selectItem {
               color: #da5015;
             }
           }
+
           .nationalDayNav {
             .selectItem {
               color: #d52020;
             }
           }
         }
+
         .dateText {
           font-size: 24rpx;
           font-family: PingFangSC, PingFang SC;
@@ -1679,6 +1321,7 @@ export default {
 
         .modalBox {
           margin-top: 40rpx;
+
           .modalTitleBox {
             width: 100%;
             box-sizing: border-box;
@@ -1687,9 +1330,11 @@ export default {
             display: flex;
             align-items: center;
             justify-content: space-between;
+
             .modalTitleItem {
               display: flex;
               align-items: center;
+
               .modalIndex {
                 width: 12rpx;
                 height: 12rpx;
@@ -1697,6 +1342,7 @@ export default {
                 border-radius: 50%;
                 margin-right: 12rpx;
               }
+
               .modalText {
                 font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
@@ -1705,6 +1351,7 @@ export default {
                 line-height: 40rpx;
                 margin-right: 4rpx;
               }
+
               .modalUnit {
                 font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
@@ -1713,9 +1360,11 @@ export default {
                 line-height: 36rpx;
               }
             }
+
             .moreBox {
               display: flex;
               align-items: center;
+
               .moreText {
                 font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
@@ -1723,25 +1372,30 @@ export default {
                 color: #9a9a9a;
                 line-height: 36rpx;
               }
+
               .moreIcon {
                 width: 24rpx;
                 height: 36rpx;
                 margin-left: 4rpx;
               }
             }
+
             .modalTitleItem1 {
               font-size: 24rpx;
               text-align: center;
             }
           }
+
           .sortBox {
             display: flex;
             align-items: center;
             justify-content: space-between;
             margin-bottom: 16rpx;
+
             .sortItem {
               display: flex;
               align-items: center;
+
               .sortText {
                 font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
@@ -1749,15 +1403,18 @@ export default {
                 color: #9a9a9a;
                 line-height: 36rpx;
               }
+
               .sortIconBox {
                 display: flex;
                 flex-direction: column;
                 margin-left: 16rpx;
+
                 .upIcon {
                   width: 16rpx;
                   height: 12rpx;
                   margin-bottom: 4rpx;
                 }
+
                 .bottomIcon {
                   width: 16rpx;
                   height: 12rpx;
@@ -1769,10 +1426,12 @@ export default {
           .modalDetail {
             width: 100%;
             box-sizing: border-box;
+
             .modalDetailTitle {
               display: flex;
               align-items: center;
               padding: 8rpx 0;
+
               .titleItem {
                 font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
@@ -1782,13 +1441,16 @@ export default {
                 text-align: center;
               }
             }
+
             .typeFirst {
               height: calc(100vh - 300px);
+
               .row {
                 margin-top: 32rpx;
                 display: flex;
                 align-items: center;
                 margin-top: 32rpx;
+
                 .valueItem {
                   font-size: 24rpx;
                   font-family: PingFangSC, PingFang SC;
@@ -1798,10 +1460,12 @@ export default {
                   text-align: center;
                   text-indent: 8rpx;
                 }
+
                 .bigFather {
                   position: relative;
                   font-weight: 600;
                 }
+
                 .bigFather:before {
                   position: absolute;
                   top: 50%;
@@ -1814,10 +1478,12 @@ export default {
                   border-radius: 50%;
                   background: #db6465;
                 }
+
                 .father {
                   position: relative;
                   font-weight: 600;
                 }
+
                 .father:before {
                   position: absolute;
                   top: 50%;
@@ -1834,6 +1500,7 @@ export default {
                 .son {
                   position: relative;
                 }
+
                 .son:before {
                   position: absolute;
                   top: 50%;
@@ -1846,6 +1513,7 @@ export default {
                   border-radius: 50%;
                   background: orangered;
                 }
+
                 .compareItem {
                   font-size: 24rpx;
                   font-family: DINAlternate, DINAlternate;
@@ -1853,6 +1521,7 @@ export default {
                   line-height: 40rpx;
                   text-align: center;
                 }
+
                 .addItem {
                   font-size: 24rpx;
                   font-family: DINAlternate, DINAlternate;
@@ -1861,6 +1530,7 @@ export default {
                   text-align: center;
                 }
               }
+
               .listItem {
                 width: 100%;
                 padding: 24rpx;
@@ -1869,6 +1539,7 @@ export default {
                 background: #f7f7f7;
                 margin-bottom: 24rpx;
                 display: flex;
+
                 .itemLeft {
                   width: 160rpx;
                   height: 160rpx;
@@ -1877,6 +1548,7 @@ export default {
                   position: relative;
                   background-repeat: no-repeat;
                   background-size: cover;
+
                   .bg {
                     position: absolute;
                     width: 160rpx;
@@ -1885,6 +1557,7 @@ export default {
                     left: 0;
                     z-index: 1;
                   }
+
                   .statueBox {
                     position: absolute;
                     z-index: 2;
@@ -1901,6 +1574,7 @@ export default {
                     background-size: 100% 100%;
                     text-align: center;
                   }
+
                   .nameBox {
                     position: absolute;
                     z-index: 2;
@@ -1908,6 +1582,7 @@ export default {
                     left: 20rpx;
                     display: flex;
                     flex-direction: column;
+
                     .serviceName {
                       font-size: 30rpx;
                       font-family: PingFangSC, PingFang SC;
@@ -1916,6 +1591,7 @@ export default {
                       line-height: 30rpx;
                       margin-bottom: 6rpx;
                     }
+
                     .serviceLabel {
                       font-size: 20rpx;
                       font-family: PingFangSC, PingFang SC;
@@ -1925,19 +1601,23 @@ export default {
                     }
                   }
                 }
+
                 .contentRight {
                   width: calc(100% - 176rpx);
                   margin-left: 16rpx;
                   display: flex;
                   flex-direction: column;
                   justify-content: space-between;
+
                   .rightTop {
                     display: flex;
                     align-items: center;
                     justify-content: space-between;
+
                     .rightTopLeft {
                       display: flex;
                       align-items: center;
+
                       .indexBox {
                         width: 36rpx;
                         height: 32rpx;
@@ -1950,6 +1630,7 @@ export default {
                         background-repeat: no-repeat;
                         background-size: 100% 100%;
                       }
+
                       .areaName {
                         font-size: 28rpx;
                         font-family: PingFangSC, PingFang SC;
@@ -1959,9 +1640,11 @@ export default {
                         margin-left: 8rpx;
                       }
                     }
+
                     .rightTopRight {
                       display: flex;
                       align-items: center;
+
                       .entryRateLabel {
                         font-size: 24rpx;
                         font-family: PingFangSC, PingFang SC;
@@ -1969,6 +1652,7 @@ export default {
                         color: #9a9a9a;
                         line-height: 32rpx;
                       }
+
                       .entryRateValue {
                         font-size: 28rpx;
                         font-family: DINAlternate, DINAlternate;
@@ -1979,13 +1663,16 @@ export default {
                       }
                     }
                   }
+
                   .rightBottom {
                     display: flex;
                     justify-content: space-between;
+
                     .rightBottomItem {
                       display: flex;
                       flex-direction: column;
                       align-items: center;
+
                       .itemLabel {
                         font-size: 24rpx;
                         font-family: PingFangSC, PingFang SC;
@@ -1993,6 +1680,7 @@ export default {
                         color: #9a9a9a;
                         line-height: 36rpx;
                       }
+
                       .itemValue {
                         font-size: 28rpx;
                         font-family: DINAlternate, DINAlternate;
@@ -2003,11 +1691,13 @@ export default {
                       }
                     }
                   }
+
                   .otherCarBox {
                     width: 100%;
                     display: flex;
                     align-items: center;
                     justify-content: space-between;
+
                     .left {
                       font-size: 24rpx;
                       font-family: PingFangSC, PingFang SC;
@@ -2015,12 +1705,14 @@ export default {
                       color: #9a9a9a;
                       line-height: 36rpx;
                     }
+
                     .MoreBox {
                       width: 30%;
                       height: 32rpx;
                       display: flex;
                       align-items: center;
                       justify-content: flex-end;
+
                       .goMoreIcon {
                         width: 32rpx;
                         height: 32rpx;
@@ -2030,13 +1722,16 @@ export default {
                 }
               }
             }
+
             .typeSecond {
               .listValueBox {
                 width: 100%;
+
                 .row {
                   width: 100%;
                   display: flex;
                   margin-top: 32rpx;
+
                   .rowItem {
                     text-align: center;
                     font-size: 24rpx;
diff --git a/pages/nationalPage/springTravel.vue b/pages/nationalPage/springTravel.vue
index 935033d..c9fca6b 100644
--- a/pages/nationalPage/springTravel.vue
+++ b/pages/nationalPage/springTravel.vue
@@ -3232,48 +3232,26 @@ export default {
         },
 
         {
-          label: "25年元旦",
-          type: 0,
-          HolidayType: 1,
+          label: "25年国庆",
+          type: 6,
+          HolidayType: 8,
           curYear: 2025,
           compareYear: 2024,
-          startTime: "2024-12-31",
-          endTime: "2025-01-02",
-          lastYearStart: "2023/12/31",
-          lastYearEnd: "2024/01/02",
+          startTime: "2025-09-30",
+          endTime: "2025-10-09",
+          lastYearStart: "2024/09/30",
+          lastYearEnd: "2024/10/09",
         },
         {
-          label: "25年春运",
-          type: 0,
-          HolidayType: 2,
+          label: "25年暑运",
+          type: 4,
+          HolidayType: 6,
           curYear: 2025,
           compareYear: 2024,
-          startTime: "2025-01-14",
-          endTime: "2025-02-22",
-          lastYearStart: "2024/01/26",
-          lastYearEnd: "2024/03/05",
-        },
-        {
-          label: "25年清明",
-          type: 1,
-          HolidayType: 3,
-          curYear: 2025,
-          compareYear: 2024,
-          startTime: "2025-04-03",
-          endTime: "2025-04-07",
-          lastYearStart: "2024/04/03",
-          lastYearEnd: "2024/04/07",
-        },
-        {
-          label: "25年劳动",
-          type: 2,
-          HolidayType: 4,
-          curYear: 2025,
-          compareYear: 2024,
-          startTime: "2025-04-30",
-          endTime: "2025-05-06",
-          lastYearStart: "2024/04/30",
-          lastYearEnd: "2024/05/06",
+          startTime: "2025-06-30",
+          endTime: "2025-08-31",
+          lastYearStart: "2024/06/30",
+          lastYearEnd: "2024/08/31",
         },
         {
           label: "25年端午",
@@ -3287,16 +3265,50 @@ export default {
           lastYearEnd: "2024/06/11",
         },
         {
-          label: "25年暑运",
-          type: 4,
-          HolidayType: 6,
+          label: "25年劳动",
+          type: 2,
+          HolidayType: 4,
           curYear: 2025,
           compareYear: 2024,
-          startTime: "2025-06-30",
-          endTime: "2025-08-31",
-          lastYearStart: "2024/06/30",
-          lastYearEnd: "2024/08/31",
+          startTime: "2025-04-30",
+          endTime: "2025-05-06",
+          lastYearStart: "2024/04/30",
+          lastYearEnd: "2024/05/06",
         },
+        {
+          label: "25年清明",
+          type: 1,
+          HolidayType: 3,
+          curYear: 2025,
+          compareYear: 2024,
+          startTime: "2025-04-03",
+          endTime: "2025-04-07",
+          lastYearStart: "2024/04/03",
+          lastYearEnd: "2024/04/07",
+        },
+        {
+          label: "25年春运",
+          type: 0,
+          HolidayType: 2,
+          curYear: 2025,
+          compareYear: 2024,
+          startTime: "2025-01-14",
+          endTime: "2025-02-22",
+          lastYearStart: "2024/01/26",
+          lastYearEnd: "2024/03/05",
+        },
+        {
+          label: "25年元旦",
+          type: 0,
+          HolidayType: 1,
+          curYear: 2025,
+          compareYear: 2024,
+          startTime: "2024-12-31",
+          endTime: "2025-01-02",
+          lastYearStart: "2023/12/31",
+          lastYearEnd: "2024/01/02",
+        },
+
         // {
         //   label: "25年中秋",
         //   curYear: 2025,
@@ -3305,82 +3317,17 @@ export default {
         //   startTime: "2025-01-26",
         //   endTime: "2025-03-05",
         // },
+
         {
-          label: "25年国庆",
+          label: "24年国庆",
           type: 6,
           HolidayType: 8,
-          curYear: 2025,
-          compareYear: 2024,
-          startTime: "2025-09-30",
-          endTime: "2025-10-09",
-          lastYearStart: "2024/09/30",
-          lastYearEnd: "2024/10/09",
-        },
-        {
-          label: "24年元旦",
-          type: 0,
-          HolidayType: 1,
           curYear: 2024,
           compareYear: 2023,
-          startTime: "2023-12-31",
-          endTime: "2024-01-02",
-          lastYearStart: "2022/12/31",
-          lastYearEnd: "2022/01/02",
-        },
-        {
-          label: "24年春运",
-          type: 0,
-          HolidayType: 2,
-          curYear: 2024,
-          compareYear: 2023,
-          startTime: "2024-01-26",
-          endTime: "2024-03-05",
-          lastYearStart: "2023/01/06",
-          lastYearEnd: "2023/02/16",
-        },
-        {
-          label: "24年清明",
-          type: 1,
-          HolidayType: 3,
-          curYear: 2024,
-          compareYear: 2023,
-          startTime: "2024-04-03",
-          endTime: "2024-04-07",
-          lastYearStart: "2023/04/04",
-          lastYearEnd: "2023/04/06",
-        },
-        {
-          label: "24年劳动",
-          type: 2,
-          HolidayType: 4,
-          curYear: 2024,
-          compareYear: 2023,
-          startTime: "2024-04-30",
-          endTime: "2024-05-06",
-          lastYearStart: "2023/04/28",
-          lastYearEnd: "2023/05/04",
-        },
-        {
-          label: "24年端午",
-          type: 3,
-          HolidayType: 5,
-          curYear: 2024,
-          compareYear: 2023,
-          startTime: "2024-06-07",
-          endTime: "2024-06-11",
-          lastYearStart: "2023/06/21",
-          lastYearEnd: "2023/06/25",
-        },
-        {
-          label: "24年暑运",
-          type: 4,
-          HolidayType: 6,
-          curYear: 2024,
-          compareYear: 2023,
-          startTime: "2024-06-30",
-          endTime: "2024-08-31",
-          lastYearStart: "2023/06/30",
-          lastYearEnd: "2023/08/31",
+          startTime: "2024-09-30",
+          endTime: "2024-10-08",
+          lastYearStart: "2023/09/30",
+          lastYearEnd: "2023/10/08",
         },
         {
           label: "24年中秋",
@@ -3394,16 +3341,71 @@ export default {
           lastYearEnd: "2023/09/30",
         },
         {
-          label: "24年国庆",
-          type: 6,
-          HolidayType: 8,
+          label: "24年暑运",
+          type: 4,
+          HolidayType: 6,
           curYear: 2024,
           compareYear: 2023,
-          startTime: "2024-09-30",
-          endTime: "2024-10-08",
-          lastYearStart: "2023/09/30",
-          lastYearEnd: "2023/10/08",
+          startTime: "2024-06-30",
+          endTime: "2024-08-31",
+          lastYearStart: "2023/06/30",
+          lastYearEnd: "2023/08/31",
         },
+        {
+          label: "24年端午",
+          type: 3,
+          HolidayType: 5,
+          curYear: 2024,
+          compareYear: 2023,
+          startTime: "2024-06-07",
+          endTime: "2024-06-11",
+          lastYearStart: "2023/06/21",
+          lastYearEnd: "2023/06/25",
+        },
+        {
+          label: "24年劳动",
+          type: 2,
+          HolidayType: 4,
+          curYear: 2024,
+          compareYear: 2023,
+          startTime: "2024-04-30",
+          endTime: "2024-05-06",
+          lastYearStart: "2023/04/28",
+          lastYearEnd: "2023/05/04",
+        },
+        {
+          label: "24年清明",
+          type: 1,
+          HolidayType: 3,
+          curYear: 2024,
+          compareYear: 2023,
+          startTime: "2024-04-03",
+          endTime: "2024-04-07",
+          lastYearStart: "2023/04/04",
+          lastYearEnd: "2023/04/06",
+        },
+        {
+          label: "24年春运",
+          type: 0,
+          HolidayType: 2,
+          curYear: 2024,
+          compareYear: 2023,
+          startTime: "2024-01-26",
+          endTime: "2024-03-05",
+          lastYearStart: "2023/01/06",
+          lastYearEnd: "2023/02/16",
+        },
+        {
+          label: "24年元旦",
+          type: 0,
+          HolidayType: 1,
+          curYear: 2024,
+          compareYear: 2023,
+          startTime: "2023-12-31",
+          endTime: "2024-01-02",
+          lastYearStart: "2022/12/31",
+          lastYearEnd: "2022/01/02",
+        }
       ],
       currentFestival: {}, // 当前节日的对象
       currentIndex: 0, // 当前节日的索引
diff --git a/pages/revenueStatistics/index.vue b/pages/revenueStatistics/index.vue
index 179dc06..070db66 100644
--- a/pages/revenueStatistics/index.vue
+++ b/pages/revenueStatistics/index.vue
@@ -27,7 +27,7 @@
                 :src="selectTab === 2 ? 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/activeSecondTab.png' : 'https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/secondTab.png'" />
             </div>
             <div class="timeSelect">
-              <span class="moreText" @click="handleShowPopup">更多筛选</span>
+              <span class="moreText" style="font-size: 30rpx;" @click="handleShowPopup">更多筛选</span>
               <!--              <uni-datetime-picker />-->
 
             </div>
@@ -91,7 +91,7 @@
                         }${$util.getMoney(topDetail.RevenueINC.increaseData / 10000)}` : '-' }}</span>
                   </span>
                   <span class="staticTimeText" v-if="currentScroll === 'item0'">
-                    {{ `统计口径：${selectStart}月至${selectEnd}月累计` }}
+                    {{ `统计口径：${selectStart}至${selectEnd}累计` }}
                   </span>
               </view>
 
@@ -354,7 +354,7 @@
                         <!--                    </view>-->
                       </view>
                     </view>
-                    <view class="amountItem" style="margin-top: 56rpx">
+                    <view class="amountItem" style="margin-top: 24rpx">
                       <view class="itemTop">
                         <view class="itemTopLeft">
                           <image class="leftIcon"
@@ -393,7 +393,7 @@
                         <!--                    </view>-->
                       </view>
                     </view>
-                    <view class="amountItem" @click="handleGoMerchantAccount" style="margin-top: 56rpx">
+                    <view class="amountItem" @click="handleGoMerchantAccount" style="margin-top: 24rpx">
                       <view class="itemTop">
                         <view class="itemTopLeft">
                           <image class="leftIcon"
@@ -502,7 +502,7 @@
                         <!--                  </view>-->
                       </view>
                     </view>
-                    <view class="amountItem" style="margin-top: 56rpx">
+                    <view class="amountItem" style="margin-top: 24rpx">
                       <view class="itemTop">
                         <view class="itemTopLeft">
                           <image class="leftIcon"
@@ -540,7 +540,7 @@
                         <!--                  </view>-->
                       </view>
                     </view>
-                    <view class="amountItem" style="margin-top: 56rpx">
+                    <view class="amountItem" style="margin-top: 24rpx">
                       <view class="itemTop">
                         <view class="itemTopLeft">
                           <image class="leftIcon"
@@ -595,7 +595,7 @@
                     <span class="contentTitle">商家营收</span>
                     <span class="contentUnit">/万元</span>
                   </view>
-                  <view class="revenueAmount" style="margin-top: 48rpx">
+                  <view class="revenueAmount" style="margin-top: 24rpx">
                     <view class="amountItem">
                       <view class="itemTop">
                         <view class="itemTopLeft">
@@ -629,7 +629,7 @@
                         <!--                  </view>-->
                       </view>
                     </view>
-                    <view class="amountItem" style="margin-top: 56rpx">
+                    <view class="amountItem" style="margin-top: 24rpx">
                       <view class="itemTop">
                         <view class="itemTopLeft">
                           <image class="leftIcon"
@@ -662,7 +662,7 @@
                         <!--                  </view>-->
                       </view>
                     </view>
-                    <view class="amountItem" style="margin-top: 56rpx">
+                    <view class="amountItem" style="margin-top: 24rpx">
                       <view class="itemTop">
                         <view class="itemTopLeft">
                           <image class="leftIcon"
@@ -695,7 +695,7 @@
                         <!--                  </view>-->
                       </view>
                     </view>
-                    <view class="amountItem" style="margin-top: 56rpx">
+                    <view class="amountItem" style="margin-top: 24rpx">
                       <view class="itemTop">
                         <view class="itemTopLeft">
                           <image class="leftIcon"
@@ -741,7 +741,8 @@
 
 
 
-    <uniPopup class="popupBox" type="bottom" :round="true" :showIndex="1" :show="showPop" @hidePopup="hidePopup">
+    <uniPopup class="popupBox" type="bottom" :round="true" :showIndex="1" :show="showPop" @hidePopup="hidePopup"
+      :safe-area="true">
       <view class="popupContentBox">
         <view class="label">统计时间：</view>
         <view class="popupTitleBox">
@@ -754,8 +755,8 @@
 
           <span class="unit" style="margin: 0 4px">-</span>
           <view class="timeSelectBox">
-            <picker mode="date" fields="month" class="screen-unit" :start="selectStart" :end="endTime"
-              @change="handleChangeSelectEnd($event)">
+            <picker mode="date" fields="month" class="screen-unit" :value="selectEnd" :start="selectStart"
+              :end="endSelectTime" @change="handleChangeSelectEnd($event)">
               <text class="time">{{ selectEnd || '结束时间' }}</text>
             </picker>
           </view>
@@ -832,7 +833,8 @@ export default {
       let currentMonth = selectDate.getMonth() + 1
       this.currentMonth = currentMonth
       this.curYear = selectYear
-      this.defaultStart = `${selectYear}-01`
+      // this.defaultStart = `${selectYear}-01` 
+      this.defaultStart = `2024-01`
       this.selectStart = `${selectYear}-01`
 
       const nowDate = new Date()
@@ -859,7 +861,6 @@ export default {
       }
       this.selectList.unshift('累计')
     }
-    console.log('this.selectList', this.selectList)
     await this.handleGetRevenueData()
     await this.handleGetTableData()
     uni.hideLoading()
@@ -876,6 +877,14 @@ export default {
     // 点击查询调用的方法
     async handleSearchTime() {
       if (this.selectStart && this.selectEnd) {
+        this.selectList = []
+        const date = new Date(this.selectEnd)
+        let monthNumber = date.getMonth() + 1
+        for (let i = 1; i <= monthNumber; i++) {
+          this.selectList.push(`${i}月`)
+        }
+        this.selectList.unshift('累计')
+
         this.hidePopup()
         this.currentScroll = 'item0'
         uni.showLoading({
@@ -890,15 +899,26 @@ export default {
     async handleChangeSelectStart(e) {
       console.log('e', e)
       this.selectStart = e.detail.value
-      const date = new Date(this.selectEnd)
-      let m = date.getMonth() + 1
+      const date = new Date(e.detail.value)
+      let y = date.getFullYear()
+      const currentDate = new Date()
+      const currentYear = currentDate.getFullYear()
+      let currentMonth = currentDate.getMonth() + 1
+      if (currentMonth < 10) {
+        currentMonth = '0' + currentMonth
+      }
+      // let m = date.getMonth() + 1
       // if (this.selectStart && this.selectEnd){
       //   uni.showLoading({
       //     title:'正在加载'
       //   })
       //   this.handleGetPageData(m)
       //   uni.hideLoading()
-      // }
+      // } 
+      // 选择了开始时间 那么也就是显示了结束时间
+      this.endSelectTime = `${y}-${currentYear === y ? currentMonth : 12}`
+      this.selectEnd = `${y}-${currentYear === y ? currentMonth : 12}`
+      this.curYear = y
     },
     // 选择结束时间
     async handleChangeSelectEnd(e) {
@@ -1321,13 +1341,13 @@ export default {
           align-items: center;
 
           .moreText {
-            font-size: 16px;
+            font-size: 24rpx;
             font-weight: bold;
             color: #fff;
           }
 
           .time {
-            font-size: 14px;
+            font-size: 24rpx;
             color: #fff;
           }
         }
@@ -1452,9 +1472,9 @@ export default {
               .contentTitle {
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 600;
-                font-size: 32rpx;
+                font-size: 30rpx;
                 color: #160002;
-                line-height: 44rpx;
+                line-height: 36rpx;
                 text-align: left;
                 font-style: normal;
                 margin-right: 4rpx;
@@ -1474,11 +1494,12 @@ export default {
             .sumBox {
               width: 100%;
               box-sizing: border-box;
-              padding: 32rpx 24rpx;
+              padding: 24rpx 24rpx;
               background: #fff;
               border-radius: 12rpx;
-              margin-top: 32rpx;
+              margin-top: 24rpx;
               display: flex;
+              align-items: center;
               justify-content: space-between;
 
               .left {
@@ -1505,27 +1526,27 @@ export default {
                 align-items: flex-end;
 
                 .sumMoney {
-                  font-size: 36rpx;
+                  font-size: 30rpx;
                   font-family: DINAlternate-Bold, DINAlternate;
                   font-weight: bold;
                   color: #160002;
-                  line-height: 44rpx;
+                  line-height: 36rpx;
                 }
 
                 .sumUnit {
                   margin-top: 8rpx;
-                  font-size: 28rpx;
+                  font-size: 24rpx;
                   font-family: PingFangSC, PingFang SC;
                   font-weight: 400;
                   color: #160002;
-                  line-height: 40rpx;
+                  line-height: 32rpx;
 
                   .unit {
-                    font-size: 28rpx;
+                    font-size: 24rpx;
                     font-family: PingFangSC, PingFang SC;
                     font-weight: 400;
                     color: #A69E9F;
-                    line-height: 40rpx;
+                    line-height: 32rpx;
                     margin-left: 4rpx;
                   }
                 }
@@ -1553,11 +1574,11 @@ export default {
                     }
 
                     .itemTitle {
-                      font-size: 32rpx;
+                      font-size: 30rpx;
                       font-family: PingFangSC, PingFang SC;
                       font-weight: 600;
                       color: #160002;
-                      line-height: 44rpx;
+                      line-height: 36rpx;
                     }
 
                     .itemUnit {
@@ -1571,11 +1592,11 @@ export default {
                   }
 
                   .itemTopRight {
-                    font-size: 36rpx;
+                    font-size: 30rpx;
                     font-family: DINAlternate-Bold, DINAlternate;
                     font-weight: bold;
                     color: #160002;
-                    line-height: 44rpx;
+                    line-height: 36rpx;
                   }
                 }
 
@@ -1587,20 +1608,20 @@ export default {
                     display: inline-block;
 
                     .bottomItemTitle {
-                      font-size: 28rpx;
+                      font-size: 24rpx;
                       font-family: PingFangSC, PingFang SC;
                       font-weight: 400;
                       color: #A69E9F;
-                      line-height: 40rpx;
-                      margin-bottom: 4rpx;
+                      line-height: 30rpx;
+                      margin-bottom: 8rpx;
                     }
 
                     .bottomItemValue {
-                      font-size: 32rpx;
+                      font-size: 28rpx;
                       font-family: PingFangSC, PingFang SC;
                       font-weight: 400;
                       color: #160002;
-                      line-height: 40rpx;
+                      line-height: 30rpx;
                     }
                   }
                 }
@@ -1720,7 +1741,7 @@ export default {
               align-items: center;
 
               .moreText {
-                font-size: 28rpx;
+                font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
                 color: #2C99FE;
@@ -1743,14 +1764,14 @@ export default {
             .dataItem {
               display: flex;
               flex-direction: column;
-              margin-top: 32rpx;
+              margin-top: 24rpx;
 
               .dataBigValue {
                 font-family: DINAlternate, DINAlternate;
                 font-weight: bold;
-                font-size: 50rpx;
+                font-size: 30rpx;
                 color: #E83944;
-                line-height: 64rpx;
+                line-height: 36rpx;
                 text-align: left;
                 font-style: normal;
               }
@@ -1768,9 +1789,9 @@ export default {
               .dataValue {
                 font-family: DINAlternate, DINAlternate;
                 font-weight: bold;
-                font-size: 36rpx;
+                font-size: 28rpx;
                 color: #160002;
-                line-height: 64rpx;
+                line-height: 36rpx;
                 text-align: left;
                 font-style: normal;
               }
@@ -1780,7 +1801,7 @@ export default {
           .addBox {
             display: flex;
             align-items: center;
-            // justify-content: space-between;
+            justify-content: space-between;
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
             font-size: 24rpx;
@@ -1795,14 +1816,14 @@ export default {
               font-weight: bold;
               font-size: 28rpx;
               color: #E83944;
-              line-height: 32rpx;
+              line-height: 36rpx;
               text-align: left;
               font-style: normal;
               margin-left: 8rpx;
             }
 
             .staticTimeText {
-
+              white-space: nowrap;
               font-weight: 400;
               font-size: 24rpx;
               color: #9A9A9A;
@@ -1813,7 +1834,7 @@ export default {
             width: 100%;
             height: 2rpx;
             background: #F5F4F4;
-            margin: 40rpx 0;
+            margin: 24rpx 0;
           }
 
           .tableBox {
diff --git a/pages/revenueStatistics/servicePartList.vue b/pages/revenueStatistics/servicePartList.vue
index 4f717e7..899734b 100644
--- a/pages/revenueStatistics/servicePartList.vue
+++ b/pages/revenueStatistics/servicePartList.vue
@@ -1,160 +1,200 @@
 <template>
   <view class="main">
     <view class="bigBg">
-      <view class="top" :style="{height: (menu.bottom + 18) + 'px'}">
-        <view class="header" :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"/>
+      <view class="top" :style="{ height: (menu.bottom + 18) + 'px' }">
+        <view class="header" :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" />
         </view>
       </view>
       <view class="contentPage">
         <view class="revenueDetail">
           <view class="revenueDetailTitleBox">
             <view class="left">
-<!--              <span class="contentMonth">{{thisMonth?thisMonth+'月':'累计'}}</span>-->
+              <!--              <span class="contentMonth">{{thisMonth?thisMonth+'月':'累计'}}</span>-->
               <span class="leftText">服务区排名</span>
-<!--              <img class="detailLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png"/>-->
+              <!--              <img class="detailLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/serverDetail.png"/>-->
               <!--          <text class="modalUnit">{{selectDateText || ''}}</text>-->
             </view>
             <view class="right">
               <view class="typeChangeBox">
-                <view :class="pageType===1?'normal select':'normal'" @click="handleChangeType(1)">按月统计</view>
-                <view :class="pageType===2?'normal select':'normal'" @click="handleChangeType(2)">累计统计</view>
+                <view :class="pageType === 1 ? 'normal select' : 'normal'" @click="handleChangeType(1)">按月统计</view>
+                <view :class="pageType === 2 ? 'normal select' : 'normal'" @click="handleChangeType(2)">累计统计</view>
               </view>
             </view>
           </view>
-          <view v-if="pageType===2" style="display: flex;justify-content: flex-end;box-sizing: border-box;padding-right: 16px">
-            {{selectStart || defaultStart}}-{{selectEnd || defaultEnd}}
+          <view v-if="pageType === 2"
+            style="display: flex;justify-content: flex-end;box-sizing: border-box;padding-right: 16px">
+            {{ selectStart || defaultStart }}-{{ selectEnd || defaultEnd }}
           </view>
           <view class="revenueContent">
-            <view class="navBigList" v-if="pageType===1">
+            <view class="navBigList" v-if="pageType === 1">
               <!--            <view class="allBox">-->
               <!--              <view :class="currentScroll==='all'?'scrollItem selectItem':'scrollItem'" @click="handleChangeTime('all')">累计</view>-->
               <!--            </view>-->
-              <scroll-view scroll-x="true" class="navList" :scrollIntoView="currentScroll" :scroll-with-animation="true">
-                <view :style="{width: `${60*scrollList.length + 40}px`,height:'100%'}">
-                  <view :class="currentScroll===`item${index+1}`?'scrollItem selectItem':'scrollItem'" v-for="(item,index) in scrollList" :key="index" :id="`item${index+1}`" @click="handleChangeTime(index+1)">{{item}}</view>
+              <scroll-view scroll-x="true" class="navList" :scrollIntoView="currentScroll"
+                :scroll-with-animation="true">
+                <view :style="{ width: `${60 * scrollList.length + 40}px`, height: '100%' }">
+                  <view :class="currentScroll === `item${index + 1}` ? 'scrollItem selectItem' : 'scrollItem'"
+                    v-for="(item, index) in scrollList" :key="index" :id="`item${index + 1}`"
+                    @click="handleChangeTime(index + 1)">{{ item }}</view>
                 </view>
               </scroll-view>
             </view>
             <view class="modalBox">
               <view class="modalTitleBox">
-                <view class="modalTitleItem" :style="{width: 'calc(100% - 300rpx)',textAlign:'left'}">
+                <view class="modalTitleItem" :style="{ width: 'calc(100% - 300rpx)', textAlign: 'left' }">
                   <view class="modalIndex"></view>
-                  <text class="modalText">{{ type===1?'对客销售':type===2?'营业收入':type===3?'入区车流':'' }}</text>
-                  <text class="modalUnit">{{type===3?'/万辆':'/万元'+`${type===2?' (除税)':''}`}}</text>
+                  <text class="modalText">{{ type === 1 ? '对客销售' : type === 2 ? '营业收入' : type === 3 ? '入区车流' : '' }}</text>
+                  <text class="modalUnit">{{ type === 3 ? '/万辆' : '/万元' + `${type === 2 ? ' (除税)' : ''}` }}</text>
                 </view>
               </view>
 
               <view class="sortBox">
                 <view class="sortItem" @click="handleChangeSortName(1)">
-                  <text class="sortText">{{ `${Number(curYear.toString().slice(2))}年${type === 1 ? '销售' : type === 2 ? '收入' : type === 3 ? '车流' : ''}` }}</text>
+                  <text class="sortText">{{ `${Number(curYear.toString().slice(2))}年${type === 1 ? '销售' : type === 2 ?
+                    '收入' : type === 3 ? '车流' : ''}` }}</text>
                   <view class="sortIconBox">
-                    <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" @click="handleChangeSortName(2)">
-                  <text class="sortText">{{ `${Number(curYear.toString().slice(2)) - 1}年${type === 1 ? '销售' : type === 2 ? '收入' : type === 3 ? '车流' : ''}` }}</text>
+                  <text class="sortText">{{ `${Number(curYear.toString().slice(2)) - 1}年${type === 1 ? '销售' : type === 2
+                    ? '收入' : type === 3 ? '车流' : ''}` }}</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" @click="handleChangeSortName(3)">
-                  <text class="sortText">{{ `${type === 1 ? '销售' : type === 2 ? '收入' : type === 3 ? '车流' : ''}增长` }}</text>
+                  <text class="sortText">{{ `${type === 1 ? '销售' : type === 2 ? '收入' : type === 3 ? '车流' : ''}增长`
+                    }}</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" @click="handleChangeSortName(4)">
-                  <text class="sortText">{{ `${type === 1 ? '销售' : type === 2 ? '收入' : type === 3 ? '车流' : ''}增幅` }}</text>
+                  <text class="sortText">{{ `${type === 1 ? '销售' : type === 2 ? '收入' : type === 3 ? '车流' : ''}增幅`
+                    }}</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>
 
 
               <view class="modalDetail">
-                <scroll-view :scroll-y="true"  class="typeFirst" :style="{height: pageType===1?'calc(100vh - 270px)':'calc(100vh - 240px)'}">
-                  <view class="listItem" v-for="(item,index) in dataList" :key="index">
-                    <view class="itemLeft" >
-                      <image class="bg" src="https://eshangtech.com/ShopICO/ahyd-BID/car/itemLeftBg.svg"/>
+                <scroll-view :scroll-y="true" class="typeFirst"
+                  :style="{ height: pageType === 1 ? 'calc(100vh - 270px)' : 'calc(100vh - 240px)' }">
+                  <view class="listItem" v-for="(item, index) in dataList" :key="index">
+                    <view class="itemLeft">
+                      <image class="bg" src="https://eshangtech.com/ShopICO/ahyd-BID/car/itemLeftBg.svg" />
                       <view class="nameBox">
-                        <text class="serviceName" :style="{fontSize:item.ServerpartName.split('服务区')[0].length>4?'26rpx':'30rpx'}">{{item.ServerpartName ? item.ServerpartName.split('服务区')[0]:''}}</text>
+                        <text class="serviceName"
+                          :style="{ fontSize: item.ServerpartName.split('服务区')[0].length > 4 ? '26rpx' : '30rpx' }">{{ item.ServerpartName
+                            ? item.ServerpartName.split('服务区')[0]:''}}</text>
                         <text class="serviceLabel">服务区</text>
                       </view>
                     </view>
                     <view class="contentRight">
                       <view class="rightTop">
                         <view class="rightTopLeft">
-                          <view class="indexBox" :style="{backgroundImage:`url(${index===0?'https://eshangtech.com/ShopICO/ahyd-BID/car/1stBg.svg':index===1?'https://eshangtech.com/ShopICO/ahyd-BID/car/2stBg.svg':index===2?'https://eshangtech.com/ShopICO/ahyd-BID/car/3stBg.svg':'https://eshangtech.com/ShopICO/ahyd-BID/car/4stBg.svg'})`}">{{index+1}}</view>
+                          <view class="indexBox"
+                            :style="{ backgroundImage: `url(${index === 0 ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/1stBg.svg' : index === 1 ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/2stBg.svg' : index === 2 ? 'https://eshangtech.com/ShopICO/ahyd-BID/car/3stBg.svg' : 'https://eshangtech.com/ShopICO/ahyd-BID/car/4stBg.svg'})` }">
+                            {{ index + 1 }}</view>
                         </view>
                         <view class="rightTopRight">
                           <text class="entryRateLabel">增幅</text>
                           <view class="entryRateValue">
-                          <span :style="{color: type===1?item.RevenueINC.increaseRate>0?'#E83944':'#0E9976': type===2?item.AccountINC.increaseRate>0?'#E83944':'#0E9976': type===3?item.BayonetINC.increaseRate>0?'#E83944':'#0E9976':'-'}">
-                      {{type===1?item.RevenueINC.increaseRate>0?'+':'': type===2?item.AccountINC.increaseRate>0?'+':'': type===3?item.BayonetINC.increaseRate>0?'+':'':'-'}}
-                    </span>
-                            <span :style="{color: type===1?item.RevenueINC.increaseRate>0?'#E83944':'#0E9976': type===2?item.AccountINC.increaseRate>0?'#E83944':'#0E9976': type===3?item.BayonetINC.increaseRate>0?'#E83944':'#0E9976':'-'}">
-                      {{type===1?item.RevenueINC.increaseRate?item.RevenueINC.increaseRate:'-' :
-                                type===2?item.AccountINC.increaseRate?item.AccountINC.increaseRate:'-' :
-                                    type===3?item.BayonetINC.increaseRate?item.BayonetINC.increaseRate:'-' :'-'}}%
-                    </span>
+                            <span
+                              :style="{ color: type === 1 ? item.RevenueINC.increaseRate > 0 ? '#E83944' : '#0E9976' : type === 2 ? item.AccountINC.increaseRate > 0 ? '#E83944' : '#0E9976' : type === 3 ? item.BayonetINC.increaseRate > 0 ? '#E83944' : '#0E9976' : '-' }">
+                              {{ type === 1 ? item.RevenueINC.increaseRate > 0 ? '+' : '' :
+                                type === 2 ? item.AccountINC.increaseRate > 0 ? '+' : '' :
+                              type===3?item.BayonetINC.increaseRate>0?'+':'':'-'}}
+                            </span>
+                            <span
+                              :style="{ color: type === 1 ? item.RevenueINC.increaseRate > 0 ? '#E83944' : '#0E9976' : type === 2 ? item.AccountINC.increaseRate > 0 ? '#E83944' : '#0E9976' : type === 3 ? item.BayonetINC.increaseRate > 0 ? '#E83944' : '#0E9976' : '-' }">
+                              {{ type === 1 ? item.RevenueINC.increaseRate ? item.RevenueINC.increaseRate : '-' :
+                                type === 2 ? item.AccountINC.increaseRate ? item.AccountINC.increaseRate : '-' :
+                                  type === 3 ? item.BayonetINC.increaseRate ? item.BayonetINC.increaseRate : '-' : '-' }}%
+                            </span>
                           </view>
                         </view>
                       </view>
                       <view class="rightBottom">
                         <view class="rightBottomItem">
-                          <text class="itemLabel">{{curYear}}</text>
+                          <text class="itemLabel">{{ curYear }}</text>
                           <text class="itemValue">
-                            {{type===1?item.RevenueINC.curYearData?$util.getMoney(item.RevenueINC.curYearData / 10000):'0.00':
-                              type===2?item.AccountINC.curYearData?$util.getMoney(item.AccountINC.curYearData / 10000):'0.00':
-                                  type===3?item.BayonetINC.curYearData?$util.getMoney(item.BayonetINC.curYearData / 10000):'0.00':'-'}}
+                            {{ type === 1 ? item.RevenueINC.curYearData ? $util.getMoney(item.RevenueINC.curYearData /
+                              10000) : '0.00' :
+                              type === 2 ? item.AccountINC.curYearData ? $util.getMoney(item.AccountINC.curYearData /
+                                10000) : '0.00' :
+                                type === 3 ? item.BayonetINC.curYearData ? $util.getMoney(item.BayonetINC.curYearData /
+                            10000):'0.00':'-'}}
                           </text>
                         </view>
                         <view class="rightBottomItem">
-                          <text class="itemLabel">{{ curYear-1 }}</text>
+                          <text class="itemLabel">{{ curYear - 1 }}</text>
                           <text class="itemValue">
-                            {{type===1?item.RevenueINC.lYearData?$util.getMoney(item.RevenueINC.lYearData / 10000):'0.00':
-                              type===2?item.AccountINC.lYearData?$util.getMoney(item.AccountINC.lYearData / 10000):'0.00':
-                                  type===3?item.BayonetINC.lYearData?$util.getMoney(item.BayonetINC.lYearData / 10000):'0.00':'-'}}
+                            {{ type === 1 ? item.RevenueINC.lYearData ? $util.getMoney(item.RevenueINC.lYearData /
+                              10000) : '0.00' :
+                              type === 2 ? item.AccountINC.lYearData ? $util.getMoney(item.AccountINC.lYearData / 10000) : '0.00' :
+                                type === 3 ? item.BayonetINC.lYearData ? $util.getMoney(item.BayonetINC.lYearData /
+                            10000):'0.00':'-'}}
                           </text>
                         </view>
                         <view class="rightBottomItem">
                           <text class="itemLabel">增长</text>
                           <text class="itemValue">
-                            {{type===1?item.RevenueINC.increaseData?$util.getMoney(item.RevenueINC.increaseData / 10000):'0.00':
-                              type===2?item.AccountINC.increaseData?$util.getMoney(item.AccountINC.increaseData / 10000):'0.00':
-                                  type===3?item.BayonetINC.increaseData?$util.getMoney(item.BayonetINC.increaseData / 10000):'0.00':'-'}}
+                            {{ type === 1 ? item.RevenueINC.increaseData ? $util.getMoney(item.RevenueINC.increaseData /
+                              10000) : '0.00' :
+                              type === 2 ? item.AccountINC.increaseData ? $util.getMoney(item.AccountINC.increaseData /
+                                10000) : '0.00' :
+                                type === 3 ? item.BayonetINC.increaseData ? $util.getMoney(item.BayonetINC.increaseData /
+                            10000):'0.00':'-'}}
                           </text>
                         </view>
                       </view>
 
-                      <view class="otherCarBox" v-if="type!==3">
+                      <view class="otherCarBox" v-if="type !== 3">
                         <view class="left">
                           <span class="carLabel">车流增幅</span>
-                          <span :style="{color: item.BayonetINC.increaseRate>1000?'':item.BayonetINC.increaseRate>0?'#E83944':item.BayonetINC.increaseRate<0?'#0E9976':''}">
-                      {{item.BayonetINC.increaseRate>1000?'':item.BayonetINC.increaseRate>0?'+':''}}
-                    </span>
-                          <span :style="{color: item.BayonetINC.increaseRate>1000?'':item.BayonetINC.increaseRate>0?'#E83944':item.BayonetINC.increaseRate<0?'#0E9976':''}">
-                      {{item.BayonetINC.increaseRate?item.BayonetINC.increaseRate>1000?'-':item.BayonetINC.increaseRate:'-'}}%
-                    </span>
+                          <span
+                            :style="{ color: item.BayonetINC.increaseRate > 1000 ? '' : item.BayonetINC.increaseRate > 0 ? '#E83944' : item.BayonetINC.increaseRate < 0 ? '#0E9976' : '' }">
+                            {{ item.BayonetINC.increaseRate > 1000 ? '' : item.BayonetINC.increaseRate > 0 ? '+' : '' }}
+                          </span>
+                          <span
+                            :style="{ color: item.BayonetINC.increaseRate > 1000 ? '' : item.BayonetINC.increaseRate > 0 ? '#E83944' : item.BayonetINC.increaseRate < 0 ? '#0E9976' : '' }">
+                            {{ item.BayonetINC.increaseRate ? item.BayonetINC.increaseRate > 1000 ? '-' : item.BayonetINC.increaseRate : '-' }}%
+                          </span>
                         </view>
                         <view class="MoreBox" @click="handleGoServerPartDetail(item)">
-                          <img class="goMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg"/>
+                          <img class="goMoreIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/goMore.svg" />
                         </view>
                       </view>
                     </view>
                   </view>
 
-                  <view class="load-more" v-if="allDateList && allDateList.length>10*selectIndexPage">
-                    <text @click="handleGetMore">{{'点击加载更多'}}</text>
+                  <view class="load-more" v-if="allDateList && allDateList.length > 10 * selectIndexPage">
+                    <text @click="handleGetMore">{{ '点击加载更多' }}</text>
                   </view>
                 </scroll-view>
               </view>
@@ -172,35 +212,35 @@ import request from '@/util/index.js'
 export default {
   data() {
     return {
-      statusBarHeight:'',
-      menu:{},
+      statusBarHeight: '',
+      menu: {},
       pageType: 1, // 选项卡选择几
-      type:1,// 页面显示数据的判断
-      useInfo:{},
-      currentScroll:'',// 时间横向滚动当前选择的
-      scrollList:'',// 时间的横向滚动的数据
-      lastDay:'',// 最近有效日期
-      dataList:[],// 分页数据
-      allDateList:[],// 全部数据
-      thisMonth:'',// 当前月份
-      curYear:'',// 当前年份
+      type: 1,// 页面显示数据的判断
+      useInfo: {},
+      currentScroll: '',// 时间横向滚动当前选择的
+      scrollList: '',// 时间的横向滚动的数据
+      lastDay: '',// 最近有效日期
+      dataList: [],// 分页数据
+      allDateList: [],// 全部数据
+      thisMonth: '',// 当前月份
+      curYear: '',// 当前年份
       sortType: 1,// 正序降序 0正序  1降序
       sortName: 3,// 排序字段 1 24年营收 2 23年营收 3营收增长 4营收增幅
       selectIndexPage: 1,// 页数
-      query:{},// 传递的query
-      selectStart:'',// 开始时间
-      selectEnd:'',// 结束时间
-      defaultStart:'',// 没有传入开始结束时间的时候显示的开始时间
-      defaultEnd:'',// 没有传入开始结束时间的时候显示的结束时间
+      query: {},// 传递的query
+      selectStart: '',// 开始时间
+      selectEnd: '',// 结束时间
+      defaultStart: '',// 没有传入开始结束时间的时候显示的开始时间
+      defaultEnd: '',// 没有传入开始结束时间的时候显示的结束时间
     }
   },
-  onLoad(query){
-    console.log('query',query)
+  onLoad(query) {
+    console.log('query', query)
 
-    if (query.searchAll === 'true'){
+    if (query.searchAll === 'true') {
       this.pageType = 2
-      this.selectStart =query.selectStart
-      this.selectEnd =query.selectEnd
+      this.selectStart = query.selectStart
+      this.selectEnd = query.selectEnd
     }
     this.query = query
     //  获取手机参数对页面进行适配
@@ -214,7 +254,7 @@ export default {
     this.useInfo = JSON.parse(JSON.stringify(userInfo))
 
     this.lastDay = uni.getStorageSync('lastDay')
-    const nowDate = new Date(this.lastDay)
+    const nowDate = new Date(query.selectEnd)
     let nowYear = nowDate.getFullYear()
     let nowMonth = nowDate.getMonth() + 1
 
@@ -226,64 +266,64 @@ export default {
     this.curYear = compareYear
 
     let timeList = []
-    if (compareYear<nowYear){
-      for (let i = 1;i<=12;i++){
+    if (compareYear < nowYear) {
+      for (let i = 1; i <= 12; i++) {
         timeList.push(`${i}月`)
       }
-    }else{
-      for (let i = 1;i<=nowMonth;i++){
+    } else {
+      for (let i = 1; i <= nowMonth; i++) {
         timeList.push(`${i}月`)
       }
     }
     this.currentScroll = 'item' + query.thisMonth
     this.thisMonth = query.thisMonth
-    console.log('timeList',timeList)
+    console.log('timeList', timeList)
     this.scrollList = timeList
 
 
 
     // 请求数据
-    if (query.searchAll === 'true'){
+    if (query.searchAll === 'true') {
       this.handleSearchAllData()
-    }else{
+    } else {
       this.handleGetData()
     }
   },
-  methods:{
-    handleBack(){
+  methods: {
+    handleBack() {
       uni.navigateBack({
         delta: 1
       });
     },
     // 跳转到详情
-    handleGoServerPartDetail(item){
-      console.log('item',item)
-      this.$util.toNextRoute('navigateTo', `/pages/revenueStatistics/detail?time=${this.query.yearMonth}&&month=${this.curYear}-${this.thisMonth<10?'0'+this.thisMonth:this.thisMonth}&&id=${item.ServerpartId}&&name=${item.ServerpartName}&allSearch=${(!!(this.selectStart && this.selectEnd))}&selectStart=${this.selectStart}&selectEnd=${this.selectEnd}`)
+    handleGoServerPartDetail(item) {
+      console.log('item', item)
+      this.$util.toNextRoute('navigateTo', `/pages/revenueStatistics/detail?time=${this.query.yearMonth}&&month=${this.curYear}-${this.thisMonth < 10 ? '0' + this.thisMonth : this.thisMonth}&&id=${item.ServerpartId}&&name=${item.ServerpartName}&allSearch=${(!!(this.selectStart && this.selectEnd))}&selectStart=${this.selectStart}&selectEnd=${this.selectEnd}`)
     },
     // 点击加载更多
-    handleGetMore(){
-      this.selectIndexPage +=1
-      this.dataList = this.allDateList.slice(0,this.selectIndexPage * 10)
+    handleGetMore() {
+      this.selectIndexPage += 1
+      this.dataList = this.allDateList.slice(0, this.selectIndexPage * 10)
     },
     // 点击月份改变时间
-    handleChangeTime(month){
+    handleChangeTime(month) {
       this.currentScroll = 'item' + month
       this.thisMonth = month
 
       this.handleGetData()
     },
     // 改变按月还是统计
-    handleChangeType(value){
+    handleChangeType(value) {
       this.pageType = value
-      if (value===1){
+      if (value === 1) {
         this.handleGetData()
-      }else{
+      } else {
         this.handleSearchAllData()
       }
       // 请求数据
     },
     // 获取排名信息
-    async handleGetData(){
+    async handleGetData() {
       this.dataList = []
       this.allDateList = []
       this.selectIndexPage = 1
@@ -293,27 +333,27 @@ export default {
       let monthText = this.currentScroll.split('item')[1]
 
       const req = {
-        calcType:this.pageType,
-        pushProvinceCode:this.useInfo.userData.ProvinceCode || '340000',
-        curYear:this.curYear,
-        compareYear:this.curYear-1,
-        StatisticsMonth:monthText,
-        StatisticsDate:this.lastDay,
-        businessRegion:1,
-        Dimension: this.type===3?3:'',
-        SortStr:`${this.type===1?'revenue':this.type===2?'account':this.type===3?'bayonet':''} ${this.sortType===0?'asc':'desc'}`
+        calcType: this.pageType,
+        pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
+        curYear: this.curYear,
+        compareYear: this.curYear - 1,
+        StatisticsMonth: monthText,
+        StatisticsDate: this.lastDay,
+        businessRegion: 1,
+        Dimension: this.type === 3 ? 3 : '',
+        SortStr: `${this.type === 1 ? 'revenue' : this.type === 2 ? 'account' : this.type === 3 ? 'bayonet' : ''} ${this.sortType === 0 ? 'asc' : 'desc'}`
       }
-      console.log('req',req)
-      const data = await request.$webGet('CommercialApi/Revenue/GetMonthlySPINCAnalysis',req)
-      console.log('data',data)
+      console.log('req', req)
+      const data = await request.$webGet('CommercialApi/Revenue/GetMonthlySPINCAnalysis', req)
+      console.log('data', data)
 
       this.allDateList = this.handleGetSort(data.Result_Data.List)
-      this.dataList = this.allDateList.slice(0,this.selectIndexPage * 10)
+      this.dataList = this.allDateList.slice(0, this.selectIndexPage * 10)
 
       uni.hideLoading()
     },
     // 传入调统计的方法
-    async handleSearchAllData(){
+    async handleSearchAllData() {
       this.dataList = []
       this.allDateList = []
       this.selectIndexPage = 1
@@ -322,25 +362,25 @@ export default {
       })
 
       let startMonth = ''
-      if (this.selectStart){
+      if (this.selectStart) {
         let startDate = new Date(this.selectStart)
         let y = startDate.getFullYear()
         let m = startDate.getMonth() + 1
-        startMonth = `${y}${m<10?'0'+m:m}`
-      }else{
+        startMonth = `${y}${m < 10 ? '0' + m : m}`
+      } else {
         startMonth = `${this.curYear}-01`
         this.defaultStart = startMonth
       }
       let endMonth = ''
       let endM = ''
-      if (this.selectEnd){
+      if (this.selectEnd) {
         let endDate = new Date(this.selectEnd)
         let endY = endDate.getFullYear()
         endM = endDate.getMonth() + 1
         // endMonth = `${endY}${endM<10?'0'+endM:endM}`
-      }else{
+      } else {
         endM = this.thisMonth
-        this.defaultEnd = `${this.curYear}-${this.thisMonth<10?'0'+this.thisMonth : this.thisMonth}`
+        this.defaultEnd = `${this.curYear}-${this.thisMonth < 10 ? '0' + this.thisMonth : this.thisMonth}`
         // startMonth = `${this.curYear}-${this.thisMonth<10?'0'+this.thisMonth : this.thisMonth}`
       }
 
@@ -349,111 +389,111 @@ export default {
 
       const req = {
         calcType: 2,
-        pushProvinceCode:this.useInfo.userData.ProvinceCode || '340000',
-        curYear:this.curYear,
-        compareYear:this.curYear-1,
+        pushProvinceCode: this.useInfo.userData.ProvinceCode || '340000',
+        curYear: this.curYear,
+        compareYear: this.curYear - 1,
         StatisticsStartMonth: startMonth,
         StatisticsMonth: endM,
-        StatisticsDate:this.lastDay,
-        businessRegion:1,
-        Dimension: this.type===3?3:'',
-        SortStr:`${this.type===1?'revenue':this.type===2?'account':this.type===3?'bayonet':''} ${this.sortType===0?'asc':'desc'}`
+        StatisticsDate: this.lastDay,
+        businessRegion: 1,
+        Dimension: this.type === 3 ? 3 : '',
+        SortStr: `${this.type === 1 ? 'revenue' : this.type === 2 ? 'account' : this.type === 3 ? 'bayonet' : ''} ${this.sortType === 0 ? 'asc' : 'desc'}`
       }
-      console.log('req',req)
-      const data = await request.$webGet('CommercialApi/Revenue/GetMonthlySPINCAnalysis',req)
-      console.log('data',data)
+      console.log('req', req)
+      const data = await request.$webGet('CommercialApi/Revenue/GetMonthlySPINCAnalysis', req)
+      console.log('data', data)
 
       this.allDateList = this.handleGetSort(data.Result_Data.List)
-      this.dataList = this.allDateList.slice(0,this.selectIndexPage * 10)
+      this.dataList = this.allDateList.slice(0, this.selectIndexPage * 10)
 
       uni.hideLoading()
     },
     // 修改排序字段
-    handleChangeSortName(value){
+    handleChangeSortName(value) {
       uni.showLoading({
         title: '正在加载...'
       })
-      if (value===this.sortName){
-        if (this.sortType===1){
-          this.sortType=0
-        }else{
-          this.sortType=1
+      if (value === this.sortName) {
+        if (this.sortType === 1) {
+          this.sortType = 0
+        } else {
+          this.sortType = 1
         }
-      }else{
+      } else {
         this.sortName = value
-        this.sortType=1
+        this.sortType = 1
       }
       this.allDateList = this.handleGetSort(this.allDateList)
-      this.dataList = this.allDateList.slice(0,this.selectIndexPage * 10)
+      this.dataList = this.allDateList.slice(0, this.selectIndexPage * 10)
       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){
+          if (this.type === 1) {
             // 正序
-            if (this.sortType===0){
+            if (this.sortType === 0) {
               // 24年营收
-              if (this.sortName===1){
+              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){
+              } 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){
+              } 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{
+            else {
               // 降序
               // 24年营收
-              if (this.sortName===1){
+              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){
+              } 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){
+              } 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;
@@ -461,33 +501,33 @@ export default {
               }
             }
           }
-          else if(this.type===2){
+          else if (this.type === 2) {
             // 正序
-            if (this.sortType===0){
+            if (this.sortType === 0) {
               // 24年营收
-              if (this.sortName===1){
+              if (this.sortName === 1) {
                 if (list[j].AccountINC.curYearData > list[j + 1].AccountINC.curYearData) { // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 23年营收
-              }else if(this.sortName===2){
-                if (list[j].AccountINC.lYearData  > list[j + 1].AccountINC.lYearData ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 2) {
+                if (list[j].AccountINC.lYearData > list[j + 1].AccountINC.lYearData) { // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增长
-              }else if(this.sortName===3){
-                if (list[j].AccountINC.increaseData  > list[j + 1].AccountINC.increaseData ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 3) {
+                if (list[j].AccountINC.increaseData > list[j + 1].AccountINC.increaseData) { // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增幅
-              }else if(this.sortName===4){
-                if (list[j].AccountINC.increaseRate   > list[j + 1].AccountINC.increaseRate  ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 4) {
+                if (list[j].AccountINC.increaseRate > list[j + 1].AccountINC.increaseRate) { // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
@@ -495,31 +535,31 @@ export default {
               }
             }
             // 降序
-            else{
+            else {
               // 24年营收
-              if (this.sortName===1){
+              if (this.sortName === 1) {
                 if (list[j].AccountINC.curYearData < list[j + 1].AccountINC.curYearData) { // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 23年营收
-              }else if(this.sortName===2){
-                if (list[j].AccountINC.lYearData  < list[j + 1].AccountINC.lYearData ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 2) {
+                if (list[j].AccountINC.lYearData < list[j + 1].AccountINC.lYearData) { // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增长
-              }else if(this.sortName===3){
-                if (list[j].AccountINC.increaseData  < list[j + 1].AccountINC.increaseData ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 3) {
+                if (list[j].AccountINC.increaseData < list[j + 1].AccountINC.increaseData) { // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
                 }
                 // 营收增幅
-              }else if(this.sortName===4){
-                if (list[j].AccountINC.increaseRate   < list[j + 1].AccountINC.increaseRate  ) { // 比较相邻元素大小并交换位置
+              } else if (this.sortName === 4) {
+                if (list[j].AccountINC.increaseRate < list[j + 1].AccountINC.increaseRate) { // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
                   list[j + 1] = temp;
@@ -527,63 +567,63 @@ export default {
               }
             }
           }
-          else if(this.type===3){
+          else if (this.type === 3) {
             // 正序
-            if (this.sortType===0){
+            if (this.sortType === 0) {
               // 24年车流
-              if (this.sortName===1){
+              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){
+              } 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 (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){
+              } else if (this.sortName === 4) {
                 if (list[j].BayonetINC.increaseRate < list[j + 1].BayonetINC.increaseRate) { // 比较相邻元素大小并交换位置
                   var temp = list[j];
                   list[j] = list[j + 1];
@@ -601,23 +641,26 @@ export default {
 </script>
 
 <style scoped lang="scss">
-.main{
+.main {
   width: 100%;
   background: #fff;
-  .bigBg{
+
+  .bigBg {
     width: 100%;
     height: 100%;
     background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/revenueBackground.png");
     background-repeat: no-repeat;
     background-size: 100% 640rpx;
-    .top{
+
+    .top {
       width: 100%;
       height: 324rpx;
+
       //background-image: url("https://eshangtech.com/ShopICO/ahyd-BID/newIndex3/rankBg.png");
       //background-repeat: no-repeat;
       //background-position: 0 0;
       //background-size: 100% 100%;
-      .header{
+      .header {
         position: fixed;
         width: 100%;
         padding: 0 16px;
@@ -629,7 +672,8 @@ export default {
         display: flex;
         align-items: center;
         z-index: 2;
-        .backArrow{
+
+        .backArrow {
           width: 24px;
           height: 24px;
           margin-right: 16px;
@@ -637,17 +681,20 @@ export default {
         }
       }
     }
-    .contentPage{
+
+    .contentPage {
       width: 100%;
       box-sizing: border-box;
+
       //transform: translateY(-120rpx);
-      .revenueDetail{
+      .revenueDetail {
         width: 100%;
         background: #fff;
         border-radius: 16rpx;
         box-sizing: border-box;
         padding: 2rpx;
-        .revenueDetailTitleBox{
+
+        .revenueDetailTitleBox {
           width: 100%;
           height: 90rpx;
           background: linear-gradient(180deg, #CDE1FF 0%, #ffffff 100%);
@@ -659,10 +706,11 @@ export default {
           align-items: center;
           justify-content: space-between;
 
-          .left{
+          .left {
             display: flex;
             align-items: center;
-            .contentMonth{
+
+            .contentMonth {
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
               font-size: 24rpx;
@@ -675,7 +723,8 @@ export default {
               margin-right: 8rpx;
               background: #F2792E;
             }
-            .leftText{
+
+            .leftText {
               font-family: DingTalk, DingTalk;
               font-weight: 600;
               font-size: 36rpx;
@@ -684,11 +733,13 @@ export default {
               text-align: left;
               font-style: normal;
             }
-            .detailLogo{
+
+            .detailLogo {
               width: 178rpx;
               height: 32rpx;
             }
-            .modalUnit{
+
+            .modalUnit {
               font-size: 24rpx;
               font-family: PingFangSC, PingFang SC;
               font-weight: 400;
@@ -699,15 +750,17 @@ export default {
               top: 30rpx;
             }
           }
-          .right{
-            .typeChangeBox{
+
+          .right {
+            .typeChangeBox {
               display: flex;
               align-items: center;
               background: #F2F1F1;
               border-radius: 6rpx;
               box-sizing: border-box;
               padding: 4rpx;
-              .normal{
+
+              .normal {
                 font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
@@ -715,7 +768,8 @@ export default {
                 line-height: 36rpx;
                 padding: 6rpx 16rpx;
               }
-              .select{
+
+              .select {
                 font-size: 24rpx;
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
@@ -727,27 +781,32 @@ export default {
             }
           }
         }
-        .revenueContent{
+
+        .revenueContent {
           width: 100%;
           box-sizing: border-box;
           padding: 0 32rpx 24rpx;
-          .navBigList{
+
+          .navBigList {
             width: 100%;
             height: 40rpx;
             display: flex;
             align-items: center;
             margin-top: 32rpx;
-            .allBox{
+
+            .allBox {
               width: 70rpx;
               height: 100%;
-              .scrollItem{
+
+              .scrollItem {
                 font-size: 28rpx;
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 400;
                 color: #A69E9F;
                 line-height: 40rpx;
               }
-              .selectItem{
+
+              .selectItem {
                 font-size: 28rpx;
                 font-family: PingFangSC, PingFang SC;
                 font-weight: 600;
@@ -756,10 +815,12 @@ export default {
               }
 
             }
-            .navList{
+
+            .navList {
               width: 100%;
               height: 60rpx;
-              .scrollItem{
+
+              .scrollItem {
                 width: 60px;
                 font-size: 28rpx;
                 font-family: PingFangSC, PingFang SC;
@@ -769,7 +830,8 @@ export default {
                 display: inline-block;
                 text-align: center;
               }
-              .selectItem{
+
+              .selectItem {
                 display: inline-block;
                 width: 60px;
                 font-size: 28rpx;
@@ -780,8 +842,9 @@ export default {
                 position: relative;
                 line-height: 40rpx;
               }
-              .selectItem:after{
-                content:'';
+
+              .selectItem:after {
+                content: '';
                 display: inline-block;
                 width: 80%;
                 position: absolute;
@@ -792,7 +855,8 @@ export default {
               }
             }
           }
-          .dateText{
+
+          .dateText {
             font-size: 24rpx;
             font-family: PingFangSC, PingFang SC;
             font-weight: 400;
@@ -801,9 +865,10 @@ export default {
             display: inline-block;
           }
 
-          .modalBox{
+          .modalBox {
             margin-top: 40rpx;
-            .modalTitleBox{
+
+            .modalTitleBox {
               width: 100%;
               box-sizing: border-box;
               padding: 0 24rpx;
@@ -811,17 +876,20 @@ export default {
               display: flex;
               align-items: center;
               justify-content: space-between;
-              .modalTitleItem{
+
+              .modalTitleItem {
                 display: flex;
                 align-items: center;
-                .modalIndex{
+
+                .modalIndex {
                   width: 12rpx;
                   height: 12rpx;
                   background: #DB6465;
                   border-radius: 50%;
                   margin-right: 12rpx;
                 }
-                .modalText{
+
+                .modalText {
                   font-size: 24rpx;
                   font-family: PingFangSC, PingFang SC;
                   font-weight: 600;
@@ -829,7 +897,8 @@ export default {
                   line-height: 40rpx;
                   margin-right: 4rpx;
                 }
-                .modalUnit{
+
+                .modalUnit {
                   font-size: 24rpx;
                   font-family: PingFangSC, PingFang SC;
                   font-weight: 400;
@@ -837,52 +906,62 @@ export default {
                   line-height: 36rpx;
                 }
               }
-              .moreBox{
+
+              .moreBox {
                 display: flex;
                 align-items: center;
-                .moreText{
+
+                .moreText {
                   font-size: 24rpx;
                   font-family: PingFangSC, PingFang SC;
                   font-weight: 400;
                   color: #9A9A9A;
                   line-height: 36rpx;
                 }
-                .moreIcon{
+
+                .moreIcon {
                   width: 24rpx;
                   height: 36rpx;
                   margin-left: 4rpx;
                 }
               }
-              .modalTitleItem1{
+
+              .modalTitleItem1 {
                 font-size: 24rpx;
                 text-align: center;
               }
             }
-            .sortBox{
+
+            .sortBox {
               display: flex;
               align-items: center;
               justify-content: space-between;
               margin-bottom: 16rpx;
-              .sortItem{
+
+              .sortItem {
                 display: flex;
                 align-items: center;
-                .sortText{
+
+                .sortText {
                   font-size: 24rpx;
                   font-family: PingFangSC, PingFang SC;
                   font-weight: 400;
                   color: #9A9A9A;
                   line-height: 36rpx;
                 }
-                .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;
                   }
@@ -890,14 +969,16 @@ export default {
               }
             }
 
-            .modalDetail{
+            .modalDetail {
               width: 100%;
               box-sizing: border-box;
-              .modalDetailTitle{
+
+              .modalDetailTitle {
                 display: flex;
                 align-items: center;
                 padding: 8rpx 0;
-                .titleItem{
+
+                .titleItem {
                   font-size: 24rpx;
                   font-family: PingFangSC, PingFang SC;
                   font-weight: 400;
@@ -906,13 +987,15 @@ export default {
                   text-align: center;
                 }
               }
-              .typeFirst{
-                .row{
+
+              .typeFirst {
+                .row {
                   margin-top: 32rpx;
                   display: flex;
                   align-items: center;
                   margin-top: 32rpx;
-                  .valueItem{
+
+                  .valueItem {
                     font-size: 24rpx;
                     font-family: PingFangSC, PingFang SC;
                     font-weight: 400;
@@ -921,32 +1004,36 @@ export default {
                     text-align: center;
                     text-indent: 8rpx;
                   }
-                  .bigFather{
+
+                  .bigFather {
                     position: relative;
                     font-weight: 600;
                   }
-                  .bigFather:before{
+
+                  .bigFather:before {
                     position: absolute;
                     top: 50%;
                     left: -8rpx;
                     transform: translateY(-50%);
-                    content:'';
+                    content: '';
                     display: inline-block;
                     width: 8rpx;
                     height: 8rpx;
                     border-radius: 50%;
                     background: #DB6465;
                   }
-                  .father{
+
+                  .father {
                     position: relative;
                     font-weight: 600;
                   }
-                  .father:before{
+
+                  .father:before {
                     position: absolute;
                     top: 50%;
                     left: -8rpx;
                     transform: translateY(-50%);
-                    content:'';
+                    content: '';
                     display: inline-block;
                     width: 8rpx;
                     height: 8rpx;
@@ -954,29 +1041,32 @@ export default {
                     background: #3188FF;
                   }
 
-                  .son{
+                  .son {
                     position: relative;
                   }
-                  .son:before{
+
+                  .son:before {
                     position: absolute;
                     top: 50%;
                     left: -8rpx;
                     transform: translateY(-50%);
-                    content:'';
+                    content: '';
                     display: inline-block;
                     width: 8rpx;
                     height: 8rpx;
                     border-radius: 50%;
                     background: orangered;
                   }
-                  .compareItem{
+
+                  .compareItem {
                     font-size: 24rpx;
                     font-family: DINAlternate, DINAlternate;
                     color: #160002;
                     line-height: 40rpx;
                     text-align: center;
                   }
-                  .addItem{
+
+                  .addItem {
                     font-size: 24rpx;
                     font-family: DINAlternate, DINAlternate;
                     color: #E83944;
@@ -984,15 +1074,17 @@ export default {
                     text-align: center;
                   }
                 }
-                .listItem{
-                  width:100%;
+
+                .listItem {
+                  width: 100%;
                   padding: 24rpx;
                   box-sizing: border-box;
                   border-radius: 16rpx;
                   background: #F7F7F7;
                   margin-bottom: 24rpx;
                   display: flex;
-                  .itemLeft{
+
+                  .itemLeft {
                     width: 160rpx;
                     height: 160rpx;
                     border-radius: 16rpx;
@@ -1000,17 +1092,21 @@ export default {
                     position: relative;
                     background-repeat: no-repeat;
                     background-size: cover;
-                    .bg{
+
+                    .bg {
                       position: absolute;
                       width: 160rpx;
                       height: 160rpx;
-                      top: 0;left: 0;
+                      top: 0;
+                      left: 0;
                       z-index: 1;
                     }
-                    .statueBox{
+
+                    .statueBox {
                       position: absolute;
                       z-index: 2;
-                      top: 0;right: 0;
+                      top: 0;
+                      right: 0;
                       width: 76rpx;
                       height: 32rpx;
                       font-size: 20rpx;
@@ -1022,14 +1118,16 @@ export default {
                       background-size: 100% 100%;
                       text-align: center;
                     }
-                    .nameBox{
+
+                    .nameBox {
                       position: absolute;
                       z-index: 2;
                       top: 32rpx;
                       left: 20rpx;
                       display: flex;
                       flex-direction: column;
-                      .serviceName{
+
+                      .serviceName {
                         font-size: 30rpx;
                         font-family: PingFangSC, PingFang SC;
                         font-weight: 500;
@@ -1037,7 +1135,8 @@ export default {
                         line-height: 30rpx;
                         margin-bottom: 6rpx;
                       }
-                      .serviceLabel{
+
+                      .serviceLabel {
                         font-size: 20rpx;
                         font-family: PingFangSC, PingFang SC;
                         font-weight: 500;
@@ -1046,20 +1145,24 @@ export default {
                       }
                     }
                   }
-                  .contentRight{
+
+                  .contentRight {
                     width: calc(100% - 176rpx);
                     margin-left: 16rpx;
                     display: flex;
                     flex-direction: column;
                     justify-content: space-between;
-                    .rightTop{
+
+                    .rightTop {
                       display: flex;
                       align-items: center;
                       justify-content: space-between;
-                      .rightTopLeft{
+
+                      .rightTopLeft {
                         display: flex;
                         align-items: center;
-                        .indexBox{
+
+                        .indexBox {
                           width: 36rpx;
                           height: 32rpx;
                           font-size: 24rpx;
@@ -1071,7 +1174,8 @@ export default {
                           background-repeat: no-repeat;
                           background-size: 100% 100%;
                         }
-                        .areaName{
+
+                        .areaName {
                           font-size: 28rpx;
                           font-family: PingFangSC, PingFang SC;
                           font-weight: 400;
@@ -1080,17 +1184,20 @@ export default {
                           margin-left: 8rpx;
                         }
                       }
-                      .rightTopRight{
+
+                      .rightTopRight {
                         display: flex;
                         align-items: center;
-                        .entryRateLabel{
+
+                        .entryRateLabel {
                           font-size: 24rpx;
                           font-family: PingFangSC, PingFang SC;
                           font-weight: 400;
                           color: #9A9A9A;
                           line-height: 32rpx;
                         }
-                        .entryRateValue{
+
+                        .entryRateValue {
                           font-size: 28rpx;
                           font-family: DINAlternate, DINAlternate;
                           font-weight: bold;
@@ -1100,15 +1207,18 @@ export default {
                         }
                       }
                     }
-                    .rightBottom{
+
+                    .rightBottom {
                       display: flex;
                       justify-content: space-between;
-                      .rightBottomItem{
+
+                      .rightBottomItem {
                         width: calc(100% / 3);
                         display: flex;
                         flex-direction: column;
                         align-items: flex-end;
-                        .itemLabel{
+
+                        .itemLabel {
                           font-size: 24rpx;
                           font-family: PingFangSC, PingFang SC;
                           font-weight: 400;
@@ -1116,7 +1226,8 @@ export default {
                           line-height: 36rpx;
                           text-align: right;
                         }
-                        .itemValue{
+
+                        .itemValue {
                           font-size: 28rpx;
                           font-family: DINAlternate, DINAlternate;
                           font-weight: bold;
@@ -1127,25 +1238,29 @@ export default {
                         }
                       }
                     }
-                    .otherCarBox{
+
+                    .otherCarBox {
                       width: 100%;
                       display: flex;
                       align-items: center;
                       justify-content: space-between;
-                      .left{
+
+                      .left {
                         font-size: 24rpx;
                         font-family: PingFangSC, PingFang SC;
                         font-weight: 400;
                         color: #9A9A9A;
                         line-height: 36rpx;
                       }
-                      .MoreBox{
+
+                      .MoreBox {
                         width: 30%;
                         height: 32rpx;
                         display: flex;
                         align-items: center;
                         justify-content: flex-end;
-                        .goMoreIcon{
+
+                        .goMoreIcon {
                           width: 32rpx;
                           height: 32rpx;
                         }
@@ -1153,6 +1268,7 @@ export default {
                     }
                   }
                 }
+
                 .load-more {
                   text-align: center;
                   width: 100%;
@@ -1161,14 +1277,17 @@ export default {
                   font-size: 24rpx;
                 }
               }
-              .typeSecond{
-                .listValueBox{
+
+              .typeSecond {
+                .listValueBox {
                   width: 100%;
-                  .row{
+
+                  .row {
                     width: 100%;
                     display: flex;
                     margin-top: 32rpx;
-                    .rowItem{
+
+                    .rowItem {
                       text-align: center;
                       font-size: 24rpx;
                       font-family: DINAlternate, DINAlternate;
diff --git a/pages/summaryOfPortraits/components/businessPortrait.vue b/pages/summaryOfPortraits/components/businessPortrait.vue
index 7a282de..79b89d8 100644
--- a/pages/summaryOfPortraits/components/businessPortrait.vue
+++ b/pages/summaryOfPortraits/components/businessPortrait.vue
@@ -9,7 +9,8 @@
       :topLeftColor="topLeftColor" :iconObj="iconObj" :haveIconObj="haveIconObj" :detailBoxBg="detailBoxBg"
       :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj" :pageType="pageType"
       :pageIndex="4" :headerBg="'linear-gradient( #d09845 0%, #ffffff 100%)'" />
-    <div class="charts" :style="{ paddingTop: serviceInfo.SERVERPART_NAME === '安徽驿达' ? menu.bottom + 62 + 14 + 'px' : '' }">
+    <div class="charts"
+      :style="{ paddingTop: serviceInfo.SERVERPART_NAME === '安徽驿达' ? menu.bottom + 62 + 14 + 'px' : '' }">
       <div class="chartsItem">
         <div style="display: flex;justify-content: space-between;align-items: center">
           <p class="title">交易分析</p>
@@ -831,7 +832,7 @@ export default {
       }
 
       .time {
-        margin-bottom: 4px;
+        // margin-bottom: 4px;
 
         .thisTime {
           font-size: 14px;
@@ -847,7 +848,10 @@ export default {
           .time {
             display: flex;
             align-items: center;
-            margin-right: 4px;
+            // margin-right: 4px;
+            border-radius: 28rpx;
+            padding: 12rpx 16rpx;
+            background: #f0e8dd;
 
             .day {
               font-size: 32rpx;
diff --git a/pages/summaryOfPortraits/components/carPortrait.vue b/pages/summaryOfPortraits/components/carPortrait.vue
index 6492484..9876656 100644
--- a/pages/summaryOfPortraits/components/carPortrait.vue
+++ b/pages/summaryOfPortraits/components/carPortrait.vue
@@ -48,7 +48,7 @@
               <div class="timeSelect">
                 <view style="display: flex;align-items: center">
                   <img class="selectIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/car/dateIcon.svg" />
-                  <picker mode="date" fields="month" :value="searchText" :end="lastDay"
+                  <picker mode="date" fields="month" :value="searchText" :end="lastDay" :start="'2023-01'"
                     @change="changeAllProvinceSearch">
                     <view class="time">
                       <view class="text">{{ searchTextMonth }}</view>
@@ -120,7 +120,7 @@
                     {{ item.RevenueAmount ? '营业中' : '休息中' }}</view>
                   <view class="nameBox">
                     <text class="serviceName">{{ item.Serverpart_Name ? item.Serverpart_Name.split('服务区')[0] : ''
-                      }}</text>
+                    }}</text>
                     <text class="serviceLabel">服务区</text>
                   </view>
                 </div>
diff --git a/pages/summaryOfPortraits/components/components/manager/revenueTrends.vue b/pages/summaryOfPortraits/components/components/manager/revenueTrends.vue
index d542ee1..0755ccc 100644
--- a/pages/summaryOfPortraits/components/components/manager/revenueTrends.vue
+++ b/pages/summaryOfPortraits/components/components/manager/revenueTrends.vue
@@ -70,7 +70,7 @@ export default {
         rotateLock: false,
         background: "#FFFFFF",
         color: ["#1E80FF", "#00B6FF"],
-        padding: [15, 15, 5, 5],
+        padding: [15, 15, 5, 0],
         dataLabel: false,
         enableScroll: false,
         legend: {
@@ -106,7 +106,8 @@ export default {
             addLine: true,
             width: 2,
             gradient: true,
-            activeType: "hollow"
+            activeType: "hollow",
+            dataPointShape: false  // 隐藏数据点上方的数值显示
           }
         }
       }
@@ -172,7 +173,8 @@ export default {
             addLine: true,
             width: 2,
             gradient: true,
-            activeType: "hollow"
+            activeType: "hollow",
+            dataLabel: false  // 隐藏数据点上方的数值显示
           }
         }
       });
diff --git a/pages/summaryOfPortraits/components/components/sliderPage.vue b/pages/summaryOfPortraits/components/components/sliderPage.vue
index ebeb49f..04d7a4e 100644
--- a/pages/summaryOfPortraits/components/components/sliderPage.vue
+++ b/pages/summaryOfPortraits/components/components/sliderPage.vue
@@ -6,11 +6,11 @@
   <!--  </view>-->
 
   <view class="scrollPage">
-    <scroll-view class="scrollBox" scroll-x="true" :scroll-into-view="'item' + isYD && selectIndex === 1 ? 0 : selectIndex"
-      scroll-with-animation>
+    <scroll-view class="scrollBox" scroll-x="true"
+      :scroll-into-view="'item' + isYD && selectIndex === 1 ? 0 : selectIndex" scroll-with-animation>
       <view :style="{ display: isYD && i === 0 ? 'none' : '' }" :id="'item' + i"
-        :class="selectIndex === i ? `scrollItem selectScroll${selectIndex}` : 'scrollItem'" v-for="(item, i) in pageList"
-        :key="i" @click="handleToDetail(i)">
+        :class="selectIndex === i ? `scrollItem selectScroll${selectIndex}` : 'scrollItem'"
+        v-for="(item, i) in pageList" :key="i" @click="handleToDetail(i)">
         {{ item }}
       </view>
     </scroll-view>
@@ -21,7 +21,8 @@ export default {
   name: "sliderPage",
   data() {
     return {
-      pageList: ["基础信息", "车流统计", "客群统计", "经营统计", "交易统计", "业态品牌", "考核考评", "日常巡检"],
+      // pageList: ["基础信息", "车流统计", "客群统计", "经营统计", "交易统计", "业态品牌", "考核考评", "日常巡检"],
+      pageList: ["基础信息", "车流统计", "客群统计", "经营统计", "交易统计", "业态品牌"],
       // pageList: [],
       urlList: [
         '/pages/map/detail',
diff --git a/pages/summaryOfPortraits/components/guestPortrait.vue b/pages/summaryOfPortraits/components/guestPortrait.vue
index a5b5c40..2f3aefa 100644
--- a/pages/summaryOfPortraits/components/guestPortrait.vue
+++ b/pages/summaryOfPortraits/components/guestPortrait.vue
@@ -25,12 +25,13 @@
         <no-data v-else />
       </div>
       <div class="chartsItem" style="margin-top: 32px;height: 330px">
-        <div class="time">
+        <div class="time" style="width:100%;display: flex;justify-content: flex-end;">
           <div class="select">
             <picker mode="date" fields="month" :value="single" :end="endData" @change="bindDateChange">
               <view class="time">
                 <view class="uni-input" style="background: transparent;padding: 0;height:100%">{{ single }}</view>
-                <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/index/arrow_bottom.svg"></image>
+                <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/index/arrow_bottom_guestPortrait.svg">
+                </image>
               </view>
             </picker>
           </div>
@@ -576,7 +577,7 @@ export default {
     background: #fff;
 
     .time {
-      margin-bottom: 4px;
+      // margin-bottom: 4px;
 
       .thisTime {
         font-size: 14px;
@@ -588,17 +589,21 @@ export default {
       .select {
         margin-left: 8px;
         display: inline-block;
+        border-radius: 28rpx;
+        padding: 12rpx 16rpx;
+        background: #EEF7F8;
 
         .time {
           display: flex;
           align-items: center;
-          margin-right: 4px;
+          // margin-right: 4px;
 
           .day {
             font-size: 32rpx;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
-            color: #782717;
+            // color: #ae664e;
+            color: #A0D0C1;
             line-height: 44rpx;
             margin-right: 4px;
           }
@@ -607,7 +612,8 @@ export default {
             font-size: 14px;
             font-family: PingFangSC-Regular, PingFang SC;
             font-weight: 400;
-            color: #ae664e;
+            // color: #ae664e;
+            color: #A0D0C1;
             line-height: 36rpx;
           }
 
@@ -630,14 +636,20 @@ export default {
       }
 
       .item {
+        border-radius: 28rpx;
+        padding: 12rpx 16rpx;
+        background: #EEF7F8;
+
         .value {
           font-size: 14px;
           font-family: PingFangSC-Semibold, PingFang SC;
           font-weight: 400;
-          color: #160002;
+          // color: #160002;
+          color: #A0D0C1;
           line-height: 20px;
         }
       }
+
     }
   }
 }
diff --git a/pages/summaryOfPortraits/components/managePortrait.vue b/pages/summaryOfPortraits/components/managePortrait.vue
index 26a45b4..db1a99f 100644
--- a/pages/summaryOfPortraits/components/managePortrait.vue
+++ b/pages/summaryOfPortraits/components/managePortrait.vue
@@ -1,194 +1,227 @@
 <template>
-    <scroll-view class="main" scroll-y="true">
-<!--      <div style="position: fixed;right: 0;top: 20%;z-index:99999999999">-->
-<!--        <commercial-type :have="2"/>-->
-<!--      </div>-->
-        <header-top ref="headerTop" :bgUrl="bgUrl" :menu="menu" :bgColor="bgColor" :title="title" :analyseInfo="analyseInfo" :topBg="topBg" :page="page" :backType="backType"
-                    :serverpartName="serviceInfo.SERVERPART_NAME" :spregionTypeName="serviceInfo.SPREGIONTYPE_NAME" :serviceInfo="serviceInfo"
-        :topLeftBg="topLeftBg" :topLeftColor="topLeftColor" :iconObj="iconObj" :haveIconObj="haveIconObj" :detailBoxBg="detailBoxBg"
-                    :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj" :pageType="pageType" :pageIndex="3"
-                    :headerBg="'linear-gradient( #a28ec3 0%, #ffffff 100%)'"/>
-        <div class="charts" :style="{paddingTop:serviceInfo.SERVERPART_NAME==='安徽驿达'?menu.bottom + 62 + 14 + 'px':''}">
-            <div class="chartsItem">
-              <view class="titleTop" style="justify-content: space-between">
-                <p class="title">营收分析</p>
-                <text>{{time?$util.getThisMonthHaveHeng(time):''}}</text>
-              </view>
-<!--              <span class="dateText">{{lastDay}}</span>-->
-                <revenue-analysis :data="monthDetail"/>
-            </div>
+  <scroll-view class="main" scroll-y="true">
+    <!--      <div style="position: fixed;right: 0;top: 20%;z-index:99999999999">-->
+    <!--        <commercial-type :have="2"/>-->
+    <!--      </div>-->
+    <header-top ref="headerTop" :bgUrl="bgUrl" :menu="menu" :bgColor="bgColor" :title="title" :analyseInfo="analyseInfo"
+      :topBg="topBg" :page="page" :backType="backType" :serverpartName="serviceInfo.SERVERPART_NAME"
+      :spregionTypeName="serviceInfo.SPREGIONTYPE_NAME" :serviceInfo="serviceInfo" :topLeftBg="topLeftBg"
+      :topLeftColor="topLeftColor" :iconObj="iconObj" :haveIconObj="haveIconObj" :detailBoxBg="detailBoxBg"
+      :haveFun="haveFun" :serviceTypeObj="serviceTypeObj" :serviceInfoObj="serviceInfoObj" :pageType="pageType"
+      :pageIndex="3" :headerBg="'linear-gradient( #a28ec3 0%, #ffffff 100%)'" />
+    <div class="charts"
+      :style="{ paddingTop: serviceInfo.SERVERPART_NAME === '安徽驿达' ? menu.bottom + 62 + 14 + 'px' : '' }">
+      <div class="chartsItem">
+        <view class="titleTop" style="justify-content: space-between">
+          <p class="title">营收分析</p>
+          <!-- <text>{{ time ? $util.getThisMonthHaveHeng(time) : '' }}</text> -->
 
-          <div class="chartsItem" style="margin-top: 32px">
-            <div class="titleTop">
-              <p class="title">本月自营计划</p>
-              <div class="question" @click.stop="handleShowNotice">
-                <image src="https://eshangtech.com/ShopICO/ahyd-BID/index/noticeQuestion.svg"></image>
-              </div>
-              <div v-if="showNotice" class="titleTopNotice">{{monthNoticeText}}</div>
-              <div v-if="showNotice" class="meng" @click.stop="handleNoShowNotice"></div>
+          <div class="time">
+            <div class="select">
+              <picker mode="date" fields="month" :value="single" :start="startTime" :end="endData"
+                @change="bindDateChange">
+                <view class="time">
+                  <view class="uni-input" style="background: transparent;padding: 0;height:100%">{{ single }}</view>
+                  <image class="icon"
+                    src="https://eshangtech.com/ShopICO/ahyd-BID/index/arrow_bottom_managePortrait.svg"></image>
+                </view>
+              </picker>
             </div>
-            <view class="box" @click="handleGoServiceInfo('month')">
-              <view class="top">
-                <view class="big">
-                  <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/index/thisMonth.svg"></image>
-                </view>
-                <view class="text">
-                  <view class="textTop">
-                    <view class="left">
-                      <p class="number">{{plan.percentageMonth?plan.percentageMonth + '%':'-'}}</p>
-                      <p v-if="plan.percentageMonth>=100" class="desc"><image class="success" src="https://eshangtech.com/ShopICO/ahyd-BID/index/successMonth.svg"></image></p>
-                    </view>
-                    <view class="right">
-                      <text class="comparePlan">比计划： </text>
-                      <view class="box2">
-                        <image class="addIcon" :src="plan.MonthGrowth_Rate>0?'https://eshangtech.com/ShopICO/ahyd-BID/index/addIcon.svg':'https://eshangtech.com/ShopICO/ahyd-BID/index/reduce.svg'"></image>
-                        <p class="text">{{monthAdd?monthAdd + '%':'-'}}</p>
-                      </view>
-                    </view>
-                  </view>
-                  <div class="progressPlan">
-                    <div class="trans" :style="{width:`${plan.percentageMonth>=100?100:plan.percentageMonth}%`}"></div>
-                    <!--                  <div class=pro :style="{width:(100 - plan.percentageMonth)+ '%'}"></div>-->
-                    <!--                  <view class="trans" :style="{width: plan.percentageMonth + '%'}"></view>-->
-                    <!--                    <image class="img"  src="https://eshangtech.com/ShopICO/ahyd-BID/index/progress_orange.png"></image>-->
-                    <!--                  <div class=pro :style="{width:(100 - plan.percentageMonth)+ '%'}"></div>-->
-                  </div>
-                </view>
-              </view>
-              <view class="bottom">
-                <view class="success" style="margin-right: 39px">
-                  <p class="text">本月已完成<text class="unit">/元</text></p>
-                  <p class="money">{{plan.RevenueMonth_Amount?plan.RevenueMonth_Amount:'-'}}</p>
-                </view>
-                <view class="success">
-                  <p class="text">本月计划<text class="unit">/元</text></p>
-                  <p class="money">{{plan.BudgetMonth_Amount?plan.BudgetMonth_Amount:'-'}}</p>
-                </view>
-              </view>
-            </view>
-          </div>
-          <div class="chartsItem" style="margin-top: 32px">
-            <div class="titleTop">
-              <p class="title">年度自营计划</p>
-              <div class="question" @click.stop="handleShowNoticeYear">
-                <image src="https://eshangtech.com/ShopICO/ahyd-BID/index/noticeQuestion.svg"></image>
-              </div>
-              <div v-if="showNoticeYear" class="titleTopNotice">{{yearNoticeText}}</div>
-              <div v-if="showNoticeYear" class="meng" @click.stop="handleNoShowNoticeYear"></div>
-            </div>
-            <view class="box" @click="handleGoServiceInfo('year')">
-              <view class="top">
-                <view class="big">
-                  <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/index/planYear.svg"></image>
-                </view>
-                <view class="text">
-                  <view class="textTop">
-                    <view class="left">
-                      <p class="number">{{plan.percentageYear?plan.percentageYear + '%':'-'}}</p>
-                      <p v-if="plan.percentageYear>=100" class="desc" style="color: #4E68FF"><image class="success" src="https://eshangtech.com/ShopICO/ahyd-BID/index/yearSuccess.svg"></image></p>
-                    </view>
-                    <view class="right">
-                      <text class="comparePlan">比计划： </text>
-                      <div class="box2">
-                        <image class="addIcon" :src="plan.YearGrowth_Rate>0?'https://eshangtech.com/ShopICO/ahyd-BID/index/addIcon.svg':'https://eshangtech.com/ShopICO/ahyd-BID/index/reduce.svg'"></image>
-                        <p class="text">{{yearAdd?yearAdd + '%':''}}</p>
-                      </div>
-                    </view>
-                  </view>
-                  <div class="progressPlan">
-                    <div class="transYear" :style="{width:`${plan.percentageYear>=100?100:plan.percentageYear}%`}"></div>
-                    <!--                  <image class="img" :style="{width: plan.percentageYear + '%'}"  src="https://eshangtech.com/ShopICO/ahyd-BID/index/progress_blue.png"></image>-->
-                    <!--                  <div class=pro :style="{width:(100 - plan.percentageYear)+ '%'}"></div>-->
-                  </div>
-                </view>
-              </view>
-              <view class="bottom">
-                <view class="success" style="margin-right: 39px">
-                  <p class="text">年度已完成<text class="unit">/元</text></p>
-                  <p class="money">{{plan.RevenueYear_Amount?plan.RevenueYear_Amount:'-'}}</p>
-                </view>
-                <view class="success">
-                  <p class="text">年度计划<text class="unit">/元</text></p>
-                  <p class="money">{{plan.BudgetYear_Amount?plan.BudgetYear_Amount:'-'}}</p>
-                </view>
-              </view>
-            </view>
           </div>
 
-<!--            <div class="chartsItem" style="margin-top: 32px">-->
-<!--                <p class="title">客流客单交易</p>-->
-<!--                <contract-guarantee :data="orderTransaction"/>-->
-<!--            </div>-->
-            <div class="chartsItem" style="margin-top: 32px">
-                <p class="title">同比分析</p>
-                <view class="tab" >
-                    <view v-for="(item,index) in tabList" :key="index" :class="selectTab===item.value?'tabItem tabItemActive':'tabItem'" @click="handleChangeTab(item.value)">{{item.name}}</view>
-                </view>
-                <div class="subItem">
-                    <p class="title">{{selectTab===0?'营收同比':selectTab===1?'客单同比':selectTab===2?'均价同比':''}}</p>
-                    <div class="money">
-                        <div class="top">
-                            <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/blueMoney.svg"></image>
-                            <p class="sumMoney">{{revenue.data?revenue.data:'-'}}</p>
-                        </div>
-                        <div class="bottom">
-                            <image class="icon" :src="revenue.add>0?'https://eshangtech.com/ShopICO/ahyd-BID/commercial/addArrow.svg':revenue.add<0?'https://eshangtech.com/ShopICO/ahyd-BID/commercial/decline.svg':''"></image>
-                            <p class="add">{{revenue.add?revenue.add+'%':'-'}}</p>
-                            <p class="text">(相比去年同日)</p>
-                        </div>
-                    </div>
-                </div>
-                <div class="subItem" style="height: 230px;margin-top: 20px;">
-                    <div style="margin-bottom: 30px;display: flex;align-items: center;justify-content: space-between">
-                        <p class="title">{{selectTab===0?'营收特征分析':selectTab===1?'客单对比':selectTab===2?'均价对比':''}}</p>
-                        <text v-if="selectTab===0" style="margin-top: 12px">单位: 万元</text>
-                        <text v-if="selectTab===1" style="margin-top: 12px">单位: 笔</text>
-                        <text v-if="selectTab===2" style="margin-top: 12px">单位: 元</text>
-                    </div>
-                    <div>
-                        <money-compare :data="moneyCompareList"/>
-                    </div>
-<!--                    <no-data v-else/>-->
-                </div>
-                <div class="subItem" style="height: 230px;margin-top: 20px;">
-                    <div style="margin-bottom: 30px;display: flex;align-items: center;justify-content: space-between">
-                        <p class="title">营收同比分析</p>
-                        <text  style="margin-top: 12px">单位: 万元</text>
-                    </div>
-                    <div>
-                        <revenue-trends :data="trendsList"/>
-                    </div>
-<!--                    <no-data/>-->
-                </div>
-                <analyse :analyseInfo="{analysisins_type: selectTab===0?1305:selectTab===1?1306:selectTab===2?1307:'',analysisins_format: 2000}"/>
-            </div>
-            <div class="chartsItem" style="margin-top: 32px">
-                <p class="title">营收类型比例</p>
-                <div class="progress">
-                    <div class="top">
-                        <div class="left">
-                            <text class="title">自营</text>
-                            <text class="value" style="margin-left: 4px">{{revenueType.own?revenueType.own:''}}%</text>
-                        </div>
-                        <div class="right">
-                            <text class="value">{{revenueType.ectocyst?revenueType.ectocyst:''}}%</text>
-                            <text class="title" style="margin-left: 4px">外包</text>
-                        </div>
-                    </div>
-                    <div class="bottom">
-                        <div class="first" :style="{width:revenueType.own+'%'}"></div>
-                        <div class="second" :style="{width:revenueType.ectocyst+'%'}"></div>
-                    </div>
-                </div>
-            </div>
+        </view>
+        <!--              <span class="dateText">{{lastDay}}</span>-->
+        <revenue-analysis :data="monthDetail" />
+      </div>
 
-          <div class="chartsItem" style="margin-top: 32px">
-            <p class="title">合同保底</p>
-            <contract-guarantee :data="contractList"/>
+      <div class="chartsItem" style="margin-top: 32px">
+        <div class="titleTop">
+          <p class="title">本月自营计划</p>
+          <div class="question" @click.stop="handleShowNotice">
+            <image src="https://eshangtech.com/ShopICO/ahyd-BID/index/noticeQuestion.svg"></image>
           </div>
-
+          <div v-if="showNotice" class="titleTopNotice">{{ monthNoticeText }}</div>
+          <div v-if="showNotice" class="meng" @click.stop="handleNoShowNotice"></div>
         </div>
-    </scroll-view>
+        <view class="box" @click="handleGoServiceInfo('month')">
+          <view class="top">
+            <view class="big">
+              <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/index/thisMonth.svg"></image>
+            </view>
+            <view class="text">
+              <view class="textTop">
+                <view class="left">
+                  <p class="number">{{ plan.percentageMonth ? plan.percentageMonth + '%' : '-' }}</p>
+                  <p v-if="plan.percentageMonth >= 100" class="desc">
+                    <image class="success" src="https://eshangtech.com/ShopICO/ahyd-BID/index/successMonth.svg"></image>
+                  </p>
+                </view>
+                <view class="right">
+                  <text class="comparePlan">比计划： </text>
+                  <view class="box2">
+                    <image class="addIcon"
+                      :src="plan.MonthGrowth_Rate > 0 ? 'https://eshangtech.com/ShopICO/ahyd-BID/index/addIcon.svg' : 'https://eshangtech.com/ShopICO/ahyd-BID/index/reduce.svg'">
+                    </image>
+                    <p class="text">{{ monthAdd ? monthAdd + '%' : '-' }}</p>
+                  </view>
+                </view>
+              </view>
+              <div class="progressPlan">
+                <div class="trans" :style="{ width: `${plan.percentageMonth >= 100 ? 100 : plan.percentageMonth}%` }">
+                </div>
+                <!--                  <div class=pro :style="{width:(100 - plan.percentageMonth)+ '%'}"></div>-->
+                <!--                  <view class="trans" :style="{width: plan.percentageMonth + '%'}"></view>-->
+                <!--                    <image class="img"  src="https://eshangtech.com/ShopICO/ahyd-BID/index/progress_orange.png"></image>-->
+                <!--                  <div class=pro :style="{width:(100 - plan.percentageMonth)+ '%'}"></div>-->
+              </div>
+            </view>
+          </view>
+          <view class="bottom">
+            <view class="success" style="margin-right: 39px">
+              <p class="text">本月已完成<text class="unit">/元</text></p>
+              <p class="money">{{ plan.RevenueMonth_Amount ? plan.RevenueMonth_Amount : '-' }}</p>
+            </view>
+            <view class="success">
+              <p class="text">本月计划<text class="unit">/元</text></p>
+              <p class="money">{{ plan.BudgetMonth_Amount ? plan.BudgetMonth_Amount : '-' }}</p>
+            </view>
+          </view>
+        </view>
+      </div>
+      <div class="chartsItem" style="margin-top: 32px">
+        <div class="titleTop">
+          <p class="title">年度自营计划</p>
+          <div class="question" @click.stop="handleShowNoticeYear">
+            <image src="https://eshangtech.com/ShopICO/ahyd-BID/index/noticeQuestion.svg"></image>
+          </div>
+          <div v-if="showNoticeYear" class="titleTopNotice">{{ yearNoticeText }}</div>
+          <div v-if="showNoticeYear" class="meng" @click.stop="handleNoShowNoticeYear"></div>
+        </div>
+        <view class="box" @click="handleGoServiceInfo('year')">
+          <view class="top">
+            <view class="big">
+              <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/index/planYear.svg"></image>
+            </view>
+            <view class="text">
+              <view class="textTop">
+                <view class="left">
+                  <p class="number">{{ plan.percentageYear ? plan.percentageYear + '%' : '-' }}</p>
+                  <p v-if="plan.percentageYear >= 100" class="desc" style="color: #4E68FF">
+                    <image class="success" src="https://eshangtech.com/ShopICO/ahyd-BID/index/yearSuccess.svg"></image>
+                  </p>
+                </view>
+                <view class="right">
+                  <text class="comparePlan">比计划： </text>
+                  <div class="box2">
+                    <image class="addIcon"
+                      :src="plan.YearGrowth_Rate > 0 ? 'https://eshangtech.com/ShopICO/ahyd-BID/index/addIcon.svg' : 'https://eshangtech.com/ShopICO/ahyd-BID/index/reduce.svg'">
+                    </image>
+                    <p class="text">{{ yearAdd ? yearAdd + '%' : '' }}</p>
+                  </div>
+                </view>
+              </view>
+              <div class="progressPlan">
+                <div class="transYear" :style="{ width: `${plan.percentageYear >= 100 ? 100 : plan.percentageYear}%` }">
+                </div>
+                <!--                  <image class="img" :style="{width: plan.percentageYear + '%'}"  src="https://eshangtech.com/ShopICO/ahyd-BID/index/progress_blue.png"></image>-->
+                <!--                  <div class=pro :style="{width:(100 - plan.percentageYear)+ '%'}"></div>-->
+              </div>
+            </view>
+          </view>
+          <view class="bottom">
+            <view class="success" style="margin-right: 39px">
+              <p class="text">年度已完成<text class="unit">/元</text></p>
+              <p class="money">{{ plan.RevenueYear_Amount ? plan.RevenueYear_Amount : '-' }}</p>
+            </view>
+            <view class="success">
+              <p class="text">年度计划<text class="unit">/元</text></p>
+              <p class="money">{{ plan.BudgetYear_Amount ? plan.BudgetYear_Amount : '-' }}</p>
+            </view>
+          </view>
+        </view>
+      </div>
+
+      <!--            <div class="chartsItem" style="margin-top: 32px">-->
+      <!--                <p class="title">客流客单交易</p>-->
+      <!--                <contract-guarantee :data="orderTransaction"/>-->
+      <!--            </div>-->
+      <div class="chartsItem" style="margin-top: 32px">
+        <p class="title">同比分析</p>
+        <view class="tab">
+          <view v-for="(item, index) in tabList" :key="index"
+            :class="selectTab === item.value ? 'tabItem tabItemActive' : 'tabItem'"
+            @click="handleChangeTab(item.value)">
+            {{ item.name }}</view>
+        </view>
+        <div class="subItem">
+          <p class="title">{{ selectTab === 0 ? '营收同比' : selectTab === 1 ? '客单同比' : selectTab === 2 ? '均价同比' : '' }}</p>
+          <div class="money">
+            <div class="top">
+              <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/commercial/blueMoney.svg"></image>
+              <p class="sumMoney">{{ revenue.data ? revenue.data : '-' }}</p>
+            </div>
+            <div class="bottom">
+              <image class="icon"
+                :src="revenue.add > 0 ? 'https://eshangtech.com/ShopICO/ahyd-BID/commercial/addArrow.svg' : revenue.add < 0 ? 'https://eshangtech.com/ShopICO/ahyd-BID/commercial/decline.svg' : ''">
+              </image>
+              <p class="add">{{ revenue.add ? revenue.add + '%' : '-' }}</p>
+              <p class="text">(相比去年同日)</p>
+            </div>
+          </div>
+        </div>
+        <div class="subItem" style="height: 230px;margin-top: 20px;">
+          <div style="margin-bottom: 30px;display: flex;align-items: center;justify-content: space-between">
+            <p class="title">{{ selectTab === 0 ? '营收特征分析' : selectTab === 1 ? '客单对比' : selectTab === 2 ? '均价对比' : '' }}
+            </p>
+            <text v-if="selectTab === 0" style="margin-top: 12px">单位: 万元</text>
+            <text v-if="selectTab === 1" style="margin-top: 12px">单位: 笔</text>
+            <text v-if="selectTab === 2" style="margin-top: 12px">单位: 元</text>
+          </div>
+          <div>
+            <money-compare :data="moneyCompareList" />
+          </div>
+          <!--                    <no-data v-else/>-->
+        </div>
+        <div class="subItem" style="height: 230px;margin-top: 20px;">
+          <div style="margin-bottom: 30px;display: flex;align-items: center;justify-content: space-between">
+            <p class="title">营收同比分析</p>
+            <text style="margin-top: 12px">单位: 万元</text>
+          </div>
+          <div>
+            <revenue-trends :data="trendsList" />
+          </div>
+          <!--                    <no-data/>-->
+        </div>
+        <analyse
+          :analyseInfo="{ analysisins_type: selectTab === 0 ? 1305 : selectTab === 1 ? 1306 : selectTab === 2 ? 1307 : '', analysisins_format: 2000 }" />
+      </div>
+      <div class="chartsItem" style="margin-top: 32px">
+        <p class="title">营收类型比例</p>
+        <div class="progress">
+          <div class="top">
+            <div class="left">
+              <text class="title">自营</text>
+              <text class="value" style="margin-left: 4px">{{ revenueType.own ? revenueType.own : '' }}%</text>
+            </div>
+            <div class="right">
+              <text class="value">{{ revenueType.ectocyst ? revenueType.ectocyst : '' }}%</text>
+              <text class="title" style="margin-left: 4px">外包</text>
+            </div>
+          </div>
+          <div class="bottom">
+            <div class="first" :style="{ width: revenueType.own + '%' }"></div>
+            <div class="second" :style="{ width: revenueType.ectocyst + '%' }"></div>
+          </div>
+        </div>
+      </div>
+
+      <div class="chartsItem" style="margin-top: 32px">
+        <p class="title">合同保底</p>
+        <contract-guarantee :data="contractList" />
+      </div>
+
+    </div>
+  </scroll-view>
 </template>
 
 <script>
@@ -200,685 +233,732 @@ import analyse from "./components/analyse.vue";
 import RevenueTrends from "./components/manager/revenueTrends.vue";
 import request from '@/util/index.js'
 import NoData from "./components/noData.vue";
-import {getFieldEnum, timestampToTimeMonth} from "../../../util/dateTime/index";
+import { getFieldEnum, timestampToTimeMonth } from "../../../util/dateTime/index";
 import SliderPage from "./components/sliderPage.vue";
 
 export default {
-    name: "businessPortrait",
-    components: {
-      SliderPage,
-      NoData, RevenueTrends, MoneyCompare, ContractGuarantee, RevenueAnalysis, headerTop,analyse},
-    data() {
-        return {
-            topBg:'linear-gradient(180deg, #D9CCEF 0%, #DED3F2 100%);',
-            labelList:['女性','高消费','喜爱奶茶','浙江','20-30岁','江苏'],//标签
-            tabList:[{name:'营收金额',value:0},{name:'客单量',value:1},{name:'客单均价',value:2}],//选项卡列表
-            selectTab:0,//当前选中
-            title:'经营画像',//页面标题
-            bgColor: '180deg, #996CFF 0%, #5D43F8 100%',
-            bgUrl: 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/managePortraitBg.svg',//背景图片路径
-            page:'/pages/commercialBI/managePortrait',
+  name: "businessPortrait",
+  components: {
+    SliderPage,
+    NoData, RevenueTrends, MoneyCompare, ContractGuarantee, RevenueAnalysis, headerTop, analyse
+  },
+  data() {
+    return {
+      topBg: 'linear-gradient(180deg, #D9CCEF 0%, #DED3F2 100%);',
+      labelList: ['女性', '高消费', '喜爱奶茶', '浙江', '20-30岁', '江苏'],//标签
+      tabList: [{ name: '营收金额', value: 0 }, { name: '客单量', value: 1 }, { name: '客单均价', value: 2 }],//选项卡列表
+      selectTab: 0,//当前选中
+      title: '经营画像',//页面标题
+      bgColor: '180deg, #996CFF 0%, #5D43F8 100%',
+      bgUrl: 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/managePortraitBg.svg',//背景图片路径
+      page: '/pages/commercialBI/managePortrait',
 
-            pageType:2000,
-            detailBoxBg:'linear-gradient(136deg, #F3EFFE 0%, #FFFFFF 100%);',
-            topLeftBg:'linear-gradient(180deg, rgba(153, 108, 255, 0.2) 0%, rgba(93, 67, 248, 0.2) 100%)',// 类别背景
-            topLeftColor:'#6347F9',// 类别文字颜色
-            iconObj:{
-              car:'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carPortrait.svg',
-              charge:'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/chargePortraitBg.svg',
-              bady:'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/babyPortrait.svg',
-              guestRoom:'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/guestRoomPortrait.svg'
-            },
-            haveIconObj:{
-              have:'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/havePortrait.svg',
-              noHave:'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/noHavePortrait.svg'
-            },
-            time: '',//跳转携带的时间
-            menu: {},//手机配置信息
-            revenueList:[],//营收分析
-            contractList:{},//合同保底
-            orderTransaction:{},//客流客单交易
-            revenueAll:[],//三组的营收信息
-            revenue:{},//营收信息
-            moneyCompareList:{},//营收对比
-            trendsList:{},//营收趋势
-            revenueType:{},//营收占比
-            plan:{},//月度和年度接口的返回参数 一起的
-            monthAdd:'',//月每天的相对增加
-            yearAdd:'', // 年度计划增加的百分比
-            showNotice:false,
-            showNoticeYear:false,
-            serviceInfo:{}, //当前服务区信息
-            backType:'',//返回的页面类型
-            analyseInfo:{
-                analysisins_type: 1301
-            },
-            monthNoticeText:'',
-            yearNoticeText:'',
-            lastDay:'',
-            month:'',
-          haveFun:{},
-          monthDetail:{},// 月度汇总信息 头部的内容
-          serviceTypeObj:{},// 服务区类型对象
-          serviceInfoObj:{}
-        }
-    },
-    props:{
-      selectIndex:{
-        type:Number,
-        default:0
-      }
-    },
-    watch:{
-      selectIndex:{
-        handler(value){
-          if (value===3){
-            this.handleGetPageData()
-          }
-        },
-        immediate:true
-      }
-    },
-    onLoad(option) {
-      // if (option.serviceInfo){
-      //   this.serviceInfo = JSON.parse(option.serviceInfo)
-      // }
-      //   this.backType = option.type
-      //   //跳转的时候带上时间
-      //   this.time = option.time
-      // // 服务区类型枚举
-      // this.handleServiceType()
-    },
-    onShow(){
-      // this.monthDetail = undefined
-      //   let storeTime = uni.getStorageSync('lastDay')
-      // this.lastDay = uni.getStorageSync('lastDay')
-      //   if (storeTime){
-      //       this.time = storeTime
-      //   }
-      //   let date = new Date(this.time)
-      //   let m = date.getMonth() + 1
-      //   if (m<10){
-      //       m = '0' + m
-      //   }
-      //   this.month = m
-      //   let storeServiceInfo = uni.getStorageSync('currentService')
-      //   if (storeServiceInfo){
-      //       this.serviceInfo = storeServiceInfo
-      //   }
-      //   //  获取手机参数对页面进行适配
-      //   let systemInfo = uni.getSystemInfoSync()
-      //   // 把获取到的手机参数保存
-      //   uni.setStorageSync('phoneInfo', systemInfo)
-      //   this.statusBarHeight = Number(systemInfo.statusBarHeight)
-      //   this.menu = uni.getMenuButtonBoundingClientRect()
-      //   if (!storeServiceInfo){
-      //       this.nearestService()
-      //   }
-      //   //营收分析
-      //   this.getRevenueList()
-      //   //客流客单交易
-      //   // this.getOrderTransaction()
-      //   //营收对比
-      //   this.getMoneyCompareList()
-      //   //营收趋势
-      //   this.getTrendsList()
-      //   //营收占比
-      //   this.getRevenueType()
-      //   //月度计划、年度计划
-      //   this.monthYearPlan()
-      // //问号显示的内容
-      // this.handleNoticeMonth()
-      // this.handleNoticeYear()
-      // //   服务区基本信息
-      // this.getServiceInfo()
-      // //   月度汇总信息
-      // this.getSummaryMonth()
-      // this.handleChangeCurrent()
-    },
-    onUnload() {
-        this.$util.addUserBehavior()
-    },
-    methods:{
-      timestampToTimeMonth,
-      // 拿到页面数据
-      handleGetPageData(){
-        // 服务区类型枚举
-        this.handleServiceType()
-        this.monthDetail = undefined
-        let storeTime = uni.getStorageSync('lastDay')
-        this.lastDay = uni.getStorageSync('lastDay')
-        if (storeTime){
-          this.time = storeTime
-        }
-        let date = new Date(this.time)
-        let m = date.getMonth() + 1
-        if (m<10){
-          m = '0' + m
-        }
-        this.month = m
-        let storeServiceInfo = uni.getStorageSync('currentService')
-        if (storeServiceInfo){
-          this.serviceInfo = storeServiceInfo
-        }
-        //  获取手机参数对页面进行适配
-        let systemInfo = uni.getSystemInfoSync()
-        // 把获取到的手机参数保存
-        uni.setStorageSync('phoneInfo', systemInfo)
-        this.statusBarHeight = Number(systemInfo.statusBarHeight)
-        this.menu = uni.getMenuButtonBoundingClientRect()
-        if (!storeServiceInfo){
-          this.nearestService()
-        }
-        //营收分析
-        this.getRevenueList()
-        //客流客单交易
-        // this.getOrderTransaction()
-        //营收对比
-        this.getMoneyCompareList()
-        //营收趋势
-        this.getTrendsList()
-        //营收占比
-        this.getRevenueType()
-        //月度计划、年度计划
-        this.monthYearPlan()
-        //问号显示的内容
-        this.handleNoticeMonth()
-        this.handleNoticeYear()
-        //   服务区基本信息
-        this.getServiceInfo()
-        //   月度汇总信息
-        this.getSummaryMonth()
-        this.handleChangeCurrent()
+      pageType: 2000,
+      detailBoxBg: 'linear-gradient(136deg, #F3EFFE 0%, #FFFFFF 100%);',
+      topLeftBg: 'linear-gradient(180deg, rgba(153, 108, 255, 0.2) 0%, rgba(93, 67, 248, 0.2) 100%)',// 类别背景
+      topLeftColor: '#6347F9',// 类别文字颜色
+      iconObj: {
+        car: 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/carPortrait.svg',
+        charge: 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/chargePortraitBg.svg',
+        bady: 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/babyPortrait.svg',
+        guestRoom: 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/guestRoomPortrait.svg'
       },
-      handleChangeCurrent(){
-        this.$refs.headerTop.handleChangeCurrent()
+      haveIconObj: {
+        have: 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/havePortrait.svg',
+        noHave: 'https://eshangtech.com/ShopICO/ahyd-BID/newCommercialBI/noHavePortrait.svg'
       },
-      // 枚举服务区类型 SERVERPART_TYPE
-      async handleServiceType(){
-        const data = await getFieldEnum({ FieldExplainField: 'SERVERPART_TYPE' });
-        let obj = {}
-        data.forEach(item=>{
-          obj[Number(item.value)] = item.label
-        })
-        this.serviceTypeObj = obj
+      time: '',//跳转携带的时间
+      menu: {},//手机配置信息
+      revenueList: [],//营收分析
+      contractList: {},//合同保底
+      orderTransaction: {},//客流客单交易
+      revenueAll: [],//三组的营收信息
+      revenue: {},//营收信息
+      moneyCompareList: {},//营收对比
+      trendsList: {},//营收趋势
+      revenueType: {},//营收占比
+      plan: {},//月度和年度接口的返回参数 一起的
+      monthAdd: '',//月每天的相对增加
+      yearAdd: '', // 年度计划增加的百分比
+      showNotice: false,
+      showNoticeYear: false,
+      serviceInfo: {}, //当前服务区信息
+      backType: '',//返回的页面类型
+      analyseInfo: {
+        analysisins_type: 1301
       },
-      //获取服务区基本信息
-      async getServiceInfo(){
-        let req = {
-          ServerpartId:this.serviceInfo.Serverpart_ID
-        }
-        const total = await request.$webGet('CommercialApi/BaseInfo/GetServerpartInfo',req)
-        this.serviceInfoObj = total.Result_Data
-        this.haveFun = {
-          car:total.Result_Data.HASPILOTLOUNGE,
-          charge:total.Result_Data.HASCHARGE ,
-          bady:total.Result_Data.HASMOTHER ,
-          gusetHome:total.Result_Data.HASGUESTROOM
-        }
-      },
-        // 拿到服务区详情页需要的数据 然后带着跳转过去
-      handleGoServiceInfo(type){
-          let serviceInfo = this.serviceInfo
+      monthNoticeText: '',
+      yearNoticeText: '',
+      lastDay: '',
+      month: '',
+      haveFun: {},
+      monthDetail: {},// 月度汇总信息 头部的内容
+      serviceTypeObj: {},// 服务区类型对象
+      serviceInfoObj: {},
 
-          let num = serviceInfo.SERVERPART_NAME.indexOf('服务区')
-          if (num!==-1){
-              serviceInfo.name = serviceInfo.SERVERPART_NAME.slice(0,num)
-              serviceInfo.unit = serviceInfo.SERVERPART_NAME.slice(num,100)
-          }else{
-              serviceInfo.name = serviceInfo.SERVERPART_NAME
-          }
-          if (type==='month'){
-              let service = {
-                  Budget_Amount:this.plan.BudgetMonth_Amount,
-                  Budget_Degree:this.plan.MonthBudget_Degree,
-                  Growth_Rate:this.plan.MonthGrowth_Rate,
-                  Revenue_Amount:this.plan.RevenueMonth_Amount,
-                  Serverpart_ID:serviceInfo.Serverpart_ID,
-                  Serverpart_Name:serviceInfo.SERVERPART_NAME,
-                  name:serviceInfo.name,
-                  unit:serviceInfo.unit
-              }
-              const date = new Date(this.time)
-              let month = date.getMonth() + 1
-            if (this.serviceInfo.Serverpart_ID){
-              uni.navigateTo({
-                url:`/pages/commercialBI/serviceDetail?serviceInfo=${JSON.stringify(service)}&month=${month}&type=month`
-              })
-            }else{
-              this.$util.toNextRoute('navigateTo', `/pages/commercialBI/planMonth?lastDay=${this.lastDay}&type=${type}`)
-            }
-          }else{
-              let service = {
-                  Budget_Amount:this.plan.BudgetYear_Amount,
-                  Budget_Degree:this.plan.YearBudget_Degree,
-                  Growth_Rate:this.yearAdd,
-                  Revenue_Amount:this.plan.RevenueYear_Amount,
-                  Serverpart_ID:serviceInfo.Serverpart_ID,
-                  Serverpart_Name:serviceInfo.SERVERPART_NAME,
-                  name:serviceInfo.name,
-                  unit:serviceInfo.unit
-              }
-            if (this.serviceInfo.Serverpart_ID){
-              uni.navigateTo({
-                url:`/pages/commercialBI/serviceDetail?serviceInfo=${JSON.stringify(service)}&type=year`
-              })
-            }else{
-              this.$util.toNextRoute('navigateTo', `/pages/commercialBI/planMonth?lastDay=${this.lastDay}&type=${type}`)
-            }
-          }
-      },
-      async handleNoticeMonth(){
-        let date = new Date(this.lastDay)
-        let y = date.getFullYear()
-        let m = date.getMonth() + 1
-        if(m<10){
-          m = '0'+m
-        }
-        //本月的
-        let req = {
-          SearchParameter:{
-            STATISTICS_DATE:`${y}-${m}`,
-            ANALYSISINS_TYPE:'1011',
-            ANALYSISINS_FORMAT:'3000'
-          },
-          PageIndex:1,
-          PageSize:10
-        }
-        const data = await request.$webPost('CommercialApi/Analysis/GetANALYSISINSList',req)
-        if (data.Result_Data.List && data.Result_Data.List.length>0){
-          this.monthNoticeText = data.Result_Data.List[0].ANALYSIS_CONTENT
-        }
-
-
-      },
-      async handleNoticeYear(){
-        let date = new Date(this.lastDay)
-        let y = date.getFullYear()
-        let m = date.getMonth() + 1
-        if(m<10){
-          m = '0'+m
-        }
-        //本年
-        let reqYear = {
-          SearchParameter:{
-            STATISTICS_DATE:`${y}`,
-            ANALYSISINS_TYPE:'1012',
-            ANALYSISINS_FORMAT:'3000'
-          },
-          PageIndex:1,
-          PageSize:10
-        }
-        const totalData = await request.$webPost('CommercialApi/Analysis/GetANALYSISINSList',reqYear)
-        if (totalData.Result_Data.List && totalData.Result_Data.List.length>0){
-          this.yearNoticeText =  totalData.Result_Data.List[0].ANALYSIS_CONTENT
-        }
-      },
-        async nearestService(){
-            let seat = uni.getStorageSync('seatInfo');
-            let req = {
-                longitude:seat.longitude,
-                Province_Code:'340000',
-                latitude:seat.latitude,
-            }
-            const data = await request.$webGet('CommercialApi/BaseInfo/GetServerpartList',req)
-            let res = {
-                SERVERPART_NAME:data.Result_Data.List[0].SERVERPART_NAME,//服务区
-                SPREGIONTYPE_NAME:data.Result_Data.List[0].SPREGIONTYPE_NAME,//片区
-                Serverpart_ID:data.Result_Data.List[0].SERVERPART_ID,
-                longitude:data.Result_Data.List[0].SERVERPART_X,
-                latitude:data.Result_Data.List[0].SERVERPART_Y,
-            }
-            uni.setStorageSync('currentService',res)
-        },
-        handleShowNotice(){
-            this.showNotice = true
-        },
-        handleNoShowNotice(){
-            this.showNotice = false
-        },
-        handleShowNoticeYear(){
-            this.showNoticeYear = true
-        },
-        handleNoShowNoticeYear(){
-            this.showNoticeYear = false
-        },
-        async getSummaryMonth(){
-          // let currentService = uni.getStorageSync('currentService')
-          const date = new Date(this.time)
-          let y = date.getFullYear()
-          let m = date.getMonth() + 1
-          let d = date.getDate()
-          if (m<10){
-            m = '0'+m
-          }
-          if (d<10){
-            d = '0'+d
-          }
-          const req= {
-            pushProvinceCode:'340000',
-            Statistics_StartDate:`${y}-${m}-01`,
-            Statistics_Date:`${y}-${m}-${d}`,
-            Serverpart_ID:this.serviceInfo.SERVERPART_NAME==='安徽驿达'?null:this.serviceInfo.Serverpart_ID
-          }
-          const data = await request.$webGet('CommercialApi/Revenue/GetSummaryRevenue',req)
-          this.monthDetail = data.Result_Data.RevenuePushModel
-          if (this.serviceInfo.SERVERPART_NAME!=='安徽驿达' && this.monthDetail.BudgetRevenue){
-            this.monthDetail.comparePlan = Number(this.$util.getMoney(((this.monthDetail.CashPay/this.monthDetail.BudgetRevenue)-1)*100))
-          }
-        },
-
-        async getRevenueList(){
-            let req = {
-                statisticsDate:this.time,
-                provinceCode:'340000',
-                Serverpart_ID:this.serviceInfo.Serverpart_ID ||'',
-                SPRegionType_ID:this.serviceInfo.SPRegionType_ID || ''
-            }
-            let totalData = await request.$webGet('CommercialApi/Contract/GetContractAnalysis',req)
-            this.revenueList = {
-                ContractProfitLoss:totalData.Result_Data.ContractProfitLoss,
-                ShopCount:totalData.Result_Data.ShopCount,
-                SalesPerSquareMeter:totalData.Result_Data.SalesPerSquareMeter,
-                ExpiredShopCount:totalData.Result_Data.ExpiredShopCount,
-                ContractList:totalData.Result_Data.ContractList
-            }
-            this.contractList = {
-                title:'完成率',
-                value:totalData.Result_Data.ContractCompletionDegree
-            }
-            this.orderTransaction = {
-                title:'转化率',
-                value:totalData.Result_Data.ConvertRate
-            }
-        },
-        //拿到合同列表
-        // async getContractList(){
-        // let req = {
-        //   statisticsDate:this.time,
-        //   provinceCode:'340000',
-        //   Serverpart_ID:this.serviceInfo.Serverpart_ID,
-        //   SPRegionType_ID:this.serviceInfo.SPRegionType_ID
-        // }
-        // let totalData = await request.$webGet('CommercialApi/Contract/GetContractAnalysis',req)
-        //
-        //
-        // },
-        // getOrderTransaction(){
-        //     let res = {
-        //         title: '转化率',
-        //         value: 50.5
-        //     }
-        //     this.orderTransaction = res
-        // },
-        //选项卡改变
-        handleChangeTab(value){
-            this.selectTab = value
-            this.revenue = this.revenueAll[this.selectTab]
-            this.moneyCompareList = this.revenue.list
-        },
-        async getMoneyCompareList(){
-          let req
-          if (this.serviceInfo.SERVERPART_NAME==='安徽驿达'){
-            req = {
-              StatisticsDate:this.time,
-            }
-          }else{
-            req = {
-              StatisticsDate:this.time,
-              ServerpartId:this.serviceInfo.Serverpart_ID ||''
-            }
-          }
-
-            const data = await request.$webGet('CommercialApi/Revenue/GetRevenueCompare',req)
-            let RevenueAmount = [] //营收金额 除以10000的金额
-            let normalAmount = [] //不除以10000的金额
-            let compareWordDay = [] //对比工作日
-            let RevenueMax = 0
-            let TicketCountList = [] // 客单量
-            let TicketMax = 0
-            let AvgTicketAmountList = [] // 客单均价
-            let AvgTicketMax = 0
-            if (data.Result_Data.RevenueAmountList && data.Result_Data.RevenueAmountList.length>0){
-              data.Result_Data.RevenueAmountList.forEach(item=>{
-                let list = []
-                let listNormal = []
-                let qoqAddList = [] //环比增加
-                item.data.forEach(subItem=>{
-                  let number = (subItem[1] / 10000 ).toFixed(2)
-                  if (number>RevenueMax){
-                    RevenueMax = number
-                  }
-                  list.push(number)
-                  qoqAddList.push(subItem[2])
-                  listNormal.push(subItem[1])
-                })
-                normalAmount.push({name:item.name,data:listNormal})
-                RevenueAmount.push({name:item.name,data:list,qoqAdd:qoqAddList,holiday: item.value})
-              })
-            }
-            if (data.Result_Data.TicketCountList && data.Result_Data.TicketCountList.length>0){
-              data.Result_Data.TicketCountList.forEach(item=>{
-                let list = []
-                let qoqAddList = [] //环比增加
-                item.data.forEach(subItem=>{
-                  let number = (subItem[1]).toFixed(0)
-                  if (number > TicketMax){
-                    TicketMax = Number(number)
-                  }
-                  qoqAddList.push(subItem[2])
-                  list.push(number)
-                })
-                TicketCountList.push({name:item.name,data:list,qoqAdd:qoqAddList,holiday: item.value})
-              })
-            }
-            if (data.Result_Data.AvgTicketAmountList && data.Result_Data.AvgTicketAmountList.length>0){
-              data.Result_Data.AvgTicketAmountList .forEach(item=>{
-                let list = []
-                let qoqAddList = [] //环比增加
-                item.data.forEach(subItem=>{
-                  let number = (subItem[1]).toFixed(2)
-                  if (number>AvgTicketMax){
-                    AvgTicketMax = number
-                  }
-                  list.push(number)
-                  qoqAddList.push(subItem[2])
-                })
-                AvgTicketAmountList.push({name:item.name,data:list,qoqAdd:qoqAddList,holiday: item.value})
-              })
-            }
-            // 因为有三个选项卡 把三种情况要展示的内容 放在一个对象里面 三个对象放一个数组里面 点击选项卡切换显示的对象就可以了
-             this.revenueAll = [
-                {
-                    data:this.$util.fmoney(data.Result_Data.RevenueAmount),
-                    add:data.Result_Data.RevenueAmountYOYRate,
-                    list:{
-                        categories: ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],
-                        series: RevenueAmount,
-                        normal:normalAmount,
-                        max:RevenueMax,
-                        type:0
-                    },
-                },
-                {
-                    data:this.$util.noDecimal(data.Result_Data.TicketCount),
-                    add:data.Result_Data.TicketCountYOYRate ,
-                    list:{
-                        categories: ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],
-                        series: TicketCountList,
-                        max:TicketMax,
-                        type:1
-                    },
-                },
-                {
-                    data:this.$util.fmoney(data.Result_Data.AvgTicketAmount),
-                    add:data.Result_Data.AvgTicketAmountRate ,
-                    list:{
-                        categories: ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],
-                        series: AvgTicketAmountList,
-                        max:AvgTicketMax,
-                        type:2
-                    },
-                }
-            ]
-            this.revenue = this.revenueAll[this.selectTab]
-            // let res = {
-            //     categories: ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],
-            //     series: [
-            //         {
-            //             name: "平日平均",
-            //             data: [7,10,8,5,8,8,9,8,5,6,7,7]
-            //         },
-            //         {
-            //             name: "周末平均",
-            //             data: [5,8,8,7,6,6,6,8,7,7,6,7]
-            //         },
-            //         {
-            //             name: "节假日平均",
-            //             data: [5,10,4,4,7,8,6,5,5,6,10,7]
-            //         }
-            //     ]
-            // }
-            this.moneyCompareList = this.revenue.list
-        },
-        async getTrendsList(){
-            let date = new Date(this.time)
-            let y = date.getFullYear()
-            // 查今年去年两年的数据
-            let req
-            let yesReq
-            if (this.serviceInfo.SERVERPART_NAME==='安徽驿达'){
-              req={
-                ProvinceCode:'340000',
-                StatisticsDate:y,
-                StatisticsType:1,
-              }
-            }else{
-              req ={
-                ProvinceCode:'340000',
-                StatisticsDate:y,
-                StatisticsType:1,
-                ServerpartId:this.serviceInfo.Serverpart_ID ||''
-              }
-            }
-          if (this.serviceInfo.SERVERPART_NAME==='安徽驿达'){
-            yesReq={
-              ProvinceCode:'340000',
-              StatisticsDate:y - 1,
-              StatisticsType:1,
-            }
-          }else{
-            yesReq = {
-              ProvinceCode:'340000',
-              StatisticsDate:y - 1,
-              StatisticsType:1,
-              ServerpartId:this.serviceInfo.Serverpart_ID ||''
-            }
-          }
-
-            const data = await request.$webGet('CommercialApi/Revenue/GetRevenueTrend',req)
-            const yesData = await request.$webGet('CommercialApi/Revenue/GetRevenueTrend',yesReq)
-            let list = []
-            let max = 0
-            data.Result_Data.List.forEach(item=>{
-                item.value = Number((item.value/10000).toFixed(1))
-                if (Number(item.value) > max){
-                    max = Number(item.value)
-                }
-                list.push(item.value)
-            })
-            let yesList = []
-            yesData.Result_Data.List.forEach(item=>{
-                item.value = Number((item.value/10000).toFixed(1))
-                yesList.push(item.value)
-            })
-            let res={
-                categories: ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],
-                series:[{
-                    name: "今年",
-                    data: list
-                },{
-                    name: "去年",
-                    data: yesList
-                }],
-                max:max
-            }
-            // let res={
-            //     categories: ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],
-            //     series:[{
-            //         name: "",
-            //         data: [3,4,5,4.8,5,4.2,4.5,5,5.5,5.7,8,9]
-            //     }]
-            // }
-            this.trendsList = res
-        },
-        async getRevenueType(){
-          const date = new Date(this.time)
-          let y = date.getFullYear()
-          let m = date.getMonth() + 1
-          if (m<10){
-             m = '0'+ m
-          }
-            const req = {
-                pushProvinceCode:'340000',
-                Statistics_StartDate:`${y}-${m}-01`,
-                Statistics_Date:this.time,
-                Serverpart_ID:this.serviceInfo.SERVERPART_NAME==='安徽驿达'?null:this.serviceInfo.Serverpart_ID
-            }
-            const data = await request.$webGet('CommercialApi/Revenue/GetSummaryRevenue',req)
-            let all = 0
-            if (data.Result_Data && data.Result_Data.BusinessTypeList && data.Result_Data.BusinessTypeList.length>0){
-              data.Result_Data.BusinessTypeList.forEach(item=>{
-                all +=Number(item.value)
-              })
-              data.Result_Data.BusinessTypeList.forEach(item=>{
-                item.rate = ((Number(item.value) / all)*100).toFixed(2)
-              })
-              let res={
-                own:data.Result_Data.BusinessTypeList[1].rate,
-                ectocyst:data.Result_Data.BusinessTypeList[0].rate
-              }
-              this.revenueType = res
-            }else{
-              this.revenueType = null
-            }
-        },
-        monthYearPlan(){
-            const monthDate= {
-                Province_Code:'340000',
-                Serverpart_ID:this.serviceInfo.SERVERPART_NAME==='安徽驿达'?null:this.serviceInfo.Serverpart_ID,
-                Statistics_Date:this.time
-            }
-            request.$webGet('CommercialApi/Revenue/GetRevenueBudget',monthDate).then(res=>{
-                // 赋值给data中的这个对象 在请求完之后会进行统一的数据处理
-                this.plan = res.Result_Data
-              if (this.plan){
-                if (this.plan && this.plan.RevenueMonth_Amount){
-                  this.plan.percentageMonth = (res.Result_Data.RevenueMonth_Amount / res.Result_Data.BudgetMonth_Amount*100).toFixed(2)
-                }
-                if (this.plan && this.plan.RevenueYear_Amount){
-                  this.plan.percentageYear = (res.Result_Data.RevenueYear_Amount / res.Result_Data.BudgetYear_Amount*100).toFixed(2)
-                }
-                // this.plan.percentageMonth = 80
-                // let date = new Date(this.time)
-                // let nowDay = date.getDate()
-                // let day = this.$util.getThisMonthDay(this.time)
-                // //一天应该的增长率
-                // let oneDay = 100/day
-                // // 到了当天的应该有的百分比
-                // let thisDayShould= oneDay*nowDay
-                // 由于显示的时候 正负号由图片表示 所以要区绝对值展现在页面上
-                this.monthAdd = Math.abs(this.plan.MonthGrowth_Rate)
-                this.yearAdd = Math.abs(this.plan.YearGrowth_Rate)
-                //处理数据 保留小数
-                this.plan.RevenueMonth_Amount = this.$util.fmoney(res.Result_Data.RevenueMonth_Amount)
-                this.plan.BudgetMonth_Amount = this.$util.fmoney(res.Result_Data.BudgetMonth_Amount)
-                this.plan.RevenueYear_Amount = this.$util.fmoney(res.Result_Data.RevenueYear_Amount)
-                this.plan.BudgetYear_Amount = this.$util.fmoney(res.Result_Data.BudgetYear_Amount)
-              }
-            })
-        }
+      single: '',//显示时间
+      endData: '', // 结束时间
+      startTime: '2023-01',// 开始时间
     }
+  },
+  props: {
+    selectIndex: {
+      type: Number,
+      default: 0
+    }
+  },
+  watch: {
+    selectIndex: {
+      handler(value) {
+        if (value === 3) {
+          this.handleGetPageData()
+        }
+      },
+      immediate: true
+    }
+  },
+  onLoad(option) {
+    // if (option.serviceInfo){
+    //   this.serviceInfo = JSON.parse(option.serviceInfo)
+    // }
+    //   this.backType = option.type
+    //   //跳转的时候带上时间
+    //   this.time = option.time
+    // // 服务区类型枚举
+    // this.handleServiceType()
+  },
+  onShow() {
+    // this.monthDetail = undefined
+    //   let storeTime = uni.getStorageSync('lastDay')
+    // this.lastDay = uni.getStorageSync('lastDay')
+    //   if (storeTime){
+    //       this.time = storeTime
+    //   }
+    //   let date = new Date(this.time)
+    //   let m = date.getMonth() + 1
+    //   if (m<10){
+    //       m = '0' + m
+    //   }
+    //   this.month = m
+    //   let storeServiceInfo = uni.getStorageSync('currentService')
+    //   if (storeServiceInfo){
+    //       this.serviceInfo = storeServiceInfo
+    //   }
+    //   //  获取手机参数对页面进行适配
+    //   let systemInfo = uni.getSystemInfoSync()
+    //   // 把获取到的手机参数保存
+    //   uni.setStorageSync('phoneInfo', systemInfo)
+    //   this.statusBarHeight = Number(systemInfo.statusBarHeight)
+    //   this.menu = uni.getMenuButtonBoundingClientRect()
+    //   if (!storeServiceInfo){
+    //       this.nearestService()
+    //   }
+    //   //营收分析
+    //   this.getRevenueList()
+    //   //客流客单交易
+    //   // this.getOrderTransaction()
+    //   //营收对比
+    //   this.getMoneyCompareList()
+    //   //营收趋势
+    //   this.getTrendsList()
+    //   //营收占比
+    //   this.getRevenueType()
+    //   //月度计划、年度计划
+    //   this.monthYearPlan()
+    // //问号显示的内容
+    // this.handleNoticeMonth()
+    // this.handleNoticeYear()
+    // //   服务区基本信息
+    // this.getServiceInfo()
+    // //   月度汇总信息
+    // this.getSummaryMonth()
+    // this.handleChangeCurrent()
+  },
+  onUnload() {
+    this.$util.addUserBehavior()
+  },
+  methods: {
+    timestampToTimeMonth,
+    // 修改时间
+    bindDateChange(e) {
+      const date = new Date(e.detail.value)
+      const nowDate = new Date()
+      let y = date.getFullYear()
+      let m = date.getMonth() + 1
+      let nowYear = nowDate.getFullYear()
+      let nowMonth = nowDate.getMonth() + 1
+      if (nowYear === y && nowMonth === m) {
+        let d = nowDate.getDate() - 1
+        this.time = `${nowYear}-${nowMonth}-${d}`
+      } else {
+        let d = this.$util.getThisMonthDay(`${y}-${m}`)
+        this.time = `${y}-${m}-${d}`
+      }
+      this.single = this.$util.getThisMonthHave(this.time)
+      this.onRefresh()
+    },
+    // 拿到页面数据
+    handleGetPageData() {
+      // 服务区类型枚举
+      this.handleServiceType()
+      this.monthDetail = undefined
+      let storeTime = uni.getStorageSync('lastDay')
+      this.lastDay = uni.getStorageSync('lastDay')
+      if (storeTime) {
+        this.time = storeTime
+      }
+      this.single = this.$util.getThisMonthHave(this.time)
+      this.endData = uni.getStorageSync('lastDay')
+      let date = new Date(this.time)
+      let m = date.getMonth() + 1
+      if (m < 10) {
+        m = '0' + m
+      }
+      this.month = m
+      let storeServiceInfo = uni.getStorageSync('currentService')
+      if (storeServiceInfo) {
+        this.serviceInfo = storeServiceInfo
+      }
+      //  获取手机参数对页面进行适配
+      let systemInfo = uni.getSystemInfoSync()
+      // 把获取到的手机参数保存
+      uni.setStorageSync('phoneInfo', systemInfo)
+      this.statusBarHeight = Number(systemInfo.statusBarHeight)
+      this.menu = uni.getMenuButtonBoundingClientRect()
+      if (!storeServiceInfo) {
+        this.nearestService()
+      }
+      //营收分析
+      this.getRevenueList()
+      //客流客单交易
+      // this.getOrderTransaction()
+      //营收对比
+      this.getMoneyCompareList()
+      //营收趋势
+      this.getTrendsList()
+      //营收占比
+      this.getRevenueType()
+      //月度计划、年度计划
+      this.monthYearPlan()
+      //问号显示的内容
+      this.handleNoticeMonth()
+      this.handleNoticeYear()
+      //   服务区基本信息
+      this.getServiceInfo()
+      //   月度汇总信息
+      this.getSummaryMonth()
+      this.handleChangeCurrent()
+    },
+    onRefresh() {
+      //营收分析
+      this.getRevenueList()
+      //客流客单交易
+      // this.getOrderTransaction()
+      //营收对比
+      this.getMoneyCompareList()
+      //营收趋势
+      this.getTrendsList()
+      //营收占比
+      this.getRevenueType()
+      //月度计划、年度计划
+      this.monthYearPlan()
+      //问号显示的内容
+      this.handleNoticeMonth()
+      this.handleNoticeYear()
+      //   服务区基本信息
+      this.getServiceInfo()
+      //   月度汇总信息
+      this.getSummaryMonth()
+      this.handleChangeCurrent()
+    },
+    handleChangeCurrent() {
+      this.$refs.headerTop.handleChangeCurrent()
+    },
+    // 枚举服务区类型 SERVERPART_TYPE
+    async handleServiceType() {
+      const data = await getFieldEnum({ FieldExplainField: 'SERVERPART_TYPE' });
+      let obj = {}
+      data.forEach(item => {
+        obj[Number(item.value)] = item.label
+      })
+      this.serviceTypeObj = obj
+    },
+    //获取服务区基本信息
+    async getServiceInfo() {
+      let req = {
+        ServerpartId: this.serviceInfo.Serverpart_ID
+      }
+      const total = await request.$webGet('CommercialApi/BaseInfo/GetServerpartInfo', req)
+      this.serviceInfoObj = total.Result_Data
+      this.haveFun = {
+        car: total.Result_Data.HASPILOTLOUNGE,
+        charge: total.Result_Data.HASCHARGE,
+        bady: total.Result_Data.HASMOTHER,
+        gusetHome: total.Result_Data.HASGUESTROOM
+      }
+    },
+    // 拿到服务区详情页需要的数据 然后带着跳转过去
+    handleGoServiceInfo(type) {
+      let serviceInfo = this.serviceInfo
+
+      let num = serviceInfo.SERVERPART_NAME.indexOf('服务区')
+      if (num !== -1) {
+        serviceInfo.name = serviceInfo.SERVERPART_NAME.slice(0, num)
+        serviceInfo.unit = serviceInfo.SERVERPART_NAME.slice(num, 100)
+      } else {
+        serviceInfo.name = serviceInfo.SERVERPART_NAME
+      }
+      if (type === 'month') {
+        let service = {
+          Budget_Amount: this.plan.BudgetMonth_Amount,
+          Budget_Degree: this.plan.MonthBudget_Degree,
+          Growth_Rate: this.plan.MonthGrowth_Rate,
+          Revenue_Amount: this.plan.RevenueMonth_Amount,
+          Serverpart_ID: serviceInfo.Serverpart_ID,
+          Serverpart_Name: serviceInfo.SERVERPART_NAME,
+          name: serviceInfo.name,
+          unit: serviceInfo.unit
+        }
+        const date = new Date(this.time)
+        let month = date.getMonth() + 1
+        if (this.serviceInfo.Serverpart_ID) {
+          uni.navigateTo({
+            url: `/pages/commercialBI/serviceDetail?serviceInfo=${JSON.stringify(service)}&month=${month}&type=month`
+          })
+        } else {
+          this.$util.toNextRoute('navigateTo', `/pages/commercialBI/planMonth?lastDay=${this.lastDay}&type=${type}`)
+        }
+      } else {
+        let service = {
+          Budget_Amount: this.plan.BudgetYear_Amount,
+          Budget_Degree: this.plan.YearBudget_Degree,
+          Growth_Rate: this.yearAdd,
+          Revenue_Amount: this.plan.RevenueYear_Amount,
+          Serverpart_ID: serviceInfo.Serverpart_ID,
+          Serverpart_Name: serviceInfo.SERVERPART_NAME,
+          name: serviceInfo.name,
+          unit: serviceInfo.unit
+        }
+        if (this.serviceInfo.Serverpart_ID) {
+          uni.navigateTo({
+            url: `/pages/commercialBI/serviceDetail?serviceInfo=${JSON.stringify(service)}&type=year`
+          })
+        } else {
+          this.$util.toNextRoute('navigateTo', `/pages/commercialBI/planMonth?lastDay=${this.lastDay}&type=${type}`)
+        }
+      }
+    },
+    async handleNoticeMonth() {
+      let date = new Date(this.lastDay)
+      let y = date.getFullYear()
+      let m = date.getMonth() + 1
+      if (m < 10) {
+        m = '0' + m
+      }
+      //本月的
+      let req = {
+        SearchParameter: {
+          STATISTICS_DATE: `${y}-${m}`,
+          ANALYSISINS_TYPE: '1011',
+          ANALYSISINS_FORMAT: '3000'
+        },
+        PageIndex: 1,
+        PageSize: 10
+      }
+      const data = await request.$webPost('CommercialApi/Analysis/GetANALYSISINSList', req)
+      if (data.Result_Data.List && data.Result_Data.List.length > 0) {
+        this.monthNoticeText = data.Result_Data.List[0].ANALYSIS_CONTENT
+      }
+
+
+    },
+    async handleNoticeYear() {
+      let date = new Date(this.lastDay)
+      let y = date.getFullYear()
+      let m = date.getMonth() + 1
+      if (m < 10) {
+        m = '0' + m
+      }
+      //本年
+      let reqYear = {
+        SearchParameter: {
+          STATISTICS_DATE: `${y}`,
+          ANALYSISINS_TYPE: '1012',
+          ANALYSISINS_FORMAT: '3000'
+        },
+        PageIndex: 1,
+        PageSize: 10
+      }
+      const totalData = await request.$webPost('CommercialApi/Analysis/GetANALYSISINSList', reqYear)
+      if (totalData.Result_Data.List && totalData.Result_Data.List.length > 0) {
+        this.yearNoticeText = totalData.Result_Data.List[0].ANALYSIS_CONTENT
+      }
+    },
+    async nearestService() {
+      let seat = uni.getStorageSync('seatInfo');
+      let req = {
+        longitude: seat.longitude,
+        Province_Code: '340000',
+        latitude: seat.latitude,
+      }
+      const data = await request.$webGet('CommercialApi/BaseInfo/GetServerpartList', req)
+      let res = {
+        SERVERPART_NAME: data.Result_Data.List[0].SERVERPART_NAME,//服务区
+        SPREGIONTYPE_NAME: data.Result_Data.List[0].SPREGIONTYPE_NAME,//片区
+        Serverpart_ID: data.Result_Data.List[0].SERVERPART_ID,
+        longitude: data.Result_Data.List[0].SERVERPART_X,
+        latitude: data.Result_Data.List[0].SERVERPART_Y,
+      }
+      uni.setStorageSync('currentService', res)
+    },
+    handleShowNotice() {
+      this.showNotice = true
+    },
+    handleNoShowNotice() {
+      this.showNotice = false
+    },
+    handleShowNoticeYear() {
+      this.showNoticeYear = true
+    },
+    handleNoShowNoticeYear() {
+      this.showNoticeYear = false
+    },
+    async getSummaryMonth() {
+      // let currentService = uni.getStorageSync('currentService')
+      const date = new Date(this.time)
+      let y = date.getFullYear()
+      let m = date.getMonth() + 1
+      let d = date.getDate()
+      if (m < 10) {
+        m = '0' + m
+      }
+      if (d < 10) {
+        d = '0' + d
+      }
+      const req = {
+        pushProvinceCode: '340000',
+        Statistics_StartDate: `${y}-${m}-01`,
+        Statistics_Date: `${y}-${m}-${d}`,
+        Serverpart_ID: this.serviceInfo.SERVERPART_NAME === '安徽驿达' ? null : this.serviceInfo.Serverpart_ID
+      }
+      const data = await request.$webGet('CommercialApi/Revenue/GetSummaryRevenue', req)
+      this.monthDetail = data.Result_Data.RevenuePushModel
+      if (this.serviceInfo.SERVERPART_NAME !== '安徽驿达' && this.monthDetail.BudgetRevenue) {
+        this.monthDetail.comparePlan = Number(this.$util.getMoney(((this.monthDetail.CashPay / this.monthDetail.BudgetRevenue) - 1) * 100))
+      }
+    },
+
+    async getRevenueList() {
+      let req = {
+        statisticsDate: this.time,
+        provinceCode: '340000',
+        Serverpart_ID: this.serviceInfo.Serverpart_ID || '',
+        SPRegionType_ID: this.serviceInfo.SPRegionType_ID || ''
+      }
+      let totalData = await request.$webGet('CommercialApi/Contract/GetContractAnalysis', req)
+      this.revenueList = {
+        ContractProfitLoss: totalData.Result_Data.ContractProfitLoss,
+        ShopCount: totalData.Result_Data.ShopCount,
+        SalesPerSquareMeter: totalData.Result_Data.SalesPerSquareMeter,
+        ExpiredShopCount: totalData.Result_Data.ExpiredShopCount,
+        ContractList: totalData.Result_Data.ContractList
+      }
+      this.contractList = {
+        title: '完成率',
+        value: totalData.Result_Data.ContractCompletionDegree
+      }
+      this.orderTransaction = {
+        title: '转化率',
+        value: totalData.Result_Data.ConvertRate
+      }
+    },
+    //拿到合同列表
+    // async getContractList(){
+    // let req = {
+    //   statisticsDate:this.time,
+    //   provinceCode:'340000',
+    //   Serverpart_ID:this.serviceInfo.Serverpart_ID,
+    //   SPRegionType_ID:this.serviceInfo.SPRegionType_ID
+    // }
+    // let totalData = await request.$webGet('CommercialApi/Contract/GetContractAnalysis',req)
+    //
+    //
+    // },
+    // getOrderTransaction(){
+    //     let res = {
+    //         title: '转化率',
+    //         value: 50.5
+    //     }
+    //     this.orderTransaction = res
+    // },
+    //选项卡改变
+    handleChangeTab(value) {
+      this.selectTab = value
+      this.revenue = this.revenueAll[this.selectTab]
+      this.moneyCompareList = this.revenue.list
+    },
+    async getMoneyCompareList() {
+      let req
+      if (this.serviceInfo.SERVERPART_NAME === '安徽驿达') {
+        req = {
+          StatisticsDate: this.time,
+        }
+      } else {
+        req = {
+          StatisticsDate: this.time,
+          ServerpartId: this.serviceInfo.Serverpart_ID || ''
+        }
+      }
+
+      const data = await request.$webGet('CommercialApi/Revenue/GetRevenueCompare', req)
+      let RevenueAmount = [] //营收金额 除以10000的金额
+      let normalAmount = [] //不除以10000的金额
+      let compareWordDay = [] //对比工作日
+      let RevenueMax = 0
+      let TicketCountList = [] // 客单量
+      let TicketMax = 0
+      let AvgTicketAmountList = [] // 客单均价
+      let AvgTicketMax = 0
+      if (data.Result_Data.RevenueAmountList && data.Result_Data.RevenueAmountList.length > 0) {
+        data.Result_Data.RevenueAmountList.forEach(item => {
+          let list = []
+          let listNormal = []
+          let qoqAddList = [] //环比增加
+          item.data.forEach(subItem => {
+            let number = (subItem[1] / 10000).toFixed(2)
+            if (number > RevenueMax) {
+              RevenueMax = number
+            }
+            list.push(number)
+            qoqAddList.push(subItem[2])
+            listNormal.push(subItem[1])
+          })
+          normalAmount.push({ name: item.name, data: listNormal })
+          RevenueAmount.push({ name: item.name, data: list, qoqAdd: qoqAddList, holiday: item.value })
+        })
+      }
+      if (data.Result_Data.TicketCountList && data.Result_Data.TicketCountList.length > 0) {
+        data.Result_Data.TicketCountList.forEach(item => {
+          let list = []
+          let qoqAddList = [] //环比增加
+          item.data.forEach(subItem => {
+            let number = (subItem[1]).toFixed(0)
+            if (number > TicketMax) {
+              TicketMax = Number(number)
+            }
+            qoqAddList.push(subItem[2])
+            list.push(number)
+          })
+          TicketCountList.push({ name: item.name, data: list, qoqAdd: qoqAddList, holiday: item.value })
+        })
+      }
+      if (data.Result_Data.AvgTicketAmountList && data.Result_Data.AvgTicketAmountList.length > 0) {
+        data.Result_Data.AvgTicketAmountList.forEach(item => {
+          let list = []
+          let qoqAddList = [] //环比增加
+          item.data.forEach(subItem => {
+            let number = (subItem[1]).toFixed(2)
+            if (number > AvgTicketMax) {
+              AvgTicketMax = number
+            }
+            list.push(number)
+            qoqAddList.push(subItem[2])
+          })
+          AvgTicketAmountList.push({ name: item.name, data: list, qoqAdd: qoqAddList, holiday: item.value })
+        })
+      }
+      // 因为有三个选项卡 把三种情况要展示的内容 放在一个对象里面 三个对象放一个数组里面 点击选项卡切换显示的对象就可以了
+      this.revenueAll = [
+        {
+          data: this.$util.fmoney(data.Result_Data.RevenueAmount),
+          add: data.Result_Data.RevenueAmountYOYRate,
+          list: {
+            categories: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+            series: RevenueAmount,
+            normal: normalAmount,
+            max: RevenueMax,
+            type: 0
+          },
+        },
+        {
+          data: this.$util.noDecimal(data.Result_Data.TicketCount),
+          add: data.Result_Data.TicketCountYOYRate,
+          list: {
+            categories: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+            series: TicketCountList,
+            max: TicketMax,
+            type: 1
+          },
+        },
+        {
+          data: this.$util.fmoney(data.Result_Data.AvgTicketAmount),
+          add: data.Result_Data.AvgTicketAmountRate,
+          list: {
+            categories: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+            series: AvgTicketAmountList,
+            max: AvgTicketMax,
+            type: 2
+          },
+        }
+      ]
+      this.revenue = this.revenueAll[this.selectTab]
+      // let res = {
+      //     categories: ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],
+      //     series: [
+      //         {
+      //             name: "平日平均",
+      //             data: [7,10,8,5,8,8,9,8,5,6,7,7]
+      //         },
+      //         {
+      //             name: "周末平均",
+      //             data: [5,8,8,7,6,6,6,8,7,7,6,7]
+      //         },
+      //         {
+      //             name: "节假日平均",
+      //             data: [5,10,4,4,7,8,6,5,5,6,10,7]
+      //         }
+      //     ]
+      // }
+      this.moneyCompareList = this.revenue.list
+    },
+    async getTrendsList() {
+      let date = new Date(this.time)
+      let y = date.getFullYear()
+      // 查今年去年两年的数据
+      let req
+      let yesReq
+      if (this.serviceInfo.SERVERPART_NAME === '安徽驿达') {
+        req = {
+          ProvinceCode: '340000',
+          StatisticsDate: y,
+          StatisticsType: 1,
+        }
+      } else {
+        req = {
+          ProvinceCode: '340000',
+          StatisticsDate: y,
+          StatisticsType: 1,
+          ServerpartId: this.serviceInfo.Serverpart_ID || ''
+        }
+      }
+      if (this.serviceInfo.SERVERPART_NAME === '安徽驿达') {
+        yesReq = {
+          ProvinceCode: '340000',
+          StatisticsDate: y - 1,
+          StatisticsType: 1,
+        }
+      } else {
+        yesReq = {
+          ProvinceCode: '340000',
+          StatisticsDate: y - 1,
+          StatisticsType: 1,
+          ServerpartId: this.serviceInfo.Serverpart_ID || ''
+        }
+      }
+
+      const data = await request.$webGet('CommercialApi/Revenue/GetRevenueTrend', req)
+      const yesData = await request.$webGet('CommercialApi/Revenue/GetRevenueTrend', yesReq)
+      let list = []
+      let max = 0
+      data.Result_Data.List.forEach(item => {
+        item.value = Number((item.value / 10000).toFixed(1))
+        if (Number(item.value) > max) {
+          max = Number(item.value)
+        }
+        list.push(item.value)
+      })
+      let yesList = []
+      yesData.Result_Data.List.forEach(item => {
+        item.value = Number((item.value / 10000).toFixed(1))
+        yesList.push(item.value)
+      })
+      let res = {
+        categories: ["1月", "2月", "3月", "4月", "5月", "6月", "7月", "8月", "9月", "10月", "11月", "12月"],
+        series: [{
+          name: "今年",
+          data: list
+        }, {
+          name: "去年",
+          data: yesList
+        }],
+        max: max
+      }
+      // let res={
+      //     categories: ["1月","2月","3月","4月","5月","6月","7月","8月","9月","10月","11月","12月"],
+      //     series:[{
+      //         name: "",
+      //         data: [3,4,5,4.8,5,4.2,4.5,5,5.5,5.7,8,9]
+      //     }]
+      // }
+      this.trendsList = res
+    },
+    async getRevenueType() {
+      const date = new Date(this.time)
+      let y = date.getFullYear()
+      let m = date.getMonth() + 1
+      if (m < 10) {
+        m = '0' + m
+      }
+      const req = {
+        pushProvinceCode: '340000',
+        Statistics_StartDate: `${y}-${m}-01`,
+        Statistics_Date: this.time,
+        Serverpart_ID: this.serviceInfo.SERVERPART_NAME === '安徽驿达' ? null : this.serviceInfo.Serverpart_ID
+      }
+      const data = await request.$webGet('CommercialApi/Revenue/GetSummaryRevenue', req)
+      let all = 0
+      if (data.Result_Data && data.Result_Data.BusinessTypeList && data.Result_Data.BusinessTypeList.length > 0) {
+        data.Result_Data.BusinessTypeList.forEach(item => {
+          all += Number(item.value)
+        })
+        data.Result_Data.BusinessTypeList.forEach(item => {
+          item.rate = ((Number(item.value) / all) * 100).toFixed(2)
+        })
+        let res = {
+          own: data.Result_Data.BusinessTypeList[1].rate,
+          ectocyst: data.Result_Data.BusinessTypeList[0].rate
+        }
+        this.revenueType = res
+      } else {
+        this.revenueType = null
+      }
+    },
+    monthYearPlan() {
+      const monthDate = {
+        Province_Code: '340000',
+        Serverpart_ID: this.serviceInfo.SERVERPART_NAME === '安徽驿达' ? null : this.serviceInfo.Serverpart_ID,
+        Statistics_Date: this.time
+      }
+      request.$webGet('CommercialApi/Revenue/GetRevenueBudget', monthDate).then(res => {
+        // 赋值给data中的这个对象 在请求完之后会进行统一的数据处理
+        this.plan = res.Result_Data
+        if (this.plan) {
+          if (this.plan && this.plan.RevenueMonth_Amount) {
+            this.plan.percentageMonth = (res.Result_Data.RevenueMonth_Amount / res.Result_Data.BudgetMonth_Amount * 100).toFixed(2)
+          }
+          if (this.plan && this.plan.RevenueYear_Amount) {
+            this.plan.percentageYear = (res.Result_Data.RevenueYear_Amount / res.Result_Data.BudgetYear_Amount * 100).toFixed(2)
+          }
+          // this.plan.percentageMonth = 80
+          // let date = new Date(this.time)
+          // let nowDay = date.getDate()
+          // let day = this.$util.getThisMonthDay(this.time)
+          // //一天应该的增长率
+          // let oneDay = 100/day
+          // // 到了当天的应该有的百分比
+          // let thisDayShould= oneDay*nowDay
+          // 由于显示的时候 正负号由图片表示 所以要区绝对值展现在页面上
+          this.monthAdd = Math.abs(this.plan.MonthGrowth_Rate)
+          this.yearAdd = Math.abs(this.plan.YearGrowth_Rate)
+          //处理数据 保留小数
+          this.plan.RevenueMonth_Amount = this.$util.fmoney(res.Result_Data.RevenueMonth_Amount)
+          this.plan.BudgetMonth_Amount = this.$util.fmoney(res.Result_Data.BudgetMonth_Amount)
+          this.plan.RevenueYear_Amount = this.$util.fmoney(res.Result_Data.RevenueYear_Amount)
+          this.plan.BudgetYear_Amount = this.$util.fmoney(res.Result_Data.BudgetYear_Amount)
+        }
+      })
+    }
+  }
 }
 </script>
 
@@ -886,385 +966,495 @@ export default {
 .main {
   width: 100vw;
   height: 100vh;
-    .charts{
+
+  .charts {
+    width: 100%;
+    box-sizing: border-box;
+    padding: 28px 16px 24px;
+    background: #fff;
+
+    .chartsItem {
+      .titleTop {
+        display: flex;
+        align-items: center;
+        position: relative;
+
+        .title {
+          font-size: 32rpx;
+          font-family: PingFangSC-Semibold, PingFang SC;
+          font-weight: 600;
+          color: #160002;
+          line-height: 44rpx;
+
+        }
+
+        .time {
+          // margin-bottom: 4px;
+
+          .thisTime {
+            font-size: 14px;
+            font-family: PingFangSC-Semibold, PingFang SC;
+            font-weight: 500;
+            color: #160002;
+          }
+
+          .select {
+            margin-left: 8px;
+            display: inline-block;
+
+            .time {
+              display: flex;
+              align-items: center;
+              // margin-right: 4px;
+              border-radius: 28rpx;
+              padding: 12rpx 16rpx;
+              background: #E9EFFF;
+
+              .day {
+                font-size: 32rpx;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #782717;
+                line-height: 44rpx;
+                margin-right: 4px;
+              }
+
+              .uni-input {
+                font-size: 14px;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #9f74f7;
+                line-height: 36rpx;
+              }
+
+              .icon {
+                width: 24px;
+                height: 16px;
+              }
+            }
+          }
+        }
+
+        .question {
+          width: 16px;
+          height: 16px;
+          margin-left: 4px;
+          display: flex;
+          align-items: center;
+
+          image {
+            width: 100%;
+            height: 100%;
+          }
+        }
+
+        .titleTopNotice {
+          position: absolute;
+          padding: 12px;
+          left: 35%;
+          width: 50vw;
+          background: #FFFFFF;
+          box-shadow: 0 10px 10px 0 rgba(22, 0, 2, 0.1);
+        }
+
+        .meng {
+          width: 100vw;
+          height: 100vh;
+          position: fixed;
+          top: 0;
+          left: 0;
+        }
+      }
+
+      .title {
+        font-size: 17px;
+        font-family: PingFangSC-Semibold, PingFang SC;
+        font-weight: 600;
+        color: #160002;
+        line-height: 24px;
+
+        .unit {
+          font-size: 14px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #786B6C;
+          line-height: 20px;
+          margin-left: 4px;
+        }
+
+        .dateText {
+          display: inline-block;
+          margin-left: 16rpx;
+          font-size: 14px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #A69E9F;
+        }
+      }
+
+      .progress {
+        width: calc(100vw - 32px);
+        margin-top: 12px;
+
+        .top {
+          display: flex;
+          align-items: center;
+          justify-content: space-between;
+
+          .left,
+          .right {
+            display: flex;
+            align-items: center;
+
+            .title {
+              font-size: 14px;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: #160002;
+            }
+
+            .value {
+              font-size: 18px;
+              font-family: DINAlternate-Bold, DINAlternate;
+              font-weight: bold;
+              color: #160002;
+            }
+          }
+        }
+
+        .bottom {
+          width: 100%;
+          height: 14px;
+          position: relative;
+
+          .first {
+            height: 100%;
+            position: absolute;
+            left: 0;
+            top: 0;
+            background: #1E80FF;
+            border-radius: 2px 0 0 2px;
+          }
+
+          .first:after {
+            position: absolute;
+            content: '';
+            right: 0;
+            top: 0;
+            background: #fff;
+            width: 1px;
+            height: 100%;
+            z-index: 111;
+          }
+
+          .second {
+            height: 100%;
+            position: absolute;
+            right: 0;
+            top: 0;
+            background: #00C2FF;
+            border-radius: 0 2px 2px 0;
+          }
+
+          .second:before {
+            position: absolute;
+            content: '';
+            left: 0;
+            top: 0;
+            background: #fff;
+            width: 1px;
+            height: 100%;
+            z-index: 111;
+          }
+        }
+      }
+
+      .box {
         width: 100%;
+        padding: 12px 16px;
         box-sizing: border-box;
-        padding: 28px 16px 24px;
-        background: #fff;
-        .chartsItem{
-            .titleTop{
+        border-radius: 8px;
+        background: #f5f2f2;
+        margin-top: 12px;
+
+        .top {
+          width: 100%;
+          display: flex;
+
+          .big {
+            width: 40px;
+            height: 40px;
+            background: #ffffff;
+            border-radius: 8px;
+            border: 1px solid #ebebeb;
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            margin-right: 8px;
+
+            .icon {
+              width: 20px;
+              height: 20px;
+            }
+          }
+
+          .text {
+            width: calc(100% - 60px);
+            padding: 2px 0;
+
+            .textTop {
+              display: flex;
+              align-items: center;
+              justify-content: space-between;
+
+              .left {
                 display: flex;
                 align-items: center;
-                position: relative;
-                .title {
-                    font-size: 32rpx;
-                    font-family: PingFangSC-Semibold, PingFang SC;
-                    font-weight: 600;
-                    color: #160002;
-                    line-height: 44rpx;
 
+                .number {
+                  font-size: 36rpx;
+                  font-family: DINAlternate-Bold, DINAlternate;
+                  font-weight: bold;
+                  color: #150002;
+                  line-height: 40rpx;
                 }
-                .question{
-                    width: 16px;
-                    height: 16px;
-                    margin-left: 4px;
-                    display: flex;
-                    align-items: center;
-                    image{
-                        width: 100%;
-                        height: 100%;
-                    }
-                }
-                .titleTopNotice{
-                    position: absolute;
-                    padding: 12px;
-                    left:35%;
-                    width: 50vw;
-                    background: #FFFFFF;
-                    box-shadow: 0 10px 10px 0 rgba(22,0,2,0.1);
-                }
-                .meng{
-                    width: 100vw;
-                    height: 100vh;
-                    position: fixed;
-                    top: 0;left: 0;
-                }
-            }
-            .title{
-                font-size: 17px;
-                font-family: PingFangSC-Semibold, PingFang SC;
-                font-weight: 600;
-                color: #160002;
-                line-height: 24px;
-                .unit{
-                    font-size: 14px;
-                    font-family: PingFangSC-Regular, PingFang SC;
-                    font-weight: 400;
-                    color: #786B6C;
-                    line-height: 20px;
-                    margin-left: 4px;
-                }
-                .dateText{
-                  display: inline-block;
-                  margin-left: 16rpx;
+
+                .desc {
+                  display: flex;
+                  align-items: center;
+                  margin-left: 8px;
                   font-size: 14px;
+                  color: #FF7043;
+
+                  .success {
+                    width: 20px;
+                    height: 20px;
+                    margin-right: 4px;
+                  }
+                }
+              }
+
+              .right {
+                flex: 1;
+                display: flex;
+                justify-content: flex-end;
+                align-items: center;
+
+                .comparePlan {
+                  font-size: 24rpx;
                   font-family: PingFangSC-Regular, PingFang SC;
                   font-weight: 400;
-                  color: #A69E9F;
+                  color: #a69e9f;
+                  line-height: 36rpx;
+                  white-space: nowrap;
                 }
-            }
-            .progress{
-                width:calc(100vw - 32px);
-                margin-top: 12px;
-                .top{
-                    display: flex;
-                    align-items: center;
-                    justify-content: space-between;
-                    .left,.right{
-                        display: flex;
-                        align-items: center;
-                        .title{
-                            font-size: 14px;
-                            font-family: PingFangSC-Regular, PingFang SC;
-                            font-weight: 400;
-                            color: #160002;
-                        }
-                        .value{
-                            font-size: 18px;
-                            font-family: DINAlternate-Bold, DINAlternate;
-                            font-weight: bold;
-                            color: #160002;
-                        }
-                    }
-                }
-                .bottom{
-                    width: 100%;
-                    height: 14px;
-                    position: relative;
-                    .first{
-                        height: 100%;
-                        position: absolute;
-                        left: 0;top: 0;
-                        background: #1E80FF;
-                        border-radius: 2px 0  0  2px;
-                    }
-                    .first:after{
-                        position: absolute;
-                        content:'';
-                        right: 0;top: 0;
-                        background: #fff;
-                        width: 1px;
-                        height: 100%;
-                        z-index:111;
-                    }
-                    .second{
-                        height: 100%;
-                        position: absolute;
-                        right: 0;top: 0;
-                        background: #00C2FF;
-                        border-radius: 0 2px 2px 0  ;
-                    }
-                    .second:before{
-                        position: absolute;
-                        content:'';
-                        left: 0;top: 0;
-                        background: #fff;
-                        width: 1px;
-                        height: 100%;
-                        z-index:111;
-                    }
-                }
-            }
-            .box {
-                width: 100%;
-                padding: 12px 16px;
-                box-sizing: border-box;
-                border-radius: 8px;
-                background: #f5f2f2;
-                margin-top: 12px;
-                .top {
-                    width: 100%;
-                    display: flex;
-                    .big {
-                        width: 40px;
-                        height: 40px;
-                        background: #ffffff;
-                        border-radius: 8px;
-                        border: 1px solid #ebebeb;
-                        display: flex;
-                        justify-content: center;
-                        align-items: center;
-                        margin-right: 8px;
-                        .icon {
-                            width: 20px;
-                            height: 20px;
-                        }
-                    }
-                    .text {
-                        width: calc(100% - 60px);
-                        padding: 2px 0;
-                        .textTop{
-                            display: flex;
-                            align-items: center;
-                            justify-content: space-between;
-                            .left{
-                                display: flex;
-                                align-items: center;
-                                .number {
-                                    font-size: 36rpx;
-                                    font-family: DINAlternate-Bold, DINAlternate;
-                                    font-weight: bold;
-                                    color: #150002;
-                                    line-height: 40rpx;
-                                }
-                                .desc{
-                                    display: flex;
-                                    align-items: center;
-                                    margin-left: 8px;
-                                    font-size: 14px;
-                                    color: #FF7043;
-                                    .success{
-                                        width: 20px;
-                                        height: 20px;
-                                        margin-right: 4px;
-                                    }
-                                }
-                            }
-                            .right{
-                                flex: 1;
-                                display: flex;
-                                justify-content: flex-end;
-                                align-items: center;
-                                .comparePlan{
-                                    font-size: 24rpx;
-                                    font-family: PingFangSC-Regular, PingFang SC;
-                                    font-weight: 400;
-                                    color: #a69e9f;
-                                    line-height: 36rpx;
-                                    white-space: nowrap;
-                                }
-                                .box2{
-                                    display: flex;
-                                    align-items: center;
-                                    .text{
-                                        font-size: 14px;
-                                        font-family: DINAlternate-Bold, DINAlternate;
-                                        color: #150002;
-                                        font-weight: bold;
 
-                                        line-height: 40rpx;
-                                    }
-                                    .addIcon {
-                                        width: 16px;
-                                        height: 16px;
-                                        margin-right: 2px;
-                                    }
-                                }
-                            }
-                        }
+                .box2 {
+                  display: flex;
+                  align-items: center;
 
-                        .progressPlan{
-                            width: 100%;
-                            height: 8px;
-                            border-radius: 5px;
-                            background: #fff;
-                            margin-top: 8px;
-                            position: relative;
-                            overflow: hidden;
-                            .trans{
-                                height: 8px;
-                                position: absolute;
-                                left: 0;top: 0;
-                                border-top-right-radius: 4px;
-                                border-bottom-right-radius: 4px;
-                                background: url("https://eshangtech.com/ShopICO/ahyd-BID/index/progress_orange.png")no-repeat 100% 100%;
-                            }
-                            .transYear{
-                                height: 8px;
-                                position: absolute;
-                                left: 0;top: 0;
-                                border-top-right-radius: 4px;
-                                border-bottom-right-radius: 4px;
-                                background: url("https://eshangtech.com/ShopICO/ahyd-BID/index/progress_blue.png")no-repeat 100% 100%;
-                            }
-                            //.img{
-                            //  width: 100%;
-                            //  height: 100%;
-                            //  position: absolute;
-                            //  top: 0;
-                            //  left: 0;
-                            //  z-index:1;
-                            //}
-                            //.pro{
-                            //  height: 100%;
-                            //  position: absolute;
-                            //  top: 0;right: 0;
-                            //  background: #fff;
-                            //  z-index:2;
-                            //}
-
-                        }
-                    }
-                }
-                .bottom {
-                    display: flex;
-                    margin-top: 16px;
-                    padding-left: 48px;
-                    .success {
-                        .text {
-                            font-size: 28rpx;
-                            font-family: PingFangSC-Regular, PingFang SC;
-                            font-weight: 400;
-                            color: #786b6c;
-                            line-height: 40rpx;
-                            margin-bottom: 2px;
-                            .unit {
-                                font-size: 28rpx;
-                                font-family: PingFangSC-Regular, PingFang SC;
-                                font-weight: 400;
-                                color: #a69e9f;
-                                line-height: 40rpx;
-                                margin-left: 2px;
-                            }
-                        }
-                        .money {
-                            font-size: 28rpx;
-                            font-family: DINAlternate-Bold, DINAlternate;
-                            font-weight: 600;
-                            color: #160002;
-                            line-height: 40rpx;
-                        }
-                    }
-                }
-            }
-            .tab{
-                width: 100%;
-                height: 38px;
-                background: #F2F1F1;
-                border-radius: 4px;
-                box-sizing: border-box;
-                padding:4px;
-                display: flex;
-                align-items: center;
-                margin-bottom: 12px;
-                margin-top: 12px;
-                .tabItem{
-                    display: flex;
-                    justify-content: center;
-                    align-items: center;
-                    width: calc(100% / 3);
-                    height: 30px;
-                    border-radius: 4px;
+                  .text {
                     font-size: 14px;
-                    font-family: PingFangSC-Regular, PingFang SC;
-                    font-weight: 400;
-                    color: #786B6C;
-                }
-                .tabItemActive{
-                  color: #160002;
-                    background: #FFFFFF;
+                    font-family: DINAlternate-Bold, DINAlternate;
+                    color: #150002;
+                    font-weight: bold;
+
+                    line-height: 40rpx;
+                  }
+
+                  .addIcon {
+                    width: 16px;
+                    height: 16px;
+                    margin-right: 2px;
+                  }
                 }
+              }
             }
-            .subItem{
-                width:100%;
-                .title{
-                    font-size: 14px;
-                    font-family: PingFangSC-Semibold, PingFang SC;
-                    font-weight: 600;
-                    color: #160002;
-                    line-height: 20px;
-                    margin-bottom: 8px;
-                }
-                .money{
-                    width:calc(100% - 32px);
-                    padding: 18px 16px;
-                    background: #F7F7F7;
-                    border-radius: 4px;
-                    .top{
-                        display: flex;
-                        align-items: center;
-                        margin-bottom: 4px;
-                        .icon{
-                            width: 20px;
-                            height: 20px;
-                            margin-right: 8px;
-                        }
-                        .sumMoney{
-                            font-size: 20px;
-                            font-family: DINAlternate-Bold, DINAlternate;
-                            font-weight: bold;
-                            color: #341D00;
-                            line-height: 24px;
-                        }
-                    }
-                    .bottom{
-                        display: flex;
-                        align-items: center;
-                        margin-left: 24px;
-                        .icon{
-                            width: 14px;
-                            height: 14px;
-                            margin-right: 4px;
-                        }
-                        .add{
-                            font-size: 14px;
-                            font-family: PingFangSC-Regular, PingFang SC;
-                            font-weight: 400;
-                            color: #FA5151;
-                            line-height: 20px;
-                            margin-right: 4px;
-                        }
-                        .text{
-                            font-size: 14px;
-                            font-family: PingFangSC-Regular, PingFang SC;
-                            font-weight: 400;
-                            color: #A69E9F;
-                            line-height: 20px;
-                        }
-                    }
-                }
+
+            .progressPlan {
+              width: 100%;
+              height: 8px;
+              border-radius: 5px;
+              background: #fff;
+              margin-top: 8px;
+              position: relative;
+              overflow: hidden;
+
+              .trans {
+                height: 8px;
+                position: absolute;
+                left: 0;
+                top: 0;
+                border-top-right-radius: 4px;
+                border-bottom-right-radius: 4px;
+                background: url("https://eshangtech.com/ShopICO/ahyd-BID/index/progress_orange.png")no-repeat 100% 100%;
+              }
+
+              .transYear {
+                height: 8px;
+                position: absolute;
+                left: 0;
+                top: 0;
+                border-top-right-radius: 4px;
+                border-bottom-right-radius: 4px;
+                background: url("https://eshangtech.com/ShopICO/ahyd-BID/index/progress_blue.png")no-repeat 100% 100%;
+              }
+
+              //.img{
+              //  width: 100%;
+              //  height: 100%;
+              //  position: absolute;
+              //  top: 0;
+              //  left: 0;
+              //  z-index:1;
+              //}
+              //.pro{
+              //  height: 100%;
+              //  position: absolute;
+              //  top: 0;right: 0;
+              //  background: #fff;
+              //  z-index:2;
+              //}
+
             }
+          }
         }
+
+        .bottom {
+          display: flex;
+          margin-top: 16px;
+          padding-left: 48px;
+
+          .success {
+            .text {
+              font-size: 28rpx;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: #786b6c;
+              line-height: 40rpx;
+              margin-bottom: 2px;
+
+              .unit {
+                font-size: 28rpx;
+                font-family: PingFangSC-Regular, PingFang SC;
+                font-weight: 400;
+                color: #a69e9f;
+                line-height: 40rpx;
+                margin-left: 2px;
+              }
+            }
+
+            .money {
+              font-size: 28rpx;
+              font-family: DINAlternate-Bold, DINAlternate;
+              font-weight: 600;
+              color: #160002;
+              line-height: 40rpx;
+            }
+          }
+        }
+      }
+
+      .tab {
+        width: 100%;
+        height: 38px;
+        background: #F2F1F1;
+        border-radius: 4px;
+        box-sizing: border-box;
+        padding: 4px;
+        display: flex;
+        align-items: center;
+        margin-bottom: 12px;
+        margin-top: 12px;
+
+        .tabItem {
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          width: calc(100% / 3);
+          height: 30px;
+          border-radius: 4px;
+          font-size: 14px;
+          font-family: PingFangSC-Regular, PingFang SC;
+          font-weight: 400;
+          color: #786B6C;
+        }
+
+        .tabItemActive {
+          color: #160002;
+          background: #FFFFFF;
+        }
+      }
+
+      .subItem {
+        width: 100%;
+
+        .title {
+          font-size: 14px;
+          font-family: PingFangSC-Semibold, PingFang SC;
+          font-weight: 600;
+          color: #160002;
+          line-height: 20px;
+          margin-bottom: 8px;
+        }
+
+        .money {
+          width: calc(100% - 32px);
+          padding: 18px 16px;
+          background: #F7F7F7;
+          border-radius: 4px;
+
+          .top {
+            display: flex;
+            align-items: center;
+            margin-bottom: 4px;
+
+            .icon {
+              width: 20px;
+              height: 20px;
+              margin-right: 8px;
+            }
+
+            .sumMoney {
+              font-size: 20px;
+              font-family: DINAlternate-Bold, DINAlternate;
+              font-weight: bold;
+              color: #341D00;
+              line-height: 24px;
+            }
+          }
+
+          .bottom {
+            display: flex;
+            align-items: center;
+            margin-left: 24px;
+
+            .icon {
+              width: 14px;
+              height: 14px;
+              margin-right: 4px;
+            }
+
+            .add {
+              font-size: 14px;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: #FA5151;
+              line-height: 20px;
+              margin-right: 4px;
+            }
+
+            .text {
+              font-size: 14px;
+              font-family: PingFangSC-Regular, PingFang SC;
+              font-weight: 400;
+              color: #A69E9F;
+              line-height: 20px;
+            }
+          }
+        }
+      }
     }
+  }
 }
 </style>