|
@@ -191,11 +191,11 @@
|
|
prop="yearlyPayment"
|
|
prop="yearlyPayment"
|
|
></el-table-column>
|
|
></el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
- label="10次包 | -Qc"
|
|
|
|
|
|
+ label="终身 | -Qc"
|
|
align="right"
|
|
align="right"
|
|
header-align="center"
|
|
header-align="center"
|
|
:render-header="renderheader"
|
|
:render-header="renderheader"
|
|
- prop="experiencePayment"
|
|
|
|
|
|
+ prop="lifeLongPayment"
|
|
></el-table-column>
|
|
></el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
label="付费订单数量| Q=Qm1+Qm2+Qy+Qc"
|
|
label="付费订单数量| Q=Qm1+Qm2+Qy+Qc"
|
|
@@ -234,7 +234,7 @@
|
|
align="right"
|
|
align="right"
|
|
header-align="center"
|
|
header-align="center"
|
|
:render-header="renderheader"
|
|
:render-header="renderheader"
|
|
- prop="experienceConversion"
|
|
|
|
|
|
+ prop="lifeLongConversion"
|
|
min-width="130px"
|
|
min-width="130px"
|
|
></el-table-column>
|
|
></el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
@@ -287,7 +287,7 @@ export default {
|
|
this.$store.dispatch("clearList");
|
|
this.$store.dispatch("clearList");
|
|
|
|
|
|
// this.$store.dispatch("getOrderList", this.skillParams);
|
|
// this.$store.dispatch("getOrderList", this.skillParams);
|
|
- this.skillParams.startDay = this.getYesterDay();
|
|
|
|
|
|
+ this.skillParams.startDay = this.getYesterMonth();
|
|
this.skillParams.endDay = this.getYesterDay();
|
|
this.skillParams.endDay = this.getYesterDay();
|
|
|
|
|
|
this.tableHeight = document.documentElement.clientHeight * 0.75;
|
|
this.tableHeight = document.documentElement.clientHeight * 0.75;
|
|
@@ -325,8 +325,16 @@ export default {
|
|
h("span", {}, column.label.split("|")[1])
|
|
h("span", {}, column.label.split("|")[1])
|
|
]);
|
|
]);
|
|
},
|
|
},
|
|
|
|
+ getYesterMonth() {
|
|
|
|
+ let yesterday = new Date().getTime() - 60 * 60 * 24 * 30 * 1000;
|
|
|
|
+ return formatDate(yesterday, 2);
|
|
|
|
+ },
|
|
|
|
+ getYesterMonth() {
|
|
|
|
+ let yesterday = new Date().getTime() - 60 * 60 * 24 * 30 * 1000;
|
|
|
|
+ return formatDate(yesterday, 2);
|
|
|
|
+ },
|
|
getYesterDay() {
|
|
getYesterDay() {
|
|
- let yesterday = new Date().getTime() - 86400000;
|
|
|
|
|
|
+ let yesterday = new Date().getTime() - 60 * 60 * 24 * 1000;
|
|
return formatDate(yesterday, 2);
|
|
return formatDate(yesterday, 2);
|
|
},
|
|
},
|
|
channelChange(val) {
|
|
channelChange(val) {
|