Merge branch 'dev' into dev-yj

src/components/estimate/Estimate.jsx

@@ -75,7 +75,7 @@ export default function Estimate({}) {
   const [popShowSpecialNoteList, setPopShowSpecialNoteList] = useState([])
 
   const globalLocaleState = useRecoilValue(globalLocaleStore)
-  const { get, promisePost } = useAxios(globalLocaleState)
+  const { get, post, promisePost } = useAxios(globalLocaleState)
 
   const { getMessage } = useMessage()
 
@@ -107,7 +107,7 @@ export default function Estimate({}) {
       saleStoreId: session.storeId,
     }
     const apiUrl = `/api/display-item/item-list?${queryStringFormatter(param)}`
-    get({ url: apiUrl }).then((res) => {
+    post({ url: apiUrl, data: param }).then((res) => {
       if (res.length > 0) {
         setDisplayItemList(res)
       }
@@ -616,6 +616,8 @@ export default function Estimate({}) {
   const onChangeDisplayItem = (itemId, dispOrder, index) => {
     const param = {
       itemId: itemId,
+      coldZoneFlg: estimateContextState?.coldRegionFlg,
+      saltAffectedFlg: estimateContextState?.saltAreaFlg,
     }
     const apiUrl = `/api/display-item/item-detail?${queryStringFormatter(param)}`
     let updateList = []
@@ -1551,6 +1553,7 @@ export default function Estimate({}) {
                                         onChangeDisplayItem(e.itemId, item.dispOrder, index)
                                       }
                                     }}
+                                    defaultInputValue={item.itemName}
                                     getOptionLabel={(x) => x.itemName}
                                     getOptionValue={(x) => x.itemId}
                                     isClearable={false}

src/components/main/MainContents.jsx

@@ -15,6 +15,8 @@ import { useMainContentsController } from '@/hooks/main/useMainContentsControlle
 import { QcastContext } from '@/app/QcastProvider'
 import { useSwal } from '@/hooks/useSwal'
 
+import BoardDetailModal from '../community/modal/BoardDetailModal'
+
 export default function MainContents() {
   const { swalFire } = useSwal()
 
@@ -87,6 +89,10 @@ export default function MainContents() {
     }
   }
 
+  // FAQ 팝업 관련
+  const [open, setOpen] = useState(false)
+  const [modalNoticeNo, setModalNoticeNo] = useState('')
+
   return (
     <div className="main-product-list-wrap">
       <div className="main-product-list">
@@ -143,6 +149,8 @@ export default function MainContents() {
           )}
         </ProductItem>
       </div>
+
+      {open && <BoardDetailModal noticeNo={modalNoticeNo} setOpen={setOpen} />}
       <div className="main-product-list">
         <ProductItem num={3} name={getMessage('main.faq')}>
           {recentFaqList.length > 0 ? (
@@ -152,7 +160,16 @@ export default function MainContents() {
                   <li key={row.rowNumber} className="faq-item">
                     <div className="faq-item-inner">
                       <div className="faq-num pre">FAQ {row.totCnt - row.rowNumber + 1}</div>
-                      <div className="faq-title pre">{row.title}</div>
+                      <div
+                        className="faq-title pre"
+                        style={{ cursor: 'pointer' }}
+                        onClick={() => {
+                          setOpen(true)
+                          setModalNoticeNo(row.noticeNo)
+                        }}
+                      >
+                        {row.title}
+                      </div>
                       <div className="faq-day pre">{dayjs(row.regDt).format('YYYY.MM.DD')}</div>
                     </div>
                   </li>