From c10ebe0a47475f2f5362429dd4d48458f6f35307 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Thu, 16 Mar 2023 13:42:48 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B6=88=E6=81=AF=E9=80=9A=E7=9F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 19 ++++++++++++++++---
 src/views/order/orderList.vue    | 12 ++++++++----
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 9080fb2..d2685a3 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -50,7 +50,6 @@
                 size="small"
                 shape="circle"
                 style="margin-left: 10px;padding:0 20px"
-
                 @click.native="toNotice"
                 >全部</Button
               >
@@ -60,8 +59,20 @@
                 <el-dropdown-item :divided="!index">
                   <div style="display: flex; align-items: center">
                     <div v-for="(value, key) in item.data">
-                     {{timeymd(item.created_at)}} {{ key }} : {{ value }}
+                      <div v-if="key!='order_item_id'">
+                        {{timeymd(item.created_at)}} {{ key }} : {{ value }}
+                      </div>
+                      <div v-else>
+                        <Button
+                          style="margin-left: 10px;"
+                          size="small"
+                          :type="'primary'"
+                          @click="goOrder(value)"
+                        >查看订单</Button>
+                      </div>
                     </div>
+
+
                     <Button
                       style="margin-left: 10px;"
                       size="small"
@@ -221,7 +232,9 @@ export default {
       console.log(res);
       this.noticeData = res.data;
     },
-
+    goOrder(value){
+      this.$router.push("/order/orderList?order_item_id="+value);
+    },
     toggleSideBar() {
       this.$store.dispatch("app/toggleSideBar");
     },
diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue
index c9c919c..61954ee 100644
--- a/src/views/order/orderList.vue
+++ b/src/views/order/orderList.vue
@@ -192,7 +192,8 @@
           end_paid: "",
           start_updated: "",
           end_updated: "",
-          order_paid: false,
+          order_paid: false,
+          order_item_id:""
         },
         pickerOptions: {
           shortcuts: [{
@@ -437,7 +438,8 @@
             this.select.start_paid = '';
             this.select.end_paid = '';
             this.select.start_updated = '';
-            this.select.end_updated = '';
+            this.select.end_updated = '';
+            this.select.order_item_id=""
             this.getOrders();
           },
           changeUpdateDate(e) {
@@ -490,7 +492,8 @@
               ...this.select
             })
             this.select.is_merchant = is_merchant;
-            this.select.order_paid = order_paid;
+            this.select.order_paid = order_paid;
+            this.select.order_item_id=""
             this.total = res.total
             this.list = res.rows
           },
@@ -527,7 +530,8 @@
           }
         },
         mounted() {
-          this.memberId = this.$route.query.user_id
+          this.memberId = this.$route.query.user_id
+          this.select.order_item_id = this.$route.query.order_item_id?this.$route.query.order_item_id:""
           this.getTypes()
           this.getOrders()
         }