diff --git a/pages/revenueStatistics/detail.vue b/pages/revenueStatistics/detail.vue
index debbe86..8379ea8 100644
--- a/pages/revenueStatistics/detail.vue
+++ b/pages/revenueStatistics/detail.vue
@@ -68,7 +68,7 @@
                     <view class="secondLabel">便利店</view>
                     <view class="secondLabel">餐饮客房</view>
                     <view class="firstLabel">外包</view>
-                    <view class="secondLabel">餐商铺租赁</view>
+                    <view class="secondLabel">商铺租赁</view>
                   </view>
                   <scroll-view class="tableRight" scroll-x="true">
                     <view class="labelBox">
@@ -129,12 +129,14 @@
                   <span class="tableUnit">/万元</span>
                 </view>
 
-                <view class="tableContent" style="height: 304rpx">
+                <view class="tableContent" >
                   <view class="tableLeft">
                     <view class="label">类别</view>
-                    <view class="firstLabel">自营 (除税)</view>
-                    <view class="firstLabel">便利店 (除税)</view>
-                    <view class="firstLabel">餐饮客房 (除税)</view>
+                    <view class="firstLabel">自营</view>
+                    <view class="secondLabel">便利店</view>
+                    <view class="secondLabel">餐饮客房</view>
+                    <view class="firstLabel">外包</view>
+                    <view class="secondLabel">商铺租赁</view>
                   </view>
                   <scroll-view class="tableRight" scroll-x="true">
                     <view class="labelBox">
@@ -313,7 +315,7 @@ export default {
           }else if(item.SPRegionTypeId===2){
             // SPRegionTypeId===2 外包
             revenueList[3] = {...item.RevenueINC, type:1}
-            // accountList[3] = {...item.AccountINC, type:1}
+            accountList[3] = {...item.AccountINC, type:1}
           }else if(item.ServerpartId===1){
             revenueList[1] = {...item.RevenueINC, type:2}
             accountList[1] = {...item.AccountINC, type:2}
@@ -322,7 +324,7 @@ export default {
             accountList[2] = {...item.AccountINC,type:2}
           }else if(item.ServerpartId===3){
             revenueList[4] = {...item.RevenueINC,type:2}
-            // accountList[4] = {...item.AccountINC,type:2}
+            accountList[4] = {...item.AccountINC,type:2}
           }
         })
         this.topDetail = everyTop
diff --git a/pages/revenueStatistics/index.vue b/pages/revenueStatistics/index.vue
index fd0a5c8..9ac0503 100644
--- a/pages/revenueStatistics/index.vue
+++ b/pages/revenueStatistics/index.vue
@@ -238,8 +238,8 @@
                       <!--                    <view class="headerTitle">驿达入账收入</view>-->
                     </view>
                     <view class="sumText">
-                      <!--                  <view class="sumMoney">{{pageDataObj.OwnerRevenue?$util.fmoney(pageDataObj.OwnerRevenue/10000,2):'0.00'}}</view>-->
-                      <view class="sumMoney">{{OwnerListSum.EntrySum?$util.fmoney(OwnerListSum.EntrySum,2):'0.00'}}</view>
+                      <!--                  <view class="sumMoney">{{pageDataObj.OwnerRevenue?$util.getMoney(pageDataObj.OwnerRevenue/10000,2):'0.00'}}</view>-->
+                      <view class="sumMoney">{{OwnerListSum.EntrySum?$util.getMoney(OwnerListSum.EntrySum,2):'0.00'}}</view>
                       <view class="sumUnit">总计<span class="unit">/万元</span></view>
                     </view>
                   </view>
@@ -252,12 +252,12 @@
                           <view class="itemTitle">入账合计</view>
                           <view class="itemUnit">/万元</view>
                         </view>
-                        <view class="itemTopRight">{{OwnerListSum.EntrySum?$util.fmoney(OwnerListSum.EntrySum,2):'0.00'}}</view>
+                        <view class="itemTopRight">{{OwnerListSum.EntrySum?$util.getMoney(OwnerListSum.EntrySum,2):'0.00'}}</view>
                       </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 class="bottomItemValue">{{item.value?$util.getMoney(item.value/10000,2):'0.00'}}</view>
                         </view>
 
                         <!--                    <view class="itemBottomItem">-->
@@ -285,12 +285,12 @@
                           <view class="itemTitle">到账合计</view>
                           <view class="itemUnit">/万元</view>
                         </view>
-                        <view class="itemTopRight">{{OwnerListSum.AcountSum?$util.fmoney(OwnerListSum.AcountSum,2):'0.00'}}</view>
+                        <view class="itemTopRight">{{OwnerListSum.AcountSum?$util.getMoney(OwnerListSum.AcountSum,2):'0.00'}}</view>
                       </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 class="bottomItemValue">{{item.value?$util.getMoney(item.value/10000,2):'0.00'}}</view>
 
                         </view>
 
