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

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

@@ -838,81 +838,147 @@
 	<!-- 몰메인 브랜드픽 조회 -->
 	<select id="getContentsBannerList" parameterType="Contents" resultType="Contents">
 		/* TsfDisplay.getContentsBannerList */
+		WITH CONTENTS_DATA AS (
+		    SELECT BRAND_GROUP_NO
+		         , IMG_PATH1
+		         , STR_VAR1
+		         , STR_TITLE1
+		         , SUB_TEXT1
+		    FROM TB_CONTENTS
+		    WHERE 1 = 1
+		      AND CONTENTS_LOC =  #{contentsLoc}
+		      AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		      AND USE_YN = 'Y'
+		      AND BRAND_GROUP_NO =  #{brandGroupNo}
+		      AND IMG_PATH1 IS NOT NULL
+		      AND IMG_PATH1 <![CDATA[<>]]> ''
+		    UNION ALL
+		    SELECT BRAND_GROUP_NO
+		         , IMG_PATH2
+		         , STR_VAR2
+		         , STR_TITLE2
+		         , SUB_TEXT2
+		    FROM TB_CONTENTS
+		    WHERE 1 = 1
+		      AND CONTENTS_LOC =  #{contentsLoc}
+		      AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		      AND USE_YN = 'Y'
+		      AND BRAND_GROUP_NO =  #{brandGroupNo}
+		      AND IMG_PATH2 IS NOT NULL
+		      AND IMG_PATH2 <![CDATA[<>]]> ''
+		    UNION ALL
+		    SELECT BRAND_GROUP_NO
+		         , IMG_PATH3
+		         , STR_VAR3
+		         , STR_TITLE3
+		         , SUB_TEXT3
+		    FROM TB_CONTENTS
+		    WHERE 1 = 1
+		      AND CONTENTS_LOC =  #{contentsLoc}
+		      AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		      AND USE_YN = 'Y'
+		      AND BRAND_GROUP_NO =  #{brandGroupNo}
+		      AND IMG_PATH3 IS NOT NULL
+		      AND IMG_PATH3 <![CDATA[<>]]> ''
+		    UNION ALL
+		    SELECT BRAND_GROUP_NO
+		         , IMG_PATH4
+		         , STR_VAR4
+		         , STR_TITLE4
+		         , SUB_TEXT4
+		    FROM TB_CONTENTS
+		    WHERE 1 = 1
+		      AND CONTENTS_LOC =  #{contentsLoc}
+		      AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		      AND USE_YN = 'Y'
+		      AND BRAND_GROUP_NO =  #{brandGroupNo}
+		      AND IMG_PATH4 IS NOT NULL
+		      AND IMG_PATH4 <![CDATA[<>]]> ''
+		    UNION ALL
+		    SELECT BRAND_GROUP_NO
+		         , IMG_PATH5
+		         , STR_VAR5
+		         , STR_TITLE5
+		         , SUB_TEXT5
+		    FROM TB_CONTENTS
+		    WHERE 1 = 1
+		      AND CONTENTS_LOC =  #{contentsLoc}
+		      AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		      AND USE_YN = 'Y'
+		      AND BRAND_GROUP_NO =  #{brandGroupNo}
+		      AND IMG_PATH5 IS NOT NULL
+		      AND IMG_PATH5 <![CDATA[<>]]> ''
+		)
 		SELECT BRAND_GROUP_NO
