fe / yoho-shop-manage · Commits

Go to a project

Authored by 陈峰
Commit f084aaa57877800c54b5d0a2ad1830f60c26218d 2 parents 14844c8e 406f544c

Merge branch 'feature/hideFor11' into 'master' 

hide before 11.11

hide statistics module data before 11.11

See merge request !80
Inline Side-by-side
Showing 4 changed files with 84 additions and 71 deletions
... ... @@ -17,7 +17,7 @@
<div slot="content">
* 仅支持历史数据，时间跨度不得超过30天
</div>
<Button type="primary" @click="exportFile">导出</Button>
<Button type="primary" @click="exportFile" style="display: none">导出</Button>
</Poptip>
</filter-item>
</layout-filter>
... ...
... ... @@ -45,36 +45,37 @@ export default function() {
);
}
},
{
title: '访客数',
key: 'uv',
align: 'left',
sortable: true,
render: (h, params) => {
const row = params.row;
return (
<div>
<p>UV：{row.uv}</p>
</div>
);
}
},
{
title: '浏览数',
key: 'pv',
align: 'left',
sortable: true,
render: (h, params) => {
const row = params.row;
return (
<div>
<p>PV：{row.pv}</p>
</div>
);
}
},
// {
// title: '访客数',
// key: 'uv',
// align: 'left',
// sortable: true,
// render: (h, params) => {
// const row = params.row;
//
// return (
// <div>
// <p>UV：{row.uv}</p>
// </div>
// );
// }
// },
// {
// title: '浏览数',
// key: 'pv',
// align: 'left',
// sortable: true,
// render: (h, params) => {
// const row = params.row;
//
// return (
// <div>
// <p>PV：{row.pv}</p>
// </div>
// );
// }
// },
{
title: '加购次数',
key: 'shopcartCount',
... ...
... ... @@ -15,7 +15,7 @@
<a href="javascript:;" @click="() => {changeLimit(7)}">近7天</a>
<a href="javascript:;" @click="() => {changeLimit(30)}">近30天</a>
</div>
<Poptip trigger="hover" placement="bottom-end">
<Poptip trigger="hover" placement="bottom-end" style="display: none;">
<div slot="content">
* 仅支持导出历史数据，时间跨度不得超过30天
</div>
... ... @@ -24,25 +24,27 @@
</Poptip>
</filter-item>
</layout-filter>
<Row style="marginTop: 20px; marginBottom: 30px;">
<Col span="6">
<div class="box-item bg-red" >
<Icon type="person"></Icon>
<span class="box-item-label">{{filters.targetColumns[0].title}}</span>
<span class="box-item-value">{{this.overviewData.uv}}</span>
</div>
<div class="box-item bg-yellow">
<Icon type="eye"></Icon>
<span class="box-item-label">{{filters.targetColumns[1].title}}</span>
<span class="box-item-value">{{this.overviewData.pv}}</span>
</div>
</Col>
<Row style="marginTop: 20px; marginBottom: 30px; marginBottom: 20px;">
<!--<Col span="6">-->
<!--<div class="box-item bg-red" >-->
<!--<Icon type="person"></Icon>-->
<!--<span class="box-item-label">{{filters.targetColumns[0].title}}</span>-->
<!--<span class="box-item-value">{{this.overviewData.uv}}</span>-->
<!--</div>-->
<!--<div class="box-item bg-yellow">-->
<!--<Icon type="eye"></Icon>-->
<!--<span class="box-item-label">{{filters.targetColumns[1].title}}</span>-->
<!--<span class="box-item-value">{{this.overviewData.pv}}</span>-->
<!--</div>-->
<!--</Col>-->
<Col span="6">
<div class="box-item bg-aqua">
<Icon type="android-cart"></Icon>
<span class="box-item-label">{{filters.targetColumns[2].title}}</span>
<span class="box-item-value">{{this.overviewData.orderCount}}</span>
</div>
</Col>
<Col span="6">
<div class="box-item bg-blue">
<Icon type="social-yen"></Icon>
<span class="box-item-label">{{filters.targetColumns[3].title}}</span>
... ... @@ -55,19 +57,21 @@
<span class="box-item-label">{{filters.targetColumns[4].title}}</span>
<span class="box-item-value">{{this.overviewData.shipmentOrderCount}}</span>
</div>
</Col>
<Col span="6">
<div class="box-item bg-green">
<Icon type="social-yen"></Icon>
<span class="box-item-label">{{filters.targetColumns[5].title}}</span>
<span class="box-item-value">{{this.overviewData.shipmentOrderAmount}}</span>
</div>
</Col>
<Col span="6">
<div class="box-item bg-purple">
<Icon type="loop"></Icon>
<span class="box-item-label">{{filters.targetColumns[6].title}}</span>
<span class="box-item-value">{{this.overviewData.uvOrderRate}}</span>
</div>
</Col>
<!--<Col span="6">-->
<!--<div class="box-item bg-purple">-->
<!--<Icon type="loop"></Icon>-->
<!--<span class="box-item-label">{{filters.targetColumns[6].title}}</span>-->
<!--<span class="box-item-value">{{this.overviewData.uvOrderRate}}</span>-->
<!--</div>-->
<!--</Col>-->
</Row>
</Card>
<Card class="shop-card">
... ... @@ -117,7 +121,9 @@
this.beginDate = moment(newDate[0]).format('YYYY-MM-DD');
this.endDate = moment(newDate[1]).format('YYYY-MM-DD');
this.day = this.beginDate === this.endDate === this.today ? '' : this.beginDate;
this.curTarget = 'uv';
// this.curTarget = 'uv';
this.curTarget = 'orderCount';
this.getDataFlag = true;
this.getOverviewData();
... ... @@ -172,8 +178,9 @@
let data = ret.data;
this.overviewChartData.xAxis = _.map(data, 'date');
this.overviewChartData.uv = _.map(data, 'uv');
this.overviewChartData.pv = _.map(data, 'pv');
// this.overviewChartData.uv = _.map(data, 'uv');
// this.overviewChartData.pv = _.map(data, 'pv');
this.overviewChartData.orderCount = _.map(data, 'orderCount');
this.overviewChartData.orderAmount = _.map(data, 'orderAmount');
this.overviewChartData.paymentOrderCount = _.map(data, 'paymentOrderCount');
... ... @@ -200,13 +207,14 @@
}).then(ret => {
if (!ret.data) {
this.overviewData.uv = 0;
this.overviewData.pv = 0;
// this.overviewData.uv = 0;
// this.overviewData.pv = 0;
this.overviewData.orderCount = 0;
this.overviewData.orderAmount = 0;
this.overviewData.shipmentOrderCount = 0;
this.overviewData.shipmentOrderAmount = 0;
this.overviewData.uvOrderRate = 0;
// this.overviewData.uvOrderRate = 0;
return;
}
... ... @@ -224,8 +232,8 @@
if (this.beginDate !== this.endDate) {
let formatData = _.slice(ret.data, 0, ret.data.length - 1);
this.overviewChartData.uv = _.get(ret, 'uv');
this.overviewChartData.pv = _.get(ret, 'pv');
// this.overviewChartData.uv = _.get(ret, 'uv');
// this.overviewChartData.pv = _.get(ret, 'pv');
this.overviewChartData.orderCount = _.get(ret, 'orderCount');
this.overviewChartData.orderAmount = _.get(ret, 'orderAmount');
this.overviewChartData.paymentOrderCount = _.get(ret, 'paymentOrderCount');
... ...
... ... @@ -17,24 +17,28 @@ export default function() {
yesterday: moment().add(-1, 'days').format('YYYY-MM-DD'),
day7: moment().add(-6, 'days').format('YYYY-MM-DD'),
day30: moment().add(-29, 'days').format('YYYY-MM-DD'),
curTarget: 'uv',
// curTarget: 'uv',
curTarget: 'orderCount',
timeLimit: true,
overviewParams: {},
overviewData: {},
getDataFlag: false,
overviewName: 'overviewChart',
overviewChartData: {uv: [], pv: [], orderCount: [], orderAmount: [], xAxis: []},
// overviewChartData: {uv: [], pv: [], orderCount: [], orderAmount: [], xAxis: []},
overviewChartData: {orderCount: [], orderAmount: [], xAxis: []},
targetList: [
{
label: '访客数(UV)',
name: 'uv',
chatOpt: {}
},
{
label: '浏览数(PV)',
name: 'pv',
chatOpt: {}
},
// {
// label: '访客数(UV)',
// name: 'uv',
// chatOpt: {}
// },
// {
// label: '浏览数(PV)',
// name: 'pv',
// chatOpt: {}
// },
{
label: '下单数',
name: 'orderCount',
... ...