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

src/main/java/com/style24/front/support/controller/TsfBaseController.java

@@ -48,6 +48,9 @@ public class TsfBaseController {
 	@Autowired
 	private TscMessageByLocale message;
 
+	@Autowired
+	private TsfEnvsetInfo envsetInfo;
+
 	/**
 	 * Json data 형식 외의 모든 문자열의 앞, 뒤 공백 제거
 	 * Json data 형식의 모든 문자열의 앞, 뒤 공백 제거 시는 AdmStringTrim에서 처리 (@RequestBody annotation 이용 시)
@@ -104,8 +107,8 @@ public class TsfBaseController {
 	 */
 	@ModelAttribute("metaInfo")
 	public Meta getMetaInfo() {
-//		return TsfEnvsetInfo.getInstance().getMetaInfo();
-		return (new TsfEnvsetInfo()).getMetaInfo();
+		return envsetInfo.getMetaInfo();
+//		return (new TsfEnvsetInfo()).getMetaInfo();
 	}
 
 	/**
@@ -114,7 +117,8 @@ public class TsfBaseController {
 	 */
 	@ModelAttribute("allCateList")
 	public Collection<Cate1> getAllCateList() {
-		return (new TsfEnvsetInfo()).getAllCateList();
+//		return (new TsfEnvsetInfo()).getAllCateList();
+		return envsetInfo.getAllCateList();
 	}
 
 	@ModelAttribute("osType")

src/main/java/com/style24/front/support/startup/TsfEnvsetInfo.java

@@ -67,11 +67,12 @@ public class TsfEnvsetInfo {
 	 * @return
 	 */
 	public Collection<Cate1> getAllCateList() {
-		if (allCateList == null) {
-			allCateList = displayService.getAllCategoryList(TsfConstants.CateGb.BYITEM.value());
-		}
-
-		return allCateList;
+//		if (allCateList == null) {
+//		allCateList = displayService.getAllCategoryList(TsfConstants.CateGb.BYITEM.value());
+//		}
+//
+//		return allCateList;
+		return displayService.getAllCategoryList(TsfConstants.CateGb.BYITEM.value());
 	}
 
 }

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

@@ -320,10 +320,11 @@
 					<div class="inner" th:if="${brandMainLayoutData.goodsList != null and !brandMainLayoutData.goodsList.empty}">
 						<div class="brand_product">
 							<p class="br_subtitle" th:text="${contentsTitle}"></p>
+							<div class="itemsGrp">
 							<th:block th:each="goodsData, goodsStat : ${brandMainLayoutData.goodsList}">
-								<th:block th:if="${(goodsStat.index%2)==0 or goodsStat.first}">
-									<div class="itemsGrp">
-								</th:block>
+<!--								<th:block th:if="${(goodsStat.index%2)==0 or goodsStat.first}">-->
+
+<!--								</th:block>-->
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike" th:classappend="${goodsData.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${goodsData.goodsCd}, ithrCd='', contentsLoc='SBMM013', planDtlSq=''">관심상품 추가</button>
@@ -353,10 +354,11 @@
 										</a>
 									</div>
 								</div>
-								<th:block th:if="${(goodsStat.index%2)== 1 or goodsStat.last}">
-									<th:block th:utext="'</div>'"></th:block>
-								</th:block>
+<!--								<th:block th:if="${(goodsStat.index%2)== 1 or goodsStat.last}">-->
+<!--									<th:block th:utext="'</div>'"></th:block>-->
+<!--								</th:block>-->
 							</th:block>
+							</div>
 
 							<div class="btn_group_flex">
 								<div>

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

@@ -1085,7 +1085,7 @@
 					// fnCategoryGoodsInfiniteScrollInit();
 					console.log('here*'+historyData.scroll);
 					fnGoodsListSearch();
-					$('html, body').animate({scrollTop: historyData.backScroll});
+					// $('html, body').animate({scrollTop: historyData.backScroll});
 					// window.scrollTo(0, historyData.backScroll);
 				}
 			}else{

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

@@ -314,6 +314,9 @@
 
 		// 컨텐츠 호출
 		$(document).ready( function() {
+			if(!gagajf.isNull([[${brandGroupInfo.brandGroupNo}]])){
+				$(".br_header").css('background-color','#fff');
+			}
 			//가격 슬라이드
 			//var custom_values = ['9,000원', '230,000원', '487,000원', '700,000원', '1,360,000원', '1,799,000원'];
 			let priceLen;

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

@@ -221,6 +221,7 @@
 		if(lookbookGb=='BL'){
 			$("#brandBox").hide();
 			$("#navHome").attr('onclick', 'cfnGoToBrandMain('+brandCd+');');
+			$(".br_header").css('background-color','#fff');
 		}else{
 			$("#navHome").attr('href', '/');
 			fnGetBrandList();

src/main/webapp/WEB-INF/views/web/planning/PlanningMainFormWeb.html

@@ -187,6 +187,10 @@
 	
 	$(document).ready(function() {
 		fnGetPlanningList([[${cateNo}]],[[${brandGroupNo}]]);
+		if(!gagajf.isNull([[${brandGroupNo}]])){
+			$(".br_header").css('background-color','#fff');
+		}
+
 	});
 /*]]>*/
 </script>