修改账单页面

src/views/ldt_bills/balancebills.vue

@@ -61,24 +61,7 @@
         <!--        <el-button type="primary" :size="size">导出已生成列表</el-button>-->
       </template>
       <template slot="menuLeft">
-        <span type="info" style="font-family: '宋体'">
-          用户付款总金额:
-          <span style="background-color: #d50e71;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-            {{parseFloat(parseFloat(censusPrice.PAY_CONSUMER!==undefined?censusPrice.PAY_CONSUMER:0)  + parseFloat(censusPrice.WECHAT_PAY!==undefined?censusPrice.WECHAT_PAY:0)).toFixed(2)}}
-          </span>
-        </span>
-        <span style="font-family: '宋体'">
-          商场交易总金额:
-          <span style="background-color: #8c70b6;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-            {{parseFloat(censusPrice.MALL_SEND!==undefined?censusPrice.MALL_SEND:0).toFixed(2)}}
-          </span>
-        </span>&nbsp;
-        <span type="warning" style="font-family: '宋体'">
-          商户交易总金额:
-          <span style="background-color: #a9c985;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-            {{parseFloat(censusPrice.SHOP_SEND!==undefined?censusPrice.SHOP_SEND:0).toFixed(2)}}
-          </span>
-        </span>&nbsp;
+        <IconFontComp :option="censusOption"></IconFontComp>
       </template>
     </avue-crud>
   </basic-container>
@@ -86,11 +69,13 @@
 
 <script>
   import {getList, generateList, getDetail, censusPrice, add, update, remove} from "@/api/ldt_bills/balancebills";
+  import IconFontComp from "./comps/iconfont";
   import {mapGetters} from "vuex";
   import moment from "moment";
   import FileUtil from "@/util/fileUtil";
 
   export default {
+    components:{IconFontComp},
     data() {
       return {
         form: {},
@@ -100,7 +85,6 @@
           type: -1,
           payStatus: -1,
         },
-        censusPrice:{},
         loading: true,
         page: {
           pageSize: 10,
@@ -124,6 +108,7 @@
           selection: true,
           searchBtn: false,
           emptyBtn: false,
+          searchSize: "mini",
           dialogClickModal: false,
           column: [
             {
@@ -296,7 +281,36 @@
             }
           ]
         },
-        data: []
+        data: [],
+        censusOption: {
+          span: ()=>24/this.censusOption.data.length,
+          data: [
+            {
+              title: '用户付款',
+              prop: ["PAY_CONSUMER","WECHAT_PAY"],
+              count: 0,
+              decimals: 2,
+              icon: 'el-icon-s-custom',
+              color: '0, 167, 208',
+            },
+            {
+              title: '商场交易',
+              prop: "MALL_SEND",
+              count: 0,
+              decimals: 2,
+              icon: 'el-icon-paperclip',
+              color: '27, 201, 142',
+            },
+            {
+              title: '商户交易',
+              prop: "SHOP_SEND",
+              count: 0,
+              decimals: 2,
+              icon: 'el-icon-s-shop',
+              color: '230, 71, 88',
+            }
+          ]
+        }
       };
     },
     computed: {
@@ -475,9 +489,12 @@
         this.onLoad(this.page, this.query);
       },
       onLoad(page, params = {}) {
-        let values = {
-          ...params,
-        };
+        let values = {};
+        for (const item in params) {
+          if (params[item] !== undefined && params[item] !== -1) {
+            values[item] = params[item];
+          }
+        }
         values.createTime = null;
         values.createTimeRange = null;
         this.loading = true;
@@ -489,24 +506,22 @@
           this.selectionClear();
         });
       },
