Merge branch 'card007' into develop

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

@@ -1436,6 +1436,7 @@ public class TsfOrderController extends TsfBaseController {
 		// 3. 화면전송변수설정
 		mav.addObject("orderAddPayGoodsList"	, orderAddPayGoodsList);					// 주문목록정보
 		mav.addObject("ordNo"					, resultMap.get("ordNo"));					// 주문번호
+		mav.addObject("ordNm"					, resultMap.get("ordNm"));					// 주문자명
 		mav.addObject("refundAmt"				, resultMap.get("refundAmt"));				// 상품환불금액
 		mav.addObject("addPayCost"				, resultMap.get("addPayCost"));				// 추가결제금액
 		mav.addObject("ordChgSq"				, resultMap.get("ordChgSq"));				// 주문취소신청번호

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

@@ -27,6 +27,7 @@
 <form class="form_wrap" name="addPayForm" id="addPayForm">
 	<input type="hidden" name="refundAmt" th:value="${refundAmt}">
 	<input type="hidden" name="ordNo" th:value="${ordNo}">
+	<input type="hidden" name="ordNm" th:value="${ordNm}">
 	<input type="hidden" name="addPayCost" th:value="${addPayCost}">
 	<input type="hidden" name="ordChgSq" th:value="${ordChgSq}">
 	
@@ -237,6 +238,7 @@ $("#btn_payment").on("click", function(){
 		"pgGb"					: pgGb
 		,"payMeans"				: payMeans // 네이버페이, 카카오페이
 		,"ordNo"				: $("#addPayForm input[name=ordNo]").val()
+		,"ordNm"				: $("#addPayForm input[name=ordNm]").val()
 		,"addPayCost"			: $("#addPayForm input[name=addPayCost]").val()
 		,"ordChgSq"				: $("#addPayForm input[name=ordChgSq]").val()
 		,"chgGb"				: $("#addPayForm input[name=chgGb]").val()

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

@@ -1945,7 +1945,7 @@ button.alertCls {-webkit-appearance: none;padding: 0;cursor: pointer;background:
 
 
 /* Notch  */
-@media only screen and (min-width: 375px) and (max-width: 415px) and (min-height: 722px) and (max-height: 897px){/* footer{padding-bottom: 8rem;}  *//* footer .f1 {padding: 0 0 8.5rem;}  *//* footer .btn_top {bottom: 20.5%;} */.my .my_delivery .inner > .btn_group,.adrsAdd_pop .modal-footer .btn,.shopping_bag .od_calc_wrap{padding-bottom: 8.8rem; background-color: #f5f5f5; background-color: #aa2020;}.cs_contactUs_my_footer,.product_floormenu,.product_floormenu.fixed{/*height: calc(env(safe-area-inset-bottom) + 8.8rem);height: calc(constant(safe-area-inset-bottom) + 8.8rem);*/background: #38c056; padding-bottom: 8.8rem;}}footer, footer .f1 {padding-bottom: calc(env(safe-area-inset-bottom) + 3.5rem);padding-bottom: clac(constant(safe-area-inset-bottom) + 3.5rem);}footer .btn_top {bottom: calc(env(safe-area-inset-bottom) + 6.5rem);bottom: clac(constant(safe-area-inset-bottom) + 6.5rem);}.my .my_delivery .inner > .btn_group,.adrsAdd_pop .modal-footer .btn,.cs_contactUs_my_footer,.shopping_bag .od_calc_wrap,.product_floormenu,.product_floormenu.fixed{	/* background: #f5f5f5; height: 5.8rem; height: calc() + 5.8rem); height: calc() + 5.8rem); */ 	padding-bottom: constant(safe-area-inset-bottom); 	padding-bottom: env(safe-area-inset-bottom); background: #f5f5f5; background: #000000;}
+@media only screen and (min-width: 375px) and (max-width: 415px) and (min-height: 722px) and (max-height: 897px){/* footer{padding-bottom: 8rem;}  *//* footer .f1 {padding: 0 0 8.5rem;}  *//* footer .btn_top {bottom: 20.5%;} */.my .my_delivery .inner > .btn_group,.adrsAdd_pop .modal-footer .btn,.shopping_bag .od_calc_wrap{padding-bottom: 8.8rem; background-color: #f5f5f5; background-color: #aa2020;}.cs_contactUs_my_footer,.product_floormenu,.product_floormenu.fixed{/*height: calc(env(safe-area-inset-bottom) + 8.8rem);height: calc(constant(safe-area-inset-bottom) + 8.8rem);*/	background: #38c056; padding-bottom: 8.8rem;}}footer, footer .f1 {padding-bottom: calc(env(safe-area-inset-bottom) + 3.5rem);padding-bottom: clac(constant(safe-area-inset-bottom) + 3.5rem);}footer .btn_top {bottom: calc(env(safe-area-inset-bottom) + 6.5rem);bottom: clac(constant(safe-area-inset-bottom) + 6.5rem);}.modal.pd_pop.pd_review_pop .pd_review .area_rv_empty .btn_group_flex{bottom: calc(env(safe-area-inset-bottom) + 6.5rem);bottom: clac(constant(safe-area-inset-bottom) + 6.5rem);}.my .my_delivery .inner > .btn_group,.adrsAdd_pop .modal-footer .btn,.cs_contactUs_my_footer,.shopping_bag .od_calc_wrap,.modal.pd_pop.pd_review_pop .pd_review .area_rv_empty .btn_group_flex,.product_floormenu,.product_floormenu.fixed{/* background: #f5f5f5; height: 5.8rem; height: calc() + 5.8rem); height: calc() + 5.8rem); */ 	padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); background: #f5f5f5; background: #000000;}
 
 
 /* APP ONLY */

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

@@ -415,7 +415,7 @@
 .itemLike.likeit::before {opacity: 1;}
 .item_prod .itemLink {position: relative;text-decoration: none;color: rgb(102, 102, 102);cursor: pointer;display: block;}
 .item_prod .itemPic {position: relative;width: 100%;margin-bottom: 1.5rem;padding-top: 150%;font-size: 0;overflow: hidden; background: #fff;}
-.item_prod .itemPic::after {content: "";display: block;position: absolute;top: 0;left: 0;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);}
+.item_prod .itemPic::after {content: "";display: block;position: absolute;top: 0;left: 0;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 2;}
 .item_prod .itemPic .pd_img {position: absolute;width: 100%;height: auto;top: 50%;left: 0;transform: translateY(-50%);}
 .item_prod .itemPic .pd_mov {position: absolute;width: 100%;height: 100%;top: 50%;left: 0;transform: translateY(-50%);z-index: 2;}
 .item_prod .itemBrand {display: inline-block; margin: 0 0.5rem 0.3rem; font-size: 1rem;font-weight: 300;color: rgb(137, 137, 137); text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;width:10rem;overflow:hidden;}

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

@@ -709,18 +709,21 @@ $(document).ready( function() {
 		}
 	});
 
-	// 상품상세 > 사이즈 테이블 - 스크롤 휠 제어
-	$(".tbl.scroll_tbl .body_t").on('mousewheel',function(e){
-		var wheelDelta = e.originalEvent.wheelDelta;
-		if(wheelDelta > 0){
-			$(this).scrollLeft(-wheelDelta + $(this).scrollLeft());
-		}else{
-			$(this).scrollLeft(-wheelDelta + $(this).scrollLeft());
-		}
-	});
-
-
-	
+	// 상품상세 > 사이즈 테이블 - 드래그스크롤 제어
+	var scrTbl,scrTblLeft,scrTblDown;
+	$(".tbl.scroll_tbl .body_t").mousedown(function(e){
+	  e.preventDefault();
+	  scrTblDown = true;
+	  scrTbl = e.pageX;
+	  scrTblLeft = $(this).scrollLeft();
+	});	
+	$("body").mousemove(function(e){
+	  if(scrTblDown){
+		var newX = e.pageX;
+		$(".tbl.scroll_tbl .body_t").scrollLeft(scrTblLeft - newX + scrTbl);
+	  }
+	});	
+	$("body").mouseup(function(e){scrTblDown = false;});
 
 
 });