Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/thirdparty/EigeneaiApi.java

@@ -259,7 +259,7 @@ public class EigeneaiApi {
 	 * @since 2021. 6. 30
 	 */
 	public Collection<Item> getRealtimeViewBestGoodsList(int size) {
-		String requestUrl = rtsApiUrl + "/stats-transition?cuid=" + cuid + "&size=" + size + "&type=view&interval=30&span=30";
+		String requestUrl = rtsApiUrl + "/stats-transition?cuid=" + cuid + "&size=" + size + "&type=view&interval=5&span=10";
 
 		Eigeneai eigeneai = this.getEigeneaiInfo(requestUrl);
 		if (eigeneai.getItems() != null && !eigeneai.getItems().isEmpty()) {

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

@@ -354,12 +354,14 @@
    $(document).ready( function() {
 	   $(".pd_descrp .cont_body").find('img').each(function() {
 			let tmpImgSrc = $(this).attr('src');
-			if (tmpImgSrc.indexOf('/Upload/Local') > 0 ){  // /Upload
- 				$(this).attr('src' , tmpImgSrc.replace('/Upload/Local', "/Local"));
- 			}else if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
+			if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
 				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local"));
 			}
 			
+			if (tmpImgSrc.indexOf('/Upload/Local') > 0 ){  // /Upload
+ 				$(this).attr('src' , tmpImgSrc.replace('/Upload/Local', "/Local"));
+ 			} 
+			
 		});
 	   
 	 	//210526_ 추가 : 이미지 style 속성 제거

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

@@ -340,10 +340,10 @@
 					<div style="height:4rem"></div><!-- 여백용 html -->
 					<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block>
 				</div>
-				<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >	
+				<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
+				<div style="height:4rem"></div><!-- 여백용 html -->	
 				<div class="mdhtml_box"	>
-						<div style="height:4rem"></div><!-- 여백용 html -->
-						<div id="goodsDescHtml"></div>
+					<div id="goodsDescHtml"></div>
 				</div>
 				</th:block>
 					
@@ -434,9 +434,11 @@
 				<th:block th:if="${goodsInfo.goodsType == 'G056_S' and goodsComposeList != null and !goodsComposeList.empty}">
 				<th:block  th:each="goodsCompose, status : ${goodsComposeList}">
 					<th:block th:if="${ goodsCompose.tobeFormYn == 'N' and goodsCompose.goodsDesc != null  and !goodsCompose.goodsDesc.empty}" >
+					<div style="height:4rem"></div><!-- 여백용 html -->
 					<div class="mdhtml_box"	>
-						<div style="height:4rem"></div><!-- 여백용 html -->
-						<div th:id="${'goodsDescHtml_' + goodsCompose.compsGoodsCd}"></div>
+						<div class="mdhtml_box"	>
+							<div th:id="${'goodsDescHtml_' + goodsCompose.compsGoodsCd}"></div>
+						</div>
 					</div>
 					</th:block>
 					
@@ -2886,6 +2888,18 @@
 			$('.modal.photo_comment_popup .pop_detail').toggleClass('active');
 		});
 		
+		 // 상품상세 asis html  이지미 경로 수정
+		$(".pd_descrp .cont_body").find('img').each(function() {
+			let tmpImgSrc = $(this).attr('src');
+			if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
+				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local"));
+			}
+			
+			if (tmpImgSrc.indexOf('/Upload/Local') > 0 ){  // /Upload
+ 				$(this).attr('src' , tmpImgSrc.replace('/Upload/Local', "/Local"));
+ 			} 
+			
+		});
 	});
 	
 
@@ -2927,19 +2941,7 @@
 	let vh = window.innerHeight * 0.01;
 	document.documentElement.style.setProperty('--vh', `${vh}px`);
 	
