Explorar el Código

Merge branch 'card007' into order

card007 hace 5 años
padre
commit
20dee794fd
Se han modificado 62 ficheros con 1581 adiciones y 1420 borrados
  1. 12 3
      src/main/java/com/style24/front/biz/service/TsfOrderService.java
  2. 61 0
      src/main/java/com/style24/front/biz/web/TsfMypageController.java
  3. 3 3
      src/main/java/com/style24/persistence/mybatis/shop/TsfOrder.xml
  4. 1 0
      src/main/java/com/style24/persistence/mybatis/shop/TsfOrderChange.xml
  5. 3 82
      src/main/webapp/WEB-INF/views/web/common/layout/MypageLayoutWeb.html
  6. 241 469
      src/main/webapp/WEB-INF/views/web/mypage/MypageCancelFormWeb.html
  7. 728 337
      src/main/webapp/WEB-INF/views/web/mypage/MypageOrderDetailFormWeb.html
  8. 201 236
      src/main/webapp/WEB-INF/views/web/mypage/MypageOrderListFormWeb.html
  9. 291 277
      src/main/webapp/WEB-INF/views/web/mypage/MypageReturnFormWeb.html
  10. BIN
      src/main/webapp/images/mo/ico_arrow_filter.png
  11. BIN
      src/main/webapp/images/mo/ico_btn_more02.png
  12. BIN
      src/main/webapp/images/mo/ico_bulltet-delivery.png
  13. BIN
      src/main/webapp/images/mo/ico_bulltet-house.png
  14. BIN
      src/main/webapp/images/mo/ico_bulltet-object.png
  15. BIN
      src/main/webapp/images/mo/ico_bulltet-order.png
  16. BIN
      src/main/webapp/images/mo/ico_cate_close.png
  17. BIN
      src/main/webapp/images/mo/ico_dp_arrow.png
  18. BIN
      src/main/webapp/images/mo/ico_dpbanner_arrow.png
  19. BIN
      src/main/webapp/images/mo/ico_filter_close.png
  20. BIN
      src/main/webapp/images/mo/ico_filter_remove.png
  21. BIN
      src/main/webapp/images/mo/ico_filter_reset.png
  22. BIN
      src/main/webapp/images/mo/ico_filter_reset02.png
  23. BIN
      src/main/webapp/images/mo/ico_filter_reset_w.png
  24. BIN
      src/main/webapp/images/mo/ico_pick_cls.png
  25. BIN
      src/main/webapp/images/mo/ico_search_btn.png
  26. BIN
      src/main/webapp/images/mo/ico_shopbag.png
  27. BIN
      src/main/webapp/images/mo/ico_sns_share.png
  28. BIN
      src/main/webapp/images/mo/icon_best_refresh.png
  29. BIN
      src/main/webapp/images/mo/icon_list_filter.png
  30. BIN
      src/main/webapp/images/mo/icon_time_hotdeal.png
  31. BIN
      src/main/webapp/images/mo/shc_arrow.png
  32. BIN
      src/main/webapp/images/mo/shc_clock.png
  33. BIN
      src/main/webapp/images/mo/shc_filter.png
  34. BIN
      src/main/webapp/images/mo/shc_itemplan.png
  35. BIN
      src/main/webapp/images/mo/shc_refresh.png
  36. BIN
      src/main/webapp/images/mo/shc_result_plan.png
  37. BIN
      src/main/webapp/images/mo/thumb/bigbanner_slide01.png
  38. BIN
      src/main/webapp/images/mo/thumb/bullet_bg1.png
  39. BIN
      src/main/webapp/images/mo/thumb/detail_case_bg.png
  40. BIN
      src/main/webapp/images/mo/thumb/dp_case1_item.jpg
  41. BIN
      src/main/webapp/images/mo/thumb/dp_case1_lookbook.jpg
  42. BIN
      src/main/webapp/images/mo/thumb/dp_visual.jpg
  43. BIN
      src/main/webapp/images/mo/thumb/dp_visual_outlets.jpg
  44. BIN
      src/main/webapp/images/mo/thumb/hotdeal_bg.png
  45. BIN
      src/main/webapp/images/mo/thumb/main_visual01.jpg
  46. BIN
      src/main/webapp/images/mo/thumb/main_visual02.jpg
  47. BIN
      src/main/webapp/images/pc/benefit_txt.jpg
  48. BIN
      src/main/webapp/images/pc/bg_check01.png
  49. BIN
      src/main/webapp/images/pc/bg_check02.png
  50. BIN
      src/main/webapp/images/pc/dp_best_livetxt.jpg
  51. BIN
      src/main/webapp/images/pc/ico_best_bedge.jpg
  52. BIN
      src/main/webapp/images/pc/ico_besttag2.png
  53. BIN
      src/main/webapp/images/pc/ico_bracket2.png
  54. BIN
      src/main/webapp/images/pc/ico_bread_root_w.png
  55. BIN
      src/main/webapp/images/pc/ico_cart_empty.png
  56. BIN
      src/main/webapp/images/pc/ico_coupon_3000.png
  57. BIN
      src/main/webapp/images/pc/ico_coupon_5.png
  58. BIN
      src/main/webapp/images/pc/ico_filter_close.png
  59. BIN
      src/main/webapp/images/pc/ico_filter_reset02.png
  60. BIN
      src/main/webapp/images/pc/pop_slide_next.png
  61. BIN
      src/main/webapp/images/pc/pop_slide_prev.png
  62. 40 13
      src/main/webapp/ux/pc/js/mypage.js

+ 12 - 3
src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -69,10 +69,11 @@ public class TsfOrderService {
 		int index = 0;
 		Collection<GagaMap> orderList = new ArrayList<>();
 		Collection<Order> ordDtlList = new ArrayList<>();
+		String allCanYn = "Y";
 
 		for (Order tmpOrder : orderDao.getOrderListForMypage(order)) {
 			if (index > 0 && ordNo != tmpOrder.getOrdNo()) {
-				orderList.add(setOrderMap(ordDtlList));
+				orderList.add(setOrderMap(ordDtlList, allCanYn));
 
 				ordDtlList = new ArrayList<>();
 				ordDtlList.add(tmpOrder);
@@ -80,18 +81,25 @@ public class TsfOrderService {
 				ordDtlList.add(tmpOrder);
 			}
 
+			if ("Y".equals(allCanYn)
+				&& !tmpOrder.getOrdDtlStat().equals(TscConstants.OrderDetailStat.DEPOSIT_WAIT.value())
+				&& !tmpOrder.getOrdDtlStat().equals(TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value())
+				&& !tmpOrder.getOrdDtlStat().equals(TscConstants.OrderDetailStat.GOODS_PREPARE.value())) {
+				allCanYn = "Y";
+			}
+
 			ordNo = tmpOrder.getOrdNo();
 			index++;
 		}
 
 		if (ordDtlList.size() > 0) {
-			orderList.add(setOrderMap(ordDtlList));
+			orderList.add(setOrderMap(ordDtlList, allCanYn));
 		}
 		
 		return orderList;
 	}
 	
-	private GagaMap setOrderMap(Collection<Order> ordDtlList) {
+	private GagaMap setOrderMap(Collection<Order> ordDtlList, String allCanYn) {
 		Order order = ordDtlList.iterator().next();
 
 		GagaMap map = new GagaMap();
@@ -99,6 +107,7 @@ public class TsfOrderService {
 		map.set("ordNo", order.getOrdNo());
 		map.set("ordDt", order.getOrdDt());
 		map.set("freeGiftList", orderDao.getOrderFreeGiftListForMypage(order));
+		map.set("allCanYn", allCanYn);
 		map.set("ordDtlList", ordDtlList);
 
 		return map;

+ 61 - 0
src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -47,6 +47,7 @@ import com.style24.persistence.domain.Coupon;
 import com.style24.persistence.domain.Customer;
 import com.style24.persistence.domain.GiftCard;
 import com.style24.persistence.domain.Order;
+import com.style24.persistence.domain.OrderChange;
 import com.style24.persistence.domain.Point;
 import com.style24.persistence.domain.WishList;
 
@@ -542,6 +543,66 @@ public class TsfMypageController extends TsfBaseController {
 		return mav;
 	}
 
+	/**
+	 * 마이페이지 취소신청
+	 *
+	 * @param Collection<Order>
+	 * @return GagaMap
+	 * @author card007
+	 * @since 2021. 03. 22
+	 */
+	@PostMapping("/cancel")
+	@ResponseBody
+	public GagaMap cancel(@RequestBody OrderChange cnclReq) {
+		if (cnclReq== null) {
+			throw new IllegalStateException(message.getMessage("FAIL_1001"));
+		}
+
+		List<Order> cnclReqList = cnclReq.getCancelReqList(); // 변경요청정보
+
+		// TODO
+		// @ 결품취소로직 추가
+		// @ 주문취소시 상태값 체크
+		// @ 취소, 반품시 배송비 체크 로직 (선결제 로직)
+
+		// 1. 세션회원조회
+		int custNo = TsfSession.getInfo().getCustNo();
+
+		// 2. 환불금액계산
+		// 2021.01.19 취소신청정보를 목록 (주문상세번호, 취소/반품수량) 으로 표현
+		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt(cnclReqList);
+
+		// 3. 주문변경 기본정보 설정
+		result.set("ordNo"			, cnclReq.getOrdNo());				// 주문번호
+		result.set("ordChgSq"		, cnclReq.getOrdChgSq());			// 주문변경번호
+		result.set("chgReason"		, cnclReq.getChgReason());			// 변경사유
+		result.set("chgMemo"		, cnclReq.getChgMemo());			// 변경메모
+
+		result.set("accountNo"		, cnclReq.getAccountNo());			// 환불계좌번호
+		result.set("accountNm"		, cnclReq.getAccountNm());			// 환불계좌예금주명
+		result.set("bankCd"			, cnclReq.getBankCd());				// 환불계좌은행코드
+
+		result.set("allCanYn"		, cnclReq.getAllCanYn());			// 무통장입금전 전체취소 여부
+		result.set("isCustomer"		, cnclReq.getIsCustomer());			// 변경사유 (고객, 회사)
+
+		// 4. 주문변경 회수지정보 추가
+		result.set("chgerNm"		, cnclReq.getChgerNm());			// 변경자명
+		result.set("chgerEmail"		, cnclReq.getChgerEmail());			// 변경자이메일주소
+		result.set("chgerPhnno"		, cnclReq.getChgerPhnno());			// 변경자핸드폰번호
+		result.set("chgerTelno"		, cnclReq.getChgerTelno());			// 변경자전화번호
+
+		result.set("reqGbn"			, cnclReq.getReqGbn());				// 신청구분
+
+		// 5. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL)
+		coreOrderChangeService.cnclComplete(result, custNo);
+
+		result.set("status", GagaResponseStatus.SUCCESS.getCode());
+		result.set("message", "취소 처리 되었습니다.");
+		// result.set("message", message.getMessage("SUCC_0004"));
+
+		return result;
+	}
+
 	/**
 	 * 마이페이지 STYLE24 포인트화면
 	 *

+ 3 - 3
src/main/java/com/style24/persistence/mybatis/shop/TsfOrder.xml

@@ -38,9 +38,11 @@
 		     , GI.SYS_IMG_NM
 		     , OD.ORD_DTL_STAT
 		     , OD.ORD_QTY
+		     , OD.CNCL_RTN_QTY
 		     , OD.ORD_AMT
 		     , OD.REAL_ORD_AMT
 		     , OD.SAVE_PNT_AMT
+		     , OD.CNCL_RTN_AMT
 		     , OD.SHIP_COMP_CD
 		     , OD.GIFT_PACK_YN
 		     , (SELECT SHIP_COMP_NM
@@ -314,13 +316,11 @@
 			</if>
 			<if test="payGb != null and payGb != ''">
 		   AND PAY_GB = #{payGb}
-			</if>
-			<if test="payStat != null and payStat != ''">
-		   AND PAY_STAT = #{payStat}
 			</if>
 			<if test="pgGb != null and pgGb != ''">
 		   AND PG_GB = #{pgGb}
 			</if>
+		   AND PAY_STAT = 'G016_30'
 		</where>
 	</select>
 

+ 1 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsfOrderChange.xml

@@ -31,6 +31,7 @@
 		     , OD.GOODS_CD
 		     , G1.GOODS_NM
 		     , G1.GOODS_TYPE
+		     , G1.LIST_PRICE
 		     , FN_GET_CODE_NM('G056', G1.GOODS_TYPE)			AS GOODS_TYPE_NM
 		     , G2.GOODS_CD										AS ITEM_CD
 		     , G2.GOODS_NM										AS ITEM_NM

+ 3 - 82
src/main/webapp/WEB-INF/views/web/common/layout/MypageLayoutWeb.html

@@ -24,49 +24,12 @@
 		<ul id="location">
 			<li class="bread_home"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">홈</a></li>
 			<li class="bread_2depth"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE);">마이페이지</a></li>
-<!--			<li class="bread_3depth">주문확인/배송조회</li>-->
 		</ul>
 	</div>
 	<div class="wrap">
-		<div class="content myOrderList">
-<!--			<div class="cont_head" style="display: none;">-->
-<!--				CONT-HEAD-->
-<!--				<style>-->
-<!--					.container .wrap .content {max-width:1460px;}-->
-<!--				</style>-->
-<!--				<div class="tit">my_center</div>-->
-<!--				<div class="tit my_tit">my_tit</div>-->
-<!--			</div>-->
-			<div class="cont_body">
-				<!-- CONT-BODY -->
-				<div class="lnb">
-					<div class="lnb_tit">
-						<h2>마이페이지</h2>
-					</div>
-					<div class="lnb_list">
-						<ul id="mypageLnbList">
-							<!--<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);">주문확인/배송조회</a></li>
-							<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_CRS_LIST);">취소/반품/환불내역</a></li>
-							<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_RESTOCK);">재입고 알림 내역</a></li>
-							<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_COUPON);">쿠폰</a></li>
-							<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_POINT);">STYLE24 포인트</a></li>
-							<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);">상품권</a></li>
-							<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_REVIEW);">리뷰</a></li>
-							<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_DELIVERY_ADDR);">배송지 관리</a></li>
-							<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_WISHLIST);">위시리스트</a></li>
-							<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_CUSTOMER);">내정보 관리</a></li>
-							<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_SECEDE);">회원 탈퇴</a></li>-->
-						</ul>
-					</div>
-				</div>
-				
-				<!-- CONTENT AREA -->
-				<th:block layout:fragment="content"></th:block>
-				<!-- // CONTENT AREA -->
-				
-				<!-- // CONT-BODY -->
-			</div>
-		</div>
+		<!-- CONTENT AREA -->
+		<th:block layout:fragment="content"></th:block>
+		<!-- // CONTENT AREA -->
 	</div>
 </div>
 
@@ -78,48 +41,6 @@
 
 <script th:inline="javascript">
 /*<![CDATA[*/
-	var fnSetMypageLnbList = function(lnbLvl) {
-		let tag = '';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);"' + (lnbLvl == 1 ? ' class="on"' : '') + '>주문확인/배송조회</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_CRS_LIST);"' + (lnbLvl == 2 ? ' class="on"' : '') + '>취소/반품/환불내역</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_RESTOCK);"' + (lnbLvl == 3 ? ' class="on"' : '') + '>재입고 알림 내역</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_COUPON);"' + (lnbLvl == 4 ? ' class="on"' : '') + '>쿠폰</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_POINT);"' + (lnbLvl == 5 ? ' class="on"' : '') + '>STYLE24 포인트</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);"' + (lnbLvl == 6 ? ' class="on"' : '') + '>상품권</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_REVIEW);"' + (lnbLvl == 7 ? ' class="on"' : '') + '>리뷰</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_DELIVERY_ADDR);"' + (lnbLvl == 8 ? ' class="on"' : '') + '>배송지 관리</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_WISHLIST);"' + (lnbLvl == 9 ? ' class="on"' : '') + '>위시리스트</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_CUSTOMER);"' + (lnbLvl == 10 ? ' class="on"' : '') + '>내정보 관리</a></li>\n';
-		tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_SECEDE);"' + (lnbLvl == 11 ? ' class="on"' : '') + '>회원 탈퇴</a></li>\n';
-		tag += '</ul>';
-		$('#mypageLnbList').html(tag);
-	}
-
-
-	//현재 페이지 활성화 표시
-	//$(".lnb_list [href]").each(function() {
-	//	var linkName = document.location.pathname.split("/ux/pc/")[1].split("_")[1];
-	//	var pagelink = this.href.search(linkName);
-	//	if(pagelink > 0){
-	//		$(this).addClass("on");
-	//	}
-	//});
-
-
-var fnSetMypageLocation = function(depth3, depth3Link, depth4) {
-		let tag = '';
-		if (gagajf.isNull(depth4)) {
-			tag += '<li class="bread_3depth">' + depth3 + '</li>'
-		} else {
-			tag += '<li className="bread_3depth"><a href="javascript:void(0);" onClick="cfnGoToPage(' + depth3Link + ');">' + depth3 + '</a></li>';
-			tag += '<li class="bread_3depth">' + depth4 + '</li>'
-		}
-		$('#location').append(tag);
-	}
-	
-	$(document).ready(function() {
-		
-	});
 /*]]>*/
 </script>
 

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

@@ -19,456 +19,181 @@
 <body>
 
 <th:block layout:fragment="content">
-	<div class="cont">
-		<div class="sec_head">
-			<h3 class="subH1">주문취소</h3>
-			<span class="order_number">주문번호&nbsp;:&nbsp;<em th:text="${cancelList.oneData.ordNo}"></em></span>
-		</div>
-		<div class="sec_body">
-			<div class="part_goods">
-				<div class="goods_head">
-					<p>주문일 <span th:text="${cancelList.oneData.ordDt}"></span></p>
+	<div class="content myOrderView">
+		<div class="cont_body">
+			<!-- CONT-BODY -->
+			<div class="lnb">
+				<div class="lnb_tit">
+					<h2>마이페이지</h2>
 				</div>
