diff --git a/src/api/sylive/activity/index.js b/src/api/sylive/activity/index.js
index 664d8ac..7aafa8a 100644
--- a/src/api/sylive/activity/index.js
+++ b/src/api/sylive/activity/index.js
@@ -182,6 +182,20 @@ export async function getActivityStatisticsTeam(id) {
return Promise.reject(new Error(res.data.message));
}
+/**
+ * 分页查询门店统计
+ * @param params 查询条件
+ */
+export async function pageStatisticsArea(params) {
+ const res = await request.get('/sylive/statistics/page_area', {
+ params
+ });
+ if (res.data.code === 0) {
+ return res.data.data;
+ }
+ return Promise.reject(new Error(res.data.message));
+}
+
/**
* 分页查询门店统计
* @param params 查询条件
diff --git a/src/views/sylive/activity/goods/components/goods-edit.vue b/src/views/sylive/activity/goods/components/goods-edit.vue
new file mode 100644
index 0000000..51d3702
--- /dev/null
+++ b/src/views/sylive/activity/goods/components/goods-edit.vue
@@ -0,0 +1,272 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 建议尺寸750X680
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 取消
+
+ 保存
+
+
+
+
+
+
+
diff --git a/src/views/sylive/activity/goods/index.vue b/src/views/sylive/activity/goods/index.vue
index eb088f6..e8485fb 100644
--- a/src/views/sylive/activity/goods/index.vue
+++ b/src/views/sylive/activity/goods/index.vue
@@ -8,7 +8,7 @@
ref="table"
:columns="columns"
:datasource="datasource"
- cache-key="syliveOrderTable"
+ cache-key="syliveActivityGoodsTable"
>
@@ -33,12 +33,15 @@
+
+
+
diff --git a/src/views/sylive/activity/statistics/components/biz-table.vue b/src/views/sylive/activity/statistics/components/biz-table.vue
index b96a04a..00de26c 100644
--- a/src/views/sylive/activity/statistics/components/biz-table.vue
+++ b/src/views/sylive/activity/statistics/components/biz-table.vue
@@ -8,6 +8,27 @@
:datasource="datasource"
size="mini"
>
+
+
+
+
+
+
+
+
+
+
@@ -16,8 +37,12 @@
import { pageStatisticsBiz } from '@/api/sylive/activity';
export default {
+ props: { data: [] },
data() {
return {
+ // 表格选中数据
+ day: '',
+ selection: [],
// 表格列配置
columns: [
{
@@ -90,8 +115,24 @@
if (!activityId) {
return;
}
- return pageStatisticsBiz({ ...order, page, limit, activityId });
+ const day = this.day;
+ return pageStatisticsBiz({
+ ...order,
+ page,
+ limit,
+ activityId,
+ day
+ });
+ },
+ /* 更新选中数据 */
+ updateValue() {
+ this.$refs.table.reload({ page: 1 });
}
}
};
+
diff --git a/src/views/sylive/activity/statistics/components/consultant-table.vue b/src/views/sylive/activity/statistics/components/consultant-table.vue
index 8c049c4..2137f6b 100644
--- a/src/views/sylive/activity/statistics/components/consultant-table.vue
+++ b/src/views/sylive/activity/statistics/components/consultant-table.vue
@@ -8,6 +8,27 @@
:datasource="datasource"
size="mini"
>
+
+
+
+
+
+
+
+
+
+
@@ -16,8 +37,10 @@
import { pageStatisticsConsultant } from '@/api/sylive/activity';
export default {
+ props: { data: [] },
data() {
return {
+ day: '',
// 表格列配置
columns: [
{
@@ -25,7 +48,7 @@
label: '顾问名称',
align: 'center',
showOverflowTooltip: true,
- minWidth: 110
+ minWidth: 150
},
{
prop: 'browse',
@@ -49,7 +72,7 @@
align: 'center',
sortable: 'custom',
showOverflowTooltip: true,
- minWidth: 110
+ minWidth: 100
},
{
prop: 'order',
@@ -57,7 +80,7 @@
align: 'center',
sortable: 'custom',
showOverflowTooltip: true,
- minWidth: 110
+ minWidth: 100
},
{
prop: 'livePV',
@@ -71,7 +94,7 @@
label: '人均观看(分)',
align: 'center',
showOverflowTooltip: true,
- minWidth: 110
+ minWidth: 100
}
]
};
@@ -83,8 +106,24 @@
if (!activityId) {
return;
}
- return pageStatisticsConsultant({ ...order, page, limit, activityId });
+ const day = this.day;
+ return pageStatisticsConsultant({
+ ...order,
+ page,
+ limit,
+ activityId,
+ day
+ });
+ },
+ /* 更新选中数据 */
+ updateValue() {
+ this.$refs.table.reload({ page: 1 });
}
}
};
+
diff --git a/src/views/sylive/activity/statistics/index.vue b/src/views/sylive/activity/statistics/index.vue
index 151e625..865f290 100644
--- a/src/views/sylive/activity/statistics/index.vue
+++ b/src/views/sylive/activity/statistics/index.vue
@@ -346,71 +346,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
@@ -428,6 +366,7 @@
import VChart from 'vue-echarts';
import 'echarts-wordcloud';
import { echartsMixin } from '@/utils/echarts-mixin';
+ import AreaTable from './components/area-table.vue';
import BizTable from './components/biz-table.vue';
import ConsultantTable from './components/consultant-table.vue';
@@ -435,7 +374,7 @@
export default {
name: 'SyliveActivityStatistics',
- components: { VChart, BizTable, ConsultantTable },
+ components: { VChart, AreaTable, BizTable, ConsultantTable },
mixins: [echartsMixin(['funnelChart'])],
data() {
return {
@@ -444,7 +383,7 @@
activityId: null,
activityData1: { list: [], style: '' },
activityData2: { list: [], style: '' },
- areaData: []
+ days: []
},
loading: true,
browseRank: { area: [], biz: [], consultant: [] },