Merge branch 'develop' into jmh

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

@@ -6,7 +6,6 @@ import java.util.List;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpSession;
 
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,8 +19,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.context.request.RequestAttributes;
-import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.gagaframework.web.parameter.GagaMap;
@@ -927,7 +924,7 @@ public class TsfMypageController extends TsfBaseController {
 				GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
 
 				// 취소 안내 메일 발송
-				if (StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
+				if (orderChange != null && StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
 					mailService.sendOrderCancel(replaceInfo, custNo);
 				}
 			} catch (Exception e) {

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

@@ -598,7 +598,7 @@ public class TsfNoMemberController extends TsfBaseController {
 				GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
 
 				// 취소 안내 메일 발송
-				if (StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
+				if (orderChange != null && StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
 					mailService.sendOrderCancel(replaceInfo, 0);
 				}
 			} catch (Exception e) {

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

@@ -1209,9 +1209,13 @@ public class TsfOrderController extends TsfBaseController {
 					replaceInfo.set("vaBankNm"			, orderInfo.getCardNm());
 					
 					// 2021.07.29
-					Date deadline = new SimpleDateFormat("yyyy-MM-dd").parse(orderInfo.getVaDeadline().substring(0, 10));
+					String vaDeadline = "";
+					if (StringUtils.isNotBlank(orderInfo.getVaDeadline())) {
+						Date deadline = new SimpleDateFormat("yyyy-MM-dd").parse(orderInfo.getVaDeadline().substring(0, 10));
+						vaDeadline = new SimpleDateFormat("yyyy.MM.dd").format(deadline);
+					}
 					
-					replaceInfo.set("vaDeadline"		, new SimpleDateFormat("yyyy.MM.dd").format(deadline));
+					replaceInfo.set("vaDeadline"		, vaDeadline);
 					replaceInfo.set("vaNo"				, orderInfo.getVaNo());
 					
 					// 2021.06.15

src/main/webapp/WEB-INF/views/mob/common/fragments/GnbSubBrandMob.html

@@ -23,9 +23,17 @@
 			</button>
 			<h1 id="htopTitle"></h1>
 			<div class="button_wrap">
-				<button type="button" class="search" th:onclick="cfnBrandSearchLayer([[${brandGroupInfo?.brandGroupNo}]]);">
-					<img src="/images/mo/ico_btn_search.png" alt="검색">
-				</button>
+				<th:block th:if="${brandGroupInfo?.brandGroupNo == null}">
+					<button class="search" onclick="cfnSearchLayer();">
+						<img src="/images/mo/ico_btn_search.png" alt="검색">
+					</button>
+				</th:block>
+				<th:block th:unless="${brandGroupInfo?.brandGroupNo == null}">
+					<button class="search" th:onclick="cfnBrandSearchLayer([[${brandGroupInfo?.brandGroupNo}]]);">
+						<img src="/images/mo/ico_btn_search.png" alt="검색">
+					</button>
+				</th:block>
+
 				<button class="store" onclick="cfnGoToPage(_PAGE_CART);">
 					<img src="/images/mo/ico_btn_store.png" alt="쇼핑백">
 					<span id="spanGnbCartCnt" style="display: none;"></span>
@@ -33,10 +41,10 @@
 			</div>
 		</section>
 	</header>
-	
+
 <script th:inline="javascript">
 /*<![CDATA[*/
-	
+
 /*]]>*/
 </script>
 

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

@@ -452,21 +452,23 @@ var fnChangeCancelQty = function(param) {
 	let jsonData = JSON.stringify(data);
 
 	gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
-		let refundPoint = Number(result.spanPntDcAmt);							// 환불 포인트 금액
-		let refundGiftCard = Number(result.spanGfcdUseAmt);						// 환불 상품권 금액
-		let spanCnclRtnAmt = Number(result.spanCnclRtnAmt);						// 환불 상품 금액
-		let spanCpnDcAmt = Number(result.spanCpnDcAmt);							// 쿠폰 할인 차감 금액
-		let spanCpn1DcAmt = Number(result.spanCpn1DcAmt);						// 즉시할인 쿠폰 차감 금액
-		let spanTmtbDcAmt = Number(result.spanTmtbDcAmt);						// 다다익선 할인 차감 금액
-		let spanPrePntDcAmt = Number(result.spanPrePntDcAmt);					// 선포인트 할인 차감 금액
-		let sumDeliveryFee = Number(result.sumDeliveryFee);						// 원주문배송비
-		let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);				// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비)
-		let spanRefundAmt = Number(result.spanRefundAmt);						// 환불 예정 금액
-		let goodsCancelAmt = spanCnclRtnAmt + spanCpn1DcAmt;					// 상품취소금액
-		let deliveryFee = sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
-		let deductDcAmt = 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)
-		let refundPayAmt = spanRefundAmt;										// 결제금액 환불 (환불상품금액 - 할인차감금액 - 배송비)
-		let returnAmt = refundPayAmt + refundPoint + refundGiftCard;			// 환불예정금액
+		let refundPoint 		= Number(result.spanPntDcAmt);							// 환불 포인트 금액
+		let spanGfcdUseAmt 		= Number(result.spanGfcdUseAmt);						// 환불 상품권 금액
+		let spanDelvGfcdUseAmt 	= Number(result.spanDelvGfcdUseAmt);					// 환불 배송비 상품권 금액
+		let spanCnclRtnAmt 		= Number(result.spanCnclRtnAmt);						// 환불 상품 금액
+		let spanCpnDcAmt 		= Number(result.spanCpnDcAmt);							// 쿠폰 할인 차감 금액
+		let spanCpn1DcAmt 		= Number(result.spanCpn1DcAmt);							// 즉시할인 쿠폰 차감 금액
+		let spanTmtbDcAmt 		= Number(result.spanTmtbDcAmt);							// 다다익선 할인 차감 금액
+		let spanPrePntDcAmt 	= Number(result.spanPrePntDcAmt);						// 선포인트 할인 차감 금액
+		let sumDeliveryFee 		= Number(result.sumDeliveryFee);						// 원주문배송비
+		let spanTotDeliveryFee 	= Number(result.spanTotDeliveryFee);					// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비)
+		let spanRefundAmt 		= Number(result.spanRefundAmt);							// 환불 예정 금액 ((취소 상품 실결제 금액 + 원주문 배송비) - 배송비쿠폰 - 추가배송비)
+		let goodsCancelAmt 		= spanCnclRtnAmt + spanCpn1DcAmt;						// 상품취소금액
+		let deliveryFee 		= sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
+		let deductDcAmt 		= 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)
+		let refundGiftCard 		= spanGfcdUseAmt + spanDelvGfcdUseAmt;					// 환불 삼품권 금액 합계
+		let refundPayAmt		= spanRefundAmt - spanDelvGfcdUseAmt;					// 결제금액 환불 (환불예정금액 - 환불 배송비 상품권 금액)
+		let returnAmt 			= refundPayAmt + refundPoint + refundGiftCard;			// 환불예정금액
 
 		// 추가배송비 영역 설정
 		if (refundPayAmt < 0) {

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

@@ -161,7 +161,7 @@
 										<dt>배송비</dt>
 										<dd>
 											<div>
-												<span th:text="${#numbers.formatInteger((oneData.rfDeliveryFee + oneData.rfDelvCpnAmt), 1, 'COMMA')}"></span>원
+												<span th:text="${#numbers.formatInteger((oneData.rfDeliveryFee + oneData.rfDelvCpnAmt + oneData.rfDelvGfcdUseAmt), 1, 'COMMA')}"></span>원
 											</div>
 										</dd>
 									</div>
@@ -183,6 +183,7 @@
 												<span th:if="${oneData.pgGb == 'NAVER'}">네이버페이</span>
 												<span th:if="${oneData.pgGb == 'KAKAO'}">카카오페이</span>
 												<span th:if="${oneData.pgGb == 'PAYCO'}">PAYCO</span>
+												<span th:if="${oneData.pgGb == 'ISTYLE'}">상품권</span>
 											</div>
 										</dd>
 									</div>
@@ -206,7 +207,7 @@
 										<dt>상품권 환불</dt>
 										<dd>
 											<div>
-												<span th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt, 1, 'COMMA')}"></span>원
+												<span th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt + oneData.rfDelvGfcdUseAmt, 1, 'COMMA')}"></span>원
 											</div>
 										</dd>
 									</div>

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

@@ -718,7 +718,7 @@
 									<th:block th:if="${orderAmtInfo.gfcdUseAmt} > 0">
 										<div>
 											<dt>상품권 사용</dt>
-											<dd><div><span th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt, 1, 'COMMA')}|"></span>원</div></dd>
+											<dd><div><span th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt + orderAmtInfo.delvGfcdUseAmt, 1, 'COMMA')}|"></span>원</div></dd>
 										</div>
 									</th:block>
 									<th:block th:if="${orderAmtInfo.npayPntAmt} > 0">

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