-				<div class="goods_cont">
-					<th:block th:if="${cancelList.cancelList}" th:each="cancel, status : ${cancelList.cancelList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
-					<!-- 주문상품 -->
-					<div class="goods_info">
-						<div class="order_desc">
-							<div class="goods_box">
-								<div class="gd_item">
-									<a href="javascript:void(0)" th:attr="goodsCd=${cancel.goodsCd}" onclick="fnGoToGoodsDetail(this)">
-										<span class="thumb">
-											<img th:src="${imageUrl + '/' + cancel.sysImgNm}" width="100%" alt="">
-										</span>
-										<p>
-											<span class="brand" th:text="${cancel.brandNm}"></span>
-											<span class="tag primary" th:if="${cancel.shotDelvYn == 'Y'}">총알배송</span>
-											<span class="tag" th:if="${cancel.shotDelvYn == 'N' and cancel.selfGoodsYn == 'Y'}">STYLE24 일반배송</span>
-											<span class="tag" th:if="${cancel.selfGoodsYn == 'N'}">업체직배송</span>
-										</p>
-										<p>
-											<span class="name" th:text="${cancel.goodsNm}"></span>
-										</p>
-									</a>
-								</div>
-								<div class="gd_opt">
-									<div class="option_wrap">
-										<span class="title sr-only">주문 옵션</span>
-										<span class="option" th:text="|${cancel.optCd1} / ${cancel.optCd2}|"></span>
-									</div>
-								</div>
-								<div class="gd_calc">
-									<p>
-										<span class="count"><em th:text="${cancel.ordQty}"></em>개</span>
-									</p>
-									<p>
-										<span class="price_org"><em th:text="${#numbers.formatInteger(cancel.listPrice * cancel.ordQty, 1, 'COMMA')}"></em>원</span>
-										<span class="price_sale"><em th:text="${#numbers.formatInteger(cancel.ordAmt, 1, 'COMMA')}"></em>원</span>
-									</p>
-								</div>
-							</div>
-							<div class="button_box">
-								<div class="count_modify">
-									<span class="txt">수량</span>
-									<form class="form_wrap">
-										<div class="form_field">
-											<div class="select_custom select_count">
-												<div class="combo">
-													<input type="hidden" name="chgQty" value="0" th:attr="ordDtlNo=${cancel.ordDtlNo}, ordCanChgQty=${cancel.ordCanChgQty}"/>
-													<div class="select">선택</div>
-													<ul class="list">
-														<li class="selected" value="0">선택</li>
-														<li th:if="${cancel.ordCanChgQty > 0}" th:each="num : ${#numbers.sequence(1,cancel.ordCanChgQty)}" th:value="${num}" th:text="${num}" onclick="fnChangeCancelQty(this);"></li>
-													</ul>
-												</div>
-											</div>
-										</div>
-									</form>
-								</div>
-							</div>
-						</div>
-						<div class="order_text">
-							<p>취소하실 수량을 선택하신 후 주문 취소를 하실 수 있습니다.</p>
-						</div>
-					</div>
-					<!-- //주문상품 -->
-					</th:block>
+				<div class="lnb_list">
+					<ul id="mypageLnbList"></ul>
 				</div>
 			</div>
-			<h4 class="subH3">환불정보</h4>
-			<div class="tbl type6">
-				<table>
-					<colgroup>
-						<col width="50%">
-						<col width="50%">
-					</colgroup>
-					<tr>
-						<td>
-							<dl>
-								<div>
-									<dt>환불 예정 금액</dt>
-									<dd>
-										<div class="price">
-											<span class="return_total_price"><em id="returnAmt">0</em>원</span>
+			<div class="cont">
+				<input type="hidden" name="accountNo" th:value="${cancelList.oneData.accountNo}"/>
+				<input type="hidden" name="accountNm" th:value="${cancelList.oneData.accountNm}"/>
+				<input type="hidden" name="bankCd" th:value="${cancelList.oneData.bankCd}"/>
+				<div class="sec_head">
+					<h3 class="subH1">주문취소</h3>
+					<span class="order_number">주문번호&nbsp;:&nbsp;<em th:text="${cancelList.oneData.ordNo}"></em></span>
+				</div>
+				<div class="sec_body">
+					<div class="part_goods">
+						<div class="goods_head">
+							<p>주문일 <span th:text="${cancelList.oneData.ordDt}"></span></p>
+						</div>
+						<div class="goods_cont">
+							<th:block th:if="${cancelList.cancelList}" th:each="cancel, status : ${cancelList.cancelList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+							<!-- 주문상품 -->
+							<div class="goods_info">
+								<div class="order_desc">
+									<div class="goods_box">
+										<div class="gd_item">
+											<a href="javascript:void(0)" th:attr="goodsCd=${cancel.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+												<span class="thumb">
+													<img th:src="${imageUrl + '/' + cancel.sysImgNm}" width="100%" alt="">
+												</span>
+												<p>
+													<span class="brand" th:text="${cancel.brandNm}"></span>
+													<span class="tag primary" th:if="${cancel.shotDelvYn == 'Y'}">총알배송</span>
+													<span class="tag" th:if="${cancel.shotDelvYn == 'N' and cancel.selfGoodsYn == 'Y'}">STYLE24 일반배송</span>
+													<span class="tag" th:if="${cancel.selfGoodsYn == 'N'}">업체직배송</span>
+												</p>
+												<p>
+													<span class="name" th:text="${cancel.goodsNm}"></span>
+												</p>
+											</a>
 										</div>
-									</dd>
-								</div>
-								<div class="include_item"> <!-- 할인항목 표기 class명 include_item -->
-									<dt>상품 취소 금액</dt>
-									<dd><em id="goodsCancelAmt">0</em>원</dd>
-								</div>
-								<div class="include_item">
-									<dt>배송비</dt>
-									<dd><em id="deliveryFee">0</em>원</dd>
-								</div>
-								<div class="include_item">
-									<dt>할인 금액 차감</dt>
-									<dd><em id="deductDcAmt">0</em>원</dd>
-								</div>
-							</dl>
-						</td>
-						<td>
-							<dl>
-								<div>
-									<dt>환불 수단</dt>
-									<dd th:text="${paymentInfo.payMeansNm}"></dd>
-								</div>
-								<div>
-									<dt>결제 금액 환불</dt>
-									<dd>
-										<em id="refundPayAmt">0</em>원
-									</dd>
-								</div>
-								<div>
-									<dt>포인트 환불</dt>
-									<dd>
-										<em id="refundPoint">0</em>P
-									</dd>
-								</div>
-								<div>
-									<dt>상품권 환불</dt>
-									<dd>
-										<em id="refundGiftCard">0</em>원
-									</dd>
-								</div>
-							</dl>
-						</td>
-					</tr>
-				</table>
-			</div>
-			<div class="txt_info">
-				<ul>
-					<li>
-						카드사로 결제 취소 요청이 전달된 후 환불까지는 평일 기준 3 ~7일이 소요될 수 있습니다.
-					</li>
-				</ul>
-			</div>
-			<div class="btn_footer_area">
-				<button type="button" class="btn btn_default btn_md"><span>취소</span></button>
-				<button type="button" id="btn_refund_pop" class="btn btn_dark btn_md"><span>주문 취소</span></button>
-			</div>
-		</div>
-	</div>
-	<!-- // CONT-BODY -->
-
-	<!--<div class="my_cont">
-		<div class="sec_head">
-			<h3>반품 신청</h3>
-			<div class="od_detail">
-				(주문번호 : <span class="num" th:text="${ordNo}"></span>)
-			</div>
-		</div>
-		<div class="sec_body mypage_body">
-			<form class="form_wrap" role="form">
-				<div class="order_list">
-					<section class="order_row">
-						<div class="part_deliver">
-							<div class="tbl_tit">
-								&lt;!&ndash; 주문일/선물일 설정 &ndash;&gt;
-								<span class="start_t" th:unless="${returnList.oneData.giftPackYn == 'Y'}">주문일</span>
-								<span class="gift_t" th:if="${returnList.oneData.giftPackYn == 'Y'}">선물일</span>
-								&lt;!&ndash; //주문일/선물일 설정 &ndash;&gt;
-
-								<span class="order_date" th:text="${returnList.oneData.ordDt}"></span>
-
-								&lt;!&ndash; 배송구분 설정 &ndash;&gt;
-								<span class="order_label02" th:if="${returnList.shotDelv}">총알배송</span>
-								<span class="order_label01" th:if="${returnList.selfMall}">STYLE24 일반배송</span>
-								<span class="order_label01" th:if="${returnList.supplyMall}">업체직배송</span>
-								&lt;!&ndash; //배송구분 설정 &ndash;&gt;
-								<a href="javascript:void(0)" class="detail_btn" th:attr="ordNo=${returnList.oneData.ordNo}" onclick="fnGoToOrderDetail(this)">주문상세보기</a>
-							</div>
-							<div class="tbl type2">
-								<table id="returnList">
-									<colgroup>
-										<col width="1020">
-										<col width="180">
-									</colgroup>
-									<tbody>
-									<th:block th:if="${returnList.returnList}" th:each="return, status : ${returnList.returnList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
-										<tr>
-											<td>
-												<div class="info_item">
-													<div class="thumb_box">
-														<a href="">
-															<img th:src="${imageUrl + '/' + return.sysImgNm}" width="100%" alt="">
-														</a>
-													</div>
-													<div class="info_box">
-														<p class="od_name">
-															<a href="">
-																<span class="brand" th:text="${return.brandNm}"></span>
-																<span class="name" th:text="${return.goodsNm}"></span>
-															</a>
-														</p>
-														<p class="od_opt">
-															<span class="option"><em th:text="${return.optCd1}"></em><em th:text="${return.optCd2}"></em></span>
-															<span class="count">수량 <em th:text="${return.ordQty}"></em>개</span>
-														</p>
-													</div>
-													<div class="info_calc">
-														<p class="price">
-															<span class="selling_price" th:text="|${#numbers.formatInteger(return.ordAmt, 1, 'COMMA')}원|"></span>
-														</p>
-														<p class="point"><span th:text="${#numbers.formatInteger(return.savePntAmt, 1, 'COMMA')}"></span>p</p>
-													</div>
-												</div>
-											</td>
-											<td class="cnt_sel">
-												<span class="cnt_t">수량</span>
+										<div class="gd_opt">
+											<div class="option_wrap">
+												<span class="title sr-only">주문 옵션</span>
+												<span class="option" th:text="|${cancel.optCd1} / ${cancel.optCd2}|"></span>
+											</div>
+										</div>
+										<div class="gd_calc">
+											<p>
+												<span class="count"><em th:text="${cancel.ordQty - cancel.cnclRtnQty}"></em>개</span>
+											</p>
+											<p>
+												<span class="price_org"><em th:text="${#numbers.formatInteger(cancel.listPrice * (cancel.ordQty - cancel.cnclRtnQty), 1, 'COMMA')}"></em>원</span>
+												<span class="price_sale"><em th:text="${#numbers.formatInteger(cancel.ordAmt - cancel.cnclRtnAmt, 1, 'COMMA')}"></em>원</span>
+											</p>
+										</div>
+									</div>
+									<div class="button_box">
+										<div class="count_modify">
+											<span class="txt">수량</span>
+											<form class="form_wrap">
 												<div class="form_field">
-													<div class="select_custom type1">
+													<div class="select_custom select_count">
 														<div class="combo">
-															<input type="hidden" name="chgQty" value="0" th:attr="ordDtlNo=${return.ordDtlNo}, ordCanChgQty=${return.ordCanChgQty}"/>
+															<input type="hidden" name="chgQty" value="0" th:attr="ordDtlNo=${cancel.ordDtlNo}, ordCanChgQty=${cancel.ordCanChgQty}"/>
 															<div class="select">선택</div>
-															<ul class="list" style="width:100px; margin:0 auto">
-																<li class="selected" value="0">선택</li>
-																<li th:if="${return.ordCanChgQty > 0}" th:each="num : ${#numbers.sequence(1,return.ordCanChgQty)}" th:value="${num}" th:text="${num}" onclick="fnChangeQty(this);"></li>
+															<ul class="list">
+																<li class="selected" qty="0" onclick="fnChangeCancelQty(this);">선택</li>
+																<li th:if="${cancel.ordCanChgQty > 0}" th:each="num : ${#numbers.sequence(1,cancel.ordCanChgQty)}" th:attr="qty=${num}" th:text="${num}" onclick="fnChangeCancelQty(this);"></li>
 															</ul>
 														</div>
 													</div>
 												</div>
-&lt;!&ndash;												<select class="select_dress" name="chgQty" onchange="fnChangeQty();">&ndash;&gt;
-&lt;!&ndash;													<option value="">선택</option>&ndash;&gt;
-&lt;!&ndash;													<option th:if="${return.ordQty > 0}" th:each="num : ${#numbers.sequence(1,return.ordQty)}" th:value="${num}" th:text="${num}"></option>&ndash;&gt;
-&lt;!&ndash;												</select>&ndash;&gt;
-											</td>
-										</tr>
-									</th:block>
-									</tbody>
-								</table>
-							</div>
-							<div class="order_confirm">
-								<p class="cf_txt cf_desc c_primary">반품하실 상품의 수량을 선택하신 후 반품 신청을 하실 수 있습니다.</p>
+											</form>
+										</div>
+									</div>
+								</div>
+								<div class="order_text">
+									<p>취소하실 수량을 선택하신 후 주문 취소를 하실 수 있습니다.</p>
+								</div>
 							</div>
+							<!-- //주문상품 -->
+							</th:block>
 						</div>
-					</section>
-					<section class="order_row">
-						<div class="tbl_tit">
-							<h3 class="subH3">반품 사유</h3>
-						</div>
-						<div class="tbl type1">
-							<table>
-								<colgroup>
-									<col width="*">
-								</colgroup>
-								<tbody>
-								<tr>
-									<td>
-										<div class="form_field">
-											<div class="select_custom type1">
-												<div class="combo">
-													<input type="hidden" name="chgReason"/>
-													<div class="select">반품 사유를 선택하세요</div>
-													<ul class="list" style="width:400px">
-														<li class="selected" value="">반품 사유를 선택하세요</li>
-														<li th:if="${returnReason}" th:each="oneData, status : ${returnReason}" th:value="${oneData.cd}" th:text="${oneData.cdNm}" onclick="fnChangeReason(this);"></li>
-													</ul>
+					</div>
+					<h4 class="subH3">환불정보</h4>
+					<div class="tbl type6">
+						<table>
+							<colgroup>
+								<col width="50%">
+								<col width="50%">
+							</colgroup>
+							<tr>
+								<td>
+									<dl>
+										<div>
+											<dt>환불 예정 금액</dt>
+											<dd>
+												<div class="price">
+													<span class="return_total_price"><em id="returnAmt">0</em>원</span>
 												</div>
-											</div>
+											</dd>
 										</div>
-									</td>
-								</tr>
-								<tr>
-									<td>
-										<textarea class="doc_exchange" name="chgMemo" id="chgMemo" placeholder="자세한 사유를 입력해주세요." onkeyup="cfnGetTextLength(this, 200, $('#return_cnt'));"></textarea>
-										<p class="txt_cnt"><span id="return_cnt" class="c_primary">0</span>/200</p>
-									</td>
-								</tr>
-								</tbody>
-							</table>
-						</div>
-					</section>
-					<section class="order_row" id="wdGb">
-						<div class="order_tit">
-							<h3 class="subH3">반품 방식 선택</h3>
-						</div>
-						<div class="tbl type1">
-							<table>
-								<colgroup>
-									<col width="*">
-								</colgroup>
-								<tbody>
-								<tr>
-									<td>
-										<div class="form_field radio_field">
-											<div class="">
-												<input type="radio" name="wdGb" id="withdraw" value="W" checked>
-												<label for="withdraw"><span>방문회수 <b class="c_primary">택배사에서 방문하여 회수</b></span></label>
-											</div>
-											<div class="">
-												<input type="radio" name="wdGb" id="direct" value="D">
-												<label for="direct"><span>직접반송 <b class="c_primary">고객이 직접 반송처리</b></span></label>
-											</div>
+										<div class="include_item"> <!-- 할인항목 표기 class명 include_item -->
+											<dt>상품 취소 금액</dt>
+											<dd><em id="goodsCancelAmt">0</em>원</dd>
 										</div>
-									</td>
-								</tr>
-								</tbody>
-							</table>
-						</div>
-					</section>
-					<section class="order_row" id="chgerLocation">
-						<div class="order_tit">
-							<h3 class="subH3">상품 회수지</h3>
-							<span class="del_t">택배사에서 반품 상품을 직접 회수할 장소 선택</span>
-							<button type="button" class="btn_popup" onclick="fnChangeDeliveryAddr('chger');"><span>회수지 선택</span></button>
-						</div>
-						<div class="tbl type1">
-							<table>
-								<colgroup>
-									<col width="200">
-									<col width="*">
-								</colgroup>
-								<tbody>
-								<tr>
-									<th>성명</th>
-									<td id="chgerNm" th:text="${deliveryAddrInfo.recipNm}"></td>
-									<input type="hidden" name="chgerNm" th:value="${deliveryAddrInfo.recipNm}">
-								</tr>
-								<tr>
-									<th>연락처</th>
-									<td id="chgerPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></td>
-									<input type="hidden" name="chgerPhnno" th:value="${deliveryAddrInfo.recipPhnno}">
-								</tr>
-								<tr>
-									<th>주소</th>
-									<td id="chgerAddr" th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></td>
-									<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
-									<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
-								</tr>
-								</tbody>
-							</table>
-						</div>
-					</section>
-					<section class="order_row" id="returnLocation" style="display:none">
-						<div class="order_tit">
-							<h3 class="subH3">반품하실 배송지</h3>
-						</div>
-						<div class="tbl type1">
-							<table>
-								<colgroup>
-									<col width="200">
-									<col width="*">
-								</colgroup>
-								<tbody>
-								<tr>
-									<th>성명</th>
-									<td th:text="${deliveryAddrInfo.rtnLocNm}"></td>
-									<input type="hidden" name="rtnLocNm" th:value="${deliveryAddrInfo.rtnLocNm}">
-								</tr>
-								<tr>
-									<th>연락처</th>
-									<td th:text="${deliveryAddrInfo.rtnLocTelno}"></td>
-									<input type="hidden" name="rtnLocTelno" th:value="${deliveryAddrInfo.rtnLocTelno}">
-								</tr>
-								<tr>
-									<th>주소</th>
-									<td th:text="|${deliveryAddrInfo.rtnLocBaseAddr} ${deliveryAddrInfo.rtnLocDtlAddr}|"></td>
-									<input type="hidden" name="rtnLocBaseAddr" th:value="${deliveryAddrInfo.rtnLocBaseAddr}">
-									<input type="hidden" name="rtnLocDtlAddr" th:value="${deliveryAddrInfo.rtnLocDtlAddr}">
-								</tr>
-								</tbody>
-							</table>
-						</div>
-					</section>
-					<section class="order_row">
-						<div class="order_tit">
-							<h3 class="subH3">환불 정보</h3>
-							<button type="button" class="btn_popup"><span>취소 전표 보기</span></button>
-						</div>
-						<div class="tbl type1 re_info_tbl">
-							<div class="r_left">
-								<dl>
-									<dt>환불(예정) 금액</dt>
-									<dd>
-										<span class="big_t"><strong id="returnAmt">0</strong>원</span>
-									</dd>
-								</dl>
-								<dl>
-									<dt>상품취소 금액</dt>
-									<dd>
-										<span id="goodsCancelAmt">0</span>원
-									</dd>
-								</dl>
-								<dl>
-									<dt>배송비</dt>
-									<dd>
-										<span id="deliveryFee">0</span>원
-									</dd>
-								</dl>
-								<dl>
-									<dt>할인금액 차감</dt>
-									<dd>
-										<span id="deductDcAmt">0</span>원
-									</dd>
-								</dl>
-							</div>
-							<div class="r_right">
-								<dl>
-									<dt>환불수단</dt>
-									<dd>
-										<span th:text="${paymentInfo.payMeansNm}"></span>
-									</dd>
-								</dl>
-								<dl>
-									<dt>결제금액 환불</dt>
-									<dd>
-										<span id="refundPayAmt">0</span>원
-									</dd>
-								</dl>
-								<dl>
-									<dt>포인트 환불</dt>
-									<dd>
-										<span id="refundPoint">0</span>P
-									</dd>
-								</dl>
-								<dl>
-									<dt>상품권 환불</dt>
-									<dd>
-										<span id="refundGiftCard">0</span>원
-									</dd>
-								</dl>
-							</div>
-						</div>
-						<p class="alert_t">※ 카드사로 결제 취소 요청이 전달된 후 환불까지는 평일 기준 3 ~7일이 소요될 수 있습니다.</p>
-					</section>
-					<section class="order_row" id="addDeliveryFee" style="display:none">
-						<div class="ship_fee">
-							<p><span class="c_primary" id="addPayCost">2,500원</span> 배송비 추가 결제가 필요합니다.</p>
-							<input type="hidden" name="addPayCost"/>
-						</div>
-					</section>
-					<div class="btn_wrap">
-						<button type="button" class="btn btn_default cancle_btn" onclick="cfnGoToPage(_PAGE_MYPAGE_CRS_LIST)"><span>반품 취소</span></button>
-						<button tyep="submit" class="btn btn_primary submit_btn" onclick="fnReturn()"><span id="returnButton">반품 신청</span></button>
+										<div class="include_item">
+											<dt>배송비</dt>
+											<dd><em id="deliveryFee">0</em>원</dd>
+										</div>
+										<div class="include_item">
+											<dt>할인 금액 차감</dt>
+											<dd><em id="deductDcAmt">0</em>원</dd>
+										</div>
+									</dl>
+								</td>
+								<td>
+									<dl>
+										<div>
+											<dt>환불 수단</dt>
+											<dd th:if="${paymentInfo.pgGb == 'KCP'}" th:text="${paymentInfo.payMeansNm}"></dd>
+											<dd th:if="${paymentInfo.pgGb == 'NAVER'}" th:text="|네이버페이|"></dd>
+											<dd th:if="${paymentInfo.pgGb == 'KAKAO'}" th:text="|카카오페이|"></dd>
+											<dd th:if="${paymentInfo.pgGb == 'PAYCO'}" th:text="|PAYCO|"></dd>
+										</div>
+										<div>
+											<dt>결제 금액 환불</dt>
+											<dd>
+												<em id="refundPayAmt">0</em>원
+											</dd>
+										</div>
+										<div>
+											<dt>포인트 환불</dt>
+											<dd>
+												<em id="refundPoint">0</em>P
+											</dd>
+										</div>
+										<div>
+											<dt>상품권 환불</dt>
+											<dd>
+												<em id="refundGiftCard">0</em>원
+											</dd>
+										</div>
+									</dl>
+								</td>
+							</tr>
+						</table>
+					</div>
+					<div class="txt_info">
+						<ul>
+							<li>
+								카드사로 결제 취소 요청이 전달된 후 환불까지는 평일 기준 3 ~7일이 소요될 수 있습니다.
+							</li>
+						</ul>
+					</div>
+					<div class="btn_footer_area">
+						<button type="button" class="btn btn_default btn_md" onclick="cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);"><span>취소</span></button>
+						<button type="button" id="btn_refund_pop" class="btn btn_dark btn_md" onclick="fnCancel();"><span>주문 취소</span></button>
 					</div>
 				</div>
