Compare commits

..

No commits in common. "1aa4e11e50f9c333947d6ff7a48be826301f2969" and "f7eaf5a7168424dc60a7139a7c37003c35892f23" have entirely different histories.

2 changed files with 15 additions and 128 deletions

View File

@ -53,7 +53,7 @@
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleOrder({os_status:[4,2]})">
<div class="card-panel">
<div class="card-panel-icon-wrapper icon-skill">
<svg-icon icon-class="skill" class-name="card-panel-icon" />
</div>
@ -66,7 +66,7 @@
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleOrder({os_status:[4,2]})">
<div class="card-panel">
<div class="card-panel-icon-wrapper icon-money2">
<svg-icon icon-class="money" class-name="card-panel-icon" />
</div>
@ -79,7 +79,7 @@
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleOrder({os_status:[4,3]})">
<div class="card-panel">
<div class="card-panel-icon-wrapper icon-documentation">
<svg-icon icon-class="documentation" class-name="card-panel-icon" />
</div>
@ -92,7 +92,7 @@
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleOrder({os_status:[4,3]})">
<div class="card-panel">
<div class="card-panel-icon-wrapper icon-money">
<svg-icon icon-class="money" class-name="card-panel-icon" />
</div>
@ -104,84 +104,6 @@
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleOrder({os_status:[4,3],times:[handleGetStartTime(30),handleEndTime()]})">
<div class="card-panel-icon-wrapper icon-camellia">
<svg-icon icon-class="documentation" class-name="card-panel-icon" />
</div>
<div class="card-panel-description">
<div class="card-panel-text">
退款订单数30天
</div>
<count-to :start-val="0" :end-val="refund_30" :duration="10" class="card-panel-num" />
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleOrder({os_status:[4,3],times:[handleGetStartTime(30),handleEndTime()]})">
<div class="card-panel-icon-wrapper icon-camellia">
<svg-icon icon-class="money" class-name="card-panel-icon" />
</div>
<div class="card-panel-description">
<div class="card-panel-text">
退款订单金额30天
</div>
<count-to :start-val="0" :end-val="refund_price_30" :duration="10" class="card-panel-num" />
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleOrder({os_status:[4,3],times:[handleGetStartTime(60),handleEndTime()]})">
<div class="card-panel-icon-wrapper icon-camellia-sixty">
<svg-icon icon-class="documentation" class-name="card-panel-icon" />
</div>
<div class="card-panel-description">
<div class="card-panel-text">
退款订单数60天
</div>
<count-to :start-val="0" :end-val="refund_60" :duration="10" class="card-panel-num" />
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleOrder({os_status:[4,3],times:[handleGetStartTime(60),handleEndTime()]})">
<div class="card-panel-icon-wrapper icon-camellia-sixty">
<svg-icon icon-class="money" class-name="card-panel-icon" />
</div>
<div class="card-panel-description">
<div class="card-panel-text">
退款订单金额60天
</div>
<count-to :start-val="0" :end-val="refund_price_60" :duration="10" class="card-panel-num" />
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleOrder({os_status:[4,3],times:[handleGetStartTime(80),handleEndTime()]})">
<div class="card-panel-icon-wrapper icon-camellia-fourscore">
<svg-icon icon-class="documentation" class-name="card-panel-icon" />
</div>
<div class="card-panel-description">
<div class="card-panel-text">
退款订单数80天
</div>
<count-to :start-val="0" :end-val="refund_80" :duration="10" class="card-panel-num" />
</div>
</div>
</el-col>
<el-col :xs="12" :sm="12" :lg="6" class="card-panel-col">
<div class="card-panel" @click="handleOrder({os_status:[4,3],times:[handleGetStartTime(80),handleEndTime()]})">
<div class="card-panel-icon-wrapper icon-camellia-fourscore">
<svg-icon icon-class="money" class-name="card-panel-icon" />
</div>
<div class="card-panel-description">
<div class="card-panel-text">
退款订单金额80天
</div>
<count-to :start-val="0" :end-val="refund_price_80" :duration="10" class="card-panel-num" />
</div>
</div>
</el-col>
</el-row>
</template>
@ -201,13 +123,7 @@ export default {
asset:0,
asset_price:0,
refund:0,
refund_price:0,
refund_30: 0,
refund_60: 0,
refund_80: 0,
refund_price_30: 0,
refund_price_60: 0,
refund_price_80: 0
refund_price:0
}
},
mounted() {
@ -227,14 +143,6 @@ export default {
})
},
methods: {
//n
handleGetStartTime(i){
return new Date(new Date().setHours(0, 0, 0) - 1000 * 3600 * 24 *i).getTime()
},
//
handleEndTime(){
return new Date(new Date().setHours(23,59,59,999)).getTime()
},
handleSetLineChartData(type) {
this.$emit('handleSetLineChartData', type)
},
@ -271,15 +179,7 @@ export default {
.card-panel-icon-wrapper {
color: #fff;
}
.icon-camellia{
background: #c45a65;
}
.icon-camellia-sixty{
background: #ea517f;
}
.icon-camellia-fourscore{
background: #d2357d;
}
.icon-people {
background: #40c9c6;
}
@ -323,15 +223,7 @@ export default {
.icon-people {
color: #40c9c6;
}
.icon-camellia-sixty{
color: #ea517f;
}
.icon-camellia-fourscore{
color: #d2357d;
}
.icon-camellia{
color: #c45a65;
}
.icon-message {
color: #36a3f7;
}

View File

@ -416,8 +416,7 @@ export default {
times: [],
status: null,
admin: null,
zhubo: null,
os_status:[]
zhubo: null
},
item: { next_follow: '', personnel: {}},
follow: [],
@ -443,26 +442,22 @@ export default {
}
},
created() {
// this.listQuery.status = this.$route.query.status || null
this.listQuery.status = this.$route.query.status || null
this.listQuery.zhubo = this.$route.query.zhubo || null
if (this.$route.query.start && this.$route.query.end) {
this.listQuery.times = [this.$route.query.start, this.$route.query.end]
}
this.setQuery('status')
this.setQuery('os_status')
this.setQuery('times')
if (this.$route.query.hasOwnProperty('status')) {
this.listQuery.status = this.$route.query.status
} else {
this.listQuery.status = ''
}
this.getList()
this.getShortcutContent()
this.getAdminList()
},
methods: {
setQuery(key){
if (this.$route.query.hasOwnProperty(key)) {
this.listQuery[key] = this.$route.query[key]
} else {
this.listQuery[key] = ''
}
},
getList($is_excel) {
this.listQuery.excel = null
if ($is_excel == 1) {