@@ -661,19 +661,21 @@ var fnChangeReturnQty = function(param) {
 		let jsonData = JSON.stringify(data);
 		
 		gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
-			let refundPoint = Number(result.spanPntDcAmt);							// 환불 포인트 금액
-			let refundGiftCard = Number(result.spanGfcdUseAmt);						// 환불 상품권 금액
-			let spanCnclRtnAmt = Number(result.spanCnclRtnAmt);						// 환불 상품 금액
-			let spanCpnDcAmt = Number(result.spanCpnDcAmt);							// 쿠폰 할인 차감 금액
-			let spanCpn1DcAmt = Number(result.spanCpn1DcAmt);						// 즉시할인 쿠폰 차감 금액
-			let spanTmtbDcAmt = Number(result.spanTmtbDcAmt);						// 다다익선 할인 차감 금액
-			let spanPrePntDcAmt = Number(result.spanPrePntDcAmt);					// 선포인트 할인 차감 금액
-			let sumDeliveryFee = Number(result.sumDeliveryFee);						// 원주문배송비 (반품에서는 안돌려줘서 항상 0일듯)
-			//let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);				// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비) - 추가배송비는 환불컨펌에서 처리
-			let spanTotDeliveryFee = 0;
-			let spanTotRtnDelvFee = Number(result.spanTotRtnDelvFee);				// 반품배송비 (회수요청으로 인한 반품 배송비)
-			let spanRealCnclRtnAmt = Number(result.spanRealCnclRtnAmt);				// 환불 상품 실결제 금액 (환불상품금액 - 할인차감금액)
-			let spanRefundAmt = spanRealCnclRtnAmt + sumDeliveryFee;				// 환불예정금액 (환불상품실결제금액 - 원주문배송비)
+			let refundPoint 		= Number(result.spanPntDcAmt);				// 환불 포인트 금액
+			let spanGfcdUseAmt 		= Number(result.spanGfcdUseAmt);			// 환불 상품권 금액
+			let spanDelvGfcdUseAmt 	= Number(result.spanDelvGfcdUseAmt);		// 환불 배송비 상품권 금액 (반품에서는 안돌려줘서 항상 0일듯)
+			let spanCnclRtnAmt 		= Number(result.spanCnclRtnAmt);			// 환불 상품 금액
+			let spanCpnDcAmt 		= Number(result.spanCpnDcAmt);				// 쿠폰 할인 차감 금액
+			let spanCpn1DcAmt 		= Number(result.spanCpn1DcAmt);				// 즉시할인 쿠폰 차감 금액
+			let spanTmtbDcAmt 		= Number(result.spanTmtbDcAmt);				// 다다익선 할인 차감 금액
+			let spanPrePntDcAmt 	= Number(result.spanPrePntDcAmt);			// 선포인트 할인 차감 금액
+			let sumDeliveryFee 		= Number(result.sumDeliveryFee);			// 원주문배송비 (반품에서는 안돌려줘서 항상 0일듯)
+			//let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);		// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비) - 추가배송비는 환불컨펌에서 처리
+			let spanTotDeliveryFee 	= 0;
+			let spanTotRtnDelvFee 	= Number(result.spanTotRtnDelvFee);			// 반품배송비 (회수요청으로 인한 반품 배송비)
+			let spanRealCnclRtnAmt 	= Number(result.spanRealCnclRtnAmt);		// 환불 상품 실결제 금액 (환불상품금액 - 할인차감금액)
+			let refundGiftCard 		= spanGfcdUseAmt + spanDelvGfcdUseAmt;		// 환불 상품권 금액 합계
+			let spanRefundAmt 		= spanRealCnclRtnAmt + sumDeliveryFee;		// 환불예정금액 (환불상품실결제금액 - 원주문배송비)
 
 			// 반품 사유 및 반품 방식 배송비 계산
 			if (result.spanRealCnclRtnAmt > 0) {
@@ -681,7 +683,7 @@ var fnChangeReturnQty = function(param) {
 				// 회사사유 : 추가배송비 0, 반품배송비 0
 				if (!isCustomer) {
 					spanTotRtnDelvFee = 0;
-					//spanTotDeliveryFee = 0;											// 추가배송비는 환불컨펌에서 처리
+					//spanTotDeliveryFee = 0;									// 추가배송비는 환불컨펌에서 처리
 				}
 				// 고객사유(직접발송) : 반품배송비 0
 				else if (wdGb == 'D') {
@@ -689,13 +691,13 @@ var fnChangeReturnQty = function(param) {
 				}
 			} else {
 				spanTotRtnDelvFee = 0;
-				//spanTotDeliveryFee = 0;												// 추가배송비는 환불컨펌에서 처리
+				//spanTotDeliveryFee = 0;										// 추가배송비는 환불컨펌에서 처리
 			}
 
-			let goodsCancelAmt = spanCnclRtnAmt + spanCpn1DcAmt;						// 상품취소금액
-			let addDelvFee = spanTotRtnDelvFee + spanTotDeliveryFee;					// 추가배송비
-			let deductDcAmt = spanCpnDcAmt + spanTmtbDcAmt + spanPrePntDcAmt;			// 할인금액 차감(쿠폰+다다익선+선포인트)
-			let refundPayAmt = spanRefundAmt - addDelvFee;								// 결제금액 환불
+			let goodsCancelAmt = spanCnclRtnAmt + spanCpn1DcAmt;				// 상품취소금액
+			let addDelvFee = spanTotRtnDelvFee + spanTotDeliveryFee;			// 추가배송비
+			let deductDcAmt = spanCpnDcAmt + spanTmtbDcAmt + spanPrePntDcAmt;	// 할인금액 차감(쿠폰+다다익선+선포인트)
+			let refundPayAmt = spanRefundAmt - addDelvFee;						// 결제금액 환불
 
 			// 추가배송비 영역 설정
 			if (refundPayAmt < 0) {
@@ -708,7 +710,7 @@ var fnChangeReturnQty = function(param) {
 				$('#returnForm input[name=addPayCost]').val(0);
 			}
 
-			let returnAmt = refundPayAmt + refundPoint + refundGiftCard;				// 환불예정금액
+			let returnAmt = refundPayAmt + refundPoint + refundGiftCard;		// 환불예정금액
 
 			// 금액 설정
 			$('#returnAmt').text(returnAmt.addComma());

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

@@ -35,8 +35,8 @@ var wishlistDelete = function(obj) {
 	cfnMoPutWishList(obj);
 
 	ajaxWishList();
-}	
-//마이페이지 위시리스트 
+}
+//마이페이지 위시리스트
 var ajaxWishList = function () {
 	 $.getJSON('/mypage/wish/list', function(result, status) {
 		if (status == 'success') {
@@ -49,7 +49,7 @@ var ajaxWishList = function () {
 					html += '		<span>'+month[i].regDt+'</span>\n';
 					html += '	</div>\n';
 					html += '	<div class="itemsGrp">\n';
-					
+
 					$.each(result, function (idx, item) {
 						if (item.regDtMonth == month[i].regDt) {
 							html += '		<div class="item_prod">\n';
@@ -60,9 +60,12 @@ var ajaxWishList = function () {
 							html += '						<img class="vLHTC pd_img"  src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '">\n';
 							html += '					</div>\n';
 							html += '					<p class="itemBrand">'+item.brandGroupNm+'</p>\n';
+							if (item.goodsTnm != null && item.goodsTnm != '') {
+								html+='					<div class="itemComment">'+item.goodsTnm+'</div>\n';
+							}
 							html += '					<div class="itemName">'+item.goodsNm+'</div>\n';
 							html += '					<p class="itemPrice">\n';
-							
+
 							if (item.currPrice != item.listPrice) {
 								html+='						<span class="itemPrice_original">'+item.listPrice.addComma()+'</span>\n';
 							}
@@ -92,7 +95,7 @@ var ajaxWishList = function () {
 								var iconArr = item.icon.split(",");
 								var iconGb = '';
 								var iconNm = '';
-								html += '	<p class="itemBadge">';
+								html += '	<p class="itemBadge wish_itemBadge">';
 								let arrCnt;
 								if(iconArr.length > 2){
 									arrCnt = 3;
@@ -107,16 +110,14 @@ var ajaxWishList = function () {
 								}
 								html += '	</p>';
 							}
-							if (item.goodsTnm != null && item.goodsTnm != '') {
-								html+='					<div class="itemComment">'+item.goodsTnm+'</div>\n';
-							}
+
 							html += '				</a>\n';
 							html += '			</div>\n';
 							html += '		</div>\n';
-							
+
 						}
 					});
-					
+
 					html += '	</div>\n';
 					html += '</div>\n';
 					$('#wishList').html(html);
@@ -131,10 +132,10 @@ var ajaxWishList = function () {
 				html += '		</p>';
 				html += '	</div>';
 				html += '</div>';
-				
+
 				$('#wishList').html(html);
 			}
-			
+
 		}
 	});
 }

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

@@ -451,21 +451,23 @@ var fnChangeCancelQty = function(param) {
 	let jsonData = JSON.stringify(data);
 
 	gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
-		let refundPoint = Number(result.spanPntDcAmt);							// 환불 포인트 금액
-		let refundGiftCard = Number(result.spanGfcdUseAmt);						// 환불 상품권 금액
-		let spanCnclRtnAmt = Number(result.spanCnclRtnAmt);						// 환불 상품 금액
-		let spanCpnDcAmt = Number(result.spanCpnDcAmt);							// 쿠폰 할인 차감 금액
-		let spanCpn1DcAmt = Number(result.spanCpn1DcAmt);						// 즉시할인 쿠폰 차감 금액
-		let spanTmtbDcAmt = Number(result.spanTmtbDcAmt);						// 다다익선 할인 차감 금액
-		let spanPrePntDcAmt = Number(result.spanPrePntDcAmt);					// 선포인트 할인 차감 금액
-		let sumDeliveryFee = Number(result.sumDeliveryFee);						// 원주문배송비
-		let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);				// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비)
-		let spanRefundAmt = Number(result.spanRefundAmt);						// 환불 예정 금액
-		let goodsCancelAmt = spanCnclRtnAmt + spanCpn1DcAmt;					// 상품취소금액
-		let deliveryFee = sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
-		let deductDcAmt = 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)
-		let refundPayAmt = spanRefundAmt;										// 결제금액 환불 (환불상품금액 - 할인차감금액 - 배송비)
-		let returnAmt = refundPayAmt + refundPoint + refundGiftCard;			// 환불예정금액
+		let refundPoint 		= Number(result.spanPntDcAmt);							// 환불 포인트 금액
+		let spanGfcdUseAmt 		= Number(result.spanGfcdUseAmt);						// 환불 상품권 금액
+		let spanDelvGfcdUseAmt 	= Number(result.spanDelvGfcdUseAmt);					// 환불 배송비 상품권 금액
+		let spanCnclRtnAmt 		= Number(result.spanCnclRtnAmt);						// 환불 상품 금액
+		let spanCpnDcAmt 		= Number(result.spanCpnDcAmt);							// 쿠폰 할인 차감 금액
+		let spanCpn1DcAmt 		= Number(result.spanCpn1DcAmt);							// 즉시할인 쿠폰 차감 금액
+		let spanTmtbDcAmt 		= Number(result.spanTmtbDcAmt);							// 다다익선 할인 차감 금액
+		let spanPrePntDcAmt 	= Number(result.spanPrePntDcAmt);						// 선포인트 할인 차감 금액
+		let sumDeliveryFee 		= Number(result.sumDeliveryFee);						// 원주문배송비
+		let spanTotDeliveryFee 	= Number(result.spanTotDeliveryFee);					// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비)
+		let spanRefundAmt 		= Number(result.spanRefundAmt);							// 환불 예정 금액 ((취소 상품 실결제 금액 + 원주문 배송비) - 배송비쿠폰 - 추가배송비)
+		let goodsCancelAmt 		= spanCnclRtnAmt + spanCpn1DcAmt;						// 상품취소금액
+		let deliveryFee 		= sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
+		let deductDcAmt 		= 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)
+		let refundGiftCard 		= spanGfcdUseAmt + spanDelvGfcdUseAmt;					// 환불 상품권 금액 합계
+		let refundPayAmt		= spanRefundAmt - spanDelvGfcdUseAmt;					// 결제금액 환불 (환불예정금액 - 환불 배송비 상품권 금액)
+		let returnAmt 			= refundPayAmt + refundPoint + refundGiftCard;			// 환불예정금액
 
 		// 추가배송비 영역 설정
 		if (refundPayAmt < 0) {

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

@@ -171,6 +171,7 @@
 												<span th:if="${oneData.pgGb == 'NAVER'}">네이버페이</span>
 												<span th:if="${oneData.pgGb == 'KAKAO'}">카카오페이</span>
 												<span th:if="${oneData.pgGb == 'PAYCO'}">PAYCO</span>
+												<span th:if="${oneData.pgGb == 'ISTYLE'}">상품권</span>
 											</div>
 										</dd>
 									</div>
@@ -194,7 +195,7 @@
 										<dt>상품권 환불</dt>
 										<dd>
 											<div>
-												<span th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt, 1, 'COMMA')}"></span>원
+												<span th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt + oneData.rfDelvGfcdUseAmt, 1, 'COMMA')}"></span>원
 											</div>
 										</dd>
 									</div>

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

@@ -666,19 +666,21 @@ var fnChangeReturnQty = function(param) {
 		let jsonData = JSON.stringify(data);
 		
 		gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
-			let refundPoint = Number(result.spanPntDcAmt);							// 환불 포인트 금액
-			let refundGiftCard = Number(result.spanGfcdUseAmt);						// 환불 상품권 금액
-			let spanCnclRtnAmt = Number(result.spanCnclRtnAmt);						// 환불 상품 금액
-			let spanCpnDcAmt = Number(result.spanCpnDcAmt);							// 쿠폰 할인 차감 금액
-			let spanCpn1DcAmt = Number(result.spanCpn1DcAmt);						// 즉시할인 쿠폰 차감 금액
-			let spanTmtbDcAmt = Number(result.spanTmtbDcAmt);						// 다다익선 할인 차감 금액
-			let spanPrePntDcAmt = Number(result.spanPrePntDcAmt);					// 선포인트 할인 차감 금액
-			let sumDeliveryFee = Number(result.sumDeliveryFee);						// 원주문배송비 (반품에서는 안돌려줘서 항상 0일듯)
-			//let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);				// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비) - 추가배송비는 환불컨펌에서 처리
-			let spanTotDeliveryFee = 0;
-			let spanTotRtnDelvFee = Number(result.spanTotRtnDelvFee);				// 반품배송비 (회수요청으로 인한 반품 배송비)
-			let spanRealCnclRtnAmt = Number(result.spanRealCnclRtnAmt);				// 환불 상품 실결제 금액 (환불상품금액 - 할인차감금액)
-			let spanRefundAmt = spanRealCnclRtnAmt + sumDeliveryFee;				// 환불예정금액 (환불상품실결제금액 - 원주문배송비)
+			let refundPoint 		= Number(result.spanPntDcAmt);				// 환불 포인트 금액
+			let spanGfcdUseAmt 		= Number(result.spanGfcdUseAmt);			// 환불 상품권 금액
+			let spanDelvGfcdUseAmt 	= Number(result.spanDelvGfcdUseAmt);		// 환불 배송비 상품권 금액
+			let spanCnclRtnAmt 		= Number(result.spanCnclRtnAmt);			// 환불 상품 금액
+			let spanCpnDcAmt 		= Number(result.spanCpnDcAmt);				// 쿠폰 할인 차감 금액
+			let spanCpn1DcAmt 		= Number(result.spanCpn1DcAmt);				// 즉시할인 쿠폰 차감 금액
+			let spanTmtbDcAmt 		= Number(result.spanTmtbDcAmt);				// 다다익선 할인 차감 금액
+			let spanPrePntDcAmt 	= Number(result.spanPrePntDcAmt);			// 선포인트 할인 차감 금액
+			let sumDeliveryFee 		= Number(result.sumDeliveryFee);			// 원주문배송비 (반품에서는 안돌려줘서 항상 0일듯)
+			//let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);		// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비) - 추가배송비는 환불컨펌에서 처리
+			let spanTotDeliveryFee 	= 0;
+			let spanTotRtnDelvFee 	= Number(result.spanTotRtnDelvFee);			// 반품배송비 (회수요청으로 인한 반품 배송비)
+			let spanRealCnclRtnAmt 	= Number(result.spanRealCnclRtnAmt);		// 환불 상품 실결제 금액 (환불상품금액 - 할인차감금액)
+			let refundGiftCard 		= spanGfcdUseAmt + spanDelvGfcdUseAmt;		// 환불 상품권 금액 합계
+			let spanRefundAmt 		= spanRealCnclRtnAmt + sumDeliveryFee;		// 환불예정금액 (환불상품실결제금액 - 원주문배송비)
 
 			// 반품 사유 및 반품 방식 배송비 계산
 			if (result.spanRealCnclRtnAmt > 0) {
@@ -686,7 +688,7 @@ var fnChangeReturnQty = function(param) {
 				// 회사사유 : 추가배송비 0, 반품배송비 0
 				if (!isCustomer) {
 					spanTotRtnDelvFee = 0;
-					//spanTotDeliveryFee = 0;											// 추가배송비는 환불컨펌에서 처리
+					//spanTotDeliveryFee = 0;									// 추가배송비는 환불컨펌에서 처리
 				}
 				// 고객사유(직접발송) : 반품배송비 0
 				else if (wdGb == 'D') {
@@ -694,13 +696,13 @@ var fnChangeReturnQty = function(param) {
 				}
 			} else {
 				spanTotRtnDelvFee = 0;
-				//spanTotDeliveryFee = 0;												// 추가배송비는 환불컨펌에서 처리
+				//spanTotDeliveryFee = 0;										// 추가배송비는 환불컨펌에서 처리
 			}
 
-			let goodsCancelAmt = spanCnclRtnAmt + spanCpn1DcAmt;						// 상품취소금액
-			let addDelvFee = spanTotRtnDelvFee + spanTotDeliveryFee;					// 추가배송비
-			let deductDcAmt = spanCpnDcAmt + spanTmtbDcAmt + spanPrePntDcAmt;			// 할인금액 차감(쿠폰+다다익선+선포인트)
-			let refundPayAmt = spanRefundAmt - addDelvFee;								// 결제금액 환불
+			let goodsCancelAmt = spanCnclRtnAmt + spanCpn1DcAmt;				// 상품취소금액
+			let addDelvFee = spanTotRtnDelvFee + spanTotDeliveryFee;			// 추가배송비
+			let deductDcAmt = spanCpnDcAmt + spanTmtbDcAmt + spanPrePntDcAmt;	// 할인금액 차감(쿠폰+다다익선+선포인트)
+			let refundPayAmt = spanRefundAmt - addDelvFee;						// 결제금액 환불
 
 			// 추가배송비 영역 설정
 			if (refundPayAmt < 0) {

src/main/webapp/WEB-INF/views/web/mypage/ChangeOptionPopupFormWeb.html

@@ -65,6 +65,17 @@
 		$('#exchangePop .select_custom.exchange_option').each(function() {
 			new sCombo($(this));
 		});
+		
+		// 210805_ 추가 : 500 이하 일 경우, 영역 밖으로 옵션 리스트 노출
+		$('.modal.exchange_pop .select_custom .combo .select').on('click', function(e){
+			var exchangeContH = $('.modal.exchange_pop .pop_cont .form_wrap').outerHeight();
+
+			if (exchangeContH < 500){
+				$(".modal.exchange_pop .pop_cont").css("overflow","visible");
+			}
+
+			return false;
+		});
 	});
 
 	// 라디오 클릭 이벤트

src/main/webapp/WEB-INF/views/web/mypage/MypageCancelFormWeb.html

@@ -348,22 +348,24 @@
 		let jsonData = JSON.stringify(data);
 
 		gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
-			let refundPoint = Number(result.spanPntDcAmt);							// 환불 포인트 금액
-			let refundGiftCard = Number(result.spanGfcdUseAmt);						// 환불 상품권 금액
-			let spanCnclRtnAmt = Number(result.spanCnclRtnAmt);						// 환불 상품 금액
-			let spanCpnDcAmt = Number(result.spanCpnDcAmt);							// 쿠폰 할인 차감 금액
-			let spanCpn1DcAmt = Number(result.spanCpn1DcAmt);						// 즉시할인 쿠폰 차감 금액
-			let spanTmtbDcAmt = Number(result.spanTmtbDcAmt);						// 다다익선 할인 차감 금액
-			let spanPrePntDcAmt = Number(result.spanPrePntDcAmt);					// 선포인트 할인 차감 금액
-			let sumDeliveryFee = Number(result.sumDeliveryFee);						// 원주문배송비
-			let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);				// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비)
-			let spanRefundAmt = Number(result.spanRefundAmt);						// 환불 예정 금액
-			let goodsCancelAmt = spanCnclRtnAmt + spanCpn1DcAmt;					// 상품취소금액
-			let deliveryFee = sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
-			let deductDcAmt = 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)
-			let refundPayAmt = spanRefundAmt;										// 결제금액 환불 (환불상품금액 - 할인차감금액 - 배송비)
-			let returnAmt = refundPayAmt + refundPoint + refundGiftCard;			// 환불예정금액
-			
+			let refundPoint 		= Number(result.spanPntDcAmt);							// 환불 포인트 금액
+			let spanGfcdUseAmt 		= Number(result.spanGfcdUseAmt);						// 환불 상품권 금액
+			let spanDelvGfcdUseAmt 	= Number(result.spanDelvGfcdUseAmt);					// 환불 배송비 상품권 금액
+			let spanCnclRtnAmt 		= Number(result.spanCnclRtnAmt);						// 환불 상품 금액
+			let spanCpnDcAmt 		= Number(result.spanCpnDcAmt);							// 쿠폰 할인 차감 금액 (즉시할인쿠폰 + 상품쿠폰 + 장바구니쿠폰 + 배송비쿠폰)
+			let spanCpn1DcAmt 		= Number(result.spanCpn1DcAmt);							// 즉시할인 쿠폰 차감 금액
+			let spanTmtbDcAmt 		= Number(result.spanTmtbDcAmt);							// 다다익선 할인 차감 금액
+			let spanPrePntDcAmt 	= Number(result.spanPrePntDcAmt);						// 선포인트 할인 차감 금액
+			let sumDeliveryFee 		= Number(result.sumDeliveryFee);						// 원주문배송비
+			let spanTotDeliveryFee 	= Number(result.spanTotDeliveryFee);					// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비)
+			let spanRefundAmt 		= Number(result.spanRefundAmt);							// 환불 예정 금액 ((취소 상품 실결제 금액 + 원주문 배송비) - 배송비쿠폰 - 추가배송비)
+			let goodsCancelAmt 		= spanCnclRtnAmt + spanCpn1DcAmt;						// 상품취소금액
+			let deliveryFee 		= sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
+			let deductDcAmt 		= 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)
+			let refundGiftCard		= spanGfcdUseAmt + spanDelvGfcdUseAmt;					// 환불 상품권 금액 합계
+			let refundPayAmt		= spanRefundAmt - spanDelvGfcdUseAmt;					// 결제금액 환불 (환불예정금액 - 환불 배송비 상품권 금액)
+			let returnAmt 			= refundPayAmt + refundPoint + refundGiftCard;			// 환불예정금액
+
 			// 추가배송비 영역 설정
 			if (refundPayAmt < 0) {
 				//refundPayAmt = spanRefundAmt;

src/main/webapp/WEB-INF/views/web/mypage/MypageCreCancelDetailFormWeb.html

@@ -135,7 +135,7 @@
 												<dt>환불 예정 금액</dt>
 												<dd>
 													<div class="price">
-														<span class="return_total_price"><em th:text="${#numbers.formatInteger(oneData.refundAmt + oneData.rfPntAmt + oneData.rfGfcdUseAmt, 1, 'COMMA')}"></em>원</span>
+														<span class="return_total_price"><em th:text="${#numbers.formatInteger(oneData.refundAmt + oneData.rfPntAmt + oneData.rfGfcdUseAmt + oneData.rfDelvGfcdUseAmt, 1, 'COMMA')}"></em>원</span>
 													</div>
 												</dd>
 											</div>
@@ -145,7 +145,7 @@
 											</div>
 											<div class="include_item">
 												<dt>배송비</dt>
-												<dd><em th:text="${#numbers.formatInteger((oneData.rfDeliveryFee + oneData.rfDelvCpnAmt), 1, 'COMMA')}"></em>원</dd>
+												<dd><em th:text="${#numbers.formatInteger((oneData.rfDeliveryFee + oneData.rfDelvCpnAmt + oneData.rfDelvGfcdUseAmt), 1, 'COMMA')}"></em>원</dd>
 											</div>
 											<div class="include_item">
 												<dt>할인 금액 차감</dt>
@@ -170,7 +170,7 @@
 											<div>
 												<dt>상품권 환불</dt>
 												<dd>
-													<em  th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt, 1, 'COMMA')}"></em>원
+													<em  th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt + oneData.rfDelvGfcdUseAmt, 1, 'COMMA')}"></em>원
 												</dd>
 											</div>
 											<div>