-			 , IMG_PATH1
-			 , IMG_PATH2
-			 , STR_VAR1
-			 , STR_VAR2
-			 , STR_TITLE1
-			 , STR_TITLE2
-			 , SUB_TEXT1
-			 , SUB_TEXT2
+		     , IMG_PATH1
+		     , IMG_PATH2
+		     , STR_VAR1
+		     , STR_VAR2
+		     , STR_TITLE1
+		     , STR_TITLE2
+		     , SUB_TEXT1
+		     , SUB_TEXT2
 		FROM (
-				 SELECT BRAND_GROUP_NO
-					  , IMG_PATH1
-					  , IMG_PATH2
-					  , STR_VAR1
-					  , STR_VAR2
-					  , STR_TITLE1
-					  , STR_TITLE2
-					  , SUB_TEXT1
-					  , SUB_TEXT2
-				 FROM TB_CONTENTS
-				 WHERE 1 = 1
-				   AND CONTENTS_LOC = #{contentsLoc}
-				   AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
-				   AND USE_YN = 'Y'
-				   AND BRAND_GROUP_NO = #{brandGroupNo}
-				 UNION ALL
-				 SELECT BRAND_GROUP_NO
-					  , IMG_PATH1
-					  , IMG_PATH2
-					  , STR_VAR1
-					  , STR_VAR2
-					  , STR_TITLE1
-					  , STR_TITLE2
-					  , SUB_TEXT1
-					  , SUB_TEXT2
-				 FROM (
-						  SELECT BRAND_CD                      AS BRAND_GROUP_NO
-							   , ORG_TNFILE_NM                 AS IMG_PATH1
-							   , ''                            AS IMG_PATH2
-							   , CONCAT('/display/lookbook/detail/form?lookbookGb=L&amp;lookbookSq=',LOOKBOOK_SQ ,'&amp;brandCd=',BRAND_CD) AS STR_VAR1
-							   , ''                            AS STR_VAR2
-							   , TITLE                         AS STR_TITLE1
-							   , ''                            AS STR_TITLE2
-							   , ''                            AS SUB_TEXT1
-							   , ''                            AS SUB_TEXT2
-						  FROM TB_LOOKBOOK
-						  WHERE 1 = 1
-							AND BRAND_CD = #{brandGroupNo}
-							AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
-							AND DISP_YN = 'Y'
-						  ORDER BY REG_DT DESC
-						  LIMIT 1
-					  ) A
-				 UNION ALL
-				 SELECT PB.BRAND_GROUP_NO
-					  , P.MAIN_PIMG                                        AS IMG_PATH1
-					  , ''                                                 AS IMG_PATH2
-					  , CONCAT('/planning/detail/form?planSq=', P.PLAN_SQ) AS STR_VAR1
-					  , ''                                                 AS STR_VAR2
-					  , P.DTL_TITLE1                                       AS STR_TITLE1
-					  , P.DTL_TITLE2                                       AS STR_TITLE2
-					  , ''                                                 AS SUB_TEXT1
-					  , ''                                                 AS SUB_TEXT2
-				 FROM TB_PLAN P
-						  INNER JOIN TB_PLAN_BRAND PB ON P.PLAN_SQ = PB.PLAN_SQ AND PB.DISP_YN = 'Y'
-				 WHERE 1 = 1
-				   AND BRAND_GROUP_NO = #{brandGroupNo}
-				   AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
-				   AND PLAN_GB = 'P'
-				   AND DEL_YN = 'N'
-				   AND OPEN_YN = 'Y'
-				<if test="frontGb != null and frontGb != ''">
-				   AND FRONT_GB LIKE CONCAT('%',#{frontGb},'%')
-				</if>
-			 ) AS Z
+		        SELECT BRAND_GROUP_NO
+		             , IMG_PATH1
+		             , '' AS IMG_PATH2
+		             , STR_VAR1
+		             , '' AS STR_VAR2
+		             , STR_TITLE1
+		             , '' AS STR_TITLE2
+		             , SUB_TEXT1
+		             , '' AS SUB_TEXT2
+		        FROM CONTENTS_DATA
+		        UNION ALL
+		         SELECT BRAND_GROUP_NO
+		              , IMG_PATH1
+		              , IMG_PATH2
+		              , STR_VAR1
+		              , STR_VAR2
+		              , STR_TITLE1
+		              , STR_TITLE2
+		              , SUB_TEXT1
+		              , SUB_TEXT2
+		         FROM (
+		              SELECT BRAND_CD                      AS BRAND_GROUP_NO
+		                   , ORG_TNFILE_NM                 AS IMG_PATH1
+		                   , ''                            AS IMG_PATH2
+		                   , CONCAT('/display/lookbook/detail/form?lookbookGb=L&amp;lookbookSq=',LOOKBOOK_SQ ,'&amp;brandCd=',BRAND_CD) AS STR_VAR1
+		                   , ''                            AS STR_VAR2
+		                   , TITLE                         AS STR_TITLE1
+		                   , ''                            AS STR_TITLE2
+		                   , ''                            AS SUB_TEXT1
+		                   , ''                            AS SUB_TEXT2
+		              FROM TB_LOOKBOOK
+		              WHERE 1 = 1
+		                AND BRAND_CD = #{brandGroupNo}
+		                AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		                AND DISP_YN = 'Y'
+		              ORDER BY REG_DT DESC
+		              LIMIT 1
+		              ) A
+		         UNION ALL
+		         SELECT PB.BRAND_GROUP_NO
+		              , P.MAIN_PIMG                                        AS IMG_PATH1
+		              , ''                                                 AS IMG_PATH2
+		              , CONCAT('/planning/detail/form?planSq=', P.PLAN_SQ) AS STR_VAR1
+		              , ''                                                 AS STR_VAR2
+		              , P.DTL_TITLE1                                       AS STR_TITLE1
+		              , P.DTL_TITLE2                                       AS STR_TITLE2
+		              , ''                                                 AS SUB_TEXT1
+		              , ''                                                 AS SUB_TEXT2
+		         FROM TB_PLAN P
+		         INNER JOIN TB_PLAN_BRAND PB ON P.PLAN_SQ = PB.PLAN_SQ AND PB.DISP_YN = 'Y'
+		         WHERE 1 = 1
+		           AND BRAND_GROUP_NO = #{brandGroupNo}
+		           AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		           AND PLAN_GB = 'P'
+		           AND DEL_YN = 'N'
+		           AND OPEN_YN = 'Y'
+		        <if test="frontGb != null and frontGb != ''">
+		           AND FRONT_GB LIKE CONCAT('%',#{frontGb},'%')
+		        </if>
+		     ) AS Z
 		LIMIT 5
 	</select>
 

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

@@ -1586,7 +1586,7 @@
 				}
 
 				if(brandGroupNo > 0){
-					$.each(brandCateList, function(idx,item){
+					$.each(cateList, function(idx,item){
 						$.each(allCateList, function (allIdx, allItem){
 							if(item.cate1No==allItem.cate1No){
 								if(idx<1) {
@@ -1603,13 +1603,16 @@
 								tag += ');">'+item.cate1Nm+'</a></li>';
 							}
 						});
-						if(item.cate2List != null && item.cate2List.length > 0){
-							let leafTag = '';
+						let leafTag = '';
+						if(idx<1){
 							leafTag += '<a href="javascript:void(0);" class="on" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\', \'\' ';
 							if(formalGb=='G009_20'){
 								leafTag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
 							}
 							leafTag += ');">전체</a>';
+						}
+
+						if(item.cate2List != null && item.cate2List.length > 0){
 							$.each(item.cate2List, function (idx, item){
 								leafTag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + [[${cateInfo.cateGb}]] + '\', ' + item.cate1No + ' , ' + item.cate2No + ' ';
 								if(formalGb=='G009_20'){
@@ -1617,8 +1620,8 @@
 								}
 								leafTag += ');">'+item.cate2Nm+'</a>';
 							});
-							$('#leafCateList').append(leafTag);
 						}
+						$('#leafCateList').append(leafTag);
 					});
 				}else{
 					$.each(cateList, function(idx,item){

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

@@ -22,13 +22,13 @@
 	<main role="" id="" class="container sch">
 		<section class="sch_result">
 			<div class="inner">
-				<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="sch_title">
+					<form id="InnerSearchForm" name="InnerSearchForm">
+					<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>
+					</form>
+				</div>
 				<div class="related_keyword">
 					<div class="sub_category">
 						<div class="cate_wrap">

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

@@ -772,6 +772,14 @@
 		gagajf.setCookie('st24ck_today_keyword',keyword, -1);
 	}
 
+	// 검색어 입력 후 엔터키
+	$('#searchMainForm input[name=keyword]').keypress(function (event) {
+		if (event.which === 13) {
+			event.preventDefault();
+			$('#btnSearchKeyword').trigger('click');
+		}
+	});
+
 	/*]]>*/
 </script>