From 2fbc6fa227d316111a9fa41ab61b4cbafbcabf13 Mon Sep 17 00:00:00 2001
From: smallchill <smallchill@163.com>
Date: Mon, 21 Mar 2022 23:48:00 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E4=BF=AE=E5=A4=8D=E9=80=9A=E7=9F=A5?=
 =?UTF-8?q?=E5=85=AC=E5=91=8A=E6=97=A5=E6=9C=9F=E6=AE=B5=E6=9F=A5=E8=AF=A2?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/desk/notice.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/desk/notice.vue b/src/views/desk/notice.vue
index 1f540a3..7886ec9 100644
--- a/src/views/desk/notice.vue
+++ b/src/views/desk/notice.vue
@@ -267,18 +267,18 @@
         const {releaseTimeRange} = this.query;
         let values = {
           ...params,
+          ...this.query
         };
         if (releaseTimeRange) {
           values = {
-            ...params,
+            ...values,
             releaseTime_datege: releaseTimeRange[0],
             releaseTime_datelt: releaseTimeRange[1],
-            ...this.query
           };
           values.releaseTimeRange = null;
         }
         this.loading = true;
-        getList(page.currentPage, page.pageSize, Object.assign(values, this.query)).then(res => {
+        getList(page.currentPage, page.pageSize, values).then(res => {
           const data = res.data.data;
           this.page.total = data.total;
           this.data = data.records;