@@ -179,6 +179,7 @@
 												<dd th:if="${oneData.pgGb == 'NAVER'}">네이버페이</dd>
 												<dd th:if="${oneData.pgGb == 'KAKAO'}">카카오페이</dd>
 												<dd th:if="${oneData.pgGb == 'PAYCO'}">PAYCO</dd>
+												<dd th:if="${oneData.pgGb == 'ISTYLE'}">상품권</dd>
 											</div>
 											<div th:if="${oneData.pgGb == 'KCP' and oneData.payMeans == 'G014_30'}">
 												<dt class="sr-only">영수증 확인</dt>

src/main/webapp/WEB-INF/views/web/mypage/MypageOrderDetailFormWeb.html

@@ -425,7 +425,7 @@
 												</div>
 												<div class="include_item" th:if="${orderAmtInfo.gfcdUseAmt > 0}">
 													<dt>상품권 사용</dt>
-													<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt, 1, 'COMMA')}|"></em>원</dd>
+													<dd><em th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt + orderAmtInfo.delvGfcdUseAmt, 1, 'COMMA')}|"></em>원</dd>
 												</div>
 												<div class="include_item" th:if="${paymentInfo.npayPntAmt > 0}">
 													<dt>마일리지 사용</dt>

src/main/webapp/WEB-INF/views/web/mypage/MypageReturnFormWeb.html

