From 536cb020f2f0181db8c9daaf1d3fe268ea59a3b5 Mon Sep 17 00:00:00 2001
From: lion <120344285@qq.com>
Date: Wed, 10 May 2023 10:15:24 +0800
Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue | 5 +++++
 src/views/order/orderList.vue    | 8 +++++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index d2685a3..282e7b1 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -99,6 +99,9 @@
           <i class="el-icon-caret-bottom" />
         </div>
         <el-dropdown-menu slot="dropdown" class="user-dropdown">
+          <el-dropdown-item disabled>
+              <span style="color:#bf617c">{{userName}}</span>
+          </el-dropdown-item>
           <router-link to="/">
             <el-dropdown-item> 系统首页 </el-dropdown-item>
           </router-link>
@@ -145,6 +148,7 @@ export default {
       //isLoading:false,
       noticeData: [],
       messageStatus: 2,
+      userName:"",
       // columns:[
       //   {
       //     width: 160,
@@ -245,6 +249,7 @@ export default {
   },
   mounted() {
     this.getNotice();
+    this.userName = this.$store.state.user?.name
   },
 };
 </script>
diff --git a/src/views/order/orderList.vue b/src/views/order/orderList.vue
index 3a6e3e5..6782cd9 100644
--- a/src/views/order/orderList.vue
+++ b/src/views/order/orderList.vue
@@ -343,6 +343,12 @@
                   prop: "member.area",
                   label: "区域",
                   width: 110
+                },
+                {
+                  prop: "member.address",
+                  label: "地址",
+                  width: 160,
+                  align:'left'
                 },
                 {
                   prop: "member.due_date",
@@ -531,7 +537,7 @@
               this.select.end_updated = e[1]+' 23:59:59';
             }else{
               this.select.start_updated = ""
-              this.select.start_updated = ""
+              this.select.end_updated = ""
             }
           },
           changePayDate(e) {