Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front.git into develop

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -21,6 +21,7 @@ import com.style24.core.biz.dao.TscOrderDao;
 import com.style24.core.biz.service.TscKakaoPayService;
 import com.style24.core.biz.service.TscKcpService;
 import com.style24.core.biz.service.TscNaverPayService;
+import com.style24.core.biz.service.TscOrderService;
 import com.style24.core.support.env.TscConstants;
 import com.style24.front.biz.dao.TsfOrderDao;
 import com.style24.front.biz.dao.TsfRendererDao;
@@ -70,6 +71,9 @@ public class TsfOrderService {
 
 	@Autowired
 	private TsfRendererDao rendererDao;
+	
+	@Autowired
+	private TscOrderService coreOrderService;
 
 	@Autowired
 	private Environment env;
@@ -517,15 +521,39 @@ public class TsfOrderService {
 	 * @since 2021. 03. 09
 	 */
 	public String orderValidationCheck(Order order) {
+		String resultStr	= "SUCCESS";
+		
 		// 1. 주문상세체크
 		Collection<Order> orderDetailList = order.getOrderDetailList();
 		
+		// TODO 2021.05.07 1.1 장바구니 금액조회 정보 
+		order.setFrontGb(TsfSession.getFrontGb());
+		Collection<Order> cartGoodsList = coreOrderService.getCartGoodsList(order);
+		
+		int orderDetailCurrPriceSum 	= 0;
+		int orderDetailRealOrdAmtSum 	= 0;
+		int cartCurrPriceSum 			= 0;
+		int cartRealOrdAmtSum 			= 0;
+		
+		for (Order orderDetail : orderDetailList) {
+			orderDetailCurrPriceSum = orderDetailCurrPriceSum + orderDetail.getCurrPrice();
+			orderDetailRealOrdAmtSum = orderDetailRealOrdAmtSum + orderDetail.getRealOrdAmt();
+		}
+		
+		for (Order orderDetail : cartGoodsList) {
+			cartCurrPriceSum = orderDetailCurrPriceSum + orderDetail.getCurrPrice();
+		}
+		
+		// 판매가비교
+		if (orderDetailCurrPriceSum != cartCurrPriceSum) {
+			resultStr = "보유하신 상품쿠폰이 존재하지 않습니다.";
+			return resultStr;
+		}
+
 		int custCpnSq		= 0;
 		int usPntAmt		= 0;
 		int usGfcdAmt		= 0;
-		
-		String resultStr	= "SUCCESS";
-		
+
 		for (Order orderDetail : orderDetailList) {
 			
 			// TODO
@@ -645,13 +673,18 @@ public class TsfOrderService {
 			}
 		}
 		
-		// TODO 5. 사은품채고체크
+		// 6. 사은품채고체크
 		int rtnCnt = orderDao.getCheckFreegiftVal(order);
 		if (rtnCnt > 0) {
 			resultStr = "선택하신 사은품의 재고가 부족 합니다.";
 			return resultStr;
 		}
 		
+		// 7. 상품금액체크
+		
+		
+		
+		
 		return resultStr;
 		
 	}
@@ -662,8 +695,8 @@ public class TsfOrderService {
 	 * param.setOrdPhnno("01011111111");		// 현금영수증 대상 휴대폰번호
 	 * param.setUsGfcdAmt(10000);				// 현금영수증 신청 금액
 	 * param.setOrdNo(211);						// 주문번호
-	 * param.setGoodsNm("보라색 원피스");		// 상품명 (“7. 현금영수증 매출전표 연동” 을 통해 고객이 직접 전표를 확인코자 한다면 상품명을 넘겨주지 않았을 경우 구매자 인증 시 인증오류가 발생할 수 있습니다.)
-	 * param.setOrdNm("구매자");				// 구매자명
+	 * param.setGoodsNm("보라색 원피스");			// 상품명 (“7. 현금영수증 매출전표 연동” 을 통해 고객이 직접 전표를 확인코자 한다면 상품명을 넘겨주지 않았을 경우 구매자 인증 시 인증오류가 발생할 수 있습니다.)
+	 * param.setOrdNm("구매자");					// 구매자명
 	 * param.setOrdEmail("xxxx@xxxx.com");		// 구매자이메일 (“7. 현금영수증 매출전표 연동” 을 통해 고객이 직접 전표를 확인코자 한다면 메일주소를 넘겨주지 않았을 경우 구매자 인증 시 인증오류가 발생할 수 있습니다.)
 	 * @param param
 	 * @return

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

@@ -794,6 +794,15 @@ public class TsfMypageController extends TsfBaseController {
 		// 고객번호 설정
 		int custNo = TsfSession.getInfo().getCustNo();
 		order.setCustNo(custNo);
+		
+		// 2021.05.07 고객정보 조회
+		Customer customer = new Customer();
+		customer.setSiteCd(TscConstants.Site.STYLE24.value());
+		customer.setCustNo(custNo);
+		customer.setCustStat(TscConstants.CustStat.ACTIVE.value());
+		customer = coreCustomerService.getCustomerInfo(customer);
+		
+		mav.addObject("customerInfo", customer);
 
 		// 취소 가능 리스트 조회
 		GagaMap map = orderChangeService.getCancelListForMypage(order);

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

@@ -267,7 +267,15 @@ public class TsfOrderController extends TsfBaseController {
 		
 		// 4.6 선물받기여부
 		mav.addObject("giftPackYn"			, giftPackYn);								// 선물받기여부
-
+		
+		// 2021.05.07 jsh77b id만 개발자모드허용
+		boolean devTempYn = false;
+		if (TsfSession.isLogin()) {
+			if ("jsh77b".equals(TsfSession.getInfo().getCustId())) {
+				devTempYn = true;
+			}
+		}
+		mav.addObject("devTempYn"			, devTempYn);								// 개발자모드가능여부
 		mav.setViewName(super.getDeviceViewName("order/OrderForm"));
 		
 		return mav;
@@ -493,8 +501,9 @@ public class TsfOrderController extends TsfBaseController {
 			order.setJsessionId(TsfSession.getSessionId());
 		}
 		
-		// 2. 즉시할인, 다다익선 할인금액 정보 적용 상품 정보
-		Collection<Order> tmtbGoodsApplyList = cartService.getMoreBetterAmtList(order);
+		// 2. 즉시할인, 다다익선 할인금액 정보 적용 상품 정보 (2021.05.07 화면에서전송)
+		//Collection<Order> tmtbGoodsApplyList = cartService.getMoreBetterAmtList(order);
+		Collection<Order> tmtbGoodsApplyList = order.getCartGoodsList();
 
 		// 3. 배송정보조회(장바구니상품목록)
 		GagaMap delvOrderMap = coreOrderService.getCartDelvGoodsCntList(tmtbGoodsApplyList, order);
@@ -600,8 +609,9 @@ public class TsfOrderController extends TsfBaseController {
 		// 2. 로그인체크 후 정보 설정 (할인구간정보조회)
 		if (TsfSession.isLogin()) {
 			
-			// 2.1 배송단위별 상품 목록 조회 (장바구니)
-			Collection<Order> tmtbGoodsApplyList = cartService.getMoreBetterAmtList(order);
+			// 2.1 배송단위별 상품 목록 조회 (장바구니) (2021.05.07 화면에서전송)
+			//Collection<Order> tmtbGoodsApplyList = cartService.getMoreBetterAmtList(order);
+			Collection<Order> tmtbGoodsApplyList = order.getCartGoodsList();
 			
 			// 2.2 상품금액, 선포인트, 다다익선할인금액
 			goodsDcAmtMap = coreOrderService.getGoodsDcAmt(tmtbGoodsApplyList);
@@ -839,29 +849,29 @@ public class TsfOrderController extends TsfBaseController {
 		 * temp.setPgTid("20210423952698");			// temp.setVaNo("110242222222");  >> PG 송부 후 result에서 값 입력하면됨
 		 *  */
 		
-		String[] goodsNameArr = new String[2]; goodsNameArr[0] ="테스트1";goodsNameArr[1] = "테스트2";
-		String[] goodsPriceArr = new String[2]; goodsPriceArr[0] ="20000";goodsPriceArr[1] = "22000";
-		String[] goodsQuantityArr = new String[2]; goodsQuantityArr[0] ="2";goodsQuantityArr[1] = "3";
-		
-		order.setItemNmArr(goodsNameArr);			// 상품명 배열
-		order.setGoodsPriceArr(goodsPriceArr);		// 상품별 가격 배열
-		order.setItemQtyArr(goodsQuantityArr);		// 상품별 수량 배열
-		order.setOrdNo(order.getOrdNo());			// 주문번호
-		order.setRealOrdAmt(53000);					// 결제금액
-		order.setBirthYmd("198912021");				// 생년월일 + 성별(남자 : 1, 여자 : 2)
-		order.setPayMeans(TscConstants.PayMeans.BANK_DEPOSIT.value());		// 무통장입금 or 계좌이체
+		String[] goodsNameArr 		= new String[2]; goodsNameArr[0] ="테스트1";goodsNameArr[1] = "테스트2";
+		String[] goodsPriceArr 		= new String[2]; goodsPriceArr[0] ="10000";goodsPriceArr[1] = "12000";
+		String[] goodsQuantityArr 	= new String[2]; goodsQuantityArr[0] ="2";goodsQuantityArr[1] = "3";
+		
+		order.setItemNmArr(goodsNameArr);		// 상품명 배열
+		order.setGoodsPriceArr(goodsPriceArr);	// 상품별 가격 배열
+		order.setItemQtyArr(goodsQuantityArr);	// 상품별 수량 배열
+		order.setOrdNo(order.getOrdNo());		// 주문번호
+		order.setRealOrdAmt(32000);				// 결제금액
+		order.setBirthYmd("198912021");			// 생년월일 + 성별(남자 : 1, 여자 : 2)
+		order.setPayMeans(TscConstants.PayMeans.ACCOUNT_TRANSFER.value());		// 무통장입금 or 계좌이체
 		order.setBankNm("신한은행");				// 은행명  >> PG 송부 후 result에서 값 입력하면됨
 		order.setOrdNm("이태영");					// 주문자명
-		order.setOrdTelno("");						// 주문자전화1 ("-" 포함)
-		order.setOrdPhnno("010-1234-5555");			// 주문자전화2 ("-" 포함)
-		order.setRecipZipcode("08755");				// 주문자우편번호
+		order.setOrdTelno("");					// 주문자전화1 ("-" 포함)
+		order.setOrdPhnno("010-1234-5555");		// 주문자전화2 ("-" 포함)
+		order.setRecipZipcode("08755");			// 주문자우편번호
 		order.setRecipAddr("서울시 관악구 신림동 1414-11 타워타워 101호");	// 주문자주소
 		order.setOrdEmail("xodud1202@naver.com");	// 주문자이메일
 		order.setRecipNm("이태영");					// 수령인명
 		order.setRecipTelno("");					// 수령인전화번호
 		order.setRecipPhnno("010-1234-5555");		// 수령인휴대폰번호
 		order.setCustNo(100010);					// 고객번호
-		order.setVaNo("110222119990");				// 가상계좌번호
+		order.setVaNo("110242222222");				// 가상계좌번호
 
 		// uSafeGuaranteeInsurance(order);
 		orderService.uSafeGuaranteeInsurance(order);

src/main/java/com/style24/persistence/mybatis/shop/TsfOrderChange.xml

@@ -316,6 +316,7 @@
 			</when>
 		</choose>
 		       ) Z
+		 WHERE Z.ORD_CAN_CHG_QTY > 0
 		 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.ORD_NM, Z.ORD_PHNNO, Z.GIFT_ADDR_INP_YN, Z.ORD_DTL_NO, Z.ORD_EXCH_GB, Z.GOODS_CD, Z.GOODS_NM, Z.LIST_PRICE, Z.SYS_IMG_NM
 		        , Z.ORD_DTL_STAT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.ORD_AMT, Z.REAL_ORD_AMT, Z.SAVE_PNT_AMT, Z.CNCL_RTN_AMT, Z.PNT_DC_AMT
 		        , Z.GFCD_USE_AMT, Z.SHIP_COMP_CD, Z.GIFT_PACK_YN, Z.SHIP_COMP_NM, Z.INVOICE_NO, Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD

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

@@ -17,7 +17,7 @@
 
 <th:block layout:fragment="content">
 
-<main role="" id="" class="container my">
+<main class="container my">
 	<section class="content my_return">
 		<form id="cancelForm" class="form_wrap">
 			<input type="hidden" name="accountNo" 	th:value="${oneData.accountNo}"/>
@@ -53,8 +53,8 @@
 												<span th:text="${cancel.brandNm}"></span>
 												<div class="badge_wrap">
 													<em class="tag primary" th:if="${cancel.shotDelvYn == 'Y'}">총알배송</em>
-													<em class="tag" th:if="${cancel.shotDelvYn == 'N' and cancel.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
-													<em class="tag" th:if="${cancel.selfGoodsYn == 'N'}">업체직배송</em>
+													<em class="tag" 		th:if="${cancel.shotDelvYn == 'N' and cancel.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+													<em class="tag" 		th:if="${cancel.selfGoodsYn == 'N'}">업체직배송</em>
 												</div>
 											</div>
 											<div class="name" th:text="${cancel.goodsNm}"></div>
@@ -185,9 +185,6 @@
 								</td>
 							</tr>
 						</table>
-						<!-- 
-						<button type="button" class="btn btn_default"><span>취소 전표 보기</span></button>
-						 -->
 					</div>
 				</div>
 				<div class="required_group">
@@ -195,7 +192,7 @@
 				</div>
 				<div class="btn_group btn_group_flex">
 					<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);"><span>취소</span></button></div>
-					<div><button type="button" id="btn_order_return" class="btn btn_dark" onclick="fnCancel();"><span>주문 취소</span></button></div>
+					<div><button type="button" class="btn btn_dark" onclick="fnCancel();"><span>주문 취소</span></button></div>
 				</div>
 			</div>
 		</form>
@@ -204,7 +201,7 @@
 
 <!-- 210408_취소 수량 선택 팝업 -->
 <th:block th:if="${cancelList.cancelList}" th:each="cancel, status : ${cancelList.cancelList}">
-	<div class="popup_box returnCountPop">
+	<div class="popup_box cancelCountPop">
 		<div class="lap">
 			<div class="popup_close">카테고리닫기</div>
 			<div class="popup_head sr-only">
@@ -213,7 +210,7 @@
 			<div class="popup_con">
 				<div class="button_list clear">
 					<button type="button" qty=0 onclick="fnChangeCancelQty(this);"><span>수량 0개</span></button>
-					<th:block th:each="num : ${#numbers.sequence(1,cancel.ordCanChgQty)}">
+					<th:block th:each="num : ${#numbers.sequence(1, cancel.ordCanChgQty)}">
 						<button type="button" th:qty="${num}" onclick="fnChangeCancelQty(this);"><span th:text="|수량 ${num}개|"></span></button>
 					</th:block>
 					<input type="hidden" name="ordDtlNo" th:value="${cancel.ordDtlNo}">
@@ -234,7 +231,7 @@
 		<div class="popup_con">
 			<div class="tbl_wrap">
 				<div class="tbl_tit"> 
-					<h3>환불 계좌 등록</h3><!-- 210409_수정 : 텍스트 변경 -->
+					<h3>환불 계좌 등록</h3>
 				</div>
 				<div class="tbl type1">
 					<table>
@@ -319,13 +316,13 @@ $(document).ready(function() {
 });
 
 // 취소수량버튼기능
-$(".select_custom.select_count").each(function(idx){
+$("#cancelForm .select_custom.select_count").each(function(idx){
 	$(this).on("click", function(){
 		// 전체비활성화
-		$(".returnCountPop").hide();
+		$(".cancelCountPop").hide();
 		
 		// 수량팝업활성화
-		$(".returnCountPop").eq(idx).show().addClass("active");
+		$(".cancelCountPop").eq(idx).show().addClass("active");
 		$("body").css({"overflow":"hidden"});
 	});
 });

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

@@ -14,7 +14,6 @@
  *******************************************************************************
  -->
 <body>
-
 <th:block layout:fragment="content">
 <main role="" id="" class="container my">
 	<section class="content my_return">
@@ -37,55 +36,58 @@
 					</th:block>
 				</div>
 				
-				<th:block th:if="${cancelDetailList.cancelDetailList}" th:each="returnDtl, status : ${cancelDetailList.cancelDetailList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+				<th:block th:if="${cancelDetailList.cancelDetailList}" th:each="cancelDtl, status : ${cancelDetailList.cancelDetailList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 					<div class="goods_section">
 						<div class="goods_status">
-							<p class="dlvr_staus" th:if="${returnDtl.chgStat == 'G685_17' or returnDtl.chgStat == 'G685_18'}">주문취소</p>
-							<p class="dlvr_staus" th:unless="${returnDtl.chgStat == 'G685_17' or returnDtl.chgStat == 'G685_18'}" th:text="${returnDtl.chgStatNm}"></p>
-							<p class="dlvr_desc" th:text="|${returnDtl.chgDate} ${returnDtl.chgTime}|"></p>
+							<p class="dlvr_staus" 	th:if="${cancelDtl.chgStat == 'G685_17' or cancelDtl.chgStat == 'G685_18'}">주문취소</p>
+							<p class="dlvr_staus" 	th:unless="${cancelDtl.chgStat == 'G685_17' or cancelDtl.chgStat == 'G685_18'}" th:text="${cancelDtl.chgStatNm}"></p>
+							<p class="dlvr_desc" 	th:text="|${cancelDtl.chgDate} ${cancelDtl.chgTime}|"></p>
 						</div>
-						
 						<div class="goods_detail">
 							<a href="">
 								<div class="thumb_box">
-									<img th:src="${imageUrl + '/' + returnDtl.sysImgNm}" width="100%" alt="">
+									<img th:src="${imageUrl + '/' + cancelDtl.sysImgNm}" width="100%" alt="">
 								</div>
 								<div class="info_box">
 									<div class="od_name">
 										<div class="brand">
-											<span th:text="${returnDtl.brandNm}"></span>
+											<span th:text="${cancelDtl.brandNm}"></span>
 											<div class="badge_wrap">
-												<em class="tag primary" th:if="${returnDtl.shotDelvYn == 'Y'}">총알배송</em>
-												<em class="tag" th:if="${returnDtl.shotDelvYn == 'N' and returnDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
-												<em class="tag" th:if="${returnDtl.selfGoodsYn == 'N'}">업체직배송</em>
+												<em class="tag primary" 	th:if="${cancelDtl.shotDelvYn == 'Y'}">총알배송</em>
+												<em class="tag" 			th:if="${cancelDtl.shotDelvYn == 'N' and cancelDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+												<em class="tag" 			th:if="${cancelDtl.selfGoodsYn == 'N'}">업체직배송</em>
 											</div>
 										</div>
-										<div class="name" th:text="${returnDtl.goodsNm}"></div>
+										<div class="name" th:text="${cancelDtl.goodsNm}"></div>
 									</div>
 									<div class="od_opt">
 										<div class="option">
-											<th:block th:if="${returnDtl.goodsType == 'G056_S'}">
-												<th:block th:each="option, status : ${returnDtl.colorNmArr}">
+											<th:block th:if="${cancelDtl.goodsType == 'G056_S'}">
+												<th:block th:each="option, status : ${cancelDtl.colorNmArr}">
 													<em th:text="${option}"></em>
-													<em th:text="${returnDtl.optCd2Arr[status.index]}"></em>
+													<em th:text="${cancelDtl.optCd2Arr[status.index]}"></em>
 												</th:block>
 											</th:block>
-											<th:block th:unless="${returnDtl.goodsType == 'G056_S'}">
-												<em th:text="${returnDtl.colorNm}"></em>
-												<em th:text="${returnDtl.optCd2}"></em>
+											<th:block th:unless="${cancelDtl.goodsType == 'G056_S'}">
+												<em th:text="${cancelDtl.colorNm}"></em>
+												<em th:text="${cancelDtl.optCd2}"></em>
 											</th:block>
 										</div>
 									</div>
 									<div class="od_calc">
 										<p class="price">
-											<span class="count"><em th:text="${returnDtl.chgQty}"></em>개</span>
+											<span class="count"><em th:text="${cancelDtl.chgQty}"></em>개</span>
 										</p>
 									</div>
 								</div>
 							</a>
 						</div>
 						<div class="goods_btn_wrap btn_group_flex">
-							<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
+							<div>
+								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">
+									<span>1:1 문의</span>
+								</button>
+							</div>
 						</div>
 					</div>
 				</th:block>
@@ -216,223 +218,9 @@ var isLogin = [[${isLogin}]];
 
 $(document).ready(function() {
 
-});
-
-// 회수지 정보 설정
-var delvAddrSet = function(delvObj) {
-	let ordChgSq 		= oneData.ordChgSq;
-	let chgerNm 		= delvObj.recipNm;
-	let chgerPhnno 		= delvObj.recipPhnno;
-	let chgerZipcode 	= delvObj.recipZipcode;
-	let chgerBaseAddr 	= delvObj.recipBaseAddr;
-	let chgerDtlAddr 	= delvObj.recipDtlAddr;
-	let chgerRtnMemo 	= delvObj.delvMemo;
-	let chgerAddr 		= chgerBaseAddr + ' ' + chgerDtlAddr;
-
-	let data = {};
-	data.ordChgSq 		= ordChgSq;
-	data.chgerNm 		= chgerNm;
-	data.chgerPhnno 	= chgerPhnno;
-	data.chgerZipcode 	= chgerZipcode;
-	data.chgerBaseAddr 	= chgerBaseAddr;
-	data.chgerDtlAddr 	= chgerDtlAddr;
-	data.chgerRtnMemo 	= chgerRtnMemo;
-
-	let jsonData = JSON.stringify(data);
-
-	gagajf.ajaxJsonSubmit('/mypage/change/chger/addr', jsonData, function(result) {
-		if (result.status == '200') {
-			$('#chgerNm').text(chgerNm);
-			$('#chgerPhnno').text(chgerPhnno);
-			$('#chgerAddr').text(chgerAddr);
-			$('#chgerRtnMemo').text(chgerRtnMemo);
-		}
-	});
-}
-
-// 배송메모 설정
-var delvMemoSet = function(delvMemoObj) {
-	let ordChgSq = oneData.ordChgSq;
-	let delvMemo = delvMemoObj.delvMemo;
-
-	let data = {};
-	data.ordChgSq = ordChgSq;
-	data.chgerRtnMemo = delvMemo;
-	
-	let jsonData = JSON.stringify(data);
-	
-	gagajf.ajaxJsonSubmit('/mypage/change/chger/rtn/memo', jsonData, function(result) {
-		if (result.status == '200') {
-			$("#chgerRtnMemo").text(delvMemo);
-		}
-	});
-	
-}
-/*]]>*/
-</script>
-
-</th:block>
-					</div>
-				</th:block>
-			</div>
-		</div>
-		
-		<div class="inner">
-			<div class="tbl_wrap">
-				<div class="tbl_tit"> 
-					<h3>상세 정보</h3>
-				</div>
-				<div class="tbl type1">
-					<table>
-						<colgroup>
-							<col width="107">
-							<col width="*">
-						</colgroup>   
-						<tr>
-							<th>반품 접수 일자</th>
-							<td><div><span th:text="${oneData.chgDt}"></span></div></td>
-						</tr>
-						<tr>
-							<th>반품 완료 일자</th>
-							<td><div><span th:text="${oneData.completeDt}"></span></div></td>
-						</tr>
-					</table>
-				</div>
-			</div>
-		</div>
-		<div class="inner">
-			<div class="tbl_wrap">
-				<div class="tbl_tit"> 
-					<h3>반품 회수지 주소</h3>
-					<button type="button" id="btn_adrsChange_pop" class="btn_popup" th:if="${oneData.chgStat == 'G685_50' or oneData.chgStat == 'G685_51'}" onclick="fnChangeDeliveryAddr();">
-						<span>회수지 변경</span>
-					</button>
-				</div>
-				<div class="tbl">
-					<div class="ship_info">
-						<dl>
-							<div class="name">
-								<dt><span class="sr-only">배송지명</span></dt>
-								<dd id="chgerNm" th:text="${oneData.chgerNm}"></dd>
-							</div>
-							<div class="addr">
-								<dt><span class="sr-only">배송주소</span></dt>
-								<dd id="chgerAddr" th:text="|${oneData.chgerBaseAddr} ${oneData.chgerDtlAddr}|"></dd>
-							</div>
-							<div class="phone">
-								<dt><span class="sr-only">휴대폰 번호</span></dt>
-								<dd id="chgerPhnno" th:text="${oneData.chgerPhnno}"></dd>
-							</div>
-						</dl>
-					</div>
-				</div>
-			</div>
-		</div>
-		<div class="inner">
-			<div class="tbl_wrap pay_wrap">
-				<div class="tbl_tit"> 
-					<h3>환불 정보</h3>
-					<strong class="pay"><span th:text="${#numbers.formatInteger(oneData.refundAmt + oneData.rfPntAmt + oneData.rfGfcdUseAmt, 1, 'COMMA')}"></span>원</strong>
-				</div>
-				<div class="tbl type1">
-					<table>
-						<colgroup>
-							<col width="227">
-							<col width="*">
-						</colgroup>   
-						<tr>
-							<td>
-								<dl class="refund_deduct">
-									<div>
-										<dt>상품 취소 금액</dt>
-										<dd>
-											<div>
-												<span th:text="${#numbers.formatInteger(oneData.rfCnclAmt, 1, 'COMMA')}"></span>원
-											</div>
-										</dd>
-									</div>
-									<div>
-										<dt>배송비</dt>
-										<dd>
-											<div>
-												<span th:text="${#numbers.formatInteger(oneData.rfDeliveryFee, 1, 'COMMA')}"></span>원
-											</div>
-										</dd>
-									</div>
-									<div>
-										<dt>할인 금액 차감</dt>
-										<dd>
-											<div>
-												<span th:text="${#numbers.formatInteger(-(oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfPrePntAmt), 1, 'COMMA')}"></span>원
-											</div>
-										</dd>
-									</div>
-								</dl>
-								<dl class="refund_detail">
-									<div>
-										<dt>환불 수단</dt>
-										<dd>
-											<div>
-												<span th:if="${oneData.pgGb == 'KCP'}" th:text="${oneData.payMeansNm}"></span>
-												<span th:if="${oneData.pgGb == 'NAVER'}">네이버페이</span>
-												<span th:if="${oneData.pgGb == 'KAKAO'}">카카오페이</span>
-												<span th:if="${oneData.pgGb == 'PAYCO'}">PAYCO</span>
-											</div>
-										</dd>
-									</div>
-									<div>
-										<dt>결제금액 환불</dt>
-										<dd>
-											<div>
-												<span th:text="${#numbers.formatInteger(oneData.refundAmt, 1, 'COMMA')}"></span>원
-											</div>
-										</dd>
-									</div>
-									<div>
-										<dt>포인트 환불</dt>
-										<dd>
-											<div>
-												<span th:text="${#numbers.formatInteger(oneData.rfPntAmt, 1, 'COMMA')}"></span>P
-											</div>
-										</dd>
-									</div>
-									<div>
-										<dt>상품권 환불</dt>
-										<dd>
-											<div>
-												<span th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt, 1, 'COMMA')}"></span>원
-											</div>
-										</dd>
-									</div>
-								</dl>
-							</td>
-						</tr>
-					</table>
-					<th:block th:if="${refundYn == 'Y' and oneData.pgGb == 'KCP' and oneData.payMeans == 'G014_30'}">
-						<button type="button" id="btn_chit_cancle" class="btn btn_default" onclick="fnReceipt('cancel')">
-							<span>취소 전표 보기</span>
-						</button>
-					</th:block>
-				</div>
-			</div>
-			<p class="desc_txt">카드사로 결제 취소 요청이 전달된 후 환불까지는 평일 기준 3 ~7일이<br>소요될 수 있습니다.</p>
-			<div class="btn_group btn_group_flex">
-				<div><button class="btn btn_dark" onclick="cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);"><span>확인</span></button></div>
-			</div>
-		</div>
-	</section>
-</main>
-<script th:inline="javascript">
-/*<![CDATA[*/
-let oneData = [[${oneData}]];
-var isLogin = [[${isLogin}]];
-
-$(document).ready(function() {
-
 });
 /*]]>*/
 </script>
-
 </th:block>
 
 </body>

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

@@ -35,81 +35,95 @@
 					<th:block th:unless="${oneData.giftPackYn == 'Y'}">
 						<div class="goods_date">주문일<span class="date" th:text="${oneData.ordDt}"></span></div>
 					</th:block>
+					<th:block th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}">
+						<a href="javascript:void(0);" th:attr="ordNo=${oneData.ordNo}, ordChgSq=${oneData.ordChgSq}, cancelGb=${oneData.chgGb}" onclick="fnCreCancel(this);" class="detail_btn">전체신청취소</a>
+					</th:block>
 				</div>
 				
-				<th:block th:if="${exchangeDetailList.exchangeDetailList}" th:each="returnDtl, status : ${exchangeDetailList.exchangeDetailList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+				<th:block th:if="${exchangeDetailList.exchangeDetailList}" th:each="exchangeDtl, status : ${exchangeDetailList.exchangeDetailList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 					<div class="goods_section">
 						<div class="goods_status">
-							<p class="dlvr_staus" th:text="${returnDtl.chgStatNm}"></p>
-							<p class="dlvr_desc" th:text="|${returnDtl.chgDate} ${returnDtl.chgTime}|"></p>
+							<p class="dlvr_staus" th:if="${exchangeDtl.chgStat == 'G685_40' && (exchangeDtl.ordDtlStat == 'G013_20' or exchangeDtl.ordDtlStat == 'G013_30' or exchangeDtl.ordDtlStat == 'G013_35' or exchangeDtl.ordDtlStat == 'G013_40' or exchangeDtl.ordDtlStat == 'G013_50')}" th:text="|교환진행중|"></p>
+							<p class="dlvr_staus" th:if="${exchangeDtl.chgStat == 'G685_40' && (exchangeDtl.ordDtlStat == 'G013_60' or exchangeDtl.ordDtlStat == 'G013_70')}" th:text="|교환완료|"></p>
+							<p class="dlvr_staus" th:if="${exchangeDtl.chgStat == 'G685_49'}" th:text="|접수취소|"></p>
+							<p class="dlvr_staus" th:unless="${exchangeDtl.chgStat == 'G685_40' or exchangeDtl.chgStat == 'G685_49'}" th:text="${exchangeDtl.chgStatNm}"></p>
+							
+							<p class="dlvr_desc" th:text="|${exchangeDtl.chgDate} ${exchangeDtl.chgTime}|"></p>
 						</div>
 						<div class="goods_detail">
 							<a href="">
 								<div class="thumb_box">
-									<img th:src="${imageUrl + '/' + returnDtl.sysImgNm}" width="100%" alt="">
+									<img th:src="${imageUrl + '/' + exchangeDtl.sysImgNm}" width="100%" alt="">
 								</div>
 								<div class="info_box">
 									<div class="od_name">
 										<div class="brand">
-											<span th:text="${returnDtl.brandNm}"></span>
+											<span th:text="${exchangeDtl.brandNm}"></span>
 											<div class="badge_wrap">
-												<em class="tag primary" th:if="${returnDtl.shotDelvYn == 'Y'}">총알배송</em>
-												<em class="tag" th:if="${returnDtl.shotDelvYn == 'N' and returnDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
-												<em class="tag" th:if="${returnDtl.selfGoodsYn == 'N'}">업체직배송</span>
+												<em class="tag primary" th:if="${exchangeDtl.shotDelvYn == 'Y'}">총알배송</em>
+												<em class="tag" 		th:if="${exchangeDtl.shotDelvYn == 'N' and exchangeDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+												<em class="tag" 		th:if="${exchangeDtl.selfGoodsYn == 'N'}">업체직배송</span>
 											</div>
 										</div>
-										<div class="name" th:text="${returnDtl.goodsNm}"></div>
+										<div class="name" th:text="${exchangeDtl.goodsNm}"></div>
 									</div>
 									<div class="od_opt">
 										<div class="option">
-											<th:block th:if="${returnDtl.goodsType == 'G056_S'}">
-												<th:block th:each="option, status : ${returnDtl.colorNmArr}">
+											<th:block th:if="${exchangeDtl.goodsType == 'G056_S'}">
+												<th:block th:each="option, status : ${exchangeDtl.colorNmArr}">
 													<em th:text="${option}"></em>
-													<em th:text="${returnDtl.optCd2Arr[status.index]}"></em>
+													<em th:text="${exchangeDtl.optCd2Arr[status.index]}"></em>
 												</th:block>
 											</th:block>
-											<th:block th:unless="${returnDtl.goodsType == 'G056_S'}">
-												<em th:text="${returnDtl.colorNm}"></em>
-												<em th:text="${returnDtl.optCd2}"></em>
+											<th:block th:unless="${exchangeDtl.goodsType == 'G056_S'}">
+												<em th:text="${exchangeDtl.colorNm}"></em>
+												<em th:text="${exchangeDtl.optCd2}"></em>
 											</th:block>
 										</div>
 									</div>
 									<div class="od_exchange_opt">
 										<span>교환옵션</span>
 										<div class="option">
-											<th:block th:if="${returnDtl.goodsType == 'G056_S'}">
-												<th:block th:each="option, status : ${returnDtl.chgColorNmArr}">
-													<em th:text="${returnDtl.chgItemNmArr[status.index]}"></em>
+											<th:block th:if="${exchangeDtl.goodsType == 'G056_S'}">
+												<th:block th:each="option, status : ${exchangeDtl.chgColorNmArr}">
+													<em th:text="${exchangeDtl.chgItemNmArr[status.index]}"></em>
 													<em th:text="${option}"></em>
-													<em th:text="${returnDtl.chgOptCd2Arr[status.index]}"></em>
+													<em th:text="${exchangeDtl.chgOptCd2Arr[status.index]}"></em>
 												</th:block>
 											</th:block>
-											<th:block th:unless="${returnDtl.goodsType == 'G056_S'}">
-												<em th:text="${returnDtl.chgColorNm}"></em>
-												<em th:text="${returnDtl.chgOptCd2}"></em>
+											<th:block th:unless="${exchangeDtl.goodsType == 'G056_S'}">
+												<em th:text="${exchangeDtl.chgColorNm}"></em>
+												<em th:text="${exchangeDtl.chgOptCd2}"></em>
 											</th:block>
 										</div>
 									</div>
 									<div class="od_calc">
 										<p class="price">
-											<span class="count"><em th:text="${returnDtl.chgQty}"></em>개</span>
+											<span class="count"><em th:text="${exchangeDtl.chgQty}"></em>개</span>
 										</p>
 									</div>
 								</div>
 							</a>
 						</div>
 						<div class="goods_btn_wrap btn_group_flex">
-							<div th:if="${returnDtl.chgStat == 'G685_20' or returnDtl.chgStat == 'G685_21'}"><button type="button" class="btn btn_default" th:attr="ordNo=${returnDtl.ordNo}, ordChgSq=${returnDtl.ordChgSq}, cancelGb=${returnDtl.chgGb}" onclick="fnCreCancel(this);"><span>신청 취소</span></button></div>
-							<div th:if="${returnDtl.chgStat == 'G685_32' or returnDtl.chgStat == 'G685_21'}"><button type="button" class="btn btn_default" th:attr="ordNo=${returnDtl.ordNo}, ordChgSq=${returnDtl.ordChgSq}" onclick="fnCrePayAddCost(this);"><span>결재하기</span></button></div>
-							<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
+							<div th:if="${exchangeDtl.chgStat == 'G685_32' or exchangeDtl.chgStat == 'G685_21'}">
+								<button type="button" class="btn btn_default" th:attr="ordNo=${exchangeDtl.ordNo}, ordChgSq=${exchangeDtl.ordChgSq}" onclick="fnCrePayAddCost(this);">
+									<span>결재하기</span>
+								</button>
+							</div>
+							<div>
+								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">
+									<span>1:1 문의</span>
+								</button>
+							</div>
 						</div>
 						<div class="goods_txt">
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_21' or (returnDtl.chgGb == 'G680_40' and returnDtl.chgStat == 'G685_32')}" th:text="|${returnDtl.addPayCost}원 결제 후 교환 가능합니다.|"></p>
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_20'}">교환 신청이 접수 되었습니다.<br> 신속하게 처리하여 드리겠습니다.</p>
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_30'}">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p>
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_31' and returnDtl.chgGb == 'G680_40'}">고객님이 교환하신 상품을 검수 중에 있습니다.</p>
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_40' and (returnDtl.chgOrdDtlStat == 'G013_60' or returnDtl.chgOrdDtlStat == 'G013_70')}">교환이 완료되었습니다.</p>
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_49'}">요청하신 교환을 취소하였습니다.</p>
+							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_21' or (exchangeDtl.chgGb == 'G680_40' and exchangeDtl.chgStat == 'G685_32')}" th:text="|${exchangeDtl.addPayCost}원 결제 후 교환 가능합니다.|"></p>
+							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_20'}">교환 신청이 접수 되었습니다.<br> 신속하게 처리하여 드리겠습니다.</p>
+							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_30'}">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p>
+							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_31' and exchangeDtl.chgGb == 'G680_40'}">고객님이 교환하신 상품을 검수 중에 있습니다.</p>
+							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_40' and (exchangeDtl.chgOrdDtlStat == 'G013_60' or exchangeDtl.chgOrdDtlStat == 'G013_70')}">교환이 완료되었습니다.</p>
+							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_49'}">요청하신 교환을 취소하였습니다.</p>
 						</div>
 					</div>
 				</th:block>
@@ -142,9 +156,11 @@
 			<div class="tbl_wrap">
 				<div class="tbl_tit"> 
 					<h3>교환 상품 배송지</h3>
-					<button type="button" id="btn_adrsChange_pop" class="btn_popup" th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25' or oneData.chgOrdDtlStat == 'G013_30' or oneData.chgOrdDtlStat == 'G013_35' or oneData.chgOrdDtlStat == 'G013_40'}" onclick="fnChangeAddr('recip');">
-						<span>배송지 변경</span>
-					</button>
+					<th:block th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25' or oneData.chgOrdDtlStat == 'G013_30' or oneData.chgOrdDtlStat == 'G013_35' or oneData.chgOrdDtlStat == 'G013_40'}">
+						<button type="button" id="btn_adrsChange_pop" class="btn_popup" onclick="fnChangeAddr('recip');">
+							<span>배송지 변경</span>
+						</button>
+					</th:block>
 				</div>
 				<div class="tbl">
 					<div class="ship_info">
@@ -175,9 +191,11 @@
 				<div class="tbl_wrap">
 					<div class="tbl_tit"> 
 						<h3>교환 회수지 주소</h3>
-						<button type="button" id="btn_adrsChange_pop" class="btn_popup" th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}" onclick="fnChangeAddr('chger');">
-							<span>회수지 변경</span>
-						</button>
+						<th:block th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}">
+							<button type="button" id="btn_adrsChange_pop" class="btn_popup"  onclick="fnChangeAddr('chger');">
+								<span>회수지 변경</span>
+							</button>
+						</th:block>
 					</div>
 					<div class="tbl">
 						<div class="ship_info">
@@ -246,36 +264,36 @@
 	// 배송지 및 회수지 정보 설정
 	var delvAddrSet = function(delvObj) {
 		let url = '';
-		let ordChgSq = oneData.ordChgSq;
-		let delvAddrSq = oneData.delvAddrSq;
-		let recipNm = delvObj.recipNm;
-		let recipPhnno = delvObj.recipPhnno;
-		let recipZipcode = delvObj.recipZipcode;
-		let recipBaseAddr = delvObj.recipBaseAddr;
-		let recipDtlAddr = delvObj.recipDtlAddr;
-		let delvMemo = delvObj.delvMemo;
-		let recipAddr = recipBaseAddr + ' ' + recipDtlAddr;
+		let ordChgSq 		= oneData.ordChgSq;
+		let delvAddrSq 		= oneData.delvAddrSq;
+		let recipNm 		= delvObj.recipNm;
+		let recipPhnno 		= delvObj.recipPhnno;
+		let recipZipcode 	= delvObj.recipZipcode;
+		let recipBaseAddr 	= delvObj.recipBaseAddr;
+		let recipDtlAddr 	= delvObj.recipDtlAddr;
+		let delvMemo 		= delvObj.delvMemo;
+		let recipAddr 		= recipBaseAddr + ' ' + recipDtlAddr;
 
 		let data = {};
 
 		if (addrGb == 'chger') {
 			url = '/mypage/change/chger/addr';
-			data.ordChgSq = ordChgSq;
-			data.chgerNm = recipNm;
-			data.chgerPhnno = recipPhnno;
-			data.chgerZipcode = recipZipcode;
-			data.chgerBaseAddr = recipBaseAddr;
-			data.chgerDtlAddr = recipDtlAddr;
-			data.chgerRtnMemo = delvMemo;
+			data.ordChgSq 		= ordChgSq;
+			data.chgerNm 		= recipNm;
+			data.chgerPhnno 	= recipPhnno;
+			data.chgerZipcode 	= recipZipcode;
+			data.chgerBaseAddr 	= recipBaseAddr;
+			data.chgerDtlAddr 	= recipDtlAddr;
+			data.chgerRtnMemo 	= delvMemo;
 		} else {
 			url = '/mypage/change/delvery/addr';
-			data.delvAddrSq = delvAddrSq;
-			data.recipNm = recipNm;
-			data.recipPhnno = recipPhnno;
-			data.recipZipcode = recipZipcode;
-			data.recipBaseAddr = recipBaseAddr;
-			data.recipDtlAddr = recipDtlAddr;
-			data.delvMemo = delvMemo;
+			data.delvAddrSq 	= delvAddrSq;
+			data.recipNm 		= recipNm;
+			data.recipPhnno 	= recipPhnno;
+			data.recipZipcode 	= recipZipcode;
+			data.recipBaseAddr 	= recipBaseAddr;
+			data.recipDtlAddr 	= recipDtlAddr;
+			data.delvMemo 		= delvMemo;
 		}
 
 		let jsonData = JSON.stringify(data);
@@ -296,38 +314,6 @@
 			}
 		});
 	}
-	
-	// 배송메모 설정
-	var delvMemoSet = function(delvMemoObj) {
-		let url = '';
-		let ordChgSq = oneData.ordChgSq;
-		let delvAddrSq = oneData.delvAddrSq;
-		let delvMemo = delvMemoObj.delvMemo;
-		
-		let data = {};
-		
-		if (memoGb == 'chger') {
-			url = '/mypage/change/chger/rtn/memo';
-			data.ordChgSq = ordChgSq;
-			data.chgerRtnMemo = delvMemo;
-		} else {
-			url = '/mypage/change/delvery/memo';
-			data.delvAddrSq = delvAddrSq;
-			data.delvMemo = delvMemo;
-		}
-		
-		let jsonData = JSON.stringify(data);
-		
-		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-			if (result.status == '200') {
-				if (memoGb == 'chger') {
-					$("#chgerRtnMemo").text(delvMemo);
-				} else {
-					$("#delvMemo").text(delvMemo);
-				}
-			}
-		});
-	}
 
 	var fnGoToWithdrawDelivery = function(param) {
 		// TODO

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

@@ -106,7 +106,7 @@
 						</div>
 						<!-- 취소,반품,교환 상태별 버튼기능정의 -->
 						<div class="goods_btn_wrap btn_group_flex">
-							<!-- 신청취소 -->
+							<!-- 신청취소 
 							<th:block th:if="${cre.chgStat} == 'G685_20' or ${cre.chgStat} == 'G685_21' or ${cre.chgStat} == 'G685_50' or ${cre.chgStat} == 'G685_51'">
 								<div>
 									<button type="button" class="btn btn_default" th:ordNo="${cre.ordNo}" th:ordChgSq="${cre.ordChgSq}" th:cancelGb="${cre.chgGb}" onclick="fnCreCancel(this);">

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

@@ -34,13 +34,18 @@
 					<th:block th:unless="${oneData.giftPackYn == 'Y'}">
 						<div class="goods_date">주문일<span class="date" th:text="${oneData.ordDt}"></span></div>
 					</th:block>
+					<th:block th:if="${oneData.chgStat == 'G685_50' or oneData.chgStat == 'G685_51'}">
+						<a href="javascript:void(0);" th:attr="ordNo=${oneData.ordNo}, ordChgSq=${oneData.ordChgSq}, cancelGb=${oneData.chgGb}" onclick="fnCreCancel(this);" class="detail_btn">전체신청취소</a>
+					</th:block>
 				</div>
 				
 				<th:block th:if="${returnDetailList.returnDetailList}" th:each="returnDtl, status : ${returnDetailList.returnDetailList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 					<div class="goods_section">
 						<div class="goods_status">
-							<p class="dlvr_staus" th:text="${returnDtl.chgStatNm}"></p>
-							<p class="dlvr_desc" th:text="|${returnDtl.chgDate} ${returnDtl.chgTime}|"></p>
+							<p class="dlvr_staus" th:if="${returnDtl.chgStat == 'G685_33'}" th:text="|환불진행중|"></p>
+							<p class="dlvr_staus" th:if="${returnDtl.chgStat == 'G685_69'}" th:text="|접수취소|"></p>
+							<p class="dlvr_staus" th:unless="${returnDtl.chgStat == 'G685_33' or returnDtl.chgStat == 'G685_69'}" th:text="${returnDtl.chgStatNm}"></p>
+							<p class="dlvr_desc"  th:text="|${returnDtl.chgDate} ${returnDtl.chgTime}|"></p>
 						</div>
 						
 						<div class="goods_detail">
@@ -54,8 +59,8 @@
 											<span th:text="${returnDtl.brandNm}"></span>
 											<div class="badge_wrap">
 												<em class="tag primary" th:if="${returnDtl.shotDelvYn == 'Y'}">총알배송</em>
-												<em class="tag" th:if="${returnDtl.shotDelvYn == 'N' and returnDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
-												<em class="tag" th:if="${returnDtl.selfGoodsYn == 'N'}">업체직배송</span>
+												<em class="tag" 		th:if="${returnDtl.shotDelvYn == 'N' and returnDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+												<em class="tag" 		th:if="${returnDtl.selfGoodsYn == 'N'}">업체직배송</span>
 											</div>
 										</div>
 										<div class="name" th:text="${returnDtl.goodsNm}"></div>
@@ -83,9 +88,16 @@
 							</a>
 						</div>
 						<div class="goods_btn_wrap btn_group_flex">
-							<div th:if="${returnDtl.chgStat == 'G685_50' or returnDtl.chgStat == 'G685_51'}"><button type="button" class="btn btn_default" th:attr="ordNo=${returnDtl.ordNo}, ordChgSq=${returnDtl.ordChgSq}, cancelGb=${returnDtl.chgGb}" onclick="fnCreCancel(this);"><span>신청 취소</span></button></div>
-							<div th:if="${returnDtl.chgStat == 'G685_32' or returnDtl.chgStat == 'G685_51'}"><button type="button" class="btn btn_default" th:attr="ordNo=${returnDtl.ordNo}, ordChgSq=${returnDtl.ordChgSq}" onclick="fnCrePayAddCost(this);"><span>결재하기</span></button></div>
-							<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
+							<div th:if="${returnDtl.chgStat == 'G685_32' or returnDtl.chgStat == 'G685_51'}">
+								<button type="button" class="btn btn_default" th:attr="ordNo=${returnDtl.ordNo}, ordChgSq=${returnDtl.ordChgSq}" onclick="fnCrePayAddCost(this);">
+									<span>결재하기</span>
+								</button>
+							</div>
+							<div>
+								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">
+									<span>1:1 문의</span>
+								</button>
+							</div>
 						</div>
 						<div class="goods_txt">
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_51' or (returnDtl.chgGb == 'G680_30' and returnDtl.chgStat == 'G685_32')}" th:text="|${returnDtl.addPayCost}원 결제 후 반품 가능합니다.|"></p>
@@ -128,9 +140,11 @@
 			<div class="tbl_wrap">
 				<div class="tbl_tit"> 
 					<h3>반품 회수지 주소</h3>
-					<button type="button" id="btn_adrsChange_pop" class="btn_popup" th:if="${oneData.chgStat == 'G685_50' or oneData.chgStat == 'G685_51'}" onclick="fnChangeDeliveryAddr();">
-						<span>회수지 변경</span>
-					</button>
+					<th:block th:if="${oneData.chgStat == 'G685_50' or oneData.chgStat == 'G685_51'}">
+						<button type="button" id="btn_adrsChange_pop" class="btn_popup" onclick="fnChangeDeliveryAddr();">
+							<span>회수지 변경</span>
+						</button>
+					</th:block>
 				</div>
 				<div class="tbl">
 					<div class="ship_info">

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

@@ -21,6 +21,7 @@
 	<section class="content my_exchange my_return">
 		<form id="exchangeForm" class="form_wrap">
 			<input type="hidden" name="chgReason"/>
+			
 			<div class="inner wide bg_beige">
 				<div class="order_number">
 					<dl class="clear">
@@ -49,8 +50,8 @@
 												<span th:text="${exchange.brandNm}"></span>
 												<div class="badge_wrap">
 													<em class="tag primary" th:if="${exchange.shotDelvYn == 'Y'}">총알배송</em>
-													<em class="tag" th:if="${exchange.shotDelvYn == 'N' and exchange.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
-													<em class="tag" th:if="${exchange.selfGoodsYn == 'N'}">업체직배송</em>
+													<em class="tag" 		th:if="${exchange.shotDelvYn == 'N' and exchange.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+													<em class="tag" 		th:if="${exchange.selfGoodsYn == 'N'}">업체직배송</em>
 												</div>
 											</div>
 											<div class="name" th:text="${exchange.goodsNm}"></div>

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

@@ -123,8 +123,15 @@
 							<!-- 주문상태별 버튼기능 정의 -->
 							<!-- 일반주문 -->
 							<th:block th:unless="${ordDtl.giftPackYn} == 'Y'">
+								<!-- 입금대기 1:1문의 버튼(입금대기, 배송준비중, 구매확정) -->
+								<th:block th:if="${ordDtl.ordDtlStat == 'G013_10'}">
+									<div class="goods_btn_wrap btn_group_flex">
+										<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
+									</div>
+								</th:block>
+							
 								<!-- 입금대기, 결제완료, 상품준비중, 출고처지정 : 주문취소 -->
-								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_10' or ${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
+								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
 									<div class="goods_btn_wrap btn_group_flex">
 										<div><button type="button" class="btn btn_default btn_cncl_complete" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></div>
 									</div>

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

@@ -104,8 +104,13 @@
 						<!-- 버튼기능정리 -->
 						<!-- 일반배송 -->
 						<th:block th:unless="${ordDtl.giftPackYn} == 'Y'">
-							<!-- 입금대기, 결제완료, 상품준비중, 출고처지정 (주문취소) -->
-							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_10' or ${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
+							<!-- 입금대기 1:1문의 버튼(입금대기, 배송준비중, 구매확정) -->
+							<th:block th:if="${ordDtl.ordDtlStat == 'G013_10'}">
+								<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></p>
+							</th:block>
+														
+							<!-- 결제완료, 상품준비중, 출고처지정 (주문취소) -->
+							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
 								<div class="goods_btn_wrap btn_group_flex">
 									<div>
 										<button type="button" class="btn btn_default btn_cncl_complete" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'cancel');">

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