@@ -507,19 +507,21 @@
 			let jsonData = JSON.stringify(data);
 			
 			gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
-				let refundPoint = Number(result.spanPntDcAmt);							// 환불 포인트 금액
-				let refundGiftCard = Number(result.spanGfcdUseAmt);						// 환불 상품권 금액
-				let spanCnclRtnAmt = Number(result.spanCnclRtnAmt);						// 환불 상품 금액
-				let spanCpnDcAmt = Number(result.spanCpnDcAmt);							// 쿠폰 할인 차감 금액
-				let spanCpn1DcAmt = Number(result.spanCpn1DcAmt);						// 즉시할인 쿠폰 차감 금액
-				let spanTmtbDcAmt = Number(result.spanTmtbDcAmt);						// 다다익선 할인 차감 금액
-				let spanPrePntDcAmt = Number(result.spanPrePntDcAmt);					// 선포인트 할인 차감 금액
-				let sumDeliveryFee = Number(result.sumDeliveryFee);						// 원주문배송비 (반품에서는 안돌려줘서 항상 0일듯)
-				//let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);				// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비) - 추가배송비는 환불컨펌에서 처리
-				let spanTotDeliveryFee = 0;
-				let spanTotRtnDelvFee = Number(result.spanTotRtnDelvFee);				// 반품배송비 (회수요청으로 인한 반품 배송비)
-				let spanRealCnclRtnAmt = Number(result.spanRealCnclRtnAmt);				// 환불 상품 실결제 금액 (환불상품금액 - 할인차감금액)
-				let spanRefundAmt = spanRealCnclRtnAmt + sumDeliveryFee;				// 환불예정금액 (환불상품실결제금액 - 원주문배송비)
+				let refundPoint 		= Number(result.spanPntDcAmt);				// 환불 포인트 금액
+				let spanGfcdUseAmt 		= Number(result.spanGfcdUseAmt);			// 환불 상품권 금액
+				let spanDelvGfcdUseAmt 	= Number(result.spanDelvGfcdUseAmt);		// 환불 배송비 상품권 금액 (반품에서는 안돌려줘서 항상 0일듯)
+				let spanCnclRtnAmt 		= Number(result.spanCnclRtnAmt);			// 환불 상품 금액
+				let spanCpnDcAmt 		= Number(result.spanCpnDcAmt);				// 쿠폰 할인 차감 금액
+				let spanCpn1DcAmt 		= Number(result.spanCpn1DcAmt);				// 즉시할인 쿠폰 차감 금액
+				let spanTmtbDcAmt 		= Number(result.spanTmtbDcAmt);				// 다다익선 할인 차감 금액
+				let spanPrePntDcAmt 	= Number(result.spanPrePntDcAmt);			// 선포인트 할인 차감 금액
+				let sumDeliveryFee 		= Number(result.sumDeliveryFee);			// 원주문배송비 (반품에서는 안돌려줘서 항상 0일듯)
+				//let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);		// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비) - 추가배송비는 환불컨펌에서 처리
+				let spanTotDeliveryFee 	= 0;
+				let spanTotRtnDelvFee 	= Number(result.spanTotRtnDelvFee);			// 반품배송비 (회수요청으로 인한 반품 배송비)
+				let spanRealCnclRtnAmt 	= Number(result.spanRealCnclRtnAmt);		// 환불 상품 실결제 금액 (환불상품금액 - 할인차감금액)
+				let refundGiftCard 		= spanGfcdUseAmt + spanDelvGfcdUseAmt;		// 환불 상품권 금액 합계
+				let spanRefundAmt 		= spanRealCnclRtnAmt + sumDeliveryFee;		// 환불예정금액 (환불상품실결제금액 - 원주문배송비)
 
 				// 반품 사유 및 반품 방식 배송비 계산
 				if (result.spanRealCnclRtnAmt > 0) {
@@ -527,7 +529,7 @@
 					// 회사사유 : 추가배송비 0, 반품배송비 0
 					if (!isCustomer) {
 						spanTotRtnDelvFee = 0;
-						//spanTotDeliveryFee = 0;											// 추가배송비는 환불컨펌에서 처리
+						//spanTotDeliveryFee = 0;									// 추가배송비는 환불컨펌에서 처리
 					}
 					// 고객사유(직접발송) : 반품배송비 0
 					else if (wdGb == 'D') {
@@ -535,13 +537,13 @@
 					}
 				} else {
 					spanTotRtnDelvFee = 0;
-					//spanTotDeliveryFee = 0;												// 추가배송비는 환불컨펌에서 처리
+					//spanTotDeliveryFee = 0;										// 추가배송비는 환불컨펌에서 처리
 				}
 
-				let goodsCancelAmt = spanCnclRtnAmt + spanCpn1DcAmt;						// 상품취소금액
-				let addDelvFee = spanTotRtnDelvFee + spanTotDeliveryFee;					// 추가배송비
-				let deductDcAmt = spanCpnDcAmt + spanTmtbDcAmt + spanPrePntDcAmt;			// 할인금액 차감(쿠폰+다다익선+선포인트)
-				let refundPayAmt = spanRefundAmt - addDelvFee;								// 결제금액 환불
+				let goodsCancelAmt = spanCnclRtnAmt + spanCpn1DcAmt;				// 상품취소금액
+				let addDelvFee = spanTotRtnDelvFee + spanTotDeliveryFee;			// 추가배송비
+				let deductDcAmt = spanCpnDcAmt + spanTmtbDcAmt + spanPrePntDcAmt;	// 할인금액 차감(쿠폰+다다익선+선포인트)
+				let refundPayAmt = spanRefundAmt - addDelvFee;						// 결제금액 환불
 
 				// 추가배송비 영역 설정
 				if (refundPayAmt < 0) {
@@ -554,7 +556,7 @@
 					$('#returnForm input[name=addPayCost]').val(0);
 				}
 
-				let returnAmt = refundPayAmt + refundPoint + refundGiftCard;				// 환불예정금액
+				let returnAmt = refundPayAmt + refundPoint + refundGiftCard;		// 환불예정금액
 
 				// 금액 설정
 				$('#returnAmt').text(returnAmt.addComma());

src/main/webapp/WEB-INF/views/web/mypage/MypageWishListFormWeb.html

@@ -37,11 +37,11 @@
 			</div>
 			<div class="sec_body" id="wishList">
 				<!-- 데이터 없을 시 -->
-				
-				<!-- //데이터 없을 시 -->											
+
+				<!-- //데이터 없을 시 -->
 			</div>
 		</div>
-		<!-- // CONT-BODY -->					
+		<!-- // CONT-BODY -->
 	</div>
 </div>
 
@@ -56,7 +56,7 @@ var wishlistDelete = function(obj) {
 
 }
 
