단위테스트 오류수정

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

@@ -1437,10 +1437,20 @@ var dcAmtInfoSet = function() {
 						// 1.8.2 쿠폰적용초기화(할인율최고)(상품,장바구니)
 						custGoodsCpnInit();
 						
+						var custCpnCnt 		= parseInt($("#orderForm input[name=custCpnCnt]").val());
+						var custDelvCpnCnt 	= parseInt($("#orderForm input[name=custDelvCpnCnt]").val());
+						var applyCpnCnt 	= custCpnCnt + custDelvCpnCnt;
+						
+						// 2021.04.23 보유쿠폰이 없을때 적용
+						if (applyCpnCnt < 1) {
+							if ($("#orderForm #chk-maxdisc").is(":checked")) {
+								$("#orderForm #chk-maxdisc").trigger("click");
+							}
+						}
+						
 						// 상품쿠폰, 장바구니쿠폰 팝업 열기
 						$("#btn_couponModify_pop").on("click", function(){
 							// 2021.04.23 보유쿠폰이 없을때 적용
-							var custCpnCnt = parseInt($("#orderForm input[name=custCpnCnt]").val());
 							if (custCpnCnt < 1) {
 								mcxDialog.alert("적용 가능한 쿠폰이 없습니다.");
 								return false;
@@ -1486,12 +1496,9 @@ var dcAmtInfoSet = function() {
 						});
 						
 						// 1.8.5 쿠폰 최대할인금액 초기화 버튼 설정
-						$("#chk-maxdisc").on("click", function(){
+						$("#orderForm #chk-maxdisc").on("click", function(){
 							// 2021.04.23 보유쿠폰이 없을때 적용
-							var custCpnCnt 		= parseInt($("#orderForm input[name=custCpnCnt]").val());
-							var custDelvCpnCnt 	= parseInt($("#orderForm input[name=custDelvCpnCnt]").val());
-							
-							if ((custCpnCnt + custDelvCpnCnt) < 1) {
+							if (applyCpnCnt < 1) {
 								mcxDialog.alert("적용 가능한 쿠폰이 없습니다.");
 								return false;
 							}
@@ -1505,8 +1512,6 @@ var dcAmtInfoSet = function() {
 								
 								// 배송비쿠폰 초기환
 								custDelvCpnInit();
-							} else {
-								
 							}
 						});
 					}

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

@@ -1367,6 +1367,17 @@ var dcAmtInfoSet = function() {
 						// 1.8.3 쿠폰적용초기화(할인율최고)(배송비)
 						custDelvCpnInit();
 						
+						var custCpnCnt 		= parseInt($("#orderForm input[name=custCpnCnt]").val());
+						var custDelvCpnCnt 	= parseInt($("#orderForm input[name=custDelvCpnCnt]").val());
+						var applyCpnCnt 	= custCpnCnt + custDelvCpnCnt;
+						
+						// 2021.04.23 보유쿠폰이 없을때 적용
+						if (applyCpnCnt < 1) {
+							if ($("#orderForm #chk-maxdisc").is(":checked")) {
+								$("#orderForm #chk-maxdisc").trigger("click");
+							}
+						}
+						
 						// 1.8.4 쿠폰적용버튼
 						$("#btn_coupon_apply").on("click", function(){
 							
@@ -1393,9 +1404,7 @@ var dcAmtInfoSet = function() {
 						// 1.8.5 쿠폰 최대할인금액 초기화 버튼 설정
 						$("#chk-maxdisc").on("click", function(){
 							// 2021.04.23 보유쿠폰이 없을때 적용
-							var custCpnCnt 		= parseInt($("#orderForm input[name=custCpnCnt]").val());
-							var custDelvCpnCnt 	= parseInt($("#orderForm input[name=custDelvCpnCnt]").val());
-							if ((custCpnCnt + custDelvCpnCnt) < 1) {
+							if (applyCpnCnt < 1) {
 								mcxDialog.alert("적용 가능한 쿠폰이 없습니다.");
 								return false;
 							}

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

@@ -2310,8 +2310,8 @@
 /* br 공통*/
 .br .br_main .inner{padding-bottom:4rem;}
 .br .br_main .inner:last-child{padding-bottom:6rem;}
-.br .br_main .inner .swiper-container {margin-bottom: -2rem;}
-.br .br_subtitle{margin-bottom: 2.4rem; font-size: 2.1rem; font-weight: 500; text-align: center;}
+.br .br_main .inner .swiper-container {}
+.br .br_subtitle{margin-bottom: 2.4rem; padding-top: 2rem; font-size: 2.1rem; font-weight: 500; text-align: center;}
 .br .br_main .item_prod {width:100%;}
 .br .br_main .itemsGrp{font-size:0;}
 .br .br_main .itemsGrp .item_prod:nth-child(2n){margin-right: 0;}
@@ -2337,8 +2337,8 @@
 .br .br_main .submain_visual .txtWrap.w {color: #fff;}
 .br .br_main .submain_visual .txtWrap p {font-size: 3rem; font-weight: 500; line-height: 1.2; display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 2;-webkit-box-orient: vertical; overflow:hidden;}
 .br .br_main .submain_visual .txtWrap p.txt_xs {font-size: 1.4rem; margin-top: 1.6rem; font-weight: 300; -webkit-line-clamp: 1;}
-.br .br_main .br_top_info{position:relative; margin-top:-1rem; padding-top: 2rem;}
-.br .br_main .br_top_info .br_subtitle{text-align:left;}
+.br .br_main .br_top_info{position:relative; margin-top:-1rem; padding-top: 0;}
+.br .br_main .br_top_info .br_subtitle{text-align:left; padding-top: 0;}
 .br .br_main .br_top_info > p:nth-of-type(1){margin-bottom:1.6rem; font-weight:600;}
 .br .br_main .br_top_info > p:nth-of-type(2){margin-bottom:1.2rem; color:#222; font-weight:500; line-height:2rem;}
 .br .br_main .br_top_info > p:last-of-type {font-size: 1.2rem;}
@@ -2375,7 +2375,7 @@
 .br .br_main .special_shop .swiper-slide .sp_item .sp_item .itemsGrp.rowtype .item_prod .itemLike {right:auto; left:13rem; z-index: 99;}
 .br .br_main .special_shop .swiper-slide .sp_item .sp_item .itemsGrp.rowtype .item_prod .itemPic {position: absolute; top: 0; left: 0; margin-bottom: 0; padding-top: 0; width:7rem; height:10.5rem;}
 /* br_main - 룩북 */
-.br .br_main .br_lookbook{margin-top:2rem; background-color:#fff;}
+.br .br_main .br_lookbook{background-color:#fff;}
 /* br_main - 유튜브 */
 .br .br_main .youtube{position:relative; padding:4rem 2rem; margin:0 auto; background-color:#444444; }
 .br .br_main .youtube .br_subtitle{color:#fff;}
@@ -2383,7 +2383,7 @@
 .br .br_main .br_youtube_slide .movbox iframe{position:absolute; top:0; left:0; width:100%; height:100%;}
 .br .br_main .br_youtube_slide .swiper-pagination{position:relative; margin-top:3rem;}
 /* br_main - brand_product */
-.br .br_main .brand_product{margin-top:2rem;}
+.br .br_main .brand_product{}
 .br .br_main .brand_product .swiper-container{overflow:visible;}
 .br .br_main .brand_product .btn:after{content: ''; display: inline-block; margin-left: 0.8rem; width: 1.1rem; height: 1.1rem; background-position: center center; background-repeat: no-repeat; background-size: contain; background-image: url(/images/mo/ico_more_lg.png);}
 /* 브랜드 - 룩북 */

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

@@ -319,7 +319,7 @@
 .main_stylereport img {width: 100%;height: auto;object-fit: cover;}
 .main_stylereport dl {padding:0 1.0rem;}
 .main_stylereport dt {font-size: 1.6rem;font-weight:400;margin: 1.4rem 0 0.4rem 0; display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 2;-webkit-box-orient: vertical; overflow:hidden; line-height: 1.2;}
-.main_stylereport dd {font-size: 1.3rem;font-weight:200;line-height: 2.0rem;display: inline-block; display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 1;-webkit-box-orient: vertical; overflow:hidden;}
+.main_stylereport dd {font-size: 1.3rem;font-weight:200;line-height: 2.0rem;display: inline-block; display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 2;-webkit-box-orient: vertical; overflow:hidden;}
 .post-stylereport {overflow: visible;display: block;height: auto;}
 .post-stylereport .swiper-pagination{bottom: -5.5rem;}
 
@@ -331,8 +331,9 @@
 .main_trendy .cont_body dd {font-size: 1.6rem;font-weight:200;padding:1rem 0 0;}
 .main_trendy .item_state {padding-bottom: 0;}
 .main_trendy .titWrap {padding:4rem 0 2rem;}
-.main_trendy .post-trendy {position: relative; display: block;padding: 0 0vw 4.8vw;}
-.main_trendy .post-trendy .swiper-slide {overflow: hidden;margin: 0 0vw;}
+.main_trendy .post-trendy {position: relative; display: block;padding: 0 0 4rem;}
+.main_trendy .post-trendy .swiper-slide {overflow: hidden;margin: 0 0;}
+.main_trendy .post-trendy .swiper-pagination {bottom: 2rem;}
 .main_trendy .item_prod {width: 49.4%;margin-bottom: 3.6rem;margin-right: 0rem;position: relative;padding: 0 0.7vw;box-sizing: border-box;vertical-align: top;display: inline-block;}
 .main_trendy .item_prod:nth-child(odd) {padding-left: 0;}
 .main_trendy .item_prod:nth-child(even) {padding-right: 0;}
@@ -419,14 +420,14 @@
 .main_pick .pick-post .item_prod .itemName{width: calc(100% - 9rem);top: 1.5rem;margin: 0 8rem 0.8rem;}
 .main_pick .pick-post .item_prod .itemPrice{margin: 0 8rem 0.8rem;top:1.5rem;}
 
-.main_1stage {padding: 2rem 0 0rem 0;}
+.main_1stage {padding: 2rem 0 0;}
 .main_1stage .bnnbox{position: relative; /*height:11.3rem;*/ overflow:hidden; padding-top: 35%;}
 .main_1stage .txtWrap{width: 18.5rem; margin: 0 auto; position: absolute; top: 50%; left: 2rem; transform:translate(0%, -50%); z-index: 1;}
 .main_1stage .txtWrap p{display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 2;-webkit-box-orient: vertical;overflow: hidden; font-size: 1.8rem;font-weight: 500;letter-spacing: -0.025em;text-align: left;line-height: 1.2;color: #222222;padding-bottom:1.0rem;}
 .main_1stage .txtWrap p:last-child {padding-bottom:0;}
 .main_1stage img {position: absolute; top: 50%; left:50%; transform:translate(-60%, -50%); max-width:none; width:auto; height:100%;}
 
-.post-bnnWide {position: relative;top:0rem;display: block;margin: 0 0 3.4rem;}
+.post-bnnWide {position: relative;top:0rem;display: block;margin: 0 0;}
 .post-bnnWide .swiper-wrapper {width: 100%;height: 100%;height: auto;margin: 0 auto;padding: 0 0 2.5rem;}
 .post-bnnWide .swiper-pagination {bottom: 0rem !important;}
 
@@ -1310,7 +1311,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 
 .icon_tag {display:inline-block;}
 .icon_tag::after {content:''; clear:both; display:inline-block; font-weight:300;}
-.icon_tag [class*="tag_"] {float:left; display:inline-block; height:1.7rem; box-sizing:border-box; margin: 0 0 0.4rem; padding:0 0.5rem; border:0.1rem solid #ddd; background: #fff; color:#888888; font-size: 1.1rem; font-weight:300; vertical-align:middle; line-height:1.7rem;}
+.icon_tag [class*="tag_"] {float:left; display:inline-block; height:1.7rem; box-sizing:border-box; margin: 0 0.2rem 0.4rem; padding:0 0.5rem; border:0.1rem solid #ddd; background: #fff; color:#888888; font-size: 1.1rem; font-weight:300; vertical-align:middle; line-height:1.7rem;}
 .icon_tag .tag_stype1 {border-color:#f5f5f5; background:#f5f5f5}
 .icon_tag .tag_stype2 {border-color:#fd4802; background:#fff6f2; color:#fd4802;}
 
@@ -2220,7 +2221,7 @@ background-size:100%;}
 .od .completed .info_complete .report_box div dt,
 .od .completed .info_complete .report_box div dd {display:inline-block; font-weight:300;}
 .od .completed .info_complete .report_box div dt {color:#666; font-size:1.7rem;}
-.od .completed .info_complete .report_box div dd {position: relative; margin-left:108rem; color:#fd4802; font-size:1.7rem;}
+.od .completed .info_complete .report_box div dd {position: relative; margin-left:1.8rem; color:#fd4802; font-size:1.7rem;}
 .od .completed .info_complete .report_box div dd:before {content:''; position: absolute; top: 50%; left: -1.1rem; transform:translateY(-50%); width: 0.1rem; height: 1.5rem; background: #ddd;}
 .od .completed .info_complete .report_box div.closedate dt,
 .od .completed .info_complete .report_box div.closedate dd {margin:0; color:#888; font-size:1.6rem; font-weight:200;}