Merge branch 'eskim' into develop

src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDescFormMob.html

@@ -77,7 +77,7 @@
 			
 			<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
 				<div style="height:4rem"></div><!-- 여백용 html -->
-				<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+				<div id="goodsDescHtml"></div>
 			</th:block>
 		</div>	
 			
@@ -362,6 +362,13 @@
 	 	//210526_ 추가 : 이미지 style 속성 제거
 		$(".mdhtml_box style").remove();$(".mdhtml_box img").removeAttr("style");
 	});
+	
+ //상품상세 적용
+	// 입점 html 에 태그가 정상적이지 않아 스크립트로 처리
+	let goodsDesc = [[${goodsInfo.goodsDesc}]];
+	if ("N" == [[${goodsInfo.tobeFormYn}]] && !gagajf.isNull(goodsDesc)){
+		$('#goodsDescHtml').html([[${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}]]);
+	}
   
 /*]]>*/
 </script>	

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -350,7 +350,7 @@
 					
 					<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
 						<div style="height:4rem"></div><!-- 여백용 html -->
-						<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+						<div id="goodsDescHtml"></div>
 					</th:block>
 					
 				</div>
@@ -2364,6 +2364,13 @@
 		//210526_ 추가 : 이미지 style 속성 제거
 		$(".mdhtml_box style").remove();$(".mdhtml_box img").removeAttr("style");
 		
+		//상품상세 적용
+		// 입점 html 에 태그가 정상적이지 않아 스크립트로 처리
+		let goodsDesc = [[${goodsInfo.goodsDesc}]];
+		if ("N" == [[${goodsInfo.tobeFormYn}]] && !gagajf.isNull(goodsDesc)){
+			$('#goodsDescHtml').html([[${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}]]);
+		}
+		
 		var params = new Object();
 		params.goodsCd = [[${params.goodsCd}]];
 		params.viewDt = [[${params.viewDt}]];

src/main/webapp/WEB-INF/views/web/goods/GoodsDealDescFormWeb.html

@@ -77,7 +77,7 @@
 		
 		<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
 		<div style="height:100px"></div><!-- 여백용 html -->
-		<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+		<div id="goodsDescHtml"></div>
 		</th:block>
 	</div>	
 			
@@ -320,6 +320,14 @@
 	$(".mdhtml_box style").remove();$(".mdhtml_box img").removeAttr("style");
    	
 	});
+	
+ //상품상세 적용
+	// 입점 html 에 태그가 정상적이지 않아 스크립트로 처리
+	let goodsDesc = [[${goodsInfo.goodsDesc}]];
+	if ("N" == [[${goodsInfo.tobeFormYn}]] && !gagajf.isNull(goodsDesc)){
+		$('#goodsDescHtml').html([[${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}]]);
+	}
+	
 /*]]>*/
 </script>	
 </html>

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailFormWeb.html

@@ -725,8 +725,8 @@
 					</th:block >
 					
 					<th:block th:if="${ goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
-						<div style="height:100px"></div><!-- 여백용 html -->
-						<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+						<div style="height:100px"></div>
+						<div id="goodsDescHtml"></div>
 					</th:block>
 				</div>	
 					
@@ -1280,9 +1280,18 @@
 <script th:src="@{'/biz/goods.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/biz/goods.js"></script>
 <script th:inline="javascript">
 /*<![CDATA[*/
+	
+	//상품상세 적용
+	// 입점 html 에 태그가 정상적이지 않아 스크립트로 처리
+	let goodsDesc = [[${goodsInfo.goodsDesc}]];
+	if ("N" == [[${goodsInfo.tobeFormYn}]] && !gagajf.isNull(goodsDesc)){
+		$('#goodsDescHtml').html([[${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}]]);
+	}
+	
 	let socialSq = [[${goodsInfo.socialSq}]];	
 	let socialEddt = [[${goodsInfo.socialEddt}]];
 	
+	
 	function promotionTimer() {
 		var endTime = new Date(socialEddt); // 남은시간 지정	30 March 2021 9:56:00 GMT+0900	
 			endTime = (Date.parse(endTime) / 1000);

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailQnaFormWeb.html

@@ -103,12 +103,12 @@
 				tag += '				<span class="fold_state ' + (item.ansStat == "G060_10" ? "doing" : "done") + '">' + item.ansStatNm + '</span>\n'; //답변완료 : done / 처리중 : doing
 				tag += '				<div class="fold_tit">\n';
 				tag += '					<span>' + item.questContent.escapeHtml() + '</span>\n';
-				if (item.selfGb == 1){
-				tag += '					<i class="ico ico_myqna"></i>\n';	//내가 쓴 글에 추가되는 아이콘
-				}
 				if (item.secretYn == "Y"){
 				tag += '					<i class="ico ico_secret"></i>\n';	//비밀글에 추가되는 아이콘
 				}
+				if (item.selfGb == 1){
+				tag += '					<i class="ico ico_myqna"></i>\n';	//내가 쓴 글에 추가되는 아이콘
+				}
 				tag += '				</div>\n';
 				tag += '				<div class="data">\n';
 				tag += '					<span class="wr_id">'+ item.maskingCustId+'</span>\n';