diff --git a/pages/index/index.vue b/pages/index/index.vue
index 207f844..36c3780 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -28,10 +28,10 @@
 <!--      ,height:loadMore?'200px':'38px'-->
       <div class="storeDetail"  :style="{ top: menu.bottom + 13 + 'px',left:0 + 'px'}">
         <swiper class="detailBox" previous-margin="40rpx" next-margin="20rpx" :style="{height: loadMore?`1290rpx`:`770rpx`}"  @change="handleChangeSelect" :current="selectDetail">
-          <block v-for="(item,index) in nowMonth" :key="index">
-            <swiper-item :item-id="index" :data-item-id="index" :class="selectMonth===index+1?'detailItemBox':'noSelectItemBox'">
-              <view class="box" :style="{height: loadMore?selectMonth===index+1 ?`1290rpx`:'770rpx':selectMonth===index+1?`770rpx`:'456rpx',background:0<=index && index<=2?'#FEB39F':3<=index && index<=5?'#8AC9EA':6<=index && index<=8?'#93B2EF':'#DDB795'}">
-                <view  class="top" :style="{background:0<=index && index<=2?'linear-gradient(135deg, #FFE5CA 0%, #FFFFFF 29%, #FFFFFF 69%, #FFDCD5 100%)':3<=index && index<=5?'linear-gradient(135deg, #D4F7FF 0%, #FFFFFF 29%, #FFFFFF 69%, #CEECFF 100%)':6<=index && index<=8?'linear-gradient(135deg, #D5E8FF 0%, #FFFFFF 29%, #FFFFFF 69%, #D3E0FF 100%)':'linear-gradient(135deg, #FEEBD1 0%, #FFFFFF 29%, #FFFFFF 69%, #FFE7D4 100%)'}">
+          <block v-for="(item,index) in swiperList" :key="index">
+            <swiper-item :item-id="index" :data-item-id="index" :class="selectMonth === index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)?'detailItemBox':'noSelectItemBox'">
+              <view class="box" :style="{height: loadMore?selectMonth===index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)?`1290rpx`:'770rpx':selectMonth===index+1|| selectMonth === ((index+1)%12===0?12:(index+1)%12)?`770rpx`:'456rpx',background:(1<=(index+1) || 1<=((index + 1)%12===0?12:(index + 1)%12)) && ((index+1)<=3 || ((index+1)%12===0?12:(index+1)%12)<=3)?'#FEB39F':(4<=(index+1) || 4<=((index+1)%12===0?12:(index+1)%12)) && ((index+1)<=6 || ((index+1)%12===0?12:(index+1)%12)<=6)?'#8AC9EA':(7<=(index+1) || 7<=((index+1)%12===0?12:(index+1)%12)) && ((index+1)<=9 || ((index+1)%12===0?12:(index+1)%12)<=9)?'#93B2EF':'#DDB795'}">
+                <view  class="top" :style="{background:(1<=(index+1) || 1<=((index + 1)%12===0?12:(index + 1)%12)) && ((index+1)<=3 || ((index+1)%12===0?12:(index+1)%12)<=3)?'linear-gradient(135deg, #FFE5CA 0%, #FFFFFF 29%, #FFFFFF 69%, #FFDCD5 100%)':(4<=(index+1) || 4<=((index+1)%12===0?12:(index+1)%12)) && ((index+1)<=6 || ((index+1)%12===0?12:(index+1)%12)<=6)?'linear-gradient(135deg, #D4F7FF 0%, #FFFFFF 29%, #FFFFFF 69%, #CEECFF 100%)':(7<=(index+1) || 7<=((index+1)%12===0?12:(index+1)%12)) && ((index+1)<=9 || ((index+1)%12===0?12:(index+1)%12)<=9)?'linear-gradient(135deg, #D5E8FF 0%, #FFFFFF 29%, #FFFFFF 69%, #D3E0FF 100%)':'linear-gradient(135deg, #FEEBD1 0%, #FFFFFF 29%, #FFFFFF 69%, #FFE7D4 100%)'}">
                   <view style="display: inline-block" @click="goToRevenueStatic">
                     <view class="statistics">
                       <image class="staticImg" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stStaticIcon.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stStaticIcon.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stStaticIcon.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stStaticIcon.svg'"/>
@@ -39,7 +39,7 @@
                       <image class="staticIcon" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stStaticMore.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stStaticMore.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stStaticMore.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stStaticMore.svg'"/>
                     </view>
                   </view>
-                  <view class="revenueBox" v-show="selectMonth===index+1">
+                  <view class="revenueBox" v-show="selectMonth===index+1 || selectMonth === ((index+1)%12===0?12:(index+1)%12)">
                     <view class="revenueTop">
                       <view class="revenueTopLeft">
                         <text class="revenueNumber">{{showTableData.CashPayChange?showTableData.CashPayChange:'0.00'}}</text>
@@ -61,7 +61,6 @@
                       <text class="leftNav">{{selectMonth}}月对客营收<text class="unit">/万元</text></text>
                       <text class="rightNav">同比</text>
                     </view>
-
                     <view class="newBox">
                       <view class="progress" @click="handleShowHaveNoticeBox" :style="{background:1<=selectMonth && selectMonth<=3?'#FFAB30':4<=selectMonth && selectMonth<=6?'#5DC1E0':7<=selectMonth && selectMonth<=9?'#7CADF8':'#DCA858'}">
                         <view class="have"  :style="{width:progressObj.owner+'%',background:1<=selectMonth && selectMonth<=3?'#DB573B':4<=selectMonth && selectMonth<=6?'#137BBD':7<=selectMonth && selectMonth<=9?'#3663CB':'#A66A37'}"></view>
@@ -125,7 +124,7 @@
                       </view>
                     </view>
                   </view>
-                  <view class="revenueBox" v-show="selectMonth!==index+1">
+                  <view class="revenueBox" v-show="selectMonth!==index+1 && selectMonth !== ((index+1)%12===0?12:(index+1)%12)">
                     <view class="revenueTop">
                       <view class="revenueTopLeft">
                         <text class="revenueNumber">-</text>
@@ -185,7 +184,7 @@
                     </view>
                   </view>
                 </view>