-      getCensusPrice(){
-        censusPrice().then(res=>{
-          res.data.data.forEach(ele=>{
-            this.censusPrice[ele.type] = ele.price;
-          })
+      getCensusPrice() {
+        censusPrice().then(res => {
+          res.data.data.forEach(ele => {
+            const find = this.censusOption.data.find(ele2=>{
+              return ele2.prop.indexOf(ele.type)!==-1;
+            });
+            if(find && ele.price){
+              find.count = find.count + parseFloat(ele.price);
+            }
+          });
         });
       },
       //搜索状态改变
       searchStateChange() {
         setTimeout(() => {
-          const newQuery = {};
-          this.page.currentPage = 1;
-          for (const item in this.query) {
-            if (this.query[item] !== undefined && this.query[item] !== -1) {
-              newQuery[item] = this.query[item];
-            }
-          }
-          this.onLoad(this.page, newQuery);
+          this.onLoad(this.page, this.query);
         }, 100);
       },
       //生成列表并到处

src/views/ldt_bills/bills.vue

@@ -63,7 +63,7 @@
         <!--        <el-button type="primary" :size="size">导出已生成列表</el-button>-->
       </template>
       <template slot="menuLeft">
-        <avue-data-panel :option="censusOption"></avue-data-panel>
+        <IconFontComp :option="censusOption"></IconFontComp>
       </template>
       <!--      <template slot-scope="scope" slot="dataInfo">-->
       <!--        <div v-if="scope.row.payStatus==='付款成功'">-->
@@ -80,11 +80,13 @@
 
 <script>
 import {getList, censusPrice, getDetail, add, update, remove, generateList} from "@/api/ldt_bills/bills";
+import IconFontComp from "./comps/iconfont";
 import {mapGetters} from "vuex";
 import moment from "moment";
 import FileUtil from "@/util/fileUtil";
 
 export default {
+  components:{IconFontComp},
   data() {
     return {
       form: {},
@@ -116,6 +118,7 @@ export default {
         selection: true,
         searchBtn: false,
         emptyBtn: false,
+        searchSize: "mini",
         dialogClickModal: false,
         column: [
           {
@@ -416,31 +419,31 @@ export default {
       },
       data: [],
       censusOption: {
-        span: 8,
+        span: ()=>24/this.censusOption.data.length,
         data: [
           {
             title: '用户付款',
-            prop: "USER_PAY",
+            prop: ["USER_PAY","WECHAT_PAY"],
             count: 0,
             decimals: 2,
-            icon: 'el-icon-message',
-            color: '#00a7d0',
+            icon: 'el-icon-s-custom',
+            color: '0, 167, 208',
           },
           {
             title: '代理充值',
             prop: "AGENT_CHARGE",
             count: 0,
             decimals: 2,
-            icon: 'el-icon-info',
-            color: 'rgb(27, 201, 142)',
+            icon: 'el-icon-paperclip',
+            color: '27, 201, 142',
           },
           {
             title: '商场充值',
             prop: "MALL_RECHARGE",
             count: 0,
             decimals: 2,
-            icon: 'el-icon-success',
-            color: 'rgb(230, 71, 88)',
+            icon: 'el-icon-s-shop',
+            color: '230, 71, 88',
           }
         ]
       }
@@ -622,9 +625,12 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      let values = {
-        ...params,
-      };
+      let values = {};
+      for (const item in params) {
+        if (params[item] !== undefined && params[item] !== -1) {
+          values[item] = params[item];
+        }
+      }
       values.createTime = null;
       values.createTimeRange = null;
       this.loading = true;
@@ -639,41 +645,19 @@ export default {
     getCensusPrice() {
       censusPrice().then(res => {
         res.data.data.forEach(ele => {
-          this.censusOption.data.find(ele2=>{
-            return ele2.prop === ele.type;
-          }).count = ele.price;
-        })
+          const find = this.censusOption.data.find(ele2=>{
+            return ele2.prop.indexOf(ele.type)!==-1;
+          });
+          if(find && ele.price){
+            find.count = find.count + parseFloat(ele.price);
+          }
+        });
       });
-      // <span style="font-family: '宋体'">
-      //             用户付款总额:
-      //             <span style="background-color: #8c70b6;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-      //               {{parseFloat(parseFloat(censusPrice.USER_PAY!==undefined?censusPrice.USER_PAY:0) + parseFloat(censusPrice.WECHAT_PAY!==undefined?censusPrice.WECHAT_PAY:0)).toFixed(2)}}
-      //             </span>
-      //           </span>&nbsp;
-      // <span type="warning" style="font-family: '宋体'">
-      //             代理充值总额:
-      //             <span style="background-color: #a9c985;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-      //               {{parseFloat(censusPrice.AGENT_CHARGE!==undefined?censusPrice.AGENT_CHARGE:0).toFixed(2)}}
-      //             </span>
-      //           </span>&nbsp;
-      // <span type="info" style="font-family: '宋体'">
-      //             商场充值总额:
-      //             <span style="background-color: #d50e71;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-      //               {{parseFloat(censusPrice.MALL_RECHARGE!==undefined?censusPrice.MALL_RECHARGE:0).toFixed(2)}}
-      //             </span>
-      //           </span>
     },
     //搜索状态改变
     searchStateChange() {
       setTimeout(() => {
-        const newQuery = {};
-        this.page.currentPage = 1;
-        for (const item in this.query) {
-          if (this.query[item] !== undefined && this.query[item] !== -1) {
-            newQuery[item] = this.query[item];
-          }
-        }
-        this.onLoad(this.page, newQuery);
+        this.onLoad(this.page, this.query);
       }, 100);
     },
     //生成列表并到处

src/views/ldt_bills/comps/iconfont.vue

@@ -0,0 +1,73 @@
+<template>
+  <el-row style="width: 100%">
+    <el-col :span="option.span" v-for="(data,index) in option.data" :key="index">
+      <div :style="{height: `${height}px`,
+            minWidth:'200px',
+            backgroundColor: 'rgb(245, 247, 249)',
+            borderRadius: '5px',
+            margin: '4px 5px',
+            // boxShadow: '2px 2px 2px 2px rgba(0, 0, 0,0.3)'
+        }">
+        <!-- 图标内容 -->
+        <div :style="{
+            height: '100%',
+            width:'50%',
+            display: 'inline-block',
+            float: 'left'
+         }">
+          <div :style="{
+            width: `${height/3}px`,
+            height: `${height/3}px`,
+            margin: `${height/2 - height/3/2 - height/2/5}px`,
+            lineHeight: `${height/3+height/2/5}px`,
+            boxShadow: `0px 0px 5px 5px rgba(${data.color?data.color:'0,0,0'},0.3)`,
+            textAlign: 'center',
+            border:`${height/2/5}px solid rgb(${data.color?data.color:'0,0,0'})`,
+            borderRadius: '50%',
+            backgroundColor: `rgb(${data.color?data.color:'0,0,0'})`
+          }">
+            <i :class="data.icon" :style="{
+              fontSize: `${height/3}px`,
+              color: 'white',
+            }"></i>
+          </div>
+        </div>
+        <!-- 描述内容 -->
+        <div :style="{
+            height: '100%',
+            width:'50%',
+            display: 'inline-block',
+         }">
+          <h4 :style="{
+            marginTop: `${(height/2-10)/2}px`,
+            marginBottom: '10px',
+          }">{{data.title}}</h4>
+          <p :style="{
+            color:'gary',
+            margin: '10px 0',
+          }">{{data.decimals?parseFloat(data.count).toFixed(2):data.count}}</p>
+        </div>
+      </div>
+    </el-col>
+  </el-row>
+</template>
+
+<script>
+export default {
+  name: "iconfont",
+  props:{
+    option:{
+      type: "Object",
+      default: {}
+    },
+    height:{
+      type:"Number",
+      default: 80
+    }
+  }
+}
+</script>
+
+<style scoped>
+
+</style>

src/views/ldt_bills/platformbills.vue

@@ -54,24 +54,7 @@
         <!--        <el-button type="primary" :size="size">导出已生成列表</el-button>-->
       </template>
       <template slot="menuLeft">
-        <span style="font-family: '宋体'">
-          用户付款费用总额:
-          <span style="background-color: #8c70b6;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-            {{parseFloat(parseFloat(censusPrice.USER_PAY!==undefined?censusPrice.USER_PAY:0) + parseFloat(censusPrice.WECHAT_PAY!==undefined?censusPrice.WECHAT_PAY:0)).toFixed(2)}}
-          </span>
-        </span>&nbsp;
-        <span type="warning" style="font-family: '宋体'">
-          代理充值费用总额:
-          <span style="background-color: #a9c985;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-            {{parseFloat(censusPrice.AGENT_CHARGE!==undefined?censusPrice.AGENT_CHARGE:0).toFixed(2)}}
-          </span>
-        </span>&nbsp;
-        <span type="info" style="font-family: '宋体'">
-          商场充值费用总额:
-          <span style="background-color: #d50e71;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-            {{parseFloat(censusPrice.MALL_RECHARGE!==undefined?censusPrice.MALL_RECHARGE:0).toFixed(2)}}
-          </span>
-        </span>
+        <IconFontComp :option="censusOption"></IconFontComp>
       </template>
     </avue-crud>
   </basic-container>
@@ -79,11 +62,13 @@
 
 <script>
   import {getList, generateList, censusPrice, getDetail, add, update, remove} from "@/api/ldt_bills/platformbills";
+  import IconFontComp from "./comps/iconfont";
   import {mapGetters} from "vuex";
   import moment from "moment";
   import FileUtil from "@/util/fileUtil";
 
   export default {
+    components:{IconFontComp},
     data() {
       return {
         form: {},
@@ -115,6 +100,7 @@
           selection: true,
           searchBtn: false,
           emptyBtn: false,
+          searchSize: "mini",
           dialogClickModal: false,
           column: [
             {
@@ -242,7 +228,36 @@
             },
           ]
         },
-        data: []
+        data: [],
+        censusOption: {
+          span: ()=>24/this.censusOption.data.length,
+          data: [
+            {
+              title: '用户付款',
+              prop: ["USER_PAY","WECHAT_PAY"],
+              count: 0,
+              decimals: 2,
+              icon: 'el-icon-s-custom',
+              color: '0, 167, 208',
+            },
+            {
+              title: '代理充值',
+              prop: "AGENT_CHARGE",
+              count: 0,
+              decimals: 2,
+              icon: 'el-icon-paperclip',
+              color: '27, 201, 142',
+            },
+            {
+              title: '商场充值',
+              prop: "MALL_RECHARGE",
+              count: 0,
+              decimals: 2,
+              icon: 'el-icon-s-shop',
+              color: '230, 71, 88',
+            }
+          ]
+        }
       };
     },
     computed: {
@@ -421,9 +436,12 @@
         this.onLoad(this.page, this.query);
       },
       onLoad(page, params = {}) {
-        let values = {
-          ...params,
-        };
+        let values = {};
+        for (const item in params) {
+          if (params[item] !== undefined && params[item] !== -1) {
+            values[item] = params[item];
+          }
+        }
         values.createTime = null;
         values.createTimeRange = null;
         this.loading = true;
@@ -435,24 +453,22 @@
           this.selectionClear();
         });
       },