-			</form>
+			</div>
+			<!-- // CONT-BODY -->
 		</div>
-	</div>-->
+	</div>
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 	let cancelList = [[${cancelList}]];
+	let oneData = [[${oneData}]];
+	let paymentInfo = [[${paymentInfo}]];
 	let usedGiftCardInfo = [[${usedGiftCardInfo}]];
 	let usedPointInfo = [[${usedPointInfo}]];
 
@@ -485,8 +210,58 @@
 	
 	// 취소 처리
 	var fnCancel = function() {
-		// TODO
-		// 취소신청 처리
+		// 취소수량 설정
+		fnChangeCancelQty();
+
+		// 취소수량 체크
+		let index = 0;
+		$.each(cancelList.cancelList, function (idx, item) {
+			index += item.ordCanChgQty;
+		});
+		
+		if (index == 0) {
+			mcxDialog.alert('취소 수량을 선택해주세요.');
+			return false;
+		}
+		
+		// 환불계좌 체크
+		let accountNo = $('input[name=accountNo]').val();
+		let accountNm = $('input[name=accountNm]').val();
+		let bankCd = $('input[name=bankCd]').val();
+		
+		if (paymentInfo.payMeans == 'G014_20' && paymentInfo.payStat == 'G016_00' && (gagajf.isNull(accountNo) || gagajf.isNull(accountNm) || gagajf.isNull(bankCd))) {
+			// TODO
+			// 환불계좌 등록 팝업
+			
+			return false;
+		}
+		
+		// 취소요청 데이터 설정
+		let url = '/mypage/cancel';
+
+		let allCanYn = '';
+		if (paymentInfo.payMeans == 'G014_20' && paymentInfo.payStat == 'G016_00') {
+			allCanYn = 'Y';
+		}
+
+		let data = {};
+		data.ordNo = oneData.ordNo;
+		data.chgReason = 'G686_10';
+		data.accountNo = accountNo;
+		data.accountNm = accountNm;
+		data.bankCd = bankCd;
+		data.allCanYn = allCanYn;
+		data.isCustomer = 'Y';
+		data.reqGbn = 'cnclComplete';
+		data.cancelReqList = cancelList.cancelList;
+
+		let jsonData = JSON.stringify(data);
+
+		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+			// TODO
+			// 주문취소 콜백처리
+			console.log(result);
+		});
 	}
 	
 	// 취소 수량 변경 이벤트 처리
@@ -494,7 +269,7 @@
 		let url = '/mypage/cancel/refund/amt/calculate';
 
 		if (param != null) {
-			$(param).parent().parent().find('input[name=chgQty]').val($(param).val());
+			$(param).parent().parent().find('input[name=chgQty]').val($(param).attr('qty'));
 		}
 
 		let cancelRequestList = [];
@@ -503,7 +278,6 @@
 		let chgQtyArr = [];
 		let ordDtlNoArr = [];
 		let ordCanChgQtyArr = [];
-		let chgQtyChk = 0;
 		$.each($('input[name=chgQty]'), function(idx, item) {
 			let chgQty = $(item).val();
 			let ordDtlNo = $(item).attr('ordDtlNo');
@@ -512,50 +286,48 @@
 			chgQtyArr.push(Number(chgQty));
 			ordDtlNoArr.push(Number(ordDtlNo));
 			ordCanChgQtyArr.push(Number(ordCanChgQty));
-			
-			chgQtyChk += Number(chgQty);
 		});
 
-		if (chgQtyChk > 0) {
+		$.each(cancelList.cancelList, function (idx, item) {
+			let index = ordDtlNoArr.indexOf(item.ordDtlNo);
+
+			if (index >= 0) {
+				item.ordCanChgQty = chgQtyArr[index];
+			}
+
+			cancelRequestList.push(item);
+		});
+
+		let jsonData = JSON.stringify(cancelRequestList);
+
+		gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
 			// 환불포인트, 환불상품권 금액 계산
 			let refundPoint = fnCalculatePoint(chgQtyArr, ordDtlNoArr, ordCanChgQtyArr);
 			let refundGiftCard = fnCalculateGiftCard(chgQtyArr, ordDtlNoArr, ordCanChgQtyArr);
+
+			let spanCnclRtnAmt = Number(result.spanCnclRtnAmt);
+			let sumDeliveryFee = Number(result.sumDeliveryFee);
+			let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);
+			let spanCpnDcAmt = Number(result.spanCpnDcAmt);
+			let spanTmtbDcAmt = Number(result.spanTmtbDcAmt);
+			let spanPrePntDcAmt = Number(result.spanPrePntDcAmt);
+			let spanRefundAmt = Number(result.spanRefundAmt);
 			
-			$.each(cancelList, function (idx, item) {
-				let index = ordDtlNoArr.indexOf(item.ordDtlNo);
-				item.ordCanChgQty = chgQtyArr[index];
-				
-				cancelRequestList.push(item);
-			})
-			
-			let jsonData = JSON.stringify(cancelRequestList);
+			let goodsCancelAmt = spanCnclRtnAmt;										// 상품취소금액
+			let deliveryFee = sumDeliveryFee - spanTotDeliveryFee;						// 배송비
+			let deductDcAmt = 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;		// 할인금액 차감(쿠폰+다다익선+선포인트)
+			let refundPayAmt = spanRefundAmt;											// 결제금액 환불
+			let returnAmt = refundPayAmt + refundPoint + refundGiftCard;				// 환불예정금액
 			
-			gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
-				let spanCnclRtnAmt = Number(result.spanCnclRtnAmt);
-				let sumDeliveryFee = Number(result.sumDeliveryFee);
-				let spanTotDeliveryFee = Number(result.spanTotDeliveryFee);
-				let spanCpnDcAmt = Number(result.spanCpnDcAmt);
-				let spanTmtbDcAmt = Number(result.spanTmtbDcAmt);
-				let spanPrePntDcAmt = Number(result.spanPrePntDcAmt);
-				let spanRefundAmt = Number(result.spanRefundAmt);
-				
-				let goodsCancelAmt = spanCnclRtnAmt;										// 상품취소금액
-				let deliveryFee = sumDeliveryFee - spanTotDeliveryFee;						// 배송비
-				let deductDcAmt = 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;		// 할인금액 차감(쿠폰+다다익선+선포인트)
-				let refundPayAmt = spanRefundAmt;											// 결제금액 환불
-				let returnAmt = refundPayAmt + refundPoint + refundGiftCard;				// 환불예정금액
-				
-				// 금액 설정
-				$('#returnAmt').text(returnAmt.addComma());
-				$('#goodsCancelAmt').text(goodsCancelAmt.addComma());
-				$('#deliveryFee').text(deliveryFee.addComma());
-				$('#deductDcAmt').text(deductDcAmt.addComma());
-				$('#refundPayAmt').text(refundPayAmt.addComma());
-				$('#refundPoint').text(refundPoint.addComma());
-				$('#refundGiftCard').text(refundGiftCard.addComma());
-				console.log(result);
-			});
-		}
+			// 금액 설정
+			$('#returnAmt').text(returnAmt.addComma());
+			$('#goodsCancelAmt').text(goodsCancelAmt.addComma());
+			$('#deliveryFee').text(deliveryFee.addComma());
+			$('#deductDcAmt').text(deductDcAmt.addComma());
+			$('#refundPayAmt').text(refundPayAmt.addComma());
+			$('#refundPoint').text(refundPoint.addComma());
+			$('#refundGiftCard').text(refundGiftCard.addComma());
+		});
 	}
 
 	// 환불 포인트 계산

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

@@ -19,387 +19,778 @@
 <body>
 
 <th:block layout:fragment="content">
-	<div class="my_cont">
-		<div class="sec_head">
-			<h3>주문상세</h3>
-			<div class="od_detail">
-				(주문번호 : <span class="num" th:text="${ordNo}"></span>)
+	<div class="content myOrderList">
+		<div class="cont_body">
+			<!-- CONT-BODY -->
+			<div class="lnb">
+				<div class="lnb_tit">
+					<h2>마이페이지</h2>
+				</div>
+				<div class="lnb_list">
+					<ul id="mypageLnbList"></ul>
+				</div>
 			</div>
-			<button type="button" class="btn btn_default od_del_btn" onclick="fnDeleteOrder()"><span>주문 내역 삭제</span></button>
-		</div>
-		<div class="sec_body">
-			<div class="order_list" id="orderList">
-				<section class="order_row">
-					<th:block th:if="${orderList}" th:each="oneData, status : ${orderList}">
-						<div class="part_deliver">
-							<div class="tbl_tit">
-								<!-- 주문일/선물일 설정 -->
-								<span class="start_t" th:unless="${oneData.giftPackYn == 'Y'}">주문일</span>
-								<span class="gift_t" th:if="${oneData.giftPackYn == 'Y'}">선물일</span>
-								<!-- //주문일/선물일 설정 -->
-
-								<span class="order_date" th:text="${oneData.ordDt}"></span>
-
-								<!-- 배송구분 설정 -->
-								<span class="order_label02" th:if="${oneData.shotDelv}">총알배송</span>
-								<span class="order_label01" th:if="${oneData.selfMall}">STYLE24 일반배송</span>
-								<span class="order_label01" th:if="${oneData.supplyMall}">업체직배송</span>
-								<!-- //배송구분 설정 -->
-<!--								<a href="javascript:void(0)" class="detail_btn" th:attr="ordNo=${oneData.ordNo}" onclick="fnGoToOrderDetail(this)">주문상세보기</a>-->
+			<div class="cont">
+				<div class="sec_head">
+					<h3 class="subH1">주문상세</h3>
+					<span class="order_number">주문번호&nbsp;:&nbsp;<em th:text="${ordNo}"></em></span>
+					<button type="button" id="btn_order_cancel" class="btn_underline" onclick="fnDeleteOrder()"><span>삭제하기</span></button>
+				</div>
+				<div class="sec_body">
+					<th:block th:if="${orderList}" th:each="order, status : ${orderList}">
+						<div class="part_goods">
+							<div class="goods_head">
+								<p th:unless="${order.giftPackYn == 'Y'}">주문일 <span th:text="${order.ordDt}"></span></p>
+								<p th:if="${order.giftPackYn == 'Y'}">선물일 <span th:text="${order.ordDt}"></span></p>
+								<a href="javascript:void(0)" th:if="${allCanYn == 'Y'}" th:onclick="fnAllCancel(${order.ordNo})">주문전체취소</a>
 							</div>
-							<th:block th:if="${oneData.orderList}" th:each="order, status : ${oneData.orderList}">
-								<div class="tbl type2">
-									<table>
-										<colgroup>
-											<col width="1020">
-											<col width="180">
-										</colgroup>
-										<tbody>
-										<th:block th:if="${order.ordDtlList}" th:each="ordDtl, status : ${order.ordDtlList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
-											<input type="hidden" name="ordDtlNo" th:value="${ordDtl.ordDtlNo}"/>
-											<input type="hidden" name="ordDtlStat" th:value="${ordDtl.ordDtlStat}"/>
-											<input type="hidden" name="reviewSq" th:value="${ordDtl.reviewSq}"/>
-											<tr class="bundle_row">
-												<td>
-													<div class="info_item">
-														<div class="thumb_box">
-															<a href="">
-																<img th:src="${imageUrl + '/' + ordDtl.sysImgNm}" width="100%" alt="">
-															</a>
-														</div>
-														<div class="info_box">
-															<p class="od_name">
-																<a href="">
-																	<span class="brand" th:text="${ordDtl.brandNm}"></span>
-																	<span class="name" th:text="${ordDtl.goodsNm}"></span>
-																</a>
-															</p>
-															<p class="od_opt">
-																<span class="option"><em th:text="${ordDtl.optCd1}"></em><em th:text="${ordDtl.optCd2}"></em></span>
-																<span class="count">수량 <em th:text="${ordDtl.ordQty}"></em>개</span>
-															</p>
-															<button type="button" class="btn btn_dark cart_btn" onclick="fnCreateCart(this);">쇼핑백 담기</button>
-														</div>
-														<div class="info_calc">
-															<p class="price">
-																<span class="selling_price" th:text="|${#numbers.formatInteger(ordDtl.ordAmt, 1, 'COMMA')}원|"></span>
-															</p>
-															<p class="point"><span th:text="${#numbers.formatInteger(ordDtl.savePntAmt, 1, 'COMMA')}"></span>p</p>
-														</div>
+							<div class="goods_cont">
+								<!-- 주문상품 -->
+								<th:block th:if="${order.ordDtlList}" th:each="ordDtl, status : ${order.ordDtlList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+									<div class="goods_info">
+										<div class="order_desc">
+											<div class="goods_box">
+												<div class="gd_item">
+													<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+														<span class="thumb">
+															<img th:src="${imageUrl + '/' + ordDtl.sysImgNm}" width="100%" alt="">
+														</span>
+														<p>
+															<span class="brand" th:text="${ordDtl.brandNm}"></span>
+															<span class="tag primary" th:if="${ordDtl.shotDelvYn == 'Y'}">총알배송</span>
+															<span class="tag" th:if="${ordDtl.shotDelvYn == 'N' and ordDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</span>
+															<span class="tag" th:if="${ordDtl.selfGoodsYn == 'N'}">업체직배송</span>
+														</p>
+														<p>
+															<span class="name" th:text="${ordDtl.goodsNm}"></span>
+														</p>
+													</a>
+												</div>
+												<div class="gd_opt">
+													<div class="option_wrap">
+														<span class="title sr-only">주문 옵션</span>
+														<span class="option" th:text="|${ordDtl.optCd1} / ${ordDtl.optCd2}|"></span>
 													</div>
-												</td>
+												</div>
+												<div class="gd_calc">
+													<p>
+														<span class="count"><em th:text="${ordDtl.ordQty}"></em>개</span>
+													</p>
+													<p>
+														<span class="price_org"><em th:text="${#numbers.formatInteger(ordDtl.listPrice * (ordDtl.ordQty - ordDtl.cnclRtnQty), 1, 'COMMA')}"></em>원</span>
+														<span class="price_sale"><em th:text="${#numbers.formatInteger(ordDtl.ordAmt - ordDtl.cnclRtnAmt, 1, 'COMMA')}"></em>원</span>
+													</p>
+													<p>
+														<span class="point"><em th:text="${#numbers.formatInteger(ordDtl.savePntAmt, 1, 'COMMA')}"></em><stong>P</stong>&nbsp;적립예정</span>
+													</p>
+												</div>
+											</div>
+											<div class="status_box">
+												<!-- 선물 -->
+												<th:block th:if="${order.giftPackYn == 'Y'}">
+													<p th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">주소 입력 대기중</p>
+													<p th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">선물 완료</p>
+													<p th:if="${ordDtl.ordDtlStat == 'G013_98' or ordDtl.ordDtlStat == 'G013_99'}">선물 취소</p>
+												</th:block>
 												<!-- 주문 -->
