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

src/main/java/com/style24/front/biz/service/TsfDisplayService.java

@@ -2,6 +2,7 @@ package com.style24.front.biz.service;
 
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 
 import com.style24.front.biz.thirdparty.EigeneaiApi;
 import com.style24.persistence.domain.eigene.Eigeneai;
@@ -860,6 +861,8 @@ public class TsfDisplayService {
 		String maxPrice = "0";
 		String minPrice = "0";
 		String lastStr = "";
+		ArrayList<String> seasonSortArr = new ArrayList<>();
+		Collection<Filter> seasonArr = new ArrayList<Filter>();
 		for (Filter filter : filterList) {
 			if (!"".equals(filter.getFilterCd()) && !filter.getFilterCd().equals(null)) {
 				if (filter.getFilterGb().equals("PRICE")) {
@@ -883,6 +886,10 @@ public class TsfDisplayService {
 									resultList.add(filter);
 								}
 							}
+						}if ("SEASON".equals(filterGb)) {
+							// 시즌정보 정렬 
+							seasonSortArr.add(filter.getFilterCd());
+							seasonArr.add(filter);
 						} else {
 							resultList.add(filter);
 						}
@@ -918,6 +925,20 @@ public class TsfDisplayService {
 			}
 			resultList.addAll(priceList);
 		}
+		
+		// 시즌정렬
+		if (filterGb.equals("SEASON")) {
+			Collections.sort(seasonSortArr);
+			for (String filterCd : seasonSortArr) {
+				for (Filter item : seasonArr) {
+					if( filterCd.equals(item.getFilterCd())){
+						resultList.add(item);
+						break;
+					}
+				}
+			}
+		}
+		
 		return resultList;
 	}
 

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -446,7 +446,11 @@
 					</th:block>
 					
 					<th:block th:if="${goodsCompose.tobeFormYn == 'Y'}">
-									
+						<!-- 상품명 -->
+						<div class="mdhtml_box">
+							<span class="tit_view" th:text="${goodsCompose.compsGoodsNm}">상품명</span>
+						</div>
+						
 						<!-- 착용컷 노출 -->
 						<div class="view_outfit_box" th:if="${#strings.contains(goodsCompose.goodsImgList,'_C1') 
 															or #strings.contains(goodsCompose.goodsImgList,'_C2')
@@ -2521,9 +2525,11 @@
 		if ("G056_S" == [[${goodsInfo.goodsType}]] ){
 			let goodsComposeList = ([[${goodsComposeList}]]);
 			if (goodsComposeList.length > 0){
+				var titStr = "";
 				$.each(goodsComposeList, function(idx, item) {
 					if ("N" == item.tobeFormYn && !gagajf.isNull(item.goodsDesc)){
-						$('#goodsDescHtml_'+ item.compsGoodsCd).html(item.goodsDesc);
+						titStr = '<span class="tit_view">'+item.compsGoodsNm+'</span>';
+						$('#goodsDescHtml_'+ item.compsGoodsCd).html(titStr + item.goodsDesc);
 					}	
 				});
 			}

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

@@ -698,10 +698,10 @@
 				if(typeof historyData.sortingType!='undefined' && historyData.sortingType!=''){
 					$("#searchGoodsForm input:hidden[name=sortingType]").val(historyData.sortingType);
 					fnSortingChange(this,historyData.sortingType,'back');
-					$(".fillter").show();
+					//$(".fillter").show();
 				}else{
 					listIdx++;
-					$(".fillter").show();
+					//$(".fillter").show();
 					fnSearchGoodsListSearch();
 					fnGetSearchPlanningList();
 					fnGetSearchEventList();

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailFormWeb.html

@@ -893,6 +893,11 @@
 					</th:block>
 
 					<th:block th:if="${goodsCompose.tobeFormYn == 'Y'}">
+						<!-- 상품명 -->
+						<div class="mdhtml_box">
+							<span class="tit_view" th:text="${goodsCompose.compsGoodsNm}">상품명</span>
+						</div>
+						
 						<!-- 착용컷 노출 -->
 						<div class="view_outfit_box" th:if="${#strings.contains(goodsCompose.goodsImgList,'_C1') 
 															or #strings.contains(goodsCompose.goodsImgList,'_C2')
@@ -1462,9 +1467,11 @@
 	if ("G056_S" == [[${goodsInfo.goodsType}]] ){
 		let goodsComposeList = ([[${goodsComposeList}]]);
 		if (goodsComposeList.length > 0){
+			var titStr = "";
 			$.each(goodsComposeList, function(idx, item) {
 				if ("N" == item.tobeFormYn && !gagajf.isNull(item.goodsDesc)){
-					$('#goodsDescHtml_'+ item.compsGoodsCd).html(item.goodsDesc);
+					titStr = '<span class="tit_view">'+item.compsGoodsNm+'</span>';
+					$('#goodsDescHtml_'+ item.compsGoodsCd).html(titStr + item.goodsDesc);
 				}	
 			});
 		}