Merge branch 'master' of https://git.bjtdba.com/shop/shop_adimn_backgroud

src/api/accounts.js

@@ -190,6 +190,20 @@ export function getVrCountApi(data) {
 }
 
 /**
+ * @description PV统计
+ */
+export function getPvCountApi(data) {
+  return request.get('finance/pv_list', data)
+} 
+
+/**
+ * @description 商户分润统计
+ */
+export function getFenrunApi(data) {
+  return request.get('finance/fenrun_list', data)
+}
+
+/**
  * @description 佣金统计
  */
 export function getYongJinCountApi(data) {

src/router/modules/accounts.js

@@ -173,10 +173,10 @@ const accountsRouter =
         meta: {
           title: '红包统计',
           noCache: true
-        },
+        },  
         component: () => import('@/views/accounts/caiwutongji/hongbao/index')
       },
-      {
+      {  
         path: 'count/fugou',
         name: 'fugou',
         meta: {
@@ -190,10 +190,28 @@ const accountsRouter =
         name: 'vr',
         meta: {
           title: 'vr统计',
-          noCache: true
+          noCache: true 
         },
         component: () => import('@/views/accounts/caiwutongji/vr/index')
       },
+      {  
+        path: 'count/pv',
+        name: 'pv',
+        meta: {
+          title: 'PV统计',
+          noCache: true
+        },
+        component: () => import('@/views/accounts/caiwutongji/pv/index')
+      },
+      { 
+        path: 'count/fenrun',
+        name: 'fenrun',
+        meta: {
+          title: '商户分润统计',
+          noCache: true
+        },
+        component: () => import('@/views/accounts/caiwutongji/fenrun/index')
+      },
       {
         path: 'record/bill',
         name: 'billRecord',

src/views/accounts/caiwutongji/commission/index.vue

@@ -55,8 +55,35 @@
                                 <el-option :value="-1" label="已失效"/>
                             </el-select>
                         </el-form-item>
+
+                        <!-- 佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\\r\\n5 养老金√ 6 广告费 7 锁客收益 √ 8平台奖励 9渠道商\\r\\n10 推广店铺收益 √ 11.合伙人分红 12联创分红，13 股权分红 -->
+                        <el-form-item class="selected-kuang" label="名称：">
+                            <el-select
+                                v-model="tableFrom.commission_type"
+                                class="filter-item"
+                                placeholder="全部"
+                                @change="getList(1)"
+                            >
+                                <el-option value="" label="全部"/> 
+                                <!-- <el-option :value="1" label="代理费"/>
+                                <el-option :value="2" label="消费佣金"/> -->
+                                <el-option :value="3" label="直推佣金"/>
+                                <!-- <el-option :value="4" label="辖区佣金"/>
+                                <el-option :value="5" label="养老金"/>
+                                <el-option :value="6" label="广告费"/> -->
+                                <el-option :value="7" label="锁客收益"/>
+                                <!-- <el-option :value="8" label="平台奖励"/>
+                                <el-option :value="9" label="渠道商"/> -->
+                                <el-option :value="10" label="推广店铺收益"/>
+                                <el-option :value="11" label="合伙人分红"/>
+                                <el-option :value="12" label="联创分红"/>
+                                <el-option :value="13" label="股权分红"/>
+                            </el-select>
+                        </el-form-item>
                     </el-form>
 
+                    
+
                     <div class="bottom-button">
                         <el-button size="small" style="width: 100px; margin-top: 20px; border: 1px solid #999;"
                                    @click="reset">重置
@@ -65,6 +92,8 @@
 
                         <el-button size="small" style="width: 100px; margin-top: 20px;" type="primary" @click="getList(1)">查询
                         </el-button>
+
+                        <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button>
                     </div>
 
                 </div>
@@ -116,6 +145,26 @@
                       <span v-if="scope.row.user_group == 7"> 董事 </span>
                   </template>
                 </el-table-column>
+
+                 <!-- 佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\\r\\n5 养老金√ 6 广告费 7 锁客收益 √ 8平台奖励 9渠道商\\r\\n10 推广店铺收益 √ 11.合伙人分红 12联创分红，13 股权分红 -->  
+                <el-table-column label="名称" min-width="130" >
+                  <template slot-scope="scope">
+                      <span v-if="scope.row.commission_type == 1"> 代理费 </span>   
+                      <span v-if="scope.row.commission_type == 2"> 消费佣金 </span>
+                      <span v-if="scope.row.commission_type == 3"> 直推佣金 </span>
+                        <span v-if="scope.row.commission_type == 4"> 辖区佣金 </span>
+                        <span v-if="scope.row.commission_type == 5"> 养老金 </span>
+                        <span v-if="scope.row.commission_type == 6"> 广告费 </span>
+                        <span v-if="scope.row.commission_type == 7"> 锁客收益 </span>
+                        <span v-if="scope.row.commission_type == 8"> 平台奖励 </span>
+                        <span v-if="scope.row.commission_type == 9"> 渠道商 </span>
+                        <span v-if="scope.row.commission_type == 10"> 推广店铺收益 </span>
+                        <span v-if="scope.row.commission_type == 11"> 合伙人分红 </span>
+                        <span v-if="scope.row.commission_type == 12"> 联创分红 </span>
+                        <span v-if="scope.row.commission_type == 13"> 股权分红 </span>
+                  </template>
+                </el-table-column>
+
                 <!-- <el-table-column label="隶属团队" min-width="130" prop="team_account"/> -->
                 <el-table-column label="说明" min-width="130" prop="title"/>
                 <el-table-column label="关联订单" prop="order_sn"  min-width="130">
@@ -299,13 +348,15 @@ export default {
         },
         // 导出
         exportSearchResult() {
-            RewardExcelApi(this.paramsData).then(res => {
-                console.log(res.data)
-                console.log(res.data.path)
-                window.open(res.data.path)
-                // window.open(SettingMer.https + `/excel/download/0?token=` + getToken()+`&path=` + res.data.path)
+            this.tableFrom.is_excel = 1;
+            getYongJinCountApi(this.tableFrom).then(res => {
+                console.log( res.data)
+                console.log( res.data.path)
+                this.tableFrom.is_excel = 0;
+                this.$message.success('导出成功')
+                window.open( res.data.path)
             }).catch((res) => {
-
+                this.$message.error('导出失败');
             })
         },
 

src/views/accounts/caiwutongji/contribute/index.vue

@@ -44,9 +44,8 @@
 
                 <div class="bottom-button">
                   <el-button size="small" @click="reset" style="width: 100px; margin-top: 20px; border: 1px solid; " >重置</el-button>
-                  <!-- <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button> -->
-
                   <el-button type="primary" size="small" @click="getList(1)" style="width: 100px; margin-top: 20px;">查询</el-button>
+                  <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button>
                 </div>
             </div>
 
@@ -232,23 +231,23 @@ export default {
             page: 1,
             limit: 20,
             type: "",
-            pm: ""
+            pm: "",
+            is_excel: 0,
           }
         this.getList();
       },
       exportSearchResult() {
-        RewardExcelApi(this.paramsData).then(res => {
+        this.tableFrom.is_excel = 1;
+        getContributeCountApi(this.tableFrom).then(res => {
           console.log( res.data)
           console.log( res.data.path)
+          this.tableFrom.is_excel = 0;
+          this.$message.success('导出成功')
           window.open( res.data.path)
-          // window.open(SettingMer.https + `/excel/download/0?token=` + getToken()+`&path=` + res.data.path)
         }).catch((res) => {
-
+          this.$message.error('导出失败');
         })
       },
-
-
-
         // 表格某一行添加特定的样式
         addTdClass(val) {
             if (val.row.status > 0 && val.row.paid == 1) {

src/views/accounts/caiwutongji/fenrun/index.vue

@@ -0,0 +1,451 @@
+<template>
+<div class="divBox">
+    <el-card class="box-card">
+        <div slot="header" class="clearfix">
+            <div class="container">
+                <el-form size="small" label-width="100px">
+                    <el-form-item label="时间选择：" class="width100">
+                        <el-radio-group v-model="tableFrom.date" type="button" class="mr20" size="small" @change="selectChange(tableFrom.date)">
+                            <el-radio-button v-for="(item,i) in fromList.fromTxt" :key="i" :label="item.val">{{ item.text }}</el-radio-button>
+                        </el-radio-group>
+                        <el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;" @change="onchangeTime" />
+                    </el-form-item>
+                    <el-form-item label="用户手机号：" class="width100">
+                        <el-input v-model="tableFrom.phone" placeholder="请输入" class="selWidth" size="small">
+                        </el-input>
+                    </el-form-item>
+                    <!-- <el-form-item label="商户分润变动：" class="selected-kuang">
+                      <el-select
+                        v-model="tableFrom.pm"
+                        placeholder="全部"
+                        class="filter-item"
+                        @change="getList(1)"
+                      >
+                        <el-option label="全部" value="" />
+                        <el-option label="增加" value="1" />
+                        <el-option label="扣减" value="2" />
+                      </el-select>
+                    </el-form-item> --> 
+                    <el-form-item label="分润状态：" class="selected-kuang"> 
+                      <el-select 
+                        v-model="tableFrom.status"
+                        placeholder="全部"
+                        class="filter-item"
+                        @change="getList(1)"
+                      >
+                        <el-option label="全部" value="" />
+                        <el-option label="已结算" value="1" />
+                        <el-option label="未结算" value="-1" />
+                        <el-option label="已失效" value="0" />
+                      </el-select>
+                    </el-form-item>
+
+                </el-form>
+
+                <div class="bottom-button">
+                  <el-button size="small" @click="reset" style="width: 100px; margin-top: 20px; border: 1px solid; " >重置</el-button>
+                  <!-- <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button> -->
+
+                  <el-button type="primary" size="small" @click="getList(1)" style="width: 100px; margin-top: 20px;">查询</el-button>
+                  <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button>
+                </div>
+            </div>
+
+
+
+        </div>
+
+        <div style="display: flex">
+          <div class="jiangjintotal" v-for="(v,k) in cardLists" >
+            <span class="jiangjintotal-title">{{ v.name }}</span>
+            <span class="money">{{ v.count }}</span>
+          </div>
+        </div>
+
+        <el-table :data="tableData.data" style="width: 100%" size="mini" class="table" highlight-current-row >
+
+
+            <el-table-column label="ID" prop="id" min-width="100" />
+            <el-table-column label="时间" prop="addtime" min-width="150" />
+            <!-- <el-table-column label="用户昵称" prop="nickname"  min-width="130" />
+            <el-table-column label="用户账号(手机号)" prop="phone"  min-width="130" /> -->
+
+            <el-table-column label="商户分润金额" prop="number"  min-width="130" />
+            <el-table-column label="订单金额" prop="total_price"  min-width="130" />
+            <el-table-column label="状态" prop="status"  min-width="130">
+              <template slot-scope="scope">
+                <span v-if="scope.row.status == 1">有效</span>  
+                <span v-if="scope.row.status == -1">待确认</span>
+                <span v-if="scope.row.status == 0">已失效</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="店铺名称" prop="mer_name"  min-width="130" />
+            <!-- <el-table-column label="商户分润变动" prop="status"  min-width="130">
+              <template slot-scope="scope">
+                <span v-if="scope.row.pm == 1">增加</span>
+                <span v-if="scope.row.pm == 2">扣减</span>
+              </template>
+            </el-table-column> -->
+            <el-table-column label="关联订单" prop="order_sn"  min-width="130">
+              <template slot-scope="scope">
+                <span style="color: blue; cursor: pointer;" @click="pushToOrderList(scope.row.order_sn)">{{ scope.row.order_sn }}</span>
+              </template>
+            </el-table-column>
+        </el-table>
+        <div class="block">
+          <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFrom.limit" :current-page="tableFrom.page"
+            layout="total, sizes, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
+            @current-change="pageChange" />
+        </div>
+    </el-card>
+
+
+</div>
+</template>
+
+<script>
+import {
+    redPointListApi,
+    exportOrderApi,
+} from "@/api/order";
+
+import { performanceDivvyLstApi } from '@/api/protocol'
+
+import fileList from "@/components/exportFile/fileList";
+import cardsData from "@/components/cards/index";
+import {getZeroPointApi, getFenrunApi} from "@/api/accounts";
+import {roterPre} from "@/settings";
+export default {
+    components: {
+        cardsData,
+        fileList
+    },
+    data() {
+        return {
+            performanceList:[],
+            merSelect: [],
+            timeVal: '',
+            tableData: {
+                data: [],
+                total: 0,
+            },
+            listLoading: true,
+            tableFrom: {
+                uid: "",
+                date: "",
+                page: 1,
+                limit: 20,
+                type: "",
+                pm: ""
+            },
+            fromList: {
+                title: "选择时间",
+                custom: true,
+                fromTxt: [{
+                        text: "全部",
+                        val: ""
+                    },
+                    {
+                        text: "今天",
+                        val: "today"
+                    },
+                    {
+                        text: "昨天",
+                        val: "yesterday"
+                    },
+                    {
+                        text: "最近7天",
+                        val: "lately7"
+                    },
+                    {
+                        text: "最近30天",
+                        val: "lately30"
+                    },
+                    {
+                        text: "本月",
+                        val: "month"
+                    },
+                    {
+                        text: "本年",
+                        val: "year"
+                    },
+                ],
+            },
+            fileVisible: false,
+            cardLists: [],
+            teamList: [],
+
+        };
+    },
+    mounted() {
+        this.getList(1);
+
+        performanceDivvyLstApi({'page':1,'limit':100,'state':1}).then(res => {
+          this.performanceList = res.data.list
+        }).catch(res => {
+          this.$message.error(res.message)
+        })
+        // 获取隶属团队
+        getZeroPointApi().then(res => {
+            this.teamList = res.data
+            console.log('隶属团队')
+            console.log(this.teamList)
+        }).catch((res) => {
+            this.$message.error(res.message);
+        });
+
+    },
+    methods: {
+
+      pushToOrderList(orderIds) {
+
+
+        // accounts/extract
+
+        this.$router.push({
+          path: roterPre + "/order/list/",
+          query: { order_sn: orderIds },
+        });
+      },
+
+      tanchuang() {
+        this.dialogVisible = true
+      },
+
+      selectData(name) {
+        if (name == '系统奖励红商户分润数') {
+          this.tableFrom.pm = '1'
+        } else if (name == '系统销毁红商户分润数') {
+          this.tableFrom.pm = '2'
+        } else if (name == '人工奖励红商户分润数') {
+          this.tableFrom.pm = '3'
+        } else if (name == '人工销毁红商户分润数') {
+          this.tableFrom.pm = '4'
+        }
+
+        this.getList(1)
+      },
+
+      // 重置
+      reset() {
+        this.tableFrom ={
+            uid: "",
+            date: "",
+            page: 1,
+            limit: 20,
+            type: "",
+            pm: ""
+          }
+        this.getList();
+      },
+      exportSearchResult() {
+        this.tableFrom.is_excel = 1;
+        getFenrunApi(this.tableFrom).then(res => {
+            console.log( res.data)
+            console.log( res.data.path)
+            this.tableFrom.is_excel = 0;
+            this.$message.success('导出成功')
+            window.open( res.data.path)
+        }).catch((res) => {
+            this.$message.error('导出失败');
+        })
+      },
+
+
+
+        // 表格某一行添加特定的样式
+        addTdClass(val) {
+            if (val.row.status > 0 && val.row.paid == 1) {
+                for (let i = 0; i < val.row.orderProduct.length; i++) {
+                    if (val.row.orderProduct[i].refund_num > 0 && val.row.orderProduct[i].refund_num < val.row.orderProduct[i].product_num) {
+                        return "row-bg";
+                    }
+                }
+            } else {
+                return " ";
+            }
+        },
+
+        // 导出
+        exportOrder() {
+            exportOrderApi(this.tableFrom)
+                .then((res) => {
+                    // this.$message.success(res.message);
+                    // this.fileVisible = true;
+                    // this.$refs.exportList.exportFileList();
+                  const h = this.$createElement;
+                  this.$msgbox({
+                    title: '提示',
+                    message: h('p', null, [
+                      h('span', null, '文件正在生成中，请稍后点击"'),
+                      h('span', { style: 'color: teal' }, '导出已生成列表'),
+                      h('span', null, '"查看~ '),
+                    ]),
+                    confirmButtonText: '我知道了',
+                  }).then(action => {
+
+                  });                })
+                .catch((res) => {
+                    this.$message.error(res.message);
+                });
+        },
+        getExportFileList() {
+            this.fileVisible = true;
+            this.$refs.exportList.exportFileList('order');
+        },
+
+        handleSelectionChange(val) {
+            this.selectionList = val;
+            const data = [];
+            this.selectionList.map((item) => {
+                data.push(item.order_id);
+            });
+            this.ids = data.join(",");
+        },
+        // 选择时间
+        selectChange(tab) {
+            this.timeVal = [];
+            this.tableFrom.date = tab;
+            this.getList(1);
+        },
+        // 具体日期
+        onchangeTime(e) {
+            this.timeVal = e;
+            this.tableFrom.date = e ? this.timeVal.join("-") : "";
+            this.getList(1);
+        },
+
+        // 列表
+        getList(num) {
+            this.tableFrom.page = num ? num : this.tableFrom.page;
+            getFenrunApi(this.tableFrom).then((res) => {
+                console.log(res,'aaaaa');
+                this.tableData.data = res.data.list;
+                this.tableData.total = res.data.count;
+
+                this.cardLists = [
+                  { info: '', name: '商户分润总数', count: res.data.statistics.all },
+                  { info: '', name: '已结算', count: res.data.statistics.clear },
+                  { info: '', name: '未结算', count: res.data.statistics.nclear },
+                  { info: '', name: '已失效', count: res.data.statistics.lost },
+                  // {info: '', name: '商户分润扣减总数', count: res.data.statistics.deduct},
+                  // {info: '', name: '剩余商户分润总数', count: res.data.statistics.all_mp1}
+                ]
+            }).catch((res) => {
+                this.$message.error(res.message);
+            });
+        },
+        pageChange(page) {
+            this.tableFrom.page = page;
+            this.getList('');
+        },
+        handleSizeChange(val) {
+            this.tableFrom.limit = val;
+            this.getList('');
+        },
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.selWidth {
+    width: 300px;
+}
+
+.el-dropdown-link {
+    cursor: pointer;
+    color: #409eff;
+    font-size: 12px;
+}
+
+.el-icon-arrow-down {
+    font-size: 12px;
+}
+
+.tabBox_tit {
+    width: 53%;
+    font-size: 12px !important;
+    margin: 0 2px 0 10px;
+    letter-spacing: 1px;
+    padding: 5px 0;
+    box-sizing: border-box;
+}
+
+/deep/.row-bg {
+    .cell {
+        color: red !important;
+    }
+}
+
+.filter-item {
+  width:50%;
+}
+
+
+.cancel-order-mark {
+    margin-top: 30px;
+
+    .cancel-order-select-reason {
+        height: 30px;
+    }
+
+    .canel-order-remark-input {
+        width: 75%;
+        margin-left: 35px;
+    }
+
+
+}
+
+.bottom-button {
+    margin-top: 30px;
+    margin-left: 300px;
+    width: 250px;
+    display: flex;
+    justify-content: space-between;
+  }
+
+.cancel-button {
+        display: flex;
+        justify-content: center;
+        margin-top: 20px;
+        gap:50px;
+        height: 30px;
+        // background-color: rebeccapurple;
+
+        .confirm {
+          width: 70px;
+          // height: 30px;
+        }
+        .cacnel-item {
+          width: 70px;
+          // height: 30px;
+        }
+    }
+
+.selected-kuang {
+  width: 500px;
+}
+
+
+.jiangjintotal {
+
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 10px;
+  border: 1px solid #999;
+  border-radius: 5px;
+  width: 150px;
+  height: 60px;
+  line-height: 25px;
+  margin-right: 10px;
+}
+
+.jiangjintotal .money {
+  font-size: 20px;
+}
+
+
+</style>

src/views/accounts/caiwutongji/fugou/index.vue

@@ -41,6 +41,31 @@
                       </el-select>
                     </el-form-item>
 
+                    <!-- 佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\\r\\n5 养老金√ 6 广告费 7 锁客收益 √ 8平台奖励 9渠道商\\r\\n10 推广店铺收益 √ 11.合伙人分红 12联创分红，13 股权分红 -->
+                    <el-form-item class="selected-kuang" label="名称：">
+                            <el-select
+                                v-model="tableFrom.commission_type"
+                                class="filter-item"
+                                placeholder="全部"
+                                @change="getList(1)"
+                            >
+                                <el-option value="" label="全部"/> 
+                                <!-- <el-option :value="1" label="代理费"/>
+                                <el-option :value="2" label="消费佣金"/> -->
+                                <el-option :value="3" label="直推佣金"/>
+                                <!-- <el-option :value="4" label="辖区佣金"/>
+                                <el-option :value="5" label="养老金"/>
+                                <el-option :value="6" label="广告费"/> -->
+                                <el-option :value="7" label="锁客收益"/>
+                                <!-- <el-option :value="8" label="平台奖励"/>
+                                <el-option :value="9" label="渠道商"/> -->
+                                <el-option :value="10" label="推广店铺收益"/>
+                                <el-option :value="11" label="合伙人分红"/>
+                                <el-option :value="12" label="联创分红"/>
+                                <el-option :value="13" label="股权分红"/>
+                            </el-select>
+                        </el-form-item>
+
                 </el-form>
 
                 <div class="bottom-button">
@@ -48,6 +73,8 @@
                   <!-- <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button> -->
 
                   <el-button type="primary" size="small" @click="getList(1)" style="width: 100px; margin-top: 20px;">查询</el-button>
+                  <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button>
+                  
                 </div>
             </div>
 
@@ -71,6 +98,26 @@
             <el-table-column label="用户账号(手机号)" prop="phone"  min-width="130" />
 
             <el-table-column label="复购金数" prop="number"  min-width="130" />
+
+            <!-- 佣金类型 1代理费 2 消费佣金 3直推奖√ 4辖区佣金\\r\\n5 养老金√ 6 广告费 7 锁客收益 √ 8平台奖励 9渠道商\\r\\n10 推广店铺收益 √ 11.合伙人分红 12联创分红，13 股权分红 -->  
+            <el-table-column label="名称" min-width="130" >
+                <template slot-scope="scope">
+                    <span v-if="scope.row.commission_type == 1"> 代理费 </span>   
+                    <span v-if="scope.row.commission_type == 2"> 消费佣金 </span>
+                    <span v-if="scope.row.commission_type == 3"> 直推佣金 </span>
+                      <span v-if="scope.row.commission_type == 4"> 辖区佣金 </span>
+                      <span v-if="scope.row.commission_type == 5"> 养老金 </span>
+                      <span v-if="scope.row.commission_type == 6"> 广告费 </span>
+                      <span v-if="scope.row.commission_type == 7"> 锁客收益 </span>
+                      <span v-if="scope.row.commission_type == 8"> 平台奖励 </span>
+                      <span v-if="scope.row.commission_type == 9"> 渠道商 </span>
+                      <span v-if="scope.row.commission_type == 10"> 推广店铺收益 </span>
+                      <span v-if="scope.row.commission_type == 11"> 合伙人分红 </span>
+                      <span v-if="scope.row.commission_type == 12"> 联创分红 </span>
+                      <span v-if="scope.row.commission_type == 13"> 股权分红 </span>
+                </template>
+              </el-table-column>
+
             <el-table-column label="复购金状态" prop="status"  min-width="130">
               <template slot-scope="scope">
                 <span v-if="scope.row.status == 1">有效</span>  
@@ -135,6 +182,7 @@ export default {
                 page: 1,
                 limit: 20,
                 type: "",
+                commission_type: "",
                 pm: ""
             },
             fromList: {
@@ -238,13 +286,15 @@ export default {
         this.getList();
       },
       exportSearchResult() {
-        RewardExcelApi(this.paramsData).then(res => {
-          console.log( res.data)
-          console.log( res.data.path)
-          window.open( res.data.path)
-          // window.open(SettingMer.https + `/excel/download/0?token=` + getToken()+`&path=` + res.data.path)
+        this.tableFrom.is_excel = 1;
+        getFugouCountApi(this.tableFrom).then(res => {
+            console.log( res.data)
+            console.log( res.data.path)
+            this.tableFrom.is_excel = 0;
+            this.$message.success('导出成功')
+            window.open( res.data.path)
         }).catch((res) => {
-
+            this.$message.error('导出失败');
         })
       },
 

src/views/accounts/caiwutongji/hongbao/index.vue

@@ -47,6 +47,7 @@
                   <!-- <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button> -->
 
                   <el-button type="primary" size="small" @click="getList(1)" style="width: 100px; margin-top: 20px;">查询</el-button>
+                  <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button>
                 </div>
             </div>
 
@@ -237,13 +238,15 @@ export default {
         this.getList();
       },
       exportSearchResult() {
-        RewardExcelApi(this.paramsData).then(res => {
-          console.log( res.data)
-          console.log( res.data.path)
-          window.open( res.data.path)
-          // window.open(SettingMer.https + `/excel/download/0?token=` + getToken()+`&path=` + res.data.path)
+        this.tableFrom.is_excel = 1;
+        getHongbaoCountApi(this.tableFrom).then(res => {
+            console.log( res.data)
+            console.log( res.data.path)
+            this.tableFrom.is_excel = 0;
+            this.$message.success('导出成功')
+            window.open( res.data.path)
         }).catch((res) => {
-
+            this.$message.error('导出失败');
         })
       },
 

src/views/accounts/caiwutongji/jingdou/index.vue

@@ -48,6 +48,7 @@
                   <!-- <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button> -->
 
                   <el-button type="primary" size="small" @click="getList(1)" style="width: 100px; margin-top: 20px;">查询</el-button>
+                  <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button>
                 </div>
             </div>
 
@@ -238,13 +239,15 @@ export default {
         this.getList();
       },
       exportSearchResult() {
-        RewardExcelApi(this.paramsData).then(res => {
-          console.log( res.data)
-          console.log( res.data.path)
-          window.open( res.data.path)
-          // window.open(SettingMer.https + `/excel/download/0?token=` + getToken()+`&path=` + res.data.path)
+        this.tableFrom.is_excel = 1;
+        getJingdouCountApi(this.tableFrom).then(res => {
+            console.log( res.data)
+            console.log( res.data.path)
+            this.tableFrom.is_excel = 0;
+            this.$message.success('导出成功')
+            window.open( res.data.path)
         }).catch((res) => {
-
+            this.$message.error('导出失败');
         })
       },
 

src/views/accounts/caiwutongji/pension/index.vue

@@ -64,6 +64,8 @@
 
                         <el-button size="small" style="width: 100px; margin-top: 20px;" type="primary" @click="getList(1)">查询
                         </el-button>
+
+                        <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button>
                     </div>
 
                 </div>
@@ -272,13 +274,15 @@ export default {
             this.getList();
         },
         exportSearchResult() {
-            RewardExcelApi(this.paramsData).then(res => {
-                console.log(res.data)
-                console.log(res.data.path)
-                window.open(res.data.path)
-                // window.open(SettingMer.https + `/excel/download/0?token=` + getToken()+`&path=` + res.data.path)
+            this.tableFrom.is_excel = 1;
+            getYongJinCountApi(this.tableFrom).then(res => {
+                console.log( res.data)
+                console.log( res.data.path)
+                this.tableFrom.is_excel = 0;
+                this.$message.success('导出成功')
+                window.open( res.data.path)
             }).catch((res) => {
-
+                this.$message.error('导出失败');
             })
         },
 

src/views/accounts/caiwutongji/point/index.vue

@@ -45,9 +45,8 @@
 
                 <div class="bottom-button">
                   <el-button size="small" @click="reset" style="width: 100px; margin-top: 20px; border: 1px solid; " >重置</el-button>
-                  <!-- <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button> -->
-
                   <el-button type="primary" size="small" @click="getList(1)" style="width: 100px; margin-top: 20px;">查询</el-button>
+                  <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button>
                 </div>
             </div>
 
@@ -238,13 +237,15 @@ export default {
         this.getList();
       },
       exportSearchResult() {
-        RewardExcelApi(this.paramsData).then(res => {
+        this.tableFrom.is_excel = 1;
+        getPointCountApi(this.tableFrom).then(res => {
           console.log( res.data)
           console.log( res.data.path)
+          this.tableFrom.is_excel = 0;
+          this.$message.success('导出成功')
           window.open( res.data.path)
-          // window.open(SettingMer.https + `/excel/download/0?token=` + getToken()+`&path=` + res.data.path)
         }).catch((res) => {
-
+          this.$message.error('导出失败');
         })
       },
 

src/views/accounts/caiwutongji/pv/index.vue

@@ -0,0 +1,451 @@
+<template>
+<div class="divBox">
+    <el-card class="box-card">
+        <div slot="header" class="clearfix">
+            <div class="container">
+                <el-form size="small" label-width="100px">
+                    <el-form-item label="时间选择：" class="width100">
+                        <el-radio-group v-model="tableFrom.date" type="button" class="mr20" size="small" @change="selectChange(tableFrom.date)">
+                            <el-radio-button v-for="(item,i) in fromList.fromTxt" :key="i" :label="item.val">{{ item.text }}</el-radio-button>
+                        </el-radio-group>
+                        <el-date-picker v-model="timeVal" value-format="yyyy/MM/dd" format="yyyy/MM/dd" size="small" type="daterange" placement="bottom-end" placeholder="自定义时间" style="width: 250px;" @change="onchangeTime" />
+                    </el-form-item>
+                    <el-form-item label="用户手机号：" class="width100">
+                        <el-input v-model="tableFrom.phone" placeholder="请输入" class="selWidth" size="small">
+                        </el-input>
+                    </el-form-item>
+                    <!-- <el-form-item label="PV变动：" class="selected-kuang">
+                      <el-select
+                        v-model="tableFrom.pm"
+                        placeholder="全部"
+                        class="filter-item"
+                        @change="getList(1)"
+                      >
+                        <el-option label="全部" value="" />
+                        <el-option label="增加" value="1" />
+                        <el-option label="扣减" value="2" />
+                      </el-select>
+                    </el-form-item> -->
+                    <el-form-item label="PV状态：" class="selected-kuang">
+                      <el-select
+                        v-model="tableFrom.status"
+                        placeholder="全部"
+                        class="filter-item"
+                        @change="getList(1)"
+                      >
+                        <el-option label="全部" value="" />
+                        <el-option label="已结算" value="1" />
+                        <el-option label="未结算" value="-1" />
+                        <el-option label="已失效" value="0" />
+                      </el-select>
+                    </el-form-item>
+
+                </el-form>
+
+                <div class="bottom-button">
+                  <el-button size="small" @click="reset" style="width: 100px; margin-top: 20px; border: 1px solid; " >重置</el-button>
+                  <!-- <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button> -->
+
+                  <el-button type="primary" size="small" @click="getList(1)" style="width: 100px; margin-top: 20px;">查询</el-button>
+
+                  <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button>
+                </div>
+            </div>
+
+
+
+        </div>
+
+        <div style="display: flex">
+          <div class="jiangjintotal" v-for="(v,k) in cardLists" >
+            <span class="jiangjintotal-title">{{ v.name }}</span>
+            <span class="money">{{ v.count }}</span>
+          </div>
+        </div>
+
+        <el-table :data="tableData.data" style="width: 100%" size="mini" class="table" highlight-current-row >
+
+
+            <el-table-column label="ID" prop="id" min-width="100" />
+            <el-table-column label="时间" prop="addtime" min-width="150" />
+            <!-- <el-table-column label="用户昵称" prop="nickname"  min-width="130" />
+            <el-table-column label="用户账号(手机号)" prop="phone"  min-width="130" /> --> 
+
+            <el-table-column label="PV数" prop="pv"  min-width="130" />
+            <el-table-column label="状态" prop="status"  min-width="130">
+              <template slot-scope="scope">
+                <span v-if="scope.row.status == 1">有效</span>  
+                <span v-if="scope.row.status == -1">待确认</span>
+                <span v-if="scope.row.status == 0">已失效</span>
+              </template>
+            </el-table-column>
+            <!-- <el-table-column label="PV变动" prop="status"  min-width="130">
+              <template slot-scope="scope">
+                <span v-if="scope.row.pm == 1">增加</span>
+                <span v-if="scope.row.pm == 2">扣减</span>
+              </template>
+            </el-table-column> -->
+            <el-table-column label="关联订单" prop="order_sn"  min-width="130">  
+              <template slot-scope="scope">
+                <span style="color: blue; cursor: pointer;" @click="pushToOrderList(scope.row.order_sn)">{{ scope.row.order_sn }}</span>
+              </template>
+            </el-table-column>
+            <el-table-column label="说明" prop="mark"  min-width="130" />
+        </el-table>
+        <div class="block">
+          <el-pagination :page-sizes="[20, 40, 60, 80]" :page-size="tableFrom.limit" :current-page="tableFrom.page"
+            layout="total, sizes, prev, pager, next, jumper" :total="tableData.total" @size-change="handleSizeChange"
+            @current-change="pageChange" />
+        </div>
+    </el-card>
+
+
+</div>
+</template>
+
+<script>
+import {
+    redPointListApi,
+    exportOrderApi,
+} from "@/api/order";
+
+import { performanceDivvyLstApi } from '@/api/protocol'
+
+import fileList from "@/components/exportFile/fileList";
+import cardsData from "@/components/cards/index";
+import {getZeroPointApi, getPvCountApi} from "@/api/accounts";
+import {roterPre} from "@/settings";
+export default {
+    components: {
+        cardsData,
+        fileList
+    },
+    data() {
+        return {
+            performanceList:[],
+            merSelect: [],
+            timeVal: '',
+            tableData: {
+                data: [],
+                total: 0,
+            },
+            listLoading: true,
+            tableFrom: {
+                uid: "",
+                date: "",
+                page: 1,
+                limit: 20,
+                type: "",
+                pm: ""
+            },
+            fromList: {
+                title: "选择时间",
+                custom: true,
+                fromTxt: [{
+                        text: "全部",
+                        val: ""
+                    },
+                    {
+                        text: "今天",
+                        val: "today"
+                    },
+                    {
+                        text: "昨天",
+                        val: "yesterday"
+                    },
+                    {
+                        text: "最近7天",
+                        val: "lately7"
+                    },
+                    {
+                        text: "最近30天",
+                        val: "lately30"
+                    },
+                    {
+                        text: "本月",
+                        val: "month"
+                    },
+                    {
+                        text: "本年",
+                        val: "year"
+                    },
+                ],
+            },
+            fileVisible: false,
+            cardLists: [],
+            teamList: [],
+
+        };
+    },
+    mounted() {
+        this.getList(1);
+
+        performanceDivvyLstApi({'page':1,'limit':100,'state':1}).then(res => {
+          this.performanceList = res.data.list
+        }).catch(res => {
+          this.$message.error(res.message)
+        })
+        // 获取隶属团队
+        getZeroPointApi().then(res => {
+            this.teamList = res.data
+            console.log('隶属团队')
+            console.log(this.teamList)
+        }).catch((res) => {
+            this.$message.error(res.message);
+        });
+
+    },
+    methods: {
+
+      pushToOrderList(orderIds) {
+
+
+        // accounts/extract
+
+        this.$router.push({
+          path: roterPre + "/order/list/",
+          query: { order_sn: orderIds },
+        });
+      },
+
+      tanchuang() {
+        this.dialogVisible = true
+      },
+
+      selectData(name) {
+        if (name == '系统奖励红PV数') {
+          this.tableFrom.pm = '1'
+        } else if (name == '系统销毁红PV数') {
+          this.tableFrom.pm = '2'
+        } else if (name == '人工奖励红PV数') {
+          this.tableFrom.pm = '3'
+        } else if (name == '人工销毁红PV数') {
+          this.tableFrom.pm = '4'
+        }
+
+        this.getList(1)
+      },
+
+      // 重置
+      reset() {
+        this.tableFrom ={
+            uid: "",
+            date: "",
+            page: 1,
+            limit: 20,
+            type: "",
+            pm: ""
+          }
+        this.getList();
+      },
+      exportSearchResult() {
+        this.tableFrom.is_excel = 1;
+        getPvCountApi(this.tableFrom).then(res => {
+            console.log( res.data)
+            console.log( res.data.path)
+            this.tableFrom.is_excel = 0;
+            this.$message.success('导出成功')
+            window.open( res.data.path)
+        }).catch((res) => {
+            this.$message.error('导出失败');
+        })
+      },
+
+
+
+        // 表格某一行添加特定的样式
+        addTdClass(val) {
+            if (val.row.status > 0 && val.row.paid == 1) {
+                for (let i = 0; i < val.row.orderProduct.length; i++) {
+                    if (val.row.orderProduct[i].refund_num > 0 && val.row.orderProduct[i].refund_num < val.row.orderProduct[i].product_num) {
+                        return "row-bg";
+                    }
+                }
+            } else {
+                return " ";
+            }
+        },
+
+        // 导出
+        exportOrder() {
+            exportOrderApi(this.tableFrom)
+                .then((res) => {
+                    // this.$message.success(res.message);
+                    // this.fileVisible = true;
+                    // this.$refs.exportList.exportFileList();
+                  const h = this.$createElement;
+                  this.$msgbox({
+                    title: '提示',
+                    message: h('p', null, [
+                      h('span', null, '文件正在生成中，请稍后点击"'),
+                      h('span', { style: 'color: teal' }, '导出已生成列表'),
+                      h('span', null, '"查看~ '),
+                    ]),
+                    confirmButtonText: '我知道了',
+                  }).then(action => {
+
+                  });                })
+                .catch((res) => {
+                    this.$message.error(res.message);
+                });
+        },
+        getExportFileList() {
+            this.fileVisible = true;
+            this.$refs.exportList.exportFileList('order');
+        },
+
+        handleSelectionChange(val) {
+            this.selectionList = val;
+            const data = [];
+            this.selectionList.map((item) => {
+                data.push(item.order_id);
+            });
+            this.ids = data.join(",");
+        },
+        // 选择时间
+        selectChange(tab) {
+            this.timeVal = [];
+            this.tableFrom.date = tab;
+            this.getList(1);
+        },
+        // 具体日期
+        onchangeTime(e) {
+            this.timeVal = e;
+            this.tableFrom.date = e ? this.timeVal.join("-") : "";
+            this.getList(1);
+        },
+
+        // 列表
+        getList(num) {
+            this.tableFrom.page = num ? num : this.tableFrom.page;
+            getPvCountApi(this.tableFrom).then((res) => {
+                console.log(res,'aaaaa');
+                this.tableData.data = res.data.list;
+                this.tableData.total = res.data.count;
+
+                this.cardLists = [
+                  { info: '', name: '平台PV总数', count: res.data.statistics.all },
+                  { info: '', name: '已结算PV总数', count: res.data.statistics.clear },
+                  { info: '', name: '未结算PV总数', count: res.data.statistics.nclear },
+                  { info: '', name: '已失效PV总数', count: res.data.statistics.lost },
+                  { info: '', name: '已结算红包总额', count: res.data.statistics.deduct},
+                  { info: '', name: '可分红PV数', count: res.data.statistics.all_mp1}
+                ]
+            }).catch((res) => { 
+                this.$message.error(res.message);
+            });
+        },
+        pageChange(page) {
+            this.tableFrom.page = page;
+            this.getList('');
+        },
+        handleSizeChange(val) {
+            this.tableFrom.limit = val;
+            this.getList('');
+        },
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.selWidth {
+    width: 300px;
+}
+
+.el-dropdown-link {
+    cursor: pointer;
+    color: #409eff;
+    font-size: 12px;
+}
+
+.el-icon-arrow-down {
+    font-size: 12px;
+}
+
+.tabBox_tit {
+    width: 53%;
+    font-size: 12px !important;
+    margin: 0 2px 0 10px;
+    letter-spacing: 1px;
+    padding: 5px 0;
+    box-sizing: border-box;
+}
+
+/deep/.row-bg {
+    .cell {
+        color: red !important;
+    }
+}
+
+.filter-item {
+  width:50%;
+}
+
+
+.cancel-order-mark {
+    margin-top: 30px;
+
+    .cancel-order-select-reason {
+        height: 30px;
+    }
+
+    .canel-order-remark-input {
+        width: 75%;
+        margin-left: 35px;
+    }
+
+
+}
+
+.bottom-button {
+    margin-top: 30px;
+    margin-left: 300px;
+    width: 250px;
+    display: flex;
+    justify-content: space-between;
+  }
+
+.cancel-button {
+        display: flex;
+        justify-content: center;
+        margin-top: 20px;
+        gap:50px;
+        height: 30px;
+        // background-color: rebeccapurple;
+
+        .confirm {
+          width: 70px;
+          // height: 30px;
+        }
+        .cacnel-item {
+          width: 70px;
+          // height: 30px;
+        }
+    }
+
+.selected-kuang {
+  width: 500px;
+}
+
+
+.jiangjintotal {
+
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  margin-bottom: 10px;
+  border: 1px solid #999;
+  border-radius: 5px;
+  width: 150px;
+  height: 60px;
+  line-height: 25px;
+  margin-right: 10px;
+}
+
+.jiangjintotal .money {
+  font-size: 20px;
+}
+
+
+</style>

src/views/accounts/caiwutongji/vr/index.vue

@@ -46,6 +46,7 @@
                   <!-- <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button> -->
 
                   <el-button type="primary" size="small" @click="getList(1)" style="width: 100px; margin-top: 20px;">查询</el-button>
+                  <el-button type="primary" size="small" @click="exportSearchResult" style="width: 100px; margin-top: 20px;">导出</el-button>
                 </div>
             </div>
 
@@ -235,13 +236,15 @@ export default {
         this.getList();
       },
       exportSearchResult() {
-        RewardExcelApi(this.paramsData).then(res => {
-          console.log( res.data)
-          console.log( res.data.path)
-          window.open( res.data.path)
-          // window.open(SettingMer.https + `/excel/download/0?token=` + getToken()+`&path=` + res.data.path)
+        this.tableFrom.is_excel = 1;
+        getVrCountApi(this.tableFrom).then(res => {
+            console.log( res.data)
+            console.log( res.data.path)
+            this.tableFrom.is_excel = 0;
+            this.$message.success('导出成功')
+            window.open( res.data.path)
         }).catch((res) => {
-
+            this.$message.error('导出失败');
         })
       },
 

src/views/accounts/gaikuang/index.vue

@@ -6,7 +6,7 @@
         <div class="clearfix" style="margin-top: 10px; margin-bottom: 10px;">
           <div class="title_label_box" >
             <div class="title_label" style="margin-bottom: 10px; " >
-              订单概况
+              订单概况 
               <el-tooltip placement="top">
                    <div slot="content" class="tips-content text-tips-content">
                        <div class="rule-box">
@@ -64,8 +64,49 @@
 
           </div>
 
-            <userCard-data :card-lists="userCountLists" class="orderCount-box" />
-            <redCards-data :card-lists="userCountLists1" class="orderCount-box" />
+            <userCard-data :card-lists="userCountListsOne" class="orderCount-box" />
+            <userCard-data :card-lists="userCountListsTow" class="orderCount-box" />
+            <!-- <redCards-data :card-lists="userCountLists1" class="orderCount-box" /> -->
+        </div>
+
+        <!-- 会员概况 -->
+        <div class="redPoint_box" style="margin-top: 10px; margin-bottom: 10px;">
+          <div class="title_label_box">
+            <div class="title_label" style="margin-bottom: 10px; " >
+                会员概况
+            </div>
+          </div>
+            <userCard-data :card-lists="memberCountLists" class="orderCount-box" />
+        </div>
+
+        <!-- PV概况 -->
+        <div class="redPoint_box" style="margin-top: 10px; margin-bottom: 10px;">
+          <div class="title_label_box">
+            <div class="title_label" style="margin-bottom: 10px; " >
+                PV概况
+            </div>
+          </div>
+            <userCard-data :card-lists="pvCountLists" class="orderCount-box" />
+        </div>
+
+        <!-- VR概况 -->
+        <div class="redPoint_box" style="margin-top: 10px; margin-bottom: 10px;">
+          <div class="title_label_box">
+            <div class="title_label" style="margin-bottom: 10px; " >
+                VR概况
+            </div>
+          </div>
+            <userCard-data :card-lists="vrCountLists" class="orderCount-box" />
+        </div>
+
+        <!-- 积分概况 -->
+        <div class="redPoint_box" style="margin-top: 10px; margin-bottom: 10px;">
+          <div class="title_label_box">
+            <div class="title_label" style="margin-bottom: 10px; " >
+                积分概况
+            </div>
+          </div>
+            <userCard-data :card-lists="jifenCountLists" class="orderCount-box" />
         </div>
 
         <!-- 交易概况 -->
@@ -101,7 +142,12 @@
               @change="getTradeGaiKuang" :disabled="notUse3" />
           </div>
 
-          <tongjiCards-data :card-lists="cardLists" class="tradeCount-box" />
+          <tongjiCards-data :card-lists="cardListsOne" class="tradeCount-box" />
+
+          <tongjiCards-data :card-lists="cardListsTow" class="tradeCount-box" />
+
+          <redCards-data :card-lists="cardLists1" class="orderCount-box" />
+
           <!-- 系统支出概况 -->
           <!-- <div class="title_label_box">
             <div class="title_label" style="margin-bottom: 10px; " >
@@ -146,8 +192,19 @@ import {
   getOrderGaiKuangApi,
   getRedPointGaiKuangApi,
   getTradeGaiKuangApi,
-  getUserGaiKuangApi
-
+  getUserGaiKuangApi,
+  getMemberGaiKuangApi,
+  getJifenGaiKuangApi,
+  getPvGaiKuangApi,
+  getVrGaiKuangApi,
+  getPointCountApi,
+  getJingdouCountApi,
+  getHongbaoCountApi,
+  getFugouCountApi,
+  getFenrunApi,
+  getPvCountApi,
+  getVrCountApi,
+  getMemberCountApi,
 } from "@/api/accounts";
 import fileList from "@/components/exportFile/fileList";
 import tongjiCardsData from "@/components/cards/tongjiCard";
@@ -246,7 +303,8 @@ export default {
             LogLoading: false,
             dialogVisible: false,
             fileVisible: false,
-            cardLists: [],
+            cardListsOne: [],
+            cardListsTow: [],
             cardLists1: [],
             orderDatalist: null,
             headeNum: [],
@@ -257,9 +315,14 @@ export default {
               remark:'',
             },
             otherCardsList: [],
-            userCountLists: [],
+            userCountListsOne: [],
+            userCountListsTow: [],
             otherCardsLists:[],
-            userCountLists1: []
+            userCountLists1: [],
+            memberCountLists: [],
+            pvCountLists: [],
+            vrCountLists: [],
+            jifenCountLists: [],
         };
     },
     mounted() {
@@ -270,6 +333,10 @@ export default {
 
         this.getOrderGaiKuang();
         this.getUserGaiKuang();
+        this.getMemberGaiKuang();
+        this.getPvGaiKuang();
+        this.getVrGaiKuang();
+        this.getJifenGaiKuang();
         this.getTradeGaiKuang();
 
     },
@@ -334,23 +401,55 @@ export default {
       getUserGaiKuang() {
         getUserGaiKuangApi(this.paramsData2).then(res => {
               console.log(res)
-              this.userCountLists = res.data.left[0]
-              this.userCountLists1 = res.data.right
-
-
-              // this.userCountLists = res.data
-              // this.userCountLists1 = res.data.right
-
+              this.userCountListsOne = res.data.left.one
+              this.userCountListsTow = res.data.left.tow
             }).catch((res) => {
               this.$message.error(res.message);
             });
       },
 
+      getMemberGaiKuang() {
+        getMemberGaiKuangApi({}).then(res => {
+            console.log(res)
+            this.memberCountLists = res.data.left[0]
+        }).catch((res) => {
+            this.$message.error(res.message);
+        });
+      },
+
+      getPvGaiKuang() {
+        getPvGaiKuangApi({}).then(res => {
+            console.log(res)
+            this.pvCountLists = res.data.left[0]
+        }).catch((res) => {
+            this.$message.error(res.message);
+        });
+      },
+
+      getVrGaiKuang() {
+        getVrGaiKuangApi({}).then(res => {
+            console.log(res)
+            this.vrCountLists = res.data.left[0]
+        }).catch((res) => {
+            this.$message.error(res.message);
+        });
+      },
+
+      getJifenGaiKuang() {
+        getJifenGaiKuangApi({}).then(res => {
+            console.log(res)
+            this.jifenCountLists = res.data.left[0]
+        }).catch((res) => {
+            this.$message.error(res.message);
+        });
+      },
+
       getTradeGaiKuang() {
         getTradeGaiKuangApi(this.paramsData3).then(res => {
               console.log(res)
-              this.cardLists = res.data;
-              // this.cardLists1 = res.data.lower;
+              this.cardListsOne = res.data.left.one;
+              this.cardListsTow = res.data.left.tow;
+              this.cardLists1 = res.data.right;
             }).catch((res) => {
               this.$message.error(res.message);
             });