@@ -17,7 +17,7 @@
 
 <th:block layout:fragment="content">
 
-<main role="" id="" class="container my">
+<main class="container my">
 	<section class="content my_return">
 		<form id="returnForm" class="form_wrap">
 			<input type="hidden" name="accountNo" 	th:value="${oneData.accountNo}"/>
@@ -54,8 +54,8 @@
 												<span th:text="${return.brandNm}"></span>
 												<div class="badge_wrap">
 													<em class="tag primary" th:if="${return.shotDelvYn == 'Y'}">총알배송</em>
-													<em class="tag" th:if="${return.shotDelvYn == 'N' and return.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
-													<em class="tag" th:if="${return.selfGoodsYn == 'N'}">업체직배송</em>
+													<em class="tag" 		th:if="${return.shotDelvYn == 'N' and return.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+													<em class="tag" 		th:if="${return.selfGoodsYn == 'N'}">업체직배송</em>
 												</div>
 											</div>
 											<div class="name" th:text="${return.goodsNm}"></div>
@@ -313,9 +313,6 @@
 								</td>
 							</tr>
 						</table>
-						<!-- 
-						<button type="button" class="btn btn_default"><span>취소 전표 보기</span></button>
-						 -->
 					</div>
 				</div>
 				<div class="required_group" id="addDeliveryFee" style="display:none">

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

