fix(customer-vue): 메시지 수정, waring 수정

This commit is contained in:
hoon7566
2022-03-18 20:22:41 +09:00
parent 5b75ef1b74
commit a22ca6cd4b
6 changed files with 13 additions and 18 deletions

View File

@@ -7,7 +7,7 @@
hide-on-scroll hide-on-scroll
absolute absolute
> >
<v-app-bar-nav-icon> <v-app-bar-nav-icon @click="$router.back()">
<v-icon>mdi-arrow-left</v-icon> <v-icon>mdi-arrow-left</v-icon>
</v-app-bar-nav-icon> </v-app-bar-nav-icon>
<v-spacer></v-spacer> <v-spacer></v-spacer>

View File

@@ -38,49 +38,42 @@ const routes = [
path: "/home", path: "/home",
beforeEnter: authCheck, beforeEnter: authCheck,
name: 'home', name: 'home',
beforeEnter: authCheck,
component: () => import('../views/HomeView') component: () => import('../views/HomeView')
}, },
{ {
path: "/search", path: "/search",
beforeEnter: authCheck, beforeEnter: authCheck,
name: 'search-store', name: 'search-store',
beforeEnter: authCheck,
component: () => import('../views/SearchStore') component: () => import('../views/SearchStore')
}, },
{ {
path: "/history", path: "/history",
beforeEnter: authCheck, beforeEnter: authCheck,
name: 'order-history', name: 'order-history',
beforeEnter: authCheck,
component: () => import('../views/OrderHistory') component: () => import('../views/OrderHistory')
}, },
{ {
path: "/favorite", path: "/favorite",
beforeEnter: authCheck, beforeEnter: authCheck,
name: 'favorite-store', name: 'favorite-store',
beforeEnter: authCheck,
component: () => import('../views/FavoriteStore') component: () => import('../views/FavoriteStore')
}, },
{ {
path: "/notification", path: "/notification",
beforeEnter: authCheck, beforeEnter: authCheck,
name: 'notification', name: 'notification',
beforeEnter: authCheck,
component: () => import('../views/NotificationView') component: () => import('../views/NotificationView')
}, },
{ {
path: "/item/:itemId", path: "/item/:itemId",
beforeEnter: authCheck, beforeEnter: authCheck,
name: 'itemDetail', name: 'itemDetail',
beforeEnter: authCheck,
component: () => import('../views/ItemDetail') component: () => import('../views/ItemDetail')
}, },
{ {
path: "/order", path: "/order",
beforeEnter: authCheck, beforeEnter: authCheck,
name: 'orderPage', name: 'orderPage',
beforeEnter: authCheck,
component: () => import('../views/OrderPage') component: () => import('../views/OrderPage')
}, },
{ {

View File

@@ -167,6 +167,7 @@ export default {
this.setItem.count =1 this.setItem.count =1
return false return false
} }
return true
} }

View File

@@ -40,7 +40,7 @@
</v-list-item> </v-list-item>
<v-card-actions class="pb-2"> <v-card-actions class="pb-2">
<v-btn block color="warning">삭제하기</v-btn> <v-btn block color="warning" @click="message('준비중입니다.')">삭제하기</v-btn>
</v-card-actions> </v-card-actions>
</v-card> </v-card>
@@ -107,6 +107,9 @@ export default {
console.log(error.response) console.log(error.response)
}) })
}, },
message: function(message){
alert(message)
}
} }
} }
</script> </script>

View File

@@ -30,7 +30,7 @@ export default {
}, },
data: function() { data: function() {
return { return {
drawer: null, drawer: true,
notificationCounts: 0 notificationCounts: 0
} }
}, },

View File

@@ -49,29 +49,27 @@ class CategoryOwnerApiControllerTest {
@DisplayName("카테고리리스트_가져오기_성공") @DisplayName("카테고리리스트_가져오기_성공")
void getCategoryList_success() throws Exception { void getCategoryList_success() throws Exception {
//given //given
Long storeId = 1L;
List<CategoryDto> categoryDtoList = new ArrayList<>(); List<CategoryDto> categoryDtoList = new ArrayList<>();
categoryDtoList.add(CategoryDto.builder() categoryDtoList.add(CategoryDto.builder()
.id(10L) .id(10L)
.name("테고리1") .name("페인")
.items(List.of(new ItemDto(1L,"아메리카노",null,5000L) .items(List.of(new ItemDto(1L,"아메리카노",null,5000L)
,new ItemDto(1L,"카페라테",null,5000L))) ,new ItemDto(2L,"카페라테",null,5000L)))
.order(1) .order(1)
.build()); .build());
categoryDtoList.add(CategoryDto.builder() categoryDtoList.add(CategoryDto.builder()
.id(11L) .id(11L)
.name("카테고리2") .name("디저트")
.items(List.of(new ItemDto(1L,"비스킷",null,5000L) .items(List.of(new ItemDto(3L,"비스킷",null,5000L)
,new ItemDto(1L,"와플",null,5000L))) ,new ItemDto(4L,"와플",null,5000L)))
.order(2) .order(2)
.build()); .build());
given(categoryService.getCategoriesWithItem(any())).willReturn(categoryDtoList); given(categoryService.getCategoriesWithItemByUserId(any())).willReturn(categoryDtoList);
//when //when
ResultActions actions = mockMvc.perform(MockMvcRequestBuilders.get("/api/owner/category") ResultActions actions = mockMvc.perform(MockMvcRequestBuilders.get("/api/owner/category")
.param("storeId",String.valueOf(storeId))
.header("user-id","2") .header("user-id","2")
); );