-												<td class="merge_row" th:unless="${oneData.giftPackYn == 'Y'}">
-													<div class="delivery">
-														<p class="dlvr_staus" th:text="${ordDtl.ordDtlStatNm}"></p>
-														<p class="dlvr_desc" th:if="${ordDtl.delvEddt}" th:text="|${ordDtl.delvEddt}일 도착|"></p>
-													</div>
-													<div class="tbl_btn_wrap case02">
-														<button type="button" class="btn btn_default btn_sm" onclick="fnCreateExchange(this, 'exchange');"><span>교환</span></button>
-														<button type="button" class="btn btn_default btn_sm" onclick="fnCreateCancel(this, 'cancel');"><span>반품/취소</span></button>
-<!--														<button type="button" class="btn btn_default btn_sm" th:if="${ordDtl.reviewSq == 0}" th:attr="ordNo=${oneData.ordNo}" onclick="fnCreateReview(this);"><span>리뷰작성</span></button>-->
-														<button type="button" class="btn btn_default btn_sm" th:if="${!order.review}" th:attr="ordNo=${oneData.ordNo}" onclick="fnCreateReview(this);"><span>리뷰작성</span></button>
-													</div>
-												</td>
-												<td class="merge_row" th:if="${oneData.giftPackYn == 'Y' and #strings.isEmpty(ordDtl.recipBaseAddr)}">
-													<div class="delivery">
-														<p class="dlvr_staus c_primary">주소 입력 대기</p>
-														<p class="dlvr_desc" th:text="|남은 기간 ${ordDtl.giftLimitDay}일|"></p>
-														<p class="dlvr_desc" th:text="|(${ordDtl.giftLimitDt}까지)|"></p>
-													</div>
-													<div class="tbl_btn_wrap case02">
-														<button type="button" class="btn btn_dark btn_sm" onclick="fnReSendSms(this);"><span>SMS 재전송</span></button>
-													</div>
-												</td>
-												<td class="merge_row" th:if="${oneData.giftPackYn == 'Y' and !#strings.isEmpty(ordDtl.recipBaseAddr)}">
-													<div class="delivery">
-														<p class="dlvr_staus c_primary">선물 완료</p>
-														<p class="dlvr_desc" th:text="|(${ordDtl.giftCompleteDt})|"></p>
-													</div>
-													<div class="tbl_btn_wrap case02">
-													</div>
-												</td>
-											</tr>
+												<th:block th:unless="${order.giftPackYn == 'Y'}">
+													<p th:text="${ordDtl.ordDtlStatNm}"></p>
+												</th:block>
+											</div>
+											<div class="button_box">
+												<!-- 선물 -->
+												<th:block th:if="${order.giftPackYn == 'Y'}">
+													<!-- SMS 재발송 버튼 -->
+													<th:block th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">
+														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></p>
+													</th:block>
+													
+													<!-- 리뷰 쓰기 버튼 -->
+													<th:block th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
+														<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>
+													</th:block>
+												</th:block>
+												<!-- 주문 -->
+												<th:block th:unless="${order.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' or ordDtl.ordDtlStat == 'G013_40'}">
+														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></p>
+													</th:block>
+													
+													<!-- 교환/반품 신청 버튼(배송중, 출고완료, 배송완료) -->
+													<th:block th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55' or ordDtl.ordDtlStat == 'G013_60'}">
+														<!-- 교환/반품 가능한 상품 -->
+														<th:block th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'Y'}">
+															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, supplyCompCd=${ordDtl.supplyCompCd}" onclick="fnCreateChange(this, 'exchange');"><span>교환 신청</span></button></p>
+															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, supplyCompCd=${ordDtl.supplyCompCd}" onclick="fnCreateChange(this, 'return');"><span>반품 신청</span></button></p>
+														</th:block>
+														
+														<!-- 교환 신청 불가 상품 -->
+														<th:block th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">
+															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
+															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, supplyCompCd=${ordDtl.supplyCompCd}" onclick="fnCreateChange(this, 'return');"><span>반품 신청</span></button></p>
+														</th:block>
+
+														<!-- 반품 신청 불가 상품 -->
+														<th:block th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">
+															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, supplyCompCd=${ordDtl.supplyCompCd}" onclick="fnCreateChange(this, 'exchange');"><span>교환 신청</span></button></p>
+															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
+														</th:block>
+
+														<!-- 교환/반품 신청 불가 상품 -->
+														<th:block th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">
+															<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
+														</th:block>
+													</th:block>
+													
+													<!-- 배송조회 버튼(배송중) -->
+													<th:block th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55'}">
+														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnGoToDelivery(this);"><span>배송 조회</span></button></p>
+													</th:block>
+
+													<!-- 구매확정 버튼(배송완료) -->
+													<th:block th:if="${ordDtl.ordDtlStat == 'G013_60'}">
+														<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);"><span>구매 확정</span></button></p>
+													</th:block>
+
+													<!-- 리뷰작성 버튼(구매확정) -->
+													<th:block th:if="${ordDtl.ordDtlStat == 'G013_70' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
+														<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>
+													</th:block>
+
+													<!-- 쇼핑백담기 버튼(구매확정) -->
+													<th:block th:if="${ordDtl.ordDtlStat == 'G013_70'}">
+														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);"><span>쇼핑백 담기</span></button></p>
+													</th:block>
+
+													<!-- 1:1문의 버튼(구매확정) -->
+													<th:block th:if="${ordDtl.ordDtlStat == 'G013_70' and (ordDtl.reviewableYn == 'N' or ordDtl.reviewSq > 0)}">
+														<p><button type="button" class="btn btn_default btn_sm" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);"><span>1:1 문의</span></button></p>
+													</th:block>
+												</th:block>
+											</div>
+										</div>
+										<!-- 선물 -->
+										<th:block th:if="${order.giftPackYn == 'Y'}">
+											<!-- 주소 입력 대기중 -->
+											<div class="order_text" th:if="${#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.giftLimitDay >= 0}">
+												<p th:text="|${ordDtl.recipNm}님이 주소를 입력하기 전입니다. (입력기한 ${ordDtl.giftLimitDt})|"></p>
+											</div>
+
+											<!-- 선물 완료 -->
+											<div class="order_text" th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr) and ordDtl.ordDtlStat != 'G013_98' and ordDtl.ordDtlStat != 'G013_99'}">
+												<p th:text="|${ordDtl.recipNm}님께 선물이 발송되었습니다.|"></p>
+											</div>
+
+											<!-- 선물 취소 -->
+											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_98' and ordDtl.ordDtlStat == 'G013_99'}">
+												<p th:text="|주소 입력 기한이 경과되어 선물이 취소 되었습니다.|"></p>
+											</div>
 										</th:block>
-										</tbody>
-									</table>
-								</div>
-								<!-- 주문 -->
-								<th:block th:unless="${oneData.giftPackYn == 'Y'}">
-									<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_00' or order.ordDtlStat == 'G013_10' or order.ordDtlStat == 'G013_11'}">
-										<span class="cf_txt">주문 완료 / 결제를 기다리고 있습니다.</span>
-									</div>
-									<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_20' or order.ordDtlStat == 'G013_30' or order.ordDtlStat == 'G013_35'}">
-										<span class="cf_txt">배송할 상품을 준비 중입니다.</span>
-									</div>
-									<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_40'}">
-										<span class="cf_txt">상품준비가 완료되어 곧 배송될 예정입니다.</span>
-									</div>
-									<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_50' or order.ordDtlStat == 'G013_55'}">
-										<span class="cf_txt" th:text="|${order.shipCompNm} / ${order.invoiceNo}|"></span>
-										<button type="button" class="btn btn_primary" th:attr="ordNo=${oneData.ordNo}, invoiceNo=${order.invoiceNo}, shipCompCd=${order.shipCompCd}" onclick="fnGetDeliveryInfo(this)">배송조회</button>
-									</div>
-									<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_60'}">
-										<span class="cf_txt" th:text="|${order.purchaseConfirmDay}일 후 자동으로 구매확정|"></span>
-										<button type="button" class="btn btn_primary" onclick="fnDecideOrder(this);">구매확정 하기</button>
-									</div>
-									<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_70' and order.reviewSq == 0}">
-										<span class="cf_txt">리뷰를 작성하면 다른 구매자에게 도움이 될 수 있습니다.</span>
-										<button type="button" class="btn btn_primary" banner="banner" onclick="fnCreateReview(this, 'Y');">리뷰작성</button>
-									</div>
-									<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_70' and order.reviewSq > 0}">
-										<span class="cf_txt">주문내역 다시 구매하기 위해</span>
-										<button type="button" class="btn btn_primary" onclick="fnCreateCart(this, 'Y');">장바구니 담기</button>
-									</div>
-								</th:block>
+										
+										<!-- 주문 -->
+										<th:block th:unless="${order.giftPackYn == 'Y'}">
+											<!-- 주문 접수 -->
+											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_10'}">
+												<p>주문이 완료되어 결제를 기다리고 있습니다.</p>
 
-								<!-- 선물 -->
-								<th:block th:if="${oneData.giftPackYn == 'Y'}">
-									<div class="order_confirm" th:if="${#strings.isEmpty(order.recipBaseAddr) and order.giftLimitDay >= 0}">
-										<span class="cf_txt" th:text="|${order.recipNm}님이 주소를 입력하기 전입니다. (입력기한 ${order.giftLimitDt})|"></span>
-									</div>
-									<div class="order_confirm" th:unless="${#strings.isEmpty(order.recipBaseAddr)}">
-										<span class="cf_txt" th:text="|${order.recipNm}님께 선물이 발송되었습니다.|"></span>
-									</div>
-									<div class="order_confirm" th:if="${#strings.isEmpty(order.recipBaseAddr) and order.giftLimitDay < 0}">
-										<span class="cf_txt">주소입력 기한이 경과되어 선물이 취소 되었습니다.</span>
+												<!-- 예약 상품 -->
+												<p th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr)}" th:text="|예약판매 상품으로${ordDtl.delvResDt} 출고 예정입니다.|"></p>
+											</div>
+											
+											<!-- 상품준비중 -->
+											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_30'}">
+												<p>배송할 상품을 준비 중입니다.</p>
+
+												<!-- 예약 상품 -->
+												<p th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr)}" th:text="|예약판매 상품으로${ordDtl.delvResDt} 출고 예정입니다.|"></p>
+											</div>
+											
+											<!-- 배송준비중 -->
+											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_40'}">
+												<p>상품 준비가 완료되어 곧 배송될 예정입니다.</p>
+
+												<!-- 예약 상품 -->
+												<p th:if="${!#strings.isEmpty(ordDtl.recipBaseAddr)}" th:text="|예약판매 상품으로${ordDtl.delvResDt} 출고 예정입니다.|"></p>
+											</div>
+											
+											<!-- 배송중, 배송완료 -->
+											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55' or ordDtl.ordDtlStat == 'G013_60'}">
+												<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'Y'}">해당 상품은 교환이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
+												<p th:if="${ordDtl.changeableYn == 'Y' and ordDtl.returnableYn == 'N'}">해당 상품은 반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
+												<p th:if="${ordDtl.changeableYn == 'N' and ordDtl.returnableYn == 'N'}">해당 상품은 교환/반품이 불가능한 상품입니다. 문의사항은 1:1문의를 이용해주세요.</p>
+												<p th:if="${ordDtl.ordDtlStat == 'G013_60'}">15일 후 자동으로 구매확정됩니다.</p>
+											</div>
+											
+											<!-- 구매확정 -->
+											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_70' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
+												<p>리뷰를 작성하면 다른 구매자에게 도움이 될 수 있습니다.</p>
+											</div>
+										</th:block>
 									</div>
 								</th:block>
-							</th:block>
+								<!-- //주문상품 -->
+							</div>
+							<div class="goods_foot" th:if="${order.freeGiftList != null and order.freeGiftList.length > 0}">
+								<div class="order_gift">
+									<span class="title">사은품</span>
+									<ul>
+										
+									</ul>
+								</div>
+							</div>
 						</div>
 					</th:block>
-
-					<!-- 주문 없을 때 -->
-					<th:block th:unless="${orderList}" th:each="oneData, status : ${orderList}">
-
-					</th:block>
-				</section>
-				<section class="order_row" th:if="${paymentInfo.payMeans == 'G014_20'}">
-					<div class="order_tit">
-						<h3 class="subH3">무통장 입금 정보</h3>
+					<h4 class="subH3">무통장 입금 정보</h4>
+					<div class="tbl type1">
+						<table>
+							<colgroup>
+								<col width="210">
+								<col width="*">
+							</colgroup>
+							<tbody><tr>
+								<th>
+									계좌정보/입금기한
+								</th>
+								<td>
+									<div class="single_line">
+										<ul>
+											<li><span>기업은행</span>&nbsp;<span>(홍길동)</span></li>
+											<li><span>123-45678-91234</span></li>
+											<li><span>2020.01.18</span>&nbsp;<span>12:00:00</span>&nbsp;까지</li>
+										</ul>
+									</div>
+								</td>
+							</tr>
+							</tbody></table>
 					</div>
-					<div class="tbl type1 row_tbl">
+					<h4 class="subH3">주문자/배송지 정보</h4>
+					<div class="tbl type1">
 						<table>
 							<colgroup>
+								<col width="210">
 								<col width="*">
 							</colgroup>
-							<tbody>
-								<tr>
-									<td>
+							<tbody><tr>
+								<th>
+									주문 고객
+								</th>
+								<td>
+									<div class="single_line">
+										<ul>
+											<li><span>홍길동</span></li>
+											<li><span>abcdefg@naver.com</span></li>
+											<li><span>010-3456-7890</span></li>
+										</ul>
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<th>
+									배송지 정보
+								</th>
+								<td>
+									<div class="block_line">
+										<ul>
+											<li>
+												<span>홍길동</span>
+												<span class="tag">기본 배송지</span>
+												<span class="tag primary_line">총알배송</span>
+											</li>
+											<li>
+												<span>010-3456-7890</span>
+											</li>
+											<li>
+												<span>서울시 영등포구 은행로 11, 8층 (여의도동, 일신빌딩)</span><button type="button" class="btn btn_default btn_sm"><span>배송지 변경</span></button>
+											</li>
+											<li>
+												배송요청 사항&nbsp;:&nbsp;<span>직접 받고 부재 시 문 앞</span><button type="button" class="btn_underline"><span>변경하기</span></button>
+											</li>
+										</ul>
+									</div>
+								</td>
+							</tr>
+							</tbody></table>
+					</div>
+					<h4 class="subH3">결제정보</h4>
+					<div class="tbl type6">
+						<table>
+							<colgroup>
+								<col width="50%">
+								<col width="50%">
+							</colgroup>
+							<tbody><tr>
+								<td>
+									<dl>
 										<div>
-											<span th:text="${paymentInfo.vaBank}"></span>(<span th:text="${paymentInfo.vaNm}"></span>)
+											<dt>총 주문금액 (상품금액+배송비+추가비용)</dt>
+											<dd>
+												<div class="price">
+													<span class="order_total_price"><em>3,546,200</em>원</span>
+												</div>
+											</dd>
 										</div>
-										<div>
-											<span th:text="${paymentInfo.vaNo}"></span>
+										<div class="include_item"> <!-- 할인항목 표기 class명 include_item -->
+											<dt>상품할인(즉시할인)</dt>
+											<dd><em>-123,456,789</em>원</dd>
+										</div>
+										<div class="include_item">
+											<dt>다다익선 할인</dt>
+											<dd><em>-123,456,789</em>원</dd>
+										</div>
+										<div class="include_item">
+											<dt>쿠폰할인</dt>
+											<dd><em>-123,456,789</em>원</dd>
+										</div>
+										<div class="include_item">
+											<dt>선포인트 할인</dt>
+											<dd><em>-123,456,789</em>원</dd>
+										</div>
+										<div class="include_item">
+											<dt>포인트 사용</dt>
+											<dd><em>-123,456,789</em>원</dd>
+										</div>
+										<div class="include_item">
+											<dt>상품권 사용</dt>
+											<dd><em>-123,456,789</em>원</dd>
 										</div>
+										<div class="include_item">
+											<dt>마일리지 사용</dt>
+											<dd><em>-123,456,789</em>원</dd>
+										</div>
+										<div class="include_item">
+											<dt>제휴할인</dt>
+											<dd><em>-123,456,789</em>원</dd>
+										</div>
+									</dl>
+								</td>
+								<td>
+									<dl>
 										<div>
-											<span th:text="${paymentInfo.vaDeadlineYmd}"></span><span th:text="${paymentInfo.vaDeadlineHms}"></span> 까지
+											<dt>결제 금액</dt>
+											<dd>
+												<div class="price">
+													<span class="pay_total_price"><em>3,546,200</em>원</span>
+												</div>
+											</dd>
 										</div>
-									</td>
-								</tr>
-							</tbody>
-						</table>
-					</div>
-				</section>
-				<section class="order_row">
-					<div class="order_tit">
-						<h3 class="subH3">주문 고객</h3>
-					</div>
-					<div class="tbl type1 row_tbl">
-						<table>
-							<colgroup>
-								<col width="*">
-							</colgroup>
-							<tbody>
-								<tr>
-									<td>
 										<div>
-											<span th:text="${orderInfo.ordNm}"></span>
+											<dt class="sr-only">결제방법</dt>
+											<dd>
+												신용카드(현대카드) / 일시불
+											</dd>
 										</div>
 										<div>
-											<span th:text="${orderInfo.ordEmail}"></span>
+											<dt class="sr-only">영수증 확인</dt>
+											<dd>
+												<button type="button" class="btn btn_default btn_sm"><span>신용카드 전표</span>
+												</button><button type="button" class="btn btn_default btn_sm"><span>현금 영수증</span>
+											</button><button type="button" class="btn btn_default btn_sm"><span>상품권 현금 영수증 신청</span>
+											</button></dd>
 										</div>
+									</dl>
+									<dl>
 										<div>
-											<span th:text="${orderInfo.ordPhnno}"></span>
+											<dt>적립 예정 포인트</dt>
+											<dd>
+												<span class="save_point"><em>123,456,789P</em></span>
+											</dd>
 										</div>
-									</td>
-								</tr>
-							</tbody>
-						</table>
-					</div>
-				</section>
-				<section class="order_row">
-					<div class="order_tit">
-						<h3 class="subH3">배송지 정보</h3>
-					</div>
-					<div class="tbl type1 row_tbl">
-						<table>
-							<colgroup>
-								<col width="*">
-							</colgroup>
-							<tbody>
-							<tr th:if="${deliveryAddrInfo.recipNm}">
-								<td th:text="${deliveryAddrInfo.recipNm}"><span class="sr-only">배송지명</span></td>
-							</tr>
-							<tr th:if="${${deliveryAddrInfo.recipBaseAddr}}">
-								<td th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"><span class="sr-only">배송 주소</span></td>
-							</tr>
-							<tr>
-								<td th:text="${deliveryAddrInfo.recipPhnno}"><span class="sr-only">휴대폰 번호</span></td>
-							</tr>
-							<tr>
-								<td>
-									<span class="tit c_primary">배송요청 사항</span>
-									<th:block th:text="${deliveryAddrInfo.delvMemo}"></th:block>
-									<button type="button" class="btn_popup" id="btn_rqstModify_pop" onclick="fnChangeDelvMemo();"><span>변경하기</span></button>
+									</dl>
 								</td>
 							</tr>
-							</tbody>
-						</table>
+							</tbody></table>
 					</div>
-				</section>
-				<section class="order_row">
-					<div class="order_tit">
-						<h3 class="subH3">결제정보</h3>
+					<div class="btn_footer_area">
+						<button type="button" class="btn btn_dark btn_md"><span>확인</span></button>
 					</div>
