Browse Source

기획전/이벤트,접근모바일 통테수정

sowon4187 5 năm trước cách đây
mục cha
commit
af2cf82958

+ 1 - 2
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());

+ 2 - 1
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>

+ 8 - 8
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(){

+ 12 - 9
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',
-		//},
 	});
 	
 })

+ 1 - 1
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';

+ 0 - 1
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';
 							

+ 15 - 9
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();

+ 1 - 1
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';

+ 4 - 6
src/main/webapp/ux/mo/css/layout_m.css

@@ -1008,7 +1008,7 @@
 .modal.pd_pop[class*="bnf_"] h6 {margin-bottom:1.6rem; font-size:1.4rem; font-weight:500;}
 .modal.pd_pop[class*="bnf_"] .benefit_blk {margin-top:3rem}
 .modal.pd_pop[class*="bnf_"] .benefit_blk:first-child {margin-top:0}
-.modal.pd_pop[class*="bnf_"] .tbl.type1 {border-top:1px solid #000; border-bottom:1px solid #ddd;} 
+.modal.pd_pop[class*="bnf_"] .tbl.type1 {border-top:0.1rem solid #000; border-bottom:0.1rem solid #ddd;} 
 .modal.pd_pop[class*="bnf_"] .tbl.type1 table {width:100%; text-align:left; word-break:break-all;}
 .modal.pd_pop[class*="bnf_"] .tbl.type1 table th,
 .modal.pd_pop[class*="bnf_"] .tbl.type1 table td {position:relative; padding:1.4rem 1.2rem; font-weight:300; font-size:1.3rem; letter-spacing:-0.025em;}
@@ -1802,8 +1802,6 @@
 .dp_hotdeal .hotdeal #countdown span:first-child{margin-right:1.8vw;}
 .dp_hotdeal .hotdeal .list_content .itemsGrp .item_prod{margin-bottom:3rem; margin-right:0;}
 .dp_hotdeal .itemsGrp.rowtype .item_prod {margin-right:0; width:100%;}
-.dp_hotdeal .itemsGrp.rowtype .item_prod:nth-child(2){margin-top:3rem;}
-.dp_hotdeal .itemsGrp.rowtype .item_prod:nth-child(2n) {margin-right: 0;}
 .dp_hotdeal .itemsGrp.rowtype .item_prod .itemBadge, 
 .dp_hotdeal .itemsGrp.rowtype .item_prod .itemcolorchip {display: none;}
 .dp_hotdeal .itemsGrp.rowtype .item_prod .item_state {display: table;  padding-bottom: 0; height:23.4rem; width: 100%;}
@@ -1910,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;}
@@ -2124,9 +2122,9 @@
 /* 필터세부사항(사이즈..) */
 .filter_body > ul > li .sizebox{padding-top:3rem;}
 .filter_body > ul > li .sizebox > li{padding:0 2rem 3rem; overflow:hidden;}
-.filter_body > ul > li .sizebox > li label{position:relative; display:block; float:left; margin:2% 0 0 2% ; width:32%; height:33px; line-height:33px; text-align:center; background-color:#fff;}
+.filter_body > ul > li .sizebox > li label{position:relative; display:block; float:left; margin:2% 0 0 2% ; width:32%; height:3.3rem; line-height:3.3rem; text-align:center; background-color:#fff;}
 .filter_body > ul > li .sizebox > li label input{position:absolute; top:0; right:0; opacity:0; width:0; height:0;}
-.filter_body > ul > li .sizebox > li label span{position:absolute; top:0; bottom:0; left:0; right:0; color:#222; border:1px solid #dddddd; box-sizing:border-box;}
+.filter_body > ul > li .sizebox > li label span{position:absolute; top:0; bottom:0; left:0; right:0; color:#222; border:0.1rem solid #dddddd; box-sizing:border-box; overflow:hidden; text-overflow:ellipsis;}
 .filter_body > ul > li .sizebox > li label input:checked + span{border-color:#222;}
 .filter_body > ul > li .sizebox > li label:nth-of-type(3n+1){margin-left:0;}
 .filter_body > ul > li .sizebox strong{display:block;}

+ 20 - 17
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:'';}
@@ -939,7 +941,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .voucher.disable .vch_remain {font-size:2.8rem !important;}
 
 
-.btn_group_flex > div > .btn {padding:1.2rem 1.3rem;}
+/* .btn_group_flex > div > .btn {padding:1.2rem 1.3rem;} */
 .goods_btn_wrap {display:flex; flex-wrap: wrap; width:100%; align-items:stretch; flex-direction:row;}
 .goods_btn_wrap > div {margin:0 0.4rem 0.5rem 0; flex:1;}
 .goods_btn_wrap > div:first-child {margin-left:0}
@@ -1756,6 +1758,7 @@ background-size:100%;}
 .od .order_badge {font-size: 0.9rem; color: #666; font-weight: 300; border:1px solid #888; padding:0.5rem 0.4rem; margin-left: 1px; vertical-align: top;}
 .od .order_bullet_badge {color: #fd4802; border:1px solid #fd4802; background: #fff6f2;}
 
+.od .btn_group_flex > div > .btn {padding:1.3rem;}
 .od .btn_group_flex > div > .btn.btn_primary {border-color:#fd4802; background: #fd4802; color:#fff;}
 
 .od .part_goods {position:relative;}
@@ -2025,7 +2028,7 @@ background-size:100%;}
 .modal.couponModify_pop .modal-body .pop_cont {line-height:1; font-size: 1.3rem;}
 .modal.couponModify_pop .modal-footer {margin-top:0;}
 .modal.couponModify_pop button span {line-height:1;}
-.modal.couponModify_pop h6 {margin-bottom:1.5rem; font-size: 1.4rem; font-weight: 500;}
+.modal.couponModify_pop h6 {margin-bottom:1.5rem; font-size: 1.4rem; font-weight: 500; line-height: 1.4rem;}
 .modal.couponModify_pop .form_field,
 .modal.couponModify_pop .form_field > div {display:block; width:100%;}
 .modal.couponModify_pop .area_item_coupon {margin-bottom:40px;}
@@ -2334,8 +2337,8 @@ main.container .shopping_bag .inner:last-child {padding-bottom: 0;}
 .shopping_bag .area_salecoupon h4 {margin-bottom: 1.5rem; font-size: 1.6rem;}
 
 .shopping_bag .part_goods .goods_basic {margin-top: 2.4rem; padding-top: 2.4rem; border-top: 1px dashed #ddd;}
-.shopping_bag .part_goods h3 {margin-bottom: 2.4rem;}
-.shopping_bag .part_goods h3 span {color: #888; font-size: 1.2rem;}
+.shopping_bag .part_goods h3 {margin-bottom: 2.4rem; font-size: 1.4rem;}
+.shopping_bag .part_goods h3 span {color: #888; font-size: 1.2rem; margin-left: 0.4rem;}
 .shopping_bag .part_goods .goods_detail {padding: 0 0 0 14rem;}
 .shopping_bag .part_goods .goods_detail .thumb_box {left: 3rem;}
 .shopping_bag .part_goods .goods_detail .form_field {position: absolute; left: 0; top: 0;}
@@ -2349,7 +2352,7 @@ main.container .shopping_bag .inner:last-child {padding-bottom: 0;}
 .shopping_bag .goods_dlvr_save a.btn_popup_save {display:inline-block; padding-right:20px; text-align: center; color:#fd4802; font-size:1.1rem; font-weight:200; line-height:14px; text-decoration:underline; background:url('/images/mo/ico_go_save.png') no-repeat 98% 45%; background-size:1.1rem;}
 
 .shopping_bag .od_calc_wrap {position: fixed; left: 0; bottom: 0; z-index: 99; font-size: 0; width: 100%;}
-.shopping_bag .od_calc_wrap button {width: 60%;}
+.shopping_bag .od_calc_wrap button {width: 60%; height: 5.8rem;}
 .shopping_bag .od_calc_wrap button:first-child {width: 40%;}
 
 .shopping_bag .area_order {}
@@ -2552,7 +2555,7 @@ main.container .od_gift .inner:last-child {padding-bottom: 0;}
 
 .od_gift .info_txt {margin-top: 2.4rem; background: #f5f5f5;}
 
-.part_goods .goods_section > .od_calc {margin: 1rem 0 0 0; padding:1.3rem 0 0 0; position: relative; line-height: 1; border-top: 1px solid #ddd;}
+.part_goods .goods_section > .od_calc {margin: 1rem 0 0 0; padding:1.3rem 0 0 0; position: relative; line-height: 1; border-top: 0.1rem solid #ddd;}
 .part_goods .goods_section > .od_calc .price {top: auto; bottom: 0;}
 .part_goods .goods_section > .od_calc .price .sale_price {margin-right: 1rem;}
 .part_goods .goods_section:last-of-type {margin-bottom: 0;}
@@ -2568,17 +2571,17 @@ main.container .od_extra .inner:last-child {padding-bottom: 0;}
 .couponSelectPop .popup_head {text-indent:-999em; visibility: hidden; font-size: 0; padding: 0;}
 .couponSelectPop .popup_con {padding:2rem 2rem;}
 .couponSelectPop .dlvr_coupon {width: 100%; text-align: left;}
-.couponSelectPop .dlvr_coupon {padding:14px 18px;}f
-.couponSelectPop .dlvr_coupon .name {color:#222; font-size:14px; font-weight:300;}
-.couponSelectPop .dlvr_coupon .txt {margin-top:10px; color:#888; font-size:14px; font-weight:200;}
+.couponSelectPop .dlvr_coupon {padding:1.4rem 1.8rem;}
+.couponSelectPop .dlvr_coupon .name {color:#222; font-size:1.4rem; font-weight:300;}
+.couponSelectPop .dlvr_coupon .txt {margin-top:1.0rem; color:#888; font-size:1.4rem; font-weight:200;}
 .couponSelectPop .dlvr_coupon .txt span {font-weight:300;}
-.couponSelectPop .dlvr_coupon .discount {margin-top:10px;  color:#fd4802; font-size:16px; font-weight:300;}
+.couponSelectPop .dlvr_coupon .discount {margin-top:1.0rem;  color:#fd4802; font-size:1.6rem; font-weight:300;}
 .couponSelectPop .dlvr_coupon .discount span {font-weight:500;}
-.couponSelectPop .dlvr_coupon .empty {margin-top:0; color:#222; font-size:14px; font-weight:300;}
+.couponSelectPop .dlvr_coupon .empty {margin-top:0; color:#222; font-size:1.4rem; font-weight:300;}
 
-.couponSelectPop .list li {border:1px solid #eee; border-bottom: 1px solid transparent;}
-.couponSelectPop .list li:last-child {border-bottom: 1px solid #eee;}
-.couponSelectPop .list li:hover, .couponSelectPop01 .list li:active {border:1px solid #fd4802;}
+.couponSelectPop .list li {border:0.1rem solid #eee; border-bottom: 0.1rem solid transparent;}
+.couponSelectPop .list li:last-child {border-bottom: 0.1rem solid #eee;}
+.couponSelectPop .list li:hover, .couponSelectPop01 .list li:active {border:0.1rem solid #fd4802;}
 .couponSelectPop .list > li[aria-disabled="true"] .dlvr_coupon p {color:#888;}
 
 /* 다음우편번호 api */
@@ -2587,7 +2590,7 @@ main.container .od_extra .inner:last-child {padding-bottom: 0;}
 /* popup_메인공지 FULL */
 .popup_main_notice {position:fixed; left:0; top:0; right: 0; bottom: 0; z-index:90000; width: 100%; height: 100%; overflow-y:auto; background: #222;}
 .popup_main_notice .swiper-button-prev,
-.popup_main_notice .swiper-button-next {position:absolute; top:50%; transform:translateY(-50%); display:inline-block; width:60px; height:60px; background-image:url('/images/pc/btn_main_pop_arrow.png'); background-repeat:no-repeat; background-size:auto 100%; z-index:2;}
+.popup_main_notice .swiper-button-next {position:absolute; top:50%; transform:translateY(-50%); display:inline-block; width:6.0rem; height:6.0rem; background-image:url('/images/pc/btn_main_pop_arrow.png'); background-repeat:no-repeat; background-size:auto 100%; z-index:2;}
 .popup_main_notice .swiper-button-prev {left:0; background-position:0 50%;}
 .popup_main_notice .swiper-button-next {right:0; background-position:100% 50%;}
 .popup_main_notice .swiper-button-prev::after,
@@ -2599,7 +2602,7 @@ main.container .od_extra .inner:last-child {padding-bottom: 0;}
 .popup_main_notice .popup_content .popup_body .swiper-slide img {width: 100%; position: absolute; top: 50%; left: 50%; transform:translate(-50%, -50%); height: auto;}
 .popup_main_notice .popup_content .popup_footer {position: fixed; left:0; bottom:0; width: 100%; background:#222; height: 6rem; padding: 2.2rem;}
 .popup_main_notice .popup_content .popup_footer::after {content:''; clear:both; display:block;}
-.popup_main_notice .popup_content .popup_footer a.btn_underline {display:inline-block; float:left; color:#888; font-size:1.3rem; font-weight:200; border-color:#888}
+.popup_main_notice .popup_content .popup_footer a.btn_underline {float:left; color:#888; font-size:1.3rem; font-weight:200; border-color:#888;}
 .popup_main_notice .popup_content .popup_footer a.btn_popup_close {position: absolute; top: 0; right: 0; width: 6rem; height: 6rem; background: url(/images/mo/btn_main_pop_arrow.png) no-repeat center; background-size:1.6rem;}
 
 .popup_main_notice .popup_body.onlyNotice .swiper-button-prev,

+ 13 - 4
src/main/webapp/ux/mo/js/common_m.js

@@ -17,8 +17,18 @@ $(document).ready(function() {
         }, false);
 
         // history back
+        var lastHeight;
+        $('a').click(function () {
+            height2 = $(document).scrollTop();
+            console.log(height2);
+        });
+        //window.onbeforeunload = function(e) {
+        //    lastHeight = $(document).scrollTop();
+        //    console.log(lastHeight);
+        //};
         $(".btn_back").on("click", function () {
-            history.back()
+            history.back();
+            $('html').animate({scrollTop : lastHeight.top}, 400);
         });
 
         // goTop, header (스크롤 인식)
@@ -88,10 +98,9 @@ $(document).ready(function() {
 
         // items like on/off
        
-            $(".itemLike").click(function () {
+        $(document).on('click','.itemLike',function(){
             $(this).toggleClass("likeit");
-            });
-      
+        });
 
 });
 

+ 47 - 7
src/main/webapp/ux/pc/css/layout.css

@@ -1656,18 +1656,19 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.container .wrap .content.wide.dp_detail_case1 {max-width: 1920px;}*/
 	.dp .itemsGrp {margin:0 -10px;}
 	/* 정렬타입 [ cutcut1 ~ 4 ] 추가 */
-	.dp .itemsGrp.cut1 {margin:0 -10px;display: flex;justify-content: center;flex-direction: column;flex-wrap: nowrap;align-content: center;align-items: center;}
-	.dp .itemsGrp.cut1 .item_prod {display: block;}
-	.dp .itemsGrp.cut2 {margin:0 -10px;margin: 0 auto;display: inline-block;padding: 0 calc((58% - 20px)/2);}
+	.dp .itemsGrp.cut1 {width: 100%;margin:0 -10px;display: flex;justify-content: center;flex-direction: column;flex-wrap: nowrap;align-content: center;align-items: center;}
+	.dp .itemsGrp.cut1 .item_prod {width: 394px;display: block;}
+	.dp .itemsGrp.cut2 {width: 100%;margin:0 -10px;margin: 0 auto;display: inline-block;padding: 0 calc((28.8% - 20px)/2);}
 	.dp .itemsGrp.cut2 .item_prod {width: calc((100% - 0px)/2);}
-	.dp .itemsGrp.cut3 {margin:0 -10px;margin: 0 auto;display: inline-block;padding: 0 calc((42.8% - 20px)/2);}
+	.dp .itemsGrp.cut3 {width: 100%;margin:0 -10px;margin: 0 auto;display: inline-block;padding: 0 calc((28.75% - 20px)/2);}
 	.dp .itemsGrp.cut3 .item_prod {width: calc((100% - 1px)/3);}
-	.dp .itemsGrp.cut4 {margin:0 -10px;margin: 0 auto;display: inline-block;padding: 0 calc((28.8% - 20px)/2);}
+	.dp .itemsGrp.cut4 {width: 100%;margin:0 -10px;margin: 0 auto;display: inline-block;padding: 0 calc((28.8% - 20px)/2);}
 	.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 .wrap {position:relative; width:100%; min-width:auto; max-width:none; padding-left:0px; padding-right:0px;} */
 	.container.dp .content {}
 	.container.dp .content.wide {}
 	.dp .content .cont_head .displayH {margin-bottom: 60px; text-align: center;}
@@ -4419,6 +4420,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	/* 이용약관,개인정보취급방침,업체리스트 */
 	.ps .cont_head > div h3{text-align: center;margin-bottom: 0;padding-bottom: 60px;font-size: 40px;line-height: 1;}
 	.ps .cont_body {width: 1200px;margin: 0 auto;}
+	.ps .cont_foot {width: 1200px;margin: 0 auto;}
 	.ps p {font-size:16px;color:#666666;line-height:26px;letter-spacing:-0.025em;}
 	.ps {padding:0; border-top:1px solid #000;} 
 	.ps table {word-break:keep-all;margin-top: 30px;}
@@ -4448,11 +4450,16 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.hookGrp .hook_list ul li a:focus span:after{content: '';display: block; color: #fd4802; box-sizing: border-box; border-bottom: 1px solid #fd4802;}
 	.hookGrp .hook_cont {font-size:16px;color:#666666;line-height:26px;letter-spacing:-0.025em;}
 	.hookGrp .hook_cont div{margin-top: 62px;}
-	.hookGrp .hook_cont div:last-child{margin-bottom: 160px;}
+	
 	.hookGrp .hook_cont h4 {font-size:24px;font-weight:500;color:#222222;line-height:26px;letter-spacing:-0.025em;}
 	.hookGrp .hook_cont p {font-size:16px;color:#666666;line-height:26px;letter-spacing:-0.025em;}
 	.hookGrp .hook_cont ol li {padding-left: 15px;}
 
+	.ps #prvc_sel {margin-top: 62px; margin-bottom: 160px;}
+	.ps #prvc_sel div {margin-top: 0; margin-bottom: 0;}
+	.ps #prvc_sel .select_custom {width: 240px; height:auto;}
+	.ps #prvc_sel .select_custom .combo .list {position: relative; top: -1px; max-height:none;}
+	.ps #prvc_sel .select_custom .combo .list>li {padding:0 15px;}
 
 
 
@@ -4502,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;}

+ 1 - 1
src/main/webapp/ux/pc/css/main.css

@@ -66,7 +66,7 @@
 
 
 /* main */
-.container.main .wrap {position:relative; width:100%; min-width:auto; max-width:none; padding-left:0px; padding-right:0px;}
+/* .container.main .wrap {position:relative; width:100%; min-width:auto; max-width:none; padding-left:0px; padding-right:0px;} */
 .main {}
 .main .dpnone {display:none;}
 .main .swiper-pagination {margin:0; position:relative;}