프론트 메인관련 수정

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

@@ -1083,12 +1083,16 @@
 		      , Z.STR_VAR1
 		      , Z.STR_TITLE1
 		      , Z.STR_TITLE2
+		      , Z.SUB_TEXT1
+		      , Z.SUB_TEXT2
 		FROM    (
 		            SELECT  'ADMIN' AS BANNER_GB
 		                  , IMG_PATH1
 		                  , STR_VAR1
 		                  , STR_TITLE1
 		                  , STR_TITLE2
+		                  , SUB_TEXT1
+		                  , SUB_TEXT2
 		            FROM    TB_CONTENTS
 		            WHERE   1=1
 		            AND     CATE_NO = #{cateNo}
@@ -1102,6 +1106,8 @@
 		                  , CONCAT('/planning/detail/form?planSq=',A.PLAN_SQ) AS STR_VAR1
 		                  , A.PLAN_NM AS STR_TITLE1
 		                  , A.DTL_TITLE1 AS STR_TITLE2
+		                  , '' AS SUB_TEXT1
+		                  , '' AS SUB_TEXT2
 		            FROM  TB_PLAN A
 		            INNER JOIN TB_PLAN_CATE B ON A.PLAN_SQ = B.PLAN_SQ
 		            WHERE  1=1

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

@@ -1829,15 +1829,15 @@
 		            AND    GS.STOCK_QTY <![CDATA[>]]> 0 /*재고있는상품*/
 		            AND    B.USE_YN = 'Y'
 		            AND    BG.USE_YN = 'Y'
+		            <if test="maxRow != null and maxRow !=''">
+		            LIMIT #{maxRow}
+		            </if>
 		           ) G
 		    WHERE  1=1
 		    ORDER BY G.REG_DT DESC, G.GOODS_CD
 		<if test="pageable != null and pageable.endRow != null and pageable.endRow > 0">
 			LIMIT #{pageable.limitStartRow} , #{pageable.pageSize}
 		</if>
-		<if test="maxRow != null and maxRow !=''">
-			LIMIT #{maxRow}
-		</if>
 		)
 		SELECT G.BRAND_GROUP_NM
 		     , G.GOODS_CD

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

@@ -94,7 +94,7 @@
 		$('#ulGnbTab').html('');
 		
 		let tag = '';
-		tag += '<ul>\n';
+		// tag += '<ul>\n';
 		tag += '	<li><a href="javascript:void(0);" onclick="cfnGoToBrandMain(' + [[${brandGroupInfo?.brandGroupNo}]] + ');" class="on">홈</a></li>\n';
 		tag += '	<li><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + [[${brandGroupInfo?.brandGroupNo}]] + ',\'' + [[${brandGroupInfo?.cateGb}]] + '\');" class="on">상품</a></li>\n';
 		
@@ -111,12 +111,10 @@
 						});
 					}
 				}
+				tag += '<button>+</button>';
+				$('#ulGnbTab').html(tag);
 			});
-		
-		tag += '</ul>\n';
-		tag += '<button>+</button>';
-		
-		$('#ulGnbTab').html(tag);
+		// tag += '</ul>\n';
 	}
 	
 	// GNB탭 생성

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

@@ -142,6 +142,16 @@
 					type: 'fraction',
 				},
 			});
+			var cate = this.querySelector('.cate_wrap');
+			var moreOn = cate.clientHeight;
+			console.log('★ clientHeight : ' + moreOn);
+
+			if (moreOn < 141) {
+				$('.sub_category .more_btn').css({"display": "none"});
+			}else{
+				$('.cate_wrap').css({"max-height": "13rem"});
+				$('.sub_category .more_btn').css({"display": "block"});
+			}
 
 			$(document).on('click','.sub_category .more_btn',function(){
 				$(this).toggleClass('on');

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

@@ -60,8 +60,8 @@
 								</div>
 							</div>
 							<!-- Add Arrows -->
-							<div class="swiper-button-next"></div>
-							<div class="swiper-button-prev"></div>
+<!--							<div class="swiper-button-next"></div>-->
+<!--							<div class="swiper-button-prev"></div>-->
 						</div>
 					</div>
 				</div>
@@ -70,12 +70,10 @@
 			<th:block th:if="${contentsLoc=='004'}">
 				<div class="content wide dp_category">
 					<div class="cont_head">
-						<h3 class="displayH">카테고리 바로가기</h3>
+						<h4>카테고리 바로가기</h4>
 					</div>
 					<div class="cont_body">
-						<div class="">
-							<div class="dp_cate_list">
-							</div>
+						<div class="dp_cate_list">
 						</div>
 					</div>
 				</div>

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

@@ -279,9 +279,9 @@
 
 								var timerStop = setInterval(function () { getCountdown(); }, 1000);
 
-								var width = 0;
 								var fixDate = new Date().getTime();
 								var fixTarget = (target_date - fixDate) / 1000;
+								var width = (86400-fixTarget)*100/86400;
 
 								function getCountdown(){
 
@@ -302,7 +302,7 @@
 
 									var elem = document.getElementById("barCurrent");
 									function progressMove(){
-										width += 100/fixTarget;
+										width += (100-width)/fixTarget;
 										elem.style.width = width + "%";
 									}
 									progressMove();
@@ -920,10 +920,10 @@ if ( (navigator.appName == 'Netscape' && agent.indexOf('trident') != -1) || (age
 		speed : 1000,
 		// Navigation arrows
 		//autoplay: false,
-		// autoplay: {
-		// 	delay: 2000,
-		// 	disableOnInteraction: false,
-		// },
+		autoplay: {
+			delay: 2000,
+			disableOnInteraction: false,
+		},
 		navigation: {
 			nextEl: '.post-visual .swiper-button-next',
 			prevEl: '.post-visual .swiper-button-prev',
@@ -948,10 +948,10 @@ if ( (navigator.appName == 'Netscape' && agent.indexOf('trident') != -1) || (age
 		// 컨테이너 시작 부분 (모든 슬라이드 이전)에 슬라이드 오프셋 추가 (픽셀 단위)
 		speed : 1000,
 		// Navigation arrows
-		// autoplay: {
-		// 	delay: 2000,
-		// 	disableOnInteraction: false,
-		// },
+		autoplay: {
+			delay: 2000,
+			disableOnInteraction: false,
+		},
 		navigation: {
 			nextEl: '.post-visual .swiper-button-next',
 			prevEl: '.post-visual .swiper-button-prev',

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

@@ -233,9 +233,9 @@
 			//	$('.dp_cate_list').html(tag);
 			//	$('.cate1Nm').html(cate1.cate1Nm);
 			//}
-			tag += '					<li id="cate'+allCateItem.cate1No+'">\n';
-			tag += '						<a href="javascript:void(0);" onclick="cfnGoToGoodsList(0,\'' + allCateItem.cateGb + '\',' + allCateItem.cate1No + ',\'\',\'\',\'\',\'\',\'' + formalGb + '\');">' + allCateItem.cate1Nm + '</a>\n';
-			tag += '					</li>\n';
+			// tag += '					<li id="cate'+allCateItem.cate1No+'">\n';
+			tag += '						<a id="cate'+allCateItem.cate1No+'" href="javascript:void(0);" onclick="cfnGoToGoodsList(0,\'' + allCateItem.cateGb + '\',' + allCateItem.cate1No + ',\'\',\'\',\'\',\'\',\'' + formalGb + '\');">' + allCateItem.cate1Nm + '</a>\n';
+			// tag += '					</li>\n';
 			
 		});
 		$('.dp_cate_list').html(tag);