-					<div class="order_amount">
-						<div class="tbl type3">
-							<table>
-								<colgroup>
-									<col width="33.33%">
-									<col width="33.33%">
-									<col width="*">
-								</colgroup>
-								<thead>
-								<tr>
-									<th>
-										<dl>
-											<dt>총 주문금액</dt>
-											<dd class="price" th:text="|${#numbers.formatInteger(orderAmtInfo.ordAmt + orderAmtInfo.delvFee, 1, 'COMMA')}원|"></dd>
-										</dl>
-										<i class="ico_calc minus"></i>
-									</th>
-									<th>
-										<dl>
-											<dt>총 할인금액</dt>
-											<dd class="price" th:text="|- ${#numbers.formatInteger(orderAmtInfo.totalDcAmt, 1, 'COMMA')}원|"></dd>
-										</dl>
-										<i class="ico_calc result"></i>
-									</th>
-									<th>
-										<dl>
-											<dt>결제금액</dt>
-											<dd class="price" data-weight="price" data-font="lato">
-												<span class="oder_total_price" th:text="${#numbers.formatInteger(orderAmtInfo.realOrdAmt, 1, 'COMMA')}"></span>원
-											</dd>
-										</dl>
-									</th>
-								</tr>
-								</thead>
-								<tbody>
-								<tr>
-									<td>
-										<dl>
-											<div>
-												<dt>상품금액</dt>
-												<dd th:text="|${#numbers.formatInteger(orderAmtInfo.ordAmt, 1, 'COMMA')}원|"></dd>
-											</div>
-											<div th:if="${orderAmtInfo.delvFee > 0}">
-												<dt>배송비</dt>
-												<dd th:text="|${#numbers.formatInteger(orderAmtInfo.delvFee, 1, 'COMMA')}원|"></dd>
-											</div>
-										</dl>
-									</td>
-									<td>
-										<dl>
-											<div th:if="${orderAmtInfo.cpn1DcAmt > 0}">
-												<dt>상품 할인(즉시 할인)</dt>
-												<dd th:text="|- ${#numbers.formatInteger(orderAmtInfo.cpn1DcAmt, 1, 'COMMA')}원|"></dd>
+				</div>
+			</div>
+			
+			<div class="my_cont">
+				<div class="sec_head">
+					<h3>주문상세</h3>
+					<div class="od_detail">
+						(주문번호 : <span class="num" th:text="${ordNo}"></span>)
+					</div>
+					<button type="button" class="btn btn_default od_del_btn" onclick="fnDeleteOrder()"><span>주문 내역 삭제</span></button>
+				</div>
+				<div class="sec_body">
+					<div class="order_list" id="orderList">
+						<section class="order_row">
+							<th:block th:if="${orderList}" th:each="oneData, status : ${orderList}">
+								<div class="part_deliver">
+									<div class="tbl_tit">
+										<!-- 주문일/선물일 설정 -->
+										<span class="start_t" th:unless="${oneData.giftPackYn == 'Y'}">주문일</span>
+										<span class="gift_t" th:if="${oneData.giftPackYn == 'Y'}">선물일</span>
+										<!-- //주문일/선물일 설정 -->
+		
+										<span class="order_date" th:text="${oneData.ordDt}"></span>
+		
+										<!-- 배송구분 설정 -->
+										<span class="order_label02" th:if="${oneData.shotDelv}">총알배송</span>
+										<span class="order_label01" th:if="${oneData.selfMall}">STYLE24 일반배송</span>
+										<span class="order_label01" th:if="${oneData.supplyMall}">업체직배송</span>
+										<!-- //배송구분 설정 -->
+		<!--								<a href="javascript:void(0)" class="detail_btn" th:attr="ordNo=${oneData.ordNo}" onclick="fnGoToOrderDetail(this)">주문상세보기</a>-->
+									</div>
+									<th:block th:if="${oneData.orderList}" th:each="order, status : ${oneData.orderList}">
+										<div class="tbl type2">
+											<table>
+												<colgroup>
+													<col width="1020">
+													<col width="180">
+												</colgroup>
+												<tbody>
+												<th:block th:if="${order.ordDtlList}" th:each="ordDtl, status : ${order.ordDtlList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+													<input type="hidden" name="ordDtlNo" th:value="${ordDtl.ordDtlNo}"/>
+													<input type="hidden" name="ordDtlStat" th:value="${ordDtl.ordDtlStat}"/>
+													<input type="hidden" name="reviewSq" th:value="${ordDtl.reviewSq}"/>
+													<tr class="bundle_row">
+														<td>
+															<div class="info_item">
+																<div class="thumb_box">
+																	<a href="">
+																		<img th:src="${imageUrl + '/' + ordDtl.sysImgNm}" width="100%" alt="">
+																	</a>
+																</div>
+																<div class="info_box">
+																	<p class="od_name">
+																		<a href="">
+																			<span class="brand" th:text="${ordDtl.brandNm}"></span>
+																			<span class="name" th:text="${ordDtl.goodsNm}"></span>
+																		</a>
+																	</p>
+																	<p class="od_opt">
+																		<span class="option"><em th:text="${ordDtl.optCd1}"></em><em th:text="${ordDtl.optCd2}"></em></span>
+																		<span class="count">수량 <em th:text="${ordDtl.ordQty}"></em>개</span>
+																	</p>
+																	<button type="button" class="btn btn_dark cart_btn" onclick="fnCreateCart(this);">쇼핑백 담기</button>
+																</div>
+																<div class="info_calc">
+																	<p class="price">
+																		<span class="selling_price" th:text="|${#numbers.formatInteger(ordDtl.ordAmt, 1, 'COMMA')}원|"></span>
+																	</p>
+																	<p class="point"><span th:text="${#numbers.formatInteger(ordDtl.savePntAmt, 1, 'COMMA')}"></span>p</p>
+																</div>
+															</div>
+														</td>
+														<!-- 주문 -->
+														<td class="merge_row" th:unless="${oneData.giftPackYn == 'Y'}">
+															<div class="delivery">
+																<p class="dlvr_staus" th:text="${ordDtl.ordDtlStatNm}"></p>
+																<p class="dlvr_desc" th:if="${ordDtl.delvEddt}" th:text="|${ordDtl.delvEddt}일 도착|"></p>
+															</div>
+															<div class="tbl_btn_wrap case02">
+																<button type="button" class="btn btn_default btn_sm" onclick="fnCreateExchange(this, 'exchange');"><span>교환</span></button>
+																<button type="button" class="btn btn_default btn_sm" onclick="fnCreateCancel(this, 'cancel');"><span>반품/취소</span></button>
+		<!--														<button type="button" class="btn btn_default btn_sm" th:if="${ordDtl.reviewSq == 0}" th:attr="ordNo=${oneData.ordNo}" onclick="fnCreateReview(this);"><span>리뷰작성</span></button>-->
+																<button type="button" class="btn btn_default btn_sm" th:if="${!order.review}" th:attr="ordNo=${oneData.ordNo}" onclick="fnCreateReview(this);"><span>리뷰작성</span></button>
+															</div>
+														</td>
+														<td class="merge_row" th:if="${oneData.giftPackYn == 'Y' and #strings.isEmpty(ordDtl.recipBaseAddr)}">
+															<div class="delivery">
+																<p class="dlvr_staus c_primary">주소 입력 대기</p>
+																<p class="dlvr_desc" th:text="|남은 기간 ${ordDtl.giftLimitDay}일|"></p>
+																<p class="dlvr_desc" th:text="|(${ordDtl.giftLimitDt}까지)|"></p>
+															</div>
+															<div class="tbl_btn_wrap case02">
+																<button type="button" class="btn btn_dark btn_sm" onclick="fnReSendSms(this);"><span>SMS 재전송</span></button>
+															</div>
+														</td>
+														<td class="merge_row" th:if="${oneData.giftPackYn == 'Y' and !#strings.isEmpty(ordDtl.recipBaseAddr)}">
+															<div class="delivery">
+																<p class="dlvr_staus c_primary">선물 완료</p>
+																<p class="dlvr_desc" th:text="|(${ordDtl.giftCompleteDt})|"></p>
+															</div>
+															<div class="tbl_btn_wrap case02">
+															</div>
+														</td>
+													</tr>
+												</th:block>
+												</tbody>
+											</table>
+										</div>
+										<!-- 주문 -->
+										<th:block th:unless="${oneData.giftPackYn == 'Y'}">
+											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_00' or order.ordDtlStat == 'G013_10' or order.ordDtlStat == 'G013_11'}">
+												<span class="cf_txt">주문 완료 / 결제를 기다리고 있습니다.</span>
 											</div>
-											<div th:if="${orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt > 0}">
-												<dt>다다익선 할인</dt>
-												<dd th:text="|- ${#numbers.formatInteger(orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt, 1, 'COMMA')}원|"></dd>
+											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_20' or order.ordDtlStat == 'G013_30' or order.ordDtlStat == 'G013_35'}">
+												<span class="cf_txt">배송할 상품을 준비 중입니다.</span>
 											</div>
-											<div th:if="${orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt > 0}">
-												<dt>쿠폰 할인</dt>
-												<dd th:text="|- ${#numbers.formatInteger(orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt, 1, 'COMMA')}원|">- 30,000원</dd>
+											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_40'}">
+												<span class="cf_txt">상품준비가 완료되어 곧 배송될 예정입니다.</span>
 											</div>
-											<div th:if="${orderAmtInfo.prePntDcAmt > 0}">
-												<dt>선 포인트 할인</dt>
-												<dd th:text="|- ${#numbers.formatInteger(orderAmtInfo.prePntDcAmt, 1, 'COMMA')}원|"></dd>
+											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_50' or order.ordDtlStat == 'G013_55'}">
+												<span class="cf_txt" th:text="|${order.shipCompNm} / ${order.invoiceNo}|"></span>
+												<button type="button" class="btn btn_primary" th:attr="ordNo=${oneData.ordNo}, invoiceNo=${order.invoiceNo}, shipCompCd=${order.shipCompCd}" onclick="fnGetDeliveryInfo(this)">배송조회</button>
 											</div>
-											<div th:if="${orderAmtInfo.pntDcAmt > 0}">
-												<dt>포인트 사용</dt>
-												<dd th:text="|- ${#numbers.formatInteger(orderAmtInfo.pntDcAmt, 1, 'COMMA')}원|"></dd>
+											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_60'}">
+												<span class="cf_txt" th:text="|${order.purchaseConfirmDay}일 후 자동으로 구매확정|"></span>
+												<button type="button" class="btn btn_primary" onclick="fnDecideOrder(this);">구매확정 하기</button>
 											</div>
-											<div th:if="${orderAmtInfo.gfcdUseAmt > 0}">
-												<dt>상품권 사용</dt>
-												<dd th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt, 1, 'COMMA')}원|"></dd>
+											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_70' and order.reviewSq == 0}">
+												<span class="cf_txt">리뷰를 작성하면 다른 구매자에게 도움이 될 수 있습니다.</span>
+												<button type="button" class="btn btn_primary" banner="banner" onclick="fnCreateReview(this, 'Y');">리뷰작성</button>
 											</div>
-											<!-- 
-											<div th:if="${}">
-												<dt>마일리지 사용</dt>
-												<dd></dd>
+											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_70' and order.reviewSq > 0}">
+												<span class="cf_txt">주문내역 다시 구매하기 위해</span>
+												<button type="button" class="btn btn_primary" onclick="fnCreateCart(this, 'Y');">장바구니 담기</button>
 											</div>
-											<div th:if="${}">
-												<dt>제휴 할인</dt>
-												<dd></dd>
+										</th:block>
+		
+										<!-- 선물 -->
+										<th:block th:if="${oneData.giftPackYn == 'Y'}">
+											<div class="order_confirm" th:if="${#strings.isEmpty(order.recipBaseAddr) and order.giftLimitDay >= 0}">
+												<span class="cf_txt" th:text="|${order.recipNm}님이 주소를 입력하기 전입니다. (입력기한 ${order.giftLimitDt})|"></span>
 											</div>
-											-->
-										</dl>
-									</td>
-									<td>
-										<dl>
-											<div th:if="${orderAmtInfo.savePntAmt > 0}">
-												<dt>적립 예정 포인트</dt>
-												<dd th:text="|${#numbers.formatInteger(orderAmtInfo.savePntAmt, 1, 'COMMA')}P|"></dd>
+											<div class="order_confirm" th:unless="${#strings.isEmpty(order.recipBaseAddr)}">
+												<span class="cf_txt" th:text="|${order.recipNm}님께 선물이 발송되었습니다.|"></span>
 											</div>
-											<div>
-												<dt>결제방법</dt>
-												<dd>
-													<!-- TODO -->
-													<!-- Style24 간편결제 처리 (STYLE24 간편결제 : STYLE24 간편결제명 / 카드사명 / 할부개월(일시불)) -->
-													<!-- 실시간계좌이체, 무통장입금 현금영수증 신청여부 추가 -->
-													<!-- 네이버페이 처리 (네이버 페이 : 네이버 페이) -->
-													<!-- 카카오페이 처리 (카카오 페이 : 카카오 페이) -->
-													<!-- PAYCO 처리 (PAYCO : PAYCO) -->
-													<span class="paymethod" th:if="${paymentInfo.payMeans == 'G014_10'}" th:text="|실시간계좌이체|"></span>
-													<span class="paymethod" th:if="${paymentInfo.payMeans == 'G014_20'}" th:text="|무통장입금|"></span>
-													<span class="paymethod" th:if="${paymentInfo.payMeans == 'G014_30'}" th:text="|${paymentInfo.cardNm}/${paymentInfo.cardMips}|"></span>
-													<span class="paymethod" th:if="${paymentInfo.payMeans == 'G014_60'}">휴대폰결제</span>
-												</dd>
+											<div class="order_confirm" th:if="${#strings.isEmpty(order.recipBaseAddr) and order.giftLimitDay < 0}">
+												<span class="cf_txt">주소입력 기한이 경과되어 선물이 취소 되었습니다.</span>
 											</div>
-											<th:block th:if="${paymentInfo.pgGb == 'KCP'}">
-												<!-- 신용카드 결제시 -->
-												<div th:if="${paymentInfo.payMeans == 'G014_30'}">
-													<dt>&nbsp;</dt>
-													<dd>
-														<button type="button" class="btn btn_default" onclick="fnReceipt('card');"><span>신용카드 전표</span></button>
-													</dd>
+										</th:block>
+									</th:block>
+								</div>
+							</th:block>
+		
+							<!-- 주문 없을 때 -->
+							<th:block th:unless="${orderList}" th:each="oneData, status : ${orderList}">
+		
+							</th:block>
+						</section>
+						<section class="order_row" th:if="${paymentInfo.payMeans == 'G014_20'}">
+							<div class="order_tit">
+								<h3 class="subH3">무통장 입금 정보</h3>
+							</div>
+							<div class="tbl type1 row_tbl">
+								<table>
+									<colgroup>
+										<col width="*">
+									</colgroup>
+									<tbody>
+										<tr>
+											<td>
+												<div>
+													<span th:text="${paymentInfo.vaBank}"></span>(<span th:text="${paymentInfo.vaNm}"></span>)
 												</div>
-												<!-- //무통장 결제시 -->
-												<!-- 무통장 결제시 -->
-												<div th:if="${paymentInfo.payMeans == 'G014_10' or paymentInfo.payMeans == 'G014_20'}">
-													<dt>&nbsp;</dt>
-													<dd>
-														<button type="button" class="btn btn_default" onclick="fnReceipt('cash');"><span>현금영수증</span></button>
-													</dd>
+												<div>
+													<span th:text="${paymentInfo.vaNo}"></span>
 												</div>
-												<!-- //무통장 결제시 -->
-											</th:block>
-											<th:block th:unless="${paymentInfo.pgGb == 'KCP'}">
-												<dt></dt>
-												<dd>NPAY등의 대체결제수단으로 결제시 해당 결제 플롯폼에서 영수증 확인이 가능합니다.</dd>
-											</th:block>
-										</dl>
-									</td>
-								</tr>
-								</tbody>
-							</table>
-						</div>
+												<div>
+													<span th:text="${paymentInfo.vaDeadlineYmd}"></span><span th:text="${paymentInfo.vaDeadlineHms}"></span> 까지
+												</div>
+											</td>
+										</tr>
+									</tbody>
+								</table>
+							</div>
+						</section>
+						<section class="order_row">
+							<div class="order_tit">
+								<h3 class="subH3">주문 고객</h3>
+							</div>
+							<div class="tbl type1 row_tbl">
+								<table>
+									<colgroup>
+										<col width="*">
+									</colgroup>
+									<tbody>
+										<tr>
+											<td>
+												<div>
+													<span th:text="${orderInfo.ordNm}"></span>
+												</div>
+												<div>
+													<span th:text="${orderInfo.ordEmail}"></span>
+												</div>
+												<div>
+													<span th:text="${orderInfo.ordPhnno}"></span>
+												</div>
+											</td>
+										</tr>
+									</tbody>
+								</table>
+							</div>
+						</section>
+						<section class="order_row">
+							<div class="order_tit">
+								<h3 class="subH3">배송지 정보</h3>
+							</div>
+							<div class="tbl type1 row_tbl">
+								<table>
+									<colgroup>
+										<col width="*">
+									</colgroup>
+									<tbody>
+									<tr th:if="${deliveryAddrInfo.recipNm}">
+										<td th:text="${deliveryAddrInfo.recipNm}"><span class="sr-only">배송지명</span></td>
+									</tr>
+									<tr th:if="${${deliveryAddrInfo.recipBaseAddr}}">
+										<td th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"><span class="sr-only">배송 주소</span></td>
+									</tr>
+									<tr>
+										<td th:text="${deliveryAddrInfo.recipPhnno}"><span class="sr-only">휴대폰 번호</span></td>
+									</tr>
+									<tr>
+										<td>
+											<span class="tit c_primary">배송요청 사항</span>
+											<th:block th:text="${deliveryAddrInfo.delvMemo}"></th:block>
+											<button type="button" class="btn_popup" id="btn_rqstModify_pop" onclick="fnChangeDelvMemo();"><span>변경하기</span></button>
+										</td>
+									</tr>
+									</tbody>
+								</table>
+							</div>
+						</section>
+						<section class="order_row">
+							<div class="order_tit">
+								<h3 class="subH3">결제정보</h3>
+							</div>
+							<div class="order_amount">
+								<div class="tbl type3">
+									<table>
+										<colgroup>
+											<col width="33.33%">
+											<col width="33.33%">
+											<col width="*">
+										</colgroup>
+										<thead>
+										<tr>
+											<th>
+												<dl>
+													<dt>총 주문금액</dt>
+													<dd class="price" th:text="|${#numbers.formatInteger(orderAmtInfo.ordAmt + orderAmtInfo.delvFee, 1, 'COMMA')}원|"></dd>
+												</dl>
+												<i class="ico_calc minus"></i>
+											</th>
+											<th>
+												<dl>
+													<dt>총 할인금액</dt>
+													<dd class="price" th:text="|- ${#numbers.formatInteger(orderAmtInfo.totalDcAmt, 1, 'COMMA')}원|"></dd>
+												</dl>
+												<i class="ico_calc result"></i>
+											</th>
+											<th>
+												<dl>
+													<dt>결제금액</dt>
+													<dd class="price" data-weight="price" data-font="lato">
+														<span class="oder_total_price" th:text="${#numbers.formatInteger(orderAmtInfo.realOrdAmt, 1, 'COMMA')}"></span>원
+													</dd>
+												</dl>
+											</th>
+										</tr>
+										</thead>
+										<tbody>
+										<tr>
+											<td>
+												<dl>
+													<div>
+														<dt>상품금액</dt>
+														<dd th:text="|${#numbers.formatInteger(orderAmtInfo.ordAmt, 1, 'COMMA')}원|"></dd>
+													</div>
+													<div th:if="${orderAmtInfo.delvFee > 0}">
+														<dt>배송비</dt>
+														<dd th:text="|${#numbers.formatInteger(orderAmtInfo.delvFee, 1, 'COMMA')}원|"></dd>
+													</div>
+												</dl>
+											</td>
+											<td>
+												<dl>
+													<div th:if="${orderAmtInfo.cpn1DcAmt > 0}">
+														<dt>상품 할인(즉시 할인)</dt>
+														<dd th:text="|- ${#numbers.formatInteger(orderAmtInfo.cpn1DcAmt, 1, 'COMMA')}원|"></dd>
+													</div>
+													<div th:if="${orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt > 0}">
+														<dt>다다익선 할인</dt>
+														<dd th:text="|- ${#numbers.formatInteger(orderAmtInfo.tmtb1DcAmt + orderAmtInfo.tmtb2DcAmt, 1, 'COMMA')}원|"></dd>
+													</div>
+													<div th:if="${orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt > 0}">
+														<dt>쿠폰 할인</dt>
+														<dd th:text="|- ${#numbers.formatInteger(orderAmtInfo.cartCpnDcAmt + orderAmtInfo.goodsCpnDcAmt, 1, 'COMMA')}원|">- 30,000원</dd>
+													</div>
+													<div th:if="${orderAmtInfo.prePntDcAmt > 0}">
+														<dt>선 포인트 할인</dt>
+														<dd th:text="|- ${#numbers.formatInteger(orderAmtInfo.prePntDcAmt, 1, 'COMMA')}원|"></dd>
+													</div>
+													<div th:if="${orderAmtInfo.pntDcAmt > 0}">
+														<dt>포인트 사용</dt>
+														<dd th:text="|- ${#numbers.formatInteger(orderAmtInfo.pntDcAmt, 1, 'COMMA')}원|"></dd>
+													</div>
+													<div th:if="${orderAmtInfo.gfcdUseAmt > 0}">
+														<dt>상품권 사용</dt>
+														<dd th:text="|- ${#numbers.formatInteger(orderAmtInfo.gfcdUseAmt, 1, 'COMMA')}원|"></dd>
+													</div>
+													<!-- 
+													<div th:if="${}">
+														<dt>마일리지 사용</dt>
+														<dd></dd>
+													</div>
+													<div th:if="${}">
+														<dt>제휴 할인</dt>
+														<dd></dd>
+													</div>
+													-->
+												</dl>
+											</td>
+											<td>
+												<dl>
+													<div th:if="${orderAmtInfo.savePntAmt > 0}">
+														<dt>적립 예정 포인트</dt>
+														<dd th:text="|${#numbers.formatInteger(orderAmtInfo.savePntAmt, 1, 'COMMA')}P|"></dd>
+													</div>
+													<div>
+														<dt>결제방법</dt>
+														<dd>
+															<!-- TODO -->
+															<!-- Style24 간편결제 처리 (STYLE24 간편결제 : STYLE24 간편결제명 / 카드사명 / 할부개월(일시불)) -->
+															<!-- 실시간계좌이체, 무통장입금 현금영수증 신청여부 추가 -->
+															<!-- 네이버페이 처리 (네이버 페이 : 네이버 페이) -->
+															<!-- 카카오페이 처리 (카카오 페이 : 카카오 페이) -->
+															<!-- PAYCO 처리 (PAYCO : PAYCO) -->
+															<span class="paymethod" th:if="${paymentInfo.payMeans == 'G014_10'}" th:text="|실시간계좌이체|"></span>
+															<span class="paymethod" th:if="${paymentInfo.payMeans == 'G014_20'}" th:text="|무통장입금|"></span>
+															<span class="paymethod" th:if="${paymentInfo.payMeans == 'G014_30'}" th:text="|${paymentInfo.cardNm}/${paymentInfo.cardMips}|"></span>
+															<span class="paymethod" th:if="${paymentInfo.payMeans == 'G014_60'}">휴대폰결제</span>
+														</dd>
+													</div>
+													<th:block th:if="${paymentInfo.pgGb == 'KCP'}">
+														<!-- 신용카드 결제시 -->
+														<div th:if="${paymentInfo.payMeans == 'G014_30'}">
+															<dt>&nbsp;</dt>
+															<dd>
+																<button type="button" class="btn btn_default" onclick="fnReceipt('card');"><span>신용카드 전표</span></button>
+															</dd>
+														</div>
+														<!-- //무통장 결제시 -->
+														<!-- 무통장 결제시 -->
+														<div th:if="${paymentInfo.payMeans == 'G014_10' or paymentInfo.payMeans == 'G014_20'}">
+															<dt>&nbsp;</dt>
+															<dd>
+																<button type="button" class="btn btn_default" onclick="fnReceipt('cash');"><span>현금영수증</span></button>
+															</dd>
+														</div>
+														<!-- //무통장 결제시 -->
+													</th:block>
+													<th:block th:unless="${paymentInfo.pgGb == 'KCP'}">
+														<dt></dt>
+														<dd>NPAY등의 대체결제수단으로 결제시 해당 결제 플롯폼에서 영수증 확인이 가능합니다.</dd>
+													</th:block>
+												</dl>
+											</td>
+										</tr>
+										</tbody>
+									</table>
+								</div>
+							</div>
+						</section>
 					</div>