-                <view class="bottom" v-if="!loadMore" @click="handleChangeLoadMore" :style="{background:0<=index && index<=2?'#FEB39F':3<=index && index<=5?'#8AC9EA':6<=index && index<=8?'#93B2EF':'#DDB795'}">
+                <view class="bottom" v-if="!loadMore" @click="handleChangeLoadMore" :style="{background:(1<=(index+1) || 1<=((index+1)%12===0?12:(index+1)%12)) && ((index+1)<=3 || ((index+1)%12===0?12:(index+1)%12)<=3)?'#FEB39F':(4<=(index+1) || 4<=((index+1)%12===0?12:(index+1)%12)) && ((index+1)<=6 || ((index+1)%12===0?12:(index+1)%12)<=6)?'#8AC9EA':(7<=(index+1) || 7<=((index+1)%12===0?12:(index+1)%12)) && ((index+1)<=9 || ((index+1)%12===0?12:(index+1)%12)<=9)?'#93B2EF':'#DDB795'}">
                   <text class="searchText">查看更多</text>
                   <image class="searchIcon" :style="{height:'16px',transform: loadMore?'rotate(180deg)':''}" :src="1<=selectMonth && selectMonth<=3?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/1stUp.svg':4<=selectMonth && selectMonth<=6?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/2stUp.svg':7<=selectMonth && selectMonth<=9?'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/3stUp.svg':'https://eshangtech.com/ShopICO/ahyd-BID/newIndex/4stUp.svg'"/>
                 </view>
@@ -329,7 +328,7 @@
                 <div class="noShowMoreBox" @click="handleChangeLoadMore" >
                   <image v-if="loadMore" class="noShowMore" src="https://eshangtech.com/ShopICO/ahyd-BID/home/downLoad.svg"/>
                 </div>
-                <view class="monthBox" >{{index+1}}月</view>
+                <view class="monthBox" >{{index>11?(index+1)%12===0?12:(index+1)%12:index+1}}月</view>
               </view>
             </swiper-item>
           </block>
@@ -339,7 +338,7 @@
 
     <view class="funEntry">
       <span @click="handleGoProject">111</span>
-<!--      五个有背景的导航栏-->
+<!--      八个有背景的导航栏-->
       <view class="funBox">
         <view class="firstBox">
           <view class="yesterday" @click="handlePage">
