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

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

@@ -1300,7 +1300,7 @@
 		          ,  0 AS ITEM_QTY
 		</otherwise>
 		</choose>
-		          , GROUP_CONCAT(CONCAT(FG.GOODS_NM,':',FG.ITEM_QTY)) AS FREE_GOODS
+		          , GROUP_CONCAT(CONCAT(FG.GOODS_NM,'@:',FG.ITEM_QTY)) AS FREE_GOODS
 		          -- , RANK() OVER (PARTITION BY F.FREEGIFT_SQ , F.FREEGIFT_SECTION_SQ ORDER BY  FG.FREEGIFT_VAL_SQ ) AS RNUM
 		    FROM TAB_FREEGOODS FG
 		     WHERE FG.ROWNUM = 1

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

@@ -19,7 +19,7 @@
 		  AND A.USE_YN = 'Y'			     		/*사용여부*/
 		  AND A.APPLY_GB = 'A'						 /*적용구분(P:대기,A:적용,F:종료)*/
 		  AND A.FRONT_GB IN ('A',#{frontGb}) 		 /*프론트 구분*/
-		<!-- ORDER BY A.REG_DT DESC LIMIT 1 -->
+		ORDER BY A.REG_DT DESC LIMIT 1
 	</select>
 	
 	<!-- 소셜상품(=핫딜) 목록 -->

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

@@ -24,7 +24,7 @@
 			<button type="button" id="kakao-link-btn" class="kk" th:attr="onclick=|cfnSendToKakaoMob('${stylelUrl+'/goods/detail/form?goodsCd='+goodsInfo.goodsCd}', '${goodsInfo.goodsFullNm}', '${imgGoodsUrl+ '/'+goodsInfo.sysImgNm+'?RS=80'}');|"><span>카카오톡</span></button>
 			<button type="button" class="fb" th:attr="onclick=|sendSns('facebook', '${stylelUrl+'/goods/detail/form?goodsCd='+goodsInfo.goodsCd}', '${goodsInfo.goodsFullNm}', '', '');|"><span>페이스북</span></button>
 			<button type="button" class="tw" th:attr="onclick=|sendSns('twitter', '${stylelUrl+'/goods/detail/form?goodsCd='+goodsInfo.goodsCd}', '${goodsInfo.goodsFullNm+ '#style24몰'}', '', '');|"><span>트위터</span></button>
-			<button type="button" class="url btn_copy"><span>URL</span></button>
+			<button type="button" class="url btn_copy" onclick="copyToClipboard();"><span>URL</span></button>
 		</span>
 	</div>
 </div>

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

@@ -77,7 +77,7 @@
 								<tr th:each="freeGoods, status : ${freeGoodsList}">
 									<th>
 										<th:block th:text="${#numbers.formatInteger(freeGoods.sectionVal, 0,'COMMA')}"></th:block><th:block th:text="${(freeGoods.sectionGb == 'G810_10')? '개':'원'}"></th:block> 이상 구매 시
-										<th:block th:each="goodsNm : ${#strings.arraySplit(freeGoods.freeGoods,',')}" th:with="goodsArray=${#strings.arraySplit(goodsNm,':')}">
+										<th:block th:each="goodsNm : ${#strings.arraySplit(freeGoods.freeGoods,',')}" th:with="goodsArray=${#strings.arraySplit(goodsNm,'@:')}">
 										<p><th:block th:text="${goodsArray[0]}"></th:block> <th:block th:text="${#numbers.formatInteger(goodsArray[1], 0,'COMMA')}"></th:block>개 증정 <th:block th:if="${freeGoods.allYn == 'N'}" th:text="${'외 택1'}"></th:block></p>
 										</th:block>
 									</th>

src/main/webapp/WEB-INF/views/mob/social/SocialMainFormMob.html

@@ -20,16 +20,17 @@
 <th:block layout:fragment="content">
 <main role="" id="" class="container dp">
 			<section class="content dp_hotdeal">
-				<div class="nodata" style="display: none;">
-					<div class="txt_box">
-						<p>진행하는 핫딜이 없습니다.</p>
-					</div>
-					<div class="btn_box">
-						<button class="btn btn_default" onclick="cfnGoToPage(_PAGE_MAIN);">
-							<span>홈으로 가기</span>
-						</button>
+				<div class="inner" id="topInner" style="display:none;">
+					<div class="list_content"> <!-- 데이터 없을시 클래스 nodata 추가 -->
+						 <div class="list_defult" style="display: none;" id="noData">
+	                         <div>
+	                             <p>진행하는 핫딜이 없습니다.</p>
+	                         </div>
+	                        <button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈으로 가기</span></button>
+	                    </div>
 					</div>
 				</div>
+			<div id="socialDiv">
 			<th:block th:if="${socialInfo != null}">
 				<div class="inner wide">
                     <div class="hotdeal">
@@ -53,6 +54,7 @@
                     </div>
 				</div>
 			</th:block>
+			</div>
 			</section>
 		</main>
 <form id="socialForm" name="socialForm" action="#" th:action="@{'/social/list'}">
@@ -199,7 +201,9 @@ var fnDrawInfiniteScrollData = function (result){
 	gagaInfiniteScroll.pageStatus.totalCount = result.totalCnt;
 	
 	if (result.dataList != null && result.dataList.length > 0) {
-		$(".nodata").hide();		
+		$("#noData").hide();		
+		$("#socialDiv").show();	
+		$("#topInner").hide();
 		let lastPage = result.paging.pageable.pageNo;
 		let endRow = result.endRow - result.paging.pageable.pageSize;
 		
@@ -207,7 +211,9 @@ var fnDrawInfiniteScrollData = function (result){
 		gagaInfiniteScroll.draw(htm);
 	}else{
 		if($("#socialForm input[name=pageNo]").val()==1){
-			$(".nodata").show();		
+			$("#noData").show();	
+			$("#socialDiv").hide();	
+			$("#topInner").show();
 		}
 		$("#divLastPage").show();
 		gagaInfiniteScroll.draw('not');

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -94,7 +94,7 @@
 		</div>
 		<div class="copyright">
 			<p data-font="lato">
-				COPYRIGHT©2020. STYLE24 ALL RIGHTS RESERVED.
+				COPYRIGHT©2021. STYLE24 ALL RIGHTS RESERVED.
 			</p>
 		</div>
 		<div class="mobile_version" style="display:none" id="_moveToMobileVer">

src/main/webapp/WEB-INF/views/web/common/fragments/GnbWeb.html

@@ -417,9 +417,8 @@
 						if(document.cookie.match('(^|;)?gnbtop_banner=([^;]*)(;|$)')==null){
 							bannerYn = "Y";
 							let tag = '';
-							console.log('contentsType:::'+item.contentsType);
+
 							if(item.contentsType == 'OPEN'){
-								console.log('strVar7:::'+item.strVar7);
 								tag +='<div class="bnrtype_open" style="background-color:#'+item.strVar5+';">';
 								if(item.strVar7=='IMG'){
 									tag +=' 	<a href="'+item.strVar1+'" target="">';

src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb.html

@@ -263,14 +263,14 @@
 
 								<div id="infiniteContainer">
 									<div id="listBoxOuter" class="itemsGrp">
-										<ul class="productlist quarter" >
+										<ul class="productlist quarter" id="listBox">
 										</ul>
 									</div>
 								</div>
 
-								<div class="itemsGrp" id="listBox">
+<!--								<div class="itemsGrp" id="listBox">-->
 
-								</div>
+<!--								</div>-->
 
 							</div>
 							<div class="last_page" id="endPage" style="display:none;">

src/main/webapp/WEB-INF/views/web/display/SearchGoodsListFormWeb.html

@@ -1409,9 +1409,6 @@
 				$.each(allCateList,function (allIdx,allItem){
 					$.each(cateList, function (idx,item){
 						if(allItem.cate1No==item.cate1No){
-							console.log('idx::'+idx);
-							console.log(item);
-							console.log(item.cate1No);
 							$('#ulAllCate').append(fnGetSearchCategoryList(item));
 						}
 					});

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

@@ -77,7 +77,7 @@
 								<tr th:each="freeGoods, status : ${freeGoodsList}">
 									<td>
 										<div class="th"><th:block th:text="${#numbers.formatInteger(freeGoods.sectionVal, 0,'COMMA')}"></th:block><th:block th:text="${(freeGoods.sectionGb == 'G810_10')? '개':'원'}"></th:block> 이상 구매 시</div>
-										<th:block th:each="goodsNm : ${#strings.arraySplit(freeGoods.freeGoods,',')}" th:with="goodsArray=${#strings.arraySplit(goodsNm,':')}">
+										<th:block th:each="goodsNm : ${#strings.arraySplit(freeGoods.freeGoods,',')}" th:with="goodsArray=${#strings.arraySplit(goodsNm,'@:')}">
 										<div class="td"><th:block th:text="${goodsArray[0]}"></th:block> <th:block th:text="${#numbers.formatInteger(goodsArray[1], 0,'COMMA')}"></th:block>개 증정 
 										<th:block th:if="${freeGoods.allYn == 'N'}" th:text="${'외 택1'}"></th:block></div>
 										</th:block>

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -514,18 +514,19 @@ if(image.length>0){
 	}
 }
 
-if(goods1.length>0){
+if(template.length>0){
 	var array = [];
-
 	for (var j = 0; j < template.length; j++) {
 		if(template[j].tmplType == 'G082_50'){
 			array.push(template[j].planContSq);
 		}
 	}	
-	
 	for (var i = 0; i < template.length; i++) {
 		var html = '';
 		if(template[i].tmplType == 'G082_50' && array[0] == template[i].planContSq && typeof array[0] != 'undefined') {
+			if(template[i].title != null && template[i].title != ''){
+				$("#G082_50" +template[i].planContSq).show();
+			}
 			html += '<div class="cont_head">\n';
 			html += '	<div>\n';
 			html += '        <h4>\n';
@@ -547,11 +548,7 @@ if(goods1.length>0){
 			html += '        <ul>\n';
 		$.each(goods1, function(idx, item)  {
 			if (item.planContSq == template[i].planContSq) {
-				if (item.goodsCd == null && item.goodsCd == '') {
-					$("#G082_50" +array[0]).hide();
-				}else{
-					$("#G082_50" +array[0]).show();
-				}
+				$("#G082_50" + item.planContSq).show();
 				html += '            <li>\n';
 				html += '                <div class="dp_listItems">\n';
 				html += '                    <div class="dp_listItems_img">\n';
@@ -589,7 +586,7 @@ if(goods1.length>0){
 	}
 }
 
-if(goods2.length>0){
+if(template.length>0){
 	var array = [];
 
 	for (var j = 0; j < template.length; j++) {
@@ -601,6 +598,9 @@ if(goods2.length>0){
 		var html = '';
 		
 		if(template[i].tmplType == 'G082_51' && array[0] == template[i].planContSq && typeof array[0] != 'undefined'){
+			if(template[i].title != null && template[i].title != ''){
+				$("#G082_51" +template[i].planContSq).show();
+			}
 			html += '<div class="cont_head">\n';
 			html += '	<div>\n';
 			html += '        <h4>\n';
@@ -622,11 +622,7 @@ if(goods2.length>0){
 			html += '            <div class="swiper-wrapper">\n';
 			$.each(goods2, function(idx, item) {
 				if (item.planContSq == template[i].planContSq) {
-					if (item.goodsCd == null && item.goodsCd == '') {
-						$("#G082_51" +array[0]).hide();
-					}else{
-						$("#G082_51" +array[0]).show();
-					}
+					$("#G082_51" + item.planContSq).show();
 					html += '                <div class="swiper-slide">\n';
 					html += '                    <div class="item_prod">\n';
 					html += '                        <div class="item_state">\n';
@@ -667,7 +663,7 @@ if(goods2.length>0){
 	}
 }
 
-if(goods4.length>0){
+if(template.length>0){
 	var array = [];
 
 	for (var j = 0; j < template.length; j++) {
@@ -678,6 +674,9 @@ if(goods4.length>0){
 	for (var i = 0; i < template.length; i++) {
 		var html = '';
 		if(template[i].tmplType == 'G082_52' && array[0] == template[i].planContSq && typeof array[0] != 'undefined'){
+			if(template[i].title != null && template[i].title != ''){
+				$("#G082_52" +template[i].planContSq).show();
+			}
 			html += '<div class="cont_head">\n';
 			html += '<div>\n';
 			html += '        <h4>\n';
@@ -699,11 +698,7 @@ if(goods4.length>0){
 			html += '            <div class="swiper-wrapper">\n';
 			$.each(goods4, function(idx, item) {
 				if (item.planContSq == template[i].planContSq) {
-					if (item.goodsCd == null && item.goodsCd == '') {
-						$("#G082_52" +array[0]).hide();
-					}else{
-						$("#G082_52" +array[0]).show();
-					}
+					$("#G082_52" + item.planContSq).show();
 					html += '                <div class="swiper-slide">\n';
 					html += '                    <div class="item_prod">\n';
 					html += '                        <div class="item_state">\n';

src/main/webapp/WEB-INF/views/web/social/SocialMainFormWeb.html

@@ -38,31 +38,33 @@
 					</div>
 				</div>
 			<th:block th:if="${socialInfo != null}">
-			<div class="content wide dp_hotdeal"> <!-- 페이지특정 클래스 = dp_hotdeal -->
-				<div class="cont_body">
-                    <div class="hotdeal">
-                    <img src="/images/pc/thumb/hotdeal_bg2.jpg" alt="핫한 아이템을 핫한 가격에 LAST DAY DEAL">
-                        <div id="countdown">
-                            <span id="h-hours"></span>
-                            <span id="h-minutes"></span>
-                            <span id="h-seconds"></span>
-                        </div>
-                    </div>  
-                    <div class="list_content">
-                        <div class="itemsGrp rowtype"> <!-- itemsGrp rank hot deal --> <!-- rowtype 추가시 가로형태로 출력 -->
-									<section id="infiniteContainer">
-										<div id="listBoxOuter">
-											<ul id="listBox">
-											</ul>
-										</div>
-									</section>
-								</div>
-                         <div class="last_page" id="divLastPage" style="display: none;">
-						<span>마지막 페이지입니다.</span>
-					</div>
-                    </div>
-                   
-                </div>
+			<div id="socialDiv" style="display: none;">
+				<div class="content wide dp_hotdeal"> <!-- 페이지특정 클래스 = dp_hotdeal -->
+					<div class="cont_body">
+	                    <div class="hotdeal">
+	                    <img src="/images/pc/thumb/hotdeal_bg2.jpg" alt="핫한 아이템을 핫한 가격에 LAST DAY DEAL">
+	                        <div id="countdown">
+	                            <span id="h-hours"></span>
+	                            <span id="h-minutes"></span>
+	                            <span id="h-seconds"></span>
+	                        </div>
+	                    </div>  
+	                    <div class="list_content">
+	                        <div class="itemsGrp rowtype"> <!-- itemsGrp rank hot deal --> <!-- rowtype 추가시 가로형태로 출력 -->
+										<section id="infiniteContainer">
+											<div id="listBoxOuter">
+												<ul id="listBox">
+												</ul>
+											</div>
+										</section>
+									</div>
+	                         <div class="last_page" id="divLastPage" style="display: none;">
+							<span>마지막 페이지입니다.</span>
+						</div>
+	                    </div>
+	                   
+	                </div>
+			    </div>
 		    </div>
 		</th:block>
 
@@ -224,7 +226,8 @@ var fnDrawInfiniteScrollData = function (result){
 	gagaInfiniteScroll.pageStatus.totalCount = result.totalCnt;
 
 	if (result.dataList != null && result.dataList.length > 0) {
-		$(".nodata").hide();		
+		$(".nodata").hide();	
+		$("#socialDiv").show();	
 		let lastPage = result.paging.pageable.pageNo;
 		let endRow = result.endRow - result.paging.pageable.pageSize;
 		
@@ -232,7 +235,8 @@ var fnDrawInfiniteScrollData = function (result){
 		gagaInfiniteScroll.draw(htm);
 	}else{
 		if($("#socialForm input[name=pageNo]").val()==1){
-			$(".nodata").show();		
+			$(".nodata").show();	
+			$("#socialDiv").hide();	
 		}
 		$("#divLastPage").show();
 		gagaInfiniteScroll.draw('not');

src/main/webapp/biz/search.js

@@ -15,7 +15,7 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 			categoryGoodsList.push(item.goodsCd);
 		}
 
-		tag += '<div class="item_prod" id="'+item.goodsCd+item.mainColorCd+'">';
+		tag += '<div class="item_prod">';
 		tag += '	<div class="item_state';
 		if(!gagajf.isNull(item.sizes)){
 			var sizeArr = item.sizes.split(",");
@@ -61,7 +61,7 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 				tag += '<iframe id="pdThumbVideo" class="pd_mov" src="'+_kollusMediaUrl+'/'+videoUrl+'?enable_initialize_focus=false&autoplay&mute&controls_activation=none" allow="fullscreen" allowFullScreen></iframe>';
 			}
 		}
-		tag += '		<img class=" vLHTC pd_img" src="'+goodsUrl+'/'+item.sysImgNm+'" data-img="'+goodsUrl+'/'+item.sysImgNm2+'" onerror="noneImg(this)">';
+		tag += '		<img class=" vLHTC pd_img" src="'+item.sysImgNm+'" data-img="'+item.sysImgNm2+'" onerror="noneImg(this)">';
 		if(!gagajf.isNull(item.sizes) && item.selfGoodsYn=='Y'){
 			var sizeArr = item.sizes.split(",");
 			var minSize;