퍼블 최신화 커밋

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:0.1rem solid #000; border-bottom:0.1rem solid #ddd;} 
+.modal.pd_pop[class*="bnf_"] .tbl.type1 {border-top:0.1rem solid #000; border-bottom:0.1rem solid #ddd;padding:0;} 
 .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;}
@@ -1832,13 +1832,14 @@
 .itemsGrp.rowtype .item_prod .shopBag .btn span::before {content:''; position:absolute; left:0; top:50%; transform:translateY(-50%); width:15px; height:18px; background: url('/images/pc/ico_shopbag.png') no-repeat 50% 50%;}
 
 /* 기획전 - dp_exhibition */
+.dp .dp_exhibition .list_content .itemsGrp{padding-top: 4rem;}
 .dp .dp_exhibition .list_content .itemsGrp.n3{margin-bottom:0; padding-bottom:0;}
 .dp .dp_exhibition .list_content .itemsGrp.n3 .item_prod {width: 31.666%; float: left; margin-right: 2.5%; margin-top:0;}
 .dp .dp_exhibition .list_content .itemsGrp.n3 .item_prod:nth-child(2n) {margin-right: 2.5%;}
 .dp .dp_exhibition .list_content .itemsGrp.n3 .item_prod:nth-child(3n) {margin-right:0;}
 .dp .dp_exhibition .list_content .itemsGrp.n3 .item_prod{margin-bottom:0;}
 .dp .dp_exhibition .list_content .list_item > div{padding-bottom:6rem;}