-	 // 상품상세 asis html  이지미 경로 수정
-	window.onload = function(){
-   	 $(".pd_descrp .cont_body").find('img').each(function() {
-			let tmpImgSrc = $(this).attr('src');
-			if (tmpImgSrc.indexOf('/Upload/Local') > 0 ){  // /Upload
- 				$(this).attr('src' , tmpImgSrc.replace('/Upload/Local', "/Local"));
- 			}else if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
-				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local"));
-			}
-			
-		});
-		
-	};
+	
 	
    	let goodsVideoList = [[${goodsVideoList}]];
 	let videoFlag = false;

src/main/webapp/WEB-INF/views/web/customer/PrivacyPolicyFormWeb.html

@@ -43,7 +43,11 @@
 						<div class="form_field">
 							<div class="select_custom prvs_detail">
 								<div class="combo">
-									<div class="select">개인정보 처리방침 v1.0</div>
+									<th:block th:if="${clauseList}" th:each="oneData, status : ${clauseList}">
+											<th:block th:if="${status.first}">
+												<div class="select" th:text="${oneData.clauseTitle}"></div>
+											</th:block>
+									</th:block>
 									<ul class="list" style="display: none;">
 										<th:block th:if="${clauseList}" th:each="oneData, status : ${clauseList}">
 											<li th:text="${oneData.clauseTitle}" th:onclick="fnGetCaluseInfo([[${oneData.clauseSq}]]);"></li>
@@ -73,7 +77,7 @@
 		$.get('/customer/privacy/policy/info/' + clauseSq
 			, function (data) {
 			if(!gagajf.isNull(data.clauseContent)) {
-				$('.cont_body').html(data.clauseContent);
+				$('.cont_body').html(data.clauseContent.replaceAll('&lt;','<').replaceAll('&gt;', '>').replaceAll('&quot;', '"'));
 				$("html, body").animate({scrollTop : $("#container").offset().top},100)
 			}
 		});
@@ -90,7 +94,6 @@
 		});
 
 		$(window).scroll(function(){
-			var scroll = $(this).scrollTop();
 			var headerH = $(".header").height();
 			if ($(window).scrollTop() > headerH){
 				$(".header").addClass("minify");

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

@@ -311,12 +311,14 @@
    $(document).ready( function() {
    	 $(".pd_descrp_pop .cont_body").find('img').each(function() {
 			let tmpImgSrc = $(this).attr('src');
-			if (tmpImgSrc.indexOf('/Upload/Local') > 0 ){  // /Upload
- 				$(this).attr('src' , tmpImgSrc.replace('/Upload/Local', "/Local"));
- 			}else if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
+			if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
 				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local"));
 			}
 			
+			if (tmpImgSrc.indexOf('/Upload/Local') > 0 ){  // /Upload
+ 				$(this).attr('src' , tmpImgSrc.replace('/Upload/Local', "/Local"));
+ 			} 
+			
 		});
    //210526_ 추가 : 이미지 style 속성 제거
 	$(".mdhtml_box style").remove();$(".mdhtml_box img").removeAttr("style");

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

@@ -825,7 +825,9 @@
 				<th:block  th:each="goodsCompose, status : ${goodsComposeList}">
 					<th:block th:if="${ goodsCompose.tobeFormYn == 'N' and goodsCompose.goodsDesc != null  and !goodsCompose.goodsDesc.empty}" >
 						<div style="height:100px"></div>
+						<div class="mdhtml_box">
 						<div th:id="${'goodsDescHtml_' + goodsCompose.compsGoodsCd}"></div>
+						</div>
 					</th:block>
 
 					<th:block th:if="${goodsCompose.tobeFormYn == 'Y'}">
@@ -2723,11 +2725,13 @@
      window.onload = function(){
     	 $(".pd_descrp .cont_body").find('img').each(function() {
  			let tmpImgSrc = $(this).attr('src');
- 			if (tmpImgSrc.indexOf('/Upload/Local') > 0 ){  // /Upload
+ 			if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
+				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local"));
+			}
+			
+			if (tmpImgSrc.indexOf('/Upload/Local') > 0 ){  // /Upload
  				$(this).attr('src' , tmpImgSrc.replace('/Upload/Local', "/Local"));
- 			}else if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
- 				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local"));
- 			}
+ 			} 
  			
  		});
  	}