@@ -312,8 +312,26 @@
 										<dd th:if="${orderInfo.pgGb == 'NAVER'}"><div><span>네이버 페이</span></div></dd>
 										<dd th:if="${orderInfo.pgGb == 'KAKAO'}"><div><span>카카오 페이</span></div></dd>
 										<dd th:if="${orderInfo.pgGb == 'PAYCO'}"><div><span>PAYCO</span></div></dd>
-										<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_10'}"><div><span>실시간계좌이체</span></div></dd>
-										<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_20'}"><div><span>무통장입금</span></div></dd>
+										<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_10'}">
+											<div>
+												<span>
+													실시간계좌이체
+													<th:blcok th:if="${orderInfo.cashAuthNo} != null and ${orderInfo.cashAuthNo} != ''">
+													<br>(현금영수증 신청)
+													</th:blcok>
+												</span>
+											</div>
+										</dd>
+										<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_20'}">
+											<div>
+												<span>
+													무통장입금
+													<th:blcok th:if="${orderInfo.cashAuthNo} != null and ${orderInfo.cashAuthNo} != ''">
+													<br>(현금영수증 신청)
+													</th:blcok>
+												</span>
+											</div>
+										</dd>
 										<dd><div><span th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_30'}" th:text="|${orderInfo.cardNm}/${orderInfo.cardMips}|"></span></div></dd>
 										<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_60'}"><div><span>휴대폰결제</span></div></dd>
 													

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

