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

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

@@ -45,17 +45,17 @@ public class TsfNoticeService {
 		return noticeDao.getNoticeList(notice);
 	}
 
-	/**
-	 * 긴급 공지사항 목록
-	 * @param notice - 공지사항 정보
-	 * @return
-	 * @author gagamel
-	 * @date 2020. 11. 3
-	 */
-	public Collection<Notice> getUrgentNoticeList(Notice notice) {
-		notice.setUrgentYn("Y"); // 긴급공지
-		return noticeDao.getNoticeList(notice);
-	}
+//	/**
+//	 * 긴급 공지사항 목록
+//	 * @param notice - 공지사항 정보
+//	 * @return
+//	 * @author gagamel
+//	 * @date 2020. 11. 3
+//	 */
+//	public Collection<Notice> getUrgentNoticeList(Notice notice) {
+//		notice.setUrgentYn("Y"); // 긴급공지
+//		return noticeDao.getNoticeList(notice);
+//	}
 
 	/**
 	 * 공지사항 첨부파일 목록

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

@@ -150,8 +150,8 @@ public class TsfCallcenterController extends TsfBaseController {
 		result.set("paging", notice);
 		result.set("dataList", noticeService.getNoticeList(notice));
 
-		// 긴급(중요) 공지사항 목록
-		result.set("urgentList", noticeService.getUrgentNoticeList(notice));
+//		// 긴급(중요) 공지사항 목록
+//		result.set("urgentList", noticeService.getUrgentNoticeList(notice));
 
 		return result;
 	}
@@ -267,6 +267,18 @@ public class TsfCallcenterController extends TsfBaseController {
 		return super.ok(message.getMessage("SUCC_0003"));
 	}
 
+	/**
+	 * 1:1문의 건수 정보
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 4. 27
+	 */
+	@GetMapping("/onetoone/qna/count/info")
+	@ResponseBody
+	public Counsel getOneToOneQnaCountInfo() {
+		return counselService.getOneToOneQnaCountInfo();
+	}
+
 	/**
 	 * 1:1문의 상세 화면. 목록 화면에 상세 데이터 노출로 해당 로직 사용 안 함.
 	 * @param counselSq - 상담일련번호
@@ -388,4 +400,16 @@ public class TsfCallcenterController extends TsfBaseController {
 		return super.ok(message.getMessage("SUCC_0003"));
 	}
 
+	/**
+	 * 상품문의 건수 정보
+	 * @return
+	 * @author gagamel
+	 * @since 2021. 4. 27
+	 */
+	@GetMapping("/goods/qna/count/info")
+	@ResponseBody
+	public Counsel getGoodsQnaCountInfo() {
+		return counselService.getGoodsQnaCountInfo();
+	}
+
 }

src/main/java/com/style24/persistence/domain/Contents.java

@@ -62,6 +62,7 @@ public class Contents extends TscBaseDomain {
 	private int planBrandCnt;
 	private int planBrandGroupNo;
 	private String planBrandGroupNm;
+	private String planGb;
 
 	// 몰메인 SMM003에서 사용
 	private String siteCd;

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

@@ -279,11 +279,15 @@
 		    <when test="goodsType != null and goodsType == 'G056_D'">
 		AND    A.REL_GOODS_CD = G.GOODS_CD
 		AND    G.GOODS_CD = C.COMPS_GOODS_CD
+		        <if test="relGoodsCd != null and relGoodsCd != '' ">
 		AND    C.GOODS_CD = #{relGoodsCd}
+		        </if>
 		    </when>
 		    <otherwise>
 		AND    A.REL_GOODS_CD = G.GOODS_CD
+		        <if test="relGoodsCd != null and relGoodsCd != '' ">
 		AND    A.REL_GOODS_CD = #{relGoodsCd}
+		        </if>
 		    </otherwise>
 		</choose>
 		<if test="custNo != null and custNo > 0 ">

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

@@ -140,7 +140,7 @@
 		     , SUB_TEXT3       /*서브텍스트3*/
 		     , SUB_TEXT4       /*서브텍스트4*/
 		     <if test='contentsLoc != null and contentsLoc =="SGNB001"'>
-			 , HTML
+		     , HTML
 		     </if>
 		     , BRAND_GROUP_NO  /*브랜드그룹번호*/
 		     <if test='contentsLoc != null and contentsLoc =="SMM007"'>
@@ -148,11 +148,12 @@
 		     </if>
 		     , BRAND_GROUP_IMG /*브랜드그룹이미지경로*/
 		     , MD_TITLE        /*MD타이틀*/
-			<if test='contentsLoc != null and contentsLoc =="SMM001"'>
-				,PLAN_BRAND_CNT
-				,PLAN_BRAND_GROUP_NO
-				,PLAN_BRAND_GROUP_NM
-			</if>
+		     <if test='contentsLoc != null and contentsLoc =="SMM001"'>
+		     , PLAN_BRAND_CNT
+		     , PLAN_BRAND_GROUP_NO
+		     , PLAN_BRAND_GROUP_NM
+		     , PLAN_GB
+		     </if>
 		FROM   (
 		        SELECT A.CATE_NO                                            /*카테고리번호*/
 		             , A.CONTENTS_LOC                                       /*컨텐츠위치*/
@@ -213,6 +214,7 @@
 		                   FROM TB_PLAN_BRAND C
 		                   WHERE B.PLAN_SQ = C.PLAN_SQ
 		                   ) AS PLAN_BRAND_GROUP_NM
+		                , B.PLAN_GB
 		             </if>
 		        <choose>
 		            <when test='preview != null and preview == "Y"'>

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

@@ -36,6 +36,7 @@
 		SELECT NOTICE_SQ                                     /*공지사항일련번호*/
 		     , NOTICE_TITLE                                  /*공지제목*/
 		     , NOTICE_CONTENT                                /*공지내용*/
+		     , URGENT_YN                                     /*긴급여부*/
 		     , READ_CNT                                      /*조회수*/
 		     , DATE_FORMAT(REG_DT,'%Y.%m.%d')    AS REG_DT   /*등록일자*/
 		     , (SELECT COUNT(1)
@@ -67,7 +68,7 @@
 		WHERE  NOTICE_SQ = #{noticeSq}
 	</select>
 	
-	<!-- 공지사항  조회건수 Update -->
+	<!-- 공지사항 조회건수 Update -->
 	<update id="updateNoticeReadCount" parameterType="Integer">
 		/* TsfNotice.updateNoticeReadCount */
 		UPDATE TB_NOTICE

src/main/webapp/WEB-INF/views/web/callcenter/FaqFormWeb.html

@@ -66,7 +66,7 @@
 									</div>
 								</div>
 								<div class="fold_nav">
-									<ul>
+									<ul id="ulFaqType">
 										<li><a href="#none;" onclick="fnGetList(this);" class="on">전체</a></li>
 										<li th:if="${faqTypeList != null and !faqTypeList.empty}" th:each="oneData, status : ${faqTypeList}">
 											<a href="javascript:void(0);" th:onclick='fnGetList(this, [[${oneData.cd}]]);' th:text="${oneData.cdNm}">상품문의</a>
@@ -208,7 +208,7 @@
 		}
 		
 		$('#faqForm input[name=faqType]').val('');
-		fnGetList();
+		fnGetList($('#ulFaqType>li').eq(0).find('a'));
 	}
 	
 	// FAQ상세팝업 오픈

