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 @@ + + {{userName}} + 系统首页 @@ -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 }, }; 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) {