From 0b972d7bb9f34bb276b446645765eff02487ca03 Mon Sep 17 00:00:00 2001 From: a0049873 <79py69t9wb@privaterelay.appleid.com> Date: Mon, 15 Aug 2022 15:08:50 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E9=A6=96=E9=A1=B5=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- front/src/views/home/DetailsPageconetent.vue | 5 +++-- .../views/newHome/components/Navigation.vue | 18 +++++++++--------- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/front/src/views/home/DetailsPageconetent.vue b/front/src/views/home/DetailsPageconetent.vue index 47244ec0..4bb4e92b 100644 --- a/front/src/views/home/DetailsPageconetent.vue +++ b/front/src/views/home/DetailsPageconetent.vue @@ -843,7 +843,8 @@ const currentPageSize = ref(5) const pageSizeOptions = ref(['5', '10', '20', '50']) const router = useRouter() - const select = router.currentRoute.value.query.select + const select = router.currentRoute.value.query.select || '组件服务' + const select2 = router.currentRoute.value.query.select const str = router.currentRoute.value.query.str const searchValue = ref(str) let tecHnosphere = router.currentRoute.value.query.tecHnosphere @@ -1424,7 +1425,7 @@ getNewList() if (!tecHnosphere && !appLiCation) { - if (searchValue.value) { + if (searchValue.value && !select2) { globalSearch() } else { getAppResources2() diff --git a/front/src/views/newHome/components/Navigation.vue b/front/src/views/newHome/components/Navigation.vue index bc28679a..6bc2478f 100644 --- a/front/src/views/newHome/components/Navigation.vue +++ b/front/src/views/newHome/components/Navigation.vue @@ -2,14 +2,14 @@