Merge branch 'develop' into bin2107

.gitignore

@@ -14,3 +14,4 @@ target/
 ### MacOS ###
 .DS_Store
 META-INF/context.xml
+/src/test/

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

@@ -146,7 +146,7 @@ public class TsfPlanningController extends TsfBaseController {
 	@GetMapping("/detail/form")
 	public ModelAndView PlanningDetailForm(Plan plan) {
 		ModelAndView mav = new ModelAndView();
-		
+		plan.setFrontGb(TsfSession.getFrontGb());
 		// 접근 불가능한 기획전 메시지 조회
 		String inaccessibleMsg = planningService.getInaccessiblePlanningMessage(plan.getPlanSq());
 		if (StringUtils.isNotBlank(inaccessibleMsg)) {
@@ -164,7 +164,6 @@ public class TsfPlanningController extends TsfBaseController {
 		Coupon coupon = new Coupon();
 
 		plan.setSiteCd(TscConstants.Site.STYLE24.value());
-		plan.setFrontGb(TsfSession.getFrontGb());
 		plan.setCustGb(TsfSession.getCustGb());
 		review.setFrontGb(TsfSession.getFrontGb());
 		review.setCustGb(TsfSession.getCustGb());

src/main/webapp/WEB-INF/views/mob/cart/CartListAjaxFormMob.html

@@ -1244,7 +1244,7 @@
 			// 페이지 이동
 			function fnGoToGoodsDetail(goodsCd, ordCanYn) {
 				if(ordCanYn == "Y" || !ordCanYn) {
-					cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
+					cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd + "&colorCd=&ithrCd=IN18_01");
 				} else {
 					mcxDialog.alert("현재 구매가 불가능한 상품입니다.");
 				}

src/main/webapp/WEB-INF/views/mob/error/InaccessMob.html

@@ -53,7 +53,8 @@
 				<p th:text="${inaccessibleMsg}">모바일웹에서만 접근이 가능합니다.</p>
 			</div>
 			<div class="btn_group">
-				<button class="btn btn_dark" onclick="fnGoToHome();"><span>홈으로 이동</span></button>
+				<button class="btn btn_default" onclick="fnGoToHome();"><span>홈으로 이동</span></button>
+				<button class="btn btn_dark" onclick="javascript:history.back(-1);"><span>목록으로 이동</span></button>
 			</div>
 		</div>
 	</div>

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

@@ -96,38 +96,38 @@
 			</div>
 
 		</div>
-		<form id="secedeCustForm" class="form_wrap" action="/mypage/customer/secede/complete/form" method="post">
-			<div class="inner">
-				<div class="titWrap">
-					<div class="">보안을 위해 회원님의<br>아이디 및 비밀번호를 다시 확인 합니다.</div>
+		<div class="inner">
+			<form id="secedeCustForm" action="/mypage/customer/secede/complete/form" method="post">
+			<div class="titWrap">
+				<div class="">보안을 위해 회원님의<br>아이디 및 비밀번호를 다시 확인 합니다.</div>
+			</div>
+			<div class="tblWrap">
+				<div class="tbl">
+					<table>
+						<colgroup>
+							<col width="*">
+						</colgroup>
+						<tbody>
+							<tr>
+								<td>
+									<div class="form_field">
+										<input type="text" id="custId" name="custId" class="form_control" readonly="readonly"/>
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<td>
+									<div class="form_field">
+										<input type="password" id="passwd" name="passwd" class="form_control" placeholder="비밀번호를 입력해주세요." minlength="8" maxlength="20"/>
+									</div>
+								</td>
+							</tr>
+						</tbody>
+					</table>
 				</div>
-					<div class="tblWrap">
-						<div class="tbl">
-							<table>
-								<colgroup>
-									<col width="*">
-								</colgroup>
-								<tbody>
-									<tr>
-										<td>
-											<div class="form_field">
-												<input type="text" id="custId" name="custId" class="form_control" readonly="readonly"/>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<td>
-											<div class="form_field">
-												<input type="password" id="passwd" name="passwd" class="form_control" placeholder="비밀번호를 입력해주세요." minlength="8" maxlength="20"/>
-											</div>
-										</td>
-									</tr>
-								</tbody>
-							</table>
-						</div>
-					</div>
 			</div>
-		</form>
+			</form>
+		</div>
 		<div class="inner">
 			<div class="announce_txt">
 				<div class="announce_list">

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

@@ -129,7 +129,7 @@
 				</div>
 				</th:block>
 				
-				<th:block th:if="${#lists.size(planCornerList)}>0">
+				<th:block th:if="${#lists.size(planCornerList)>0 && planInfo.cornerNmDispYn == 'Y'}">
 				<div class="inner" id="cornerInner">
 					<div class="dp_listItems_wrap typeSelector">
 						<div class="items_option">
@@ -151,7 +151,7 @@
 								<div class="swiper-slide">
 									<a th:onclick="cfnGoToPlanDetail([[${PlanData.planSq}]])" class="dp_lookbook_item" tabindex="0">
 										<div class="img">
-											<img th:src="${@environment.getProperty('upload.image.view')+PlanData.mainImg}" alt="${PlanData.planNm}">
+											<img th:src="${@environment.getProperty('upload.image.view')+PlanData.mainImg+'?RS=960'}" alt="${PlanData.planNm}">
 										</div>
 										<div class="txt">
 											<div class="tit" th:text="${PlanData.planNm}"></div>
@@ -174,7 +174,7 @@
                     </div>
                     <div class="popup_con">
                         <div class="button_list clear">
-                        	<th:block th:if="${planCornerList!=null}" th:each="a, cornerStat : ${planCornerList}">
+                        	<th:block th:if="${planCornerList!=null && planInfo.cornerNmDispYn == 'Y'}" th:each="a, cornerStat : ${planCornerList}">
                            	 <button type="button" th:onclick="fnCornerClick([[${cornerStat.index+1}]], [[${a.cornerNm}]])"><span th:text="${a.cornerNm}"></span></button>
                             </th:block>
                         </div>
@@ -469,7 +469,7 @@ if (notice.length>0) {
 	$("#G082_60").append(html);
 }
 
-if(planCornerList.length>0){
+if(planCornerList.length>0 && plan.cornerNmDispYn == "Y"){
 	
 	var html = '';
 	$.each(planCornerList, function(idx, item)  {
@@ -1035,7 +1035,7 @@ $(document).ready(function(){
 	if(plan.planGb == "P"){
 		$('#htopTitle').text('기획전');
 	}else{
-		$('#htopTitle').text('이벤트');
+		$('#htopTitle').text('이벤트/혜택');
 	}
 	ajaxReplyList();
 	
@@ -1108,11 +1108,11 @@ $(document).ready(function(){
 		centerMode: true,
 	});
 	
-	// 다른기획전
+	/* SLIDE - 다른 기획전,이벤트 보기 */
 	var other_promotion_slide = new Swiper('.other_promotion_slide .swiper-container', {
-		slidesPerView: 2,
+		slidesPerView: 'auto',
 		spaceBetween: 8,
-		centerMode: true,
+		centerMode:true,
 	});
 	
 	 $(document).on('click','.popup_box .button_list button',function(){

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

@@ -2,7 +2,7 @@
 <html lang="ko"
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-	layout:decorator="mob/common/layout/DefaultLayoutMob">
+	layout:decorator="mob/common/layout/SubLayoutMob">
 <!--
  *******************************************************************************
  * @source  : PlanningEventAttendFormMob.html
@@ -101,10 +101,10 @@
 									<li th:if="${a.benefitGb == 'A'  and ( a.basDays > 0 and a.pntAmt > 0)}">
 										<div class="benfit_coupon">
 											<th:block th:if="${a.dcWay == '%'}">
-												<span th:text="${a.basDays}"></span> 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span> + <span class="c_primary"><em th:text="${a.dcVal}"></em>%</span> <strong>할인 쿠폰</strong>
+												<span th:text="${a.basDays}"></span>일 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span> + <span class="c_primary"><em th:text="${a.dcVal}"></em>%</span> <strong>할인 쿠폰</strong>
 											</th:block>
 											<th:block th:if="${a.dcWay == '원'}">
-												<span th:text="${a.basDays}"></span> 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span> + <span class="c_primary"><em th:text="${a.dcVal}"></em>원</span> <strong>할인 쿠폰</strong>
+												<span th:text="${a.basDays}"></span>일 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span> + <span class="c_primary"><em th:text="${a.dcVal}"></em>원</span> <strong>할인 쿠폰</strong>
 											</th:block>
 										</div>
 									</li>
@@ -141,7 +141,7 @@
 								<div class="swiper-slide">
 									 <a href="javascript:void(0);" th:onclick="cfnGoToPlanDetail([[${PlanData.planSq}]])">
 										<div class="img">
-											<img th:src="${@environment.getProperty('upload.image.view')+PlanData.mainImg}">
+											<img th:src="${@environment.getProperty('upload.image.view')+PlanData.mainImg+'?RS=960'}">
 										</div>
 										<div class="txt">
 											<p class="subject" th:text="${PlanData.planNm}"></p>
@@ -204,6 +204,7 @@ let month =today.getMonth()+1;
 let calendar = [[${month}]];
 let planInfo = [[${planInfo}]];
 let noticeInfo = [[${noticeInfo}]];
+let plan = [[${planInfo}]];
 var custAttendList = [[${custAttendList}]];
 var appendHtml = function () {
 	
@@ -316,6 +317,12 @@ var fnInfoConfirmCallBack = function(result) {
 };
 
 $(document).ready(function() {
+	if(plan.planGb == "P"){
+		$('#htopTitle').text('기획전');
+	}else{
+		$('#htopTitle').text('이벤트/혜택');
+	}
+	
 	$("#monthHead").html("<strong>"+month+"월</strong> 출석체크");
 	appendHtml();
 	
@@ -359,14 +366,10 @@ $(document).ready(function() {
 	});
 	
 	/* SLIDE - 다른 기획전,이벤트 보기 */
-	var ev_ohter_slide = new Swiper('.other_ev_slide .swiper-container', {
+	var other_promotion_slide = new Swiper('.other_promotion_slide .swiper-container', {
 		slidesPerView: 'auto',
 		spaceBetween: 8,
 		centerMode:true,
-		//navigation: {
-		//	nextEl: '.other_ev_slide .swiper-button-next',
-		//	prevEl: '.other_ev_slide .swiper-button-prev',
-		//},
 	});
 	
 })

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

@@ -73,7 +73,7 @@ let fnGetEventList = function() {
 							tag += '					<span>NEW</span>\n';
 							tag += '				</div>\n';
 						}
-						tag += '				<img src="' + _uploadImageUrl + item.mainImg + '" alt="">\n';
+						tag += '				<img src="' + _uploadImageUrl + item.mainImg + '?RS=960" alt="">\n';
 						tag += '			</div>\n';
 						tag += '			<div class="txt">\n';
 						tag += '				<p class="tit">'+item.planNm+'</p>\n';

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

@@ -84,7 +84,6 @@
 							tag += '			<p class="txt_xs">' + item.dtlTitle1 + '</p>\n';
 							tag += '		</div>\n';
 							tag += '	</div>\n';
-							
 							if (item.planningGoodsList.length > 0) {
 								tag += '	<div class="itemsGrp n3">\n';
 							

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

@@ -10,7 +10,7 @@
  *============================================================================
  * VER  DATE		 AUTHOR	  DESCRIPTION
  * ===  ===========  ==========  =============================================
- * 1.0  2021.04.008   eskim		최초 작성
+ * 1.0  2021.04.08   eskim		최초 작성
  *******************************************************************************
  -->
 <div class="modal-dialog" role="document">
@@ -36,8 +36,7 @@
 					<div class="swiper-pagination"></div>
 				</div>
 				<div class="pop_detail">
-					<button class="pop_open_btn">
-						<span class="sr-only"></span>
+					<button class="pop_open_btn" onclick="togglePopOpen()"><span class="sr-only"></span>
 					</button>
 					<!-- 210414_추가 : comment_wrap 태그 추가. -->
 					
@@ -60,17 +59,21 @@
 	onclick="cfCloseLayer('photo_full_popup')" class="close-modal">Close</a>
 <script th:inline="javascript">
 /* 210414_추가 : swiper fraction 숫자 1자리수 일때 앞에 0 스크립트 추가 */
-
-
+var togglePopOpen = function() {
+	if ($('.pop_detail').hasClass('active')) {
+		$('.pop_detail').removeClass('active');
+	}else{
+		$('.pop_detail').addClass('active');
+	}
+	
+};
 /*<![CDATA[*/
 	$(document).ready( function() {
 		let replyAttchSq = 0; 
 		if (!gagajf.isNull( [[${plan.attachSq}]])){
 			replyAttchSq = [[${plan.attachSq}]];
 		} 
-		$(document).on('click','.pop_open_btn',function(){
-			$('.modal.photo_comment_popup .pop_detail').toggleClass('active');
-		});
+		
 		
 		var photoreplydetailSwiper = new Swiper('.pop_slide .swiper-container', {
 			observer: true,
@@ -81,7 +84,10 @@
 				type: 'fraction',
 			},
 		});
-		
+	/* 	$(document).on('click','.pop_open_btn',function(){
+			$('.modal.photo_comment_popup .pop_detail').toggleClass('active');
+		}); */
+
 		
 		photoreplydetailSwiper.slideTo(replyAttchSq, 0, false);
 		photoreplydetailSwiper.update();

src/main/webapp/WEB-INF/views/web/cart/CartListAjaxFormWeb.html

@@ -1220,7 +1220,7 @@
 		// 페이지 이동
 		function fnGoToGoodsDetail(goodsCd, ordCanYn) {
 			if(ordCanYn == "Y" || !ordCanYn) {
-				cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd);
+				cfnGoToPage(_PAGE_GOODS_DETAIL + goodsCd + "&colorCd=&ithrCd=IN18_01");
 			} else {
 				mcxDialog.alert("현재 구매가 불가능한 상품입니다.");
 			}

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

@@ -1093,7 +1093,8 @@
 							if(info.ordCanQty < 6 && info.ordCanQty > 0) {
 								quickShoppingBagHtml += '			<div class="shape"><span>곧 품절돼요!</span></div>';
 							}
-							quickShoppingBagHtml += "			<a href='javascript:cfnGoToGoodsDetail(\"" + info.goodsCd + "\")' class='itemLink'>";
+							quickShoppingBagHtml += "			<a href='javascript:cfnGoToGoodsDetail(\"" + info.goodsCd + "\",\"\",\"IN22_03\")' class='itemLink'>";
+
 							quickShoppingBagHtml += '				<div class="itemPic">';
 							quickShoppingBagHtml += '					<img alt="BLACK-a" class="vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + info.sysImgNm + '?RS=120"/>';
 							quickShoppingBagHtml += '				</div>';

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

@@ -137,7 +137,7 @@
 		<span class="tit_view">FABRIC</span>
 		<div class="view">
 			<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_F1')}">
-			<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
+			<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 			</th:block>
 		</div>
 	</div>
@@ -150,7 +150,7 @@
 			<span>
 				<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_L1') 
 																		or #strings.contains(goodsImg.sysImgNm,'_L2')}">
-				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=250}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
+				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=250'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 				</th:block>
 			</span>
 		</div>

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

@@ -295,7 +295,7 @@ if(notice.length>0){
 }
 
 
-if(planCornerList.length>0){
+if(planCornerList.length>0 && plan.cornerNmDispYn == "Y"){
 	var html = '';
 	
 	html += '<div class="cont_head">\n';

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

@@ -1908,7 +1908,7 @@
 .dp .other_promotion_slide .dp_subtitle {padding-top: 0; font-size: 1.6rem;}
 .dp .other_promotion_slide .swiper-container{padding:0 2rem; margin:0 -2rem;}
 /* dp_detail-case - 쿠폰 */
-.dp .coupon_list {margin-bottom:3rem;}
+.dp .coupon_list {padding-bottom:3rem;}
 .dp .coupon_list li {position: relative; position: relative; margin-top:3rem; overflow: hidden;}
 .dp .coupon_list li:first-child{margin-top:0;}
 .dp .coupon_list li .cp_top {position: relative; overflow: hidden;}

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

@@ -617,7 +617,9 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .other_promotion_slide .tit a {position: absolute; top: 50%; right: 0; transform:translateY(-50%); padding-right: 20px; background: url(/images/pc/ico_more_lg.png) no-repeat right top 1px; font-size: 18px; color:#888;}
 /* .ev .other_ev_slide .swiper-container {overflow:visible;} */
 .other_promotion_slide .swiper-slide {width: 42%;}
-.other_promotion_slide .swiper-slide img {width: 100%; height:auto;}
+.other_promotion_slide .swiper-slide .img{position: relative;width: 100%;margin-bottom: 1.5rem;padding-top: 100%;font-size: 0px;overflow: hidden;background: #fff;}
+.other_promotion_slide .swiper-slide img {position: absolute;width: 100%;height: auto;top: 50%;left: 0px;transform: translateY(-50%);}
+/* .other_promotion_slide .swiper-slide img {width: 100%; height:auto;} */
 .other_promotion_slide .swiper-slide .txt {}
 .other_promotion_slide .swiper-slide .txt .subject {margin:1.6rem 0 0; padding:0 0.46rem; font-size: 1.2rem; line-height: 1.6; font-weight: 300; color:#222; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; display: -webkit-box; word-break: keep-all;}
 .other_promotion_slide .swiper-button-next:after, .other_promotion_slide .swiper-button-prev:after {content:'';}

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

@@ -4509,6 +4509,39 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.modal.trustPrivacy_pop .text_wrap {padding:20px}
 	.modal.trustPrivacy_pop .modal-footer .btn {width:220px; border-color:#a7a7a7;}
 
+	/*
+		팝업 컨텐츠 공통
+		popup_STYLE24이용약관, popup_개인정보 수집 및 이용 약관, popup_개인정보 취급 위탁
+	*/
+	.modal.trustPrivacy_pop .hookGrp .hook_list,
+	.modal.policiesTerms_pop .hookGrp .hook_list,
+	.modal.policiesPrivacy_pop .hookGrp .hook_list {padding: 20px;}
+	.modal.trustPrivacy_pop .hookGrp .hook_list ul li,
+	.modal.policiesTerms_pop .hookGrp .hook_list ul li,
+	.modal.policiesPrivacy_pop .hookGrp .hook_list ul li {width: 100%;}
+	.modal.trustPrivacy_pop .hookGrp .hook_list ul li a span,
+	.modal.policiesTerms_pop .hookGrp .hook_list ul li a span,
+	.modal.policiesPrivacy_pop .hookGrp .hook_list ul li a span {margin: 0px 0px 20px 0;line-height: 16px;}
+	.modal.trustPrivacy_pop table,
+	.modal.policiesTerms_pop table,
+	.modal.policiesPrivacy_pop table {word-break:keep-all;margin-top: 30px;}
+	.modal.trustPrivacy_pop table th,
+	.modal.policiesTerms_pop table th,
+	.modal.policiesPrivacy_pop table th,
+	.modal.trustPrivacy_pop table td,
+	.modal.policiesTerms_pop table td,
+	.modal.policiesPrivacy_pop table td {position:relative; padding:10px 20px; font-size:14px;color: #222222;letter-spacing:-0.025em;}
+	.modal.trustPrivacy_pop table td,
+	.modal.policiesTerms_pop table td,
+	.modal.policiesPrivacy_pop table td {border-bottom:1px solid #ddd;border-right: 1px solid #ddd;font-weight:200;}
+	.modal.trustPrivacy_pop table td:last-child,
+	.modal.policiesTerms_pop table td:last-child,
+	.modal.policiesPrivacy_pop table td:last-child {border-right: 1px solid transparent;}
+	.modal.trustPrivacy_pop table th,
+	.modal.policiesTerms_pop table th,
+	.modal.policiesPrivacy_pop table th {border-top: 1px solid #000;border-bottom:1px solid #000;border-right: 1px solid transparent;font-weight:500;text-align:center;}
+
+
 	/* popup_비밀번호 변경 팝업 */
 	.modal.pswordModify_pop {width:600px; max-width:none; height:auto;}
 	.modal.pswordModify_pop input {color:#222;}