-				</section>
+				</div>
 			</div>
+			<!-- // CONT-BODY -->
 		</div>
 	</div>
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>

+ 201 - 236
src/main/webapp/WEB-INF/views/web/mypage/MypageOrderListFormWeb.html

@@ -19,240 +19,194 @@
 <body>
 
 <th:block layout:fragment="content">
-	<div class="cont my_cont">
-		<div class="sec_head">
-			<div class="my_information">
-				<div class="name_box">
-					<strong th:text="${customerInfo.custNm}"></strong>님 반갑습니다.
+	<div class="content myOrderList">
+		<div class="cont_body">
+			<!-- CONT-BODY -->
+			<div class="lnb">
+				<div class="lnb_tit">
+					<h2>마이페이지</h2>
 				</div>
-				<div class="property_box">
-					<div th:class="|level lv_${#strings.toLowerCase(customerInfo.custGradeNm)}|">
-						<span class="txt" th:text="${customerInfo.custGradeNm}"></span>
-						<div class="btn_level">
-							<a href="javascript:void(0);" onclick="fnGoToCustomerBenefit();">등급혜택 보기</a>
-							<button type="button" id="btn_lv_coupon" onclick="fnDownloadCoupon();"><span>등급쿠폰 받기</span></button>
-						</div>
-					</div>
-					<div class="property">
-						<ul>
-							<li>
-								<div>
-									<p class="txt">보유쿠폰 / 만료예정</p>
-									<p class="count"><span id="couponCnt" th:text="${couponCnt}"></span>장 / <span id="expiredSoonCouponCnt" th:text="|${expiredSoonCouponCnt}|"></span>장</p>
-								</div>
-							</li>
-							<li>
-								<div>
-									<p class="txt">STYLE24 포인트</p>
-									<p class="count"><span th:text="${#numbers.formatInteger(rmPntAmt, 1, 'COMMA')}"></span>P</p>
-								</div>
-							</li>
-							<li>
-								<div>
-									<p class="txt">상품권</p>
-									<p class="count"><span th:text="${#numbers.formatInteger(rmGfcdAmt, 1, 'COMMA')}"></span>원</p>
-								</div>
-							</li>
-						</ul>
-					</div>
+				<div class="lnb_list">
+					<ul id="mypageLnbList"></ul>
 				</div>
 			</div>
-			<div class="my_order_progress">
-				<div class="progress">
-					<ul>
-						<li>
-							<div>
-								<p class="txt">주문접수</p>
-								<p class="count"><span id="orderReceiptCount" th:text="${orderCount.orderReceiptCount}">0</span></p>
-							</div>
-						</li>
-						<li>
-							<div>
-								<p class="txt">결제완료</p>
-								<p class="count"><span id="paymentCompleteCount" th:text="${orderCount.paymentCompleteCount}">0</span></p>
-							</div>
-						</li>
-						<li>
-							<div>
-								<p class="txt">상품 준비 중</p>
-								<p class="count"><span id="goodsPrepareCount" th:text="${orderCount.goodsPrepareCount}">0</span></p>
-							</div>
-						</li>
-						<li>
-							<div>
-								<p class="txt">배송 준비 중</p>
-								<p class="count"><span id="shipPrepareCount" th:text="${orderCount.shipPrepareCount}">0</span></p>
-							</div>
-						</li>
-						<li>
-							<div>
-								<p class="txt">배송 중</p>
-								<p class="count"><span id="shippingCount" th:text="${orderCount.shippingCount}">0</span></p>
+			<div class="cont">
+				<div class="sec_head">
+					<div class="my_information">
+						<div class="name_box">
+							<strong th:text="${customerInfo.custNm}"></strong>님 반갑습니다.
+						</div>
+						<div class="property_box">
+							<div th:class="|level lv_${#strings.toLowerCase(customerInfo.custGradeNm)}|">
+								<span class="txt" th:text="${customerInfo.custGradeNm}"></span>
+								<div class="btn_level">
+									<a href="javascript:void(0);" onclick="fnGoToCustomerBenefit();">등급혜택 보기</a>
+									<button type="button" id="btn_lv_coupon" onclick="fnDownloadCoupon();"><span>등급쿠폰 받기</span></button>
+								</div>
 							</div>
-						</li>
-						<li>
-							<div>
-								<p class="txt">배송 완료</p>
-								<p class="count"><span id="shipCompleteCount" th:text="${orderCount.shipCompleteCount}">0</span></p>
+							<div class="property">
+								<ul>
+									<li>
+										<div>
+											<p class="txt">보유쿠폰 / 만료예정</p>
+											<p class="count"><span id="couponCnt" th:text="${couponCnt}"></span>장 / <span id="expiredSoonCouponCnt" th:text="|${expiredSoonCouponCnt}|"></span>장</p>
+										</div>
+									</li>
+									<li>
+										<div>
+											<p class="txt">STYLE24 포인트</p>
+											<p class="count"><span th:text="${#numbers.formatInteger(rmPntAmt, 1, 'COMMA')}"></span>P</p>
+										</div>
+									</li>
+									<li>
+										<div>
+											<p class="txt">상품권</p>
+											<p class="count"><span th:text="${#numbers.formatInteger(rmGfcdAmt, 1, 'COMMA')}"></span>원</p>
+										</div>
+									</li>
+								</ul>
 							</div>
-						</li>
-					</ul>
-				</div>
-				<div class="invalid">
-					<p class="txt">취소/교환/반품</p>
-					<p class="count"><span id="orderCrsCount" th:text="${orderCount.cancelCount + orderCount.returnCount + orderCount.exchangeCount}">0</span></p>
-				</div>
-			</div>
-		</div>
-		<div class="sec_body">
-			<h3 class="subH2 mb40">주문확인/배송조회</h3>
-			<!-- 주문조회 검색 -->
-			<div class="area_filter">
-				<div class="select_month_box">
-					<div class="form_field">
-						<div>
-							<input type="radio" name="rdi-month" id="rdi-month1" onclick="fnSetSearchPeriod(1);">
-							<label for="rdi-month1"><span>최근 1개월</span></label>
 						</div>
-						<div>
-							<input type="radio" name="rdi-month" id="rdi-month2" onclick="fnSetSearchPeriod(3);">
-							<label for="rdi-month2"><span>최근 3개월</span></label>
+					</div>
+					<div class="my_order_progress">
+						<div class="progress">
+							<ul>
+								<li>
+									<div>
+										<p class="txt">주문접수</p>
+										<p class="count"><span id="orderReceiptCount" th:text="${orderCount.orderReceiptCount}">0</span></p>
+									</div>
+								</li>
+								<li>
+									<div>
+										<p class="txt">결제완료</p>
+										<p class="count"><span id="paymentCompleteCount" th:text="${orderCount.paymentCompleteCount}">0</span></p>
+									</div>
+								</li>
+								<li>
+									<div>
+										<p class="txt">상품 준비 중</p>
+										<p class="count"><span id="goodsPrepareCount" th:text="${orderCount.goodsPrepareCount}">0</span></p>
+									</div>
+								</li>
+								<li>
+									<div>
+										<p class="txt">배송 준비 중</p>
+										<p class="count"><span id="shipPrepareCount" th:text="${orderCount.shipPrepareCount}">0</span></p>
+									</div>
+								</li>
+								<li>
+									<div>
+										<p class="txt">배송 중</p>
+										<p class="count"><span id="shippingCount" th:text="${orderCount.shippingCount}">0</span></p>
+									</div>
+								</li>
+								<li>
+									<div>
+										<p class="txt">배송 완료</p>
+										<p class="count"><span id="shipCompleteCount" th:text="${orderCount.shipCompleteCount}">0</span></p>
+									</div>
+								</li>
+							</ul>
 						</div>
-						<div>
-							<input type="radio" name="rdi-month" id="rdi-month3" onclick="fnSetSearchPeriod(6);">
-							<label for="rdi-month3"><span>최근 6개월</span></label>
+						<div class="invalid">
+							<p class="txt">취소/교환/반품</p>
+							<p class="count"><span id="orderCrsCount" th:text="${orderCount.cancelCount + orderCount.returnCount + orderCount.exchangeCount}">0</span></p>
 						</div>
 					</div>
 				</div>
-				<div class="select_period_box">
-					<form class="form_wrap">
-						<div class="form_field">
-							<label class="input_label sr-only">선택기간 시작</label>
-							<div class="input_wrap">
-								<input type="text" class="form_control period_datepicker hasDatepicker" value="" id="stDate" onchange="fnCheckPeriod(this);">
+				<div class="sec_body">
+					<h3 class="subH2 mb40">주문확인/배송조회</h3>
+					<!-- 주문조회 검색 -->
+					<div class="area_filter">
+						<div class="select_month_box">
+							<div class="form_field">
+								<div>
+									<input type="radio" name="rdi-month" id="rdi-month1" onclick="fnSetSearchPeriod(1);">
+									<label for="rdi-month1"><span>최근 1개월</span></label>
+								</div>
+								<div>
+									<input type="radio" name="rdi-month" id="rdi-month2" onclick="fnSetSearchPeriod(3);">
+									<label for="rdi-month2"><span>최근 3개월</span></label>
+								</div>
+								<div>
+									<input type="radio" name="rdi-month" id="rdi-month3" onclick="fnSetSearchPeriod(6);">
+									<label for="rdi-month3"><span>최근 6개월</span></label>
+								</div>
 							</div>
 						</div>
-						<div class="form_field">
-							<label class="input_label sr-only">선택기간 끝</label>
-							<div class="input_wrap">
-								<input type="text" class="form_control n_input period_datepicker hasDatepicker" value="" id="edDate" onchange="fnCheckPeriod(this);">
-							</div>
+						<div class="select_period_box">
+							<form class="form_wrap">
+								<div class="form_field">
+									<label class="input_label sr-only">선택기간 시작</label>
+									<div class="input_wrap">
+										<input type="text" class="form_control period_datepicker hasDatepicker" value="" id="stDate" onchange="fnCheckPeriod(this);">
+									</div>
+								</div>
+								<div class="form_field">
+									<label class="input_label sr-only">선택기간 끝</label>
+									<div class="input_wrap">
+										<input type="text" class="form_control n_input period_datepicker hasDatepicker" value="" id="edDate" onchange="fnCheckPeriod(this);">
+									</div>
+								</div>
+								<button type="button" class="btn btn_dark btn_sm" onclick="fnSearchOrderList();"><span>조회</span></button>
+							</form>
 						</div>
-						<button type="button" class="btn btn_dark btn_sm" onclick="fnSearchOrderList();"><span>조회</span></button>
-					</form>
-				</div>
-				<div class="select_status_box">
-					<form class="form_wrap">
-						<div class="form_field">
-							<div class="select_custom order_status">
-								<div class="combo">
-									<div class="select">전체상태</div>
-									<ul class="list">
-										<li class="selected" code="">전체상태</li>
-										<li th:if="${ordDtlStatList}" th:each="oneData, status : ${ordDtlStatList}" th:attr="code=${oneData.cd}" th:text="${oneData.cdNm}"></li>
-									</ul>
+						<div class="select_status_box">
+							<form class="form_wrap">
+								<div class="form_field">
+									<div class="select_custom order_status">
+										<div class="combo">
+											<div class="select">전체상태</div>
+											<ul class="list">
+												<li class="selected" code="">전체상태</li>
+												<li th:if="${ordDtlStatList}" th:each="oneData, status : ${ordDtlStatList}" th:attr="code=${oneData.cd}" th:text="${oneData.cdNm}"></li>
+											</ul>
+										</div>
+									</div>
 								</div>
-							</div>
+							</form>
 						</div>
-					</form>
-				</div>
-			</div>
-			<!-- //주문조회 검색 -->
-			<div class="area_list" id="orderList"></div>
-			<div class="sec_foot">
-				<div class="ui_row">
-					<ul class="pageNav" id="paging">
-					</ul>
-				</div>
-			</div>
-		</div>
-		<!--<div class="sec_body mypage_body">
-			&lt;!&ndash; 주문 경로 &ndash;&gt;
-			<div class="order_info clear">
-				<ul class="clear">
-					<li>
-						<p class="or_p">주문접수</p>
-						<p class="count"><span id="orderReceiptCount" th:text="${orderCount.orderReceiptCount}">0</span></p>
-					</li>
-					<li>
-						<p class="or_p">결제완료</p>
-						<p class="count"><span id="paymentCompleteCount" th:text="${orderCount.paymentCompleteCount}">0</span></p>
-					</li>
-					<li>
-						<p class="or_p">상품 준비 중</p>
-						<p class="count"><span id="goodsPrepareCount" th:text="${orderCount.goodsPrepareCount}">0</span></p>
-					</li>
-					<li>
-						<p class="or_p">배송 준비 중</p>
-						<p class="count"><span id="shipPrepareCount" th:text="${orderCount.shipPrepareCount}">0</span></p>
-					</li>
-					<li>
-						<p class="or_p">배송 중</p>
-						<p class="count"><span id="shippingCount" th:text="${orderCount.shippingCount}">0</span></p>
-					</li>
-					<li>
-						<p class="or_p">배송 완료</p>
-						<p class="count"><span id="shipCompleteCount" th:text="${orderCount.shipCompleteCount}">0</span></p>
-					</li>
-				</ul>
-				<div class="order_right">
-					<p class="or_p">취소/교환/반품</p>
-					<p class="count"><span id="orderCrsCount" th:text="${orderCount.cancelCount + orderCount.returnCount + orderCount.exchangeCount}">0</span></p>
-				</div>
-			</div>
-			&lt;!&ndash; //주문 경로 &ndash;&gt;
-			<h2 class="subH2 my_subtit">주문확인/배송조회</h2>
-			&lt;!&ndash; 주문조회 검색 &ndash;&gt;
-			<div class="order_sch_filter clear">
-				<div class="sch_radio_tab">
-					<input type="checkbox" name="month" value="최근 1개월" id="chk01" onclick="fnSetSearchPeriod(1);">
-					<label for="chk01">최근 1개월</label>
-					<input type="checkbox" name="month" value="최근 3개월" id="chk02" onclick="fnSetSearchPeriod(3);">
-					<label for="chk02">최근 3개월</label>
-					<input type="checkbox" name="month" value="최근 6개월" id="chk03" onclick="fnSetSearchPeriod(6);">
-					<label for="chk03">최근 6개월</label>
-				</div>
-				<div class="sch_right">
-					<div class="sch_datepicker sb">
-						<input type="text" class="n_input my_datepicker" name="stDate" value="" id="stDate" onchange="fnCheckPeriod(this);">
 					</div>
-					<div class="sch_datepicker">
-						<input type="text" class="n_input my_datepicker" name="edDate" value="" id="edDate" onchange="fnCheckPeriod(this);">
+					<!-- //주문조회 검색 -->
+					<div class="area_list" id="orderList"></div>
+					<div class="sec_foot">
+						<div class="ui_row">
+							<ul class="pageNav" id="paging">
+							</ul>
+						</div>
 					</div>
-					<button type="button" class="btn btn_dark" onclick="fnSearchOrderList();">조회</button>
 				</div>