src/main/webapp/WEB-INF/views/web/callcenter/GoodsQnaFormWeb.html

@@ -36,7 +36,7 @@
 					<div class="cont">
 						<div>
 							<div class="sec_head">
-								<h3>1:1 문의</h3>
+								<h3>상품문의</h3>
 							</div>
 							<div class="sec_body">
 								<div class="history_wrap clear">
@@ -44,15 +44,15 @@
 										<ul>
 											<li>
 												<span>총 문의</span>
-												<a href="javascript:void(0);" onclick="" th:text="${qnaCountInfo.totCnt}">12</a>
+												<a href="javascript:void(0);" onclick="" th:text="${qnaCountInfo.totCnt}" id="qnaTotCnt">12</a>
 											</li>
 											<li>
 												<span>답변 완료</span>
-												<a href="javascript:void(0);" onclick="" th:text="${qnaCountInfo.ansCnt}">8</a>
+												<a href="javascript:void(0);" onclick="" th:text="${qnaCountInfo.ansCnt}" id="qnaAnsCnt">8</a>
 											</li>
 											<li>
 												<span>처리 중</span>
-												<a href="javascript:void(0);" onclick="" th:text="${qnaCountInfo.ingCnt}" class="doing">0</a>
+												<a href="javascript:void(0);" onclick="" th:text="${qnaCountInfo.ingCnt}" class="doing" id="qnaIngCnt">0</a>
 											</li>
 										</ul>
 									</div>
@@ -176,6 +176,14 @@
 						, jsonData
 						, function() {
 							fnGetList();
+							
+							$.get('/callcenter/goods/qna/count/info'
+									, function(result) {
+										$('#qnaTotCnt').html(result.totCnt);
+										$('#qnaAnsCnt').html(result.ansCnt);
+										$('#qnaIngCnt').html(result.ingCnt);
+									}
+								);
 						});
 			}
 		});

src/main/webapp/WEB-INF/views/web/callcenter/NoticeFormWeb.html

@@ -28,7 +28,7 @@
 			</ul> 
 		</div>
 		<div class="wrap">
-			<div class="content faq">
+			<div class="content notice">
 				<div class="cont_body">
 					<!-- CONT-BODY -->
 					<div class="lnb" id="callcenterLnb">
