diff --git a/ahyd_DIB.zip b/ahyd_DIB.zip
new file mode 100644
index 0000000..5398e75
Binary files /dev/null and b/ahyd_DIB.zip differ
diff --git a/pages/commercialBI/components/manager/revenueAnalysis.vue b/pages/commercialBI/components/manager/revenueAnalysis.vue
index 8c27159..8f25e84 100644
--- a/pages/commercialBI/components/manager/revenueAnalysis.vue
+++ b/pages/commercialBI/components/manager/revenueAnalysis.vue
@@ -117,7 +117,8 @@ export default {
               // this.dataInfo.SalesPerSquareMeter = this.$util.fmoney(this.dataInfo.SalesPerSquareMeter)
               console.log('value',value)
             }
-        }
+        },
+        deep:true
     },
     methods:{
 
diff --git a/pages/commercialBI/managePortrait.vue b/pages/commercialBI/managePortrait.vue
index 0326a94..cf5292e 100644
--- a/pages/commercialBI/managePortrait.vue
+++ b/pages/commercialBI/managePortrait.vue
@@ -258,6 +258,7 @@ export default {
         this.time = option.time
     },
     onShow(){
+      this.monthDetail = undefined
         let storeTime = uni.getStorageSync('lastDay')
       this.lastDay = uni.getStorageSync('lastDay')
         if (storeTime){
@@ -442,20 +443,27 @@ export default {
             this.showNoticeYear = false
         },
         async getSummaryMonth(){
+          let currentService = uni.getStorageSync('currentService')
           console.log('this.time',this.time)
           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',
-            StatisticsMonth:`${y}${m}`,
+            Statistics_StartDate:`${y}-${m}-01`,
+            Statistics_Date:`${y}-${m}-${d}`,
+            Serverpart_ID:currentService.Serverpart_ID
           }
-          const data = await request.$webGet('CommercialApi/Revenue/GetSummaryRevenueMonth',req)
+          const data = await request.$webGet('CommercialApi/Revenue/GetSummaryRevenue',req)
           console.log('data22222',data)
-          this.monthDetail = data.Result_Data.MonthRevenueModel
+          this.monthDetail = data.Result_Data.RevenuePushModel
         },
 
         async getRevenueList(){
diff --git a/pages/index/components/rateCharts.vue b/pages/index/components/rateCharts.vue
index b2505bf..7f1dbd1 100644
--- a/pages/index/components/rateCharts.vue
+++ b/pages/index/components/rateCharts.vue
@@ -1,7 +1,7 @@
 <template>
   <view class="rateMain">
     <image v-if="preferPath" style="width: 144rpx;height: 144rpx" :src="preferPath"></image>
-    <canvas v-if="name"  style="width: 144rpx;height: 144rpx;position:fixed;left: 100%" :canvas-id="name" :id="name"/>
+    <canvas v-if="name"  style="width: 144rpx;height: 144rpx;position:fixed;left: 100%" :canvas-id="name" id="rate"/>
   </view>
 </template>
 
@@ -52,6 +52,7 @@ export default {
           this.drawCharts(this.name,res)
         }
       },
+    immediate:true
     }
   },
   methods:{
@@ -97,7 +98,7 @@ export default {
         }
       });
       setTimeout( ()=>{
-        this.canvasToTempImage(this.name)
+        _this.canvasToTempImage(_this.name)
       },500)
     },
     canvasToTempImage(id){
@@ -123,8 +124,8 @@ export default {
 
 <style lang="scss" scoped>
 .rateMain{
-  width: 100%;
-  height: 100%;
+  width: 144rpx;
+  height: 144rpx;
   .month{
     width: 136rpx;
     height: 136rpx;
diff --git a/pages/index/index.vue b/pages/index/index.vue
index d5f681b..ebcf407 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -42,7 +42,7 @@
                   <view class="revenueBox" v-show="selectMonth===index+1">
                     <view class="revenueTop">
                       <view class="revenueTopLeft">
-                        <text class="revenueNumber">{{showTableData.CashPayChange?$util.fmoney(showTableData.CashPayChange,2):'0.00'}}</text>
+                        <text class="revenueNumber">{{showTableData.CashPayChange?showTableData.CashPayChange:'0.00'}}</text>
                         <view class="moreIcon" @click="changeShowRealBox">?
                           <view v-if="showRealBox" class="realBox" @click.stop="changeShowRealBox">
                             <view><text class="label">对客营收：</text>{{showTableData.CashPay?$util.fmoney(showTableData.CashPay,2):'-'}}</view>
@@ -103,8 +103,8 @@
                         </view>
                       </view>
                       <view class="moneyRate">
-                        <view class="leftBox" @click="handleShowYDModal">
-                          <rateCharts :success="moneyRateList" :colorList="['#A66A37','#DCA858']" :name="`${selectMonth}rate`"/>
+                        <view class="leftBox" @click="handleShowYDModal" v-if="showRateChart">
+                          <rateCharts :success="moneyRateList" :colorList="1<=selectMonth && selectMonth<=3?['#DB573B','#FFAB30']:4<=selectMonth && selectMonth<=6?['#137BBD','#5DC1E0']:7<=selectMonth && selectMonth<=9?['#3663CB','#7CADF8']:['#A66A37','#DCA858']" :name="`${selectMonth}rate`"/>
                           <view class="haveNoticeBox" v-if="ydModal" @click.stop="handleShowYDModal">
                             <text class="label">驿达入账:<text class="value">{{ydRate}}%</text></text>
                             <text class="label">商家入账:<text class="value">{{shopRate}}%</text></text>
@@ -930,6 +930,7 @@ export default {
       ydModal: false,// 显示驿达百分比的具体值
       ydRate:'',// 驿达百分比
       shopRate:'',// 商家百分比
+      showRateChart:true,// 显示百分比表格
     }
   },
   watch:{
@@ -1609,6 +1610,9 @@ export default {
       })
     },
     handleChangeSelect(e){
+      console.log('1')
+      console.log('this.stopSwiper',this.stopSwiper)
+      this.showRateChart = false
       if (!this.stopSwiper){
         this.selectMonth = e.detail.current + 1
         this.selectDetail = e.detail.current
@@ -1651,6 +1655,11 @@ export default {
         this.handleGetDailyPatrol()
         // 获取全省平均车流量
         this.handleGetAllCarTraffic()
+
+      }else{
+        setTimeout(()=>{
+          this.showRateChart = true
+        },1500)
       }
     },
     handleShowYDModal(){
@@ -1935,6 +1944,7 @@ export default {
             this.trafficCurrentObj = item
           }
         })
+        this.showRateChart = true
       })
     },
     defaultMsg() {
@@ -2073,7 +2083,10 @@ export default {
          this.bodyList = list
        }
        let index1= (this.showTableData.CashPay / 10000).toString().indexOf('.')
-       this.showTableData.CashPayChange = (this.showTableData.CashPay / 10000).toString().substring(0,index1+3)
+       console.log('this.showTableData.CashPay',this.showTableData.CashPay)
+       let number = this.showTableData.CashPay / 10000
+       console.log('number',number)
+       this.showTableData.CashPayChange = this.$util.fmoney(number,2)
        // for (let key in this.showTableData){
         //   if (this.showTableData[key]){
         //     // 在有值的前提下
diff --git a/pages/revenue/expenditureDetail.vue b/pages/revenue/expenditureDetail.vue
index 72c7aa3..b149439 100644
--- a/pages/revenue/expenditureDetail.vue
+++ b/pages/revenue/expenditureDetail.vue
@@ -299,7 +299,7 @@ export default {
       const req = {
         Month:this.month
       }
-      const data = await request.$webGetTest('EShangApiMain/Budget/GetbudgetProjectReportOut',req)
+      const data = await request.$webGet('EShangApiMain/Budget/GetbudgetProjectReportOut',req)
       console.log('data',data)
       this.pageData = data.Result_Data
       this.pageList = this.selectTab===1?data.Result_Data.costList:this.selectTab===2?data.Result_Data.managerList:this.selectTab===3?data.Result_Data.sellingList:this.selectTab===4?data.Result_Data.financialList:''
diff --git a/pages/revenue/incomeDetail.vue b/pages/revenue/incomeDetail.vue
index 06a9631..f2e8601 100644
--- a/pages/revenue/incomeDetail.vue
+++ b/pages/revenue/incomeDetail.vue
@@ -210,7 +210,7 @@ export default {
       const req = {
         Month:this.month
       }
-      const data = await request.$webGetTest('EShangApiMain/Budget/GetbudgetProjectReportIn',req)
+      const data = await request.$webGet('EShangApiMain/Budget/GetbudgetProjectReportIn',req)
       console.log('data',data)
       this.pageData = data.Result_Data
       this.pageList = this.selectTab===1?data.Result_Data.supportList:data.Result_Data.otherList
diff --git a/pages/revenue/index.vue b/pages/revenue/index.vue
index 905eaea..f97948d 100644
--- a/pages/revenue/index.vue
+++ b/pages/revenue/index.vue
@@ -840,7 +840,7 @@ export default {
       childrenShow:false,// 收入合计的显示框
       CostInRate:44.36,
       InOutRate:56.29,
-      monthList:[7,8,9,10],// 月份列表
+      monthList:[7,8,9,10,11],// 月份列表
       selectMonth: 0,// 当前选中的月份
       monthResult:[
         //   7月
@@ -1147,15 +1147,15 @@ export default {
     let m = date.getMonth()+1
     this.thisYear = y
     this.startDate = `${y}-07`
-    this.endData = `${y}-10`
+    this.endData = `${y}-11`
     this.single =  `${y}-07`
-    this.thisMonth = '07'
+    this.thisMonth = '11'
     // 请求的方法
     // this.selectMonth = 0
     setTimeout(()=>{
       // this.handleChangeSwiper({target:{current:3}})
-      this.single = `${y}-10`
-      this.thisMonth = '10'
+      this.single = `${y}-11`
+      this.thisMonth = '11'
       this.thisYear = this.single.split('-')[0]
       this.thisMonth = this.single.split('-')[1]
       if (this.thisMonth.indexOf('7')!==-1){
@@ -1166,6 +1166,8 @@ export default {
         this.selectMonth = 2
       }else if(this.thisMonth.indexOf('10')!==-1){
         this.selectMonth = 3
+      }else if(this.thisMonth.indexOf('11')!==-1){
+        this.selectMonth = 4
       }
     },500)
     // this.currentResult = this.monthResult[this.selectMonth]
@@ -1340,6 +1342,8 @@ export default {
         this.selectMonth = 2
       }else if(this.thisMonth.indexOf('10')!==-1){
         this.selectMonth = 3
+      }else if(this.thisMonth.indexOf('11')!==-1){
+        this.selectMonth = 4
       }
       // let sum = 0
       // this.currentResult.outList.forEach(item=>{
@@ -1379,7 +1383,7 @@ export default {
       const req = {
         Month:this.thisMonth
       }
-      const data = await request.$webGetTest('EShangApiMain/Budget/GetbudgetProjectReport',req)
+      const data = await request.$webGet('EShangApiMain/Budget/GetbudgetProjectReport',req)
       console.log('data',data)
       this.currentResult = data.Result_Data
       let sum = 0
diff --git a/pages/revenueStatistics/index.vue b/pages/revenueStatistics/index.vue
index 3523452..750518c 100644
--- a/pages/revenueStatistics/index.vue
+++ b/pages/revenueStatistics/index.vue
@@ -21,100 +21,118 @@
     <view class="content">
 
       <view class="revenueBox ydRevenue">
-        <view class="revenueBoxHeader">
-          <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="sumText">
-                <view class="sumMoney">15,583.9</view>
-                <view class="sumUnit">总计<span class="unit">/元</span></view>
+        <view class="bigBox">
+          <view class="revenueBoxHeader">
+            <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="sumText">
+                  <view class="sumMoney">{{pageDataObj.OwnerRevenue?$util.fmoney(pageDataObj.OwnerRevenue/10000,2):'0.00'}}</view>
+                  <view class="sumUnit">总计<span class="unit">/万元</span></view>
+                </view>
               </view>
-            </view>
 
-            <view class="revenueAmount">
-              <view class="amountItem">
-                <view class="itemTop">
-                  <view class="itemTopLeft">
-                    <image class="leftIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/amountReceived.svg"/>
-                    <view class="itemTitle">到账合计</view>
-                    <view class="itemUnit">/元</view>
+              <view class="revenueAmount">
+                <view class="amountItem">
+                  <view class="itemTop">
+                    <view class="itemTopLeft">
+                      <image class="leftIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/amountReceived.svg"/>
+                      <view class="itemTitle">到账合计</view>
+                      <view class="itemUnit">/万元</view>
+                    </view>
+                    <view class="itemTopRight">{{OwnerListSum.AcountSum?$util.fmoney(OwnerListSum.AcountSum,2):'0.00'}}</view>
                   </view>
-                  <view class="itemTopRight">7126.85</view>
-                </view>
-                <view class="itemBottom">
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">业主自营</view>
-                    <view class="bottomItemValue">3178</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">自营提成</view>
-                    <view class="bottomItemValue">241.84</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">合租经营</view>
-                    <view class="bottomItemValue">2586.45</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">固定租金</view>
-                    <view class="bottomItemValue">1120.56</view>
+                  <view class="itemBottom" v-if="pageDataObj.OwnerList && pageDataObj.OwnerList.AcountList && pageDataObj.OwnerList.AcountList.length>0">
+                    <view class="itemBottomItem" v-for="(item,index) in pageDataObj.OwnerList.AcountList" :key="index">
+                      <view class="bottomItemTitle">{{ item.name }}</view>
+                      <view class="bottomItemValue">{{item.value?$util.fmoney(item.value/10000,2):'0.00'}}</view>
+
+                    </view>
+
+<!--                    <view class="itemBottomItem">-->
+<!--                      <view class="bottomItemTitle">业主自营</view>-->
+<!--                      <view class="bottomItemValue">3178</view>-->
+<!--                    </view>-->
+<!--                    <view class="itemBottomItem">-->
+<!--                      <view class="bottomItemTitle">自营提成</view>-->
+<!--                      <view class="bottomItemValue">241.84</view>-->
+<!--                    </view>-->
+<!--                    <view class="itemBottomItem">-->
+<!--                      <view class="bottomItemTitle">合租经营</view>-->
+<!--                      <view class="bottomItemValue">2586.45</view>-->
+<!--                    </view>-->
+<!--                    <view class="itemBottomItem">-->
+<!--                      <view class="bottomItemTitle">固定租金</view>-->
+<!--                      <view class="bottomItemValue">1120.56</view>-->
+<!--                    </view>-->
                   </view>
                 </view>
-              </view>
-              <view class="amountItem" style="margin-top: 56rpx">
-                <view class="itemTop">
-                  <view class="itemTopLeft">
-                    <image class="leftIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/amountEntry.svg"/>
-                    <view class="itemTitle">入账合计</view>
-                    <view class="itemUnit">/元</view>
+                <view class="amountItem" style="margin-top: 56rpx">
+                  <view class="itemTop">
+                    <view class="itemTopLeft">
+                      <image class="leftIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/amountEntry.svg"/>
+                      <view class="itemTitle">入账合计</view>
+                      <view class="itemUnit">/万元</view>
+                    </view>
+                    <view class="itemTopRight">{{OwnerListSum.EntrySum?$util.fmoney(OwnerListSum.EntrySum,2):'0.00'}}</view>
                   </view>
-                  <view class="itemTopRight">7126.85</view>
-                </view>
-                <view class="itemBottom">
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">业主自营</view>
-                    <view class="bottomItemValue">3178</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">自营提成</view>
-                    <view class="bottomItemValue">241.84</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">合租经营</view>
-                    <view class="bottomItemValue">2586.45</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">固定租金</view>
-                    <view class="bottomItemValue">1120.56</view>
+                  <view class="itemBottom" v-if="pageDataObj.OwnerList && pageDataObj.OwnerList.EntryList && pageDataObj.OwnerList.EntryList.length>0">
+                    <view class="itemBottomItem" v-for="(item,index) in pageDataObj.OwnerList.EntryList" :key="index">
+                      <view class="bottomItemTitle">{{ item.name }}</view>
+                      <view class="bottomItemValue">{{item.value?$util.fmoney(item.value/10000,2):'0.00'}}</view>
+                    </view>
+
+<!--                    <view class="itemBottomItem">-->
+<!--                      <view class="bottomItemTitle">业主自营</view>-->
+<!--                      <view class="bottomItemValue">3178</view>-->
+<!--                    </view>-->
+<!--                    <view class="itemBottomItem">-->
+<!--                      <view class="bottomItemTitle">自营提成</view>-->
+<!--                      <view class="bottomItemValue">241.84</view>-->
+<!--                    </view>-->
+<!--                    <view class="itemBottomItem">-->
+<!--                      <view class="bottomItemTitle">合租经营</view>-->
+<!--                      <view class="bottomItemValue">2586.45</view>-->
+<!--                    </view>-->
+<!--                    <view class="itemBottomItem">-->
+<!--                      <view class="bottomItemTitle">固定租金</view>-->
+<!--                      <view class="bottomItemValue">1120.56</view>-->
+<!--                    </view>-->
                   </view>
                 </view>
-              </view>
-              <view class="amountItem"  style="margin-top: 56rpx">
-                <view class="itemTop">
-                  <view class="itemTopLeft">
-                    <image class="leftIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/receivable.svg"/>
-                    <view class="itemTitle">应收合计</view>
-                    <view class="itemUnit">/元</view>
+                <view class="amountItem"  style="margin-top: 56rpx">
+                  <view class="itemTop">
+                    <view class="itemTopLeft">
+                      <image class="leftIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/receivable.svg"/>
+                      <view class="itemTitle">商家欠款</view>
+                      <view class="itemUnit">/万元</view>
+                    </view>
+                    <view class="itemTopRight">{{OwnerListSum.ReceivableSum?$util.fmoney(OwnerListSum.ReceivableSum,2):'0.00'}}</view>
                   </view>
-                  <view class="itemTopRight">7126.85</view>
-                </view>
-                <view class="itemBottom">
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">业主自营</view>
-                    <view class="bottomItemValue">3178</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">自营提成</view>
-                    <view class="bottomItemValue">241.84</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">合租经营</view>
-                    <view class="bottomItemValue">2586.45</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">固定租金</view>
-                    <view class="bottomItemValue">1120.56</view>
+                  <view class="itemBottom" v-if="pageDataObj.OwnerList && pageDataObj.OwnerList.ReceivableList && pageDataObj.OwnerList.ReceivableList.length>0">
+                    <view class="itemBottomItem" v-for="(item,index) in pageDataObj.OwnerList.ReceivableList" :key="index">
+                      <view class="bottomItemTitle">{{ item.name }}</view>
+                      <view class="bottomItemValue">{{item.value?$util.fmoney(item.value/10000,2):'0.00'}}</view>
+                    </view>
+
+<!--                    <view class="itemBottomItem">-->
+<!--                      <view class="bottomItemTitle">业主自营</view>-->
+<!--                      <view class="bottomItemValue">3178</view>-->
+<!--                    </view>-->
+<!--                    <view class="itemBottomItem">-->
+<!--                      <view class="bottomItemTitle">自营提成</view>-->
+<!--                      <view class="bottomItemValue">241.84</view>-->
+<!--                    </view>-->
+<!--                    <view class="itemBottomItem">-->
+<!--                      <view class="bottomItemTitle">合租经营</view>-->
+<!--                      <view class="bottomItemValue">2586.45</view>-->
+<!--                    </view>-->
+<!--                    <view class="itemBottomItem">-->
+<!--                      <view class="bottomItemTitle">固定租金</view>-->
+<!--                      <view class="bottomItemValue">1120.56</view>-->
+<!--                    </view>-->
                   </view>
                 </view>
               </view>
@@ -124,15 +142,16 @@
       </view>
 
       <view class="revenueBox merchantRevenue" style="margin-top: 24rpx">
-        <view class="revenueBoxHeader">
+        <view class="bigBox">
+          <view class="revenueBoxHeader">
           <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="sumText">
-                <view class="sumMoney">4,930.12</view>
-                <view class="sumUnit">总计<span class="unit">/元</span></view>
+                <view class="sumMoney">{{pageDataObj.MerchantRevenue?$util.fmoney(pageDataObj.MerchantRevenue/10000):"0.00"}}</view>
+                <view class="sumUnit">总计<span class="unit">/万元</span></view>
               </view>
             </view>
 
@@ -142,27 +161,32 @@
                   <view class="itemTopLeft">
                     <image class="leftIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/merchantsAmount.svg"/>
                     <view class="itemTitle">到账合计</view>
-                    <view class="itemUnit">/元</view>
+                    <view class="itemUnit">/万元</view>
                   </view>
-                  <view class="itemTopRight">7126.85</view>
+                  <view class="itemTopRight">{{OwnerListSum.AcountSum?$util.fmoney(OwnerListSum.AcountSum,2):'0.00'}}</view>
                 </view>
-                <view class="itemBottom">
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">业主自营</view>
-                    <view class="bottomItemValue">3178</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">自营提成</view>
-                    <view class="bottomItemValue">241.84</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">合租经营</view>
-                    <view class="bottomItemValue">2586.45</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">固定租金</view>
-                    <view class="bottomItemValue">1120.56</view>
+                <view class="itemBottom" v-if="pageDataObj.MerchantList && pageDataObj.MerchantList.AcountList && pageDataObj.MerchantList.AcountList.length>0">
+                  <view class="itemBottomItem" v-for="(item,index) in pageDataObj.MerchantList.AcountList" :key="index">
+                    <view class="bottomItemTitle">{{ item.name }}</view>
+                    <view class="bottomItemValue">{{item.value?$util.fmoney(item.value/10000):"0.00"}}</view>
                   </view>
+
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">业主自营</view>-->
+<!--                    <view class="bottomItemValue">3178</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">自营提成</view>-->
+<!--                    <view class="bottomItemValue">241.84</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">合租经营</view>-->
+<!--                    <view class="bottomItemValue">2586.45</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">固定租金</view>-->
+<!--                    <view class="bottomItemValue">1120.56</view>-->
+<!--                  </view>-->
                 </view>
               </view>
               <view class="amountItem" style="margin-top: 56rpx">
@@ -170,27 +194,32 @@
                   <view class="itemTopLeft">
                     <image class="leftIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/merchantsEntry.svg"/>
                     <view class="itemTitle">入账合计</view>
-                    <view class="itemUnit">/元</view>
+                    <view class="itemUnit">/万元</view>
                   </view>
-                  <view class="itemTopRight">7126.85</view>
+                  <view class="itemTopRight">{{OwnerListSum.EntrySum?$util.fmoney(OwnerListSum.EntrySum,2):'0.00'}}</view>
                 </view>
-                <view class="itemBottom">
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">业主自营</view>
-                    <view class="bottomItemValue">3178</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">自营提成</view>
-                    <view class="bottomItemValue">241.84</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">合租经营</view>
-                    <view class="bottomItemValue">2586.45</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">固定租金</view>
-                    <view class="bottomItemValue">1120.56</view>
+                <view class="itemBottom" v-if="pageDataObj.MerchantList && pageDataObj.MerchantList.EntryList && pageDataObj.MerchantList.EntryList.length>0">
+                  <view class="itemBottomItem" v-for="(item,index) in pageDataObj.MerchantList.EntryList" :key="index">
+                    <view class="bottomItemTitle">{{ item.name }}</view>
+                    <view class="bottomItemValue">{{item.value?$util.fmoney(item.value/10000):"0.00"}}</view>
                   </view>
+
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">业主自营</view>-->
+<!--                    <view class="bottomItemValue">3178</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">自营提成</view>-->
+<!--                    <view class="bottomItemValue">241.84</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">合租经营</view>-->
+<!--                    <view class="bottomItemValue">2586.45</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">固定租金</view>-->
+<!--                    <view class="bottomItemValue">1120.56</view>-->
+<!--                  </view>-->
                 </view>
               </view>
               <view class="amountItem"  style="margin-top: 56rpx">
@@ -198,36 +227,42 @@
                   <view class="itemTopLeft">
                     <image class="leftIcon" src="https://eshangtech.com/ShopICO/ahyd-BID/newIndex2/merchantsReceivable.svg"/>
                     <view class="itemTitle">应收合计</view>
-                    <view class="itemUnit">/元</view>
+                    <view class="itemUnit">/万元</view>
                   </view>
-                  <view class="itemTopRight">7126.85</view>
+                  <view class="itemTopRight">{{OwnerListSum.ReceivableSum?$util.fmoney(OwnerListSum.ReceivableSum,2):'0.00'}}</view>
                 </view>
-                <view class="itemBottom">
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">业主自营</view>
-                    <view class="bottomItemValue">3178</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">自营提成</view>
-                    <view class="bottomItemValue">241.84</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">合租经营</view>
-                    <view class="bottomItemValue">2586.45</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">固定租金</view>
-                    <view class="bottomItemValue">1120.56</view>
+                <view class="itemBottom" v-if="pageDataObj.MerchantList && pageDataObj.MerchantList.ReceivableList && pageDataObj.MerchantList.ReceivableList.length>0">
+                  <view class="itemBottomItem" v-for="(item,index) in pageDataObj.MerchantList.ReceivableList" :key="index">
+                    <view class="bottomItemTitle">{{ item.name }}</view>
+                    <view class="bottomItemValue">{{item.value?$util.fmoney(item.value/10000):"0.00"}}</view>
                   </view>
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">业主自营</view>-->
+<!--                    <view class="bottomItemValue">3178</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">自营提成</view>-->
+<!--                    <view class="bottomItemValue">241.84</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">合租经营</view>-->
+<!--                    <view class="bottomItemValue">2586.45</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">固定租金</view>-->
+<!--                    <view class="bottomItemValue">1120.56</view>-->
+<!--                  </view>-->
                 </view>
               </view>
             </view>
           </view>
         </view>
+        </view>
       </view>
 
-      <view class="revenueBox otherData" style="margin-top: 24rpx">
-        <view class="revenueBoxHeader">
+      <view class="revenueBox otherData"  style="margin-top: 24rpx">
+        <view class="bigBox">
+          <view class="revenueBoxHeader">
           <view class="headerTitle" >其他数据</view>
           <image class="revenueImg" src="https://eshangtech.com/ShopICO/ahyd-BID/revenueBox/expenditure.png"/>
           <view class="revenueContent">
@@ -241,25 +276,29 @@
                     <view class="itemTitle">项目数量</view>
                     <view class="itemUnit">/个</view>
                   </view>
-                  <view class="itemTopRight">499</view>
+                  <view class="itemTopRight">{{ pageDataObj.ProjectCount || 0 }}</view>
                 </view>
                 <view class="itemBottom">
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">业主自营</view>
-                    <view class="bottomItemValue">102</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">自营提成</view>
-                    <view class="bottomItemValue">44</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">合租经营</view>
-                    <view class="bottomItemValue">220</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">固定租金</view>
-                    <view class="bottomItemValue">123</view>
+                  <view class="itemBottomItem" v-for="(item,index) in pageDataObj.ProjectCountList" :key="index">
+                    <view class="bottomItemTitle">{{ item.name }}</view>
+                    <view class="bottomItemValue">{{ item.value || '0.00' }}</view>
                   </view>
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">业主自营</view>-->
+<!--                    <view class="bottomItemValue">102</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">自营提成</view>-->
+<!--                    <view class="bottomItemValue">44</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">合租经营</view>-->
+<!--                    <view class="bottomItemValue">220</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">固定租金</view>-->
+<!--                    <view class="bottomItemValue">123</view>-->
+<!--                  </view>-->
                 </view>
               </view>
               <view class="amountItem" style="margin-top: 56rpx">
@@ -272,22 +311,26 @@
                   <view class="itemTopRight">100%</view>
                 </view>
                 <view class="itemBottom">
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">业主自营</view>
-                    <view class="bottomItemValue">12%</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">自营提成</view>
-                    <view class="bottomItemValue">9%</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">合租经营</view>
-                    <view class="bottomItemValue">45%</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">固定租金</view>
-                    <view class="bottomItemValue">25%</view>
+                  <view class="itemBottomItem" v-for="(item,index) in pageDataObj.ProjectRatioList" :key="index">
+                    <view class="bottomItemTitle">{{ item.name }}</view>
+                    <view class="bottomItemValue">{{ item.value || '0.00' }}</view>
                   </view>
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">业主自营</view>-->
+<!--                    <view class="bottomItemValue">12%</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">自营提成</view>-->
+<!--                    <view class="bottomItemValue">9%</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">合租经营</view>-->
+<!--                    <view class="bottomItemValue">45%</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">固定租金</view>-->
+<!--                    <view class="bottomItemValue">25%</view>-->
+<!--                  </view>-->
                 </view>
               </view>
               <view class="amountItem"  style="margin-top: 56rpx">
@@ -300,22 +343,26 @@
                   <view class="itemTopRight">100%</view>
                 </view>
                 <view class="itemBottom">
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">业主自营</view>
-                    <view class="bottomItemValue">44.59%</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">自营提成</view>
-                    <view class="bottomItemValue">3.41%</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">合租经营</view>
-                    <view class="bottomItemValue">36%</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">固定租金</view>
-                    <view class="bottomItemValue">16%</view>
+                  <view class="itemBottomItem" v-for="(item,index) in pageDataObj.RevenueRatioList" :key="index">
+                    <view class="bottomItemTitle">{{ item.name }}</view>
+                    <view class="bottomItemValue">{{ item.value || '0.00' }}</view>
                   </view>
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">业主自营</view>-->
+<!--                    <view class="bottomItemValue">44.59%</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">自营提成</view>-->
+<!--                    <view class="bottomItemValue">3.41%</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">合租经营</view>-->
+<!--                    <view class="bottomItemValue">36%</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">固定租金</view>-->
+<!--                    <view class="bottomItemValue">16%</view>-->
+<!--                  </view>-->
                 </view>
               </view>
               <view class="amountItem"  style="margin-top: 56rpx">
@@ -325,42 +372,51 @@
                     <view class="itemTitle">综合提成</view>
                     <view class="itemUnit">/%</view>
                   </view>
-                  <view class="itemTopRight">100%</view>
+                  <view class="itemTopRight">{{ pageDataObj.CommissionRatio || '-' }}%</view>
                 </view>
                 <view class="itemBottom">
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">业主自营</view>
-                    <view class="bottomItemValue">0%</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">自营提成</view>
-                    <view class="bottomItemValue">0%</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">合租经营</view>
-                    <view class="bottomItemValue">32.4%</view>
-                  </view>
-                  <view class="itemBottomItem">
-                    <view class="bottomItemTitle">固定租金</view>
-                    <view class="bottomItemValue">77.6%</view>
+                  <view class="itemBottomItem" v-for="(item,index) in pageDataObj.CommissionList" :key="index">
+                    <view class="bottomItemTitle">{{ item.name }}</view>
+                    <view class="bottomItemValue">{{ item.value || '0.00' }}</view>
                   </view>
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">业主自营</view>-->
+<!--                    <view class="bottomItemValue">0%</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">自营提成</view>-->
+<!--                    <view class="bottomItemValue">0%</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">合租经营</view>-->
+<!--                    <view class="bottomItemValue">32.4%</view>-->
+<!--                  </view>-->
+<!--                  <view class="itemBottomItem">-->
+<!--                    <view class="bottomItemTitle">固定租金</view>-->
+<!--                    <view class="bottomItemValue">77.6%</view>-->
+<!--                  </view>-->
                 </view>
               </view>
             </view>
           </view>
         </view>
+        </view>
       </view>
     </view>
   </view>
 </template>
 <script>
+import request from '@/util/index.js'
 export default {
   data(){
     return {
       statusBarHeight:'',
       menu:{},
       lastDay:'',
-      searchText:''
+      searchText:'',
+      pageDataObj:{},
+      OwnerListSum:{},
+      MerchantSum:{}
     }
   },
   onLoad(option){
@@ -382,7 +438,7 @@ export default {
       this.lastDay = option.time
       this.searchText = `${y}-${m}`
     }
-
+    this.handleGetTableData()
   },
   methods:{
     handleBack(){
@@ -390,6 +446,73 @@ export default {
         delta: 1
       });
     },
+    bindDateChange(e){
+      this.OwnerListSum = {}
+      this.MerchantSum = {}
+      this.pageDataObj = {}
+      console.log('e',e)
+      this.searchText = e.detail.value
+      this.handleGetTableData()
+    },
+    async handleGetTableData(){
+      uni.showLoading({
+        title:'正在加载'
+      })
+      const date = new Date(this.searchText)
+      let y = date.getFullYear()
+      let m = date.getMonth() + 1
+      if (m<10){
+        m = '0'+m
+      }
+      const req = {
+        pushProvinceCode:'340000',
+        StatisticsMonth:`${y}${m}`,
+        StatisticsDate:this.lastDay
+      }
+      const data = await request.$webGet('CommercialApi/Revenue/GetAccountReceivable',req)
+      console.log('data',data)
+      this.pageDataObj = data.Result_Data
+      let OwnerAcountSum = 0
+      let OwnerEntrySum = 0
+      let OwnerReceivableSum = 0
+
+      let MerchantAcountSum = 0
+      let MerchantEntrySum = 0
+      let MerchantReceivableSum = 0
+      this.pageDataObj.OwnerList.AcountList.forEach(item=>{
+        OwnerAcountSum+=(item.value)/10000
+      })
+      this.pageDataObj.OwnerList.EntryList.forEach(item=>{
+        OwnerEntrySum+=(item.value)/10000
+      })
+      this.pageDataObj.OwnerList.ReceivableList.forEach(item=>{
+        OwnerReceivableSum+=(item.value)/10000
+      })
+
+      this.pageDataObj.MerchantList.AcountList.forEach(item=>{
+        MerchantAcountSum+=(item.value)/10000
+      })
+      this.pageDataObj.MerchantList.EntryList.forEach(item=>{
+        MerchantEntrySum+=(item.value)/10000
+      })
+      this.pageDataObj.MerchantList.ReceivableList.forEach(item=>{
+        MerchantReceivableSum+=(item.value)/10000
+      })
+      let OwnerListSum = {
+        AcountSum:OwnerAcountSum,
+        EntrySum:OwnerEntrySum,
+        ReceivableSum:OwnerReceivableSum
+      }
+      let MerchantSum = {
+        AcountSum:MerchantAcountSum,
+        EntrySum:MerchantEntrySum,
+        ReceivableSum:MerchantReceivableSum
+      }
+      this.OwnerListSum = OwnerListSum
+      this.MerchantSum = MerchantSum
+      console.log('this.pageDataObj',this.pageDataObj)
+      uni.hideLoading()
+    }
   }
 }
 </script>
@@ -463,21 +586,26 @@ export default {
     width: 100%;
     box-sizing: border-box;
     padding: 0 32rpx 48rpx;
-    transform: translateY(-260rpx);
+    position: relative;
+    top: -260rpx;
+    //transform: translateY(-260rpx);
     .revenueBox{
       width: 100%;
+      height: 100%;
       background:#fff;
       border-radius: 24rpx;
       box-sizing: border-box;
       padding: 4rpx;
+      .bigBox{
+        position: relative;
+        width: 100%;
+        height: 100%;
+      }
       .revenueBoxHeader{
         width: 100%;
-        height: 500px;
         border-radius: 12rpx 12rpx 0 0;
         box-sizing: border-box;
         padding: 22rpx 24rpx;
-        position: relative;
-        overflow: hidden;
         .headerTitle{
           font-size: 36rpx;
           font-family: Alimama ShuHeiTi;
@@ -486,15 +614,14 @@ export default {
         }
         .revenueImg{
           position: absolute;
-          right: 0;top: 0;
+          top: 0;right: 0;
           width: 266rpx;
           height: 208rpx;
-
         }
         .revenueContent{
-          position: absolute;
           z-index: 2;
-          width: calc(100% - 48rpx);
+          width: 100%;
+          position: relative;
           .sumBox{
             width: 100%;
             box-sizing: border-box;
@@ -624,7 +751,6 @@ export default {
     }
     .otherData{
       .revenueBoxHeader{
-        height: 530px;
         background: linear-gradient(#F1F7FF 0%, #FFFFFF 20% , #FFFFFF 100%);
         .headerTitle{
           color: #096EF7;