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

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

@@ -35,6 +35,8 @@ import com.style24.persistence.domain.searchengine.SearchEngine;
 
 import lombok.extern.slf4j.Slf4j;
 
+import com.gagaframework.web.parameter.GagaMap;
+
 /**
  * 상품 Service
  *
@@ -653,7 +655,58 @@ public class TsfGoodsService {
 	 * @date 2021. 3. 10
 	 */
 	public Collection<Measurement> getMeasurementList(Goods goods) {
-		return goodsDao.getMeasurementList(goods);
+		
+		 return goodsDao.getMeasurementList(goods);
+	}
+	
+	/**
+	 * 실측사이즈 조회
+	 *
+	 * @param goods
+	 * @return
+	 * @author eskim
+	 * @date 2021. 3. 10
+	 */
+	public GagaMap getMeasurementListNew(Goods goods) {
+		GagaMap result = new GagaMap();
+		// 행, 열 변환
+		Collection<Measurement> getMeasurementList = goodsDao.getMeasurementList(goods);
+		
+		if (getMeasurementList == null || getMeasurementList.size() <=0) {
+			result.set("flag", "NOT");
+			return result;
+		}
+		
+		int colSize = getMeasurementList.size(); 	// 열 column
+		int rowSize = 5; // 상의하위포함 최대사이즈
+
+		
+		String[][] arrMeasurementList = new String[rowSize + 1][colSize + 1];
+
+		// 사이즈 설정
+		int yIndex = 0;
+		for (Measurement measurement : getMeasurementList) {
+			arrMeasurementList[0][0] = measurement.getTypecd();
+			yIndex++;
+			arrMeasurementList[0][yIndex] = measurement.getOptCd2();
+			
+			// 부위명 설정
+			arrMeasurementList[1][0] = measurement.getTypecd();
+			arrMeasurementList[2][0] = measurement.getTypecd();
+			arrMeasurementList[3][0] = measurement.getTypecd();
+			arrMeasurementList[4][0] = measurement.getTypecd();
+			arrMeasurementList[5][0] = measurement.getTypecd();
+			arrMeasurementList[1][yIndex] = String.valueOf(measurement.getValue1());
+			arrMeasurementList[2][yIndex] = String.valueOf(measurement.getValue2());
+			arrMeasurementList[3][yIndex] = String.valueOf(measurement.getValue3());
+			arrMeasurementList[4][yIndex] = String.valueOf(measurement.getValue4());
+			arrMeasurementList[5][yIndex] = String.valueOf(measurement.getValue5());
+		}
+		log.info("arrMeasurementList = {}", arrMeasurementList);
+		
+		result.set("flag", "OK");
+		result.set("dataList", arrMeasurementList);
+		return result;
 	}
 
 	/**

src/main/java/com/style24/front/biz/web/TsfGoodsController.java

@@ -667,7 +667,12 @@ public class TsfGoodsController extends TsfBaseController {
 		Collection<Measurement> measurementList = new ArrayList<Measurement>();
 		if ("Y".equals(goods.getSelfGoodsYn())) {
 			paramsGoods.setOptCd1(colorCd);
+			
 			measurementList = goodsService.getMeasurementList(paramsGoods);
+
+			// 개발중 eskim
+			//GagaMap result = goodsService.getMeasurementList(paramsGoods);
+			
 			if (measurementList != null && !measurementList.isEmpty()) {
 				typeCd = measurementList.iterator().next().getTypecd();
 				if ("하의".equals(typeCd)) {

src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -20,6 +20,7 @@ import org.springframework.web.servlet.ModelAndView;
 import com.gagaframework.web.parameter.GagaMap;
 import com.style24.core.biz.service.TscFreegiftService;
 import com.style24.core.biz.service.TscKakaoPayService;
+import com.style24.core.biz.service.TscKakaotalkService;
 import com.style24.core.biz.service.TscNaverPayService;
 import com.style24.core.biz.service.TscOrderService;
 import com.style24.core.support.env.TscConstants;
@@ -73,6 +74,9 @@ public class TsfOrderController extends TsfBaseController {
 	@Autowired
 	private TscNaverPayService coreNaverPayService;
 	
+	@Autowired
+	private TscKakaotalkService kakaotalkService;
+	
 	/**
 	 * 회원, 비회원 주문페이지
 	 *
@@ -1030,7 +1034,19 @@ public class TsfOrderController extends TsfBaseController {
 			return mav;
 		}
 		
-		// TODO 주문정보 알림톡전송
+		// TODO 2021.05.31 알림톡전송 주문완료정보
+		/*
+		if (StringUtils.isNotBlank(orderInfo.getCellPhnno())) {
+			Integer userNo = orderInfo.getCustNo();
+			try {
+				orderInfo.setGoodsNm((String) resultMap.get("goodsNm"));
+				kakaotalkService.sendOrderComplete(orderInfo, userNo);
+			} catch (Exception e) {
+				// TODO Auto-generated catch block
+				e.printStackTrace();
+			}
+		}
+		*/
 		
 		// 2021.04.27 마일리지, 제휴할인정보
 		Order payOrder = orderService.getPaymentInfoForMypage(order);

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

