Merge branch 'develop'

BCSDLab · Nov 20, 2024 · fea0737 · fea0737
2 parents 0596ab9 + 1c84193
commit fea0737
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 0 deletions.
diff --git a/src/model/shopInfo/allShopInfo.ts b/src/model/shopInfo/allShopInfo.ts
@@ -15,6 +15,7 @@ export const Shop = z.object({
   pay_bank: z.boolean(),
   pay_card: z.boolean(),
   open: z.array(Open),
+  main_category_id: z.number(),
   category_ids: z.array(z.number()),
 });
 

diff --git a/src/page/MyShopPage/components/EditShopInfoModal/index.tsx b/src/page/MyShopPage/components/EditShopInfoModal/index.tsx
@@ -98,6 +98,7 @@ export default function EditShopInfoModal({
 
   const handleCategoryIdChange = (e: React.ChangeEvent<HTMLSelectElement>) => {
     setValue('category_ids', [Number(e.target.value), 0]);
+    setValue('main_category_id', Number(e.target.value));
   };
 
   const handleDeleteImage = (image: string) => {

diff --git a/src/page/ShopRegistration/component/Modal/Category/index.tsx b/src/page/ShopRegistration/component/Modal/Category/index.tsx
@@ -11,6 +11,7 @@ export default function Category() {
 
   const handleCategoryClick = (categoryInfo: CategoryProps) => {
     setValue('category_ids', [categoryInfo.id, 0]);
+    setValue('main_category_id', categoryInfo.id);
   };
 
   return (

diff --git a/src/page/ShopRegistration/view/Mobile/ShopCategory/index.tsx b/src/page/ShopRegistration/view/Mobile/ShopCategory/index.tsx
@@ -15,6 +15,7 @@ export default function ShopCategory({ onNext }:{ onNext: () => void }) {
 
   const handleCategoryClick = (categoryInfo: CategoryProps) => {
     setValue('category_ids', [categoryInfo.id, 0]);
+    setValue('main_category_id', categoryInfo.id);
   };
 
   const handleNextClick = () => {