senyao
/
travel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix

This commit is contained in:
faiz 2024-06-25 16:16:51 +08:00
parent d61156cf9d
commit 668a71df67
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
admin/src/App.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div id="app"> <div id="app">
{{ username }} <!-- {{ username }} -->
<router-view /> <router-view />
</div> </div>
</template> </template>

2
admin/src/main.js
View File

@ -53,7 +53,7 @@ Vue.prototype.$axios = request
Vue.use(watermark) Vue.use(watermark)
new Vue({ export default new Vue({
el: '#app', el: '#app',
router, router,
store, store,

20
admin/src/views/order/product.vue
View File

@ -18,13 +18,13 @@
</div> </div>
<el-table v-loading="listLoading" :data="list" border fit highlight-current-row style="width: 100%"> <el-table v-loading="listLoading" :data="list" border highlight-current-row style="width: 100%">
<el-table-column align="center" fixed label="产品名称" width="220" prop="product_name" /> <el-table-column align="center" label="产品名称" width="220" prop="product_name" />
<el-table-column align="center" fixed label="平台" width="80" prop="os" /> <el-table-column align="center" label="平台" width="80" prop="os" />
<el-table-column align="center" fixed label="订单数" width="80" prop="all" /> <el-table-column align="center" label="订单数" width="80" prop="all" />
<el-table-column align="center" label="订单金额" width="180" prop="total" /> <el-table-column align="center" label="订单金额" width="180" prop="total" />
@ -92,7 +92,17 @@ export default {
form: {} form: {}
} }
}, },
created() { mounted() {
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.getList()
},
//被缓存接收参数
activated(){
this.listQuery.status = this.$route.query.status || null this.listQuery.status = this.$route.query.status || null
this.listQuery.zhubo = this.$route.query.zhubo || null this.listQuery.zhubo = this.$route.query.zhubo || null
if (this.$route.query.start && this.$route.query.end) { if (this.$route.query.start && this.$route.query.end) {