@@ -368,7 +368,7 @@
 		<include refid="selectForPagingHeader"/>
 		SELECT GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.ORD_DTL_ITEM_SQ SEPARATOR '!@!') AS ITEM_NM
 		     -- , GROUP_CONCAT(Z.COLOR_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
-		     , GROUP_CONCAT(' ',CONCAT(OPT_CD1_NM,'/', OPT_CD2) ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
+		     , GROUP_CONCAT(' ',CONCAT(OPT_CD1_NM,' / ', OPT_CD2) ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
 		     , GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1
 		     , GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD2
 		     , GROUP_CONCAT(Z.OPT_CD1_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1_NM
@@ -948,7 +948,7 @@
 		<include refid="selectForPagingHeader"/>
 		        SELECT GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.ORD_DTL_ITEM_SQ SEPARATOR '!@!') AS ITEM_NM
 		          -- , GROUP_CONCAT(Z.COLOR_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
-		             , GROUP_CONCAT(' ',CONCAT(OPT_CD1_NM,'/', OPT_CD2) ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
+		             , GROUP_CONCAT(' ',CONCAT(OPT_CD1_NM,' / ', OPT_CD2) ORDER BY Z.ORD_DTL_ITEM_SQ) AS COLOR_NM
 		             , GROUP_CONCAT(Z.OPT_CD1 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1
 		             , GROUP_CONCAT(Z.OPT_CD2 ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD2
 		             , GROUP_CONCAT(Z.OPT_CD1_NM ORDER BY Z.ORD_DTL_ITEM_SQ) AS OPT_CD1_NM

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

@@ -21,6 +21,7 @@
 	<meta property="og:site_name" th:content="${metaInfo.browserTitle}" content="한세공식몰 스타일24"/>
 	
 	<!-- 추천솔루션 meta -->
+	<meta property="eg:type" content="product" />
 	<meta property="eg:cuid" content="" />
 	<meta property="eg:itemId" content="" />
 	<meta property="eg:itemName" content="" />

src/main/webapp/WEB-INF/views/mob/mypage/MypageReviewDetailFormMob.html

@@ -22,7 +22,7 @@
 			</th:block>
 			<th:block th:unless="${review.bestYn == 'Y'}">
 			<h5 class="modal-title" id="exampleFullLabel">
-				<button type="button" id="btn_more_photoreview" th:onclick="cfGoodsReviewPhoto([[${params.goodsCd}]])" ></button>
+				<!-- <button type="button" id="btn_more_photoreview" th:onclick="cfGoodsReviewPhoto([[${params.goodsCd}]])" ></button> -->
 				포토/영상리뷰
 			</h5>
 			</th:block>

src/main/webapp/WEB-INF/views/mob/mypage/MypageReviewFormMob.html

@@ -61,20 +61,11 @@
 								<div id="reviewList">
 
 								</div>
-								<!-- <div class="btn_group" style="display:none;">
+								<div class="ui_foot" style="display:none;">
 									<button class="btn btnM btnIcon_more" id="btnMore"  style="width: 100%;">더보기</button>
-								</div> -->
-								
-								<div class="btn_group">
-									<div><button class="btn btnIcon_more" id="btnMore">더보기</button></div>
 								</div>
-									
-								<!-- <div class="ui_foot" style="display:none;">
+								<div class="ui_foot" style="display:none;">
 									<button class="btn btnM btnIcon_more" id="btnMore2"  style="width: 100%;">더보기</button>
-								</div> -->
-								
-								<div class="btn_group">
-									<div><button class="btn btnIcon_more" id="btnMore2">더보기</button></div>
 								</div>
 							<!-- // tab_cont End -->
 							</div>
@@ -124,7 +115,7 @@
 					html += '					</div>\n';
 					html += '					<div class="info_box">\n';
 					html += '						<div class="od_name">\n';
-					html += '							<div class="goods_date"><span class="date">'+item.payDt+'</span> 구매</div>\n';
+					html += '							<div class="goods_date"><span class="date">'+item.ordDt+'</span> 구매</div>\n';
 					html += '							<div class="brand">\n';
 					html += '								<span>'+item.brandNm+'</span>\n';
 					html += '							</div>\n';
@@ -133,9 +124,11 @@
 					html += '						<div class="od_opt">\n';
 					html += '							<div class="option">\n';
 					if (item.goodsType =='G056_S') {
+						html += '<em>';
 						$.each(item.colorNmArr, function (index2, option) {
-							html += '							<em>' + item.itemNmArr[index2] + ' / ' + option +'</em>\n';
+							html +=  item.itemNmArr[index2] + ' / ' + option  + '<br>';
 						})
+						html += '</em>\n';
 					}else{
 						html += '							<em>'+item.colorNm+'</em>\n';
 					}
@@ -300,7 +293,7 @@
 				html += '					</div>\n';
 				html += '					<div class="info_box">\n';
 				html += '						<div class="od_name">\n';
-				html += '							<div class="goods_date"><span class="date">'+item.payDt+'</span> 구매</div>\n';
+				html += '							<div class="goods_date"><span class="date">'+item.ordDt+'</span> 구매</div>\n';
 				html += '							<div class="brand">\n';
 				html += '								<span>'+item.brandNm+'</span>\n';
 				html += '							</div>\n';
@@ -309,9 +302,11 @@
 				html += '						<div class="od_opt">\n';
 				html += '							<div class="option">\n';
 				if (item.goodsType =='G056_S') {
+					html += '<em>';
 					$.each(item.colorNmArr, function (index2, option) {
-						html += '							<em>' + item.itemNmArr[index2] + ' / ' + option + '</em><br>\n';
+						html +=  item.itemNmArr[index2] + ' / ' + option + '<br>';
 					})
+					html += '</em>\n';
 				}else{
 					html += '							<em>'+item.colorNm+'</em>\n';
 				}

src/main/webapp/WEB-INF/views/mob/order/OrderAddPaymentFormMob.html

@@ -67,7 +67,7 @@
 															<div class="info_box">
 																<div class="od_name">
 																	<div class="brand">
-																		<span th:text="${goods.brandEnm} + ' ' + ${goods.brandKnm}"></span>
+																		<span th:text="${goods.brandGroupNm"></span>
 																	</div>
 																	<div class="name" th:text="${goods.goodsNm}"></div>
 																</div>

src/main/webapp/WEB-INF/views/mob/order/OrderGiftInfoMob.html

@@ -28,27 +28,18 @@
 					</a>
 				</div>
 				<div class="fold_cont" style="display: none;">
-					<div class="tabWrap">
-						<ul class="tabIndex">
-							<!-- <li><a href="javascript:void(0);"><span>연락처 불러오기</span></a></li> -->
-							<li class="active"><a href="javascript:void(0);"><span>직접입력</span></a></li>
-						</ul>
-						<div class="tabContents">
-							<div class="tab_cont active">
-								<div class="form_field">
-									<div class="input_wrap">
-										<input type="text" name="recipNm" class="form_control" value="" maxlength="10" placeholder="받는분">
-									</div>
-									<br>
-									<div class="input_wrap">
-										<input type="text" name="recipPhnno" class="form_control" value="" minlength="10" maxlength="14" placeholder="받으실분 휴대폰번호">
-										<p class="desc_txt">선물이 타인에게 전송될수 있으니 전화번호를 받으실분 연락처를 정확하게 입력해주세요.</p>
-									</div>
-									<div class="textarea_wrap">
-										<textarea class="doc_review" name="giftMsg" id="giftMsg" placeholder="선물 메시지 입력&#13;&#10;(미 입력시 ‘감사합니다’로 발송됩니다.)"></textarea>
-										<p class="txt_cnt"><span id="review_cnt" class="c_primary">0</span>/200</p>
-									</div>
-								</div>
+					<div class="inner"><!-- 210419_ : 모바일웹에서만 .inner 사용 -->
+						<div class="form_field">
+							<div class="input_wrap">
+								<input type="text" name="recipNm" class="form_control" value="" maxlength="10" placeholder="받는 분">
+							</div>
+							<div class="input_wrap">
+								<input type="text" name="recipPhnno" class="form_control" value="" minlength="10" maxlength="14" placeholder="받는 분 휴대폰번호">
+								<p class="desc_txt">선물이 타인에게 전송될수 있으니 받으실분 연락처를 정확하게 입력해주세요.</p> <!-- 210421_삭제 : 전화번호를 텍스트 삭제 -->
+							</div>
+							<div class="textarea_wrap">
+								<textarea class="doc_review" name="review" id="" placeholder="선물 메시지 입력&#13;&#10;(미 입력시 ‘감사합니다’로 발송됩니다.)"></textarea>
+								<p class="txt_cnt"><span id="review_cnt" class="c_primary">0</span>/200</p>
 							</div>
 						</div>
 					</div>
@@ -83,5 +74,16 @@ $(document).ready( function() {
 $(document).on("keyup", "#orderGiftInfo input[name=recipPhnno]", function() { 
 	$(this).val( $(this).val().replace(/[^0-9]/g, "").replace(/(^02|^0505|^1[0-9]{3}|^0[0-9]{2})([0-9]+)?([0-9]{4})$/,"$1-$2-$3").replace("--", "-") ); 
 });
+
+//선물 받으실 분 직접입력 글자 제한
+$('.doc_review').keyup(function (e){
+	var content = $(this).val();
+	$('#review_cnt').html(content.length);
+	if (content.length > 200){
+		mcxDialog.alert("최대 200자까지 입력 가능합니다."); //210420_수정 : 시스템 alert -> dialog 변경.
+		$(this).val(content.substring(0, 200));
+		$('#review_cnt').html("200");
+	}
+});
 </script>
 </html>

src/main/webapp/WEB-INF/views/mob/planning/PlanningEventAttendFormMob.html

@@ -328,22 +328,17 @@ $(document).ready(function() {
 	if (!cfCheckLogin()) {
 		$(".day").html("<span>0</span>일");
 	}else{
+		$('.day').html('<span>' + (custAttendList.length +1) + '</span>일');
+		$("#td_"+date).attr("class","today"); 
 		$.each(custAttendList, function(idx, item) {
-			$('.day').html('<span>' + custAttendList.length + '</span>일');
 			if(item.entryDt == date){
 				$("#td_"+date).attr("class","complete");
-			}else{
-				$("#td_"+date).attr("class","today"); 
 			}
 		})
 	}
 	
 	
 	
-	
-	
-	
-	
 	$(".title").html("<strong>"+month+"월</strong> 출석체크");
 	
 	//공유 버튼 토글 

src/main/webapp/WEB-INF/views/web/common/fragments/HeadWeb.html

@@ -20,6 +20,7 @@
 	<meta property="og:site_name" th:content="${metaInfo.browserTitle}" content="한세공식몰 스타일24"/>
 	
 	<!-- 추천솔루션 meta -->
+	<meta property="eg:type" content="product" />
 	<meta property="eg:cuid" content="" />
 	<meta property="eg:itemId" content="" />
 	<meta property="eg:itemName" content="" />
@@ -124,11 +125,11 @@
 		_eglqueue.push(['setVar', 'cuid', eglqueueCuid]);
 		_eglqueue.push(['setVar', 'userId', hCustId]);
 		_eglqueue.push(['track', 'visit']);
-		(function (s, x) {
+		/* (function (s, x) {
 			s = document.createElement('script'); s.type = 'text/javascript';
 			s.async = true; s.defer = true; s.src = (('https:' == document.location.protocol) ? 'https' : 'http') + '://logger.eigene.io/js/logger.min.js';
 			x = document.getElementsByTagName('script')[0]; x.parentNode.insertBefore(s, x);
-		})();
+		})(); */
 		/* \\Eiengine Script (Visit) */
 
 		// 로그인 성공 시 - 시작

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

@@ -1683,7 +1683,10 @@
 
 	<script th:inline="javascript">
 		$(document).ready( function() {
-//결과내 재 검색 - 검색어 입력 시
+			fnCreateSearchCategoryList();
+			// fnCreateSearchFilter();
+
+			//결과내 재 검색 - 검색어 입력 시
 			$(document).on('keyup','.sch_result .area_info .inner_search input',function(e){
 				var reSearchValue = $(this).val();
 				if(reSearchValue.length > 0) {
@@ -1746,6 +1749,20 @@
 				$(this).parent('li').children(".sub_cate").toggle();
 			});
 		});
+
+		// 좌측 카테고리 생성
+		var fnCreateSearchCategoryList = function (){
+			let cateList = [[${cateList}]];
+			let tag = '';
+
+			if(cateList.length > 0){
+				$.each(cateList, function (idx,item){
+					console.log('idx::'+idx);
+					console.log(item);
+					console.log(item.cate1No);
+				});
+			}
+		}
 	</script>
 
 </th:block>

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

@@ -374,6 +374,8 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 	
+	
+	
 	let socialSq = [[${goodsInfo.socialSq}]];	
 	let socialEddt = [[${goodsInfo.socialEddt}]];
 	
@@ -1065,7 +1067,6 @@
 	
 	$(document).ready( function() {
 		
-		
 		//상품 대표설명 > 우측 상품정보 
 		/* 딜 옵션선택 후 다음 옵션 활성화 */
 		var detail_deal_option01 = new sCombo('.pd_detail .opt_select .select_custom.deal_opt_item');
@@ -1103,79 +1104,6 @@
 			$(' .option_box .result_item .number_count .minus').addClass('min_val');
 		} 
 
-		// 광고 스크립트용
-		var goodsNavigation = [[${goodsNavigation}]];
-		var cate1Nm = "";
-		var cate2Nm = "";
-		var cate3Nm = "";
-		var cate4Nm = "";
-		var cate5Nm = "";
-		if (!gagajf.isNull(goodsNavigation)) {
-			cate1Nm = goodsNavigation.cate1Nm;
-			cate2Nm = goodsNavigation.cate2Nm;
-			cate3Nm = goodsNavigation.cate3Nm;
-			cate4Nm = goodsNavigation.cate4Nm;
-			cate5Nm = goodsNavigation.cate3Nm;
-			
-			if (!gagajf.isNull(cate1Nm)) {
-				cateNm += cate1Nm;
-			}
-			if (!gagajf.isNull(cate2Nm)) {
-				cateNm += ' > ' + cate2Nm;
-			}
-			if (!gagajf.isNull(cate3Nm)) {
-				cateNm += ' > ' + cate3Nm;
-			}
-			if (!gagajf.isNull(cate4Nm)) {
-				cateNm += ' > ' + cate4Nm;
-			}
-			if (!gagajf.isNull(cate5Nm)) {
-				cateNm += ' > ' + cate5Nm;
-			}
-		}
-		// 광고 스크립트용
-		
-		var snsGoodsImg = _uploadGoodsUrl + [[${goodsInfo.sysImgNm}]];
-		var snsUrl = location.protocol + _PAGE_GOODS_DETAIL + params.goodsCd +'&colorCd =' + params.colorCd  ;
-		var snsGoodsFullNm = [[${goodsInfo.goodsFullNm}]];
-		
-		<!-- 페이스북 카카오스토리 연동 관련 메타태그 -->
-		$("meta[property='og:url']").attr('content', snsUrl);
-		$("meta[property='og:title']").attr('content', snsGoodsFullNm);
-		$("meta[property='og:description']").attr('content', snsGoodsFullNm);
-		$("meta[property='og:image']").attr('content', snsGoodsImg);
-
-		<!-- 트위터 관련 메타태그 -->
-		$("meta[name='twitter:url']").attr('content', snsUrl);
-		$("meta[name='twitter:title']").attr('content', snsGoodsFullNm);
-		$("meta[name='twitter:description']").attr('content', snsGoodsFullNm);
-		$("meta[name='twitter:image']").attr('content', snsGoodsImg);
-
-		// 추천솔류션 meta 설정
-		$("meta[property='eg:type']").attr('content',"product");
-		$("meta[property='eg:cuid']").attr('content',eglqueueCuid);
-		$("meta[property='eg:itemId']").attr('content', [[${goodsInfo.goodsCd}]] );
-		$("meta[property='eg:itemName']").attr('content',[[${goodsInfo.goodsFullNm}]] );
-		$("meta[property='eg:itemImage']").attr('content', snsGoodsImg);
-		$("meta[property='eg:itemUrl']").attr('content',snsUrl);
-		$("meta[property='eg:originalPrice']").attr('content',[[${goodsInfo.listPrice}]]);
-		$("meta[property='eg:salePrice']").attr('content',[[${goodsInfo.currPrice}]]);
-		$("meta[property='eg:category1']").attr('content',cate1Nm);
-		$("meta[property='eg:category2']").attr('content',cate2Nm);
-		$("meta[property='eg:category3']").attr('content',cate3Nm);
-		$("meta[property='eg:category4']").attr('content',cate4Nm);
-		$("meta[property='eg:category5']").attr('content',cate5Nm);
-		$("meta[property='eg:brandId']").attr('content',[[${goodsInfo.brandGroupNo}]]);
-		$("meta[property='eg:brandName']").attr('content',[[${goodsInfo.brandGroupNm}]]);
-		$("meta[property='eg:regDate']").attr('content',[[${goodsInfo.regDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
-		$("meta[property='eg:updateDate']").attr('content',[[${goodsInfo.updDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
-		$("meta[property='eg:stock']").attr('content',"");
-		$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStatNm}]]);
-		$("meta[property='eg:description']").attr('content',null);
-		$("meta[property='eg:extraImage']").attr('content',null);
-		$("meta[property='eg:locale']").attr('content',"KR");
-		$("meta[property='eg:isNew']").attr('content',([[${goodsInfo.formalGb}]] == 'G009_10')? 'True' :'False');
-		$("meta[property='eg:etc1']").attr('content', [[${goodsInfo.selfGoodsYn}]]);
 		
 		
 		// 탭별 선택시 기본 상품 설정
@@ -1223,13 +1151,88 @@ function buy_nc_req(cartSqArr) {
 			}
 		}
 	});
+	
 }
 	
+	// 광고 스크립트용
+	var goodsNavigation = [[${goodsNavigation}]];
+	var cate1Nm = "";
+	var cate2Nm = "";
+	var cate3Nm = "";
+	var cate4Nm = "";
+	var cate5Nm = "";
+	if (!gagajf.isNull(goodsNavigation)) {
+		cate1Nm = goodsNavigation.cate1Nm;
+		cate2Nm = goodsNavigation.cate2Nm;
+		cate3Nm = goodsNavigation.cate3Nm;
+		cate4Nm = goodsNavigation.cate4Nm;
+		cate5Nm = goodsNavigation.cate3Nm;
+		
+		if (!gagajf.isNull(cate1Nm)) {
+			cateNm += cate1Nm;
+		}
+		if (!gagajf.isNull(cate2Nm)) {
+			cateNm += ' > ' + cate2Nm;
+		}
+		if (!gagajf.isNull(cate3Nm)) {
+			cateNm += ' > ' + cate3Nm;
+		}
+		if (!gagajf.isNull(cate4Nm)) {
+			cateNm += ' > ' + cate4Nm;
+		}
+		if (!gagajf.isNull(cate5Nm)) {
+			cateNm += ' > ' + cate5Nm;
+		}
+	}
+	// 광고 스크립트용
+	
+	var snsGoodsImg = _uploadGoodsUrl + [[${goodsInfo.sysImgNm}]];
+	var snsUrl = location.protocol + _PAGE_GOODS_DETAIL + params.goodsCd;
+	if (typeof (params.colorCd) != 'undefined') snsUrl += "&colorCd=" + params.colorCd;
+	var snsGoodsFullNm = [[${goodsInfo.goodsFullNm}]];
+	
+	<!-- 페이스북 카카오스토리 연동 관련 메타태그 -->
+	$("meta[property='og:url']").attr('content', snsUrl);
+	$("meta[property='og:title']").attr('content', snsGoodsFullNm);
+	$("meta[property='og:description']").attr('content', snsGoodsFullNm);
+	$("meta[property='og:image']").attr('content', snsGoodsImg);
+	
+	<!-- 트위터 관련 메타태그 -->
+	$("meta[name='twitter:url']").attr('content', snsUrl);
+	$("meta[name='twitter:title']").attr('content', snsGoodsFullNm);
+	$("meta[name='twitter:description']").attr('content', snsGoodsFullNm);
+	$("meta[name='twitter:image']").attr('content', snsGoodsImg);
+	
+	// 추천솔류션 meta 설정
+	$("meta[property='eg:type']").attr('content',"product");
+	$("meta[property='eg:cuid']").attr('content',eglqueueCuid);
+	$("meta[property='eg:itemId']").attr('content', [[${goodsInfo.goodsCd}]] );
+	$("meta[property='eg:itemName']").attr('content',[[${goodsInfo.goodsFullNm}]] );
+	$("meta[property='eg:itemImage']").attr('content', snsGoodsImg);
+	$("meta[property='eg:itemUrl']").attr('content',snsUrl);
+	$("meta[property='eg:originalPrice']").attr('content',[[${goodsInfo.listPrice}]]);
+	$("meta[property='eg:salePrice']").attr('content',[[${goodsInfo.currPrice}]]);
+	$("meta[property='eg:category1']").attr('content',cate1Nm);
+	$("meta[property='eg:category2']").attr('content',cate2Nm);
+	$("meta[property='eg:category3']").attr('content',cate3Nm);
+	$("meta[property='eg:category4']").attr('content',cate4Nm);
+	$("meta[property='eg:category5']").attr('content',cate5Nm);
+	$("meta[property='eg:brandId']").attr('content',[[${goodsInfo.brandGroupNo}]]);
+	$("meta[property='eg:brandName']").attr('content',[[${goodsInfo.brandGroupNm}]]);
+	$("meta[property='eg:regDate']").attr('content',[[${goodsInfo.regDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
+	$("meta[property='eg:updateDate']").attr('content',[[${goodsInfo.updDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
+	$("meta[property='eg:stock']").attr('content',"");
+	$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStatNm}]]);
+	$("meta[property='eg:description']").attr('content',null);
+	$("meta[property='eg:extraImage']").attr('content',null);
+	$("meta[property='eg:locale']").attr('content',"KR");
+	$("meta[property='eg:isNew']").attr('content',([[${goodsInfo.formalGb}]] == 'G009_10')? 'True' :'False');
+	$("meta[property='eg:etc1']").attr('content', [[${goodsInfo.selfGoodsYn}]]);
 /*]]>*/
 </script>
 
 <!-- 광고 스크립트 -->
-<!-- <th:block th:replace="~{web/common/advertisements/GoodsDetailScriptsWeb :: scripts}"></th:block> -->
+<th:block th:replace="~{web/common/advertisements/GoodsDetailScriptsWeb :: scripts}"></th:block>
 <!-- //광고 스크립트 -->
 </th:block>
 

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

@@ -1907,6 +1907,7 @@
 	
 	var params = new Object();
 	params.goodsCd = [[${params.goodsCd}]];
+	params.colorCd = [[${params.colorCd}]];
 	params.viewDt = [[${params.viewDt}]];
 	params.preview = [[${params.preview}]];
 	params.adminYn = [[${params.adminYn}]];
@@ -1978,8 +1979,6 @@
 		var opt_selecter01_4 = new sCombo('.opt_set_select .select_custom.item_opt1.item_opt1_4');
 		var opt_selecter01_5 = new sCombo('.opt_set_select .select_custom.item_opt1.item_opt1_5');
 
-
-
 		//스타일링 추천 picker 상품팝업
 /*         $(document).on('click','.pd_recommend .area_slider .item_picker button',function(e){
             $("#pdLookbookPop").modal("show");
@@ -1992,83 +1991,6 @@
 		
 		fnOptionSoldout();
 		
-		// 광고 스크립트용
-		var goodsNavigation = [[${goodsNavigation}]];
-		var cate1Nm = "";
-		var cate2Nm = "";
-		var cate3Nm = "";
-		var cate4Nm = "";
-		var cate5Nm = "";
-		if (!gagajf.isNull(goodsNavigation)) {
-			cate1Nm = goodsNavigation.cate1Nm;
-			cate2Nm = goodsNavigation.cate2Nm;
-			cate3Nm = goodsNavigation.cate3Nm;
-			cate4Nm = goodsNavigation.cate4Nm;
-			cate5Nm = goodsNavigation.cate3Nm;
-			
-			if (!gagajf.isNull(cate1Nm)) {
-				cateNm += cate1Nm;
-			}
-			if (!gagajf.isNull(cate2Nm)) {
-				cateNm += ' > ' + cate2Nm;
-			}
-			if (!gagajf.isNull(cate3Nm)) {
-				cateNm += ' > ' + cate3Nm;
-			}
-			if (!gagajf.isNull(cate4Nm)) {
-				cateNm += ' > ' + cate4Nm;
-			}
-			if (!gagajf.isNull(cate5Nm)) {
-				cateNm += ' > ' + cate5Nm;
-			}
-		}
-		// 광고 스크립트용
-		
-		var snsGoodsImg = _uploadGoodsUrl + [[${goodsInfo.sysImgNm}]];
-		var snsUrl = location.protocol + _PAGE_GOODS_DETAIL + params.goodsCd +'&colorCd =' + params.colorCd  ;
-		var snsGoodsFullNm = [[${goodsInfo.goodsFullNm}]];
-		
-		<!-- 페이스북 카카오스토리 연동 관련 메타태그 -->
-		$("meta[property='og:url']").attr('content', snsUrl);
-		$("meta[property='og:title']").attr('content', snsGoodsFullNm);
-		$("meta[property='og:description']").attr('content', snsGoodsFullNm);
-		$("meta[property='og:image']").attr('content', snsGoodsImg);
-
-		<!-- 트위터 관련 메타태그 -->
-		$("meta[name='twitter:url']").attr('content', snsUrl);
-		$("meta[name='twitter:title']").attr('content', snsGoodsFullNm);
-		$("meta[name='twitter:description']").attr('content', snsGoodsFullNm);
-		$("meta[name='twitter:image']").attr('content', snsGoodsImg);
-
-		// 추천솔류션 meta 설정
-		$("meta[property='eg:type']").attr('content',"product");
-		$("meta[property='eg:cuid']").attr('content',eglqueueCuid);
-		$("meta[property='eg:itemId']").attr('content', [[${goodsInfo.goodsCd}]] );
-		$("meta[property='eg:itemName']").attr('content',[[${goodsInfo.goodsFullNm}]] );
-		$("meta[property='eg:itemImage']").attr('content', snsGoodsImg);
-		$("meta[property='eg:itemUrl']").attr('content',snsUrl);
-		$("meta[property='eg:originalPrice']").attr('content',[[${goodsInfo.listPrice}]]);
-		$("meta[property='eg:salePrice']").attr('content',[[${goodsInfo.currPrice}]]);
-		$("meta[property='eg:category1']").attr('content',cate1Nm);
-		$("meta[property='eg:category2']").attr('content',cate2Nm);
-		$("meta[property='eg:category3']").attr('content',cate3Nm);
-		$("meta[property='eg:category4']").attr('content',cate4Nm);
-		$("meta[property='eg:category5']").attr('content',cate5Nm);
-		$("meta[property='eg:brandId']").attr('content',[[${goodsInfo.brandGroupNo}]]);
-		$("meta[property='eg:brandName']").attr('content',[[${goodsInfo.brandGroupNm}]]);
-		$("meta[property='eg:regDate']").attr('content',[[${goodsInfo.regDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
-		$("meta[property='eg:updateDate']").attr('content',[[${goodsInfo.updDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
-		$("meta[property='eg:stock']").attr('content',"");
-		$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStatNm}]]);
-		$("meta[property='eg:description']").attr('content',null);
-		$("meta[property='eg:extraImage']").attr('content',null);
-		$("meta[property='eg:locale']").attr('content',"KR");
-		$("meta[property='eg:isNew']").attr('content',([[${goodsInfo.formalGb}]] == 'G009_10')? 'True' :'False');
-		$("meta[property='eg:etc1']").attr('content', [[${goodsInfo.selfGoodsYn}]]);
-		
-		// ep 쿠폰확인
-		fnEpCouponDown([[${afLinkCd}]], [[${params.goodsCd}]], 1);
-		
 		
 	});
 	
@@ -2173,6 +2095,86 @@
  		});
  	}
      
+
+	// 광고 스크립트용
+	var goodsNavigation = [[${goodsNavigation}]];
+	var cate1Nm = "";
+	var cate2Nm = "";
+	var cate3Nm = "";
+	var cate4Nm = "";
+	var cate5Nm = "";
+	if (!gagajf.isNull(goodsNavigation)) {
+		cate1Nm = goodsNavigation.cate1Nm;
+		cate2Nm = goodsNavigation.cate2Nm;
+		cate3Nm = goodsNavigation.cate3Nm;
+		cate4Nm = goodsNavigation.cate4Nm;
+		cate5Nm = goodsNavigation.cate3Nm;
+
+		if (!gagajf.isNull(cate1Nm)) {
+			cateNm += cate1Nm;
+		}
+		if (!gagajf.isNull(cate2Nm)) {
+			cateNm += ' > ' + cate2Nm;
+		}
+		if (!gagajf.isNull(cate3Nm)) {
+			cateNm += ' > ' + cate3Nm;
+		}
+		if (!gagajf.isNull(cate4Nm)) {
+			cateNm += ' > ' + cate4Nm;
+		}
+		if (!gagajf.isNull(cate5Nm)) {
+			cateNm += ' > ' + cate5Nm;
+		}
+	}
+	// 광고 스크립트용
+	
+     
+	var snsGoodsImg = _uploadGoodsUrl + [[${goodsInfo.sysImgNm}]];
+	var snsUrl = location.protocol + _PAGE_GOODS_DETAIL + params.goodsCd;
+	if (typeof (params.colorCd) != 'undefined') snsUrl += "&colorCd=" + params.colorCd;
+	var snsGoodsFullNm = [[${goodsInfo.goodsFullNm}]];
+	
+	<!-- 페이스북 카카오스토리 연동 관련 메타태그 -->
+	$("meta[property='og:url']").attr('content', snsUrl);
+	$("meta[property='og:title']").attr('content', snsGoodsFullNm);
+	$("meta[property='og:description']").attr('content', snsGoodsFullNm);
+	$("meta[property='og:image']").attr('content', snsGoodsImg);
+
+	<!-- 트위터 관련 메타태그 -->
+	$("meta[name='twitter:url']").attr('content', snsUrl);
+	$("meta[name='twitter:title']").attr('content', snsGoodsFullNm);
+	$("meta[name='twitter:description']").attr('content', snsGoodsFullNm);
+	$("meta[name='twitter:image']").attr('content', snsGoodsImg);
+
+	// 추천솔류션 meta 설정
+	$("meta[property='eg:type']").attr('content',"product");
+	$("meta[property='eg:cuid']").attr('content',eglqueueCuid);
+	$("meta[property='eg:itemId']").attr('content', [[${goodsInfo.goodsCd}]] );
+	$("meta[property='eg:itemName']").attr('content',[[${goodsInfo.goodsFullNm}]] );
+	$("meta[property='eg:itemImage']").attr('content', snsGoodsImg);
+	$("meta[property='eg:itemUrl']").attr('content',snsUrl);
+	$("meta[property='eg:originalPrice']").attr('content',[[${goodsInfo.listPrice}]]);
+	$("meta[property='eg:salePrice']").attr('content',[[${goodsInfo.currPrice}]]);
+	$("meta[property='eg:category1']").attr('content',cate1Nm);
+	$("meta[property='eg:category2']").attr('content',cate2Nm);
+	$("meta[property='eg:category3']").attr('content',cate3Nm);
+	$("meta[property='eg:category4']").attr('content',cate4Nm);
+	$("meta[property='eg:category5']").attr('content',cate5Nm);
+	$("meta[property='eg:brandId']").attr('content',[[${goodsInfo.brandGroupNo}]]);
+	$("meta[property='eg:brandName']").attr('content',[[${goodsInfo.brandGroupNm}]]);
+	$("meta[property='eg:regDate']").attr('content',[[${goodsInfo.regDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
+	$("meta[property='eg:updateDate']").attr('content',[[${goodsInfo.updDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
+	$("meta[property='eg:stock']").attr('content',"");
+	$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStatNm}]]);
+	$("meta[property='eg:description']").attr('content',null);
+	$("meta[property='eg:extraImage']").attr('content',null);
+	$("meta[property='eg:locale']").attr('content',"KR");
+	$("meta[property='eg:isNew']").attr('content',([[${goodsInfo.formalGb}]] == 'G009_10')? 'True' :'False');
+	$("meta[property='eg:etc1']").attr('content', [[${goodsInfo.selfGoodsYn}]]);
+	
+	// ep 쿠폰확인
+	fnEpCouponDown([[${afLinkCd}]], [[${params.goodsCd}]], 1);
+   
      
 /*]]>*/
 </script>

src/main/webapp/WEB-INF/views/web/order/OrderAddPaymentFormWeb.html

@@ -162,7 +162,7 @@
 													<img th:src="${imageUrl + '/' + goods.sysImgNm}" src="/" width="100%" alt="">
 												</span>
 												<figcaption>
-													<div class="brand" th:text="${goods.brandEnm} + ' ' + ${goods.brandKnm}"></div>
+													<div class="brand" th:text="${goods.brandGroupNm}"></div>
 													<div class="name goodsNm" th:text="${goods.goodsNm}"></div>
 													<div class="option" th:each="colorNm, index : ${goods.colorNmArr}">
 														<span th:text="${colorNm}+'/'+${goods.optCd2Arr[index.index]}"></span> 

src/main/webapp/WEB-INF/views/web/order/OrderCompleteWeb.html

@@ -85,10 +85,6 @@
 													<ul>
 														<li>
 															<span id="recipNm" th:text="${orderInfo.recipNm}"></span>
-															<!-- 
-															<span class="tag">기본배송지</span>
-															<span class="tag primary_line">총알배송</span>
-															 -->
 														</li>
 														<li>
 															<span id="recipPhnno" th:text="${orderInfo.recipPhnno}"></span>

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

@@ -359,12 +359,11 @@ $(document).ready(function() {
 	if (!cfCheckLogin()) {
 		$(".day").html("<span>0</span>일");
 	}else{
+		$('.day').html('<span>' + (custAttendList.length + 1) + '</span>일');
+		$("#td_"+date).attr("class","today");
 		$.each(custAttendList, function(idx, item) {
-			$('.day').html('<span>' + custAttendList.length + '</span>일');
 			if(item.entryDt == date){
 				$("#td_"+date).attr("class","complete");
-			}else{
-				$("#td_"+date).attr("class","today"); 
 			}
 		})
 	}

src/main/webapp/biz/goods.js

@@ -301,16 +301,20 @@ 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){
 				if(item.listPrice != 0){
+					tag += '				<span class="itemPrice_original">'+item.listPrice.addComma()+'</span>';
 					tag += '				<span class="itemPercent">'+ Math.round((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100) +'%</span>';
 				}
 			}
 			tag += '			</p>';
 		}else{
 			tag += '			<p class="itemPrice">';
-			tag += '				<span class="itemPrice_original">'+item.listPrice.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")+'</span>';
+			if(item.currPrice != item.listPrice){
+				if(item.listPrice != 0){
+					tag += '				<span class="itemPrice_original">'+item.listPrice.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")+'</span>';
+				}
+			}
 			tag += item.currPrice.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
 			if(item.currPrice != item.listPrice){
 				if(item.listPrice != 0){
@@ -736,6 +740,7 @@ var fnDeleteFilterSlider = function (obj, gubun, minVal, maxVal){
 
 // 정렬 순서
 var fnSortingChange = function (obj, sortingType, stat, appGb){
+	fnCategoryGoodsInfiniteScrollInit();
 	if(stat != 'back'){
 		if($("#searchGoodsForm input[name=sortingType]").val()==sortingType){
 			return;
@@ -759,8 +764,13 @@ var fnSortingChange = function (obj, sortingType, stat, appGb){
 		$("#sorting"+sortingType).addClass("on");
 	}
 	$("#searchGoodsForm").find("[name=sortingType]").val(sortingType);
+	$("#searchGoodsForm").find("[name=pageNo]").val(1);
+	gagaInfiniteScroll.pageStatus.loadPage = 1;
+	gagaInfiniteScroll.pageStatus.pageNum = [];
 	gagaInfiniteScroll.pageStatus.sortingType = sortingType;
-	fnCategoryGoodsInfiniteScrollInit();
+
+	$('#endPage').hide();
+	$('#noFilterData').hide();
 	fnGoodsListSearch();
 }
 

src/main/webapp/biz/search.js

@@ -0,0 +1,184 @@
+//**************** 검색 상품리스트  start **********************************
+var categoryGoodsList = [];
+var cnt = 1;
+var email = '';
+var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage, endRow, appGb) {
+	var tag = '';
+	var rank = 0;
+	if(lastPage!='1'){
+		rank = endRow;
+	}
+
+	$.each(result.dataList, function(idx, item) {
+		if (idx < 4) {
+			categoryGoodsList.push(item.goodsCd);
+		}
+
+		tag += '<div class="item_prod" id="'+item.goodsCd+item.mainColorCd+'">';
+		tag += '	<div class="item_state';
+		if(!gagajf.isNull(item.sizes)){
+			var sizeArr = item.sizes.split(",");
+			let soldOutCnt = 0;
+			for(let i=0; i<sizeArr.length; i++){
+				var sizeInfo = sizeArr[i].split(":");
+				var sizeVal = sizeInfo[0];
+				var soldOutYn = sizeInfo[1];
+				if(soldOutYn=='Y'){
+					soldOutCnt++;
+				}
+			}
+			if(sizeArr.length==soldOutCnt){
+				tag += ' soldout';
+			}
+		}
+		tag += '">';
+		tag += '		<button type="button" class="itemLike';
+		if(item.likeIt == 'likeit'){
+			tag += ' likeit';
+		}
+		tag += ' "';
+		if(appGb == 'Mob'){
+			tag += ' onClick="cfnMoPutWishList(this);" goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
+		}else{
+			tag += ' onClick="cfnPutWishList(this);" goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
+		}
+		tag += '<a href="javascript:void(0);" class="itemLink" onclick="fnClickGoodsCd(\''+item.goodsCd+'\',\''+item.mainColorCd+'\');">';
+		tag += '			<div class="itemPic">';
+		if(!gagajf.isNull(item.videos)){
+			var videoArr = item.videos.split(",");
+			var videoGb = '';
+			var videoUrl = '';
+			for(let i=0; i<videoArr.length; i++){
+				var videoInfo = videoArr[i].split(":");
+				videoGb = videoInfo[0];
+				videoUrl = videoInfo[1];
+			}
+			if(videoGb=='Y'){
+				tag += '<iframe id="pdThumbVideo" class="pd_mov" src="https://www.youtube.com/embed/'+videoUrl+'?autoplay=1&mute=1"></iframe>';
+				//tag += '<iframe id="pdThumbVideo" class="pd_mov" src="http://v.kr.kollus.com/164MyIiv?enable_initialize_focus=false&autoplay&mute&controls_activation=none" allow="fullscreen" allowFullScreen></iframe>';
+			}else{
+				tag += '<iframe id="pdThumbVideo" class="pd_mov" src="'+_kollusMediaUrl+'/'+videoUrl+'?enable_initialize_focus=false&autoplay&mute&controls_activation=none" allow="fullscreen" allowFullScreen></iframe>';
+			}
+		}
+		tag += '		<img class=" vLHTC pd_img" src="'+goodsUrl+'/'+item.sysImgNm+'" data-img="'+goodsUrl+'/'+item.sysImgNm2+'" onerror="noneImg(this)">';
+		if(!gagajf.isNull(item.sizes) && item.selfGoodsYn=='Y'){
+			var sizeArr = item.sizes.split(",");
+			var minSize;
+			var maxSize;
+			var sizeVal = '';
+			var soldOutYn = '';
+			tag +='<div class="itemOpt">';
+
+			if(sizeArr.length>5){
+				for(let i=0; i<sizeArr.length; i++){
+					var sizeInfo = sizeArr[i].split(":");
+					sizeVal = sizeInfo[0];
+					soldOutYn = sizeInfo[1];
+					if(i==0){
+						minSize = sizeVal;
+					}else if(i==sizeArr.length-1){
+						maxSize = sizeVal;
+					}
+				}
+				tag +='	<div class="exc">';
+				tag +='		<span>'+minSize+'</span> ~ <span>'+maxSize+'</span> 사이즈가 있습니다.';
+				tag +='	</div>';
+			}else{
+				tag += '<ul>';
+				for(let i=0; i<sizeArr.length; i++){
+					var sizeInfo = sizeArr[i].split(":");
+					sizeVal = sizeInfo[0];
+					soldOutYn = sizeInfo[1];
+					if(soldOutYn=='N'){
+						tag +='		<li>'+sizeVal+'</li>';
+					}else{
+						tag +='		<li class="none">'+sizeVal+'</li>';
+					}
+				}
+				tag += '</ul>';
+			}
+			tag += '			</div>';
+		}
+
+		tag += '			</div>';
+
+		tag += '			<p class="itemBrand">'+item.brandGroupNm+'</p>';
+		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){
+				if(item.listPrice != 0){
+					tag += '				<span class="itemPercent">'+ Math.round((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100) +'%</span>';
+				}
+			}
+			tag += '			</p>';
+		}else{
+			tag += '			<p class="itemPrice">';
+			tag += '				<span class="itemPrice_original">'+item.listPrice.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",")+'</span>';
+			tag += item.currPrice.toString().replace(/\B(?=(\d{3})+(?!\d))/g, ",");
+			if(item.currPrice != item.listPrice){
+				if(item.listPrice != 0){
+					tag += '				<span class="itemPercent">'+ Math.round((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100) +'%</span>';
+				}
+			}
+			tag += '			</p>';
+		}
+
+		tag += '			<div class="itemcolorchip">';
+		if(!gagajf.isNull(item.colorChips)){
+			var colorArr = item.colorChips.split(",");
+			var colorCd = '';
+			var rgbColor = '';
+			for(let i=0; i<colorArr.length; i++){
+				var colorInfo = colorArr[i].split(":");
+				colorCd = colorInfo[0];
+				rgbColor = colorInfo[1];
+				if(rgbColor=='#FFFFFF'){
+					tag += '	<span class="chip_color" style="background-color: '+rgbColor+';border:1px solid #aaa;" value="'+colorCd+'">'+colorCd+'</span>';
+				}else{
+					tag += '	<span class="chip_color" style="background-color: '+rgbColor+'" value="'+colorCd+'">'+colorCd+'</span>';
+				}
+			}
+		}
+		tag += '			</div>';
+
+		if(!gagajf.isNull(item.benefits)){
+			var iconArr = item.benefits.split(",");
+			var iconGb = '';
+			var iconNm = '';
+			tag += '	<p class="itemBadge">';
+			let arrCnt;
+			if(iconArr.length > 2){
+				arrCnt = 3;
+			}else{
+				arrCnt = iconArr.length;
+			}
+			for(let i=0; i<arrCnt; i++){
+				var iconInfo = iconArr[i].split(":");
+				iconGb = iconInfo[0];
+				iconNm = iconInfo[1];
+				tag += '	<span class="badge13" value="'+iconGb+'">'+iconNm+' </span>';
+			}
+			tag += '	</p>';
+		}
+
+		if(item.goodsTnm != null){
+			tag += '			<div class="itemComment">'+item.goodsTnm+'</div>';
+		}
+		tag += '		</a>';
+		tag += '	</div>';
+		tag += '</div>';
+	});
+
+	return tag;
+}
+
+// 인피니트 스크롤 초기화
+var fnCategoryGoodsInfiniteScrollInit = function(){
+	sessionStorage.removeItem(document.location.href);
+	//History 초기화
+	$("#listBox").html("");
+}
+
+//****************상품리스트  end **********************************