-.dp .dp_exhibition .list_content .list_item .visual{position:relative; margin-bottom:2rem;}
+.dp .dp_exhibition .list_content .list_item .visual{position:relative; margin-bottom:-2rem;}
 .dp .dp_exhibition .list_content .list_item .visual img {width: 100%;}
 .dp .dp_exhibition .list_content .list_item .visual .txtWrap {position: absolute; left: 0; bottom: 2rem; padding: 2rem; color: #fff; width: 100%;}
 .dp .dp_exhibition .list_content .list_item .visual .txtWrap p:first-child {display: -webkit-box; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; color: #fff; font-size: 2.4rem; font-weight: 500; line-height: 1.2;}

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

@@ -1819,7 +1819,7 @@ background-size:100%;}
 .od .foldGroup .fold_head .data span::before {content:''; position:absolute; left:-0.2rem; top:50%; transform:translateY(-60%); width:1px; height:10px; background-color:#ddd;}
 .od .foldGroup .fold_head .data span:first-of-type {margin-left:0; padding-left:0;}
 .od .foldGroup .fold_head .data span:first-of-type::before {display:none;}
-
+.od .foldGroup .fold_selgift .fold_head .data {overflow:visible; white-space: normal; width: 60%;}
 .od .fold_cont .area_mbinfo div:first-child dd {font-size: 1.4rem;}
 .od .fold_cont .area_mbinfo div dd {font-size: 1.3rem; color:#222; font-weight: 300;}
 

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

@@ -16,21 +16,100 @@ $(document).ready(function() {
             setTimeout(scrollTo, 0, 0, 1);
         }, false);
 
-        // history back
-        var lastHeight;
-        $('a').click(function () {
-            height2 = $(document).scrollTop();
-            console.log(height2);
-        });
-        //window.onbeforeunload = function(e) {
-        //    lastHeight = $(document).scrollTop();
-        //    console.log(lastHeight);
-        //};
+
+
+        //210608_히스토리백 스크립트
         $(".btn_back").on("click", function () {
             history.back();
-            $('html').animate({scrollTop : lastHeight.top}, 400);
         });
 
+        //1.쿠키세팅
+        function setCookie(cookieName, value, exdays){
+            var exdate = new Date();
+            exdate.setDate(exdate.getDate() + exdays);
+            var cookieValue = escape(value) + ((exdays==null) ? "" : "; expires=" + exdate.toGMTString());
+            document.cookie = cookieName + "=" + cookieValue;
+        }
+        
+        function deleteCookie(cookieName){
+            var expireDate = new Date();
+            expireDate.setDate(expireDate.getDate() - 1);
+            document.cookie = cookieName + "= " + "; expires=" + expireDate.toGMTString();
+        }
+        
+        function getCookie(cookieName) {
+            cookieName = cookieName + '=';
+            var cookieData = document.cookie;
+            var start = cookieData.indexOf(cookieName);
+            var cookieValue = '';
+            if(start != -1){
+                start += cookieName.length;
+                var end = cookieData.indexOf(';', start);
+                if(end == -1)end = cookieData.length;
+                cookieValue = cookieData.substring(start, end);
+            }
+            return unescape(cookieValue);
+        }
+
+        //2. 쿠키설정
+        var category = getCookie("category"); //setCookie("category")로 세팅한 category 변수 명
+        var scrollPoint = getCookie("scrollPoint"); //setCookie("scrollPoint")로 세팅한 스크롤 위치
+        console.log(scrollPoint);
+        var currentCategory = "mainScrollPoint"; //이벤트 발생 후 새로 로드된 현재 페이지의 카테고리 지정
+
+        //3.스크롤 값 가져오기
+        $('a').on("click", function(){
+            // window.onbeforeunload = function(event) {
+                var scrollPoint = (document.documentElement && document.documentElement.scrollTop) 
+                   || document.body.scrollTop;
+                setCookie("category", "mainScrollPoint"); // 쿠키에서 사용할 category에 사용자 정의 카테고리명 세팅
+                setCookie("scrollPoint", scrollPoint); // 쿠키에 스크롤 위치 세팅
+                 console.log("vvbbbbbbbbb");
+            // function frm_submit(){
+                //스크롤 위치 저장
+                if($(this).attr('href') !== '#none' || $(this).attr('href') !== '' || $(this).attr('href') !== 'javascript:void(0)'){
+              
+                //    console.log($(this).attr('href'));
+                //    location.href="pd_deal_detail.html";
+               }
+               console.log(scrollPoint);
+    
+                    //    $("#frm").submit();
+                    // $(window).scroll(function(){
+                    //     console.log(scrollPoint);
+                    // });
+                    // window.onbeforeunload = function(e) {
+                    //     lastHeight = $(document).scrollTop();
+                    //     console.log(lastHeight);
+                    //     console.log("vv");
+                    // };
+                // }
+        //    frm_submit();
+        });
+
+        //4. 뒤로가기 시 이전페이지 스크롤 이동
+        window.onpageshow = function(event) {
+            console.log(window.onpageshow);
+            if ( event.persisted || (window.performance && window.performance.navigation.type == 2)) {
+            // Back Forward Cache로 브라우저가 로딩될 경우 혹은 브라우저 뒤로가기 했을 경우
+            // alert("히스토리백!!!!");
+                if (category != "" && category != 'undefined' 
+                    && category == currentCategory && scrollPoint != "" && scrollPoint != 'undefined') {
+                    console.log("zzzzzzzzzz");
+
+                    $('html').animate({scrollTop : scrollPoint}, 400);
+
+
+                    //  window.scroll(0, scrollPoint);
+                    //  body.scrollTop(scrollPoint);
+                }
+             setCookie("category", "");
+             setCookie("scrollPoint", "");
+            }
+        };
+
+
+
         // goTop, header (스크롤 인식)
         $(".btn_top").click(function () {
             $("html, body").animate({

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

@@ -1717,7 +1717,9 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 
 	/* dp_submain 상단배너 스크롤바 슬라이드 */
 	.dp .dp_submain {position:relative;}
-	.dp .dp_submain .swiper-container .img img {width: 100%; height:auto;}
+	.dp .dp_submain .swiper-container .img {position: relative;width: 100%;margin-bottom: 0;padding-top: 100%;font-size: 0px;overflow: hidden;}
+	.dp .dp_submain .swiper-container .img img {position: absolute;width: 100%;height: auto;top: 50%;left: 0px;transform: translateY(-50%);}
+	/* .dp .dp_submain .swiper-container .img img {width: 100%; height:auto;} */
 	.dp .dp_submain .swiper-container .txt .subject {margin:20px 0; font-size: 24px; line-height: 1.5; font-weight: 300; color:#222; min-height:66px; max-height:66px; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; display: -webkit-box;}
 	.dp .dp_submain .swiper-container .txt span {font-size: 16px; font-weight: 200; color: #222; overflow: hidden;text-overflow: ellipsis;-webkit-line-clamp: 1;-webkit-box-orient: vertical;display: -webkit-box;}
 	.dp .dp_submain .swiper-controls {margin-top:60px}
@@ -3042,6 +3044,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.pd_dealitem .itemsGrp .item_prod {margin-top:60px}
 	.pd_dealitem .itemsGrp .item_prod .item_state {padding:0;}
 	.pd_dealitem .itemLink {}
+	.pd_dealitem .itemLink .itemPic::before {content: "";display: block;position: absolute;top: 0px;left: 0px;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 999;}
 	.pd_dealitem .itemLink .itemPic::after {content:''; background:none; background:rgba(34,34,34,0.8) url('/images/pc/btn_deal_item_more.png') no-repeat 50% 50%; opacity:0; -webkit-transition:all .2s ease-in-out; transition:all .2s ease-in-out; z-index:2;}
 	.pd_dealitem .itemLink:hover .itemPic::after,
 	.pd_dealitem .itemLink:active .itemPic::after {content:''; opacity:1;}
@@ -4438,9 +4441,9 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.ps.ptn .pager {padding-top: 20px;}
 	.hookGrp{margin-top: 40px;}
 	.hookGrp .hook_list{border: 1px solid #f5f5f5;padding: 40px;}
-	.hookGrp .hook_list ul{}
+	.hookGrp .hook_list ul{flex-direction: column;list-style: none;flex-wrap: wrap;height: 288px;display: flex;padding: 0;margin: 0;}
 	.hookGrp .hook_list ul:after{content: ''; clear:both; display: block;}
-	.hookGrp .hook_list ul li{float: left;width: 33.333%;}
+	.hookGrp .hook_list ul li{float: left; /*width: 33.333%;*/ }
 	.hookGrp .hook_list ul li a{display: table; color: #222222;}
 	.hookGrp .hook_list ul li a span{margin: 0px 0px 18px 0;display: block;font-size: 16px;font-weight: 300;}
 	.hookGrp .hook_list ul li a span::after{content: ''; display: block; box-sizing: border-box; border: 1px solid transparent;}
@@ -4453,6 +4456,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	
 	.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 p em {font-weight: 500;}
 	.hookGrp .hook_cont ol li {padding-left: 15px;}
 
 	.ps #prvc_sel {margin-top: 62px; margin-bottom: 160px;}
@@ -4462,7 +4466,6 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.ps #prvc_sel .select_custom .combo .list>li {padding:0 15px;}
 
 
-
 	/********** MODAL POPUP **********/
 	/* popup_자주 묻는 질문 팝업 */	
 	.modal.faq_pop {max-width: 1000px; max-height: 780px; padding:60px;}