From 0dda98f962bb746bf60ef2619aa6b994eb31d70c Mon Sep 17 00:00:00 2001
From: Caps <452713115@qq.com>
Date: Tue, 28 Apr 2020 11:03:15 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=8E=A7=E5=88=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/pages/shop/IncreaseDataCompany.vue | 8 ++++++--
src/pages/shop/IncreaseDataStaff.vue | 5 ++++-
src/pages/shop/IncreaseDataStore.vue | 7 +++++--
3 files changed, 15 insertions(+), 5 deletions(-)
diff --git a/src/pages/shop/IncreaseDataCompany.vue b/src/pages/shop/IncreaseDataCompany.vue
index 37e614b..545e408 100644
--- a/src/pages/shop/IncreaseDataCompany.vue
+++ b/src/pages/shop/IncreaseDataCompany.vue
@@ -29,7 +29,7 @@
-
+
@@ -144,6 +144,7 @@
pageNum: 1,
pageSize: 10,
selectDate: [],
+ tableLoading:false,
}
},
mounted: function () {
@@ -180,6 +181,7 @@
})
},
generalizeOfRetail() {
+ this.tableLoading = true;
if(this.selectDate[0] === ""){
this.$Message.info("请选择日期");
return
@@ -199,12 +201,14 @@
let that = this;
that.data1 = [];
IncreaseData.generalizeOfRetail(request, function (data) {
+ that.tableLoading = false;
data = data.data;
if (data.code === '0001') {
that.$Message.info("查询推广数据失败！");
return;
}
if (data.code === '0000') {
+ that.tableLoading = false;
that.data1 = data.results.dataVOS;
that.totalSize = data.results.sizeNum;
if(that.data1){
@@ -258,7 +262,7 @@
const { export_json_to_excel } = require('../../excel/Export2Excel');
const tHeader = ['序号', '零售公司名称', '总好友数', '总好友数（去重）', '新增好友数', '新增好友数（去重）','日增好友平均','日增好友平均（去重）','删除/拉黑成员客户数（累计）','拉黑率（累计）'];
// 属性名
- const filterVal = ['index', 'retailCompany', 'allCustomer', 'effectiveCustomer', 'newCustomer', 'newEffectiveCustomer','avgNewCustomer','avgNewCustomer','avgNewEffectiveCustomer','delCustomer','delRate'];
+ const filterVal = ['index', 'retailCompany', 'allCustomer', 'effectiveCustomer', 'newCustomer', 'newEffectiveCustomer','avgNewCustomer','avgNewEffectiveCustomer','delCustomer','delRate'];
// 数据
//把data里的tableData存到list
const data = that.formatJson(filterVal, originAllData);
diff --git a/src/pages/shop/IncreaseDataStaff.vue b/src/pages/shop/IncreaseDataStaff.vue
index 0f68a3c..cd48d5f 100644
--- a/src/pages/shop/IncreaseDataStaff.vue
+++ b/src/pages/shop/IncreaseDataStaff.vue
@@ -46,7 +46,7 @@
-
+
@@ -133,6 +133,7 @@
pageSize: 10,
selectDate:[],
loading:false,
+ tableLoading: false
}
},
mounted: function () {
@@ -277,6 +278,7 @@
})
},
generalizeOfSeller(){
+ this.tableLoading = true;
if(this.selectDate[0] === ""){
this.$Message.info("请选择日期");
return
@@ -306,6 +308,7 @@
};
this.data1 = [];
IncreaseData.generalizeOfSeller(request,function (data) {
+ that.tableLoading = false;
data = data.data;
if (data.code === '0001') {
that.$Message.error("查询零售公司的店铺出错!");
diff --git a/src/pages/shop/IncreaseDataStore.vue b/src/pages/shop/IncreaseDataStore.vue
index fa13e75..c5d177d 100644
--- a/src/pages/shop/IncreaseDataStore.vue
+++ b/src/pages/shop/IncreaseDataStore.vue
@@ -37,7 +37,7 @@
-
+
@@ -113,7 +113,8 @@
totalSize: 0,
pageNum: 1,
pageSize: 10,
- loading:false
+ loading:false,
+ tableLoading:false,
}
},
mounted: function () {
@@ -201,6 +202,7 @@
})
},
generalizeOfStore() {
+ this.tableLoading = true;
if (this.selectDate[0] === "") {
this.$Message.info("请选择日期");
return
@@ -225,6 +227,7 @@
let that = this;
that.data1 = [];
IncreaseData.generalizeOfStore(request, function (data) {
+ that.tableLoading = false;
data = data.data;
if (data.code === '0001') {
that.$Message.info("查询门店推广数据失败！");