-      getCensusPrice(){
-        censusPrice().then(res=>{
-          res.data.data.forEach(ele=>{
-            this.censusPrice[ele.type] = parseFloat(ele.price);
-          })
+      getCensusPrice() {
+        censusPrice().then(res => {
+          res.data.data.forEach(ele => {
+            const find = this.censusOption.data.find(ele2=>{
+              return ele2.prop.indexOf(ele.type)!==-1;
+            });
+            if(find && ele.price){
+              find.count = find.count + parseFloat(ele.price);
+            }
+          });
         });
       },
       //搜索状态改变
       searchStateChange() {
         setTimeout(() => {
-          const newQuery = {};
-          this.page.currentPage = 1;
-          for (const item in this.query) {
-            if (this.query[item] !== undefined && this.query[item] !== -1) {
-              newQuery[item] = this.query[item];
-            }
-          }
-          this.onLoad(this.page, newQuery);
+          this.onLoad(this.page, this.query);
         }, 100);
       },
       //生成列表并到处

src/views/ldt_bills/pointbills.vue

@@ -75,41 +75,10 @@
         <!--        <el-button type="primary" :size="size">导出已生成列表</el-button>-->
       </template>
       <template slot="menuLeft">
-        <span style="font-family: '宋体',serif" v-if="this.userInfo.role_name !== 'administrator'">
-          余额(易宝):
-          <span
-            style="background-color: #494141;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-            {{ censusPrice.accountsPayable }}
-<!--            {{ parseFloat(censusPrice.yeePayBalance | 0).toFixed(2) }}-->
-          </span>
-        </span>&nbsp;
-        <span type="warning" style="font-family: '宋体',serif" v-if="this.userInfo.role_name !== 'administrator'">
-          总金额:
-          <span
-            style="background-color: #967f1e;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-            {{ censusPrice.accountsPayable }}
-<!--            {{ parseFloat(censusPrice.accountsPayable | 0).toFixed(2) }}-->
-          </span>
-        </span>&nbsp;
-        <span type="info" style="font-family: '宋体',serif">
-          已核销金额:
-          <span
-            style="background-color: #096e38;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-            {{ censusPrice.handledAmount }}
-<!--            {{ parseFloat(censusPrice.handledAmount | 0).toFixed(2) }}-->
-          </span>
-        </span>
-        <span type="info" style="font-family: '宋体',serif">
-          未核销金额:
-          <span
-            style="background-color: #f60824;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-            {{ censusPrice.untreatedAmount }}
-<!--            {{ parseFloat(censusPrice.untreatedAmount | 0).toFixed(2) }}-->
-          </span>
-        </span>
+        <IconFontComp :option="censusOption"></IconFontComp>
       </template>
 
-      <template slot="menuLeft" v-if="this.userInfo.role_name !== 'administrator'">
+      <template slot="menuRight" v-if="this.userInfo.role_name !== 'administrator'">
         <el-button type="danger"
                    size="small"
                    icon="el-icon-money"
@@ -123,11 +92,13 @@
 
 <script>
 import {add, censusPrice, getDetail, getList, handlePointBills, remove, update, generateList} from "@/api/ldt_bills/pointbills";
+import IconFontComp from "./comps/iconfont";
 import {mapGetters} from "vuex";
 import moment from "moment";
 import FileUtil from "@/util/fileUtil";
 
 export default {
+  components:{IconFontComp},
   data() {
     return {
       form: {},
@@ -139,7 +110,6 @@ export default {
         type: -1
       },
       loading: true,
-      censusPrice: {},
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -160,6 +130,9 @@ export default {
         editBtn: false,
         viewBtn: true,
         selection: true,
+        searchBtn: false,
+        searchSize: "mini",
+        emptyBtn: false,
         dialogClickModal: false,
         column: [
           {
@@ -391,7 +364,44 @@ export default {
           },
         ]
       },
-      data: []
+      data: [],
+      censusOption: {
+        span: ()=>24/this.censusOption.data.length,
+        data: [
+          {
+            title: '易宝余额',
+            prop: "accountsPayable",
+            count: 0,
+            decimals: 2,
+            icon: 'el-icon-s-custom',
+            color: '0, 167, 208',
+          },
+          {
+            title: '应付总额',
+            prop: "accountsPayable",
+            count: 0,
+            decimals: 2,
+            icon: 'el-icon-paperclip',
+            color: '27, 201, 142',
+          },
+          {
+            title: '已核销',
+            prop: "handleAmount",
+            count: 0,
+            decimals: 2,
+            icon: 'el-icon-s-shop',
+            color: '230, 71, 88',
+          },
+          {
+            title: '未核销',
+            prop: "untreatedAmount",
+            count: 0,
+            decimals: 2,
+            icon: 'el-icon-s-shop',
+            color: '230, 71, 88',
+          }
+        ]
+      }
     };
   },
   computed: {
@@ -592,9 +602,12 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      let values = {
-        ...params,
-      };
+      let values = {};
+      for (const item in params) {
+        if (params[item] !== undefined && params[item] !== -1) {
+          values[item] = params[item];
+        }
+      }
       values.createTime = null;
       values.createTimeRange = null;
       this.loading = true;
@@ -608,20 +621,15 @@ export default {
     },
     getCensusPrice() {
       censusPrice().then(res => {
-        this.censusPrice = res.data.data;
+        this.censusOption.data.forEach(ele=>{
+          ele.count = res.data.data[ele.prop]?res.data.data[ele.prop]:0;
+        });
       });
     },
     //搜索状态改变
     searchStateChange() {
       setTimeout(() => {
-        const newQuery = {};
-        this.page.currentPage = 1;
-        for (const item in this.query) {
-          if (this.query[item] !== undefined && this.query[item] !== -1) {
-            newQuery[item] = this.query[item];
-          }
-        }
-        this.onLoad(this.page, newQuery);
+        this.onLoad(this.page, this.query);
       }, 100);
     },
     //生成列表并到处

src/views/ldt_bills/transferrec.vue

@@ -96,6 +96,7 @@
           addBtn: false,
           delBtn: false,
           editBtn: false,
+          searchSize: "mini",
           dialogClickModal: false,
           column: [
             {

src/views/ldt_bills/withdrawrec.vue

@@ -69,21 +69,9 @@
         <el-button type="primary" :size="size" icon="el-icon-top" @click="generateListAndDownload">生成列表</el-button>
         <!--        <el-button type="primary" :size="size">导出已生成列表</el-button>-->
       </template>
+
       <template slot="menuLeft">
-        <span style="font-family: '宋体'">
-          代理提现总金额:
-          <span
-            style="background-color: #8c70b6;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-            {{ censusPrice.channelAgentSum }}
-          </span>
-        </span>&nbsp;
-        <span type="warning" style="font-family: '宋体'">
-          商户提现总金额:
-          <span
-            style="background-color: #a9c985;color: white; border-radius: 5px; margin:10px; padding:0 10px 0 10px ;">
-            {{ censusPrice.merchantsSum }}
-          </span>
-        </span>&nbsp;
+        <IconFontComp :option="censusOption"></IconFontComp>
       </template>
     </avue-crud>
   </basic-container>
@@ -91,11 +79,13 @@
 
 <script>
 import moment from "moment";
+import IconFontComp from "./comps/iconfont";
 import {add, censusPrice, generateList, getDetail, getList, remove, update} from "@/api/ldt_bills/withdrawrec";
 import {mapGetters} from "vuex";
 import FileUtil from "@/util/fileUtil";
 
 export default {
+  components:{IconFontComp},
   data() {
     return {
       form: {},
@@ -106,7 +96,6 @@ export default {
         channel: -1
       },
       loading: true,
-      censusPrice: {},
       page: {
         pageSize: 10,
         currentPage: 1,
@@ -130,6 +119,7 @@ export default {
         selection: true,
         searchBtn: false,
         emptyBtn: false,
+        searchSize: "mini",
         dialogClickModal: false,
         column: [
           // {
@@ -344,7 +334,28 @@ export default {
           },
         ]
       },
-      data: []
+      data: [],
+      censusOption: {
+        span: ()=>24/this.censusOption.data.length,
+        data: [
+          {
+            title: '代理提现',
+            prop: "channelAgentSum",
+            count: 0,
+            decimals: 2,
+            icon: 'el-icon-s-custom',
+            color: '0, 167, 208',
+          },
+          {
+            title: '商户提现',
+            prop: "merchantsSum",
+            count: 0,
+            decimals: 2,
+            icon: 'el-icon-paperclip',
+            color: '27, 201, 142',
+          },
+        ]
+      }
     };
   },
   computed: {
@@ -523,9 +534,12 @@ export default {
       this.onLoad(this.page, this.query);
     },
     onLoad(page, params = {}) {
-      let values = {
-        ...params,
-      };
+      let values = {};
+      for (const item in params) {
+        if (params[item] !== undefined && params[item] !== -1) {
+          values[item] = params[item];
+        }
+      }
       values.createTime = null;
       values.createTimeRange = null;
       this.loading = true;
@@ -539,20 +553,15 @@ export default {
     },
     getCensusPrice() {
       censusPrice().then(res => {
-        this.censusPrice = res.data.data;
+        this.censusOption.data.forEach(ele=>{
+          ele.count = res.data.data[ele.prop]?res.data.data[ele.prop]:0;
+        });
       });
     },
     //搜索状态改变
     searchStateChange() {
       setTimeout(() => {
-        const newQuery = {};
-        this.page.currentPage = 1;
-        for (const item in this.query) {
-          if (this.query[item] !== undefined && this.query[item] !== -1) {
-            newQuery[item] = this.query[item];
-          }
-        }
-        this.onLoad(this.page, newQuery);
+        this.onLoad(this.page, this.query);
       }, 100);
     },
     //生成列表并到处