@@ -30,7 +30,7 @@
 <!-- 주문금액정보표현 -->
 <form id="orderAmtForm" name="orderAmtForm">
 	<!-- 고객정보 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderInfo" id="orderInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderInfo">
 		<tbody>
 			<tr style="height:30px;">
 				<th>custNm</th>
@@ -82,7 +82,7 @@
 	<!-- //사은품정보 -->
 	
 	<!-- 주문상세금액 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderDetailInfo" id="orderDetailInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderDetailInfo">
 		<tr style="height:30px;">
 			<th>cartSq</th>
 			<th style="display:none">goodsNm</th>
@@ -175,7 +175,7 @@
 	<!-- //주문상세금액 -->
 	
 	<!-- 배송단위목록 -->
-	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="delvFeeCdInfo" id="delvFeeCdInfo">
+	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="delvFeeCdInfo">
 		<tr style="height:30px;">
 			<th>supplyCompCd</th>
 			<th>delvFeeCd</th>
@@ -196,7 +196,7 @@
 	<!-- //배송단위목록 -->
 	
 	<!-- 주문금액합계 -->
-	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="orderSumAmtInfo" id="orderSumAmtInfo">
+	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="orderSumAmtInfo">
 		<tr style="height:30px;">
 			<th>orgGoodsSumAmt</th>
 			<th>delvSumAmt</th>
