Merge branch 'develop' into develop_tsit

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

@@ -1240,6 +1240,35 @@ public class TsfDisplayController extends TsfBaseController {
 
 		return result;
 	}
+	
+	/**
+	 * 검색상품 리스트 수량 조회
+	 * 검색팝업창에서 추천솔루선 리턴이 0일 때, 검색엔진 결과가 있는지 확인용
+	 * @param params - 검색엔진 정보
+	 * @return
+	 * @author jmh
+	 * @since 2021. 8. 29
+	 */
+	@PostMapping("/search/goods/list_cnt")
+	@ResponseBody
+	public GagaMap getSearchGoodsListCnt(@RequestBody SearchEngine params) {
+		GagaMap result = new GagaMap();
+		
+		if (TsfSession.isLogin()) {
+			params.setCustNo(TsfSession.getInfo().getCustNo());
+		}
+
+		params.setFrontGb(TsfSession.getFrontGb());
+		params.setCustGb(TsfSession.getCustGb());
+		log.info("getSearchGoodsList params::{}", params);
+		
+		// 검색엔진을 통한 상품리스트 조회
+		GoodsListResponse response = diquest.getGoodsList(params);
+		
+		result.set("response_cnt", response.getTotalCount());
+
+		return result;
+	}
 
 	/**
 	 * 검색기획전 리스트 조회

src/main/webapp/WEB-INF/views/mob/SigninFormMob.html

@@ -73,7 +73,6 @@
 						</ul>
 					</div>
 				</form>
-				<!-- 210812 주석
 				<div class="t_c sns_wrap">
 					<h3 class="sr-only">간편로그인</h3>
 					<ul class="login_utill">
@@ -94,7 +93,6 @@
 						</li>
 					</ul>
 				</div>
-				 --><br><br>
 				<div class="t_c mt30">
 					<button type="button" class="btn_nonMb" onclick="cfnGoToPage(_PAGE_NON_CUSTOMER_ORDER_CONFIRM);" >
 						비회원 주문조회

src/main/webapp/WEB-INF/views/mob/cart/CartListFormMob.html

@@ -57,7 +57,7 @@
 				</div>
 			</div>
 		</th:block>
-<!-- 820임시주석
+
 		<th:block th:if="${cartSize == null or cartSize == 0}">
 			<div class="od_liveview" style="background-color:white;">
 				<h3>지금 많이 보고 있어요</h3>
@@ -82,7 +82,7 @@
 				</div>
 			</div>
 		</th:block>
- -->
+ 		
 		<!-- 옵션변경_팝업01 -->
 		<div id="optModifyPop01" class="popup_box optModifyPop optModifyPop01">
 			<div class="lap">

src/main/webapp/WEB-INF/views/mob/customer/JoinTypeFormMob.html

@@ -43,7 +43,7 @@
 					   <button type="button" class="btn btn_primary btn_block" onclick="cfnGoToPage(_PAGE_CUSTOMER_JOIN);">동의하고 가입하기</button>
 				   </div>
 				</form>
-				<!-- 210812 주석
+				
 				<div class="t_c sns_wrap">
 					<h5>간편하게 시작하기</h5>
 					<ul class="login_utill">
@@ -64,7 +64,7 @@
 						</li>
 					</ul>
 				</div>
-				-->
+				
 		</div>
 
 	</section>

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

@@ -65,7 +65,6 @@
 				<!-- //1.통합검색 default -->
 
 				<!-- 3.지금 많이 보고 있어요 상품. -->
-				<!-- 820임시주석
 				<div class="inner default_box" id="popularArea">
 					<div class="now_view">
 						<div class="store_product">
@@ -93,7 +92,7 @@
 							</div>
 						</div>
 					</div>
-				</div> -->
+				</div>
 				<!-- //3.지금 많이 보고 있어요 상품. -->
 
 				<!-- 4.검색어 타이핑 -->
@@ -151,6 +150,7 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	/*<![CDATA[*/
+	var enterBool = false;
 	var swiperschProduct = new Swiper('.swiper-container.sch_product', {
 		slidesPerView: 3,
 		spaceBetween: 7,
@@ -204,14 +204,32 @@
 		if (!gagajf.validation($('#searchMainForm'))) {
 			return false;
 		}
+		
+		// 검색결과 상품목록 호출(있으면 검색결과 페이지로 이동)
+		gagajf.ajaxFormSubmit("/display/search/goods/list_cnt", document.searchMainForm, function(result) {
+			if( "0" == result.response_cnt){
+				$('.sch_result .default_box').hide();
+				$('.sch_result .searching_box').hide();
+				$('.sch_result .empty_box2').hide();
+				$('.sch_result .empty_box').show();
+				$("#noDataArea").find('#noDataKeyword').text($("#searchMainForm").find('input[name=keyword]').val());
+				
+				// 검색어 연관 상품 추천
+				fnRecommendItemList($("#searchMainForm").find('input[name=keyword]').val());
+				// 인기검색어
+				fnTrendKeywordList();
+				
+			}else{
+				let keyword = encodeURIComponent($('#searchMainForm input[name=keyword]').val());
 
-		let keyword = encodeURIComponent($('#searchMainForm input[name=keyword]').val());
-
-		// 쿠키 세팅
-		fnSetKeywordCookie(keyword);
+				// 쿠키 세팅
+				fnSetKeywordCookie(keyword);
 
-		let actionUrl = _PAGE_BRAND_SEARCH_GOODS + '?keyword=' + keyword + '&brandGroupNo=' + $('#searchMainForm input[name=brandGroupNo]').val();
-		cfnGoToPage(actionUrl);
+				let actionUrl = _PAGE_BRAND_SEARCH_GOODS + '?keyword=' + keyword + '&brandGroupNo=' + $('#searchMainForm input[name=brandGroupNo]').val();
+				
+				cfnGoToPage(actionUrl);
+			}
+		});
 	});
 
 	// 검색어 찾기
