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

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

@@ -17,6 +17,24 @@
 	<!-- GNB 브랜드그룹 목록 -->
 	<select id="getGnbBrandGroupList" parameterType="Contents" resultType="BrandGroup">
 		/* TsfDisplay.getGnbBrandGroupList */
+		WITH TAB AS (
+		    SELECT  STR_TITLE3
+		    FROM
+		<choose>
+		    <when test='preview != null and preview == "Y"'>
+		        TB_CONTENTS_PREVIEW
+		    </when>
+		    <otherwise>
+		        TB_CONTENTS
+		    </otherwise>
+		</choose>
+		    WHERE 1=1
+		    AND   CONTENTS_LOC = #{contentsLoc}
+		    AND   DISP_STDT <![CDATA[<=]]> NOW()
+		    AND   DISP_EDDT <![CDATA[>=]]> NOW()
+		    GROUP BY STR_TITLE3
+		    LIMIT 1
+		)
 		SELECT B.STR_TITLE1     AS TITLE
 		     , A.BRAND_GROUP_NO
 		     , CASE WHEN A.DISP_NM_LANG = 'EN' THEN A.BRAND_GROUP_ENM
@@ -34,7 +52,9 @@
 		     , TB_CONTENTS B
 		    </otherwise>
 		</choose>
-		WHERE  A.BRAND_GROUP_NO = B.STR_VAR1
+		     , TAB C
+		WHERE  B.STR_TITLE3 = C.STR_TITLE3
+		AND    A.BRAND_GROUP_NO = B.STR_VAR1
 		AND    A.USE_YN = 'Y'
 		AND    B.CONTENTS_LOC = #{contentsLoc}
 		<choose>

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

@@ -1524,7 +1524,7 @@
 		                                                                                        AND A.CATE_NO = #{cate1No}
 		                                                                                        </if>
 		                                                                                    </if>
-		                                                                                    AND A.USE_YN = 'Y' ORDER BY A.CONTENTS_SQ
+		                                                                                    AND A.USE_YN = 'Y' ORDER BY A.DISP_ORD
 		                                                                                    <if test="pageGb == null and pageGb != 'BEST'">
 		                                                                                    LIMIT 1
 		                                                                                    </if>

src/main/webapp/WEB-INF/views/mob/app/NoticeFormMob.html

@@ -55,12 +55,13 @@
 			let html = '';
 			$.each(pushListJosn.pushList, function(idx, item) {
 				if (_osType === 'I') {
-					alert('fnDecodeUnicode :' + fnDecodeUnicode(item.title.toLowerCase()) + 'escape :' + escape(item.title)
-					 + ' unescape :' + unescape(item.title)
-					 + ' encodeURI:' + encodeURI(item.title)
-					 + ' decodeURI:' + decodeURI(item.title)
-					 + ' encodeURIComponent:' + encodeURIComponent(item.title)
-					 + ' decodeURIComponent:' + decodeURIComponent(item.title)
+					alert('fnDecodeUnicode :' + fnDecodeUnicode(item.content.toLowerCase())
+					 + 'escape :' + escape(item.content)
+					 + ' unescape :' + unescape(item.content)
+					 + ' encodeURI:' + encodeURI(item.content)
+					 + ' decodeURI:' + decodeURI(item.content)
+					 + ' encodeURIComponent:' + encodeURIComponent(item.content)
+					 + ' decodeURIComponent:' + decodeURIComponent(item.content)
 					);
 				}
 				html += '<div class="inner">\n';

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

@@ -42,7 +42,9 @@
 																<input type="hidden" name="mainTitlee" th:value="${ContentsData.strTitle1}"/>
 															</dd>
 															<!--													<dd>NEW ARRIVAL</dd>-->
-															<dd class="txt_xs" th:text="${ContentsData.subText1}">나만의 가을 스타일 찾기</dd>
+															<dd class="txt_xs mainSubTitle" th:text="${ContentsData.subText1}">
+																<input type="hidden" name="mainSubTitlee" th:value="${ContentsData.subText1}"/>
+															</dd>
 														</dl>
 													</div>
 												</a>
@@ -811,6 +813,13 @@
 				$(this).append(tag);
 			});
 
+			// 몰메인 <br> 태그
+			$('.mainSubTitle').each(function (){
+				var brText = $(this).find("input[name=mainSubTitlee]").val();
+				let tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+				$(this).append(tag);
+			});
+
 			// 브랜드픽 <br> 태그
 			$('#id007 .title').each(function (){
 				var brText = $(this).find("input[name=title]").val();

src/main/webapp/WEB-INF/views/web/cart/CartListFormWeb.html

@@ -305,6 +305,7 @@
         //추천상품 슬라이드
 		var rcmdItemSwiper = new Swiper('.od_recommend .swiper-container', {
 			slidesPerView: 5,
+			slidesPerGroup: 5, //210708_ 추가 : 슬라이드 전환시 5개씩 이동.
 			spaceBetween: 20,
 			navigation: {
 				nextEl: '.od_recommend .swiper-button-next',
@@ -315,10 +316,10 @@
 				clickable: true,
 			},
 		});
-
 		//지금 많이 보고 있어요 슬라이드
 		var realtimeItemSwiper = new Swiper('.od_realtime .swiper-container', {
 			slidesPerView: 5,
+			slidesPerGroup: 5, //210708_ 추가 : 슬라이드 전환시 5개씩 이동.
 			spaceBetween: 20,
 			navigation: {
 				nextEl: '.od_realtime .swiper-button-next',

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

@@ -50,7 +50,9 @@
 															<input type="hidden" name="mainTitlee" th:value="${ContentsData.strTitle1}"/>
 														</dd>
 <!--														<dd>NEW ARRIVAL</dd>-->
-														<dd class="txt_xs" th:text="${ContentsData.subText1}"></dd>
+														<dd class="txt_xs mainSubTitle">
+															<input type="hidden" name="mainSubTitlee" th:value="${ContentsData.subText1}"/>
+														</dd>
 													</dl>
 													<button type="button" class="btn" th:onclick="cfnGoToPage([[${ContentsData.strVar1}]]);"><span>자세히 보기</span></button>
 												</div>
@@ -1481,6 +1483,12 @@ $(document).ready(function() {
 		$(this).append(tag);
 	});
 
+	$('.mainSubTitle').each(function (){
+		var brText = $(this).find("input[name=mainSubTitlee]").val();
+		let tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+		$(this).append(tag);
+	});
+
 	// 가로긴배너 슬라이드
 	$('.silderBannerArea').each(function (){
 		let tag = '';