From 668a71df67959bb6e0ea5b9dbee8b9e1c75fb379 Mon Sep 17 00:00:00 2001
From: 15820893422 <1978476055@qq.com>
Date: Tue, 25 Jun 2024 16:16:51 +0800
Subject: [PATCH] fix

---
 admin/src/App.vue                 |  2 +-
 admin/src/main.js                 |  2 +-
 admin/src/views/order/product.vue | 20 +++++++++++++++-----
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/admin/src/App.vue b/admin/src/App.vue
index 4f587a45..625a5907 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -1,6 +1,6 @@
 <template>
   <div id="app">
-    {{ username }}
+    <!-- {{ username }} -->
     <router-view />
   </div>
 </template>
diff --git a/admin/src/main.js b/admin/src/main.js
index 2c7ec078..0b3dbbf6 100644
--- a/admin/src/main.js
+++ b/admin/src/main.js
@@ -53,7 +53,7 @@ Vue.prototype.$axios = request
 
 Vue.use(watermark)
 
-new Vue({
+export default new Vue({
   el: '#app',
   router,
   store,
diff --git a/admin/src/views/order/product.vue b/admin/src/views/order/product.vue
index 1998d9a4..3d94af53 100644
--- a/admin/src/views/order/product.vue
+++ b/admin/src/views/order/product.vue
@@ -18,13 +18,13 @@
 
     </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" />
 
@@ -92,7 +92,17 @@ export default {
       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.zhubo = this.$route.query.zhubo || null
     if (this.$route.query.start && this.$route.query.end) {