+				<form id="searchForm" name="searchForm" th:action="@{'/mypage/order/list'}" th:method="post">
+					<input type="hidden" name="pageNo" value=1 />
+					<input type="hidden" name="pageSize" value=5 />
+					<input type="hidden" name="pageUnit" value=10 />
+					<input type="hidden" name="ordDtlStat" value="" />
+					<input type="hidden" name="stDate" value="" />
+					<input type="hidden" name="edDate" value="" />
+					<input type="hidden" name="custNo" th:value ="${customerInfo.custNo}"/>
+				</form>
+				<form id="exchangeForm" name="exchangeForm" action="#" th:action="@{'/mypage/exchange/form'}" th:method="post">
+					<input type="hidden" name="ordNo"/>
+					<input type="hidden" name="ordDtlNo"/>
+					<input type="hidden" name="supplyCompCd"/>
+				</form>
+				<form id="returnForm" name="returnForm" action="#" th:action="@{'/mypage/return/form'}" th:method="post">
+					<input type="hidden" name="ordNo"/>
+					<input type="hidden" name="ordDtlNo"/>
+					<input type="hidden" name="supplyCompCd"/>
+				</form>
+				<form id="cancelForm" name="cancelForm" th:action="@{'/mypage/cancel/form'}" th:method="post">
+					<input type="hidden" name="ordNo"/>
+					<input type="hidden" name="ordDtlNo"/>
+				</form>
+				<form id="reviewForm" name="reviewForm" th:action="@{'/mypage/review/form'}" th:method="post">
+					<input type="hidden" name="ordNo"/>
+					<input type="hidden" name="ordDtlNo"/>
+				</form>
 			</div>
-			&lt;!&ndash; //주문조회 검색 &ndash;&gt;
-			<div class="order_list" id="orderList">
-			</div>
-		</div>-->
-		<form id="searchForm" name="searchForm" th:action="@{'/mypage/order/list'}" th:method="post">
-			<input type="hidden" name="pageNo" value=1 />
-			<input type="hidden" name="pageSize" value=5 />
-			<input type="hidden" name="pageUnit" value=10 />
-			<input type="hidden" name="ordDtlStat" value="" />
-			<input type="hidden" name="stDate" value="" />
-			<input type="hidden" name="edDate" value="" />
-			<input type="hidden" name="custNo" th:value ="${customerInfo.custNo}"/>
-		</form>
-		<form id="exchangeForm" name="exchangeForm" action="#" th:action="@{'/mypage/exchange/form'}" th:method="post">
-			<input type="hidden" name="ordNo"/>
-			<input type="hidden" name="ordDtlNo"/>
-			<input type="hidden" name="supplyCompCd"/>
-		</form>
-		<form id="returnForm" name="returnForm" action="#" th:action="@{'/mypage/return/form'}" th:method="post">
-			<input type="hidden" name="ordNo"/>
-			<input type="hidden" name="ordDtlNo"/>
-			<input type="hidden" name="supplyCompCd"/>
-		</form>
-		<form id="cancelForm" name="cancelForm" th:action="@{'/mypage/cancel/form'}" th:method="post">
-			<input type="hidden" name="ordNo"/>
-			<input type="hidden" name="ordDtlNo"/>
-		</form>
-		<form id="reviewForm" name="reviewForm" th:action="@{'/mypage/review/form'}" th:method="post">
-			<input type="hidden" name="ordNo"/>
-			<input type="hidden" name="ordDtlNo"/>
-		</form>
+			<!-- // CONT-BODY -->
+		</div>
 	</div>
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
@@ -456,11 +410,11 @@
 					tag += '					</div>\n';
 					tag += '					<div class="gd_calc">\n';
 					tag += '						<p>\n';
-					tag += '							<span class="count"><em>' + ordDtl.ordQty + '</em>개</span>\n';
+					tag += '							<span class="count"><em>' + (ordDtl.ordQty - ordDtl.cnclRtnQty) + '</em>개</span>\n';
 					tag += '						</p>\n';
 					tag += '						<p>\n';
-					tag += '							<span class="price_org"><em>' + (ordDtl.listPrice * ordDtl.ordQty).addComma() + '</em>원</span>\n';
-					tag += '							<span class="price_sale"><em>' + ordDtl.ordAmt.addComma() + '</em>원</span>\n';
+					tag += '							<span class="price_org"><em>' + (ordDtl.listPrice * (ordDtl.ordQty - ordDtl.cnclRtnQty)).addComma() + '</em>원</span>\n';
+					tag += '							<span class="price_sale"><em>' + (ordDtl.ordAmt - ordDtl.cnclRtnAmt).addComma() + '</em>원</span>\n';
 					tag += '						</p>\n';
 					tag += '					</div>\n';
 					tag += '				</div>\n';