@@ -505,6 +505,7 @@ $(document).ready( function() {
 		, "orderMadeYn"		: orderMadeYn
 		, "custDelvAddrSq"	: 0
 		, "giftPackYn"		: giftPackYn
+		, "cartGoodsList"	: cartGoodsList
 	}
 	
 	jsonData = JSON.stringify(jsonObj);
@@ -753,10 +754,11 @@ var fnGetDailyDeliveryCheck = function (temp) {
 				}
 
 				// json 값 설정
-				var orderListObj 		= {
-					"cartSqArr"		: cartSqArr
-					, "shotDelvYn"	: tempShotDelvYn
-					, "giftPackYn"	: giftPackYn
+				var orderListObj = {
+					"cartSqArr"			: cartSqArr
+					, "shotDelvYn"		: tempShotDelvYn
+					, "giftPackYn"		: giftPackYn
+					, "cartGoodsList"	: cartGoodsList
 				};
 				
 				var orderListJsonData 	= JSON.stringify(orderListObj);
@@ -866,6 +868,9 @@ var freegiftInfoSet = function() {
 						mcxDialog.alert("적용된 할인/혜택이 초기화 됩니다.");
 						pntDcAmtReset();
 					}
+					
+					// 2021.05.07 금액계산실행
+					custCpnSumAmtCal();
 				});
 				
 				// 2021.04.29 무료사은품 기본선택
