Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

src/main/java/com/style24/front/biz/service/TsfDisplayService.java

@@ -692,8 +692,8 @@ public class TsfDisplayService {
 	public Collection<Filter> getCategoryFilterList(Collection<Filter> filterList, String filterGb) {
 		Collection<Filter> resultList = new ArrayList<Filter>();
 		int idx = 0;
-		String maxPrice = null;
-		String minPrice = null;
+		String maxPrice = "0";
+		String minPrice = "0";
 		for (Filter filter : filterList) {
 			if(!"".equals(filter.getFilterCd()) && !filter.getFilterCd().equals(null)){
 				if(filter.getFilterGb().equals("PRICE")){

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

@@ -213,16 +213,16 @@ public class SearchEngineDiquest {
 		paramMap.put("adminPort", port);
 		paramMap.put("pageNumber", String.valueOf(params.getPageNo()));
 		paramMap.put("rowsPerPage", String.valueOf(params.getPageSize()));
-//		log.info("///[getGoodsList] paramMap: {}", paramMap);
+		log.info("///[getGoodsList] paramMap: {}", paramMap);
 
 		try {
 			JSONObject jsonObj = SearchService.getGoodsList(paramMap);
-//			log.info("///[getGoodsList] jsonObj: {}", jsonObj.toJSONString());
+			log.info("///[getGoodsList] jsonObj: {}", jsonObj.toJSONString());
 
 			if (jsonObj.get("returnCode").toString().equals("1")) { // 성공
 				Gson gson = new Gson();
 				result = gson.fromJson(jsonObj.toJSONString(), GoodsListResponse.class);
-//				log.info("///[getGoodsList] result: {}", result);
+				log.info("///[getGoodsList] result: {}", result);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();

src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -1,5 +1,6 @@
 package com.style24.front.biz.web;
 
+import java.text.DecimalFormat;
 import java.util.ArrayList;
 import java.util.Collection;
 
@@ -1058,7 +1059,7 @@ public class TsfOrderController extends TsfBaseController {
 
 		int count = customerService.getGiftKakaoSendInfo(custContactHst);
 		
-		if (count < 1) {
+		if (count < 30) {
 			// 2021.05.31 알림톡전송 주문완료정보		
 			if (StringUtils.isNotBlank(orderInfo.getOrdPhnno())) {
 				Integer userNo = orderInfo.getCustNo();
@@ -1067,10 +1068,44 @@ public class TsfOrderController extends TsfBaseController {
 					orderInfo.setGoodsCnt(String.valueOf(resultMap.get("goodsCnt")));
 					kakaotalkService.sendOrderComplete(orderInfo, userNo);
 					
+					GagaMap replaceInfo = new GagaMap(); 
+					DecimalFormat df = new DecimalFormat("###,###");
+					
+					replaceInfo.set("ordSumAmt"			, df.format(resultMap.getInt("ordSumAmt")));
+					replaceInfo.set("dcSumAmt"			, df.format(resultMap.getInt("dcSumAmt")));
+					replaceInfo.set("realOrdSumAmt"		, df.format(resultMap.getInt("realOrdSumAmt")));
+					replaceInfo.set("listSumAmt"		, df.format(resultMap.getInt("listSumAmt")));
+					replaceInfo.set("goodsSumAmt"		, df.format(resultMap.getInt("goodsSumAmt")));
+					replaceInfo.set("goodsDcSumAmt"		, df.format(resultMap.getInt("goodsDcSumAmt")));
+					replaceInfo.set("delvFeeSumAmt"		, df.format(resultMap.getInt("delvFeeSumAmt")));
+					replaceInfo.set("realDelvSumAmt"	, df.format(resultMap.getInt("realDelvSumAmt")));
+					replaceInfo.set("cpn1DcSumAmt"		, df.format(resultMap.getInt("cpn1DcSumAmt")));
+					replaceInfo.set("tmtbSumAmt"		, df.format(resultMap.getInt("tmtbSumAmt")));
+					replaceInfo.set("cpnDcSumAmt"		, df.format(resultMap.getInt("cpnDcSumAmt")));
+					replaceInfo.set("prePntDcSumAmt"	, df.format(resultMap.getInt("prePntDcSumAmt")));
+					replaceInfo.set("pntDcSumAmt"		, df.format(resultMap.getInt("pntDcSumAmt")));
+					replaceInfo.set("gfcdUseSumAmt"		, df.format(resultMap.getInt("gfcdUseSumAmt")));
+					replaceInfo.set("savePntSumAmt"		, df.format(resultMap.getInt("savePntSumAmt")));
+					replaceInfo.set("mileageDcAmt"		, df.format(resultMap.getInt("mileageDcAmt")));
+					replaceInfo.set("allianceDcAmt"		, df.format(resultMap.getInt("allianceDcAmt")));
+					replaceInfo.set("orderInfo"			, resultMap.get("orderInfo"));
+					replaceInfo.set("ordNm"				, resultMap.get("ordNm"));
+					replaceInfo.set("ordNo"				, resultMap.get("ordNo"));
+					replaceInfo.set("ordDt"				, resultMap.get("ordDt"));
+					replaceInfo.set("recipNm"			, resultMap.get("recipNm"));
+					replaceInfo.set("recipPhnno"		, resultMap.get("recipPhnno"));
+					replaceInfo.set("recipZipcode"		, resultMap.get("recipZipcode"));
+					replaceInfo.set("recipBaseAddr"		, resultMap.get("recipBaseAddr"));
+					replaceInfo.set("recipDtlAddr"		, resultMap.get("recipDtlAddr"));
+					replaceInfo.set("delvMemo"			, resultMap.get("delvMemo"));
+					replaceInfo.set("pgGbNm"			, resultMap.get("pgGbNm"));
+					replaceInfo.set("orderListInfo"		, resultMap.get("orderListInfo"));
+					replaceInfo.set("orderFreegiftInfo"	, resultMap.get("orderFreegiftInfo"));
+					
 					// 2021.06.15
 					// 주문완료 안내 메일 보내기
 					if (StringUtils.isNotBlank(orderInfo.getOrdEmail())) {
-						mailService.sendOrderComplete(resultMap, userNo);
+						mailService.sendOrderComplete(replaceInfo, userNo);
 					}
 				} catch (Exception e) {
 					// TODO Auto-generated catch block

src/main/webapp/WEB-INF/views/mob/common/fragments/GnbMob.html

@@ -32,10 +32,10 @@
 			</h1>
 			<div class="button_wrap">
 				<button class="search" onclick="cfnSearchLayer();">
-					<img src="/images/mo/ico_btn_search_w.png" alt="검색">
+					<img src="/images/mo/ico_btn_search.png" alt="검색">
 				</button>
 				<button class="store" onclick="cfnGoToPage(_PAGE_CART);">
-					<img src="/images/mo/ico_btn_store_w.png" alt="쇼핑백">
+					<img src="/images/mo/ico_btn_store.png" alt="쇼핑백">
 					<span id="spanGnbCartCnt" style="display: none;"></span>
 				</button>
 			</div>

src/main/webapp/WEB-INF/views/mob/display/CategoryGoodsListFormMob.html

@@ -1213,58 +1213,144 @@
 
 			}else if(!gagajf.isNull(cate4No)){
 				$.each(cateList, function(idx,item){
-					$.each(item.cate4List, function (idx4,item4){
-						if(item4.cate4No == cate4No){
-							if(idx<1) {
-								$("#htopTitle").append(fnDisplayTitle(item4.cate4Nm));
-							}
-							if(item4.cate5List != null && item4.cate5List.length > 0){
-								let leafTag = '';
-								leafTag += '<a href="javascript:void(0);" class="on" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item4.cate1No + ', ' + item4.cate2No + ', ' + item4.cate3No + ', ' + item4.cate4No + ' ';
-								if(formalGb=='G009_20'){
-									leafTag += ' ,\'\',\''+formalGb+'\'';
-								}
-								leafTag += ');">전체</a>';
-								$.each(item4.cate5List, function (idx5, item5){
-									leafTag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + [[${cateInfo.cateGb}]] + '\', ' + item5.cate1No + ' , ' + item5.cate2No + ', ' + item5.cate3No + ' , ' + item5.cate4No + ' , ' + item5.cate5No + ' ';
+					let cate2 = item.cate2List;
+					$.each(cate2, function(idx2, item2){
+						if(item2.cate2No == cate2No){
+							$.each(item2.cate3List, function(idx3,item3){
+								if(item3.cate3No == cate3No){
+									tag += '<a href="javascript:void(0);" class="daps1" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ' ,' + item2.cate2No + ',' + item3.cate3No + ' ';
 									if(formalGb=='G009_20'){
-										leafTag += ' ,\''+formalGb+'\'';
+										tag += ' ,\'\',\'\',\''+formalGb+'\'';
 									}
-									leafTag += ');">'+item5.cate5Nm+'</a>';
-								});
-								$('#leafCateList').append(leafTag);
-							}
+									tag += ' )">'+item3.cate3Nm+'</a>';
+									tag += '<ul class="daps2">\n';
+									tag += '<li>';
+									tag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ' ,' + item2.cate2No + ',' + item3.cate3No + ' ';
+									if(formalGb=='G009_20'){
+										tag += ' ,\'\',\'\',\''+formalGb+'\'';
+									}
+									tag += ' )">전체</a>';
+									tag += '</li>\n';
+									$.each(item3.cate4List, function(idx4, item4){
+										if(item4.cate4No == cate4No){
+											if(idx<1) {
+												$("#htopTitle").append(fnDisplayTitle(item4.cate4Nm));
+											}
+											let leafTag = '';
+											leafTag += '<a href="javascript:void(0);" class="on" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item4.cate1No + ', ' + item4.cate2No + ', ' + item4.cate3No + ', ' + item4.cate4No + ' ';
+											if(formalGb=='G009_20'){
+												leafTag += ' ,\'\',\''+formalGb+'\'';
+											}
+											leafTag += ');">전체</a>';
+											if(item4.cate5List != null && item4.cate5List.length > 0){
+												$.each(item4.cate5List, function (idx5, item5){
+													leafTag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + [[${cateInfo.cateGb}]] + '\', ' + item5.cate1No + ' , ' + item5.cate2No + ', ' + item5.cate3No + ' , ' + item5.cate4No + ' , ' + item5.cate5No + ' ';
+													if(formalGb=='G009_20'){
+														leafTag += ' ,\''+formalGb+'\'';
+													}
+													leafTag += ');">'+item5.cate5Nm+'</a>';
+												});
+											}
+											$('#leafCateList').append(leafTag);
+										}
+										tag += '<li ';
+										if(item4.cate4No == cate4No){
+											tag += ' class="on"';
+										}
+										tag += '>\n';
+										tag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item4.cate1No + ', ' + item4.cate2No + ', ' + item4.cate3No + ', ' + item4.cate4No + ' ';
+										if(formalGb=='G009_20'){
+											leafTag += ' ,\'\',\''+formalGb+'\'';
+										}
+										tag += ' );">'+item4.cate4Nm+'</a></li>';
+									});
+								}
+							});
 						}
 					});
+					tag += '</ul>\n';
 				});
+				$("#cateDepth").append(tag);
 			}else if(!gagajf.isNull(cate3No)){
 				$.each(cateList, function(idx,item){
-					$.each(item.cate3List, function (idx3,item3){
-						if(item3.cate3No == cate3No){
-							if(idx<1) {
-								$("#htopTitle").append(fnDisplayTitle(item3.cate3Nm));
+					let cate2 = item.cate2List;
+					$.each(cate2, function (idx2,item2){
+						if(item2.cate2No == cate2No){
+							tag += '<a href="javascript:void(0);" class="daps1" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ' ,' + item2.cate2No + ' ';
+							if(formalGb=='G009_20'){
+								tag += ' ,\'\',\'\',\'\',\''+formalGb+'\'';
 							}
-							if(item3.cate4List != null && item3.cate4List.length > 0){
-								let leafTag = '';
-								leafTag += '<a href="javascript:void(0);" class="on" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item3.cate1No + ', ' + item3.cate2No + ', ' + item3.cate3No + ' ';
-								if(formalGb=='G009_20'){
-									leafTag += ' ,\'\',\'\',\''+formalGb+'\'';
-								}
-								leafTag += ');">전체</a>';
-								$.each(item3.cate4List, function (idx4, item4){
-									leafTag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + [[${cateInfo.cateGb}]] + '\', ' + item4.cate1No + ' , ' + item4.cate2No + ', ' + item4.cate3No + ' , ' + item4.cate4No + ' ';
+							tag += ' )">'+item2.cate2Nm+'</a>';
+							tag += '<ul class="daps2">\n';
+							tag += '<li>';
+							tag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ' ,' + item2.cate2No + ' ';
+							if(formalGb=='G009_20'){
+								tag += ' ,\'\',\'\',\'\',\''+formalGb+'\'';
+							}
+							tag += ' )">전체</a>';
+							tag += '</li>\n';
+							$.each(item2.cate3List, function (idx3, item3){
+								if(idx<1) {
+									tag += '<li';
+									if(item3.cate3No == cate3No){
+										tag += ' class="on"';
+									}
+									tag += '><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ', ' + item2.cate2No + ', ' + item3.cate3No + ' ';
 									if(formalGb=='G009_20'){
-										leafTag += ' ,\'\',\''+formalGb+'\'';
+										tag += ' ,\'\',\'\',\''+formalGb+'\'';
 									}
-									leafTag += ');">'+item4.cate4Nm+'</a>';
-								});
-								$('#leafCateList').append(leafTag);
+									tag += ');">'+item3.cate3Nm+'</a></li>';
+								}
+							});
+						}
+					});
+
+					$.each(cate2, function (idx2,item2){
+						let leafTag = '';
+						if(item2.cate2No == cate2No){
+							leafTag += '<a href="javascript:void(0);" class="on" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ', ' + item2.cate2No + ', ' + cate3No + ' ';
+							if(formalGb=='G009_20'){
+								leafTag += ' ,\'\',\'\',\''+formalGb+'\'';
 							}
+							leafTag += ');">전체</a>';
+							$.each(item2.cate3List, function(idx3, item3){
+								if(item3.cate3No == cate3No){
+									if(idx<1) {
+										$("#htopTitle").append(fnDisplayTitle(item3.cate3Nm));
+									}
+									if(item3.cate4List != null && item3.cate4List.length > 0){
+										$.each(item3.cate4List, function (idx4, item4){
+											leafTag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + [[${cateInfo.cateGb}]] + '\', ' + item4.cate1No + ' , ' + item4.cate2No + ', ' + item4.cate3No + ' , ' + item4.cate4No + ' ';
+											if(formalGb=='G009_20'){
+												leafTag += ' ,\'\',\''+formalGb+'\'';
+											}
+											leafTag += ');">'+item4.cate4Nm+'</a>';
+										});
+										// $('#leafCateList').append(leafTag);
+									}
+								}
+							});
+							$('#leafCateList').append(leafTag);
 						}
 					});
+					tag += '</ul>\n';
 				});
+				$("#cateDepth").append(tag);
 			}else if(!gagajf.isNull(cate2No)){
 				$.each(cateList, function(idx,item){
+					tag += '<a href="javascript:void(0);" class="daps1" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item.cate1No + ' ';
+					if(formalGb=='G009_20'){
+						tag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
+					}
+					tag += ' )">'+item.cate1Nm+'</a>';
+					tag += '<ul class="daps2">\n';
+					tag += '<li>';
+					tag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item.cate1No + ' ';
+					if(formalGb=='G009_20'){
+						tag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
+					}
+					tag += ' )">전체</a>';
+					tag += '</li>\n';
 					$.each(item.cate2List, function (idx2,item2){
 						if(item2.cate2No == cate2No){
 							if(idx<1) {
@@ -1288,7 +1374,11 @@
 							}
 						}
 						if(idx<1) {
-							tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ', ' + item2.cate2No + ' ';
+							tag += '<li';
+							if(item2.cate2No == cate2No){
+								tag += ' class="on"';
+							}
+							tag += '><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + item2.cate1No + ', ' + item2.cate2No + ' ';
 							if(formalGb=='G009_20'){
 								tag += ' ,\'\',\'\',\'\',\''+formalGb+'\'';
 							}
@@ -1296,6 +1386,7 @@
 						}
 
 					});
+					tag += '</ul>\n';
 				});
 				$("#cateDepth").append(tag);
 			}else{
@@ -1307,7 +1398,11 @@
 							}
 						}
 						if(idx<1) {
-							tag += '<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + allItem.cate1No + ' ';
+							tag += '<li';
+							if(item.cate1No==allItem.cate1No){
+							tag += ' class="on"';
+							}
+							tag += '><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + allItem.cate1No + ' ';
 							if(formalGb=='G009_20'){
 								tag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
 							}

src/main/webapp/WEB-INF/views/mob/display/LookbookDetailFormMob.html

@@ -207,12 +207,12 @@
 		tag +='		</div>\n';
 		tag +='		<div class="modal-body">\n';
 		tag +='			<div class="itemsGrp rowtype">\n';
-		tag +='				<div class="item_prod ';
+		tag +='				<div class="item_prod">\n';
+		tag +='					<div class="item_state';
 		if(obj9 == 'Y'){
-			tag += ' sold_out';
+			tag += ' soldout';
 		}
 		tag +='">\n';
-		tag +='					<div class="item_state">\n';
 		tag +='						<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\''+obj7+'\',\'\',\'\')" class="itemLink">\n';
 		tag +='							<div class="itemPic">\n';
 		tag +='								<img class="vLHTC pd_img" src="'+goodsImgUrl+'/'+obj1+'?RS=260" alt="">\n';

src/main/webapp/WEB-INF/views/mob/display/SearchGoodsListFormMob.html

@@ -22,11 +22,13 @@
 	<main role="" id="" class="container sch">
 		<section class="sch_result">
 			<div class="inner">
-				<div class="sch_title">
-					<input type="text" class="form_control" id="search" name="search" th:value="${params.keyword}" placeholder="" maxlength="100">
-					<!-- <button class="btn_x">X</button> -->
-					<button type="button" class="btn_sch" onclick="fnSearchData();"><img src="/images/mo/ico_btn_search.png" alt=""></button>
-				</div>
+				<form id="InnerSearchForm" name="InnerSearchForm">
+					<div class="sch_title">
+						<input type="text" class="form_control" id="keyword" name="keyword" th:value="${params.keyword}" placeholder="" maxlength="100">
+						<!-- <button class="btn_x">X</button> -->
+						<button type="button" class="btn_sch" onclick="fnSearchData();"><img src="/images/mo/ico_btn_search.png" alt=""></button>
+					</div>
+				</form>
 				<div class="related_keyword">
 					<div class="sub_category">
 						<div class="cate_wrap">
@@ -810,9 +812,9 @@
 
 	// 검색
 	var fnSearchData = function (){
-		let keyword = $("#InnerSearchForm").find("input[name=search]").val();
+		let keyword = $("#InnerSearchForm").find("input[name=keyword]").val();
 		let brandGroupNo = $("#InnerSearchForm").find("input[name=brandGroupNo]").val();
-		$("#searchGoodsForm").find('input[name=keyword]').val($("#InnerSearchForm").find("input[name=search]").val());
+		$("#searchGoodsForm").find('input[name=keyword]').val($("#InnerSearchForm").find("input[name=keyword]").val());
 		cfnGoToSearchGoodsListForm(keyword,brandGroupNo);
 	}
 
@@ -1107,6 +1109,7 @@
 		fnGetSearchPlanningList();
 		fnGetSearchEventList();
 	}
+
 	/*]]>*/
 </script>
 

src/main/webapp/WEB-INF/views/mob/display/SearchLayerMob.html

@@ -43,10 +43,10 @@
 			<div class="search-list" th:classappend="${#lists.isEmpty(recentlyKeywordList)?'nodata':''}"> <!-- 검색데이터 없을시 nodata 클래스 추가. -->
 				<ul>
 					<li th:if="${recentlyKeywordList}" th:each="oneData, status : ${recentlyKeywordList}">
-						<a href="javascript:void(0);" onclick="fnSearchKeyword([[@{oneData}]]);">
+						<a href="javascript:void(0);" th:onclick="fnSearchKeyword([[${oneData}]])">
 							<p th:text="${oneData}"></p>
 						</a>
-						<button type="button" class="xBtn" onclick="gagajf.setCookie('st24ck_today_keyword', \'[[${oneData}]]\', -1);"><span>삭제</span></button>
+						<button type="button" class="xBtn" th:onclick="fnDeleteCookie(this,[[${oneData}]]);"><span>삭제</span></button>
 					</li>
 				</ul>
 				<p class="nodata_txt" th:if="${#lists.isEmpty(recentlyKeywordList)}">최근 검색어가 없습니다.</p>
@@ -741,7 +741,7 @@
 			trendKeywordList.forEach(function (item, idx) {
 				var tag = '';
 				if (idx < 10) {
-					tag += '	<a href="">'+ item.keyword +'</a>';
+					tag += '	<a href="javascript:void(0);" onclick="fnSearchKeyword(\''+item.keyword+'\');">'+ item.keyword +'</a>';
 				}
 				$("#popularKeyArea").append(tag);
 			});
@@ -754,6 +754,18 @@
 		$("#recommandArea").hide();
 	});
 
+	// 선택 단어 검색
+	var fnSearchKeyword = function (obj){
+		$("#searchMainForm").find("input[name=keyword]").val(obj);
+		$('#btnSearchKeyword').trigger('click');
+	}
+
+	// 선택 단어 삭제
+	var fnDeleteCookie = function (obj, keyword){
+		$(obj).closest('li').remove();
+		gagajf.setCookie('st24ck_today_keyword',keyword, -1);
+	}
+
 	/*]]>*/
 </script>
 

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

@@ -120,7 +120,7 @@
 				tag += '	</div>\n';
 				tag += '	<div class="fold_cont" style="display: none;">\n';
 				tag += '		<div class="fold_detail">\n';
-				tag += '			<div>' + item.noticeContent + '</div>\n';
+				tag += '			<div>' + item.noticeContent.replace(/\n/g,'<br/>') + '</div>\n';
 				tag += '		</div>\n';
 				tag += '	</div>\n';
 				tag += '</li>\n';

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

@@ -51,11 +51,11 @@
 					<a href="https://www.facebook.com/istyle24" class="fbook clickable fl mr5" target="_blank" title="새창 열림"><span class="sr-only">STYLE24 페이스북</span></a>
 					<a href="https://instagram.com/istyle24.official?igshid=o3nzm9tydg9n" class="insta clickable fl" target="_blank" title="새창 열림"><span class="sr-only">STYLE24 인스타그램</span></a>
 				</div>
-				<div class="isms_box mt30">
-					<a href="http://www.yes24.com/notice/pop_isms.html" onclick="window.open(this.href, '_blank','width=500,height=708,toolbars=no,scrollbars=no'); return false;">
-						<p>정보보호관리체계<br>ISMS 인증획득</p>
-					</a>
-				</div>
+<!--				<div class="isms_box mt30">-->
+<!--					<a href="http://www.yes24.com/notice/pop_isms.html" onclick="window.open(this.href, '_blank','width=500,height=708,toolbars=no,scrollbars=no'); return false;">-->
+<!--						<p>정보보호관리체계<br>ISMS 인증획득</p>-->
+<!--					</a>-->
+<!--				</div>-->
 			</div>
 		</div>
 		<div class="corporation_info">
@@ -67,7 +67,7 @@
 							<p>
 								<span>대표이사 : 윤종선</span>
 								<span>주소: 서울시 영등포구 은행로 <em data-font="lato">11</em>, <em data-font="lato">8</em>층 (여의도동, 일신빌딩)</span> <br>
-								<span>사업자등록번호: <em data-font="lato">116-27-32499</em></span>
+								<span>사업자등록번호: <em data-font="lato">116-81-32499</em></span>
 								<span>통신판매업 신고번호: 제<rm data-font="lato">2020</rm>-서울영등포-<rm data-font="lato">1432</rm></span>
 								<span><a class="clickable" href="http://www.ftc.go.kr/bizCommPop.do?wrkr_no=2298137000" target="_blank" title="새창 열림">사업자정보확인</a></span><br>
 								<span>개인정보보호책임자 : 김명인</span>

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

@@ -261,70 +261,76 @@
 									<div id="countdown">
 										<div id="tiles"></div>
 									</div>
-									<div class="count_time" id="countdownTime">
-										<span id="h-hours">HOURS</span>
-										<span id="h-minutes">MINS</span>
-										<span id="h-seconds">SECS</span>
+<!--									<div class="count_time" id="countdownTime">-->
+<!--										<span id="h-hours">HOURS</span>-->
+<!--										<span id="h-minutes">MINS</span>-->
+<!--										<span id="h-seconds">SECS</span>-->
+<!--									</div>-->
+									<div class="count_time">
+										<span>HOURS</span>
+										<span>MINS</span>
+										<span>SECS</span>
 									</div>
 								</div>
 							</div>
-							<script>
-								/* 핫딜 countDown */
-								// var target_date = new Date().getTime() + (1000*3600*8); // set the countdown date
-								var target_date = '';
-								if(!gagajf.isNull($("#socailForm").find("input[name=targetTime]").val())){
-									target_date = $("#socailForm").find("input[name=targetTime]").val().toDate("YYYYMMDD");
-								}
-								if(target_date != null && target_date != ''){
-									var days, hours, minutes, seconds; // variables for time units
+<!--							<script>-->
+<!--								/* 핫딜 countDown */-->
+<!--								// var target_date = new Date().getTime() + (1000*3600*8); // set the countdown date-->
+<!--							  -->
+<!--								var target_date = '';-->
+<!--								if(!gagajf.isNull($("#socailForm").find("input[name=targetTime]").val())){-->
+<!--									target_date = $("#socailForm").find("input[name=targetTime]").val().toDate("YYYYMMDD");-->
+<!--								}-->
+<!--								if(target_date != null && target_date != ''){-->
+<!--									var days, hours, minutes, seconds; // variables for time units-->
 
-									var countdown = document.getElementById("tiles"); // get tag element
+<!--									var countdown = document.getElementById("tiles"); // get tag element-->
 
-									getCountdown();
+<!--									getCountdown();-->
 
-									var timerStop = setInterval(function () { getCountdown(); }, 1000);
+<!--									var timerStop = setInterval(function () { getCountdown(); }, 1000);-->
 
-									var fixDate = new Date().getTime();
-									var fixTarget = (target_date - fixDate) / 1000;
-									var width = (86400-fixTarget)*100/86400;
+<!--									var fixDate = new Date().getTime();-->
+<!--									var fixTarget = (target_date - fixDate) / 1000;-->
+<!--									var width = (86400-fixTarget)*100/86400;-->
 
-									function getCountdown(){
+<!--									function getCountdown(){-->
 
-										// find the amount of "seconds" between now and target
-										var current_date = new Date().getTime();
-										var seconds_left = (target_date - current_date) / 1000;
+<!--										// find the amount of "seconds" between now and target-->
+<!--										var current_date = new Date().getTime();-->
+<!--										var seconds_left = (target_date - current_date) / 1000;-->
 
-										seconds_left = seconds_left % 86400;
+<!--										seconds_left = seconds_left % 86400;-->
 
-										hours = pad( parseInt(seconds_left / 3600) );
-										seconds_left = seconds_left % 3600;
+<!--										hours = pad( parseInt(seconds_left / 3600) );-->
+<!--										seconds_left = seconds_left % 3600;-->
 
-										minutes = pad( parseInt(seconds_left / 60) );
-										seconds = pad( parseInt( seconds_left % 60 ) );
+<!--										minutes = pad( parseInt(seconds_left / 60) );-->
+<!--										seconds = pad( parseInt( seconds_left % 60 ) );-->
 
-										// format countdown string + set tag value
-										countdown.innerHTML = "<span>" + hours + "</span><span>" + minutes + "</span><span>" + seconds + "</span>";
+<!--										// format countdown string + set tag value-->
+<!--										countdown.innerHTML = "<span>" + hours + "</span><span>" + minutes + "</span><span>" + seconds + "</span>";-->
 
-										var elem = document.getElementById("barCurrent");
-										function progressMove(){
-											width += (100-width)/fixTarget;
-											elem.style.width = width + "%";
-										}
-										progressMove();
+<!--										var elem = document.getElementById("barCurrent");-->
+<!--										function progressMove(){-->
+<!--											width += (100-width)/fixTarget;-->
+<!--											elem.style.width = width + "%";-->
+<!--										}-->
+<!--										progressMove();-->
 
-										if(seconds_left < 1){
-											clearInterval(timerStop);
-											elem.style.width = "100%";
-										}
+<!--										if(seconds_left < 1){-->
+<!--											clearInterval(timerStop);-->
+<!--											elem.style.width = "100%";-->
+<!--										}-->
 
-									}
+<!--									}-->
 
-									function pad(n) {
-										return (n < 10 ? '0' : '') + n;
-									}
-								}
-								/* countDown */
-							</script>
+<!--									function pad(n) {-->
+<!--										return (n < 10 ? '0' : '') + n;-->
+<!--									}-->
+<!--								}-->
+<!--								/* countDown */-->
+<!--							</script>-->
 						</div>
 						<div class="cont_body">
 							<div class="swiper-container post-deal">
@@ -859,6 +865,97 @@
 /*<![CDATA[*/
 
 var mainLayoutList = [[${mainLayoutList}]];
+// var targetTime = '';
+// if(!gagajf.isNull($("#socailForm").find("input[name=targetTime]").val())){
+// 	targetTime = $("#socailForm").find("input[name=targetTime]").val().toDate("YYYYMMDD");
+// }
+// if(targetTime != null && targetTime != ''){
+// 	/* 핫딜 countDown */
+// 	var endTime = new Date(targetTime); // 남은시간 지정
+// 	endTime = (Date.parse(endTime) / 1000);
+//
+// 	var countdown = document.getElementById("tiles"); // get tag element
+//
+// 	getCountdown();
+//
+// 	setInterval(function () { getCountdown(); }, 1000);
+//
+// 	function getCountdown(){
+// 		// find the amount of "seconds" between now and target
+// 		var now = new Date();
+// 		now = (Date.parse(now) / 1000);
+//
+// 		var timeLeft = endTime - now;
+//
+// 		var days = Math.floor(timeLeft / 86400);
+// 		var hours = Math.floor((timeLeft - (days * 86400)) / 3600);
+// 		var minutes = Math.floor((timeLeft - (days * 86400) - (hours * 3600 )) / 60);
+// 		var seconds = Math.floor((timeLeft - (days * 86400) - (hours * 3600) - (minutes * 60)));
+//
+// 		if (hours < '10') { hours = '0' + hours; }
+// 		if (minutes < '10') { minutes = '0' + minutes; }
+// 		if (seconds < '10') { seconds = '0' + seconds; }
+//
+// 		// format countdown string + set tag value
+// 		countdown.innerHTML = "<span>" + hours + "</span><span>" + minutes + "</span><span>" + seconds + "</span>";
+// 	}
+//
+// 	function pad(n) {
+// 		return (n < 10 ? '0' : '') + n;
+// 	}
+// }
+
+/* 핫딜 countDown */
+/* 핫딜 countDown */
+var target_date = new Date().getTime() + (1000*3600*7); // set the countdown date
+var days, hours, minutes, seconds; // variables for time units
+
+var countdown = document.getElementById("tiles"); // get tag element
+
+getCountdown();
+
+var timerStop = setInterval(function () { getCountdown(); }, 1000);
+
+var fixDate = new Date().getTime();
+var fixTarget = (target_date - fixDate) / 1000;
+var width = (86400-fixTarget)*100/86400;
+
+function getCountdown(){
+
+	// find the amount of "seconds" between now and target
+	var current_date = new Date().getTime();
+	var seconds_left = (target_date - current_date) / 1000;
+
+	seconds_left = seconds_left % 86400;
+
+	hours = pad( parseInt(seconds_left / 3600) );
+	seconds_left = seconds_left % 3600;
+
+	minutes = pad( parseInt(seconds_left / 60) );
+	seconds = pad( parseInt( seconds_left % 60 ) );
+
+	// format countdown string + set tag value
+	countdown.innerHTML = "<span>" + hours + "</span><span>" + minutes + "</span><span>" + seconds + "</span>";
+
+	var elem = document.getElementById("barCurrent");
+	function progressMove(){
+		width += (100-width)/fixTarget;
+		elem.style.width = width + "%";
+	}
+	progressMove();
+
+	if(seconds_left < 1){
+		clearInterval(timerStop);
+		elem.style.width = "100%";
+	}
+
+}
+
+function pad(n) {
+	return (n < 10 ? '0' : '') + n;
+}
+
+/* countDown */
 
 // var targetTime = $("#socailForm").find("input[name=targetTime]").val();
 // if(targetTime != null && targetTime != ''){
@@ -992,7 +1089,7 @@ var main_trendy_slide = new Swiper('.main_trendy .post-trendy', {
 	loopAdditionalSlides : 1,
 	speed : 1000,
 	autoplay: {
-		delay: 30000,
+		delay: 1500,
 		disableOnInteraction:false,
 	},
 	navigation: {
@@ -1127,61 +1224,37 @@ if (pickLength < 7) { //210614_ 수정 : 슬라이드 갯수 7개 미만일시
 
 }
 
-/* 브랜드 PICK 갯수체크 210430_수정 */
+//210622_ 삭제 : 슬라이드 주석 삭제.
 var pickForCont = $('.post-pick-for .swiper-slide');
 var pickForLength = pickForCont.length;
 if (pickForLength < 2) {
 	var main_pick_post = new Swiper('.main_pick .post-pick-for', { //thumbs
 		initialSlide: 0,
 		slidesPerView: 1,
-		// slidesPerGroup: 6,
 		loop: false,
 		watchOverflow : true,
 		loopeSlides: 6,
 		spaceBetween: 10,
-		// loopFillGroupWithBlank : true,
 		loopAdditionalSlides: 1,
 		allowTouchMove: false,
-		// navigation: {
-		// nextEl: '.main_pick .swiper-button-next',
-		// prevEl: '.main_pick .swiper-button-prev',
-		// },
 		thumbs: {
 			swiper: main_pick_nav
 		},
-		// autoplay: {
-		// 	delay: 5000,
-		// 	disableOnInteraction: false,
-		// },
 	});
 }else{
 	var main_pick_post = new Swiper('.main_pick .post-pick-for', { //thumbs
 		initialSlide: 0,
 		slidesPerView: 1,
-		// slidesPerGroup: 6,
 		loop: true,
 		loopeSlides: 6,
-		//spaceBetween: 10,
-		// loopFillGroupWithBlank : true,
 		loopAdditionalSlides: 1,
 		allowTouchMove: false,
-		// navigation: {
-		// nextEl: '.main_pick .swiper-button-next',
-		// prevEl: '.main_pick .swiper-button-prev',
-		// },
 		thumbs: {
 			swiper: main_pick_nav
 		},
-		// autoplay: {
-		// 	delay: 5000,
-		// 	disableOnInteraction: false,
-		// },
 	});
 }
 
-// main_pick_nav.controller.control = main_pick_post;
-// main_pick_post.controller.control = main_pick_nav;
-
 var main_pick_lookbook = new Swiper ('.main_pick .post-lookbook', {
 	slidesPerView: 1,
 	speed : 1000,

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

@@ -36,29 +36,29 @@
 								<input type="hidden" name="brandGroupNo" th:value="${params.brandGroupNo}">
 								<fieldset>
 									<legend>결과 내 재검색</legend>
-									<input type="text" id="search" name="search" th:value="${params.keyword}" placeholder="" class="search_input" title="검색어 입력" maxlength="100">
+									<input type="text" id="keyword" name="keyword" th:value="${params.keyword}" placeholder="" class="search_input" title="검색어 입력" maxlength="100" >
 									<button type="button" class="sch_btn" onclick="fnSearchData();"><span>검색</span></button>
 								</fieldset>
 							</form>
 							<div class="autokeyword">
 								<h3 class="sr-only">자동완성 검색어</h3>
-								<ul>
-									<li><a href=""><em>가</em>을컬리수</a></li>
-									<li><a href=""><em>가</em>드상하</a></li>
-									<li><a href=""><em>가</em>죽자켓</a></li>
-									<li><a href=""><em>가</em>죽밸트</a></li>
-									<li><a href=""><em>가</em>운</a></li>
-									<li><a href=""><em>가</em>을</a></li>
-									<li><a href=""><em>가</em>디건</a></li>
-									<li><a href=""><em>가</em>디건형니트</a></li>
-									<li><a href=""><em>가</em>드밴드레깅스</a></li>
-									<li><a href=""><em>가</em>을잠옷</a></li>
+								<ul class="autokeywordUl">
+<!--									<li><a href=""><em>가</em>을컬리수</a></li>-->
+<!--									<li><a href=""><em>가</em>드상하</a></li>-->
+<!--									<li><a href=""><em>가</em>죽자켓</a></li>-->
+<!--									<li><a href=""><em>가</em>죽밸트</a></li>-->
+<!--									<li><a href=""><em>가</em>운</a></li>-->
+<!--									<li><a href=""><em>가</em>을</a></li>-->
+<!--									<li><a href=""><em>가</em>디건</a></li>-->
+<!--									<li><a href=""><em>가</em>디건형니트</a></li>-->
+<!--									<li><a href=""><em>가</em>드밴드레깅스</a></li>-->
+<!--									<li><a href=""><em>가</em>을잠옷</a></li>-->
 								</ul>
 							</div>
 						</div>
 						<div class="related_keyword">
 							<span class="title">연관검색어</span>
-							<ul>
+							<ul class="relKeyword">
 								<li><a href="">연관검색어1</a></li>
 								<li><a href="">연관검색어2</a></li>
 								<li><a href="">연관검색어3</a></li>
@@ -932,6 +932,7 @@
 				var reSearchValue = $(this).val();
 				if(reSearchValue.length > 0) {
 					$('.inner_search .autokeyword').show();
+					fnGetAutoSearch();
 				} else if (reSearchValue.length == 0) {
 					$('.inner_search .autokeyword').hide();
 				}
@@ -986,6 +987,37 @@
 			//fnGetInfiniteScrollDataList(1);
 		});
 
+		// 검색어 찾기
+		var fnGetAutoSearch = function (){
+			gagajf.ajaxFormSubmit("/display/search/auto/complete", document.InnerSearchForm, fnAutoCompleteList);
+		}
+
+		// 검색어 찾기 결과
+		var fnAutoCompleteList = function (result){
+			if(result.autoKeywords.length==0 && result.brand == null && result.cateList == null && result.goodsList ==null) {
+				$('.inner_search .autokeyword').hide();
+			}else{
+				// 자동완성 키워드
+				if(result.autoKeywords != null && result.autoKeywords.length > 0){
+					$(".autokeywordUl").html('');
+					let tag = '';
+					// tag += '<ul>\n';
+					$.each(result.autoKeywords, function (idx, item){
+						//<a href="javascript:void(0);"><em>가</em>을컬리수</a>
+						tag += '<li><a href="javascript:void(0);" onclick="fnSearchKeyword(\''+result.autoKeywords[idx]+'\');">'+result.autoKeywords[idx]+'</a></li>\n';
+					});
+					// tag += '</ul>\n';
+					$(".autokeywordUl").append(tag);
+				}
+			}
+		}
+
+		// 선택 단어 검색
+		var fnSearchKeyword = function (obj){
+			$("#InnerSearchForm").find("input[name=keyword]").val(obj);
+			fnSearchData();
+		}
+
 		// 좌측 카테고리 생성
 		var fnCreateSearchCategoryList = function (){
 			let allCateList = [[${allCateList}]];
@@ -1109,9 +1141,9 @@
 
 		// 검색
 		var fnSearchData = function (){
-			let keyword = $("#InnerSearchForm").find("input[name=search]").val();
+			let keyword = $("#InnerSearchForm").find("input[name=keyword]").val();
 			let brandGroupNo = $("#InnerSearchForm").find("input[name=brandGroupNo]").val();
-			$("#searchGoodsForm").find('input[name=keyword]').val($("#InnerSearchForm").find("input[name=search]").val());
+			$("#searchGoodsForm").find('input[name=keyword]').val($("#InnerSearchForm").find("input[name=keyword]").val());
 			cfnGoToSearchGoodsListForm(keyword,brandGroupNo);
 		}
 
@@ -1192,6 +1224,7 @@
 			fnSearchGoodsListSearch();
 		}
 
+
 	</script>
 
 	<!-- //2021.06.18 검색화면 로그스크립트 삽입 -->

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

@@ -36,8 +36,8 @@
 				<div class="list_recent_keword" th:if="${not #lists.isEmpty(recentlyKeywordList)}">
 					<ul>
 						<li th:if="${recentlyKeywordList}" th:each="oneData, status : ${recentlyKeywordList}">
-							<a href="javascript:void(0);" th:text="${oneData}" onclick="fnSearchKeyword([[@{oneData}]]);">슬랙스</a>
-							<button type="button" class="btn_delete" onclick="gagajf.setCookie('st24ck_today_keyword', \'[[${oneData}]]\', -1);"><span>삭제</span></button>
+							<a href="javascript:void(0);" th:text="${oneData}" th:onclick="fnSearchKeyword([[${oneData}]])">슬랙스</a>
+							<button type="button" class="btn_delete" th:onclick="fnDeleteCookie(this,[[${oneData}]]);" ><span>삭제</span></button>
 						</li>
 					</ul>
 				</div>
@@ -373,7 +373,7 @@
 				var tag = '';
 				if (idx < 10) {
 					tag += '<li>';
-					tag += '	<a href="">'+ item.keyword +'</a>';
+					tag += '	<a href="javascript:void(0);" onclick="fnSearchKeyword(\''+item.keyword+'\');">'+ item.keyword +'</a>';
 					tag += '</li>';
 				}
 				$("#popularKeyArea").append(tag);
@@ -506,6 +506,19 @@
 			$('.common_search .area_result .empty_box').hide();
 		}
 	}
+
+	// 선택 단어 검색
+	var fnSearchKeyword = function (obj){
+		$("#searchMainForm").find("input[name=keyword]").val(obj);
+		$('#btnSearchKeyword').trigger('click');
+	}
+
+	// 선택 단어 삭제
+	var fnDeleteCookie = function (obj, keyword){
+		$(obj).closest('li').remove();
+		gagajf.setCookie('st24ck_today_keyword',keyword, -1);
+	}
+
 	/*]]>*/
 </script>
 </html>

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

@@ -260,7 +260,7 @@ $(function(){
            //var endTime = new Date(socialInfo.socialEddt); // 남은시간 지정
 
                endTime = (Date.parse(endTime) / 1000);
-
+console.log(endTime);
                var now = new Date();
                now = (Date.parse(now) / 1000);