-// 마이페이지 위시리스트 
+// 마이페이지 위시리스트
 var ajaxWishList = function () {
 	 $.getJSON('/mypage/wish/list', function(result, status) {
 		if (status == 'success') {
@@ -70,7 +70,7 @@ var ajaxWishList = function () {
 					html+='		<span>'+month[i].regDt+'</span>\n';
 					html+='	</div>\n';
 					html+='	<div class="itemsGrp">\n';
-					
+
 					$.each(result, function (idx, item) {
 						if (item.regDtMonth == month[i].regDt) {
 							html+='		<div class="item_prod">\n';
@@ -80,8 +80,11 @@ var ajaxWishList = function () {
 							html+='					<div class="itemPic">\n';
 							html+='						<img alt="" class=" vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '?RS=550">\n';
 							html+='					</div>\n';
-							html+='					<p class=" itemBrand">'+item.brandGroupNm+'</p>\n';
-							html+='					<div class=" itemName">'+item.goodsNm+'</div>\n';
+							html+='					<p class="itemBrand">'+item.brandGroupNm+'</p>\n';
+							if (item.goodsTnm != null && item.goodsTnm != '') {
+								html+='					<div class="itemComment">'+item.goodsTnm+'</div>\n';
+							}
+							html+='					<div class="itemName">'+item.goodsNm+'</div>\n';
 							html+='					<p class="itemPrice">'+item.currPrice.addComma();
 							if (item.currPrice != item.listPrice) {
 								html+='						<span class="itemPrice_original">'+item.listPrice.addComma()+'</span>\n';
@@ -89,7 +92,7 @@ var ajaxWishList = function () {
 							if (item.dcRate>0) {
 								html+='						<span class=" itemPercent">'+item.dcRate+'%</span>\n';
 							}
-							
+
 							html+='					</p>\n';
 							html+='					<div class="itemcolorchip">\n';
 							if(!gagajf.isNull(item.colorChips)){
@@ -127,19 +130,17 @@ var ajaxWishList = function () {
 								}
 								html += '	</p>';
 							}
-							if (item.goodsTnm != null && item.goodsTnm != '') {
-								html+='					<div class="itemComment">'+item.goodsTnm+'</div>\n';
-							}
+
 							html+='				</a>\n';
 							html+='			</div>\n';
 							html+='		</div>\n';
 						}
-						
+
 					});
 				}
 				html+='	</div>\n';
 				html+='</div>\n';
-				
+
 			}else{
 				html += ' <div class="nodata">\n';
 				html += '	<div class="txt_box">\n';
@@ -162,7 +163,7 @@ $(document).ready(function() {
 
 	// 마이페이지 location 설정
 	fnSetMypageLocation('위시리스트', '_PAGE_MYPAGE_WISHLIST');
-	
+
 	ajaxWishList();
 
 });

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCancelFormWeb.html

@@ -348,21 +348,23 @@
 		let jsonData = JSON.stringify(data);
 
 		gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
-			let refundPoint = Number(result.spanPntDcAmt);							// 환불 포인트 금액
-			let refundGiftCard = Number(result.spanGfcdUseAmt);						// 환불 상품권 금액
-			let spanCnclRtnAmt = Number(result.spanCnclRtnAmt);						// 환불 상품 금액
-			let spanCpnDcAmt = Number(result.spanCpnDcAmt);							// 쿠폰 할인 차감 금액
-			let spanCpn1DcAmt = Number(result.spanCpn1DcAmt);						// 즉시할인 쿠폰 차감 금액
-			let spanTmtbDcAmt = Number(result.spanTmtbDcAmt);						// 다다익선 할인 차감 금액
-			let spanPrePntDcAmt = Number(result.spanPrePntDcAmt);					// 선포인트 할인 차감 금액
-			let sumDeliveryFee = Number(result.sumDeliveryFee);						// 원주문배송비
-			let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);				// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비)
-			let spanRefundAmt = Number(result.spanRefundAmt);						// 환불 예정 금액
-			let goodsCancelAmt = spanCnclRtnAmt + spanCpn1DcAmt;					// 상품취소금액
-			let deliveryFee = sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
-			let deductDcAmt = 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)
-			let refundPayAmt = spanRefundAmt;										// 결제금액 환불 (환불상품금액 - 할인차감금액 - 배송비)
-			let returnAmt = refundPayAmt + refundPoint + refundGiftCard;			// 환불예정금액
+			let refundPoint 		= Number(result.spanPntDcAmt);							// 환불 포인트 금액
+			let spanGfcdUseAmt 		= Number(result.spanGfcdUseAmt);						// 환불 상품권 금액
+			let spanDelvGfcdUseAmt 	= Number(result.spanDelvGfcdUseAmt);					// 환불 배송비 상품권 금액
+			let spanCnclRtnAmt 		= Number(result.spanCnclRtnAmt);						// 환불 상품 금액
+			let spanCpnDcAmt 		= Number(result.spanCpnDcAmt);							// 쿠폰 할인 차감 금액
+			let spanCpn1DcAmt 		= Number(result.spanCpn1DcAmt);							// 즉시할인 쿠폰 차감 금액
+			let spanTmtbDcAmt 		= Number(result.spanTmtbDcAmt);							// 다다익선 할인 차감 금액
+			let spanPrePntDcAmt 	= Number(result.spanPrePntDcAmt);						// 선포인트 할인 차감 금액
+			let sumDeliveryFee 		= Number(result.sumDeliveryFee);						// 원주문배송비
+			let spanTotDeliveryFee 	= Number(result.spanTotDeliveryFee);					// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비)
+			let spanRefundAmt 		= Number(result.spanRefundAmt);							// 환불 예정 금액 ((취소 상품 실결제 금액 + 원주문 배송비) - 배송비쿠폰 - 추가배송비)
+			let goodsCancelAmt 		= spanCnclRtnAmt + spanCpn1DcAmt;						// 상품취소금액
+			let deliveryFee 		= sumDeliveryFee - spanTotDeliveryFee;					// 배송비 (마지막 취소 시 돌려줘야할 원주문 배송비 - 추가배송비)
+			let deductDcAmt 		= 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감 (쿠폰+다다익선+선포인트)
+			let refundGiftCard 		= spanGfcdUseAmt + spanDelvGfcdUseAmt;					// 환불 상품권 금액 합계
+			let refundPayAmt		= spanRefundAmt - spanDelvGfcdUseAmt;					// 결제금액 환불 (환불예정금액 - 환불 배송비 상품권 금액)
+			let returnAmt 			= refundPayAmt + refundPoint + refundGiftCard;			// 환불예정금액
 
 			// 추가배송비 영역 설정
 			if (refundPayAmt < 0) {

src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreCancelDetailFormWeb.html

@@ -168,7 +168,7 @@
 											<div>
 												<dt>상품권 환불</dt>
 												<dd>
-													<em  th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt, 1, 'COMMA')}"></em>원
+													<em  th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt + oneData.rfDelvGfcdUseAmt, 1, 'COMMA')}"></em>원
 												</dd>
 											</div>
 											<div>
@@ -177,6 +177,7 @@
 												<dd th:if="${oneData.pgGb == 'NAVER'}">네이버페이</dd>
 												<dd th:if="${oneData.pgGb == 'KAKAO'}">카카오페이</dd>
 												<dd th:if="${oneData.pgGb == 'PAYCO'}">PAYCO</dd>
+												<dd th:if="${oneData.pgGb == 'ISTYLE'}">상품권</dd>
 											</div>
 											<div th:if="${oneData.pgGb == 'KCP' and oneData.payMeans == 'G014_30'}">
 												<dt class="sr-only">영수증 확인</dt>

src/main/webapp/WEB-INF/views/web/mypage/NoMemberReturnFormWeb.html

@@ -509,19 +509,21 @@
 			let jsonData = JSON.stringify(data);
 			
 			gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
-				let refundPoint = Number(result.spanPntDcAmt);							// 환불 포인트 금액
-				let refundGiftCard = Number(result.spanGfcdUseAmt);						// 환불 상품권 금액
-				let spanCnclRtnAmt = Number(result.spanCnclRtnAmt);						// 환불 상품 금액
-				let spanCpnDcAmt = Number(result.spanCpnDcAmt);							// 쿠폰 할인 차감 금액
-				let spanCpn1DcAmt = Number(result.spanCpn1DcAmt);						// 즉시할인 쿠폰 차감 금액
-				let spanTmtbDcAmt = Number(result.spanTmtbDcAmt);						// 다다익선 할인 차감 금액
-				let spanPrePntDcAmt = Number(result.spanPrePntDcAmt);					// 선포인트 할인 차감 금액
-				let sumDeliveryFee = Number(result.sumDeliveryFee);						// 원주문배송비 (반품에서는 안돌려줘서 항상 0일듯)
-				//let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);				// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비) - 추가배송비는 환불컨펌에서 처리
-				let spanTotDeliveryFee = 0;
-				let spanTotRtnDelvFee = Number(result.spanTotRtnDelvFee);				// 반품배송비 (회수요청으로 인한 반품 배송비)
-				let spanRealCnclRtnAmt = Number(result.spanRealCnclRtnAmt);				// 환불 상품 실결제 금액 (환불상품금액 - 할인차감금액)
-				let spanRefundAmt = spanRealCnclRtnAmt + sumDeliveryFee;				// 환불예정금액 (환불상품실결제금액 - 원주문배송비)
+				let refundPoint 		= Number(result.spanPntDcAmt);				// 환불 포인트 금액
+				let spanGfcdUseAmt 		= Number(result.spanGfcdUseAmt);			// 환불 상품권 금액
+				let spanDelvGfcdUseAmt 	= Number(result.spanDelvGfcdUseAmt);		// 환불 배송비 상품권 금액
+				let spanCnclRtnAmt 		= Number(result.spanCnclRtnAmt);			// 환불 상품 금액
+				let spanCpnDcAmt 		= Number(result.spanCpnDcAmt);				// 쿠폰 할인 차감 금액
+				let spanCpn1DcAmt 		= Number(result.spanCpn1DcAmt);				// 즉시할인 쿠폰 차감 금액
+				let spanTmtbDcAmt 		= Number(result.spanTmtbDcAmt);				// 다다익선 할인 차감 금액
+				let spanPrePntDcAmt 	= Number(result.spanPrePntDcAmt);			// 선포인트 할인 차감 금액
+				let sumDeliveryFee 		= Number(result.sumDeliveryFee);			// 원주문배송비 (반품에서는 안돌려줘서 항상 0일듯)
+				//let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);		// 추가배송비 (무료배송비 허들 깨져서 발생한 배송비) - 추가배송비는 환불컨펌에서 처리
+				let spanTotDeliveryFee 	= 0;
+				let spanTotRtnDelvFee 	= Number(result.spanTotRtnDelvFee);			// 반품배송비 (회수요청으로 인한 반품 배송비)
+				let spanRealCnclRtnAmt 	= Number(result.spanRealCnclRtnAmt);		// 환불 상품 실결제 금액 (환불상품금액 - 할인차감금액)
+				let refundGiftCard 		= spanGfcdUseAmt + spanDelvGfcdUseAmt;		// 환불 상품권 금액 합계
+				let spanRefundAmt 		= spanRealCnclRtnAmt + sumDeliveryFee;		// 환불예정금액 (환불상품실결제금액 - 원주문배송비)
 
 				// 반품 사유 및 반품 방식 배송비 계산
 				if (result.spanRealCnclRtnAmt > 0) {
@@ -529,7 +531,7 @@
 					// 회사사유 : 추가배송비 0, 반품배송비 0
 					if (!isCustomer) {
 						spanTotRtnDelvFee = 0;
-						//spanTotDeliveryFee = 0;											// 추가배송비는 환불컨펌에서 처리
+						//spanTotDeliveryFee = 0;									// 추가배송비는 환불컨펌에서 처리
 					}
 					// 고객사유(직접발송) : 반품배송비 0
 					else if (wdGb == 'D') {
@@ -537,13 +539,13 @@
 					}
 				} else {
 					spanTotRtnDelvFee = 0;
-					//spanTotDeliveryFee = 0;												// 추가배송비는 환불컨펌에서 처리
+					//spanTotDeliveryFee = 0;										// 추가배송비는 환불컨펌에서 처리
 				}
 
-				let goodsCancelAmt = spanCnclRtnAmt + spanCpn1DcAmt;						// 상품취소금액
-				let addDelvFee = spanTotRtnDelvFee + spanTotDeliveryFee;					// 추가배송비
-				let deductDcAmt = spanCpnDcAmt + spanTmtbDcAmt + spanPrePntDcAmt;			// 할인금액 차감(쿠폰+다다익선+선포인트)
-				let refundPayAmt = spanRefundAmt - addDelvFee;								// 결제금액 환불
+				let goodsCancelAmt = spanCnclRtnAmt + spanCpn1DcAmt;				// 상품취소금액
+				let addDelvFee = spanTotRtnDelvFee + spanTotDeliveryFee;			// 추가배송비
+				let deductDcAmt = spanCpnDcAmt + spanTmtbDcAmt + spanPrePntDcAmt;	// 할인금액 차감(쿠폰+다다익선+선포인트)
+				let refundPayAmt = spanRefundAmt - addDelvFee;						// 결제금액 환불
 
 				// 추가배송비 영역 설정
 				if (refundPayAmt < 0) {

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

@@ -149,7 +149,7 @@
 .cs_contactUs_my .blt_dot::before {content:''; position:absolute; left:0; top:50%; margin-top:-0.2rem; width:0.3rem; height:0.3rem; background:#888;}
 .cs_contactUs_my textarea,
 .cs_contactUs_my .select,
-.cs_contactUs_my input[type="text"] {width:100%; font-weight:200; box-sizing:border-box; color:#222; font-size:1.2rem; font-weight:300;}	
+.cs_contactUs_my input[type="text"] {width:100%; font-weight:200; box-sizing:border-box; color:#222; font-size:1.2rem; font-weight:300;}
 .cs_contactUs_my input[type="text"]::placeholder,
 .cs_contactUs_my .form_control {height:4.2rem; color:#222; font-size:1.4rem; line-height: 4.5rem;}
 .cs_contactUs_my .input_label {line-height:4.2rem;}
@@ -173,7 +173,7 @@
 .cs_contactUs_my .txt_cnt {position:absolute; right:1.5rem; bottom:1.5rem; text-align:right; font-size:1.4rem; font-weight: 300; background-color: #ffffff;}
 .cs_contactUs_my .cellphone .input_wrap{display:flex; flex-wrap:wrap;}
 .cs_contactUs_my .cellphone .input_wrap .tt{padding:0.3rem 0; margin-right:3rem; font-weight:600;}
-.cs_contactUs_my .img_group .thumb_pic {position:relative; display:inline-block; width:7.4rem; height:7.4rem; border:0.1rem solid #ddd; margin-right:0.4rem; box-sizing:border-box; overflow:hidden;} 
+.cs_contactUs_my .img_group .thumb_pic {position:relative; display:inline-block; width:7.4rem; height:7.4rem; border:0.1rem solid #ddd; margin-right:0.4rem; box-sizing:border-box; overflow:hidden;}
 .cs_contactUs_my .img_group .thumb_pic img {position:absolute; top:50%; transform: translateY(-50%); width:100%; height: auto;}
 .cs_contactUs_my .form_wrap .form_field:nth-of-type(3) .input_wrap{padding:0 1rem; padding-bottom:2.5rem; border: 0.1rem solid #d7d7d7;}
 .cs_contactUs_my .form_wrap .form_field:nth-of-type(3) .input_wrap textarea{border:0 none; outline:none;}
@@ -247,7 +247,7 @@
 .mb .find_result .form_print_bar ul li {margin-top: 1.2rem;}
 .mb .find_result .form_print_bar ul li:first-child {margin-top: 0;}
 .mb .find_result .form_print_bar ul li span {display:inline-block;}
-.mb .find_result .form_print_bar ul li span.t_span {width:7.5rem; color:#888;}	
+.mb .find_result .form_print_bar ul li span.t_span {width:7.5rem; color:#888;}
 .mb .btn_group_block {float:none; margin-top:3rem; display:flex;}
 .mb [class^="ico_content_"]::before {margin: 0 auto 1.5rem;}
 .ico_content_find::before {width:3.6rem; height:4.6rem; background:url(/images/mo/ico_content_find.png) no-repeat 50% 50%;}
@@ -271,9 +271,9 @@
 .mb .mb_login .captcha .captcha_btn_dual {margin-left:0.6rem;}
 .mb .mb_login .captcha .captcha_btn_dual button {width:9rem; height:3rem; display: block; border:0.1rem solid #ddd; border-radius: 0.3rem; background-color:#f5f5f5;}
 .mb .mb_login .captcha .captcha_btn_dual button:before{content:''; display:inline-block; margin-right:0.4rem; width:1.4rem; height:1.4rem;  background:url('/images/mo/ico_captcha_btn.png') no-repeat center 0; vertical-align:middle;}
-.mb .mb_login .captcha .captcha_btn_dual button:last-child:before {background-position:center -4rem;}  
+.mb .mb_login .captcha .captcha_btn_dual button:last-child:before {background-position:center -4rem;}
 .mb .mb_login .captcha .captcha_btn_dual button:first-child {margin-bottom:0.6rem;}
-.mb .mb_login .captcha .captcha_btn_dual button:last-child {background-position:center -3.1rem;}    
+.mb .mb_login .captcha .captcha_btn_dual button:last-child {background-position:center -3.1rem;}
 .mb .mb_login .captcha .captcha_area {margin-top:0.6rem;}
 .mb .mb_login .captcha .captcha_area input {padding:1.3rem 0 1.5rem 1.3rem;}
 .mb .mb_login .captcha .captcha_area label { display: block; width: 100%; margin:-0.8rem 0 0.4rem 0;}
@@ -392,7 +392,7 @@
 .item_prod .item_state.AD .itemPic:after {content:'AD'; position: absolute; bottom: 0.666rem; right: 0.666rem; font-size: 1rem; font-weight: 300; letter-spacing: -0.025em; color:#888888; width: auto; height: auto; line-height: 1rem; z-index: 21; text-align: right;}
 
 .item_prod .itemLike {position: absolute;top:0rem;right:0rem;font-size: 0;z-index: 99;width: 2.0rem;height: 2.0rem; background: url('/images/mo/ico_like.png');background-size: 3.65rem;background-position:1.18rem 1rem;background-repeat: no-repeat;margin: 0;margin-right: 1rem;padding: 2rem 0.0rem 2rem 3rem;}
-.item_prod .itemLike::before, 
+.item_prod .itemLike::before,
 .item_prod .itemLike::after {content: "";position: absolute;top: 0;right: 0;width: 100%;height: 100%; background-repeat: no-repeat;background-position: right top;background-size: contain;opacity: 0;transition: opacity 200ms ease 0s;}
 .item_prod .itemLike::before {background: url('/images/mo/ico_like.png');background-size: 3.82rem;background-position:-1.86rem 1rem;background-repeat: no-repeat;margin: 0rem -1rem 2rem 0rem;}
 .item_prod .itemLike::after {background: url('/images/mo/ico_like.png');background-size: 3.82rem;background-position: -1.86rem 1rem;background-repeat: no-repeat;margin: 0rem -1rem 2rem 0rem;}
@@ -408,7 +408,7 @@
 .item_prod .itemName .tit_option{font-weight:500;}
 .item_prod .itemPrice {position: relative; line-height: 1;font-size: 1.5rem; font-weight: 300; color:#222; margin: 0 0.5rem; margin-top: 2.3rem;text-align: left;}
 .item_prod .itemPrice_original {position: relative; margin-top: -1.5rem; margin-bottom:0.5rem; display:block; line-height:1; font-size: 1rem; font-weight: 300; color: rgb(204, 204, 204); text-decoration:line-through;}
-.item_prod .itemText{margin-top:0.5rem; font-size:1.1rem; color:#888888; font-weight:300;} 
+.item_prod .itemText{margin-top:0.5rem; font-size:1.1rem; color:#888888; font-weight:300;}
 .item_prod .itemPercent {position: absolute;top: auto;right: 0;bottom: 0;left: auto;margin-left: 1.5rem;line-height:1;font-size: 1.5rem;font-weight: 300;color: #fd4802;}
 .rank {position: absolute; z-index: 1; font-size: 1.4rem; color: #ffffff; top: 0; left: 0; width: auto; height: auto; min-width: 4.0rem; max-height: 4.0rem; text-align: center; line-height: 0.9; padding: 1.4rem 0;}
 .rank::after {content: ""; z-index: -1; position: absolute; top: 0; left: 0; width: 100%; height: 100%; display: block; background: currentColor; background: #222222; clip-path: polygon(40px 0, 40px 30px, 30px 40px, 0 40px, 0 0); clip-path: polygon(100% 0, 100% 75%, 75% 100%, 0 100%, 0 0); clip-path: polygon(100% 0, 100% calc( 100% - 10px), calc( 100% - 10px) 100%, 0 100%, 0 0);}
@@ -497,7 +497,7 @@
 /* 2 */
 .pd_detail .desc_status{padding:1.5rem 2rem; margin-bottom:-1.2rem; color: #fd4802; border-bottom:0.1rem solid #dddddd;}
 .pd_detail .timer_box{position: absolute;width: 30rem;top:-2.4rem;left: 50%;transform: translateX(-50%);z-index: 2;}
-.pd_detail .timer_box::before{position: absolute;left: 0;bottom: 0;width: 100%;height: 3rem;background-color: rgba(255,255,255,.95);z-index: -1;} 
+.pd_detail .timer_box::before{position: absolute;left: 0;bottom: 0;width: 100%;height: 3rem;background-color: rgba(255,255,255,.95);z-index: -1;}
 .pd_detail .timer_box p{padding: 0;text-align: center;background: #222;height: 3.6rem;}
 .pd_detail .timer_box p::after {content:''; clear:both; display:block;}
 .pd_detail .timer_box p span {display:inline-block; position:relative;}
@@ -616,7 +616,7 @@
 .pd_descrp .btn_group_flex{width:92%; margin: 0 auto; padding-bottom:4rem;}
 [class*="pd_descrp"] .btn_group_flex button{border: 0.1rem solid #fd4802; color: #fd4802; background: #fff;}
 [class*="pd_descrp"] .btn_group_flex button span{position:relative; padding-right:2rem;}
-[class*="pd_descrp"] .btn_group_flex button span::after {content:""; position:absolute; right:0.4rem; top:0.1rem; transform:rotate(90deg); width:0.7rem; height:1.3rem; background:url(/images/mo/ico_mb_arrow2.png) no-repeat 0 0; background-size:auto 100%;} 
+[class*="pd_descrp"] .btn_group_flex button span::after {content:""; position:absolute; right:0.4rem; top:0.1rem; transform:rotate(90deg); width:0.7rem; height:1.3rem; background:url(/images/mo/ico_mb_arrow2.png) no-repeat 0 0; background-size:auto 100%;}
 [class*="pd_descrp"] .btn_group_flex button.active span::after {transform:rotate(-90deg);}
 [class*="pd_descrp"] {width:100%;}
 [class*="pd_descrp"] .cont_body {max-height:58rem; overflow:hidden;}
@@ -649,7 +649,7 @@
 [class*="pd_descrp"] .brand_box .name {margin-bottom:1rem; color:#222; font-size:1.8rem; font-weight:600;}
 [class*="pd_descrp"] .brand_box a {display:inline-block; border:0.1rem solid #ddd; font-size:1.3rem; color:#222; font-weight:300; line-height: 4.3rem; width: 92%;}
 [class*="pd_descrp"] .required_box {margin-bottom:4.0rem;}
-[class*="pd_descrp"] .required_box .area_detail {text-align:center;} 
+[class*="pd_descrp"] .required_box .area_detail {text-align:center;}
 [class*="pd_descrp"] .required_box .area_detail img {max-width:100%;}
 [class*="pd_descrp"] .required_box .area_infotbl {margin-top:4rem;}
 [class*="pd_descrp"] .required_box .area_infotbl .title {display:block; margin-bottom:1rem; font-size:1.4rem; font-weight:500; letter-spacing:-0.025em;}
@@ -663,13 +663,13 @@
 [class*="pd_descrp"] .required_box .area_kcl .tit {margin-top:0; margin-bottom:0.5rem; font-size:1.3rem;}
 [class*="pd_descrp"] .required_box .area_kcl a.linktxt3 {margin-left:2.0rem; color:#888; font-weight:200; text-decoration:none !important;}
 [class*="pd_descrp"] .required_box .area_kcl .ico_kcl {position:relative;}
-[class*="pd_descrp"] .required_box .tbl.type1 {border-top:0.1rem solid #000; border-bottom:0.1rem solid #ddd;} 
+[class*="pd_descrp"] .required_box .tbl.type1 {border-top:0.1rem solid #000; border-bottom:0.1rem solid #ddd;}
 [class*="pd_descrp"] .required_box .tbl.type1 table {width:100%; text-align:left; word-break:keep-all;}
 [class*="pd_descrp"] .required_box .tbl.type1 table th,
 [class*="pd_descrp"] .required_box .tbl.type1 table td {position:relative; padding:0.4rem 1.2rem; font-weight:300; font-size:1.3rem; letter-spacing:-0.025em; word-break: break-all;}
 [class*="pd_descrp"] .required_box .tbl.type1 table th {font-weight:400; width:8rem;}
 [class*="pd_descrp"] .required_box .tbl.type1 table td {color:#666666}
-[class*="pd_descrp"] .required_box .tbl.type2 {padding:0; border-top:0.1rem solid #000;} 
+[class*="pd_descrp"] .required_box .tbl.type2 {padding:0; border-top:0.1rem solid #000;}
 [class*="pd_descrp"] .required_box .tbl.type2 table {width:100%; word-break:keep-all;}
 [class*="pd_descrp"] .required_box .tbl.type2 table th,
 [class*="pd_descrp"] .required_box .tbl.type2 table td {position:relative; padding:1.5rem 0; border-bottom:0.1rem solid #ddd; font-weight:200; font-size:1.3rem; letter-spacing:-0.025em; text-align:center;}
@@ -783,7 +783,7 @@
 .product_floormenu.fixed{-webkit-transform: translate(0, 0);-ms-transform: translate(0, 0);-moz-transform: translate(0, 0);transform: translate(0, 0);}
 
 /* 토스트팝업 > 구매하기 */
-.container.btPop_full.pd_open::after, 
+.container.btPop_full.pd_open::after,
 .container.btPop_open.pd::after{position:fixed; z-index: 100;}
 
 /* 재확인 */
@@ -933,18 +933,18 @@
 .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;padding:0;} 
+.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;}
 .modal.pd_pop[class*="bnf_"] .tbl.type1 table th {font-weight:400;}
-.modal.pd_pop[class*="bnf_"] .tbl.type1 table tr td:last-child {text-align:right;} 
+.modal.pd_pop[class*="bnf_"] .tbl.type1 table tr td:last-child {text-align:right;}
 .modal.pd_pop[class*="bnf_"] .tbl.type1 table tr th{vertical-align:top; color:#222; width:28%;}
 .modal.pd_pop[class*="bnf_"] .tbl.type1 table tr th,
 .modal.pd_pop[class*="bnf_"] .tbl.type1 table tr td {border-top:0.1rem solid #eeeeee;}
 .modal.pd_pop[class*="bnf_"] .tbl.type1 table tr:first-child th,
 .modal.pd_pop[class*="bnf_"] .tbl.type1 table tr:first-child td {border-top:none;}
-.modal.pd_pop[class*="bnf_"] .tbl.type2 {padding:0; border-top:0.1rem solid #000;} 
+.modal.pd_pop[class*="bnf_"] .tbl.type2 {padding:0; border-top:0.1rem solid #000;}
 .modal.pd_pop[class*="bnf_"] .tbl.type2 table {width:100%; word-break:keep-all;}
 .modal.pd_pop[class*="bnf_"] .tbl.type2 table th,
 .modal.pd_pop[class*="bnf_"] .tbl.type2 table td {position:relative; padding:1.5rem 0; border-bottom:0.1rem solid #ddd; font-weight:200; font-size:1.3rem; letter-spacing:-0.025em; text-align:center;}
@@ -1001,20 +1001,20 @@
 .modal.pd_pop.info_size_pop .category_box .lap{position:absolute; bottom:0; left:0; padding:3rem 0; width:100%; background:#fff;}
 .modal.pd_pop.info_size_pop .category_box .category_list{min-height:25rem; max-height:40rem; overflow-y:auto;}
 .modal.pd_pop.info_size_pop .category_box .category_close{opacity: 1; position: absolute; z-index: 98; top: -3.8rem; left: 50%; transform: translate(-50%); display: block; border: 0; width: 1.6rem; height: 1.6rem; background-image: url(/images/mo/ico_pop_cls_w.png); text-indent: -9999px; background-size: contain; background-repeat: no-repeat; background-position: center center; background-color: transparent;}
-.modal.pd_pop.info_size_pop .tbl.type1 {border-top:0.1rem solid #000; border-bottom:0.1rem solid #ddd;} 
+.modal.pd_pop.info_size_pop .tbl.type1 {border-top:0.1rem solid #000; border-bottom:0.1rem solid #ddd;}
 .modal.pd_pop.info_size_pop .tbl.type1 table {width:100%; text-align:left; word-break:keep-all;}
 .modal.pd_pop.info_size_pop .tbl.type1 table th,
 .modal.pd_pop.info_size_pop .tbl.type1 table td {position:relative; padding:1.4rem 1.2rem; font-weight:300; font-size:1.3rem; letter-spacing:-0.025em;}
 .modal.pd_pop.info_size_pop .tbl.type1 table th {font-weight:400;}
-.modal.pd_pop.info_size_pop .tbl.type1 table tr td:last-child {text-align:right;} 
+.modal.pd_pop.info_size_pop .tbl.type1 table tr td:last-child {text-align:right;}
 .modal.pd_pop.info_size_pop .tbl.type1 table tr th{vertical-align:top; color:#222;}
 .modal.pd_pop.info_size_pop .tbl.type1 table tr th,
 .modal.pd_pop.info_size_pop .tbl.type1 table tr td {border-top:0.1rem solid #eeeeee;}
 .modal.pd_pop.info_size_pop .tbl.type1 table tr:first-child th,
 .modal.pd_pop.info_size_pop .tbl.type1 table tr:first-child td {border-top:none;}
 
-.modal.pd_pop.info_size_pop .tbl.type2 {width: 100%;overflow: auto;} 
-.modal.pd_pop.info_size_pop .tbl.type2 {padding:0; border-top:0.1rem solid #000;} 
+.modal.pd_pop.info_size_pop .tbl.type2 {width: 100%;overflow: auto;}
+.modal.pd_pop.info_size_pop .tbl.type2 {padding:0; border-top:0.1rem solid #000;}
 .modal.pd_pop.info_size_pop .tbl.type2 table {width:100%; word-break:keep-all;}
 .modal.pd_pop.info_size_pop .tbl.type2 table th,
 .modal.pd_pop.info_size_pop .tbl.type2 table td {position:relative; padding:1.5rem 1rem; border-bottom:0.1rem solid #ddd; font-weight:200; font-size:1.4rem; letter-spacing:-0.025em; text-align:center;}
@@ -1177,7 +1177,7 @@
     .pd_review .area_rv_empty .txt_box div dl {margin-left:5vw;}
   }
 .pd_review .area_rv_empty .txt_box div dl:first-child {margin-left:0;}
-.pd_review .area_rv_empty .txt_box div dl dt {color:#666; font-weight:200; line-height:1.4; font-size:1.3rem;} 
+.pd_review .area_rv_empty .txt_box div dl dt {color:#666; font-weight:200; line-height:1.4; font-size:1.3rem;}
 .pd_review .area_rv_empty .txt_box div dl dd {color:#000; font-weight:300;font-size:1.7rem;}
 .pd_review .area_rv_empty .btn_box .review_go{margin-top:3rem;}
 .pd_review .area_rv_average {margin-bottom:0!important; padding-bottom:0!important; text-align:center;}
@@ -1454,10 +1454,10 @@
 .pd_detail .area_desc .desc_wrap .option_box .opt_select .select_custom.deal_opt_item .item_prod .item_state a .itemPercent {position:relative;}
 .pd_detail .area_desc .desc_wrap .option_box .opt_select .select_custom.deal_opt_item .item_prod .item_state a .itemPrice_original {margin-right:0;}
 .pd_detail .area_desc .desc_wrap .option_box .opt_select .select_custom.deal_opt_item .item_prod .item_state a .itemPercent {margin-right:0;}
-.pd_detail .area_desc .desc_wrap .option_box .opt_select .select_custom.deal_opt_item .item_prod .item_state a > [class^="item"] {margin-left:0; margin-right:0;} 
+.pd_detail .area_desc .desc_wrap .option_box .opt_select .select_custom.deal_opt_item .item_prod .item_state a > [class^="item"] {margin-left:0; margin-right:0;}
 .pd_detail .area_desc .desc_wrap .option_box .opt_select .select_custom.deal_opt_item .combo .list {top:11.0rem;}
 .pd_detail .area_desc .desc_wrap .option_box .opt_select .select_custom.deal_opt_item .combo .list > li {border-bottom:0.1rem solid #eee;}
-.pd_detail .area_desc .desc_wrap .option_box .opt_select .select_custom.deal_opt_item .combo .list > li[aria-disabled="true"] a [class^="item"] {color:#bbb; text-decoration:line-through;} 
+.pd_detail .area_desc .desc_wrap .option_box .opt_select .select_custom.deal_opt_item .combo .list > li[aria-disabled="true"] a [class^="item"] {color:#bbb; text-decoration:line-through;}
 .pd_detail .area_desc .desc_wrap .option_box .opt_select .select_custom.deal_opt_item .combo .list > li[aria-disabled="true"] a img {opacity:0.3;}
 .pd.deal .tab_detail_cont .select_custom.deal_opt_item,
 .pd.deal .tab_detail_cont .select_custom.deal_opt_item .select {height:11.0rem;}
@@ -1542,7 +1542,7 @@
 .select_custom.deal_opt_item .combo .list>li{border-bottom:0.1rem solid #eee;}
 .select_custom.deal_opt_item .combo .list>li[data-soldout="true"]::after{top:50%; -webkit-transform:translateY(-50%); transform:translateY(-50%);}
 .select_custom.deal_opt_item .combo .list{position:relative; top:0;}
-.select_custom.deal_opt_item .combo .list > li[aria-disabled="true"] a [class^="item"] {color:#bbb; text-decoration:line-through;} 
+.select_custom.deal_opt_item .combo .list > li[aria-disabled="true"] a [class^="item"] {color:#bbb; text-decoration:line-through;}
 .select_custom.deal_opt_item .combo .list > li[aria-disabled="true"] a img {opacity:0.3;}
 /* tab_detail_cont >  item_prod*/
 .tab_detail_cont .item_blk .item_prod .item_state .itemLink .itemBrand{padding-right:0; margin:0; margin-bottom:0.3rem;}
@@ -1567,9 +1567,9 @@
 .dp .category_nav ul::after {content:''; display: block; clear: both;}
 .dp .category_nav ul li {margin-right:2rem;}
 .dp .category_nav ul li button {position: relative; padding:1.5rem 0; font-size:1.4rem; font-weight:300; color:#222;}
-.dp .category_nav ul li button:hover, 
+.dp .category_nav ul li button:hover,
 .dp .category_nav ul li button.active {color: #fd4802; font-weight:500;}
-.dp .category_nav ul li:hover button::after, 
+.dp .category_nav ul li:hover button::after,
 .dp .category_nav ul li button.active::after{content:''; position: absolute; bottom:0; left:0; width:100%; height:2px; background: #fd4802;}
 .dp .category_nav ul li:last-child {margin-right: 0;}
 .dp .open_categori {background-color:#fff;}
@@ -1604,14 +1604,14 @@
 .dp .dp_list .sub_category .cate_wrap a:last-child{margin-right:2rem;}
 .dp .dp_list .sub_category .cate_wrap a.on{border:0.1rem solid #fe4904; color:#fe4904;}
 .dp .list_content .list_defult{display:none; text-align:center; padding:11rem 0;}
-.dp .list_content .list_defult p{text-align:center; font-size:1.3rem; color:#888888; font-weight:300;} 
+.dp .list_content .list_defult p{text-align:center; font-size:1.3rem; color:#888888; font-weight:300;}
 .dp .list_content .list_defult .btn{margin-top:2.4rem; font-size:1.1rem; height:3rem;}
 .dp .list_content .list_last{padding: 2.5rem 0 6rem; font-size: 1.1rem; color: #888888; font-weight: 300; text-align: center; border-top:0.1rem solid #f5f5f5;}
 .dp .list_content.nodata .lookbookGrp,
 .dp .list_content.nodata .itemsGrp,
 .dp .list_content.nodata .list_item,
 .dp .list_content.nodata .list_last{display:none;}
-.dp .list_content.nodata .list_defult{display:block;} 
+.dp .list_content.nodata .list_defult{display:block;}
 .dp .itemsGrp .item_prod:nth-child(2n){margin-right: 0;}
 .dp .itemsGrp .item_prod:nth-last-child(1),
 .dp .itemsGrp .item_prod:nth-last-child(2) {padding-bottom: 1.0rem; margin-bottom: 0 !important;}
@@ -1638,7 +1638,7 @@
 .dp .dp_outlets .best_item .itemsGrp:after {content:''; display: block; clear:both;}
 .dp .dp_outlets .best_item .itemsGrp .item_prod {width: 48.75%; float:left; margin-right: 2.5%;}
 .dp .dp_outlets .best_item .itemsGrp .item_prod:nth-child(2n) {margin-right: 0;}
-.dp .dp_outlets .md_item .dp_subtitle, 
+.dp .dp_outlets .md_item .dp_subtitle,
 .dp .dp_outlets .best_item .dp_subtitle {text-align: center; margin-bottom: 2.4rem; font-size: 2rem; padding-top: 6rem;}
 
 /* 룩북 - dp_lookbook */
@@ -1693,7 +1693,7 @@
 .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 .itemBadge, 
+.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%;}
 .dp_hotdeal .itemsGrp.rowtype .item_prod .itemLink {display: table-cell; position: static; vertical-align: top; padding-top: 1.8rem; padding-left:17.6rem;}
@@ -1871,7 +1871,7 @@
 }
 .dp .dp_util .select_dress:after {
   content: "";width: 0;height: 0;box-sizing: border-box;position: absolute;top:0.5rem;right:0;
-  border: 0.5rem solid transparent; border-color: #222222 transparent transparent transparent;  
+  border: 0.5rem solid transparent; border-color: #222222 transparent transparent transparent;
 }
 .dp .dp_util .select_options {
   display: none;position: absolute;top:2rem;right: 0;left: 0;z-index: 2;
@@ -2000,7 +2000,7 @@
 .filter_body > ul > li .colorbox{padding:2rem 1rem; display:flex; flex-wrap: wrap;}
 .filter_body > ul > li .colorbox li {margin:0.5rem 0.5rem; position:relative;}
 .filter_body > ul > li .colorbox li .color-check input {position: absolute; display: block;overflow: hidden; height: 0.1rem; width: 0.1rem; clip: rect(1px, 1px, 1px, 1px);}
-.filter_body > ul > li .colorbox li .color-check [class*="pdColor"], 
+.filter_body > ul > li .colorbox li .color-check [class*="pdColor"],
 .filter_body > ul > li .filter_content [class*="pdColor"] {position: relative; display: inline-block;width: 2.4rem;height: 2.4rem;font-size: 0;vertical-align: middle;margin: 0 0 0 2px;border-radius: 50%;box-sizing: border-box;}
 .filter_body > ul > li .colorbox li [class*="pdColor"]:before {content: ""; display: inline-block; width: 100%; height: 100%; border-radius: 50%; box-sizing: border-box;}
 .filter_body > ul > li.color .daps1 span [class*="pdColor"]{position:relative; display:inline-block; margin-left:0.5rem; width:1.2rem; height:1.2rem; border-radius:50%; overflow:hidden;}
@@ -2123,7 +2123,7 @@
 .modal#reco_pop .itemsGrp.rowtype .item_prod:nth-child(2){padding-top:2rem; margin-top:2rem; border-top:0.1rem solid #eee;}
 .modal#reco_pop .itemsGrp.rowtype .item_prod:nth-child(2n) {margin-right: 0;}
 .modal#reco_pop .itemsGrp.rowtype .item_prod .itemPercent{position: relative;}
-.modal#reco_pop .itemsGrp.rowtype .item_prod .itemBadge, 
+.modal#reco_pop .itemsGrp.rowtype .item_prod .itemBadge,
 .modal#reco_pop .itemsGrp.rowtype .item_prod .itemcolorchip {display: none;}
 .modal#reco_pop .itemsGrp.rowtype .item_prod .item_state{display: table; padding-left:7.5rem; padding-bottom: 0; height:10.5rem; width: 100%;}
 .modal#reco_pop .itemsGrp.rowtype .item_prod .item_state:after{content:''; position:absolute; right:0; top:50%; display:inline-block; width:0.6rem; height:1.1rem; background:url(/images/mo/br_pop_arrow.png) no-repeat; -webkit-transform:translateY(-50%); transform:translateY(-50%);}
@@ -2204,7 +2204,7 @@
 .br .br_main .special_shop .swiper-slide .sp_item .sp_item .itemsGrp.rowtype .item_prod:nth-child(2){padding-top:2rem; margin-top:2rem; border-top:0.1rem solid #eee;}
 .br .br_main .special_shop .swiper-slide .sp_item .sp_item .itemsGrp.rowtype .item_prod:nth-child(2n) {margin-right: 0;}
 .br .br_main .special_shop .swiper-slide .sp_item .sp_item .itemsGrp.rowtype .item_prod .itemPercent{position: relative;}
-.br .br_main .special_shop .swiper-slide .sp_item .sp_item .itemsGrp.rowtype .item_prod .itemBadge, 
+.br .br_main .special_shop .swiper-slide .sp_item .sp_item .itemsGrp.rowtype .item_prod .itemBadge,
 .br .br_main .special_shop .swiper-slide .sp_item .sp_item .itemsGrp.rowtype .item_prod .itemcolorchip {display: none;}
 .br .br_main .special_shop .swiper-slide .sp_item .sp_item .itemsGrp.rowtype .item_prod .item_state {display: table; padding-left:7.5rem; padding-bottom: 0; height:10.5rem; width: 100%;}
 .br .br_main .special_shop .swiper-slide .sp_item .sp_item .itemsGrp.rowtype .item_prod .itemLink {display: table-cell; position: static; vertical-align: middle;}
@@ -2497,16 +2497,16 @@
 .sch .sch_result .list_content .list_item .visual .txtWrap p {color: #fff; font-size: 2.4rem; font-weight: 500; line-height: 1.2;}
 .sch .sch_result .list_content .list_item .visual .txtWrap p.txt_xs {font-size: 1.2rem; margin-top:1.6rem; font-weight: 300;}
 .sch .sch_result .list_content .list_defult{display:none; text-align:center; padding:11rem 0;}
-.sch .sch_result .list_content .list_defult p{text-align:center; font-size:1.3rem; color:#888888; font-weight:300;} 
+.sch .sch_result .list_content .list_defult p{text-align:center; font-size:1.3rem; color:#888888; font-weight:300;}
 .sch .sch_result .list_content .list_defult .btn{margin-top:2.4rem; font-size:1.1rem; height:3rem;}
 .sch .sch_result .list_content .list_defult{display:none; text-align:center; padding:11rem 0;}
-.sch .sch_result .list_content .list_defult p{text-align:center; font-size:1.3rem; color:#888888; font-weight:300;} 
+.sch .sch_result .list_content .list_defult p{text-align:center; font-size:1.3rem; color:#888888; font-weight:300;}
 .sch .sch_result .list_content .list_defult .btn{margin-top:2.4rem; font-size:1.1rem; height:3rem;}
 .sch .sch_result .list_content.nodata .lookbookGrp,
 .sch .sch_result .list_content.nodata .itemsGrp,
 .sch .sch_result .list_content.nodata .list_item,
 .sch .sch_result .list_content.nodata .list_last{display:none;}
-.sch .sch_result .list_content.nodata .list_defult{display:block;} 
+.sch .sch_result .list_content.nodata .list_defult{display:block;}
 .sch .sch_result .list_item.pro .itemName{font-size:1.1rem; color:#000; width:20rem;}
 .sch .sch_result .list_item.pro .itemPrice .itemPrice_sale{font-size:0.9rem; color:#888888;}
 .sch .sch_result .list_last{ padding: 2.5rem 0;margin-top: 5rem; font-size: 1.1rem; color: #888888; font-weight: 300; text-align: center; border-top:0.1rem solid #f5f5f5;}
@@ -2543,7 +2543,7 @@
 }
 .sch .sch_util .select_dress:after {
   content: "";width: 0;height: 0;box-sizing: border-box;position: absolute;top:0.5rem;right:0;
-  border: 0.5rem solid transparent; border-color: #222222 transparent transparent transparent;  
+  border: 0.5rem solid transparent; border-color: #222222 transparent transparent transparent;
 }
 .sch .sch_util .select_options {
   display: none;position: absolute;top:2rem;right: 0;left: 0;z-index: 2;
@@ -2581,6 +2581,7 @@
 header .htop .btn_back span i.gl1, header .htop .btn_back span i.gl2, header .htop .btn_back span i.gl3 {height: 0.13rem;}
 .btn_group_flex > div > .btn {padding:1.5rem;}
 .itemBadge {padding: 0.4rem; font-size: 1rem;}
+.wish_itemBadge{padding-left:0;} /*jmh 위시리스트 배지*/
 .item_prod .itemPic {padding-top: 135%;}
 .item_prod .itemName {font-size: 1.2rem;}
 .item_prod .itemPrice, .item_prod .itemPercent {font-weight: 400;}