diff --git a/src/apis/order/order.ts b/src/apis/order/order.ts index 6e4eb7ba..85e02475 100644 --- a/src/apis/order/order.ts +++ b/src/apis/order/order.ts @@ -124,6 +124,27 @@ export const getOrderDetails = async (orderNo: String): Promise { + try { + const response = await authAxiosInstance.delete( + `${ORDER_SERVICE_PREFIX_PATH}/orders/order-details/${orderDetailNo}` + ) + } catch (error) { + if (error instanceof AxiosError) { + if (error.response) { + if (error.response.status >= 400) { + alert(error.response.data.message) + console.error(`Client Error=${error.response.data.message}`) + } else if (error.response.status < 500) { + alert('서버 내부 오류') + console.error('Internal Server Error') + } + } + } + throw error + } +} + export const gifts = async (giftInfo: GiftInfo): Promise => { try { const { data } = await authAxiosInstance.post(`${ORDER_SERVICE_PREFIX_PATH}/gifts`, giftInfo) diff --git a/src/apis/product/ProductClient.ts b/src/apis/product/ProductClient.ts index f4e48a45..32e07e39 100644 --- a/src/apis/product/ProductClient.ts +++ b/src/apis/product/ProductClient.ts @@ -1,7 +1,7 @@ import type { AxiosResponse } from 'axios' import { AxiosError } from 'axios' import { defaultAxiosInstance } from '@/apis/utils' -import type { ReadProductDetailResponse } from './ProductDto' +import type { ReadProductDetailResponse, ReadProductSliceResponse } from './ProductDto' const PRODUCT_SERVICE_PREFIX: string = '/product-service' const PRODUCT_PREFIX: string = '/products' @@ -43,3 +43,31 @@ export const getProductDetail = async (productId: number): Promise => { + try { + const { data } = await defaultAxiosInstance.get( + `${PRODUCT_SERVICE_PREFIX}${PRODUCT_PREFIX}/search`, + { + params: { lastId: lastId, query: query } + } + ) + return data + } catch (error) { + if (error instanceof AxiosError) { + if (error.response) { + if (error.response.status >= 400) { + alert(error.response.data.message) + console.error(`Client Error=${error.response.data.message}`) + } else if (error.response.status < 500) { + alert('서버 내부 오류') + console.error('Internal Server Error') + } + } + } + throw error + } +} diff --git a/src/assets/css/cart.css b/src/assets/css/cart.css index e90f8e5e..f8ae622c 100644 --- a/src/assets/css/cart.css +++ b/src/assets/css/cart.css @@ -25,6 +25,14 @@ border-bottom: 1px solid #202027; } +.cart-table-data2 { + cursor: pointer; +} + +.cart-table-data2:hover { + background-color: rgba(0, 0, 0, 0.1); +} + .cart-table-data2 > td { color: var(--Grayscale7, #202027); font-family: TheJamsil; @@ -88,6 +96,8 @@ .basket-img { flex-shrink: 0; margin: 20px 0; + width: 100px; + height: 100px; } .basket-column { diff --git a/src/assets/css/order/order-detail.css b/src/assets/css/order/order-detail.css index dc69a9f3..019e2243 100644 --- a/src/assets/css/order/order-detail.css +++ b/src/assets/css/order/order-detail.css @@ -143,6 +143,20 @@ cursor: pointer; } +.gray-button, +.gray-cancel-button { + width: 100%; + height: 40px; + border: none; + border-radius: 2.5px; + font-size: 16px; + font-weight: 400; + line-height: normal; + color: #fff; + background-color: gray; + cursor: default; +} + /* ant */ .ant-rate { color: var(--Grayscale7, #000); diff --git a/src/assets/css/wish.css b/src/assets/css/wish.css index 0e7302b5..a4f9b06e 100644 --- a/src/assets/css/wish.css +++ b/src/assets/css/wish.css @@ -55,6 +55,14 @@ padding-bottom: 10px; } +.wish-table-data2 { + cursor: pointer; +} + +.wish-table-data2:hover { + background-color: rgba(0, 0, 0, 0.1); +} + .wish-table-data2 > td { color: var(--Grayscale7, #202027); font-family: TheJamsil; @@ -67,6 +75,8 @@ .basket-img { flex-shrink: 0; margin: 20px 0; + width: 100px; + height: 100px; } .basket-column { diff --git a/src/components/HeaderComponent.vue b/src/components/HeaderComponent.vue index c43594d0..bae8e425 100644 --- a/src/components/HeaderComponent.vue +++ b/src/components/HeaderComponent.vue @@ -1,11 +1,12 @@