Merge pull request #273 from lotteon2/develop

[FIX] 빈 문자열 검색 불가
lotteon2 · Jan 28, 2024 · 3bce2c9 · 3bce2c9
2 parents 4c0118a + e51b90f
commit 3bce2c9
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 22 deletions.
diff --git a/src/components/HeaderComponent.vue b/src/components/HeaderComponent.vue
@@ -42,7 +42,7 @@ const memberId = computed(() => memberInfo.value.memberId)
 const searchQuery = ref<string | null>(null)
 
 const routeSearch = () => {
-  if (searchQuery.value === null) {
+  if (searchQuery.value === null || searchQuery.value.trim().length === 0) {
     infoModal('알림', '검색 키워드를 입력해주세요.')
   } else {
     window.location.href = `/product-search?query=${searchQuery.value}`
@@ -274,4 +274,4 @@ onMounted(async () => {
 
 <style scoped>
 @import '@/assets/header.css';
-</style>
+</style>
diff --git a/src/views/ProductListView.vue b/src/views/ProductListView.vue
@@ -55,11 +55,6 @@ const initData = async () => {
 
 onBeforeMount(initData)
 
-const scrollToTop = () => {
-  alert('to top')
-  window.scrollTo({ top: 0, behavior: 'smooth' })
-}
-
 const changeBrand = (idx: number) => {
   // 한 번 누른거 또 누르면 브랜드 선택 해제
   if (brandId.value === brandStore.brandList[idx].id) {
@@ -84,21 +79,23 @@ const changeGender = (genderVal: string) => {
 
 // 검색 버튼 클릭 시 다시 조회
 const changeQuery = async () => {
-  const response: ReadProductSliceResponse = await getProductSlice(
-    brandId.value,
-    categoryId.value,
-    gender.value,
-    lowPrice.value,
-    highPrice.value,
-    query.value,
-    (page.value = 0),
-    sort.value,
-    direction.value
-  )
+  if (query.value !== null && query.value.trim().length !== 0) {
+    const response: ReadProductSliceResponse = await getProductSlice(
+      brandId.value,
+      categoryId.value,
+      gender.value,
+      lowPrice.value,
+      highPrice.value,
+      query.value,
+      (page.value = 0),
+      sort.value,
+      direction.value
+    )
 
-  page.value++
-  hasNext.value = response.hasNext
-  products.value = response.productResponses
+    page.value++
+    hasNext.value = response.hasNext
+    products.value = response.productResponses
+  }
 }
 
 // 정렬 기준 변경 시 다시 조회
@@ -639,4 +636,4 @@ const getProductMaxDiscountPercentage = (product: ReadProductResponse) => {
   width: 10vw;
   height: 19.5vh;
 }
-</style>
+</style>