@@ -89,44 +89,28 @@
 	var fnGetListCallback = function(result) {
 		$('#ulNotice').html('');
 
-		// 중요 공지 목록
-		if (result.urgentList != null && result.urgentList.length > 0) {
-			$.each(result.urgentList, function(idx, item) {
-				let tag = '<li class="critical">\n'; // 중요 공지 클래스 critical 추가
-				tag += '	<div class="fold_head">\n';
-				tag += '		<a href="javascript:void(0)">\n';
-				tag += '			<div>\n';
-				tag += '				<span class="fold_state"><em class="important">중요</em></span>\n';
-				tag += '				<span class="fold_category">공지</span>\n';
-				tag += '				<div class="fold_tit">\n';
-				tag += '					<span>' + item.noticeTitle + '</span>\n';
-				tag += '				</div>\n';
-				tag += '				<span class="data">' + item.regDt.toDate("YYYYMMDD").format("YYYY.MM.DD") + '</span>\n';
-				tag += '			</div>\n';
-				tag += '		</a>\n';
-				tag += '	</div>\n';
-				tag += '	<div class="fold_cont" style="display: none;">\n';
-				tag += '		<div class="fold_detail">\n';
-				tag += '			<div>' + item.noticeContent + '</div>\n';
-				tag += '		</div>\n';
-				tag += '	</div>\n';
-				tag += '</li>\n';
-
-				$('#ulNotice').append(tag);
-			});
-		}
-		
-		// 일반 공지 목록
 		if (result.dataList != null && result.dataList.length > 0) {
 			$.each(result.dataList, function(idx, item) {
 				let paging = result.paging.pageable;
-
-				let tag = '<li>\n';
+				let tag = '';
+				
+				if (item.urgentYn == 'Y') {
+					tag += '<li class="critical">\n'; // 중요 공지 클래스 critical 추가
+				} else {
+					tag += '<li>\n';
+				}
+				
 				tag += '	<div class="fold_head">\n';
 				tag += '		<a href="javascript:void(0)">\n';
 				tag += '			<div>\n';
-				tag += '				<span class="fold_state">' + (paging.totalCount - ((paging.pageNo - 1) * paging.pageSize) - idx++) + '</span>\n';
-				tag += '				<span class="fold_category">브랜드</span>\n';
+				
+				if (item.urgentYn == 'Y') {
+					tag += '				<span class="fold_state"><em class="important">중요</em></span>\n';
+				} else {
+					tag += '				<span class="fold_state">' + (paging.totalCount - ((paging.pageNo - 1) * paging.pageSize) - idx++) + '</span>\n';
+				}
+				
+// 				tag += '				<span class="fold_category">공지</span>\n';
 				tag += '				<div class="fold_tit">\n';
 				tag += '					<span>' + item.noticeTitle + '</span>\n';
 				tag += '				</div>\n';
@@ -140,17 +124,13 @@
 				tag += '		</div>\n';
 				tag += '	</div>\n';
 				tag += '</li>\n';
-			
+
 				$('#ulNotice').append(tag);
 			});
-		}
-		
-		if (result.urgentList == null && result.dataList == null) {
+		} else {
 			let tag = '<li>내역이 없습니다.</li>\n';
-			$('#ulNotice').append(tag);
+			$('#ulNotice').html(tag);
 			$('#divNotice').addClass('nodata');
-		} else {
-			$('#divNotice').removeClass('nodata');
 		}
 
 		// Create pagination

src/main/webapp/WEB-INF/views/web/callcenter/OneToOneQnaFormWeb.html

@@ -44,15 +44,15 @@
 										<ul>
 											<li>
 												<span>총 문의</span>
-												<a href="javascript:void(0);" onclick="" th:text="${qnaCountInfo.totCnt}">12</a>
+												<a href="javascript:void(0);" onclick="" th:text="${qnaCountInfo.totCnt}" id="qnaTotCnt">12</a>
 											</li>
 											<li>
 												<span>답변 완료</span>
-												<a href="javascript:void(0);" onclick="" th:text="${qnaCountInfo.ansCnt}">8</a>
+												<a href="javascript:void(0);" onclick="" th:text="${qnaCountInfo.ansCnt}" id="qnaAnsCnt">8</a>
 											</li>
 											<li>
 												<span>처리 중</span>
-												<a href="javascript:void(0);" onclick="" th:text="${qnaCountInfo.ingCnt}" class="doing">0</a>
+												<a href="javascript:void(0);" onclick="" th:text="${qnaCountInfo.ingCnt}" class="doing" id="qnaIngCnt">0</a>
 											</li>
 										</ul>
 									</div>
@@ -259,6 +259,14 @@
 						, jsonData
 						, function() {
 							fnGetList();
+							
+							$.get('/callcenter/onetoone/qna/count/info'
+								, function(result) {
+									$('#qnaTotCnt').html(result.totCnt);
+									$('#qnaAnsCnt').html(result.ansCnt);
+									$('#qnaIngCnt').html(result.ingCnt);
+								}
+							);
 						});
 			}
 		});

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

@@ -37,14 +37,15 @@
 										<div class="swiper-slide">
 											<th:block th:if="${ContentsData.imgPath1!=null && ContentsData.imgPath1!=''}">
 												<div class="txtWrap">
-
 													<th:block th:if="${ContentsData.strVar5!=null && ContentsData.strVar5!=''}">
-														<p class="vrt_txt" th:if="${ContentsData.strVar5=='P'}" th:text="${ContentsData.planBrandGroupNm}"></p>
-														<p class="vrt_txt" th:if="${ContentsData.strVar5!='P'}" >EVENT</p>
+														<p class="vrt_txt" th:if="${ContentsData.strVar5=='P' and ContentsData.planBrandCnt<2}" th:text="${ContentsData.planBrandGroupNm}"></p>
+														<p class="vrt_txt" th:if="${ContentsData.strVar5=='P' and ContentsData.planBrandCnt>1}" th:text="${ContentsData.planBrandGroupNm+' 외'}"></p>
+														<p class="vrt_txt" th:if="${ContentsData.strVar5!='P' or (ContentsData.strVar5=='P' and ContentsData.planGb=='E') }" >EVENT</p>
 													</th:block>
 													<dl th:class="${ContentsData.strVar7=='BLACK'?'':'w'}">
-														<dt th:if="${ContentsData.strVar5=='P'}" th:text="${ContentsData.planBrandGroupNm}"></dt>
-														<dt th:if="${ContentsData.strVar5!='P'}" >EVENT</dt>
+														<dt th:if="${ContentsData.strVar5=='P' and ContentsData.planBrandCnt<2}" th:text="${ContentsData.planBrandGroupNm}"></dt>
+														<dt th:if="${ContentsData.strVar5=='P' and ContentsData.planBrandCnt>1}" th:text="${ContentsData.planBrandGroupNm+' 외'}"></dt>
+														<dt th:if="${ContentsData.strVar5!='P' or (ContentsData.strVar5=='P' and ContentsData.planGb=='E') }" >EVENT</dt>
 														<dd class="mainTitle">
 															<input type="hidden" name="mainTitlee" th:value="${ContentsData.strTitle1}"/>
 														</dd>

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