@@ -1241,6 +1246,7 @@ var paymentInfoSet = function() {
 						,"freegiftUsePointArr"	: freegiftUsePointArr
 						,"giftMsg"				: giftMsg
 						,"custPayMeans"			: custPayMeans
+						,"cartSqArr"			: cartSqArr
 					};
 					
 					$.ajax( {
@@ -1551,7 +1557,7 @@ var dcAmtInfoSet = function() {
 					}
 					
 					// 2021.04.23 추가
-					mcxDialog.alert("총 " + getZeroMinusDelAmt(pntDcAmt) + " P를 차감 결제 합니다.”");
+					mcxDialog.alert("총 " + getZeroMinusDelAmt(pntDcAmt) + " P를 차감 결제 합니다.");
 					
 					// 포인트 적용
 					$("#orderAmtForm .pntDcSumAmt").text(pntDcAmt);
@@ -1615,7 +1621,7 @@ var dcAmtInfoSet = function() {
 					}
 					
 					// 2021.04.23 추가
-					mcxDialog.alert("총 " + gfcdUseAmt.addComma() + " 원를 상품권 금액에서 차감 결제 합니다.”");
+					mcxDialog.alert("총 " + gfcdUseAmt.addComma() + " 원를 상품권 금액에서 차감 결제 합니다.");
 					
 					// 상품권 적용
 					$("#orderAmtForm .gfcdUseSumAmt").text(gfcdUseAmt);

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

@@ -46,12 +46,12 @@
 							<p class="txt">
 								<!-- 필수사은품 -->
 								<th:block th:if="${freegift.allYn} == 'Y'">
-									<span th:text="|사은품필수 ${i.count}|"></span>
+									<span th:text="'사은품필수' + ${i.count}"></span>
 								</th:block>
 								<!-- //필수사은품 -->
 								<!-- 선택사은품 -->
 								<th:block th:if="${freegift.allYn} == 'N'">
-									<span th:text="|사은품선택 ${i.count}|"></span>
+									<span th:text="'사은품선택' + ${i.count}"></span>
 								</th:block>
 								<!-- //선택사은품 -->
 								<th:block th:text="${freegift.freegiftNm}"></th:block>

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

@@ -90,10 +90,11 @@
 										</div>
 										<div class="status_box">
 											<p>
+												<th:block th:if="${exchangeDtl.chgStat == 'G685_21'}" th:text="|결제대기|"></th:block>
 												<th:block th:if="${exchangeDtl.chgStat == 'G685_40' && (exchangeDtl.ordDtlStat == 'G013_20' or exchangeDtl.ordDtlStat == 'G013_30' or exchangeDtl.ordDtlStat == 'G013_35' or exchangeDtl.ordDtlStat == 'G013_40' or exchangeDtl.ordDtlStat == 'G013_50')}" th:text="|교환진행중|"></th:block>
 												<th:block th:if="${exchangeDtl.chgStat == 'G685_40' && (exchangeDtl.ordDtlStat == 'G013_60' or exchangeDtl.ordDtlStat == 'G013_70')}" th:text="|교환완료|"></th:block>
 												<th:block th:if="${exchangeDtl.chgStat == 'G685_49'}" th:text="|접수취소|"></th:block>
-												<th:block th:unless="${exchangeDtl.chgStat == 'G685_40' or exchangeDtl.chgStat == 'G685_49'}" th:text="${exchangeDtl.chgStatNm}"></th:block>
+												<th:block th:unless="${exchangeDtl.chgStat == 'G685_21' or exchangeDtl.chgStat == 'G685_40' or exchangeDtl.chgStat == 'G685_49'}" th:text="${exchangeDtl.chgStatNm}"></th:block>
 												<span class="date" th:text="${exchangeDtl.chgDate}"></span>
 												<span class="time" th:text="${exchangeDtl.chgTime}"></span>
 											</p>
@@ -106,7 +107,7 @@
 										</div>
 									</div>
 									<!-- 교환결제대기 -->
-									<div class="order_text" th:if="${exchangeDtl.chgStat == 'G685_21' or (exchangeDtl.chgGb == 'G680_40' and exchangeDtl.chgStat == 'G685_32')}"><p th:text="|${exchangeDtl.addPayCost}|원 결제 후 교환 가능합니다."></p></div>
+									<div class="order_text" th:if="${exchangeDtl.chgStat == 'G685_21' or (exchangeDtl.chgGb == 'G680_40' and exchangeDtl.chgStat == 'G685_32')}"><p th:text="|${exchangeDtl.addPayCost}원 결제 후 교환 가능합니다.|"></p></div>
 									<!-- 교환접수 -->
 									<div class="order_text" th:if="${exchangeDtl.chgStat == 'G685_20'}"><p>교환 신청이 접수 되었습니다. 신속하게 처리하여 드리겠습니다.</p></div>
 									<!-- 회수요청 -->

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

@@ -433,6 +433,8 @@
 						});
 					} else if (cre.chgStat == 'G685_33') {
 						tag += '												환불진행중\n';
+					} else if (cre.chgStat == 'G685_21' || cre.chgStat == 'G685_51') {
+						tag += '												결제대기\n';
 					} else if (cre.chgStat == 'G685_49' || cre.chgStat == 'G685_69') {
 						tag += '												접수취소\n';
 					} else {

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

@@ -83,9 +83,10 @@
 										</div>
 										<div class="status_box">
 											<p>
+												<th:block th:if="${returnDtl.chgStat == 'G685_51'}" th:text="|결제대기|"></th:block>
 												<th:block th:if="${returnDtl.chgStat == 'G685_33'}" th:text="|환불진행중|"></th:block>
 												<th:block th:if="${returnDtl.chgStat == 'G685_69'}" th:text="|접수취소|"></th:block>
-												<th:block th:unless="${returnDtl.chgStat == 'G685_33' or returnDtl.chgStat == 'G685_69'}" th:text="${returnDtl.chgStatNm}"></th:block>
+												<th:block th:unless="${returnDtl.chgStat == 'G685_51' or returnDtl.chgStat == 'G685_33' or returnDtl.chgStat == 'G685_69'}" th:text="${returnDtl.chgStatNm}"></th:block>
 												<span class="date" th:text="${returnDtl.chgDate}"></span>
 												<span class="time" th:text="${returnDtl.chgTime}"></span>
 											</p>

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

@@ -397,9 +397,6 @@
 				chkQty += chgQty;
 			}
 		});
-		
-		console.log(ordDtlNoArr);
-		console.log(cnclRtnReqQtyArr);
 
 		// 반품 수량 체크
 		if (chkQty == 0) {

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

@@ -89,10 +89,11 @@
 										</div>
 										<div class="status_box">
 											<p>
+												<th:block th:if="${exchangeDtl.chgStat == 'G685_21'}" th:text="|결제대기|"></th:block>
 												<th:block th:if="${exchangeDtl.chgStat == 'G685_40' && (exchangeDtl.ordDtlStat == 'G013_20' or exchangeDtl.ordDtlStat == 'G013_30' or exchangeDtl.ordDtlStat == 'G013_35' or exchangeDtl.ordDtlStat == 'G013_40' or exchangeDtl.ordDtlStat == 'G013_50')}" th:text="|교환진행중|"></th:block>
 												<th:block th:if="${exchangeDtl.chgStat == 'G685_40' && (exchangeDtl.ordDtlStat == 'G013_60' or exchangeDtl.ordDtlStat == 'G013_70')}" th:text="|교환완료|"></th:block>
 												<th:block th:if="${exchangeDtl.chgStat == 'G685_49'}" th:text="|접수취소|"></th:block>
-												<th:block th:unless="${exchangeDtl.chgStat == 'G685_40' or exchangeDtl.chgStat == 'G685_49'}" th:text="${exchangeDtl.chgStatNm}"></th:block>
+												<th:block th:unless="${exchangeDtl.chgStat == 'G685_21' or exchangeDtl.chgStat == 'G685_40' or exchangeDtl.chgStat == 'G685_49'}" th:text="${exchangeDtl.chgStatNm}"></th:block>
 												<span class="date" th:text="${exchangeDtl.chgDate}"></span>
 												<span class="time" th:text="${exchangeDtl.chgTime}"></span>
 											</p>
@@ -103,7 +104,7 @@
 										</div>
 									</div>
 									<!-- 교환결제대기 -->
-									<div class="order_text" th:if="${exchangeDtl.chgStat == 'G685_21' or (exchangeDtl.chgGb == 'G680_40' and exchangeDtl.chgStat == 'G685_32')}"><p th:text="|${exchangeDtl.addPayCost}|원 결제 후 교환 가능합니다."></p></div>
+									<div class="order_text" th:if="${exchangeDtl.chgStat == 'G685_21' or (exchangeDtl.chgGb == 'G680_40' and exchangeDtl.chgStat == 'G685_32')}"><p th:text="|${exchangeDtl.addPayCost}원 결제 후 교환 가능합니다.|"></p></div>
 									<!-- 교환접수 -->
 									<div class="order_text" th:if="${exchangeDtl.chgStat == 'G685_20'}"><p>교환 신청이 접수 되었습니다. 신속하게 처리하여 드리겠습니다.</p></div>
 									<!-- 회수요청 -->

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

@@ -438,6 +438,8 @@
 						});
 					} else if (cre.chgStat == 'G685_33') {
 						tag += '												환불진행중\n';
+					} else if (cre.chgStat == 'G685_21' || cre.chgStat == 'G685_51') {
+						tag += '												결제대기\n';
 					} else if (cre.chgStat == 'G685_49' || cre.chgStat == 'G685_69') {
 						tag += '												접수취소\n';
 					} else {

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

@@ -82,9 +82,10 @@
 										</div>
 										<div class="status_box">
 											<p>
+												<th:block th:if="${returnDtl.chgStat == 'G685_51'}" th:text="|결제대기|"></th:block>
 												<th:block th:if="${returnDtl.chgStat == 'G685_33'}" th:text="|환불진행중|"></th:block>
 												<th:block th:if="${returnDtl.chgStat == 'G685_69'}" th:text="|접수취소|"></th:block>
-												<th:block th:unless="${returnDtl.chgStat == 'G685_33' or returnDtl.chgStat == 'G685_69'}" th:text="${returnDtl.chgStatNm}"></th:block>
+												<th:block th:unless="${returnDtl.chgStat == 'G685_51' or returnDtl.chgStat == 'G685_33' or returnDtl.chgStat == 'G685_69'}" th:text="${returnDtl.chgStatNm}"></th:block>
 												<span class="date" th:text="${returnDtl.chgDate}"></span>
 												<span class="time" th:text="${returnDtl.chgTime}"></span>
 											</p>

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

@@ -227,28 +227,24 @@
 												</div>
 												<!-- 신용카드 일때 -->
 												<div>
-													<dt>결제방법</dt>
+													<dt class="sr-only">결제방법</dt>
 													<dd th:if="${orderInfo.pgGb == 'NAVER'}">네이버 페이</dd>
 													<dd th:if="${orderInfo.pgGb == 'KAKAO'}">카카오 페이</dd>
 													<dd th:if="${orderInfo.pgGb == 'PAYCO'}">PAYCO</dd>
-													<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_10'}">실시간계좌이체</dd>
-													<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_20'}">무통장입금</dd>
+													<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_10'}">
+														실시간계좌이체
+														<th:blcok th:if="${orderInfo.cashAuthNo} != null and ${orderInfo.cashAuthNo} != ''">
+														(현금영수증신청)
+														</th:blcok>
+													</dd>
+													<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_20'}">
+														무통장입금
+														<th:blcok th:if="${orderInfo.cashAuthNo} != null and ${orderInfo.cashAuthNo} != ''">
+														(현금영수증신청)
+														</th:blcok>
+													</dd>
 													<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_30'}" th:text="|${orderInfo.cardNm}/${orderInfo.cardMips}|"></dd>
 													<dd th:if="${orderInfo.pgGb == 'KCP' and orderInfo.payMeans == 'G014_60'}">휴대폰결제</dd>
-																										
-													<!-- kcp 신용카드
-													<th:block th:if="${orderInfo.payMeans} == 'G014_30'">
-														<th:block th:if="${orderInfo.cardType} == 'Y'">
-															<dd th:text="|체크카드(${orderInfo.cardNm})/${orderInfo.cardMips}|"></dd>
-														</th:block>
-														<th:block th:if="${orderInfo.cardType} == 'N'">
-															<dd th:text="|신용카드(${orderInfo.cardNm})/${orderInfo.cardMips}|"></dd>
-														</th:block>
-													</th:block>
-													<th:block th:if="${orderInfo.payMeans} != 'G014_30'">
-														<dd th:text="${orderInfo.payType}"></dd>
-													</th:block>
-													-->
 												</div>
 												<!-- //신용카드 일때 -->
 											</dl>

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

@@ -5,7 +5,7 @@
 	<div class="modal-dialog" role="document">
 		<div class="modal-content">
 			<div class="modal-header">
-				<h5 class="modal-title" id="couponModifyLabel">할인쿠폰 변겅</h5>
+				<h5 class="modal-title" id="couponModifyLabel">할인쿠폰 변경</h5>
 			</div>
 			<div class="modal-body">
 				<div class="pop_cont">

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

@@ -32,7 +32,7 @@
 <!-- 주문금액정보표현 -->
 <form id="orderAmtForm" name="orderAmtForm">
 	<!-- 주문자정보 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderInfo" id="orderInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderInfo">
 		<tbody>
 			<tr style="height:30px;">
 				<th>custNm</th>
@@ -82,7 +82,7 @@
 	<!-- //사은품정보 -->
 	
 	<!-- 주문상세금액 -->
-	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderDetailInfo" id="orderDetailInfo">
+	<table border="1" style="font-size:10px; text-align:center; margin-top:20px; display:none; width:100%;" name="orderDetailInfo">
 		<tr style="height:30px;">
 			<th>cartSq</th>
 			<th style="display:none">goodsNm</th>
@@ -175,7 +175,7 @@
 	<!-- //주문상세금액 -->
 	
 	<!-- 배송단위목록 -->
-	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="delvFeeCdInfo" id="delvFeeCdInfo">
+	<table border="1" style="font-size:10px; text-align:center;  margin-top:20px; display:none; width:100%;" name="delvFeeCdInfo">
 		<tr style="height:30px;">
 			<th>supplyCompCd</th>
 			<th>delvFeeCd</th>
@@ -185,9 +185,9 @@
 		</tr>
 		<th:block th:each="delvFeeCd, index : ${delvFeeCdList}">
 			<tr style="height:30px;">
-				<td class="supplyCompCd" th:text="${delvFeeCd.supplyCompCd}"></td>
-				<td class="delvFeeCd" th:text="${delvFeeCd.delvFeeCd}"></td>
-				<td class="delvFee" th:text="${delvFeeCd.delvFee}"></td>
+				<td class="supplyCompCd" 	th:text="${delvFeeCd.supplyCompCd}"></td>
+				<td class="delvFeeCd" 		th:text="${delvFeeCd.delvFeeCd}"></td>
+				<td class="delvFee" 		th:text="${delvFeeCd.delvFee}"></td>
 				<td class="delvCpnSq">0</td>
 				<td class="delvCpnDcAmt">0</td>
 			</tr>
@@ -348,7 +348,6 @@
 													</tr>
 												</tbody>
 											</table>
-											개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.개인정보제공에 대한 동의 내용입니다.
 										</div>
 									</div>
 									<!-- 
@@ -448,13 +447,6 @@
 									</div>
 								</th:block>
 							</dl>
-							<!-- 비회원인경우 노출 
-							<th:blcok th:if="!${isLogin}">
-								<div class="t_info">
-									<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_CUSTOMER_JOIN_TYPE);" title="회원가입 하여 할인받기" class="btn_link">회원가입 하여 할인받기</a>
-								</div>
-							</th:blcok>
-							-->
 						</div>
 						<div class="totalprice_box">
 							<dl>
