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

@@ -33,6 +33,7 @@
 		    AND   DISP_STDT <![CDATA[<=]]> NOW()
 		    AND   DISP_EDDT <![CDATA[>=]]> NOW()
 		    GROUP BY STR_TITLE3
+		    ORDER BY STR_TITLE3
 		    LIMIT 1
 		)
 		SELECT B.STR_TITLE1     AS TITLE

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

@@ -594,6 +594,7 @@
 				$("#searchGoodsForm input:hidden[name=sortingType]").val(historyData.sortingType);
 				fnSortingChange(this,historyData.sortingType,'back','Mob');
 			}else{
+				idx++;
 				fnSearchGoodsListSearch();
 			}
 		}else{

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

@@ -682,6 +682,7 @@
 				$("#searchGoodsForm input:hidden[name=sortingType]").val(historyData.sortingType);
 				fnSortingChange(this,historyData.sortingType,'back','Mob');
 			}else{
+				idx++;
 				fnSearchGoodsListSearch();
 			}
 		}else{

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

@@ -681,6 +681,7 @@ $(document).ready( function() {
 			var br_bn_slide = new Swiper ($(this), {
 				loop: false,
 				watchOverflow : true, //210503_추가 : 슬라이드 1개일때 롤링 막는 기능 추가.
+				autoHeight : true,
 				slidesPerView: 1,
 				speed : 1000,
 				a11y: {
@@ -688,8 +689,6 @@ $(document).ready( function() {
 					notificationClass: 'swiper-notification',
 					prevSlideMessage: '이전 슬라이드',
 					nextSlideMessage: '다음 슬라이드',
-					firstSlideMessage: '첫번째 슬라이드 입니다',
-					lastSlideMessage: '마지막 슬라이드 입니다',
 					paginationBulletMessage: '슬라이드 {{index}}로 이동',
 				},
 				navigation: {
@@ -701,12 +700,20 @@ $(document).ready( function() {
 			/* SLIDE - WIDE BANNER */
 			var br_bn_slide = new Swiper ($(this), {
 				loop: true,
+				autoHeight : true,
 				slidesPerView: 1,
 				speed : 1000,
 				autoplay: {
 					delay: 4000,
 					disableOnInteraction: false,
 				},
+				a11y: {
+					enabled: true,
+					notificationClass: 'swiper-notification',
+					prevSlideMessage: '이전 슬라이드',
+					nextSlideMessage: '다음 슬라이드',
+					paginationBulletMessage: '슬라이드 {{index}}로 이동',
+				},
 				navigation: {
 					nextEl: '.main_1stage .swiper-button-next',
 					prevEl: '.main_1stage .swiper-button-prev',

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

@@ -695,6 +695,7 @@
 					fnSortingChange(this,historyData.sortingType,'back');
 					$(".fillter").show();
 				}else{
+					idx++;
 					$(".fillter").show();
 					fnSearchGoodsListSearch();
 					fnSetPriceFilter();

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

@@ -776,6 +776,7 @@
 					fnSortingChange(this,historyData.sortingType,'back');
 					$(".fillter").show();
 				}else{
+					idx++;
 					$(".fillter").show();
 					fnSearchGoodsListSearch();
 					fnSetPriceFilter();

src/main/webapp/biz/search.js

@@ -113,8 +113,8 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 			tag += '			<div class="itemName">'+item.goodsFullNm+'</div>';
 			if(appGb != 'Mob'){
 				tag += '			<p class="itemPrice">'+item.currPrice.addComma()
-				tag += '				<span class="itemPrice_original">'+item.listPrice.addComma()+'</span>';
 				if(item.currPrice != item.listPrice){
+					tag += '				<span class="itemPrice_original">'+item.listPrice.addComma()+'</span>';
 					if(item.listPrice != 0){
 						tag += '				<span class="itemPercent">'+ Math.round((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100) +'%</span>';
 					}

src/main/webapp/ux/pc/css/layout.css

@@ -82,7 +82,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .more_category a.btn_more_cate {position:relative; display:inline-block; padding-right:16px; color:#888; font-size:16px; font-weight:300; z-index:8;}
 .more_category a.btn_more_cate:after {display:block; position:absolute; top:2px; right:0; width:6px; height:6px; border:2px solid #888; border-width:2px 2px 0 0; transform:rotate(135deg); -webkit-transform:rotate(135deg); content:''}
 .more_category.on a.btn_more_cate:after {top:5px; transform:rotate(-45deg); -webkit-transform:rotate(-45deg); content:''}
-.more_category .cate_list {display:none; position:absolute; left:-30px; top:-22px; background:#222; min-width:180px; padding:60px 25px 25px; box-sizing:initial; border:1px solid #aaa; z-index:5;}
+.more_category .cate_list {display:none; position:absolute; left:-30px; top:-22px; background:#222; min-width:180px; padding:60px 25px 25px; box-sizing:initial; border:1px solid #aaa; z-index:151;}
 .more_category .cate_list ul li {margin-top:14px; display: none;}
 .more_category .cate_list ul li:first-child {margin-top:0}
 .more_category .cate_list ul li a {display:block; padding:5px; color:#fff; font-size:19px;}