@@ -424,7 +424,7 @@
 .pd_detail > .inner.wide{padding-left:0!important; padding-right:0!important; padding-bottom:0;}
 
 .pd_detail .movbox {position: relative;height: 0;padding-top: 100%;padding-bottom:50.25%;overflow: hidden;transition: all 300ms ease;transform: scale(1);}
-.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;}
+.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;pointer-events:none;}
 
 
 .pd_detail .thumb_box{position: relative;}
@@ -659,7 +659,7 @@
 .riview_box .best_review a .lap > .pic.none + div.txt_best_review{padding-left:0;}
 .riview_box .best_review a .lap > .pic + div.txt_best_review{padding-left:1.6rem;}
 .riview_box .best_review a .lap > div.txt_best_review p{height:6.4rem; margin-top: 0.8rem; overflow:hidden; line-height:2.1333rem; color:#666; font-size:1.3rem; font-weight:200; display:-webkit-box; text-overflow:ellipsis; -webkit-line-clamp:3; -webkit-box-orient:vertical;}
-.riview_box .best_review a .star_score {display:block; margin-bottom:0.7rem; vertical-align:middle; image-rendering:pixelated;}
+.riview_box .best_review a .star_score {display:block; margin-bottom:0.7rem; image-rendering:pixelated;}
 .riview_box .best_review a .star_score .star{vertical-align:middle;}
 .riview_box .best_review a .pic .thumb {display:block; padding-top:100%; background-repeat:no-repeat; background-position:50% 50%; background-size:cover;}
 .riview_box .best_review a .pic .thumb.mov::after {content:''; position:absolute; left:0; top:0; width:100%; height:100%; background:rgba(0,0,0,0.3) url('/images/mo/ico_play.png') no-repeat 50% 50%; z-index:2;}
@@ -692,7 +692,7 @@
 .pd_detail .pd_recommend .area_slider .page .pic {position:relative;}
 .pd_detail .pd_recommend .area_slider .page .pic span.thumb {display:block; width:100%; height:0; padding-top:100%; background-color:#f5f5f5; background-repeat:no-repeat; background-position:50% 50%; background-size:contain;}
 .pd_detail .pd_recommend .area_slider .page .item_wrap {}
-.pd_detail .pd_recommend .area_slider .page .item_wrap .item_area {position:relative; display:block; height:100%; width:100%; padding:1.0rem; box-sizing:border-box; vertical-align:middle;}
+.pd_detail .pd_recommend .area_slider .page .item_wrap .item_area {position:relative; display:block; height:100%; width:100%; padding:1.0rem; box-sizing:border-box;}
 .pd_detail .pd_recommend .area_slider .page .item_wrap .item_area h5 {margin: 0 0 3.0rem;color:#222;font-size:2.0rem;font-weight:500;}
 .pd_detail .pd_recommend .area_slider .page .item_wrap .item_area h5 span {color:#666; font-weight:200;}
 .pd_detail .pd_recommend .area_slider .page .item_wrap .item_area .li_item {height:calc(100% - 14.0rem); overflow-y:auto;}
@@ -814,7 +814,7 @@ header .htop.trans{position:absolute; background:transparent !important;}
 .cs .fold_head .fold_tit .lap2 span{font-weight:500;}
 .cs .fold_head .fold_state{padding:0.2rem 0.3rem;}
 .cs .fold_head .data{font-family: 'LATO', 'Noto Sans kr', sans-serif;}
-.Purchase_pop .select_custom .combo .list>li{padding:1.2rem; line-height:2rem; word-wrap: break-word;}
+.Purchase_pop .select_custom .combo .list>li{padding:1.2rem 4.2rem 1.2rem 1.2rem; line-height:2rem; word-wrap: break-word;}
 /* 210415 */
 .dp .popup_box .button_list.clear button{width:100% !important;}
 .dp .open_categori a{display: inline-block;font-size: 1.2rem;font-weight: 300;padding-right: 1.4rem;background: url(/images/mo/ico_sort_arrow.png) no-repeat right center;background-size: 0.7rem 0.43rem;}
@@ -822,30 +822,14 @@ header .htop.trans{position:absolute; background:transparent !important;}
 /*.dp .dp_Bulletship .inner:first-child{margin-bottom:0; padding-bottom:0;}*/
 .dp .items_option{padding-top:0; margin:0 2rem;}
 .dp .items_option #filter{height:4.5rem; border:0.1rem solid #dddddd; font-size:1.2rem; color:#666666; width:100%;line-height:4.5rem; padding:0 1.5rem; background-color:#fff;}
-.dp .items_option.fix{position:fixed; top:0; z-index:999; width:100%; left:0; margin:0}
+.dp .items_option.fix{position:fixed; top:0; z-index:999; width:100%; left:0; margin:0; box-shadow:rgb(0 0 0 / 30%) 0px 3px 15px 0px;}
 .dp .dp_listItems_wrap .items_option #filter{font-size:1.2rem; color:#666666; width:100%;line-height:4.5rem; padding:0 1.5rem; background-color:#fff;}
 .Purchase_pop .select_custom .combo .list>li[data-soldout="true"]::after{top:1rem}
 /* 210416 */
 .dp .filter_box .filter_body .daps1{position:sticky; top:0; background-color:#fff; z-index: 9999;}
-.deal_list_select .list>li[aria-disabled="true"] {
-	text-decoration: line-through;
-    background: #fff;
-    color: #bbb;
-	pointer-events: none;
-}
-.deal_list_select .list>li[data-soldout="true"] {
-	pointer-events: none;
-}
-.deal_list_select .list>li[data-soldout="true"]::after {
-	content: '품절';
-    display: inline-block;
-    font-size: 12px;
-    color: #bbbbbb;
-    position: absolute;
-    right: 15px;
-    top: 0;
-    bottom: 0;
-}
+.deal_list_select .list>li[aria-disabled="true"] {text-decoration: line-through;background: #fff;color: #bbb;pointer-events: none;}
+.deal_list_select .list>li[data-soldout="true"] {pointer-events: none;}
+.deal_list_select .list>li[data-soldout="true"]::after {content: '품절';display: inline-block;font-size: 12px;color: #bbbbbb;position: absolute;right: 15px;top: 0;bottom: 0;}
 .dp .mid_banner{margin-top:-6rem}
 /* 210419 */
 .pd_qnalist_pop .ui_foot{padding:0 2rem}
@@ -861,6 +845,29 @@ header .subs .dp_list_btn_gnbs span i {display: block;position: absolute;left: 0
 header .subs .dp_list_btn_gnbs span {display: block;width: 24px;height: 24px;margin: 0 auto;position: relative;}
 header .subs .dp_list_btn_gnbs span i {background: url(/images/mo/ico_btn_more.png) no-repeat;background-size: 1.3rem 0.733rem;background-position: 50% 50%;}
 header .subs .dp_list_btn_gnbs.on span i {transform: rotate(-180deg);-webkit-transform: rotate(-180deg);}
+/* 210422 */
+/* 플롯팅 메뉴 > 구매하기 */
+.brand_floormenu{position:fixed; bottom:0; left:0; width:100%; height:5.8rem; line-height:5.8rem; z-index:20;}
+.brand_floormenu > div{float:left; color:#fff; text-align:center;}
+.brand_floormenu > div:nth-child(1){width:37%;}
+.brand_floormenu > div:nth-child(2){width:63%; background-color:#fd4802;}
+.brand_floormenu button{display:block; width:100%; height:5.8rem; line-height:5.8rem; font-size:1.6rem; font-weight:500;}
+.brand_floormenu .share_like{overflow:hidden;}
+.brand_floormenu .share_like > button{float:left; width:100%; font-size:0; text-indent:-999999px;}
+.brand_floormenu .share_like > button.refresh{background:#000 url(/images/mo/dp_refresh.png) center center no-repeat; background-color:#222222;}
+/*.brand_floormenu .share_like > button.like{background:#000 url(/images/mo/ico_floorbtn_like.png) center center no-repeat; background-size:2rem;}*/
+.brand_floormenu .prd_buy > .buying{display:block; background-color:#fd4802;}
+.brand_floormenu .prd_buy > .cantbuying{display:none;}
+.brand_floormenu.soldout .prd_buy > .buying{display:none;}
+.brand_floormenu.soldout .prd_buy > .cantbuying{display:block; background-color:#ddd;}
+.dp_lookbook ~ .popup_box .popup_con{margin-bottom:5rem}
+.dp_listItems_cont.type1 .open_categori{background-color:#fff; padding: 1.6rem 2rem;}
+/* 210423 */
+.br .brand_si{margin-top:0.1rem}
+.br .brand_si .swiper-wrapper{height:0;}
+.br .brand_si .swiper-wrapper .swiper-slide:nth-child(odd){border-bottom:0rem none;}
+.Purchase_pop .select_custom .opt_price{font-size:1.2rem; color:#888888}
+.select_custom .combo .list>li[aria-disabled="true"] .opt_price{color:#bbb !important}
 
 
 
@@ -1142,7 +1149,7 @@ header .subs .dp_list_btn_gnbs.on span i {transform: rotate(-180deg);-webkit-tra
 /* pd_pop > 상품문의 페이지 */
 .modal.pd_pop.pd_qnalist_pop .modal-header {position:fixed; top:0; left:0; right:0; width:100%; height:auto; border-bottom:1px solid #eee !important; box-sizing:border-box; background:#fff; z-index:11; box-sizing:border-box;}
 .modal.pd_pop.pd_qnalist_pop .modal-body{position:relative; margin:auto; padding:9.3rem 0 3rem;}
-.modal.pd_pop.pd_qnalist_pop .ui_row{margin:0 -1.33rem!important 0; width:auto;}
+.modal.pd_pop.pd_qnalist_pop .ui_row{margin:0 -1.33rem!important; width:auto;}
 .modal.pd_pop.pd_qnalist_pop .pd_qnalist > .btn_group_flex{position:fixed; width: 100%; bottom: 0; margin-top: 0;}
 .pd_qnalist .qna_list .foldGroup {margin-bottom:0;}
 .pd_qnalist .qna_list {margin-top:3rem;}
@@ -1269,7 +1276,7 @@ header .subs .dp_list_btn_gnbs.on span i {transform: rotate(-180deg);-webkit-tra
 .pd_review .area_rv_average .average .part_average dl dt {float:left; padding-left:0.7rem; width:7.2rem; font-size:1.2rem; box-sizing:border-box;}
 .pd_review .area_rv_average .average .part_average dl dd {position:relative; float:left; width:calc(100% - 7.2rem); padding-right:4.7rem; box-sizing:border-box;}
 .pd_review .area_rv_average .average .part_average dl dd::after {content:''; clear:both; display:block;}
-.pd_review .area_rv_average .average .part_average dl dd span {float:left; display:inline-block;}
+.pd_review .area_rv_average .average .part_average dl dd span {float:left; /*display:inline-block;*/}
 .pd_review .area_rv_average .average .part_average dl dd .ratio {width:100%; height:5px; margin-top:6px; background:#f5f5f5; overflow:hidden;}
 .pd_review .area_rv_average .average .part_average dl dd .ratio .progbar {display:inline-block; position:relative; height:8px; background:#ddd; vertical-align:top; margin-left:0}
 .pd_review .area_rv_average .average .part_average dl dd .ratio .progbar::after {content:''; position:absolute; right:-8px; top:0; width:0; height:0; border:4px solid #ddd; border-bottom-color:transparent;border-right-color:transparent;}
@@ -1682,7 +1689,7 @@ header .subs .dp_list_btn_gnbs.on span i {transform: rotate(-180deg);-webkit-tra
   color: #222;
   font-weight: 300;
   word-break: keep-all;
-}}
+}
 
 /* 베스트 - dp_best */
 .dp .dp_best .count_wrap{padding-top:0;}
@@ -1986,7 +1993,7 @@ header .subs .dp_list_btn_gnbs.on span i {transform: rotate(-180deg);-webkit-tra
 .filter_body > ul > li .filter_content [class*="pdColor"] {position: relative; display: inline-block; width:2.4rem; height: 2.4rem; cursor: pointer;}
 .filter_body > ul > li .colorbox li [class*="pdColor"]:before {content: ""; display: inline-block; width: 100%; height: 100%; border-radius: 50%; box-sizing: border-box;}
 .filter_body > ul > li.color .daps1 span [class*="pdColor"]{position:relative; display:inline-block; margin-left:0.5rem; width:1.2rem; height:1.2rem; border-radius:50%; overflow:hidden;}
-.filter_body > ul > li.color .daps1 span [class*="pdColor"]:before{content:''; position:absolute; top:0; left:0; display:block; width:100%; height:100%; cursor: pointer; vertical-align:top;}
+.filter_body > ul > li.color .daps1 span [class*="pdColor"]:before{content:''; position:absolute; top:0; left:0; display:block; width:100%; height:100%; cursor: pointer;}
 .pdColor-color01::before {background-color: #000;}
 .pdColor-color02::before {background-color: #7f7f7f;}
 .pdColor-color03::before {background-color: #ff0306;}
@@ -2221,7 +2228,7 @@ header .subs .dp_list_btn_gnbs.on span i {transform: rotate(-180deg);-webkit-tra
 .htop.br_lookbook h1 { color: #fff !important; margin: 1rem 0 0 2rem;}
 .htop.br_lookbook .btn_back { margin: 1.4rem 0 0 0;}
 .htop.br_lookbook .btn_back img { width: 1.5rem; height: 1rem;}
-.htop.br_lookbook .button_wrap {height: 5.5rem; display: inline-block; float: right; padding: 1.6rem 0 0; margin: 0 2.5rem 0 0; box-sizing: border-box;}
+.htop.br_lookbook .button_wrap {height: 5.5rem; /*display: inline-block;*/ float: right; padding: 1.6rem 0 0; margin: 0 2.5rem 0 0; box-sizing: border-box;}
 .htop.br_lookbook .button_wrap .br_search { margin: 0 2.5rem 0 0; width: 2.3rem; height: 2.4rem;}
 .htop.br_lookbook .button_wrap .br_store img:nth-child(1) { width: 1.8rem; height: 2.2rem; }
 .htop.br_lookbook .button_wrap .br_store span { width: 2.1rem; height: 1.5rem; position: absolute; top: 1.2rem; right: 1.5rem; background: #fd4802; border-radius: 0.8rem; font-size: 0.8rem; color: #fff; line-height: 1.6rem;}
@@ -2265,10 +2272,10 @@ header .subs .dp_list_btn_gnbs.on span i {transform: rotate(-180deg);-webkit-tra
 .br_search_wrap .swiper-container { width: 100%; height: 21.4rem; margin-left: auto; margin-right: auto; }
 .br_search_wrap .swiper-slide { text-align: center; font-size: 1.8rem; background: #fff; height: calc((100% - 30px) / 2); /* Center slide text vertically--> */ display: -webkit-box; display: -ms-flexbox; display: -webkit-flex; display: flex; -webkit-box-pack: center; -ms-flex-pack: center; -webkit-justify-content: center; justify-content: center; -webkit-box-align: center; -ms-flex-align: center; -webkit-align-items: center; align-items: center; }
 .br_search_wrap .swiper-slide {width: 12rem; height: 8rem;}
-.br_search_wrap .swiper-slide {border-bottom: 0.1rem solid #eeeeee; border-right: 1px solid #eeeeee;}
+.br_search_wrap .swiper-slide {border-bottom: 0.1rem solid #eeeeee; border-right: 0.1rem solid #eeeeee; border-top: 0.1rem solid #eeeeee;}
 .br_search_wrap .swiper-slide:nth-child(1) {border-left: 0.1rem solid #eeeeee;}
 .br_search_wrap .swiper-slide:nth-child(2) {border-left: 0.1rem solid #eeeeee;}
-.br_search_wrap .swiper-slide > div { width: 12.6rem; height: 8rem; margin: 0; padding: 2.5rem 2rem 0; box-sizing: border-box;}
+.br_search_wrap .swiper-slide > div { width: 12.6rem; margin: 0; box-sizing: border-box; padding:0.6rem;}
 .br_search_wrap .swiper-pagination-bullet-active { background: #fd4802;}
 .br_search_wrap .hmenu .line { width: 100%; height: 1.4rem; background: #f5f5f5; margin: 1rem 0 0;}
 .br_search_wrap .hmenu .brand_si .swiper-pagination-bullet{margin-right:0.8rem;}
@@ -2291,7 +2298,7 @@ header .subs .dp_list_btn_gnbs.on span i {transform: rotate(-180deg);-webkit-tra
 /* 브랜드 - br_search */
 .htop.br { overflow: hidden;}
 /* 제거 예정/ 공통으로 교체 */
-.htop.br .button_wrap {height: 5.5rem; display: inline-block; float: right; padding: 1.6rem 0 0; margin: 0 2.5rem 0 0; box-sizing: border-box;}
+.htop.br .button_wrap {height: 5.5rem; /*display: inline-block;*/ float: right; padding: 1.6rem 0 0; margin: 0 2.5rem 0 0; box-sizing: border-box;}
 .htop.br .button_wrap .br_search { margin: 0 2.5rem 0 0; }
 .htop.br .button_wrap .br_store img:nth-child(1) { height: 2rem; }
 .htop.br .button_wrap .br_store span { width: 2.1rem; height: 1.5rem; position: absolute; top: 1.2rem; right: 1.5rem; background: #fd4802; border-radius: 0.8rem; font-size: 0.8rem; color: #fff; line-height: 1.6rem;}

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

@@ -29,14 +29,50 @@ $(document).ready(function() {
         });
 
         var lastScrollTop = 0;
+        $(window).on('mousewheel',function(e){
+            if($('body').hasClass('gnb_on') === false && $('main').hasClass('pd') === false){
+                var wheel = e.originalEvent.wheelDelta;
+                if(wheel>0){
+                    //스크롤 올릴때
+                    $(".tabbar").addClass('fixed');
+                    $(".gnb").addClass('fixed');
+                    $(".pnb_mo").addClass('fixed');
+                    $("header").css("display", "block");
+                    $("header").css("position", "fixed");
+                    if($(".gnb").hasClass("fixed")){
+                        $("header").css("display", "none");
+                    }
+                    if($(".pnb_mo").hasClass("fixed")){
+                        $("header").css("display", "none");
+                    }
+                    if($(window).scrollTop() < 10){
+                        $(".gnb").css('position', 'relative');
+                        $(".pnb_mo").css('position', 'relative');
+                        $("header").css("position", "relative");
+                        $("header").css("display", "block");
+                    } else {
+                        $(".gnb").css('position', 'fixed');
+                        $(".pnb_mo").css('position', 'fixed');
+                    }
+                } else {
+                    //스크롤 내릴때
+                    $(".tabbar").removeClass('fixed');
+                    $(".pnb_mo").addClass('fixed');
+                    $(".pnb_mo").css('position', 'fixed');
+                    $(".gnb").addClass('fixed');
+                    $(".gnb").css('position', 'fixed');
+                    $("header").css("display", "none");
+                }
+            }
+        });
         $(window).scroll(function (event) {
 
             // header height 가 아닌, 스크롤 감지로 변경할 것
-            if ($(window).scrollTop() > $("header").height()) {
-                $(".tabbar").removeClass('fixed');
-            } else {
-                $(".tabbar").addClass('fixed');
-            }
+            //if ($(window).scrollTop() > $("header").height()) {
+            //    $(".tabbar").removeClass('fixed');
+            //} else {
+            //    $(".tabbar").addClass('fixed');
+            //}
 
             if ($(window).scrollTop() > $("header").height()) {
                 $(".btn_top").animate({
@@ -55,30 +91,30 @@ $(document).ready(function() {
             }
 
             // 210409_스크롤시 헤더 백그라운드 흰색
-            var st = $(this).scrollTop();
-            if($('header').hasClass("main") !== true){
-                if (st > lastScrollTop){
-                    $(".app .gnb").css("position", "fixed");
-                    $(".htop").css("background", "#fff");
-                    $(".app .gnb .btn-expand").css("position", "fixed");
-                    $(".tabbar").removeClass("fixed");
-                } else {
-                    $(".app .gnb").css("position", "fixed");
-                    $(".htop").css("background", "#fff");
-                    $(".app .gnb .btn-expand").css("position", "fixed");
-                    $(".tabbar").addClass("fixed");
-                    setTimeout(function(){
-                        if($(window).scrollTop() === 0){
-                            $(".app .gnb").css("position", "relative");
-                            $(".app .gnb .btn-expand").css("position", "absolute");
-                        }
-                    },300)
-                }
-                if(st < 10) {
-                    $(".htop").css("background", "transparent");
-                }
-                lastScrollTop = st;
-            }
+            //var st = $(this).scrollTop();
+            //if($('header').hasClass("main") !== true){
+            //    if (st > lastScrollTop){
+            //        $(".app .gnb").css("position", "fixed");
+            //        $(".htop").css("background", "#fff");
+            //        $(".app .gnb .btn-expand").css("position", "fixed");
+            //        $(".tabbar").removeClass("fixed");
+            //    } else {
+            //        $(".app .gnb").css("position", "fixed");
+            //        $(".htop").css("background", "#fff");
+            //        $(".app .gnb .btn-expand").css("position", "fixed");
+            //        $(".tabbar").addClass("fixed");
+            //        setTimeout(function(){
+            //            if($(window).scrollTop() === 0){
+            //                $(".app .gnb").css("position", "relative");
+            //                $(".app .gnb .btn-expand").css("position", "absolute");
+            //            }
+            //        },300)
+            //    }
+            //    if(st < 10) {
+            //        $(".htop").css("background", "transparent");
+            //    }
+            //    lastScrollTop = st;
+            //}
             
 
             //var posiGap = $(window).scrollTop();
@@ -753,7 +789,7 @@ $(document).ready(function () {
             $('#itemqna_cnt').html("<em class='c_primary'>"+content.length+"</em>/500자");//글자수 실시간 카운팅
         
             if (content.length > 200){
-                alert("최대 500자까지 입력 가능합니다.");
+                mcxDialog.alert("최대 500자까지 입력 가능합니다."); //210420_수정 : 시스템 alert -> dialog 변경.
                 $(this).val(content.substring(0, 500));
                 $('#itemqna_cnt').html("<em class='c_primary'>500</em>/500자");
             }

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

@@ -40,16 +40,16 @@ tab_event();
 
 // 5초간 동작 없을 시 top으로 이동
 $(document).ready(function () {
-  var time;
-  $(document).bind('touchstart', function (e) {
-    clearInterval(time);
-    e.stopPropagation();
-  })
-  $(document).bind('touchend', function (e) {
-    time = setInterval(function () {
-      $('html, body').animate({scrollTop : 0}, 400);
-    }, 5000000);
-  })
+  //var time;
+  //$(document).bind('touchstart', function (e) {
+  //  clearInterval(time);
+  //  e.stopPropagation();
+  //})
+  //$(document).bind('touchend', function (e) {
+  //  time = setInterval(function () {
+  //    $('html, body').animate({scrollTop : 0}, 400);
+  //  }, 5000000);
+  //})
   //최신상품순(팝업)을 눌렀을 때 top으로 이동하는 기능 제거
   $(".select_dress").bind('touchend', function (e) {
     setTimeout(function(){

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

@@ -204,8 +204,6 @@ section::after, .ui_row::after, .btn_group_block::after{content: '';display: blo
 }
 
 
-
-
 /* textarea */
 textarea {background-color:transparent; border:1px solid #d7d7d7; width:99%; overflow-y:auto}
 .textarea_full {width:832px; padding:10px}
@@ -635,6 +633,10 @@ content: "〉";font-size: 12px;padding-left: 8px;
   margin-left: 0;
 }
 
+/* page loading */
+#load {width: 100%;height: 100%;top: 0;left: 0;position: fixed;display: block;text-align: center;opacity: 0.6;background: #ffffff;background-image: url('/images/pc/movloading.gif');background-repeat: no-repeat;background-position: 50% 50%;background-size: 37px 36px;z-index: 99999;}
+
+
 /* pageNav */
 .pageNav {display: table; margin-left: auto; margin-right: auto;}
 .pageNav:after {display: table;clear: both;content: " ";}
@@ -801,6 +803,7 @@ content: "〉";font-size: 12px;padding-left: 8px;
 .itemPic .pd_mov {position: absolute;width: 100%;height: auto;top: 50%;left: 0px;transform: translateY(-50%);}
 .itemPic .pd_mov {z-index: 2;height: 100%;}
 .itemPic .pd_img {z-index: 1;transition: 0.5s;}
+.itemPic .pd_img::after {content: '';display: block; height: 100%;width: 100%;background: #333;}
 /* .itemPic .pd_img {position: absolute;width: 100%;width: auto; height: auto;max-height: 500px;top: 50%;left: 50%;transform: translate(-50%,-50%);} */
 .itemOpt{z-index:3; pointer-events:none;position: absolute;bottom: -120px; left: 0; right: 0; width: 100%; height:111px;padding: 32px 0; text-align:center; color: #fff; background: rgb(0 0 0 / 0.8); }
 .itemOpt p{font-size: 12px;line-height: 1.2;padding-bottom: 15px;}
@@ -1296,7 +1299,7 @@ input[type="file"] {
 .quick_menu_group .area > div:first-child span:first-child a{margin-left:0}
 .quick_menu_group .area > div:first-child span:first-child a:after{display:none}
 .quick_menu_group .area > div:first-child span a:after{position:absolute;top:13px;left:0;width:1px;height:13px;background:#959596;content:''}
-.quick_menu_group .inr a{margin-left:16px;color:#eeeeee;}*/
+.quick_menu_group .inr a{margin-left:16px;color:#eeeeee;}
 
 
 
@@ -1309,12 +1312,13 @@ input[type="file"] {
 		margin-top: 26px !important; 
 		line-height: 0.6 !important; 
 	}
+}
 	.pageNav .disabled a {background-position: 0 9px !important; }
 	.pageNav .disabled.prev a {background-position: -23px 9px !important; }
 	.pageNav .next a,.pageNav > li:last-child a {background-position:-64px 9px !important; }
 	.pageNav .next a {background-position: -47px 9px !important; }
 	.filter_content .sort#tap01 ul li.noDepth.on > a::after {top:8px !important;}
-}
+
 
 /* 제거예정 */
 

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

@@ -84,19 +84,10 @@ $(document).ready(function() {
 				var fileReader = new FileReader();
 				fileReader.onload = (function(e) {
 					var file = e.target;
-					if(file.result.indexOf("video/mp4") > -1){
-						$("<span class=\"pics\">" +
-						"<ifram class=\"picsThumbs\" src=\"" + e.target.result + "\" />" +
-						"<br/><span class=\"removes\">Removes image</span>" +
-						"</span>").insertAfter("#fileAdd");
-					}else{
-						$("<span class=\"pics\">" +
+					$("<span class=\"pics\">" +
 						"<img class=\"picsThumbs\" src=\"" + e.target.result + "\" title=\"" + file.name + "\"/>" +
 						"<br/><span class=\"removes\">Removes image</span>" +
 						"</span>").insertAfter("#fileAdd");
-					}
-					
-					
 					$(".removes").click(function(){
 						$(this).parent(".pics").remove();
 					});