@@ -483,12 +437,12 @@
 					if (ordDtl.giftPackYn == 'Y') {
 						// SMS 재발송 버튼
 						if (gagajf.isNull(ordDtl.recipBaseAddr) && ordDtl.giftLimitDay >= 0) {
-							tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" onClick="fnReSendSms(this);"><span>SMS 재발송</span></button></p>\n';
+							tag += '					<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" onclick="fnReSendSms(this);"><span>SMS 재발송</span></button></p>\n';
 						}
 
 						// 리뷰 쓰기 버튼
 						if (!gagajf.isNull(ordDtl.recipBaseAddr) && ordDtl.ordDtlStat != 'G013_98' && ordDtl.ordDtlStat != 'G013_99' && ordDtl.reviewableYn == 'Y' && ordDtl.reviewSq == null) {
-							tag += '					<p><button type="button" class="btn btn_primary_line btn_sm" ordNo="' + ordDtl.ordNo + '" onClick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>\n';
+							tag += '					<p><button type="button" class="btn btn_primary_line btn_sm" ordNo="' + ordDtl.ordNo + '" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>\n';
 						}
 					} else {
 						// 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중)
@@ -565,19 +519,35 @@
 					} else {
 						// 주문 접수
 						if (ordDtl.ordDtlStat == 'G013_10') {
-							tag += '			<div class="order_text"><p>주문이 완료되어 결제를 기다리고 있습니다.</p></div>\n';
+							tag += '			<div class="order_text">';
+							tag += '				<p>주문이 완료되어 결제를 기다리고 있습니다.</p>';
+							// 예약상품
+							if (!gagajf.isNull(ordDtl.delvResDt)) {
+								tag += '				<p>예약판매 상품으로' + ordDtl.delvResDt + ' 출고 예정입니다.</p>';
+							}
+							tag += '			</div>\n';
 						}
 						
 						// 상품준비중
-						if (ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_40') {
-							// 예약 상품 준비중
+						if (ordDtl.ordDtlStat == 'G013_30') {
+							tag += '			<div class="order_text">';
+							tag += '				<p>배송할 상품을 준비 중입니다.</p>';
+							// 예약상품
 							if (!gagajf.isNull(ordDtl.delvResDt)) {
-								tag += '			<div class="order_text"><p>예약판매 상품으로' + ordDtl.delvResDt + ' 출고 예정입니다.</p></div>\n';
+								tag += '				<p>예약판매 상품으로' + ordDtl.delvResDt + ' 출고 예정입니다.</p>';
 							}
-							// 상품 준비중
-							else {
-								tag += '			<div class="order_text"><p>상품 준비가 완료되어 곧 배송될 예정입니다.</p></div>\n';
+							tag += '			</div>\n';
+						}
+						
+						// 배송준비중
+						if (ordDtl.ordDtlStat == 'G013_40') {
+							tag += '			<div class="order_text">';
+							tag += '				<p>상품 준비가 완료되어 곧 배송될 예정입니다.</p>';
+							// 예약상품
+							if (!gagajf.isNull(ordDtl.delvResDt)) {
+								tag += '				<p>예약판매 상품으로' + ordDtl.delvResDt + ' 출고 예정입니다.</p>';
 							}
+							tag += '			</div>\n';
 						}
 						
 						// 배송중, 배송완료
@@ -619,9 +589,9 @@
 				tag += '	</div>';
 				//사은품 처리
 				if (order.freeGiftList != null && order.freeGiftList.length > 0) {
-					tag += '	<div className="goods_foot">';
-					tag += '		<div className="order_gift">';
-					tag += '			<span className="title">사은품</span>';
+					tag += '	<div class="goods_foot">';
+					tag += '		<div class="order_gift">';
+					tag += '			<span class="title">사은품</span>';
 					tag += '			<ul>';
 					$.each(order.freeGiftList, function(index, freeGift) {
 						tag += '				<li>' + freeGift.goodsNm + ' ' + '<span>(-' + freeGift.usePoint.addComma() + 'P)</span></li>';
@@ -637,14 +607,9 @@
 			tag += '<div class="nodata">';
 			tag += '	<div class="txt_box">';
 			tag += '		<p>';
-			tag += '			현재 노출 할 수 있는 데이터가 없습니다.<br>';
+			tag += '			주문내역이 없습니다.<br>';
 			tag += '		</p>';
 			tag += '	</div>';
-			//tag += '	<!-- 버튼 필요시 -->';
-			//tag += '	<div class="btn_box">';
-			//tag += '		<button class="btn btn_default"><span>행동하기</span></button>';
-			//tag += '	</div>';
-			//tag += '	<!-- //버튼 필요시 -->';
 			tag += '</div>';
 		}
 

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

@@ -19,299 +19,313 @@
 <body>
 
 <th:block layout:fragment="content">
-	<div class="my_cont">
-		<div class="sec_head">
-			<h3>반품 신청</h3>
-			<div class="od_detail">
-				(주문번호 : <span class="num" th:text="${ordNo}"></span>)
+	<div class="content myOrderList">
+		<div class="cont_body">
+			<!-- CONT-BODY -->
+			<div class="lnb">
+				<div class="lnb_tit">
+					<h2>마이페이지</h2>
+				</div>
+				<div class="lnb_list">
+					<ul id="mypageLnbList"></ul>
+				</div>
 			</div>
-		</div>
-		<div class="sec_body mypage_body">
-			<form class="form_wrap" role="form">
-				<div class="order_list">
-					<section class="order_row">
-						<div class="part_deliver">
-							<div class="tbl_tit">
-								<!-- 주문일/선물일 설정 -->
-								<span class="start_t" th:unless="${returnList.oneData.giftPackYn == 'Y'}">주문일</span>
-								<span class="gift_t" th:if="${returnList.oneData.giftPackYn == 'Y'}">선물일</span>
-								<!-- //주문일/선물일 설정 -->
-
-								<span class="order_date" th:text="${returnList.oneData.ordDt}"></span>
-
-								<!-- 배송구분 설정 -->
-								<span class="order_label02" th:if="${returnList.shotDelv}">총알배송</span>
-								<span class="order_label01" th:if="${returnList.selfMall}">STYLE24 일반배송</span>
-								<span class="order_label01" th:if="${returnList.supplyMall}">업체직배송</span>
-								<!-- //배송구분 설정 -->
-								<a href="javascript:void(0)" class="detail_btn" th:attr="ordNo=${returnList.oneData.ordNo}" onclick="fnGoToOrderDetail(this)">주문상세보기</a>
-							</div>
-							<div class="tbl type2">
-								<table id="returnList">
-									<colgroup>
-										<col width="1020">
-										<col width="180">
-									</colgroup>
-									<tbody>
-									<th:block th:if="${returnList.returnList}" th:each="return, status : ${returnList.returnList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+			<div class="my_cont">
+				<div class="sec_head">
+					<h3>반품 신청</h3>
+					<div class="od_detail">
+						(주문번호 : <span class="num" th:text="${ordNo}"></span>)
+					</div>
+				</div>
+				<div class="sec_body mypage_body">
+					<form class="form_wrap" role="form">
+						<div class="order_list">
+							<section class="order_row">
+								<div class="part_deliver">
+									<div class="tbl_tit">
+										<!-- 주문일/선물일 설정 -->
+										<span class="start_t" th:unless="${returnList.oneData.giftPackYn == 'Y'}">주문일</span>
+										<span class="gift_t" th:if="${returnList.oneData.giftPackYn == 'Y'}">선물일</span>
+										<!-- //주문일/선물일 설정 -->
+		
+										<span class="order_date" th:text="${returnList.oneData.ordDt}"></span>
+		
+										<!-- 배송구분 설정 -->
+										<span class="order_label02" th:if="${returnList.shotDelv}">총알배송</span>
+										<span class="order_label01" th:if="${returnList.selfMall}">STYLE24 일반배송</span>
+										<span class="order_label01" th:if="${returnList.supplyMall}">업체직배송</span>
+										<!-- //배송구분 설정 -->
+										<a href="javascript:void(0)" class="detail_btn" th:attr="ordNo=${returnList.oneData.ordNo}" onclick="fnGoToOrderDetail(this)">주문상세보기</a>
+									</div>
+									<div class="tbl type2">
+										<table id="returnList">
+											<colgroup>
+												<col width="1020">
+												<col width="180">
+											</colgroup>
+											<tbody>
+											<th:block th:if="${returnList.returnList}" th:each="return, status : ${returnList.returnList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+												<tr>
+													<td>
+														<div class="info_item">
+															<div class="thumb_box">
+																<a href="">
+																	<img th:src="${imageUrl + '/' + return.sysImgNm}" width="100%" alt="">
+																</a>
+															</div>
+															<div class="info_box">
+																<p class="od_name">
+																	<a href="">
+																		<span class="brand" th:text="${return.brandNm}"></span>
+																		<span class="name" th:text="${return.goodsNm}"></span>
+																	</a>
+																</p>
+																<p class="od_opt">
+																	<span class="option"><em th:text="${return.optCd1}"></em><em th:text="${return.optCd2}"></em></span>
+																	<span class="count">수량 <em th:text="${return.ordQty}"></em>개</span>
+																</p>
+															</div>
+															<div class="info_calc">
+																<p class="price">
+																	<span class="selling_price" th:text="|${#numbers.formatInteger(return.ordAmt, 1, 'COMMA')}원|"></span>
+																</p>
+																<p class="point"><span th:text="${#numbers.formatInteger(return.savePntAmt, 1, 'COMMA')}"></span>p</p>
+															</div>
+														</div>
+													</td>
+													<td class="cnt_sel">
+														<span class="cnt_t">수량</span>
+														<div class="form_field">
+															<div class="select_custom type1">
+																<div class="combo">
+																	<input type="hidden" name="chgQty" value="0" th:attr="ordDtlNo=${return.ordDtlNo}, ordCanChgQty=${return.ordCanChgQty}"/>
+																	<div class="select">선택</div>
+																	<ul class="list" style="width:100px; margin:0 auto">
+																		<li class="selected" value="0">선택</li>
+																		<li th:if="${return.ordCanChgQty > 0}" th:each="num : ${#numbers.sequence(1,return.ordCanChgQty)}" th:value="${num}" th:text="${num}" onclick="fnChangeQty(this);"></li>
+																	</ul>
+																</div>
+															</div>
+														</div>
+		<!--												<select class="select_dress" name="chgQty" onchange="fnChangeQty();">-->
+		<!--													<option value="">선택</option>-->
+		<!--													<option th:if="${return.ordQty > 0}" th:each="num : ${#numbers.sequence(1,return.ordQty)}" th:value="${num}" th:text="${num}"></option>-->
+		<!--												</select>-->
+													</td>
+												</tr>
+											</th:block>
+											</tbody>
+										</table>
+									</div>
+									<div class="order_confirm">
+										<p class="cf_txt cf_desc c_primary">반품하실 상품의 수량을 선택하신 후 반품 신청을 하실 수 있습니다.</p>
+									</div>
+								</div>
+							</section>
+							<section class="order_row">
+								<div class="tbl_tit">
+									<h3 class="subH3">반품 사유</h3>
+								</div>
+								<div class="tbl type1">
+									<table>
+										<colgroup>
+											<col width="*">
+										</colgroup>
+										<tbody>
 										<tr>
 											<td>
-												<div class="info_item">
-													<div class="thumb_box">
-														<a href="">
-															<img th:src="${imageUrl + '/' + return.sysImgNm}" width="100%" alt="">
-														</a>
-													</div>
-													<div class="info_box">
-														<p class="od_name">
-															<a href="">
-																<span class="brand" th:text="${return.brandNm}"></span>
-																<span class="name" th:text="${return.goodsNm}"></span>
-															</a>
-														</p>
-														<p class="od_opt">
-															<span class="option"><em th:text="${return.optCd1}"></em><em th:text="${return.optCd2}"></em></span>
-															<span class="count">수량 <em th:text="${return.ordQty}"></em>개</span>
-														</p>
-													</div>
-													<div class="info_calc">
-														<p class="price">
-															<span class="selling_price" th:text="|${#numbers.formatInteger(return.ordAmt, 1, 'COMMA')}원|"></span>
-														</p>
-														<p class="point"><span th:text="${#numbers.formatInteger(return.savePntAmt, 1, 'COMMA')}"></span>p</p>
-													</div>
-												</div>
-											</td>
-											<td class="cnt_sel">
-												<span class="cnt_t">수량</span>
 												<div class="form_field">
 													<div class="select_custom type1">
 														<div class="combo">
-															<input type="hidden" name="chgQty" value="0" th:attr="ordDtlNo=${return.ordDtlNo}, ordCanChgQty=${return.ordCanChgQty}"/>
-															<div class="select">선택</div>
-															<ul class="list" style="width:100px; margin:0 auto">
-																<li class="selected" value="0">선택</li>
-																<li th:if="${return.ordCanChgQty > 0}" th:each="num : ${#numbers.sequence(1,return.ordCanChgQty)}" th:value="${num}" th:text="${num}" onclick="fnChangeQty(this);"></li>
+															<input type="hidden" name="chgReason"/>
+															<div class="select">반품 사유를 선택하세요</div>
+															<ul class="list" style="width:400px">
+																<li class="selected" value="">반품 사유를 선택하세요</li>
+																<li th:if="${returnReason}" th:each="oneData, status : ${returnReason}" th:value="${oneData.cd}" th:text="${oneData.cdNm}" onclick="fnChangeReason(this);"></li>
 															</ul>
 														</div>
 													</div>
 												</div>
-<!--												<select class="select_dress" name="chgQty" onchange="fnChangeQty();">-->
-<!--													<option value="">선택</option>-->
-<!--													<option th:if="${return.ordQty > 0}" th:each="num : ${#numbers.sequence(1,return.ordQty)}" th:value="${num}" th:text="${num}"></option>-->
-<!--												</select>-->
 											</td>
 										</tr>
-									</th:block>
-									</tbody>
-								</table>
-							</div>
-							<div class="order_confirm">
-								<p class="cf_txt cf_desc c_primary">반품하실 상품의 수량을 선택하신 후 반품 신청을 하실 수 있습니다.</p>
-							</div>
-						</div>
-					</section>
-					<section class="order_row">
-						<div class="tbl_tit">
-							<h3 class="subH3">반품 사유</h3>
-						</div>
-						<div class="tbl type1">
-							<table>
-								<colgroup>
-									<col width="*">
-								</colgroup>
-								<tbody>
-								<tr>
-									<td>
-										<div class="form_field">
-											<div class="select_custom type1">
-												<div class="combo">
-													<input type="hidden" name="chgReason"/>
-													<div class="select">반품 사유를 선택하세요</div>
-													<ul class="list" style="width:400px">
-														<li class="selected" value="">반품 사유를 선택하세요</li>
-														<li th:if="${returnReason}" th:each="oneData, status : ${returnReason}" th:value="${oneData.cd}" th:text="${oneData.cdNm}" onclick="fnChangeReason(this);"></li>
-													</ul>
+										<tr>
+											<td>
+												<textarea class="doc_exchange" name="chgMemo" id="chgMemo" placeholder="자세한 사유를 입력해주세요." onkeyup="cfnGetTextLength(this, 200, $('#return_cnt'));"></textarea>
+												<p class="txt_cnt"><span id="return_cnt" class="c_primary">0</span>/200</p>
+											</td>
+										</tr>
+										</tbody>
+									</table>
+								</div>
+							</section>
+							<section class="order_row" id="wdGb">
+								<div class="order_tit">
+									<h3 class="subH3">반품 방식 선택</h3>
+								</div>
+								<div class="tbl type1">
+									<table>
+										<colgroup>
+											<col width="*">
+										</colgroup>
+										<tbody>
+										<tr>
+											<td>
+												<div class="form_field radio_field">
+													<div class="">
+														<input type="radio" name="wdGb" id="withdraw" value="W" checked>
+														<label for="withdraw"><span>방문회수 <b class="c_primary">택배사에서 방문하여 회수</b></span></label>
+													</div>
+													<div class="">
+														<input type="radio" name="wdGb" id="direct" value="D">
+														<label for="direct"><span>직접반송 <b class="c_primary">고객이 직접 반송처리</b></span></label>
+													</div>
 												</div>
-											</div>
-										</div>
-									</td>
-								</tr>
-								<tr>
-									<td>
-										<textarea class="doc_exchange" name="chgMemo" id="chgMemo" placeholder="자세한 사유를 입력해주세요." onkeyup="cfnGetTextLength(this, 200, $('#return_cnt'));"></textarea>
-										<p class="txt_cnt"><span id="return_cnt" class="c_primary">0</span>/200</p>
-									</td>
-								</tr>
-								</tbody>
-							</table>
-						</div>
-					</section>
-					<section class="order_row" id="wdGb">
-						<div class="order_tit">
-							<h3 class="subH3">반품 방식 선택</h3>
-						</div>
-						<div class="tbl type1">
-							<table>
-								<colgroup>
-									<col width="*">
-								</colgroup>
-								<tbody>
-								<tr>
-									<td>
-										<div class="form_field radio_field">
-											<div class="">
-												<input type="radio" name="wdGb" id="withdraw" value="W" checked>
-												<label for="withdraw"><span>방문회수 <b class="c_primary">택배사에서 방문하여 회수</b></span></label>
-											</div>
-											<div class="">
-												<input type="radio" name="wdGb" id="direct" value="D">
-												<label for="direct"><span>직접반송 <b class="c_primary">고객이 직접 반송처리</b></span></label>
-											</div>
-										</div>
-									</td>
-								</tr>
-								</tbody>
-							</table>
-						</div>
-					</section>
-					<section class="order_row" id="chgerLocation">
-						<div class="order_tit">
-							<h3 class="subH3">상품 회수지</h3>
-							<span class="del_t">택배사에서 반품 상품을 직접 회수할 장소 선택</span>
-							<button type="button" class="btn_popup" onclick="fnChangeDeliveryAddr('chger');"><span>회수지 선택</span></button>
-						</div>
-						<div class="tbl type1">
-							<table>
-								<colgroup>
-									<col width="200">
-									<col width="*">
-								</colgroup>
-								<tbody>
-								<tr>
-									<th>성명</th>
-									<td id="chgerNm" th:text="${deliveryAddrInfo.recipNm}"></td>
-									<input type="hidden" name="chgerNm" th:value="${deliveryAddrInfo.recipNm}">
-								</tr>
-								<tr>
-									<th>연락처</th>
-									<td id="chgerPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></td>
-									<input type="hidden" name="chgerPhnno" th:value="${deliveryAddrInfo.recipPhnno}">
-								</tr>
-								<tr>
-									<th>주소</th>
-									<td id="chgerAddr" th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></td>
-									<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
-									<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
-								</tr>
-								</tbody>
-							</table>
-						</div>
-					</section>
-					<section class="order_row" id="returnLocation" style="display:none">
-						<div class="order_tit">
-							<h3 class="subH3">반품하실 배송지</h3>
-						</div>
-						<div class="tbl type1">
-							<table>
-								<colgroup>
-									<col width="200">
-									<col width="*">
-								</colgroup>
-								<tbody>
-								<tr>
-									<th>성명</th>
-									<td th:text="${deliveryAddrInfo.rtnLocNm}"></td>
-									<input type="hidden" name="rtnLocNm" th:value="${deliveryAddrInfo.rtnLocNm}">
-								</tr>
-								<tr>
-									<th>연락처</th>
-									<td th:text="${deliveryAddrInfo.rtnLocTelno}"></td>
-									<input type="hidden" name="rtnLocTelno" th:value="${deliveryAddrInfo.rtnLocTelno}">
-								</tr>
-								<tr>
-									<th>주소</th>
-									<td th:text="|${deliveryAddrInfo.rtnLocBaseAddr} ${deliveryAddrInfo.rtnLocDtlAddr}|"></td>
-									<input type="hidden" name="rtnLocBaseAddr" th:value="${deliveryAddrInfo.rtnLocBaseAddr}">
-									<input type="hidden" name="rtnLocDtlAddr" th:value="${deliveryAddrInfo.rtnLocDtlAddr}">
-								</tr>
-								</tbody>
-							</table>
-						</div>
-					</section>
-					<section class="order_row">
-						<div class="order_tit">
-							<h3 class="subH3">환불 정보</h3>
-							<button type="button" class="btn_popup"><span>취소 전표 보기</span></button>
-						</div>
-						<div class="tbl type1 re_info_tbl">
-							<div class="r_left">
-								<dl>
-									<dt>환불(예정) 금액</dt>
-									<dd>
-										<span class="big_t"><strong id="returnAmt">0</strong>원</span>
-									</dd>
-								</dl>
-								<dl>
-									<dt>상품취소 금액</dt>
-									<dd>
-										<span id="goodsCancelAmt">0</span>원
-									</dd>
-								</dl>
-								<dl>
-									<dt>배송비</dt>
-									<dd>
-										<span id="deliveryFee">0</span>원
-									</dd>
-								</dl>
-								<dl>
-									<dt>할인금액 차감</dt>
-									<dd>
-										<span id="deductDcAmt">0</span>원
-									</dd>
-								</dl>
-							</div>
-							<div class="r_right">
-								<dl>
-									<dt>환불수단</dt>
-									<dd>
-										<span th:text="${paymentInfo.payMeansNm}"></span>
-									</dd>
-								</dl>
-								<dl>
-									<dt>결제금액 환불</dt>
-									<dd>
-										<span id="refundPayAmt">0</span>원
-									</dd>
-								</dl>
-								<dl>
-									<dt>포인트 환불</dt>
-									<dd>
-										<span id="refundPoint">0</span>P
-									</dd>
-								</dl>
-								<dl>
-									<dt>상품권 환불</dt>
-									<dd>
-										<span id="refundGiftCard">0</span>원
-									</dd>
-								</dl>
+											</td>
+										</tr>
+										</tbody>
+									</table>
+								</div>
+							</section>
+							<section class="order_row" id="chgerLocation">
+								<div class="order_tit">
+									<h3 class="subH3">상품 회수지</h3>
+									<span class="del_t">택배사에서 반품 상품을 직접 회수할 장소 선택</span>
+									<button type="button" class="btn_popup" onclick="fnChangeDeliveryAddr('chger');"><span>회수지 선택</span></button>
+								</div>
+								<div class="tbl type1">
+									<table>
+										<colgroup>
+											<col width="200">
+											<col width="*">
+										</colgroup>
+										<tbody>
+										<tr>
+											<th>성명</th>
+											<td id="chgerNm" th:text="${deliveryAddrInfo.recipNm}"></td>
+											<input type="hidden" name="chgerNm" th:value="${deliveryAddrInfo.recipNm}">
+										</tr>
+										<tr>
+											<th>연락처</th>
+											<td id="chgerPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></td>
+											<input type="hidden" name="chgerPhnno" th:value="${deliveryAddrInfo.recipPhnno}">
+										</tr>
+										<tr>
+											<th>주소</th>
+											<td id="chgerAddr" th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></td>
+											<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
+											<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
+										</tr>
+										</tbody>
+									</table>
+								</div>
+							</section>
+							<section class="order_row" id="returnLocation" style="display:none">
+								<div class="order_tit">
+									<h3 class="subH3">반품하실 배송지</h3>
+								</div>
+								<div class="tbl type1">
+									<table>
+										<colgroup>
+											<col width="200">
+											<col width="*">
+										</colgroup>
+										<tbody>
+										<tr>
+											<th>성명</th>
+											<td th:text="${deliveryAddrInfo.rtnLocNm}"></td>
+											<input type="hidden" name="rtnLocNm" th:value="${deliveryAddrInfo.rtnLocNm}">
+										</tr>
+										<tr>
+											<th>연락처</th>
+											<td th:text="${deliveryAddrInfo.rtnLocTelno}"></td>
+											<input type="hidden" name="rtnLocTelno" th:value="${deliveryAddrInfo.rtnLocTelno}">
+										</tr>
+										<tr>
+											<th>주소</th>
+											<td th:text="|${deliveryAddrInfo.rtnLocBaseAddr} ${deliveryAddrInfo.rtnLocDtlAddr}|"></td>
+											<input type="hidden" name="rtnLocBaseAddr" th:value="${deliveryAddrInfo.rtnLocBaseAddr}">
+											<input type="hidden" name="rtnLocDtlAddr" th:value="${deliveryAddrInfo.rtnLocDtlAddr}">
+										</tr>
+										</tbody>
+									</table>
+								</div>
+							</section>
+							<section class="order_row">
+								<div class="order_tit">
+									<h3 class="subH3">환불 정보</h3>
+									<button type="button" class="btn_popup"><span>취소 전표 보기</span></button>
+								</div>
+								<div class="tbl type1 re_info_tbl">
+									<div class="r_left">
+										<dl>
+											<dt>환불(예정) 금액</dt>
+											<dd>
+												<span class="big_t"><strong id="returnAmt">0</strong>원</span>
+											</dd>
+										</dl>
+										<dl>
+											<dt>상품취소 금액</dt>
+											<dd>
+												<span id="goodsCancelAmt">0</span>원
+											</dd>
+										</dl>
+										<dl>
+											<dt>배송비</dt>
+											<dd>
+												<span id="deliveryFee">0</span>원
+											</dd>
+										</dl>
+										<dl>
+											<dt>할인금액 차감</dt>
+											<dd>
+												<span id="deductDcAmt">0</span>원
+											</dd>
+										</dl>
+									</div>
+									<div class="r_right">
+										<dl>
+											<dt>환불수단</dt>
+											<dd>
+												<span th:text="${paymentInfo.payMeansNm}"></span>
+											</dd>
+										</dl>
+										<dl>
+											<dt>결제금액 환불</dt>
+											<dd>
+												<span id="refundPayAmt">0</span>원
+											</dd>
+										</dl>
+										<dl>
+											<dt>포인트 환불</dt>
+											<dd>
+												<span id="refundPoint">0</span>P
+											</dd>
+										</dl>
+										<dl>
+											<dt>상품권 환불</dt>
+											<dd>
+												<span id="refundGiftCard">0</span>원
+											</dd>
+										</dl>
+									</div>
+								</div>
+								<p class="alert_t">※ 카드사로 결제 취소 요청이 전달된 후 환불까지는 평일 기준 3 ~7일이 소요될 수 있습니다.</p>
+							</section>
+							<section class="order_row" id="addDeliveryFee" style="display:none">
+								<div class="ship_fee">
+									<p><span class="c_primary" id="addPayCost">2,500원</span> 배송비 추가 결제가 필요합니다.</p>
+									<input type="hidden" name="addPayCost"/>
+								</div>
+							</section>
+							<div class="btn_wrap">
+								<button type="button" class="btn btn_default cancle_btn" onclick="cfnGoToPage(_PAGE_MYPAGE_CRS_LIST)"><span>반품 취소</span></button>
+								<button tyep="submit" class="btn btn_primary submit_btn" onclick="fnReturn()"><span id="returnButton">반품 신청</span></button>
 							</div>
 						</div>
-						<p class="alert_t">※ 카드사로 결제 취소 요청이 전달된 후 환불까지는 평일 기준 3 ~7일이 소요될 수 있습니다.</p>
-					</section>
-					<section class="order_row" id="addDeliveryFee" style="display:none">
-						<div class="ship_fee">
-							<p><span class="c_primary" id="addPayCost">2,500원</span> 배송비 추가 결제가 필요합니다.</p>
-							<input type="hidden" name="addPayCost"/>
-						</div>
-					</section>
-					<div class="btn_wrap">
-						<button type="button" class="btn btn_default cancle_btn" onclick="cfnGoToPage(_PAGE_MYPAGE_CRS_LIST)"><span>반품 취소</span></button>
-						<button tyep="submit" class="btn btn_primary submit_btn" onclick="fnReturn()"><span id="returnButton">반품 신청</span></button>
-					</div>
+					</form>
 				</div>
-			</form>
+			</div>
+			<!-- // CONT-BODY -->
 		</div>
 	</div>
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>

BIN
src/main/webapp/images/mo/ico_arrow_filter.png


BIN
src/main/webapp/images/mo/ico_btn_more02.png


BIN
src/main/webapp/images/mo/ico_bulltet-delivery.png


BIN
src/main/webapp/images/mo/ico_bulltet-house.png


BIN
src/main/webapp/images/mo/ico_bulltet-object.png


BIN
src/main/webapp/images/mo/ico_bulltet-order.png


BIN
src/main/webapp/images/mo/ico_cate_close.png


BIN
src/main/webapp/images/mo/ico_dp_arrow.png


BIN
src/main/webapp/images/mo/ico_dpbanner_arrow.png


BIN
src/main/webapp/images/mo/ico_filter_close.png


BIN
src/main/webapp/images/mo/ico_filter_remove.png


BIN
src/main/webapp/images/mo/ico_filter_reset.png


BIN
src/main/webapp/images/mo/ico_filter_reset02.png


BIN
src/main/webapp/images/mo/ico_filter_reset_w.png


BIN
src/main/webapp/images/mo/ico_pick_cls.png


BIN
src/main/webapp/images/mo/ico_search_btn.png


BIN
src/main/webapp/images/mo/ico_shopbag.png


BIN
src/main/webapp/images/mo/ico_sns_share.png


BIN
src/main/webapp/images/mo/icon_best_refresh.png


BIN
src/main/webapp/images/mo/icon_list_filter.png


BIN
src/main/webapp/images/mo/icon_time_hotdeal.png


BIN
src/main/webapp/images/mo/shc_arrow.png


BIN
src/main/webapp/images/mo/shc_clock.png


BIN
src/main/webapp/images/mo/shc_filter.png


BIN
src/main/webapp/images/mo/shc_itemplan.png


BIN
src/main/webapp/images/mo/shc_refresh.png


BIN
src/main/webapp/images/mo/shc_result_plan.png


BIN
src/main/webapp/images/mo/thumb/bigbanner_slide01.png


BIN
src/main/webapp/images/mo/thumb/bullet_bg1.png


BIN
src/main/webapp/images/mo/thumb/detail_case_bg.png


BIN
src/main/webapp/images/mo/thumb/dp_case1_item.jpg


BIN
src/main/webapp/images/mo/thumb/dp_case1_lookbook.jpg


BIN
src/main/webapp/images/mo/thumb/dp_visual.jpg


BIN
src/main/webapp/images/mo/thumb/dp_visual_outlets.jpg


BIN
src/main/webapp/images/mo/thumb/hotdeal_bg.png


BIN
src/main/webapp/images/mo/thumb/main_visual01.jpg


BIN
src/main/webapp/images/mo/thumb/main_visual02.jpg


BIN
src/main/webapp/images/pc/benefit_txt.jpg


BIN
src/main/webapp/images/pc/bg_check01.png


BIN
src/main/webapp/images/pc/bg_check02.png


BIN
src/main/webapp/images/pc/dp_best_livetxt.jpg


BIN
src/main/webapp/images/pc/ico_best_bedge.jpg


BIN
src/main/webapp/images/pc/ico_besttag2.png


BIN
src/main/webapp/images/pc/ico_bracket2.png


BIN
src/main/webapp/images/pc/ico_bread_root_w.png


BIN
src/main/webapp/images/pc/ico_cart_empty.png


BIN
src/main/webapp/images/pc/ico_coupon_3000.png


BIN
src/main/webapp/images/pc/ico_coupon_5.png


BIN
src/main/webapp/images/pc/ico_filter_close.png


BIN
src/main/webapp/images/pc/ico_filter_reset02.png


BIN
src/main/webapp/images/pc/pop_slide_next.png


BIN
src/main/webapp/images/pc/pop_slide_prev.png


+ 40 - 13
src/main/webapp/ux/pc/js/mypage.js

@@ -1,3 +1,34 @@
+// 마이페이지 LNB 처리
+var fnSetMypageLnbList = function(lnbLvl) {
+	let tag = '';
+	tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);"' + (lnbLvl == 1 ? ' class="on"' : '') + '>주문확인/배송조회</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_CRS_LIST);"' + (lnbLvl == 2 ? ' class="on"' : '') + '>취소/반품/환불내역</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_RESTOCK);"' + (lnbLvl == 3 ? ' class="on"' : '') + '>재입고 알림 내역</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_COUPON);"' + (lnbLvl == 4 ? ' class="on"' : '') + '>쿠폰</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_POINT);"' + (lnbLvl == 5 ? ' class="on"' : '') + '>STYLE24 포인트</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);"' + (lnbLvl == 6 ? ' class="on"' : '') + '>상품권</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_REVIEW);"' + (lnbLvl == 7 ? ' class="on"' : '') + '>리뷰</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_DELIVERY_ADDR);"' + (lnbLvl == 8 ? ' class="on"' : '') + '>배송지 관리</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_WISHLIST);"' + (lnbLvl == 9 ? ' class="on"' : '') + '>위시리스트</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_CUSTOMER);"' + (lnbLvl == 10 ? ' class="on"' : '') + '>내정보 관리</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_MYPAGE_SECEDE);"' + (lnbLvl == 11 ? ' class="on"' : '') + '>회원 탈퇴</a></li>\n';
+	tag += '</ul>';
+	$('#mypageLnbList').html(tag);
+}
+
+
+// 마이페이지 로케이션 처리
+var fnSetMypageLocation = function(depth3, depth3Link, depth4) {
+	let tag = '';
+	if (gagajf.isNull(depth4)) {
+		tag += '<li class="bread_3depth">' + depth3 + '</li>'
+	} else {
+		tag += '<li className="bread_3depth"><a href="javascript:void(0);" onClick="cfnGoToPage(' + depth3Link + ');">' + depth3 + '</a></li>';
+		tag += '<li class="bread_3depth">' + depth4 + '</li>'
+	}
+	$('#location').append(tag);
+}
+
 // 주문상세보기 버튼 클릭 이벤트 처리
 var fnGoToOrderDetail = function(param) {
 	let ordNo = $(param).attr('ordNo');
@@ -105,19 +136,15 @@ var fnCreateChange = function(param, gubun) {
 
 	$('#' + gubun + 'Form input[name=ordNo]').val(ordNo);
 	$('#' + gubun + 'Form input[name=ordDtlNo]').val(ordDtlNo);
-	mcxDialog.alertC(gubun,  {
-		sureBtnText: "확인",
-		sureBtnClick: function() {
-			if (gubun == 'cancel') {
-				document.cancelForm.submit();
-			} else if (gubun == 'return') {
-				document.returnForm.submit();
-			} else if (gubun == 'exchange') {
-				document.exchangeForm.submit();
-			}
-		}
-	});
-	
+
+	if (gubun == 'cancel') {
+		document.cancelForm.submit();
+	} else if (gubun == 'return') {
+		document.returnForm.submit();
+	} else if (gubun == 'exchange') {
+		document.exchangeForm.submit();
+	}
+
 }
 
 // 주문 내역 삭제 처리