@@ -821,6 +820,7 @@ export default {
   components: {RateCharts, MonthCharts, Tabbar,uniPopup},
   data() {
     const lastDay = this.$util.cutDate(new Date(), 'YYYY-MM-DD', -1)
+    // const lastDay = '2025-01-01'
     const nowDay = this.$util.cutDate(new Date(), 'MM月DD日')
     return {
       statusBarHeight:'',// 每个手机的状态栏高度
@@ -909,6 +909,7 @@ export default {
       warningList:[],// 预警列表
       selectDetail:0,// 选中的统计标签
       nowMonth:0,// 当前的月份
+      swiperList:[],// 滑动块有多少项
       selectMonth:0,//选择的月份
       useInfo:{},//用户信息
       showRealBox:false,// 是否显示对客营收的完整数据
@@ -1029,6 +1030,7 @@ export default {
      // setTimeout(()=>{
      //   _this.moneyRateList = [0,0]
      // },3000)
+
      // 顶部显示的时间
      this.single = timestampToTimeMonth((new Date(this.lastDay).getTime()))
      // 获取手机参数对页面进行适配 主要是用于拿到胶囊的位置
@@ -1039,15 +1041,45 @@ export default {
      // 拿到用户手机的宽 用设计图的宽高比去设定上半部的高度
      this.phoneWidth = systemInfo.windowWidth
      // 拿到昨天的时间戳
+     // 当年份不是2023 要判断有多少个可以滑动的项
+     console.log('this.lastDay',this.lastDay)
      const date = new Date(this.lastDay)
+     let y = date.getFullYear()
+     let m = date.getMonth() + 1
+     let sum = 0
+     let swiperList = []
+     if (2023-y<0){
+       sum = 12 * (y - 2023) + m
+       console.log('sum',sum)
+       for (let i=0;i<sum;i++){
+         if (i<=11){
+           swiperList.push({key:i})
+         }else{
+           let currentNumber = Math.floor(i/12)
+           let currentM = i%12
+           swiperList.push({key: 12*currentNumber + currentM})
+         }
+       }
+     }else{
+       sum = m
+       for (let i=1;i<=sum;i++){
+         swiperList.push({key:`2023${i<10?'0'+i:i}`})
+       }
+     }
+     console.log('sum',sum)
+     console.log('swiperList',swiperList)
+     this.swiperList = swiperList
+     // 顶部卡片滚动的第几个
+     this.selectDetail = this.handleGetSwiperIndex(this.lastDay)
+     console.log('this.selectDetail',this.selectDetail)
      // 拿到选择日期的月份
      this.nowMonth = date.getMonth() + 1
      // 默认选择的月份
      this.selectMonth = date.getMonth() + 1
+     console.log('this.selectMonth',this.selectMonth)
      // 设置顶部时间选择器的开始时间 因为不能选去年数据 所以只能从当前日期的年份开始计算
      this.startDate = `${date.getFullYear()}-01`
-     // 顶部卡片滚动的第几个 月份减1 就是卡片的index
-     this.selectDetail = this.nowMonth - 1
+
      // 设置顶部选时间的显示 结束时间不能是大于等于今天
      this.endData = new Date()
      // 星期几
@@ -1616,23 +1648,22 @@ export default {
     handleChangeSelect(e){
       console.log('1')
       console.log('this.stopSwiper',this.stopSwiper)
+      console.log('e',e.detail.current)
       this.showRateChart = false
       if (!this.stopSwiper){
-        this.selectMonth = e.detail.current + 1
+        this.selectMonth = e.detail.current>11?(e.detail.current + 1)%12===0?12:(e.detail.current + 1)%12:e.detail.current + 1
         this.selectDetail = e.detail.current
+        console.log('this.selectMonth',this.selectMonth)
+        console.log('this.selectDetail',this.selectDetail)
+        let y = e.detail.current>11? Math.floor((e.detail.current + 1)%12===0?(e.detail.current + 1)/12-1:(e.detail.current + 1)/12) : 0
+        let m = e.detail.current>11?(e.detail.current + 1)%12===0?12:(e.detail.current + 1)%12:e.detail.current + 1
         const date = new Date(this.lastDay)
-        let y = date.getFullYear()
-        let m = e.detail.current + 1
-        if(m<10){
-          m='0'+m
-        }
-        this.single = `${y}-${m}`
-        let day
-        if (this.selectMonth === date.getMonth()+1){
-          day = date.getDate()<10?'0'+date.getDate():date.getDate()
-        }else{
-          day = this.$util.getThisMonthDay(this.single)
-        }
+        // let y = date.getFullYear()
+        // let m = e.detail.current + 1
+        // if(m<10){
+        //   m='0'+m
+        // }
+        this.single = `${2023+y}-${m}`
         this.showTableData = null
         // this.yesObj = null
         this.typeList = []
@@ -1643,14 +1674,14 @@ export default {
         // 月份详情卡片的详情
         this.initYesterdayData(this.selectMonth!==date.getMonth()+1)
         // 自营计划
-        this.monthYearPlan(`${y}-${m}-${day}`)
+        this.monthYearPlan()
         // 切换月份的车流量变化
         // 是当前月份传入日期 不是当前日期传入月份
         let carDate
         if (this.selectMonth === date.getMonth()+1){
           carDate = this.lastDay
         }else{
-          carDate = `${y}${m}`
+          carDate = `${2023+y}-${m}`
         }
         this.getCarInfo(carDate)
         // 切换考核的数据
@@ -1754,7 +1785,7 @@ export default {
       //   ShowCompareRate: true,
       //   ShowYearRevenue: true
       // }
-      const nowDate = new Date(this.lastDay)
+      const nowDate = new Date(this.single)
       let month = JSON.parse(JSON.stringify(this.selectMonth))
       if (month<10){
         month = '0'+ month
@@ -1762,24 +1793,30 @@ export default {
       let req
       if (type){
         if (nowDate.getMonth() + 1 === this.selectMonth ){
+          console.log('1')
           req = {
             pushProvinceCode:this.useInfo.userData.ProvinceCode || '340000',
             StatisticsMonth:`${nowDate.getFullYear()}${month}`,
             StatisticsDate:this.lastDay
           }
+          console.log('req',req)
         }else{
+          console.log('2')
           req = {
             pushProvinceCode:this.useInfo.userData.ProvinceCode || '340000',
             StatisticsMonth:`${nowDate.getFullYear()}${month}`,
             StatisticsDate:this.lastDay
           }
+          console.log('req',req)
         }
       }else{
+        console.log('3')
         req = {
           pushProvinceCode:this.useInfo.userData.ProvinceCode || '340000',
           StatisticsMonth:`${nowDate.getFullYear()}${month}`,
           StatisticsDate:type?null:this.lastDay
         }
+        console.log('req',req)
       }
       uni.showLoading({
         title: '正在加载...'
@@ -1973,8 +2010,22 @@ export default {
     handleSelectTab(value){
       this.selectTab = value
     },
+    // 根据当前时间 拿到滑块索引的办法
+    handleGetSwiperIndex(time){
+      const date = new Date(time)
+      let y = date.getFullYear()
+      let m = date.getMonth() + 1
+      if (y-2023>0){
+        let currentY = y - 2023
+        let currentM = m % 12===0?12:m % 12
+        return currentY*12 + currentM - 1
+      }else{
+        return m - 1
+      }
+    },
     // 顶部的时间组件切换时间触发的方法
     bindDateChange(e){
+
       this.showTableData = null
       // this.yesObj = null
       this.typeList = []
@@ -1987,8 +2038,10 @@ export default {
       this.stopSwiper = true
       let isOnRefresh = false
       const date = new Date(e.detail.value)
-      this.selectMonth = date.getMonth() + 1
-      this.selectDetail = date.getMonth()
+      let y = date.getFullYear()
+      let m = date.getMonth()+1
+      this.selectMonth = m + 1
+      this.selectDetail = this.handleGetSwiperIndex(e.detail.value)
       // this.stopSwiper = false
 
 
diff --git a/pages/revenue/incomeDetail.vue b/pages/revenue/incomeDetail.vue
index f2e8601..63e324c 100644
--- a/pages/revenue/incomeDetail.vue
+++ b/pages/revenue/incomeDetail.vue
@@ -37,19 +37,19 @@
                 <view class="noticeTitle">{{subItem.name}}</view>
                 <view class="noticeItem">
                   <span class="noticeLabel">本月预算:</span>
-                  <span class="noticeValue">{{subItem.budgetMonth||'-'}}万元</span>
+                  <span class="noticeValue">{{subItem.budgetMonth?$util.fmoney(subItem.budgetMonth,2):'-'}}万元</span>
                 </view>
                 <view class="noticeItem">
                   <span class="noticeLabel">本月执行:</span>
-                  <span class="noticeValue">{{subItem.monthExecute||'-'}}万元</span>
+                  <span class="noticeValue">{{subItem.monthExecute?$util.fmoney(subItem.monthExecute,2):'-'}}万元</span>
                 </view>
                 <view class="noticeItem">
                   <span class="noticeLabel">年度预算:</span>
-                  <span class="noticeValue">{{subItem.budgetYear||'-'}}万元</span>
+                  <span class="noticeValue">{{subItem.budgetYear?$util.fmoney(subItem.budgetYear,2):'-'}}万元</span>
                 </view>
                 <view class="noticeItem">
                   <span class="noticeLabel">累计执行:</span>
-                  <span class="noticeValue">{{subItem.accumulateExecute||'-'}}万元</span>
+                  <span class="noticeValue">{{subItem.accumulateExecute?$util.fmoney(subItem.accumulateExecute,2):'-'}}万元</span>
                 </view>
               </view>
             </view>
@@ -59,20 +59,20 @@
             <view class="progressBox">
               <view class="progressTop">
                 <span class="progressLabel">本月占比:</span>
-                <span class="progressValue">{{`${item.monthRate||'-'}%`}}</span>
+                <span class="progressValue">{{`${item.monthRate||'-'}`}}</span>
               </view>
               <view class="progress">
-                <view class="have" :style="{width:item.monthRate>100?'100%':`${item.monthRate}%`}"></view>
+                <view class="have" :style="{width:item.monthRate}"></view>
               </view>
             </view>
 
             <view class="progressBox" style="margin-top: 12px">
               <view class="progressTop">
                 <span class="progressLabel">累计完成进度占比:</span>
-                <span class="progressValue">{{`${item.accumulateRate||'-'}%`}}</span>
+                <span class="progressValue">{{`${item.accumulateRate||'-'}`}}</span>
               </view>
               <view class="progress">
-                <view class="have" :style="{width:item.accumulateRate>100?'100%':`${item.accumulateRate}%`}"></view>
+                <view class="have" :style="{width:item.accumulateRate>100?'100%':`${item.accumulateRate}`}"></view>
               </view>
             </view>
           </view>
@@ -86,11 +86,11 @@
               <view class="subItemBottom" v-if="subItem.monthRate || subItem.accumulateRate">
                 <view class="bottomItem">
                   <span v-if="subItem.monthRate" class="bottomLabel">本月占比:</span>
-                  <span v-if="subItem.monthRate" class="bottomValue">{{`${subItem.monthRate||'-'}%`}}</span>
+                  <span v-if="subItem.monthRate" class="bottomValue">{{`${subItem.monthRate||'-'}`}}</span>
                 </view>
                 <view class="bottomItem" style="text-align: right">
                   <span v-if="subItem.accumulateRate" class="bottomLabel">累计占比:</span>
-                  <span v-if="subItem.accumulateRate" class="bottomValue">{{`${subItem.accumulateRate||'-'}%`}}</span>
+                  <span v-if="subItem.accumulateRate" class="bottomValue">{{`${subItem.accumulateRate||'-'}`}}</span>
                 </view>
               </view>
             </view>
@@ -174,6 +174,7 @@ export default {
     handleChangePageTab(value){
       this.selectTab = value
       this.pageList = this.selectTab===1?this.pageData.supportList:this.pageData.otherList
+      console.log('this.pageList',this.pageList)
     },
     // 改变类型的方法
     handleChangeType(e){
@@ -207,13 +208,20 @@ export default {
       uni.showLoading({
         title:'正在加载'
       })
-      const req = {
-        Month:this.month
+      const date = new Date(this.single)
+      let y = date.getFullYear()
+      let m = date.getMonth() + 1
+      if (m<10){
+        m = '0'+m
       }
-      const data = await request.$webGet('EShangApiMain/Budget/GetbudgetProjectReportIn',req)
+      const req = {
+        Month:`${y}${m}`
+      }
+      const data = await request.$webGetTest('EShangApiMain/Budget/GetbudgetProjectReportInDynamic',req)
       console.log('data',data)
       this.pageData = data.Result_Data
       this.pageList = this.selectTab===1?data.Result_Data.supportList:data.Result_Data.otherList
+      console.log('this.pageList',this.pageList)
       uni.hideLoading()
     }
   }
@@ -384,7 +392,7 @@ export default {
             box-sizing: border-box;
             padding: 12rpx 0;
             display: block;
-            width: 300px;
+            width: 320px;
             box-shadow: 0rpx 4rpx 12rpx 0rpx rgba(166, 158, 159, 0.3);
             .noticeTitle{
               font-size: 28rpx;
@@ -396,7 +404,7 @@ export default {
             }
             .noticeItem{
               display: inline-block;
-              width: 140px;
+              width: 150px;
               color: #A69E9F;
               font-size: 12px;
               font-weight: 500;
diff --git a/pages/revenue/index.vue b/pages/revenue/index.vue
index 91b1bdb..7ef733e 100644
--- a/pages/revenue/index.vue
+++ b/pages/revenue/index.vue
@@ -62,14 +62,14 @@
                     <view class="successBox">
                       <view class="successBoxItem">
                         <!--                  <text class="successNumber">{{ pageDetail.monthAmount.ThisMonthIn?$util.fmoney(pageDetail.monthAmount.ThisMonthIn / 10000,2):'' }}</text>-->
-                        <text class="successNumber">{{ currentResult.thisMonthInCome||'-' }}</text>
+                        <text class="successNumber">{{ currentResult.thisMonthInCome?$util.fmoney(currentResult.thisMonthInCome,2):'-' }}</text>
                         <view class="successTime">本月收入
                           <text class="successUnit">/万元</text>
                         </view>
                       </view>
                       <view class="successBoxItem" style="margin-top: 12rpx">
                         <!--                  <text class="successNumber">{{ pageDetail.monthAmount.ThisMonthIn?$util.fmoney(pageDetail.monthAmount.ThisMonthIn / 10000,2):'' }}</text>-->
-                        <text class="successNumber">{{ currentResult.inComeThisYear||'-' }}</text>
+                        <text class="successNumber">{{ currentResult.inComeThisYear?$util.fmoney(currentResult.inComeThisYear,2):'-' }}</text>
                         <view class="successTime">累计收入
                           <text class="successUnit">/万元</text>
                         </view>
@@ -79,7 +79,7 @@
                         <!--                      `${pageDetail.monthAmount.IncomeChangeRate>0?'+':pageDetail.monthAmount.IncomeChangeRate<0?'-':''}${pageDetail.monthAmount.IncomeChangeRate||''}%`-->
                         <!--                    }}</text> -->
                         <text class="successNumber"  style="color: #E83944">{{
-                            `${currentResult.costYear||'-'}%`
+                            `${currentResult.inComeYear?$util.fmoney(currentResult.inComeYear,2):'-'}%`
                           }}</text>
                         <text class="successTime">收入同比</text>
                       </view>
@@ -102,7 +102,7 @@
                     <view class="successBox">
                       <view class="successBoxItem">
                         <!--                  <text class="successNumber">{{ $util.fmoney(pageDetail.monthAmount.ThisMonthOut/10000,2) }}</text>-->
-                        <text class="successNumber">{{ currentResult.thisMonthExpend || '-' }}</text>
+                        <text class="successNumber">{{ currentResult.thisMonthExpend?$util.fmoney(currentResult.thisMonthExpend,2):'-' }}</text>
                         <view class="successTime">
                           本月支出
                           <text class="successUnit">/万元</text>
@@ -110,7 +110,7 @@
                       </view>
                       <view class="successBoxItem" style="margin-top: 12rpx">
                         <!--                  <text class="successNumber">{{ $util.fmoney(pageDetail.monthAmount.ThisMonthOut/10000,2) }}</text>-->
-                        <text class="successNumber">{{ currentResult.expenditureThisYear || '-' }}</text>
+                        <text class="successNumber">{{ currentResult.expenditureThisYear?$util.fmoney(currentResult.expenditureThisYear,2):'-' }}</text>
                         <view class="successTime">
                           累计支出
                           <text class="successUnit">/万元</text>
@@ -121,7 +121,7 @@
                         <!--                      `${pageDetail.monthAmount.PayoutChangeRate>0?'+':pageDetail.monthAmount.PayoutChangeRate<0?'-':''}${pageDetail.monthAmount.PayoutChangeRate||''}%`-->
                         <!--                    }}</text>-->
                         <text class="successNumber" style="color: #E83944">{{
-                            `${currentResult.expendYear||'-'}%`
+                            `${currentResult.costYear?$util.fmoney(currentResult.costYear,2):'-'}%`
                           }}</text>
                         <text class="successTime">成本同比</text>
                       </view>
@@ -145,10 +145,10 @@
 <!--                <view>利润总额完成率=本年累计/年度预算<br/>{{ `(${$util.fmoney(pageDetail.yearProfit.ThisYearTotal/10000,2)} / ${$util.fmoney(pageDetail.yearProfit.ThisYearBudget/10000,2)})` }}</view>-->
 <!--                <view>净利润完成度=本年净利润/净利润预算<br/>{{ `(${$util.fmoney(pageDetail.yearProfit.ThisYearTotalC/10000,2)} / ${$util.fmoney(pageDetail.yearProfit.ThisYearBudgetC/10000,2)})` }}</view>                -->
 
-                <view>利润总额完成率=本年累计/年度预算<br/>{{ `(${currentResult.profitThisYearReal||'-'} / ${currentResult.profitBudgetThisYearReal||'-'})` }}</view>
-                <view>净利润完成度=本年净利润/净利润预算<br/>{{ `(${currentResult.thisYearNetProfitReal||'-'} / ${currentResult.thisYearNetProfitBudgetReal||'-'})` }}</view>
-                <view>净利润预算=年度预算-年度预计所得税费用{{`(${currentResult.profitBudgetThisYearReal||'-'} - ${(currentResult.profitBudgetThisYearReal - currentResult.thisYearNetProfitBudgetReal).toFixed(2)})`}}</view>
-                <view>本年净利润=本年累计-本年累计所得税{{`(${currentResult.profitThisYearReal||'-'} - ${(currentResult.profitThisYearReal - currentResult.thisYearNetProfitReal).toFixed(2)})`}}</view>
+                <view>利润总额完成率=本年累计/年度预算<br/>{{ `(${currentResult.profitThisYear?$util.fmoney(currentResult.profitThisYear,2):'-'} / ${currentResult.profitBudgetThisYear?$util.fmoney(currentResult.profitBudgetThisYear,2):'-'})` }}</view>
+                <view>净利润完成度=本年净利润/净利润预算<br/>{{ `(${currentResult.thisYearNetProfit?$util.fmoney(currentResult.thisYearNetProfit,2):'-'} / ${currentResult.thisYearNetProfitBudget?$util.fmoney(currentResult.thisYearNetProfitBudget,2):'-'})` }}</view>
+                <view>净利润预算=年度预算-年度预计所得税费用{{`(${currentResult.profitBudgetThisYear?$util.fmoney(currentResult.profitBudgetThisYear,2):'-'} - ${(currentResult.profitBudgetThisYearReal - currentResult.thisYearNetProfitBudgetReal).toFixed(2)})`}}</view>
+                <view>本年净利润=本年累计-本年累计所得税{{`(${currentResult.profitThisYear?$util.fmoney(currentResult.profitThisYear,2):'-'} - ${(currentResult.profitThisYearReal - currentResult.thisYearNetProfitReal).toFixed(2)})`}}</view>
               </view>
             </view>
           </view>
@@ -170,13 +170,13 @@
             <view class="yearDetail">
               <view class="yearItem">
 <!--                <view class="itemValue">{{$util.fmoney(pageDetail.yearProfit.ThisYearTotal/10000,2)}}</view>-->
-                <view class="itemValue">{{ currentResult.profitThisYear||'-' }}</view>
+                <view class="itemValue">{{ currentResult.profitThisYear?$util.fmoney(currentResult.profitThisYear,2):'-' }}</view>
                 <text class="itemLabel">含税累计<text class="itemUnit">/万元</text></text>
               </view>
 
               <view class="yearItem">
 <!--                <view class="itemValue">{{$util.fmoney(pageDetail.yearProfit.ThisYearBudget/10000,2)}}</view>-->
-                <view class="itemValue">{{currentResult.profitBudgetThisYear||'-'}}</view>
+                <view class="itemValue">{{currentResult.profitBudgetThisYear?$util.fmoney(currentResult.profitBudgetThisYear,2):'-'}}</view>
                 <text class="itemLabel">年度预算<text class="itemUnit">/万元</text></text>
               </view>
 
@@ -193,13 +193,13 @@
             <view class="yearDetail">
               <view class="yearItem">
 <!--                <view class="itemValue">{{$util.fmoney(pageDetail.yearProfit.ThisYearTotalC/10000,2)}}</view>-->
-                <view class="itemValue">{{currentResult.thisYearNetProfit||'-'}}</view>
+                <view class="itemValue">{{currentResult.thisYearNetProfit?$util.fmoney(currentResult.thisYearNetProfit,2):'-'}}</view>
                 <text class="itemLabel">除税净利润<text class="itemUnit">/万元</text></text>
               </view>
 
               <view class="yearItem">
 <!--                <view class="itemValue">{{$util.fmoney(pageDetail.yearProfit.ThisYearBudgetC/10000,2)}}</view>-->
-                <view class="itemValue">{{currentResult.thisYearNetProfitBudget||'-'}}</view>
+                <view class="itemValue">{{currentResult.thisYearNetProfitBudget?$util.fmoney(currentResult.thisYearNetProfitBudget,2):'-'}}</view>
                 <text class="itemLabel">净利润预算<text class="itemUnit">/万元</text></text>
               </view>
 
@@ -298,7 +298,7 @@
 <!--                <view>成本比=本年累计成本/本年累计收入<br/>{{ `(${$util.fmoney(pageDetail.Income.ThisYearCost,2)} / ${$util.fmoney(pageDetail.Income.ThisYearTotal,2)})` }}</view>   -->
 <!--                <view>完成率=本年累计收入 / 年度预算<br/>{{ `(619,033,365.94 / 800,500,000.00)` }}</view>-->
 <!--                <view>成本比=本年累计成本/本年累计收入<br/>{{ `243,936,015.66 / 619,033,365.94)` }}</view>   -->
-                <view>完成率=本年累计收入 / 年度预算<br/>{{ `(${currentResult.inComeThisYearReal||'-'} / ${currentResult.thisYearInComeBudgetReal||'-'})` }}</view>
+                <view>完成率=本年累计收入 / 年度预算<br/>{{ `(${currentResult.inComeThisYearReal||'-'} / ${currentResult.thisYearInComeBudget?$util.fmoney(Number(currentResult.thisYearInComeBudget)*10000,2):'-'})` }}</view>
                 <view>成本比=本年累计成本/本年累计收入<br/>{{ `(${currentResult.costReal||'-'} /${currentResult.inComeThisYearReal||'-'})` }}</view>
                 <view>年度预算：年度预算包含营业外</view>
                 <view>年度预算同比： 本年累计收入的同比值</view>
@@ -308,15 +308,15 @@
           <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/allInCome.png" />
           <view class="itemDetailBox">
               <view class="leftCharts" >
-                <OtherCharts :success="currentResult.inComeSuccess" :colorList="['#FC7909', '#FEE4CE']" :name="'inComeSuccess'"/>
+                <OtherCharts :success="currentResult.thisYearInComeRate" :colorList="['#FC7909', '#FEE4CE']" :name="'inComeSuccess'"/>
                 <!--              <text class="numberValue" style="color: #FE7500">{{`${pageDetail.Income.CompleteRate||''}%`}}</text>-->
-                <text class="numberValue" style="color: #FE7500">{{`${currentResult.inComeSuccess || '-'}%`}}</text>
+                <text class="numberValue" style="color: #FE7500">{{`${currentResult.thisYearInComeRate || '-'}%`}}</text>
               </view>
               <view class="rightBox">
                 <view class="rightBoxTop">
                   <view class="itemTop">
                     <!--                  <text class="itemTopValue">{{ $util.fmoney(pageDetail.Income.ThisYearTotal/10000,2) }}</text>-->
-                    <text class="itemTopValue">{{ currentResult.inComeThisYear || '' }}</text>
+                    <text class="itemTopValue">{{ currentResult.inComeThisYear?$util.fmoney(currentResult.inComeThisYear,2):'-' }}</text>
                     <view class="itemTopTitle" style="display: flex;align-items: center">
                       本年累计
                       <text class="itemTopUnit">/万元</text>
@@ -331,7 +331,7 @@
                 <view class="rightBoxTop" style="margin-top: 32rpx">
                   <view class="itemTop">
                     <!--                  <text class="itemTopValue">{{$util.fmoney(pageDetail.Income.ThisYearBudget/10000,2)}}</text>-->
-                    <text class="itemTopValue">{{ currentResult.thisYearInComeBudget||'-' }}</text>
+                    <text class="itemTopValue">{{ currentResult.thisYearInComeBudget?$util.fmoney(currentResult.thisYearInComeBudget,2):'-' }}</text>
                     <view class="itemTopTitle" style="display: flex;align-items: center">
                       年度预算
                       <text class="itemTopUnit">/万元</text>
@@ -347,12 +347,12 @@
           </view>
           <view class="inComeRateBox" @click="handleShowInComeNotice">
             <view v-if="showInComeNotice" class="noticeRate" >
-              <view class="noticeView">自营收入:<span>{{currentResult.inComeList[0].thisYear}}</span>万元，<span>{{`${((currentResult.inComeList[0].thisYearRealNumber / (currentResult.inComeList[0].thisYearRealNumber + currentResult.inComeList[1].thisYearRealNumber))*100).toFixed(2)}%`}}</span></view>
-              <view class="noticeView">其他收入:<span>{{currentResult.inComeList[1].thisYear}}</span>万元，<span>{{`${((currentResult.inComeList[1].thisYearRealNumber / (currentResult.inComeList[0].thisYearRealNumber + currentResult.inComeList[1].thisYearRealNumber))*100).toFixed(2)}%`}}</span></view>
+              <view class="noticeView">自营收入:<span>{{currentResult.inComeList[0].thisYear?$util.fmoney(currentResult.inComeList[0].thisYear,2):'-'}}</span>万元，<span>{{`${((currentResult.inComeList[0].thisYear / (Number(currentResult.inComeList[0].thisYear) + Number(currentResult.inComeList[1].thisYear)))*100).toFixed(2)}%`}}</span></view>
+              <view class="noticeView">其他收入:<span>{{currentResult.inComeList[1].thisYear?$util.fmoney(currentResult.inComeList[1].thisYear,2):'-'}}</span>万元，<span>{{`${((currentResult.inComeList[1].thisYear / (Number(currentResult.inComeList[0].thisYear) + Number(currentResult.inComeList[1].thisYear)))*100).toFixed(2)}%`}}</span></view>
             </view>
             <view class="inComeRate">
-              <view class="owner" :style="{background:'#FC7909',left: 0,width:`${(currentResult.inComeList[0].thisYearRealNumber / (currentResult.inComeList[0].thisYearRealNumber + currentResult.inComeList[1].thisYearRealNumber))*100}%`}"></view>
-              <view class="otherRate" :style="{background:'#F9DCC2',right: 0,width:`${(currentResult.inComeList[1].thisYearRealNumber / (currentResult.inComeList[0].thisYearRealNumber + currentResult.inComeList[1].thisYearRealNumber))*100}%`}"></view>
+              <view class="owner" :style="{background:'#FC7909',left: 0,width:`${(currentResult.inComeList[0].thisYear / (Number(currentResult.inComeList[0].thisYear) + Number(currentResult.inComeList[1].thisYear)))*100}%`}"></view>
+              <view class="otherRate" :style="{background:'#F9DCC2',right: 0,width:`${(currentResult.inComeList[1].thisYear / (Number(currentResult.inComeList[0].thisYear) + Number(currentResult.inComeList[1].thisYear)))*100}%`}"></view>
             </view>
             <view class="rateType">
               <view class="rateItem">
@@ -425,13 +425,13 @@
                 <view class="rightTopItem">
                   <view class="itemDetail">
 <!--                    <view class="detailValue" style="font-size: 26rpx">{{$util.fmoney(item.ThisYearTotal/10000,2)}}</view>-->
-                    <view class="detailValue" >{{item.thisYear || '-'}}</view>
+                    <view class="detailValue" >{{item.thisYear?$util.fmoney(item.thisYear,2):'-'}}</view>
                     <view class="detailTitle">本年累计<text class="detailTitleUnit">/万元</text></view>
                   </view>
                   <view class="itemDetail">
                     <view class="detailValue"  style="text-align: right">
 <!--                      {{$util.fmoney(item.ThisMonthIncome/10000,2)}}-->
-                      {{item.thisMonth || '-'}}
+                      {{item.thisMonth?$util.fmoney(item.thisMonth,2):'-'}}
                     </view>
                     <view class="detailTitle">
                       {{ `${thisMonth}月累计` }}
@@ -442,12 +442,12 @@
                 <view class="rightTopItem" style="margin-top: 32rpx">
                   <view class="itemDetail">
 <!--                    <view class="detailValue">{{$util.fmoney(item.ThisYearBudget/10000,2)}}</view>-->
-                    <view class="detailValue">{{item.thisYearBudget || '-'}}</view>
+                    <view class="detailValue">{{item.thisYearBudget?$util.fmoney(item.thisYearBudget,2):'-'}}</view>
                     <view class="detailTitle">年度预算<text class="detailTitleUnit">/万元</text></view>
                   </view>
                   <view class="itemRight" style="text-align: right">
 <!--                    <view class="rightValue">{{ `${item.ThisMonthIncomeRate||''}%` }}</view>-->
-                    <view class="rightValue">{{ `${item.thisMonthRate || '-'}%` }}</view>
+                    <view class="rightValue">{{ `${item.thisYearYOY || '-'}%` }}</view>
                     <view class="rightLabel">本月占比</view>
                   </view>
                 </view>
@@ -487,7 +487,7 @@
         </view>
       </view>
 
-      <view class="expenditure" v-if="currentResult.showExpenditure">
+      <view class="expenditure" >
         <view class="itemBox">
           <view class="itemBoxTitle" style="color: #096EF7">支出合计</view>
           <image class="monthSumBg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/expenditure.png" />
@@ -502,7 +502,7 @@
               <view class="rightBoxTop">
                 <view class="itemTop">
 <!--                  <text class="itemTopValue">{{$util.fmoney(pageDetail.Cost.ThisYearTotal/10000,2)}}</text>-->
-                  <text class="itemTopValue">{{currentResult.expenditureThisYear}}</text>
+                  <text class="itemTopValue">{{currentResult.expenditureThisYear?$util.fmoney(currentResult.expenditureThisYear,2):'-'}}</text>
                   <text class="itemTopTitle">本年累计<text class="itemTopUnit">/万元</text></text>
                 </view>
 <!--                <view class="itemRateBox">-->
@@ -518,7 +518,7 @@
               <view class="rightBoxTop" style="margin-top: 16px">
                 <view class="itemTop">
 <!--                  <text class="itemTopValue">{{$util.fmoney(pageDetail.Cost.ThisYearBudget/10000,2) }}</text>-->
-                  <text class="itemTopValue">{{currentResult.expenditureThisYearBudget}}</text>
+                  <text class="itemTopValue">{{currentResult.expenditureThisYearBudget?$util.fmoney(currentResult.expenditureThisYearBudget,2):'-'}}</text>
                   <text class="itemTopTitle">年度预计<text class="itemTopUnit">/万元</text></text>
                 </view>
                 <view class="itemRateBox">
@@ -532,10 +532,10 @@
 
           <view class="expenditureRateBox" @click="handleShowOutNotice">
             <view v-if="showOutNoitive" class="noticeRate">
-              <view class="noticeView">营业成本:<span>{{currentResult.outList[0].expenditureCostThisYear}}</span>万元，<span>{{`${outFirst.toFixed(2)}%`}}</span></view>
-              <view class="noticeView">销售费用:<span>{{currentResult.outList[1].expenditureCostThisYear}}</span>万元，<span>{{`${outSecond.toFixed(2)}%`}}</span></view>
-              <view class="noticeView">管理费用:<span>{{currentResult.outList[2].expenditureCostThisYear}}</span>万元，<span>{{`${outThird.toFixed(2)}%`}}</span></view>
-              <view class="noticeView">财务费用:<span>{{currentResult.outList[3].expenditureCostThisYear}}</span>万元，<span>{{`${outFourth.toFixed(2)}%`}}</span></view>
+              <view class="noticeView">营业成本:<span>{{currentResult.outList[0].thisYear}}</span>万元，<span>{{`${outFirst.toFixed(2)}%`}}</span></view>
+              <view class="noticeView">销售费用:<span>{{currentResult.outList[1].thisYear}}</span>万元，<span>{{`${outSecond.toFixed(2)}%`}}</span></view>
+              <view class="noticeView">管理费用:<span>{{currentResult.outList[2].thisYear}}</span>万元，<span>{{`${outThird.toFixed(2)}%`}}</span></view>
+              <view class="noticeView">财务费用:<span>{{currentResult.outList[3].thisYear}}</span>万元，<span>{{`${outFourth.toFixed(2)}%`}}</span></view>
             </view>
             <view class="expenditureRate">
               <view class="first" :style="{left:0,width: outFirst+'%',background:'#1679FF'}"></view>
@@ -581,14 +581,14 @@
             <view class="itemSmallDetail">
               <view class="itemSmallLeftBox">
 <!--                <OtherCharts :success="item.CompleteRate" :colorList="['#1679FF', '#E7F1FF']" />-->
-                <OtherCharts :success="item.expenditureCostRate" :colorList="['#1679FF', '#E7F1FF']" :name="'CompleteRate2'+index" />
-                <text class="leftValue">{{`${item.expenditureCostRate}%`}}</text>
+                <OtherCharts :success="item.rate" :colorList="['#1679FF', '#E7F1FF']" :name="'CompleteRate2'+index" />
+                <text class="leftValue">{{`${item.rate}%`}}</text>
               </view>
               <view class="itemSmallRightBox">
                 <view class="rightTopItem">
                   <view class="itemDetail">
 <!--                    <view class="detailValue">{{$util.fmoney(pageDetail.Cost.ThisYearTotal/10000,2) }}</view>-->
-                    <view class="detailValue">{{ item.expenditureCostThisYear }}</view>
+                    <view class="detailValue">{{ item.thisYear?$util.fmoney(item.thisYear,2):'-' }}</view>
                     <view class="detailTitle">本年累计<text class="detailTitleUnit">/万元</text></view>
                   </view>
 <!--                  <view class="itemRight">-->
@@ -596,7 +596,7 @@
 <!--                    <view class="rightLabel">成本比</view>-->
 <!--                  </view>                  -->
                   <view class="itemRight">
-                    <view class="rightValue">{{ item.expenditureCostThisMonth }}</view>
+                    <view class="rightValue">{{ item.thisMonth?$util.fmoney(item.thisMonth,2):'-' }}</view>
 <!--                    <view class="rightValue">{{`${item.PartRate  ||''}%`}}</view>-->
                     <view class="rightLabel">{{ `${thisMonth}月累计` }}<text class="detailTitleUnit">/万元</text></view>
                   </view>
@@ -604,11 +604,11 @@
                 <view class="rightTopItem" style="margin-top: 32rpx">
                   <view class="itemDetail">
 <!--                    <view class="detailValue">{{$util.fmoney(pageDetail.Cost.ThisYearBudget/10000,2) }}</view>-->
-                    <view class="detailValue">{{ item.expenditureCostThisYearBudget }}</view>
+                    <view class="detailValue">{{ item.thisYearBudget?$util.fmoney(item.thisYearBudget,2):'-' }}</view>
                     <view class="detailTitle">年度预计<text class="detailTitleUnit">/万元</text></view>
                   </view>
                   <view class="itemRight">
-                    <view class="rightValue">{{ item.expenditureCostThisRate }}</view>
+                    <view class="rightValue">{{ `${item.thisYearYOY || '-'}%` }}</view>
                     <view class="rightLabel">本月占比</view>
                   </view>
 <!--                  <view class="itemRight">-->
@@ -1367,12 +1367,9 @@ export default {
     // 滑动swiper的方法
     handleChangeSwiper(e){
       this.selectMonth = e.target.current
-      console.log('this.selectMonth',this.selectMonth)
       this.thisMonth = this.monthList[this.selectMonth]
       this.single =  `${this.thisYear}-${this.thisMonth<10?'0'+this.thisMonth:this.thisMonth}`
-      console.log('this.single',this.single)
       // this.currentResult = this.monthResult[this.selectMonth]
-      console.log('11111')
       this.handleGetPageData()
     },
     // 拿到数据的方法
@@ -1387,21 +1384,19 @@ export default {
         Month:`${y}${m}`
       }
       // const data = await request.$webGet('EShangApiMain/Budget/GetbudgetProjectReport',req)
-      const data = await request.$webGet('EShangApiMain/Budget/GetbudgetProjectReportDynamic',req)
-      console.log('data',data)
+      const data = await request.$webGetTest('EShangApiMain/Budget/GetbudgetProjectReportDynamic',req)
       this.currentResult = data.Result_Data
       let sum = 0
       console.log('this.currentResult',this.currentResult)
       if (this.currentResult.outList && this.currentResult.outList.length>0){
         this.currentResult.outList.forEach(item=>{
-          sum+=item.expenditureCostThisYearNumber
+          sum+=Number(item.thisYear)
         })
         this.outAll = sum
-        console.log('this.outAll',this.outAll)
-        this.outFirst = (this.currentResult.outList[0].expenditureCostThisYearNumber/sum)*100
-        this.outSecond = (this.currentResult.outList[1].expenditureCostThisYearNumber/sum)*100
-        this.outThird = (this.currentResult.outList[2].expenditureCostThisYearNumber/sum)*100
-        this.outFourth = (this.currentResult.outList[3].expenditureCostThisYearNumber/sum)*100
+        this.outFirst = (Number(this.currentResult.outList[0].thisYear)/sum)*100
+        this.outSecond = (Number(this.currentResult.outList[1].thisYear)/sum)*100
+        this.outThird = (Number(this.currentResult.outList[2].thisYear)/sum)*100
+        this.outFourth = (Number(this.currentResult.outList[3].thisYear)/sum)*100
       }
       uni.hideLoading()
     },
@@ -1708,7 +1703,7 @@ export default {
   .content{
     width: 100%;
     box-sizing: border-box;
-    padding: 24rpx 36rpx 0;
+    padding: 24rpx 36rpx 32rpx;
     background: #F5F5F5;
     .profitYear{
       width: 100%;
diff --git a/pages/revenueStatistics/index.vue b/pages/revenueStatistics/index.vue
index 4fff4ba..48beb45 100644
--- a/pages/revenueStatistics/index.vue
+++ b/pages/revenueStatistics/index.vue
@@ -8,7 +8,7 @@
             <picker mode="date" fields="month" :value="searchText"  :end="lastDay" @change="bindDateChange" >
               <view class="time">
                 <image class="timeIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/timeIcon.svg"/>
-                <view class="text">{{ searchText }}</view>
+                <view class="text"  >{{ searchText }}</view>
                 <image class="icon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/timeUpDown.svg"></image>
               </view>
             </picker>
@@ -23,11 +23,14 @@
       <view class="revenueBox ydRevenue">
         <view class="bigBox">
           <view class="revenueBoxHeader">
-            <view class="headerTitle">驿达营收</view>
+<!--            <view class="headerTitle">驿达营收</view>-->
             <image class="revenueImg" src="https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/revenueItemBg.png"/>
             <view class="revenueContent">
               <view class="sumBox">
-                <image class="sumLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/sumLogo.svg"/>
+                <view class="left">
+                  <image class="sumLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/sumLogo.svg"/>
+                  <view class="headerTitle">驿达营收</view>
+                </view>
                 <view class="sumText">
                   <view class="sumMoney">{{pageDataObj.OwnerRevenue?$util.fmoney(pageDataObj.OwnerRevenue/10000,2):'0.00'}}</view>
                   <view class="sumUnit">总计<span class="unit">/万元</span></view>
@@ -144,11 +147,14 @@
       <view class="revenueBox merchantRevenue" style="margin-top: 24rpx">
         <view class="bigBox">
           <view class="revenueBoxHeader">
-          <view class="headerTitle">商家营收</view>
+<!--          <view class="headerTitle">商家营收</view>-->
           <image class="revenueImg" src="https://eshangtech.com/ShopICO/ahyd-BID/nationalDay/entryAdd.png"/>
           <view class="revenueContent">
             <view class="sumBox">
-              <image class="sumLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/merchantsSum.svg"/>
+              <view class="left">
+                <image class="sumLogo" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/merchantsSum.svg"/>
+                <view class="headerTitle">商家营收</view>
+              </view>
               <view class="sumText">
                 <view class="sumMoney">{{pageDataObj.MerchantRevenue?$util.fmoney(pageDataObj.MerchantRevenue/10000):"0.00"}}</view>
                 <view class="sumUnit">总计<span class="unit">/万元</span></view>
@@ -263,7 +269,7 @@
       <view class="revenueBox otherData"  style="margin-top: 24rpx">
         <view class="bigBox">
           <view class="revenueBoxHeader">
-          <view class="headerTitle" >其他数据</view>
+<!--          <view class="headerTitle">其他数据</view>-->
           <image class="revenueImg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/expenditure.png"/>
           <view class="revenueContent">
 
@@ -416,7 +422,8 @@ export default {
       searchText:'',
       pageDataObj:{},
       OwnerListSum:{},
-      MerchantSum:{}
+      MerchantSum:{},
+      thisMonth:0
     }
   },
   onLoad(option){
@@ -430,6 +437,9 @@ export default {
     console.log('menu',this.menu)
     if (option.time){
       this.lastDay = option.time
+      const date = new Date(this.lastDay)
+      let m = date.getMonth() + 1
+      this.thisMonth = m
     }
     if (option.month){
       this.searchText = option.month
@@ -627,20 +637,32 @@ export default {
             margin-top: 22rpx;
             display: flex;
             justify-content: space-between;
-            .sumLogo{
-              width: 96rpx;
-              height: 96rpx;
+            .left{
+              display: flex;
+              align-items: center;
+              .sumLogo{
+                width: 96rpx;
+                height: 96rpx;
+              }
+              .headerTitle{
+                font-size: 36rpx;
+                font-family: Alimama ShuHeiTi;
+                font-weight: bold;
+                line-height: 44rpx;
+                margin-left: 12rpx;
+              }
             }
+
             .sumText{
               display: flex;
               flex-direction: column;
               align-items: flex-end;
               .sumMoney{
-                font-size: 40rpx;
-                font-family: DINAlternate, DINAlternate;
+                font-size: 36rpx;
+                font-family: DINAlternate-Bold, DINAlternate;
                 font-weight: bold;
                 color: #160002;
-                line-height: 48rpx;
+                line-height: 44rpx;
               }
               .sumUnit{
                 margin-top: 8rpx;
@@ -693,11 +715,11 @@ export default {
                   }
                 }
                 .itemTopRight{
-                  font-size: 40rpx;
-                  font-family: DINAlternate, DINAlternate;
+                  font-size: 36rpx;
+                  font-family: DINAlternate-Bold, DINAlternate;
                   font-weight: bold;
                   color: #160002;
-                  line-height: 40rpx;
+                  line-height: 44rpx;
                 }
               }
               .itemBottom{