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

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

@@ -29,7 +29,6 @@ import com.style24.front.biz.service.TsfCartService;
 import com.style24.front.biz.service.TsfOrderService;
 import com.style24.front.biz.thirdparty.NiceCertify;
 import com.style24.front.support.controller.TsfBaseController;
-import com.style24.front.support.env.TsfConstants;
 import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.domain.Customer;
 import com.style24.persistence.domain.Order;
@@ -68,12 +67,6 @@ public class TsfOrderController extends TsfBaseController {
 	
 	@Autowired
 	private NiceCertify niceCertify;
-
-	@Autowired
-	private TscKakaoPayService coreKakaoPayService;
-
-	@Autowired
-	private TscNaverPayService coreNaverPayService;
 	
 	@Autowired
 	private TscKakaotalkService kakaotalkService;

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

@@ -61,7 +61,7 @@ public class TsfPgController extends TsfBaseController {
 				return null;
 			}
 
-			// TODO 2021.03.15 jsh77b 무통장입금 결제완료 처리
+			// 2021.03.15 jsh77b 무통장입금 결제완료 처리
 			Order order = new Order();
 			order.setOrdNo(Integer.parseInt(request.getParameter("order_no")));
 			order.setPgTid(request.getParameter("tno"));

src/main/java/com/style24/front/support/config/TsfRedisSessionConfig.java

@@ -94,7 +94,7 @@ public class TsfRedisSessionConfig extends AbstractHttpSessionApplicationInitial
 		String active = env.getProperty("spring.profiles.active");
 		// TODO : SSL 적용 후 주석 풀고 테스트 해야함 2021-04-13
 		// SSL인증서 적용 시 주석 제거
-		if ("run".equals(active) || "locd".equals(active)) {
+		if ("run".equals(active) || "locd".equals(active) || "style".equals(active)) {
 			serializer.setUseSecureCookie(true);
 			serializer.setSameSite("NONE");
 		}

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/resources/config/application-style.yml

@@ -26,7 +26,7 @@ spring:
                 172.30.90.112:6381
                 172.30.90.113:6381
 # SSL Server
-has-ssl: false
+has-ssl: true
 
 logging:
     config: classpath:log/logback-run.xml

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

@@ -112,8 +112,7 @@
 												</div>
 												<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 												<div class=" itemName" th:text="${item.goodsFullNm}">여성 체인 프린트 큐롯 스커트 프린트 큐롯 스커트</div>
-												<p class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</p>
-												<p class="itemPrice">[[${#numbers.formatInteger(item.currPrice,1,'COMMA')}]]
+												<p class="itemPrice"><span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(item.currPrice,1,'COMMA')}]]
 													<span class=" itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 												</p>
 												<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
@@ -142,6 +141,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/mob/display/OutletMainFormMob.html

@@ -110,9 +110,7 @@
 												</div>
 												<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 												<div class="itemName" th:text="${item.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
-												<p class="itemPrice">
-													<span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>
-													[[${#numbers.formatInteger(item.currPrice,0,'COMMA')}]]
+												<p class="itemPrice"><span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(item.currPrice,0,'COMMA')}]]
 													<span class="itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 												</p>
 												<div class="itemComment" th:text="${item.goodsTnm}">#주문 폭주 상품</div>

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

@@ -1293,6 +1293,11 @@
 		$(document).on('click','.pop_option_select .close',function(e){
 			$(".pop_option_select").hide();
 			$(".option_open").removeClass("on");
+			$('.form_field .select_custom.deal_opt_item').find('.combo .select').html('선택');
+			$('.form_field .select_custom.item_opt1').attr('disabled', true);
+			$('.form_field .select_custom.item_opt1').find('.combo .select').html('선택');
+			$('.form_field .select_custom.item_opt2').attr('disabled', true);
+			$('.form_field .select_custom.item_opt2').find('.combo .select').html('선택');
 			 return false;
 		 })
 //			//팝업 - 딜상세정보 옵션선택 > 옵션셀렉트팝업 ==> fnGoodsDealOptionOpen()대체

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

@@ -2604,6 +2604,13 @@
 		$(document).on('click','.pop_option_select .close',function(e){
             $(".pop_option_select").hide();
 			$('.option_result .option_open').removeClass('on');
+			let target=$('.select_custom.item_opt1');
+			target.each(function(){ 
+				$('.form_field .select_custom.item_opt1.' +$(this).attr('id') ).find('.combo .select').html('선택');
+				$('.form_field .select_custom.item_opt2.' +$(this).attr('id') ).attr('disabled', true);
+				$('.form_field .select_custom.item_opt2.' +$(this).attr('id') ).find('.combo .select').html('선택');
+			});
+			
             return false;
         });
 

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

@@ -35,8 +35,9 @@
 								</div>
 								<p class="itemBrand" th:text="${goodsInfo.brandGroupNm}">NBA 키즈</p>
 								<div class="itemName" th:text="${goodsInfo.goodsFullNm}">유니 삼단블록 플리스 집업 유니 삼단블록 플리스 집업 유니 삼단블록 플리스 집업</div>
-								<p class="itemPrice"><th:block th:text="${#numbers.formatInteger(goodsInfo.currPrice, 0,'COMMA')}"> 134,100</th:block>
+								<p class="itemPrice">
 									<span class="itemPrice_original" th:if="${goodsInfo.listPrice > goodsInfo.currPrice}" th:text="${#numbers.formatInteger(goodsInfo.listPrice, 0,'COMMA')}">149,000</span>
+									<th:block th:text="${#numbers.formatInteger(goodsInfo.currPrice, 0,'COMMA')}"> 134,100</th:block>
 									<span class="itemPercent" th:if="${goodsInfo.dcRate > 0}" th:text="|${#numbers.formatDecimal(goodsInfo.dcRate,0,0)}%|">30%</span>
 								</p>
 							</a>
@@ -47,13 +48,15 @@
 				<div class="select_blk" th:if="${goodsOption2List != null and !goodsOption2List.empty}" >
 					<h6>사이즈 선택</h6>
 					<div class="opt_size">
-						<div class="form_field">
-							<div th:each="goodsOption2, status : ${goodsOption2List}">
-								<th:block th:if="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" >
+						<div class="form_field size_select">
+							<th:block  th:each="goodsOption2, status : ${goodsOption2List}">
+							<th:block th:if="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" >
+							<div>
 								<input type="radio" name="opt" th:id="${'alarmSize'+goodsOption2.optCd}" th:value="${goodsOption2.optCd2}" th:attr="optCd=${goodsOption2.optCd}" >
 								<label th:for="${'alarmSize'+goodsOption2.optCd}"><span th:text="${goodsOption2.optCd2}" >90</span></label>
-								</th:block>
 							</div>
+							</th:block>
+							</th:block>
 						</div>
 					</div>
 				</div>

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

@@ -61,19 +61,25 @@
 										<div class="name" th:text="${cancelDtl.goodsNm}"></div>
 									</div>
 									<div class="od_opt">
-										<div class="option">
-											<th:block th:if="${cancelDtl.goodsType == 'G056_S'}">
-												<th:block th:each="option, status : ${cancelDtl.colorNmArr}">
-													<em th:text="${cancelDtl.itemNmArr[status.index]}"></em>
+										<!-- 세트상품일때 -->
+										<th:block th:if="${cancelDtl.goodsType} == 'G056_S'">
+											<th:block th:each="option , index2 : ${cancelDtl.colorNmArr}">
+												<div class="option">
+													<em th:text="${cancelDtl.itemNmArr[index2.index]}"></em>
 													<em th:text="${option}"></em>
-													<em th:text="${cancelDtl.optCd2Arr[status.index]}"></em>
-												</th:block>
+													<em th:text="${cancelDtl.optCd2Arr[index2.index]}"></em>
+												</div>
 											</th:block>
-											<th:block th:unless="${cancelDtl.goodsType == 'G056_S'}">
+										</th:block>
+										<!-- //세트상품일때 -->
+										<!-- 단품상품일때 -->
+										<th:block th:unless="${cancelDtl.goodsType} == 'G056_S'">
+											<div class="option">
 												<em th:text="${cancelDtl.colorNm}"></em>
 												<em th:text="${cancelDtl.optCd2}"></em>
-											</th:block>
-										</div>
+											</div>
+										</th:block>
+										<!-- //단품상품일때 -->
 									</div>
 									<div class="od_calc">
 										<p class="price">

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

@@ -56,19 +56,25 @@
 										<div class="name" th:text="${cancelDtl.goodsNm}"></div>
 									</div>
 									<div class="od_opt">
-										<div class="option">
-											<th:block th:if="${cancelDtl.goodsType == 'G056_S'}">
-												<th:block th:each="option, status : ${cancelDtl.colorNmArr}">
-													<em th:text="${cancelDtl.itemNmArr[status.index]}"></em>
+										<!-- 세트상품일때 -->
+										<th:block th:if="${cancelDtl.goodsType} == 'G056_S'">
+											<th:block th:each="option , index2 : ${cancelDtl.colorNmArr}">
+												<div class="option">
+													<em th:text="${cancelDtl.itemNmArr[index2.index]}"></em>
 													<em th:text="${option}"></em>
-													<em th:text="${cancelDtl.optCd2Arr[status.index]}"></em>
-												</th:block>
+													<em th:text="${cancelDtl.optCd2Arr[index2.index]}"></em>
+												</div>
 											</th:block>
-											<th:block th:unless="${cancelDtl.goodsType == 'G056_S'}">
+										</th:block>
+										<!-- //세트상품일때 -->
+										<!-- 단품상품일때 -->
+										<th:block th:unless="${cancelDtl.goodsType} == 'G056_S'">
+											<div class="option">
 												<em th:text="${cancelDtl.colorNm}"></em>
 												<em th:text="${cancelDtl.optCd2}"></em>
-											</th:block>
-										</div>
+											</div>
+										</th:block>
+										<!-- //단품상품일때 -->
 									</div>
 									<div class="od_calc">
 										<p class="price">

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

@@ -539,7 +539,7 @@ window._eglqueue = window._eglqueue || [];
 _eglqueue.push(['setVar'	, 'cuid'		, eglqueueCuid]);
 _eglqueue.push(['setVar'	, 'orderId'		, [[${orderInfo.ordNo}]]]);
 _eglqueue.push(['setVar'	, 'orderPrice'	, [[${realOrdSumAmt}]]]);
-_eglqueue.push(['setVar'	, 'userId'		, [[${orderInfo.custId}]]]); // optional
+_eglqueue.push(['setVar'	, 'userId'		, hCustId]); // optional
 _eglqueue.push(['track'		, 'order']);
 
 (function (s, x) {

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

@@ -183,7 +183,7 @@
 															</div>
 															<p class=" itemBrand" th:text="${bestItemData.brandGroupNm}">BRAND NAME</p>
 															<div class=" itemName" th:text="${bestItemData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-															<p class="itemPrice">[[${#numbers.formatInteger(bestItemData.currPrice,0,'COMMA')} + 원]]
+															<p class="itemPrice">[[${#numbers.formatInteger(bestItemData.currPrice,0,'COMMA')}]]
 																<span class="itemPrice_original" th:if="${bestItemData.currPrice != bestItemData.listPrice}" th:text="${#numbers.formatInteger(bestItemData.listPrice,3,'COMMA')}">89,000</span>
 																<span class=" itemPercent" th:if="${bestItemData.currPrice != bestItemData.listPrice}" th:text="${(bestItemData.listPrice == 0 ? 0 : #numbers.formatDecimal((bestItemData.listPrice - bestItemData.currPrice) / (bestItemData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 															</p>
@@ -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();
@@ -337,7 +337,7 @@
 															<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 															<div class="itemName" th:text="${goodsData.goodsNm}">여성 체인 프린트 큐롯 스커트 프린트 큐롯 스커트</div>
 															<p class="itemPrice">
-																[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')} + 원]]
+																[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 																<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,0,'COMMA')} + '원'"></span>
 																<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatDecimal(goodsData.dcRate,1,0)} + '%'"></span>
 																<!--<span class="itemPercent" th:if="${planningGoods.currPrice != planningGoods.listPrice}" th:text="${(planningGoods.listPrice == 0 ? 0 : #numbers.formatDecimal((planningGoods.listPrice - planningGoods.currPrice) / (planningGoods.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>-->
@@ -456,7 +456,7 @@
 																<input type="hidden" name="bannerNote" th:value="${ContentsData.strTitle1}"/>
 															</p>
 															<!--<p>아우터 + 이너 단독세일</p>-->	<!-- br 태그 줄바꿈해야함-->
-															<button type="button" class="btn">VIEW MORE</button>
+<!--															<button type="button" class="btn">VIEW MORE</button>-->
 														</div>
 														<img alt="BLUE-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('domain.image')+ContentsData.imgPath1}">
 													</div>
@@ -512,7 +512,7 @@
 																		</div>
 																		<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 																		<div class=" itemName" th:text="${goodsData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-																		<p class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')} + 원]]
+																		<p class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 																			<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 																			<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 																		</p>
@@ -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);

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

@@ -48,12 +48,14 @@
 					<h6>사이즈 선택</h6>
 					<div class="opt_size">
 						<div class="form_field">
-							<div th:each="goodsOption2, status : ${goodsOption2List}">
-								<th:block th:if="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" >
+							<th:block  th:each="goodsOption2, status : ${goodsOption2List}">
+							<th:block th:if="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" >
+							<div>
 								<input type="radio" name="opt" th:id="${'alarmSize'+goodsOption2.optCd}" th:value="${goodsOption2.optCd2}" th:attr="optCd=${goodsOption2.optCd}" >
 								<label th:for="${'alarmSize'+goodsOption2.optCd}"><span th:text="${goodsOption2.optCd2}" >90</span></label>
-								</th:block>
 							</div>
+							</th:block>
+							</th:block>
 						</div>
 					</div>
 				</div>

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

@@ -440,7 +440,7 @@ window._eglqueue = window._eglqueue || [];
 _eglqueue.push(['setVar'	, 'cuid'		, eglqueueCuid]);
 _eglqueue.push(['setVar'	, 'orderId'		, [[${orderInfo.ordNo}]]]);
 _eglqueue.push(['setVar'	, 'orderPrice'	, [[${realOrdSumAmt}]]]);
-_eglqueue.push(['setVar'	, 'userId'		, [[${orderInfo.custId}]]]); // optional
+_eglqueue.push(['setVar'	, 'userId'		, hCustId]); // optional
 _eglqueue.push(['track'		, 'order']);
 
 (function (s, x) {

src/main/webapp/ux/mo/css/common_m.css

@@ -212,22 +212,22 @@ select,
 .form_full {} 
 
 .form_col_w {width: 100%;}
-.form_col_c {width: 530px; margin: 0 auto;}
+.form_col_c {width: 53.0rem; margin: 0 auto;}
 .form_field {width: 100%;margin-left: 0px !important;margin-right: 0px !important;position: relative;display: -webkit-box;display: -ms-flexbox;display: flex;}
 .input_wrap{position: relative;display: table;border-collapse: separate;}
 .input_wrap, 
 .input_label {vertical-align: top;text-align: left;}
-.input_label { line-height: 3.0; font-size: 16px; font-weight: 300;}
-.input_label span[class*="t_"]{display: inline !important;text-indent: -10px;margin-left: -10px;}
+.input_label { line-height: 3.0; font-size: 1.6rem; font-weight: 300;}
+.input_label span[class*="t_"]{display: inline !important;text-indent: -1.0rem;margin-left: -1.0rem;}
 .input_wrap .form_control, 
 .input_group_addon, 
 .input_group_btn {display: table-cell;float: left;}
-.form_control{height: 45px;font-size: 12px;line-height: 43px;-moz-box-shadow: none;-webkit-box-shadow: none;box-shadow: none;-webkit-appearance: none;border: 1px solid #D5D5D5;position: relative;}
-.form_control.err {border: 1px solid #fd4802 !important; background: #fff6f2;}
+.form_control{height: 4.5rem;font-size: 1.2rem;line-height: 4.3rem;-moz-box-shadow: none;-webkit-box-shadow: none;box-shadow: none;-webkit-appearance: none;border: 0.1rem solid #D5D5D5;position: relative;}
+.form_control.err {border: 0.1rem solid #fd4802 !important; background: #fff6f2;}
 
 .usable {display: none;}
-.form_control.usable + .usable:before {content:'사용가능';  position:absolute; top:50%; bottom: auto; right: 20px; left: auto; transform: translateY(-50%); padding-left:15px; background: url('/images/mo/ico_usable1.png') no-repeat 0 40%; color:#222; font-size:12px; font-weight:200; line-height:1;}
-.sr-only {position: absolute!important;width: 1px;height: 1px;padding: 0!important;margin: -1px;overflow: hidden;clip: rect(0,0,0,0);border: 0;}
+.form_control.usable + .usable:before {content:'사용가능';  position:absolute; top:50%; bottom: auto; right: 2.0rem; left: auto; transform: translateY(-50%); padding-left:1.5rem; background: url('/images/mo/ico_usable1.png') no-repeat 0 40%; color:#222; font-size:1.2rem; font-weight:200; line-height:1;}
+.sr-only {position: absolute!important;width: 0.1rem;height: 0.1rem;padding: 0!important;margin: -0.1rem;overflow: hidden;clip: rect(0,0,0,0);border: 0;}
 
 /* form style (hyangah_0223_수정중 - input[type="text"] padding 수정) */
 input,  textarea {font-size:12px; font-family:'Noto Sans KR', 'LATO', sans-serif; color:#666666; vertical-align:middle;}

src/main/webapp/ux/mo/css/layout_m.css

@@ -4,7 +4,7 @@
 /* cs 공통 */
 .cs .pnb ul{padding-left:1rem;}
 .cs .search_wrap{position: relative;}
-.cs .cs_search_input{font-size:1.5rem; height:4.5rem; width:100%; border:none !important; border-bottom:0.2rem solid #000 !important; position:relative; padding:0 !important;}
+.cs .cs_search_input{font-size:1.5rem; height:4.5rem; width:calc(100% - 4.0rem); border:none !important; border-bottom:0.2rem solid #000 !important; position:relative; padding:0 !important;}
 .cs .search_wrap button.btn_sch {position:absolute; top:0; right:0; background:url(/images/mo/cs_search_btn.png) center center no-repeat; text-indent:-9999px; width:2.2rem; height:4.5rem;}
 .cs .search_wrap button.btn_x { width: 2rem; height: 2rem; background: #aaa; border-radius: 1rem; color: #fff; font-size: 1rem; position: absolute; top: 1.2rem; right: 3.2rem; background:#aaa url(/images/mo/ico_sch_del_w.png) no-repeat center; background-size:1.1rem; text-indent:-999em;}
 .cs .inner{background:#fff;}
@@ -546,10 +546,10 @@
 .pd_detail .option_box .opt_color{padding:3rem 0;}
 .pd_detail .option_box .opt_color ul {margin:0 -2rem; padding-left:2rem; overflow-x:auto; font-size:0; white-space:nowrap;}
 .pd_detail .option_box .opt_color ul::after {content:''; position: relative; display:inline-block; width:2rem; height:1px;}
-.pd_detail .option_box .opt_color ul li {margin-right:0.5rem; display:inline-block; width:5rem;}
+.pd_detail .option_box .opt_color ul li {margin-right:0.5rem; display:inline-block; width:5rem;height: 7.5rem;}
 .pd_detail .option_box .opt_color ul li:last-child {margin-right:0;}
-.pd_detail .option_box .opt_color ul li a {position:relative; display:block; padding-bottom:0%; box-sizing:border-box; width:5rem;}
-.pd_detail .option_box .opt_color ul li a img {width:100%; }
+.pd_detail .option_box .opt_color ul li a {position:relative; display:block; padding-bottom:0%; box-sizing:border-box; width:5rem;height: 7.5rem;}
+.pd_detail .option_box .opt_color ul li a img {position: absolute;width: 100%;height: auto;top: 50%;left: 0;transform: translateY(-50%); }
 .pd_detail .option_box .opt_color ul li a.on:after{display:block; content:''; position:absolute; left:0; right:0; top:0; bottom:0; border:1px solid #fd4802; box-sizing:border-box;}
 .pd_detail .option_box > [class^="opt_"] .opt_header {margin-bottom:0.5rem;}
 .pd_detail .option_box > [class^="opt_"] .opt_header .title {margin-right:1rem; font-weight:500; color:#222;}
@@ -1565,6 +1565,7 @@
 .pd.deal .tab_detail_cont .select_custom.deal_opt_item .item_prod .item_state a {position:relative; padding-left:70px}
 .pd.deal .tab_detail_cont .select_custom.deal_opt_item .item_prod .item_state a .itemPic {position:absolute; left:0; top:0; width:50px; height:70px; padding:0;}
 .pd.deal .tab_detail_cont .select_custom.deal_opt_item .combo .list {top:109px}
+.pd.deal .select_custom.deal_opt_item .item_prod .itemPercent{left:9.6rem;}
 /* 리스트팝업 */
 .pd_pop.list_pop{display:none; position:fixed; top:0; left:0; width:100%; height:100%; background-color:rgba(34,34,34,.7); z-index:1000;}
 
@@ -1663,8 +1664,8 @@
 .dp .dp_subtitle{margin-bottom: 2.4rem; font-size:2rem; font-weight:500; text-align:center;}
 .dp .dp_subtitle > a{position:relative; padding-right:2rem;}
 .dp .dp_subtitle > a:before{content:''; position:absolute; right:0; top:50%; margin-top:-1px; width:0.7rem; height:1.3rem; background:url(/images/mo/ico_dp_arrow.png) center center no-repeat; background-size:contain; -webkit-transform:translateY(-50%); transform:translateY(-50%);}
-.dp .category_nav {margin:0 -2rem -1.2rem; padding:0 2rem; justify-content: center; border-bottom:1px solid #eeeeee;}
-.dp .category_nav ul{padding:0 2rem; display:flex;}
+.dp .category_nav {margin:0 0 -1.2rem; justify-content: center; border-bottom:1px solid #eeeeee;}
+.dp .category_nav ul{padding:0 2rem; display:flex; white-space: nowrap; overflow-x:auto;}
 .dp .category_nav ul::after {content:''; display: block; clear: both;}
 .dp .category_nav ul li {margin-right:2rem; }
 .dp .category_nav ul li button {position: relative; padding:1.5rem 0; font-size:1.4rem; font-weight:300; color:#222;}
@@ -2089,7 +2090,7 @@
 .filter_list{font-size:1.4rem; background:#fff; position:fixed; top:0; right:-80%; width:80%; height:100%; transition:right 0.4s;}
 .filter_list::after{content:''; display: block; clear:both;}
 .filter_list .form_field{display:block;}
-.filter_list .form_field input[type="checkbox"] + label {display: block; position: relative; padding-left:0; padding-right: 26px; cursor: pointer; font-size: 1.2rem; line-height: 1.4; font-weight: 300; letter-spacing: 0;}
+.filter_list .form_field input[type="checkbox"] + label {display: block; position: relative; padding-left:0; padding-right: 26px; cursor: pointer; font-size: 1.2rem; line-height: 1.4; font-weight: 300; letter-spacing: 0; text-align: left;}
 .filter_list .form_field div label span{color:#222!important;}
 .filter_list .form_field input[type="checkbox"] + label:before{left:auto; right:0}
 .filter_list .form_field input[type="checkbox"]:checked + label:after{left:auto; right:0}
@@ -2106,7 +2107,7 @@
 .filter_header .form_field{padding:0 2rem; border-bottom:1px solid #eeeeee;}
 .filter_header .form_field > div label{padding:1.2rem 0;}
 /* 메뉴부분 */
-.filter_body > ul li a{position:relative; padding:1rem 2rem; display:block; color:#222; font-size:1.4rem; font-weight: 300;}
+.filter_body > ul li a{position:relative; padding:1.4rem 2rem; display:block; color:#222; font-size:1.4rem; font-weight: 300;}
 .filter_body > ul > li{border-bottom:1px solid #eeeeee;}
 .filter_body > ul > li > a{display:block; padding:2rem 2rem;}
 .filter_body > ul > li .daps1{position:relative; background-color:#fff}
@@ -2119,6 +2120,7 @@
 .filter_body > ul > li .daps1 .pic{position:absolute; right:4.5rem; top:50%; display:block; max-width:15rem; font-size:1.1rem; color:#fd4801; text-align:right; text-overflow:ellipsis; white-space:nowrap; overflow:hidden; -webkit-transform:translateY(-50%); transform:translateY(-50%);}
 .filter_body > ul > li .daps5 a{background:url(/images/mo/ico_bracket2.png) 4rem 40% no-repeat;}
 .filter_body > ul > li a.on{color:#fd4801;}
+.filter_body > ul > li.categori .daps2 > li > a.on, .filter_body > ul > li.categori .daps3 > li > a.on, .filter_body > ul > li.categori .daps4 > li > a.on {border-bottom: 1px solid #ddd;}
 .filter_body > ul > li.categori .daps2 > li > a.on:after,
 .filter_body > ul > li.categori .daps3 > li > a.on:after,
 .filter_body > ul > li.categori .daps4 > li > a.on:after{content:''; position:absolute; right:2rem; top:50%; width:1.3rem; height:0.7rem; background:url(/images/mo/ico_cate_close.png) center center no-repeat; -webkit-transform:translateY(-50%); transform:translateY(-50%);}
@@ -2323,12 +2325,6 @@
 .br .br_main .br_top_info > p:nth-of-type(1){margin-bottom:1.6rem; font-weight:bold;}
 .br .br_main .br_top_info > p:nth-of-type(2){margin-bottom:1.2rem; color:#222; font-weight:500; line-height:2rem;}
 .br .br_main .br_top_info .btn_group_flex > div > .btn > span{display:inline-block; background:url(/images/mo/br_site.png) no-repeat; width:1.1rem; height:1.2rem; margin-left:0.8rem}
-/* br_main - 이미지배너 */
-.br .br_main .br_second_slide{position:relative;}
-.br .br_main .br_second_slide .swiper-slide img{width:100%;}
-.br .br_main .br_second_slide .swiper-slide .s-text{position:absolute; top:50%; left:0; padding:2rem; width:100%; box-sizing:border-box; -webkit-transform:translateY(-50%); transform:translateY(-50%);}
-.br .br_main .br_second_slide .swiper-slide .s-text p{font-size:1.6rem; font-weight:500;}
-.br .br_main .br_second_slide .swiper-pagination{position: relative; bottom:auto; margin-top:1rem;}
 /* br_main - new_item */
 .br .br_main .new_item .swiper-slide{font-size:0;}
 .br .br_main .new_item .swiper-slide .item_prod:nth-child(2n){margin-right: 0;}
@@ -2442,7 +2438,7 @@
 .br_search_wrap .hmenu .brand_si .swiper-pagination-bullet{margin-right:0.8rem;}
 .br_search_wrap .hmenu .brand_si .swiper-pagination-bullet:last-child{margin-right:0;}
 .br_search_wrap .brand_title { width: 100%; height: 4.3rem; margin: 2.4rem 0 0; border-bottom: 0.2rem solid black; }
-.br_search_wrap .brand_title input { width: 100%; height: 4.3rem; float: left; border: none;  padding: 0; font-size: 1.6rem; font-weight: 100; color: #000; border-bottom:2px solid #000; margin-bottom:1.6rem;}
+.br_search_wrap .brand_title input { width: calc(100% - 4.0rem); height: 4.3rem; float: left; border: none;  padding: 0; font-size: 1.6rem; font-weight: 100; color: #000; border-bottom:2px solid #000; margin-bottom:1.6rem;}
 .br_search_wrap .brand_title .btn_x { width: 2rem; height: 2rem; background: #aaa; border-radius: 1rem; color: #fff; font-size: 1rem; position: absolute; top: 1.2rem; right: 5rem; }
 .br_search_wrap .brand_title button img { width: 2rem; height: 2rem; position: absolute; top: 1.2rem; right: 2.2rem;}
 .br_search_wrap .inner .result {padding-bottom:3rem; margin: 1.5rem 0 1rem; border-bottom:0.1rem solid #dddddd;}

src/main/webapp/ux/mo/css/style24_m.css

@@ -426,7 +426,7 @@
 
 .post-bnnWide {position: relative;top:0rem;display: block;margin: 0 0 3.4rem;}
 .post-bnnWide .swiper-wrapper {width: 100%;height: 100%;height: auto;margin: 0px auto;padding: 0 0 2.5rem;}
-.post-bnnWide .swiper-pagination {bottom: 0rem;}
+.post-bnnWide .swiper-pagination {bottom: 0rem !important;}
 
 .main_recomm {margin: 0px auto;}
 .main_recomm .titWrap{padding: 4rem 0 2rem 0;}
@@ -691,7 +691,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .dp .cmt_group .cmt_list li .cmt_cont .img_wrap .pics {float:none; display: inline-block !important; margin:0 0.1.11%; width: 20.55%; padding-top: 20%;}
 .dp .cmt_group .cmt_list li .cmt_cont .img_wrap .pics .picsThumbs {}
 .dp .cmt_group .cmt_list li .cmt_cont .img_wrap img {max-width:100%; max-height:100%;}
-.dp .cmt_group .cmt_list li .cmt_cont p {color: #666; line-height: 1.7; font-size: 1.3rem; font-weight: 300;}
+.dp .cmt_group .cmt_list li .cmt_cont p {color: #666; line-height: 1.7; font-size: 1.3rem; font-weight: 300; word-break: break-all;}
 .dp .cmt_group .cmt_list li .btn_del {display: block; font-size: 1.1rem; color: #666; font-weight: 300; position: absolute; top: 0; right: 0; height:auto; padding:0; border-color:transparent; border-bottom: 1px solid #666;}
 
 /* ev_comment_1 포토댓글 */
@@ -1473,7 +1473,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .my_delivery .blocker:before {display: none;}
 .my_delivery .modal .modal-body {margin-bottom: 5rem;}
 .my_delivery .modal .modal-footer {position: fixed; left: 0; bottom: 0; width: 100%;}
-.my .my_delivery .inner {padding: 0;}
+.my .my_delivery .inner {margin:0; padding: 0;}
 .my .my_delivery .inner > .btn_group {position: fixed; left: 0; bottom: 0; width: 100%; z-index: 99; transition:all 0.3s;}
 .my .my_delivery .inner > .btn_group.active {transform: translate(0, -4.3rem);}
 .my .my_delivery .inner:last-child {padding-bottom: 0;}

src/main/webapp/ux/mo/js/common_m.js

@@ -808,33 +808,6 @@ $(document).ready(function () {
             return false;
         });
 
-        // 210407_스크롤감지 헤더 그림자
-        $('.pd_delivery_pop').scroll(function(){
-            $(".pd_delivery_pop .modal-header").css("box-shadow", "rgb(0 0 0 / 20%) 0px 0px 5px");
-            $(".pd_delivery_pop .modal-header").css("border-bottom", "0px none");
-            if($(".pd_delivery_pop").scrollTop() === 0){
-                $(".pd_delivery_pop .modal-header").css("box-shadow", "none");
-                $(".pd_delivery_pop .modal-header").css("border-bottom", "1px solid #eee");
-            }
-        });
-        $('.pd_review_pop').scroll(function(){
-            $(".pd_review_pop .modal-header").css("box-shadow", "rgb(0 0 0 / 20%) 0px 0px 5px");
-            $(".pd_review_pop .modal-header").css("border-bottom", "0px none");
-            if($(".pd_review_pop").scrollTop() === 0){
-                $(".pd_review_pop .modal-header").css("box-shadow", "none");
-                $(".pd_review_pop .modal-header").css("border-bottom", "1px solid #eee");
-            }
-        });
-        $('.pd_qnalist_pop').scroll(function(){
-            $(".pd_qnalist_pop .modal-header").css("box-shadow", "rgb(0 0 0 / 20%) 0px 0px 5px");
-            $(".pd_qnalist_pop .modal-header").css("border-bottom", "0px none");
-            if($(".pd_qnalist_pop").scrollTop() === 0){
-                $(".pd_qnalist_pop .modal-header").css("box-shadow", "none");
-                $(".pd_qnalist_pop .modal-header").css("border-bottom", "1px solid #eee");
-            }
-        });
-
-
 });
         
 

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

@@ -177,7 +177,8 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .common_header.br_header .depth_menu .head_banner li img{top: 50%;left: 0px;}
 .common_header.br_header .depth_menu .head_banner li:first-child {margin-right:0;}
 .common_header.br_header .depth_menu .item_prod {width: 100%;}
-.common_header.br_header > .area {height:90px;}
+.common_header.br_header > .area {height:90px;background: inherit;}
+.common_header.br_header > .gnb {background: inherit;}
 .common_header.br_header .nav > ul > li.home {display:none;}
 .minify .common_header.br_header .nav > ul > li.home{display:block;}
 
@@ -1665,6 +1666,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.dp .itemsGrp.cut4 .item_prod {width: calc((100% - 0px)/4);}
 	.dp .wrap {padding-bottom:160px;}
 	.dp .cont_body {position:relative;}
+	.container.dp {background: #ffffff;}
 	.container.dp .wrap {position:relative; width:100%; min-width:auto; max-width:none; padding-left:0px; padding-right:0px;}
 	.container.dp .content {}
 	.container.dp .content.wide {}

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

@@ -456,8 +456,8 @@
 /* main_1stage */
 .main .wrap .content.main_1stage {}
 .main_1stage .bnnbox{position:relative;}
-.main_1stage .txtWrap{margin:0 auto; position:absolute; top:50%; left:50%; transform:translate(-50%, -50%);z-index:1; text-align:center;}
-.main_1stage .txtWrap p{color:#222222; font-size:40px; font-weight:500; text-align:center; line-height:1.25;}
+.main_1stage .txtWrap{margin:0 auto; position:absolute; top:50%; left:30%; transform:translate(-70%, -50%);z-index:1; text-align:left;}
+.main_1stage .txtWrap p{color:#222222; font-size:40px; font-weight:500; text-align:left; line-height:1.25;}
 .main_1stage .txtWrap .btn{position:relative; width:160px; height:52px; border:1px solid #959899; margin:20px auto 0; text-align:center; font-weight:300; }
 .main_1stage img {margin:0 auto;width:100%;}
 .post-bnnWide .swiper-button-next {right:70px;}

src/main/webapp/ux/pc/js/common-ui.js

@@ -37,6 +37,13 @@ $(document).ready(function(){
 		history.back()
 	});
 
+	// main css 호출 제거
+	var uifn_DISCR = $('#container').attr('class');
+	var uifn_DISCRCLASS = "main";
+	if (uifn_DISCR.indexOf(uifn_DISCRCLASS) == -1) {
+		jQuery("link[rel=stylesheet][href*='css/main.css']").remove();
+	};
+
 	// header minify
 	$(function(){
 		$(window).scroll(function(){