@@ -221,24 +239,18 @@
 
 	// 검색어 찾기 결과
 	var fnAutoCompleteList = function (result){
+		if( enterBool ) return;
+		
 		if(result.autoKeywords.length==0 && gagajf.isNull(result.goodsList)){
 			$('.sch_result .default_box').hide();
 			$('.sch_result .searching_box').hide();
 			$('.sch_result .empty_box2').hide();
-			
-			/* 210830 임시주석
-			$('.sch_result .empty_box').show();
-			$("#noDataArea").find('#noDataKeyword').text($("#searchMainForm").find('input[name=keyword]').val());
-			*/
-			// 검색어 연관 상품 추천
-			fnRecommendItemList($("#searchMainForm").find('input[name=keyword]').val());
-			// 인기검색어
-			fnTrendKeywordList();
+						
 		}else{
 			$('.sch_result .default_box').hide();
 			$('.sch_result .searching_box').show();
 			$('.sch_result .empty_box').hide();
-			$('.sch_result .empty_box2').show();
+			$('.sch_result .empty_box2').hide();
 			// 자동완성 키워드
 			if(result.autoKeywords != null && result.autoKeywords.length > 0){
 				$("#keyupArea").show();
@@ -313,7 +325,7 @@
 				$("#relateArea").html('');
 				let tag = '';
 				$.each(result.goodsList, function (idx, item){
-					console.log(item);
+					//console.log(item);
 					if(idx<5) {
 						tag += '<div class="swiper-slide">\n';
 						tag += '	<div class="item_prod">\n';
@@ -364,13 +376,20 @@
 
 	// 검색어 입력
 	var fnOnkeyupKeyword = function (obj){
-		var searchValue = $(obj).val();
-		if(searchValue.length > 0){
-			fnGetAutoSearch();
+		if( 13 != event.keyCode){
+			enterBool = false;
+			var searchValue = $(obj).val();
+			if(searchValue.length > 0){
+				fnGetAutoSearch();
+			}else{
+				$('.sch_result .default_box').show();
+				$('.sch_result .searching_box').hide();
+				$('.sch_result .empty_box').hide();
+				$('.sch_result .empty_box2').hide();
+			}
 		}else{
-			$('.sch_result .default_box').show();
-			$('.sch_result .searching_box').hide();
-			$('.sch_result .empty_box').hide();
+			// 엔터친 후, 그 전에 검색한 결과가 오고있으므로 
+			enterBool = true;	
 		}
 	}
 
@@ -399,6 +418,14 @@
 		$(obj).closest('li').remove();
 		gagajf.setCookie('st24ck_today_keyword',keyword, -1);
 	}
+	
+	// 검색어 입력 후 엔터키
+	$('#searchMainForm input[name=keyword]').keypress(function (event) {
+		if (event.which === 13) {
+			event.preventDefault();
+			$('#btnSearchKeyword').trigger('click');
+		}
+	});
 
 	// 인기검색어 조회
 	var fnTrendKeywordList = function (){
@@ -423,8 +450,9 @@
 		var html = '';
 
 		$.getJSON('/display/recommend/item/list', data, function (result){
-			$("#recommandArea").show();
 			$("#recommendItemArea").html('');
+			$("#recommandArea").show();
+			
 			if(result.length > 0){
 				$.each(result, function (idx, item){
 					html += '<div class="swiper-slide">\n';

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

@@ -65,7 +65,7 @@
 				<!-- //1.통합검색 default -->
 
 				<!-- 3.지금 많이 보고 있어요 상품. -->
-				<!--820임시주석 <div class="inner default_box" id="popularArea">
+				<div class="inner default_box" id="popularArea">
 					<div class="now_view">
 						<div class="store_product">
 							<div class="allresult-tit">
@@ -92,7 +92,7 @@
 							</div>
 						</div>
 					</div>
-				</div> -->
+				</div>
 				<!-- //3.지금 많이 보고 있어요 상품. -->
 
 				<!-- 4.검색어 타이핑 -->
@@ -154,6 +154,7 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	/*<![CDATA[*/
+	var enterBool = false;
 	var trendKeywordList = [[${trendKeywordList.trendList}]];
 
 	var swiperschProduct = new Swiper('.swiper-container.sch_product', {
@@ -209,14 +210,31 @@
 		if (!gagajf.validation($('#searchMainForm'))) {
 			return false;
 		}
+		
+		// 검색결과 상품목록 호출(있으면 검색결과 페이지로 이동)
+		gagajf.ajaxFormSubmit("/display/search/goods/list_cnt", document.searchMainForm, function(result) {
+			if( "0" == result.response_cnt){
+				$('.sch_result .default_box').hide();
+				$('.sch_result .searching_box').hide();
+				$('.sch_result .empty_box2').hide();
+				$('.sch_result .empty_box').show();
+				$("#noDataArea").find('#noDataKeyword').text($("#searchMainForm").find('input[name=keyword]').val());
+				
+				// 검색어 연관 상품 추천
+				fnRecommendItemList($("#searchMainForm").find('input[name=keyword]').val());
+				// 인기검색어
+				fnTrendKeywordList();
+				
+			}else{
+				let keyword = encodeURIComponent($('#searchMainForm input[name=keyword]').val());
 
-		let keyword = encodeURIComponent($('#searchMainForm input[name=keyword]').val());
-
-		// 쿠키 세팅
-		fnSetKeywordCookie(keyword);
+				// 쿠키 세팅
+				fnSetKeywordCookie(keyword);
 
-		let actionUrl = _PAGE_SEARCH_GOODS + '?keyword=' + keyword + '&brandGroupNo=' + $('#searchMainForm input[name=brandGroupNo]').val();
-		cfnGoToPage(actionUrl);
+				let actionUrl = _PAGE_SEARCH_GOODS + '?keyword=' + keyword + '&brandGroupNo=' + $('#searchMainForm input[name=brandGroupNo]').val();
+				cfnGoToPage(actionUrl);
+			}
+		});
 	});
 
 	// 검색어 찾기
@@ -226,18 +244,12 @@
 
 	// 검색어 찾기 결과
 	var fnAutoCompleteList = function (result){
+		if( enterBool ) return;
+		
 		if(result.autoKeywords.length==0 && gagajf.isNull(result.brand.brandGroupNo) && result.cateList.length == 0 && gagajf.isNull(result.goodsList)){
 			$('.sch_result .default_box').hide();
 			$('.sch_result .searching_box').hide();
-			
-			/* 210830 임시주석
-			$('.sch_result .empty_box').show();
-			$("#noDataArea").find('#noDataKeyword').text($("#searchMainForm").find('input[name=keyword]').val());
-			*/
-			// 검색어 연관 상품 추천
-			fnRecommendItemList($("#searchMainForm").find('input[name=keyword]').val());
-			// 인기검색어
-			fnTrendKeywordList();
+						
 		}else{
 			$('.sch_result .default_box').hide();
 			$('.sch_result .searching_box').show();
@@ -384,14 +396,20 @@
 
 	// 검색어 입력
 	var fnOnkeyupKeyword = function (obj){
-		var searchValue = $(obj).val();
-		if(searchValue.length > 0){
-			fnGetAutoSearch();
+		if( 13 != event.keyCode){
+			enterBool = false;
+			var searchValue = $(obj).val();
+			if(searchValue.length > 0){
+				fnGetAutoSearch();
+			}else{
+				$('.sch_result .default_box').show();
+				$('.sch_result .searching_box').hide();
+				$('.sch_result .empty_box').hide();
+				$('.sch_result .empty_box2').hide();
+			}
 		}else{
-			$('.sch_result .default_box').show();
-			$('.sch_result .searching_box').hide();
-			$('.sch_result .empty_box').hide();
-			$('.sch_result .empty_box2').hide();
+			// 엔터친 후, 그 전에 검색한 결과가 오고있으므로 
+			enterBool = true;	
 		}
 	}
 
@@ -512,6 +530,8 @@
 
 		$.getJSON('/display/recommend/item/list', data, function (result){
 			$("#recommendItemArea").html('');
+			$("#recommandArea").show();
+			
 			if(result.length > 0){
 				$.each(result, function (idx, item){
 					html += '<div class="swiper-slide">\n';
@@ -543,13 +563,9 @@
 					html += '	</div>\n';
 					html += '</div>\n';
 				});
-			}
-			$("#recommendItemArea").append(html);
-
-			if( "" == html){
-				$("#recommandArea").hide();
-			}else{
-				$("#recommandArea").show();
+				
+				$("#recommendItemArea").append(html);
+				
 				var swiperschProduct3 = new Swiper('.swiper-container.recommand_slide', {
 					slidesPerView: 2.2,
 					spaceBetween: 8,
@@ -559,6 +575,10 @@
 					freeMode: true,
 					//centeredSlides: true,
 				});
+				
+			}else{
+				$("#recommendItemArea").html('');
+				$("#recommandArea").hide();
 			}
 		});
 	}

src/main/webapp/WEB-INF/views/mob/mypage/MypageReviewCreateFormMob.html

@@ -257,11 +257,10 @@
 													</div>
 												</td>
 											</tr>
-											<!-- 210812 주석-->
+											
 											<tr>
 												<th>
-													<!-- <span class="tit">포토/영상 첨부</span> -->
-													<span class="tit">포토 첨부</span>
+													<span class="tit">포토/영상 첨부</span>
 												</th>
 												<td>
 													<div class="form_field">
@@ -270,7 +269,7 @@
 															<div class="form_field">
 																<div class="imgUpload">
 																	<label for="fileAdd" class="fileAdd" id="fileAdd_reply">첫번째업로드</label>
-																	<input type="file" id="fileAdd" name="files" accept="image/png, image/jpeg, image/jpg"> <!-- 210507_추가 : accept 속성 추가 , video/mp4, video/x-m4v-->
+																	<input type="file" id="fileAdd" name="files" accept="image/png, image/jpeg, image/jpg, video/mp4, video/x-m4v"> <!-- 210507_추가 : accept 속성 추가 -->
 																</div>
 															</div>
 															<!-- //이미지첨부 -->
@@ -278,7 +277,7 @@
 													</div>
 
 													<p class="review_desc">최대 10개까지 등록 가능</p>
-													<!-- <p class="review_desc">동영상 첨부 시 관리자 승인이 필요하여 바로 노출이 되지 않을 수 있습니다.</p> -->
+													<p class="review_desc">동영상 첨부 시 관리자 승인이 필요하여 바로 노출이 되지 않을 수 있습니다.</p>
 												</td>
 											</tr>
 

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

@@ -101,21 +101,22 @@
 
 		<!-- 검색결과 없을때 노출 -->
 		<div class="empty_box" style="display: none">
-		<div class="">
-			<div class="nodata">
-				<p>
-					<span class="keyword" id="noDataKeyword"></span>에 맞는 상품을 찾지 못했습니다.<br>
-					검색어를 변경해 보세요.
-				</p>
-			</div>
-			<div class="pd_list recommend">
-				<h3>이런 상품은 어떤가요?</h3>
-				<div class="itemsGrp" id="recommendItemArea">
-
+			<div class="">
+				<div class="nodata">
+					<p>
+						<span class="keyword" id="noDataKeyword"></span>에 맞는 상품을 찾지 못했습니다.<br>
+						검색어를 변경해 보세요.
+					</p>
+				</div>
+				<div class="pd_list recommend">
+					<h3>이런 상품은 어떤가요?</h3>
+					<div class="itemsGrp" id="recommendItemArea">
+	
+					</div>
 				</div>
 			</div>
+			<!-- //검색결과 없을때 노출 -->
 		</div>
-		<!-- //검색결과 없을때 노출 -->
 	</div>
 </div>
 <button type="button" class="btn_close_search" onclick="fnClose();"><span>닫기</span></button>
@@ -123,6 +124,7 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	/*<![CDATA[*/
+	var enterBool = false;
 	var fnClose = function() {
 		$("#brand_layer_search").removeClass('active');
 	}
@@ -165,13 +167,33 @@
 			return false;
 		}
 		
-		let keyword = encodeURIComponent($('#brandSearchMainForm input[name=keyword]').val());
-		
-		// 쿠키 세팅
-		fnSetKeywordCookie(keyword);
-		
-		let actionUrl = _PAGE_BRAND_SEARCH_GOODS + '?keyword=' + keyword + '&brandGroupNo=' + $('#brandSearchMainForm input[name=brandGroupNo]').val();
-		cfnGoToPage(actionUrl);
+		// 검색결과 상품목록 호출(있으면 검색결과 페이지로 이동)
+		gagajf.ajaxFormSubmit("/display/search/goods/list_cnt", document.brandSearchMainForm, function(result) {
+			if( "0" == result.response_cnt){
+				$('.common_search .area_result .default_box').hide();
+				$('.common_search .area_result .searching_box').hide();
+				$('.common_search .area_result .empty_box').show();
+				$('.empty_box .nodata').find('#noDataKeyword').text("'"+$("#brandSearchMainForm").find('input[name=keyword]').val()+"'");
+				
+				// 검색결과 페이지에서 검색팝업 띄웠을때 (검색결과 페이지에 정의되어있으므로 내용 안뜨는 오류)
+				if( 1 == $("input[name=keyword]").length ){
+					$(".common_search .recommend").show();
+					// 검색어 연관 상품 추천
+					fnRecommendItemList($("#brandSearchMainForm").find('input[name=keyword]').val());
+				}else{
+					$(".common_search .recommend").hide();
+				}
+				
+			}else{
+				let keyword = encodeURIComponent($('#brandSearchMainForm input[name=keyword]').val());
+				
+				// 쿠키 세팅
+				fnSetKeywordCookie(keyword);
+				
+				let actionUrl = _PAGE_BRAND_SEARCH_GOODS + '?keyword=' + keyword + '&brandGroupNo=' + $('#brandSearchMainForm input[name=brandGroupNo]').val();
+				cfnGoToPage(actionUrl);
+			}
+		});
 	});
 
 	var submain_slide;
@@ -204,15 +226,12 @@
 
 	// 검색어 찾기 결과
 	var fnAutoCompleteList = function (result){
+		if( enterBool ) return;
+				
 		if(result.autoKeywords.length==0 && gagajf.isNull(result.goodsList)){
 			$('.common_search .area_result .default_box').hide();
 			$('.common_search .area_result .searching_box').hide();
-			/* 210830 임시주석
-			$('.common_search .area_result .empty_box').show();
-			$('.empty_box .nodata').find('#noDataKeyword').text("'"+$("#brandSearchMainForm").find('input[name=keyword]').val()+"'");
-			*/
-			// 검색어 연관 상품 추천
-			fnRecommendItemList($("#brandSearchMainForm").find('input[name=keyword]').val());
+			
 		}else{
 			$('.common_search .area_result .default_box').hide();
 			$('.common_search .area_result .searching_box').show();
@@ -331,13 +350,19 @@
 	}
 
 	var fnOnkeyupKeyword = function (obj){
-		var searchValue = $(obj).val();
-		if(searchValue.length > 0) {
-			fnGetAutoSearch();
-		} else if (searchValue.length == 0) {
-			$('.common_search .area_result .searching_box').hide();
-			$('.common_search .area_result .default_box').show();
-			$('.common_search .area_result .empty_box').hide();
+		if( 13 != event.keyCode){
+			enterBool = false;
+			var searchValue = $(obj).val();
+			if(searchValue.length > 0) {
+				fnGetAutoSearch();
+			} else if (searchValue.length == 0) {
+				$('.common_search .area_result .searching_box').hide();
+				$('.common_search .area_result .default_box').show();
+				$('.common_search .area_result .empty_box').hide();
+			}
+		}else{
+			// 엔터친 후, 그 전에 검색한 결과가 오고있으므로 
+			enterBool = true;	
 		}
 	}
 
@@ -408,6 +433,8 @@
 
 		$.getJSON('/display/recommend/item/list', data, function (result){
 			$("#recommendItemArea").html('');
+			$("#recommendItemArea").show();
+			
 			if(result.length > 0){
 				$.each(result, function (idx, item){
 					html += '<div class="item_prod">\n';
@@ -431,13 +458,12 @@
 					html += '	</div>\n';
 					html += '</div>\n';
 				});
-			}
-			
-			$("#recommendItemArea").append(html);
-			if( "" == html){
-				$(".recommend").hide();	// leng
+				
+				$("#recommendItemArea").append(html);
+				
 			}else{
-				$(".recommend").show();
+				$("#recommendItemArea").html('');
+				$("#recommendItemArea").hide();
 			}
 			
 		});

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

@@ -117,20 +117,21 @@
 
 		<!-- 검색결과 없을때 노출 -->
 		<div class="empty_box" style="display: none">
-		<div class="">
-			<div class="nodata">
-				<p>
-					<span class="keyword" id="noDataKeyword"></span>에 맞는 상품을 찾지 못했습니다.<br>
-					검색어를 변경해 보세요.
-				</p>
-			</div>
-			<div class="pd_list recommend">
-				<h3>이런 상품은 어떤가요?</h3>
-				<div class="itemsGrp" id="recommendItemArea">
+			<div class="">
+				<div class="nodata">
+					<p>
+						<span class="keyword" id="noDataKeyword"></span>에 맞는 상품을 찾지 못했습니다.<br>
+						검색어를 변경해 보세요.
+					</p>
+				</div>
+				<div class="pd_list recommend">
+					<h3>이런 상품은 어떤가요?</h3>
+					<div class="itemsGrp" id="recommendItemArea">
+					</div>
 				</div>
 			</div>
-		</div>
 		<!-- //검색결과 없을때 노출 -->
+		</div>
 	</div>
 </div>
 <button type="button" class="btn_close_search" onclick="fnClose();"><span>닫기</span></button>
@@ -138,6 +139,7 @@
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	/*<![CDATA[*/
+	var enterBool = false;
 	var trendKeywordList = [[${trendKeywordList.trendList}]];
 
 	var fnClose = function() {
@@ -182,13 +184,34 @@
 			return false;
 		}
 		
-		let keyword = encodeURIComponent($('#searchMainForm input[name=keyword]').val());
-		
-		// 쿠키 세팅
-		fnSetKeywordCookie(keyword);
-		
-		let actionUrl = _PAGE_SEARCH_GOODS + '?keyword=' + keyword + '&brandGroupNo=' + $('#searchMainForm input[name=brandGroupNo]').val();
-		cfnGoToPage(actionUrl);
+		// 검색결과 상품목록 호출(있으면 검색결과 페이지로 이동)
+		gagajf.ajaxFormSubmit("/display/search/goods/list_cnt", document.searchMainForm, function(result) {
+			if( "0" == result.response_cnt){
+				$('.common_search .area_result .default_box').hide();
+				$('.common_search .area_result .searching_box').hide();
+				$('.common_search .area_result .empty_box').show();
+				$('.empty_box .nodata').find('#noDataKeyword').text("'"+$("#searchMainForm").find('input[name=keyword]').val()+"'");
+				
+				// 검색결과 페이지에서 검색팝업 띄웠을때 (검색결과 페이지에 정의되어있으므로 내용 안뜨는 오류)
+				console.log("= "+$("input[name=keyword]").length);
+				if( 1 == $("input[name=keyword]").length ){
+					$(".common_search .recommend").show();
+					// 검색어 연관 상품 추천
+					fnRecommendItemList($("#searchMainForm").find('input[name=keyword]').val());
+				}else{
+					$(".common_search .recommend").hide();
+				}
+				
+			}else{
+				let keyword = encodeURIComponent($('#searchMainForm input[name=keyword]').val());
+				
+				// 쿠키 세팅
+				fnSetKeywordCookie(keyword);
+				
+				let actionUrl = _PAGE_SEARCH_GOODS + '?keyword=' + keyword + '&brandGroupNo=' + $('#searchMainForm input[name=brandGroupNo]').val();
+				cfnGoToPage(actionUrl);
+			}
+		});
 	});
 
 	var submain_slide;
@@ -236,16 +259,12 @@
 
 	// 검색어 찾기 결과
 	var fnAutoCompleteList = function (result){
+		if( enterBool ) return;
+		
 		if(result.autoKeywords.length==0 && gagajf.isNull(result.brand.brandGroupNo) && result.cateList.length == 0 && gagajf.isNull(result.goodsList)){
 			$('.common_search .area_result .default_box').hide();
 			$('.common_search .area_result .searching_box').hide();
-			
-			/* 210830 임시주석
-			$('.common_search .area_result .empty_box').show();
-			$('.empty_box .nodata').find('#noDataKeyword').text("'"+$("#searchMainForm").find('input[name=keyword]').val()+"'");
-			*/
-			// 검색어 연관 상품 추천
-			fnRecommendItemList($("#searchMainForm").find('input[name=keyword]').val());
+				
 		}else{
 			$('.common_search .area_result .default_box').hide();
 			$('.common_search .area_result .searching_box').show();
@@ -364,13 +383,19 @@
 	}
 
 	var fnOnkeyupKeyword = function (obj){
-		var searchValue = $(obj).val();
-		if(searchValue.length > 0) {
-			fnGetAutoSearch();
-		} else if (searchValue.length == 0) {
-			$('.common_search .area_result .searching_box').hide();
-			$('.common_search .area_result .default_box').show();
-			$('.common_search .area_result .empty_box').hide();
+		if( 13 != event.keyCode){
+			enterBool = false;
+			var searchValue = $(obj).val();
+			if(searchValue.length > 0) {
+				fnGetAutoSearch();
+			} else if (searchValue.length == 0) {
+				$('.common_search .area_result .searching_box').hide();
+				$('.common_search .area_result .default_box').show();
+				$('.common_search .area_result .empty_box').hide();
+			}
+		}else{
+			// 엔터친 후, 그 전에 검색한 결과가 오고있으므로 
+			enterBool = true;	
 		}
 	}
 
@@ -441,6 +466,8 @@
 
 		$.getJSON('/display/recommend/item/list', data, function (result){
 			$("#recommendItemArea").html('');
+			$("#recommendItemArea").show();
+			
 			if(result.length > 0){
 				$.each(result, function (idx, item){
 					html += '<div class="item_prod">\n';
@@ -464,13 +491,12 @@
 					html += '	</div>\n';
 					html += '</div>\n';
 				});
-			}
-			
-			$("#recommendItemArea").append(html);
-			if( "" == html){
-				$(".recommend").hide();	// leng
+				
+				$("#recommendItemArea").append(html);
+				
 			}else{
-				$(".recommend").show();
+				$("#recommendItemArea").html('');
+				$("#recommendItemArea").hide();
 			}
 		});
 	}