@@ -539,6 +531,7 @@ var foreignBuyYn		= [[${order.foreignBuyYn}]];	// 해외구매대행
 var foreignBuyYn		= [[${foreignBuyYn}]];			// 해외구매대행여부
 var orderMadeYn			= [[${orderMadeYn}]];			// 주문제작상품여부
 var isLogin				= [[${isLogin}]];				// 로그인여부
+var devTempYn			= [[${devTempYn}]];				// 개발자모드가능여부
 
 var custCpnSq 			= 0;
 var cpnIndex			= 0;
@@ -574,6 +567,7 @@ $(document).ready( function() {
 		, "foreignBuyYn"	: foreignBuyYn
 		, "orderMadeYn"		: orderMadeYn
 		, "custDelvAddrSq"	: 0
+		, "cartGoodsList"	: cartGoodsList
 	}
 	
 	jsonData = JSON.stringify(jsonObj);
@@ -590,7 +584,8 @@ $(document).ready( function() {
 	arr[3] = "delvFeeCdInfo";
 	arr[4] = "orderSumAmtInfo";
 	
-	if (devTemp) {
+	// 개발자모드실행
+	if (devTemp == true && devTempYn == true) {
 		$("table").each(function(){
 			var name = $(this).attr("name");
 			for (i=0 ; i<arr.length ; i++) {
@@ -773,7 +768,11 @@ var fnGetDailyDeliveryCheck = function (temp) {
 				}
 
 				// json 값 설정
-				var orderListObj 		= {"cartSqArr":cartSqArr, "shotDelvYn":tempShotDelvYn};
+				var orderListObj 		= {
+					"cartSqArr"			: cartSqArr
+					, "shotDelvYn"		: tempShotDelvYn 
+					, "cartGoodsList"	: cartGoodsList
+				};
 				var orderListJsonData 	= JSON.stringify(orderListObj);
 				
 				if (temp) {
@@ -888,6 +887,9 @@ var freegiftInfoSet = function() {
 						mcxDialog.alert("적용된 할인/혜택이 초기화 됩니다.");
 						pntDcAmtReset();
 					}
+					
+					// 2021.05.07 금액계산실행
+					custCpnSumAmtCal();
 				});
 				
 				// 2021.04.29 무료사은품 기본선택
@@ -1076,7 +1078,7 @@ var paymentInfoSet = function() {
 							return false;
 						}
 					}
-					
+										
 					// 사은품지급할 경우 체크 2020.04.29 사은품지급이 필수가 아닙니다.
 					if ($("#orderAmtForm .freegiftValArr").text().length > 0) {
 						if (!$("#orderForm #chk-agree_gift").is(":checked")) {
@@ -1225,6 +1227,7 @@ var paymentInfoSet = function() {
 						,"freegiftUsePointArr"	: freegiftUsePointArr
 						,"giftMsg"				: ""
 						,"custPayMeans"			: custPayMeans
+						,"cartSqArr"			: cartSqArr
 					};
 					
 					$.ajax( {
@@ -1475,7 +1478,7 @@ var dcAmtInfoSet = function() {
 					}
 					
 					// 2021.04.23 추가
-					mcxDialog.alert("총 " + getZeroMinusDelAmt(pntDcAmt) + " P를 차감 결제 합니다.”");
+					mcxDialog.alert("총 " + getZeroMinusDelAmt(pntDcAmt) + " P를 차감 결제 합니다.");
 					
 					// 포인트 적용
 					$("#orderAmtForm .pntDcSumAmt").text(pntDcAmt);
@@ -1539,7 +1542,7 @@ var dcAmtInfoSet = function() {
 					}
 					
 					// 2021.04.23 추가
-					mcxDialog.alert("총 " + gfcdUseAmt.addComma() + " 원를 상품권 금액에서 차감 결제 합니다.”");
+					mcxDialog.alert("총 " + gfcdUseAmt.addComma() + " 원을 상품권 금액에서 차감 결제 합니다.");
 					
 					// 상품권 적용
 					$("#orderAmtForm .gfcdUseSumAmt").text(gfcdUseAmt);
@@ -2259,7 +2262,7 @@ var custCpnSumAmtCal = function() {
 	var freegiftValArr 			= [];
 	var freegiftUsePointArr 	= [];
 		
-	$(".gift_box").each(function(){
+	$("#orderForm .gift_box").each(function(){
 		$(this).find(".freegiftRdo").each(function(){
 			// 사은품필수
 			if ($(this).attr("allYn") == "Y" ) {
@@ -2278,7 +2281,7 @@ var custCpnSumAmtCal = function() {
 		});
 	});
 	
-	$("#orderAmtForm .freegiftValArr").text(freegiftValArr);				// 사은품시퀀스배열
+	$("#orderAmtForm .freegiftValArr").text(freegiftValArr);			// 사은품시퀀스배열
 	$("#orderAmtForm .freegiftUsePointArr").text(freegiftUsePointArr);	// 사은품사용포인트배열
 };
 

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

@@ -34,12 +34,14 @@
 		<th:block th:each="freegift, i : ${freegiftList}">
 			<div class="gift_box">
 				<p class="txt">
+					
 					<th:block th:if="${freegift.allYn} == 'Y'">
-						<span th:text="'사은품필수' + ${i.count} + ' ' + ${freegift.freegiftNm}"></span>
+						<span th:text="'사은품필수' + ${i.count}"></span>
 					</th:block>
 					<th:block th:if="${freegift.allYn} == 'N'">
-						<span th:text="'사은품선택' + ${i.count} + ' ' + ${freegift.freegiftNm}"></span>
+						<span th:text="'사은품선택' + ${i.count}"></span>
 					</th:block>
+					<th:block th:text="${freegift.freegiftNm}"></th:block>
 				</p>
 				<div class="form_field">
 					<!-- 전체지급 사음품(필수) -->
@@ -48,7 +50,7 @@
 							<th:block th:if="${freegift.freegiftSq} == ${freegiftGoods.freegiftSq}">
 								<div class="gift">
 									<input type="hidden" th:name="'rdi-gift'+${i.count}" th:id="'rdi-gift'+${i.count}+${k.count}" class="chk_img freegiftRdo" th:value="${freegiftGoods.freegiftValSq}" usepoint="0" allYn="Y">
-									<input type="checkbox" name="chk-gift-required" id="chk-gift-required1" class="chk_img" value="" checked="" onclick="return(false);">
+									<input type="checkbox" name="chk-gift-required" th:id="'chk-gift-required'+${i.count}+${k.count}" class="chk_img" value="" checked="" onclick="return(false);">
 									<label for="rdi-gift'+${i.count}+${k.count}">
 										<span class="thumb"><img src="http://ts5000.ipdisk.co.kr:89/images/pc/thumb/tmp_gift1.jpg" width="" alt=""></span>
 										<span class="name" th:text="${freegiftGoods.goodsNm}"></span>

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

@@ -77,16 +77,18 @@
 				</ul>
 			</div>
 		</div>
-		<div class="form_field">
-			<div class="agree_paymethod">
-				<input id="chk-agree_paymethod" type="checkbox">
-				<label for="chk-agree_paymethod">
-					 <span>선택한 결제수단으로 향후 결제 이용에 동의합니다.&nbsp;&nbsp;
-						<em class="tmark_optional">(선택)</em>
-					</span>
-				</label>
+		<th:blcok th:if="${isLogin}">
+			<div class="form_field">
+				<div class="agree_paymethod">
+					<input id="chk-agree_paymethod" type="checkbox">
+					<label for="chk-agree_paymethod">
+						 <span>선택한 결제수단으로 향후 결제 이용에 동의합니다.&nbsp;&nbsp;
+							<em class="tmark_optional">(선택)</em>
+						</span>
+					</label>
+				</div>
 			</div>
-		</div>
+		</th:blcok>
 		<div class="form_field">
 			<div class="agree_insurance">
 				<input id="chk-insurance" type="checkbox" name="insuranceYn"> 

src/main/webapp/WEB-INF/views/web/popup/DelvAddrModifyPopWeb.html

@@ -11,12 +11,12 @@
 				<div class="default_addrs">
 					<div class="form_field">
 						<th:block th:if="${deliveryAddrInfo.defaultYn} == 'Y'">
-							<input id="chk-default-addrs" type="checkbox" name="defaultYn" checked>
+							<input id="chk-default-addrs1" type="checkbox" name="defaultYn" checked>
 						</th:block>
 						<th:block th:if="${deliveryAddrInfo.defaultYn} == 'N'">
-							<input id="chk-default-addrs" type="checkbox" name="defaultYn">
+							<input id="chk-default-addrs1" type="checkbox" name="defaultYn">
 						</th:block>
-						<label for="chk-default-addrs"><span>기본 배송지로 등록</span></label>
+						<label for="chk-default-addrs1"><span>기본 배송지로 등록</span></label>
 					</div>
 				</div>
 				<div class="form_field">

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

@@ -1201,7 +1201,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .goods_info .order_desc .button_box .btn {display:block; width:100%; height:42px; padding:14px; font-size:14px;}
 .goods_info .order_desc .button_box .btn:hover,
 .goods_info .order_desc .button_box .btn:focus,
-.goods_info .order_desc .button_box .btn:active{color: #333333;background-color: #ffffff;border-color: #dddddd;}
+.goods_info .order_desc .button_box .btn:active{}
 .goods_info .order_desc .button_box .btn.btn_primary_line:hover,
 .goods_info .order_desc .button_box .btn.btn_primary_line:focus,
 .goods_info .order_desc .button_box .btn.btn_primary_line:active{color:#fd4802; border-color:#fd4802;}
@@ -1811,7 +1811,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.dp .dp_detail_visual h3 {padding-top:10px; padding-bottom:80px;}
 	.dp .dp_detail_visual .cont_head > div .period {position:absolute; left:50%; bottom:40px; transform:translateX(-50%); font-size:14px; font-weight:300; color:#888; text-align:center;}
 	.dp_detail_visual .promotion_visual {position:relative; width:100%;}
-	.dp_detail_visual .promotion_visual img {}
+	.dp_detail_visual .promotion_visual img {width: 100%; height: auto;}
 	.dp_detail_visual .promotion_visual.type1 {}
 	.dp_detail_visual .promotion_visual.type1 img {position:relative; left:50%; top:0; transform:translateX(-50%);}
 	.dp_detail_visual .promotion_visual.type2 {}
@@ -2330,11 +2330,12 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.odPayment .fold_cont .area_receiveinfo {}
 	.odPayment .fold_cont .area_receiveinfo + .area_receiveinfo.none {padding-top: 25px;}
 	.odPayment .fold_cont .area_receiveinfo.none {padding:0 0 30px;}
-	.odPayment .fold_cont .area_receiveinfo > dl > div {margin-top:15px; height:16px}
+	.odPayment .fold_cont .area_receiveinfo > dl > div {margin-top:15px; min-height:16px}
 	.odPayment .fold_cont .area_receiveinfo > dl > div:first-child {margin-top:0}
+	.odPayment .fold_cont .area_receiveinfo > dl > div:last-child {margin-top: 5px;}
 	.odPayment .fold_cont .area_receiveinfo > dl > div dt {position:relative; padding-right:10px; margin-right:10px; font-weight:200;}
-	.odPayment .fold_cont .area_receiveinfo > dl > div dt::after {content:':'; position:absolute; right:-2px; top:-1px;}
-	.odPayment .fold_cont .area_receiveinfo > dl > div dd {height:16px}
+	.odPayment .fold_cont .area_receiveinfo > dl > div:last-child dt::after {content:':'; position:absolute; right:-2px; top:-1px;}
+	.odPayment .fold_cont .area_receiveinfo > dl > div dd {min-height:16px}
 	.odPayment .fold_cont .area_receiveinfo > dl > div dd .btn {vertical-align:top; margin-top:-9px; margin-left:15px}
 	.odPayment .fold_cont .area_receiveinfo > dl > div dd .btn_underline {margin-left:12px}
 	.odPayment .fold_cont .area_receiveinfo .icon_tag {margin-top:-3px; margin-left:4px}
@@ -2960,6 +2961,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	[class*="pd_descrp"] .required_box .area_infotbl .title {font-size:24px; font-weight:500; letter-spacing:-0.025em;}
 	[class*="pd_descrp"] .required_box .area_infotbl .tbl table th {width:280px; font-weight:300;}
 	[class*="pd_descrp"] .required_box .area_kcl {display:block; position:relative; min-height:160px; margin-top:100px; padding:40px 40px 40px 160px; box-sizing:border-box; background:#f5f5f5;}
+	[class*="pd_descrp"] .required_box .area_kcl.no-mark{padding-left:65px}
 	[class*="pd_descrp"] .required_box .area_kcl p {margin-top:20px; color:#222; font-size:14px; line-height:1; letter-spacing:-0.025em;}
 	[class*="pd_descrp"] .required_box .area_kcl .tit {margin-top:0; font-size:16px;}
 	[class*="pd_descrp"] .required_box .area_kcl a.linktxt3 {margin-left:20px; color:#888; font-weight:200; text-decoration:none !important;}
@@ -3851,9 +3853,18 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.br_lookbook_view.cont_visual .cont_head {margin-bottom:60px}
 	.br_lookbook_view.cont_visual .cont_body .area_slider {margin-left:-70px; margin-right:-70px;}
 	.br_lookbook_view.cont_visual .swiper-slide {width: auto; height: 660px;}
+	.br_lookbook_view.cont_visual .swiper-slide-next img,
+	.br_lookbook_view.cont_visual .swiper-slide-prev img {width: 100%; height:auto;max-height: 660px;}
 	/* .br_lookbook_view.cont_visual .swiper-slide img {width: 100%; height:auto;} */
 	.br_lookbook_view.cont_visual .swiper-slide img {width: auto; height:100%;} /* .0506.높이기준으로 변경 */
-	.br_lookbook_view.cont_visual .bt_lb_item {}
+	/* 05.07 다양한 이미지를 리사이징하기 위해 가로 기준이 생성됨 */
+	.br_lookbook_view.cont_visual .bt_lb_item {overflow: hidden;width: 100%;height: 660px;}
+	.br_lookbook_view.cont_visual .swiper-slide img {max-width: 990px;height: auto;display: block;}
+	.br_lookbook_view.cont_visual .swiper-slide .item_picker {display: none;}
+	.br_lookbook_view.cont_visual .swiper-slide-active .item_picker {display: block;}
+	.br_lookbook_view.cont_visual .swiper-slide-prev img,
+	.br_lookbook_view.cont_visual .swiper-slide-next img {transform: translate(-50%,-50%);left: 50%;top: 50%;position: relative;}
+
 	.br_lookbook_view.cont_visual .swiper-container {padding-top:60px;}
 	.br_lookbook_view.cont_visual .swiper-slide .bt_lb_item:after {content:''; position: absolute; top: 0; left: 0; width: 100%; height: 100%; background: rgba(0,0,0,.3);}
 	.br_lookbook_view.cont_visual .swiper-slide-active .bt_lb_item {position: relative; height: 618px; margin-top: -60px; transition: all 200ms ease;}

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

@@ -86,7 +86,7 @@
 .post-visual .txtWrap dl.w,
 .post-visual .txtWrap dl.w + .btn {color:#ffffff; border-color:#fff;}
 .post-visual .txtWrap dt {font-size:18px; padding-bottom:20px; font-weight:200;}
-.post-visual .txtWrap dd {font-size:62px;line-height:1;font-weight:500; display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 2;-webkit-box-orient: vertical; overflow:hidden;}
+.post-visual .txtWrap dd {font-size:62px; max-height:122px; line-height:1;font-weight:500; display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 2;-webkit-box-orient: vertical; overflow:hidden;}
 .post-visual .txtWrap dd.txt_xs {font-size:18px;line-height:1;font-weight:200;padding:20px 0 0px 0; display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 1;-webkit-box-orient: vertical; max-height:37px; overflow:hidden;}
 /* .post-visual .vrt_txt{width:auto;height:auto;font-size:18px;color:#888888;position:absolute;left:-90px;bottom:-99px;top:0;-webkit-transform:rotate(-90deg);transform:rotate(-180deg); white-space: nowrap; -webkit-writing-mode:vertical-rl;-ms-writing-mode:tb-rl;writing-mode:vertical-rl;} */
 .post-visual .vrt_txt{width: 500px;height: 20px;box-sizing: content-box;display: inline-block;text-align: left;font-size: 18px;color: #888888;position: absolute;left: -80%;bottom: 160px;position: relative;left: -65%;bottom: -160px;top: auto;-webkit-transform: rotate(-90deg);transform: rotate(-90deg);white-space: nowrap;}
@@ -154,7 +154,7 @@
 
 	.post-visual .vrt_txt {bottom:-120px !important;}
 	.post-visual.swiper-container {margin-left:0px;}
-	.main .post-visual .swiper-slide {padding-bottom:20px;}
+	.main .post-visual .swiper-slide {padding-bottom:20px; mask-size:none;}
 	.main .post-visual .swiper-slide-prev {}
 	.main .post-visual .swiper-slide-active {}
 	.main .post-visual .swiper-slide::before {display:block;}
@@ -752,11 +752,7 @@ header.minify .common_header.br_header::after {bottom:-565px;}
 
 /* brand_main :ie */
 @media screen and (-ms-high-contrast:active), (-ms-high-contrast:none) {
-	.brand_main .post-visual .swiper-slide {
-		margin:0;
-		box-shadow:none;
-	}
-	.brand_main .post-visual .swiper-slide {z-index:9; padding-bottom:20px;}
+	.brand_main .post-visual .swiper-slide {z-index:9; margin:0; box-shadow:none; padding-bottom:0; width: 1520px;}
 	.brand_main .post-visual .swiper-slide:before {display:none;}
 	.brand_main .post-visual .swiper-slide-active {z-index:8;}
 	.brand_main .post-visual .swiper-slide-active:before {display:block;}

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

@@ -82,6 +82,8 @@ $(document).ready(function() {
 				console.log(filesLength);
 			var cmtLa = $('.cmt .cmt_thumb .form_field .imgUpload label');
 			var cmtIn = $('.cmt .cmt_thumb .form_field .imgUpload input');
+			var myrvLa = $('.myReviewWrite .form_field .imgUpload label');
+			var myrvIn = $('.myReviewWrite .form_field .imgUpload input');
 			for (var i = 0; i < filesLength; i++) {
 				var f = files[i]
 				var fileReader = new FileReader();
@@ -97,6 +99,8 @@ $(document).ready(function() {
 						$(this).parent(".pics").remove();
 						cmtLa.css('display', 'block');
 						cmtIn.css('display', 'block');
+						myrvLa.css('display', 'block');
+						myrvIn.css('display', 'block');
 						$('#fileAdd').removeAttr("disabled");
 					});
 				});
@@ -105,11 +109,15 @@ $(document).ready(function() {
 				var imgFiles=$('.imgUpload .pics');
 				var cmtLa = $('.cmt .cmt_thumb .form_field .imgUpload label');
 				var cmtIn = $('.cmt .cmt_thumb .form_field .imgUpload input');
+				var myrvLa = $('.myReviewWrite .form_field .imgUpload label');
+				var myrvIn = $('.myReviewWrite .form_field .imgUpload input');
 				if (imgFiles.length >= maxFileLength-1) {
-					mcxDialog.alert('이미지는 최대' + maxFileLength +'장 까지 첨부 가능합니다.'); //210420_수정 : 시스템 alert -> dialog 변경.
+					//mcxDialog.alert('이미지는 최대' + maxFileLength +'장 까지 첨부 가능합니다.'); //210507_삭제
 					$('#fileAdd').attr("disabled",true);
 					cmtLa.css('display', 'none');
 					cmtIn.css('display', 'none');
+					myrvLa.css('display', 'none');
+					myrvIn.css('display', 'none');
 				} else if(imgFiles.length < maxFileLength){
 					$('#fileAdd').removeAttr("disabled");
 				}
@@ -244,12 +252,19 @@ function sCombo(selector){
 		});
 	}
 	sCombo.prototype.listOn = function(){
-		this.$selectBox.toggleClass('on');
 		if(this.$selectBox.hasClass('on')){
-			this.$list.css('display', 'block');
-		}else{
+			this.$selectBox.removeClass('on');
 			this.$list.css('display', 'none');
-		};
+		} else {
+			this.$selectBox.addClass('on');
+			this.$list.css('display', 'block');
+		}
+		//this.$selectBox.toggleClass('on');
+		//if(this.$selectBox.hasClass('on')){
+		//	this.$list.css('display', 'block');
+		//}else{
+		//	this.$list.css('display', 'none');
+		//};
 	}
 	sCombo.prototype.listSelect = function($target){
 		$target.addClass('selected').siblings('li').removeClass('selected');
@@ -257,6 +272,7 @@ function sCombo(selector){
 		//this.$select.text($target.text());
 		this.$select.html($target.html());
 		this.$list.css('display', 'none');
+		console.log($target.html())
 	}
 	sCombo.prototype.listOff = function($target){
 		if(!$target.is(this.$select) && this.$selectBox.hasClass('on')){