Merge remote-tracking branch 'origin/develop' into xodud1202

src/main/java/com/style24/persistence/mybatis/shop/TsfFaq.xml

@@ -17,12 +17,13 @@
 	<!-- FAQ 자주 묻는 질문 목록 (10개) -->
 	<select id="getFaqLikesList" parameterType="String" resultType="Faq">
 		/* TsfFaq.getFaqLikesList */
-		SELECT FAQ_SQ   /*FAQ일련번호*/
-		     , SITE_CD  /*사이트코드(공통코드G000)*/
-		     , FAQ_TYPE /*FAQ유형(공통코드G046)*/
-		     , QUESTION /*질문*/
-		     , ANSWER   /*답변*/
-		     , DISP_ORD /*표시순서*/
+		SELECT FAQ_SQ                                         /*FAQ일련번호*/
+		     , SITE_CD                                        /*사이트코드(공통코드G000)*/
+		     , FAQ_TYPE                                       /*FAQ유형(공통코드G046)*/
+		     , FN_GET_CODE_NM('G046',FAQ_TYPE) AS FAQ_TYPE_NM /*FAQ유형명*/
+		     , QUESTION                                       /*질문*/
+		     , ANSWER                                         /*답변*/
+		     , DISP_ORD                                       /*표시순서*/
 		FROM   TB_FAQ
 		WHERE  SITE_CD = #{siteCd}
 		AND    USE_YN = 'Y'

src/main/webapp/WEB-INF/views/web/callcenter/FaqFormWeb.html

@@ -61,7 +61,7 @@
 									<h4 class="subH3_eng mb20 c_black">자주 묻는 질문 TOP 10</h4>
 									<ul>
 										<li th:each="faqInfo, status : ${faqTop10List}">
-											<a href="#quick_pop" rel="modal:open" th:text="${faqInfo.question}">제품을 받았는데<br>반품을 하고 싶습니다.</a>
+											<a href="#quick_pop" rel="modal:open" th:text="${faqInfo.question}" th:attr="data-answer=${faqInfo.faqTypeNm + '|'+ #strings.replace(#strings.replace(faqInfo.answer,'&amplt;','<'),'&ampgt;','>')}" onclick="fnOpenFaqDetailPopup(this);">제품을 받았는데<br>반품을 하고 싶습니다.</a>
 										</li>
 									</ul>
 								</div>
@@ -71,7 +71,7 @@
 										<form id="faqForm" name="faqForm" class="search_box" action="#" th:action="@{'/callcenter/faq/list'}" th:method="post" onsubmit="fnSearchFaq(); return false;">
 											<input type="hidden" name="faqType"/>
 											<input type="hidden" name="pageNo" value ="1"/>
-											<input type="hidden" name="pageSize" value ="5"/>
+											<input type="hidden" name="pageSize" value ="10"/>
 											<fieldset>
 												<legend>FAQ 검색</legend>
 												<input type="text" name="searchTxt" placeholder="검색어를 입력해 주세요" class="search_input" title="검색어 입력" maxlength="50"/>
@@ -117,7 +117,7 @@
 		<div class="modal-dialog" role="document">
 			<div class="modal-content">
 				<div class="modal-header">
-					<p>[취소/반품/교환]</p>
+					<p id="faqTypeNm">[취소/반품/교환]</p>
 					<h5 class="modal-title" id="faqQuestion">제품을 받았는데 반품을 하고 싶습니다.</h5>
 				</div>
 				<div class="modal-body">
@@ -228,6 +228,17 @@
 		$('#faqForm input[name=faqType]').val('');
 		fnGetList();
 	}
+	
+	// FAQ상세팝업 오픈
+	let fnOpenFaqDetailPopup = function(obj) {
+		$('#faqQuestion').html($(obj).html());
+		
+		let answer = $(obj).data('answer');
+		if (!gagajf.isNull(answer)) {
+			$('#faqTypeNm').html('[' + answer.substring(0, answer.indexOf('|')) + ']');
+			$('#faqAnswer').html('<span>답변 내용은 아래와 같습니다.</span>' + answer.substring(answer.indexOf('|') + 1));
+		}
+	}
 /*]]>*/
 </script>