@@ -319,12 +319,12 @@
                           <view class="itemTitle">商家欠款</view>
                           <view class="itemUnit">/万元</view>
                         </view>
-                        <view class="itemTopRight">{{OwnerListSum.ReceivableSum?$util.fmoney(OwnerListSum.ReceivableSum,2):'0.00'}}</view>
+                        <view class="itemTopRight">{{OwnerListSum.ReceivableSum?$util.getMoney(OwnerListSum.ReceivableSum,2):'0.00'}}</view>
                       </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 class="bottomItemValue">{{item.value?$util.getMoney(item.value/10000,2):'0.00'}}</view>
                         </view>
 
                         <!--                    <view class="itemBottomItem">-->
@@ -368,8 +368,8 @@
                       <!--                    <view class="headerTitle">商家入账收入</view>-->
                     </view>
                     <view class="sumText">
-                      <!--                <view class="sumMoney">{{pageDataObj.MerchantRevenue?$util.fmoney(pageDataObj.MerchantRevenue/10000):"0.00"}}</view>-->
-                      <view class="sumMoney">{{MerchantSum.EntrySum?$util.fmoney(MerchantSum.EntrySum,2):'0.00'}}</view>
+                      <!--                <view class="sumMoney">{{pageDataObj.MerchantRevenue?$util.getMoney(pageDataObj.MerchantRevenue/10000):"0.00"}}</view>-->
+                      <view class="sumMoney">{{MerchantSum.EntrySum?$util.getMoney(MerchantSum.EntrySum,2):'0.00'}}</view>
                       <view class="sumUnit">总计<span class="unit">/万元</span></view>
                     </view>
                   </view>
@@ -382,12 +382,12 @@
                           <view class="itemTitle">入账合计</view>
                           <view class="itemUnit">/万元</view>
                         </view>
-                        <view class="itemTopRight">{{MerchantSum.EntrySum?$util.fmoney(MerchantSum.EntrySum,2):'0.00'}}</view>
+                        <view class="itemTopRight">{{MerchantSum.EntrySum?$util.getMoney(MerchantSum.EntrySum,2):'0.00'}}</view>
                       </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 class="bottomItemValue">{{item.value?$util.getMoney(item.value/10000):"0.00"}}</view>
                         </view>
 
                         <!--                  <view class="itemBottomItem">-->
@@ -415,12 +415,12 @@
                           <view class="itemTitle">到账合计</view>
                           <view class="itemUnit">/万元</view>
                         </view>
-                        <view class="itemTopRight">{{MerchantSum.AcountSum?$util.fmoney(MerchantSum.AcountSum,2):'0.00'}}</view>
+                        <view class="itemTopRight">{{MerchantSum.AcountSum?$util.getMoney(MerchantSum.AcountSum,2):'0.00'}}</view>
                       </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 class="bottomItemValue">{{item.value?$util.getMoney(item.value/10000):"0.00"}}</view>
                         </view>
 
                         <!--                  <view class="itemBottomItem">-->
@@ -448,12 +448,12 @@
                           <view class="itemTitle">应缴费用</view>
                           <view class="itemUnit">/万元</view>
                         </view>
-                        <view class="itemTopRight">{{MerchantSum.ReceivableSum?$util.fmoney(MerchantSum.ReceivableSum,2):'0.00'}}</view>
+                        <view class="itemTopRight">{{MerchantSum.ReceivableSum?$util.getMoney(MerchantSum.ReceivableSum,2):'0.00'}}</view>
                       </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 class="bottomItemValue">{{item.value?$util.getMoney(item.value/10000):"0.00"}}</view>
                         </view>
                         <!--                  <view class="itemBottomItem">-->
                         <!--                    <view class="bottomItemTitle">业主自营</view>-->
@@ -843,14 +843,14 @@ export default {
           MerchantReceivableSum+=Number(item.value)
         })
         let OwnerListSum = {
-          AcountSum:this.$util.getMoney(OwnerAcountSum/ 10000),
-          EntrySum:this.$util.getMoney(OwnerEntrySum/ 10000),
-          ReceivableSum:this.$util.getMoney(OwnerReceivableSum / 10000)
+          AcountSum:OwnerAcountSum/ 10000,
+          EntrySum:OwnerEntrySum/ 10000,
+          ReceivableSum:OwnerReceivableSum / 10000
         }
         let MerchantSum = {
-          AcountSum:this.$util.getMoney(MerchantAcountSum/ 10000),
-          EntrySum:this.$util.getMoney(MerchantEntrySum/ 10000),
-          ReceivableSum:this.$util.getMoney(MerchantReceivableSum/ 10000)
+          AcountSum:MerchantAcountSum/ 10000,
+          EntrySum:MerchantEntrySum/ 10000,
+          ReceivableSum:MerchantReceivableSum/ 10000
         }
         this.OwnerListSum = OwnerListSum
         this.MerchantSum = MerchantSum