瀏覽代碼

마이페이지 비회원 모바일 개발 임시 커밋

card007 5 年之前
父節點
當前提交
ef936ed937
共有 25 個文件被更改,包括 1304 次插入430 次删除
  1. 7 7
      src/main/java/com/style24/front/biz/web/TsfMypageController.java
  2. 285 29
      src/main/java/com/style24/front/biz/web/TsfNoMemberController.java
  3. 0 4
      src/main/java/com/style24/front/support/interceptor/TsfDefaultInterceptor.java
  4. 15 3
      src/main/java/com/style24/front/support/interceptor/TsfReturnUrlInterceptor.java
  5. 0 39
      src/main/webapp/WEB-INF/views/mob/common/layout/NoMemberLayoutMob.html
  6. 12 11
      src/main/webapp/WEB-INF/views/mob/mypage/MypageCreListFormMob.html
  7. 313 0
      src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreListFormMob.html
  8. 250 0
      src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreListInfoMob.html
  9. 46 149
      src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderListFormMob.html
  10. 287 0
      src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderListInfoMob.html
  11. 0 6
      src/main/webapp/WEB-INF/views/web/common/layout/MypageLayoutWeb.html
  12. 1 32
      src/main/webapp/WEB-INF/views/web/common/layout/NoMemberLayoutWeb.html
  13. 12 23
      src/main/webapp/WEB-INF/views/web/mypage/MypageCreListFormWeb.html
  14. 0 15
      src/main/webapp/WEB-INF/views/web/mypage/MypageOrderDetailFormWeb.html
  15. 0 15
      src/main/webapp/WEB-INF/views/web/mypage/MypageOrderListFormWeb.html
  16. 2 2
      src/main/webapp/WEB-INF/views/web/mypage/NoMemberCancelFormWeb.html
  17. 1 1
      src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreCancelDetailFormWeb.html
  18. 1 1
      src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreExchangeDetailFormWeb.html
  19. 9 28
      src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreListFormWeb.html
  20. 1 1
      src/main/webapp/WEB-INF/views/web/mypage/NoMemberCreReturnDetailFormWeb.html
  21. 2 2
      src/main/webapp/WEB-INF/views/web/mypage/NoMemberExchangeFormWeb.html
  22. 7 7
      src/main/webapp/WEB-INF/views/web/mypage/NoMemberOrderDetailFormWeb.html
  23. 7 7
      src/main/webapp/WEB-INF/views/web/mypage/NoMemberOrderListFormWeb.html
  24. 2 2
      src/main/webapp/WEB-INF/views/web/mypage/NoMemberReturnFormWeb.html
  25. 44 46
      src/main/webapp/biz/mypage.js

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

@@ -387,7 +387,7 @@ public class TsfMypageController extends TsfBaseController {
 	 * @author card007
 	 * @since 2021. 02. 22
 	 */
-	@PostMapping("/exchange/form")
+	@GetMapping("/exchange/form")
 	@ResponseBody
 	public ModelAndView exchangeForm(Order order) {
 		ModelAndView mav = new ModelAndView();
@@ -627,7 +627,7 @@ public class TsfMypageController extends TsfBaseController {
 	 * @author card007
 	 * @since 2021. 02. 25
 	 */
-	@PostMapping("/return/form")
+	@GetMapping("/return/form")
 	@ResponseBody
 	public ModelAndView returnForm(Order order) {
 		ModelAndView mav = new ModelAndView();
@@ -786,7 +786,7 @@ public class TsfMypageController extends TsfBaseController {
 	 * @author card007
 	 * @since 2021. 03. 19
 	 */
-	@PostMapping("/cancel/form")
+	@GetMapping("/cancel/form")
 	@ResponseBody
 	public ModelAndView cancelForm(Order order) {
 		ModelAndView mav = new ModelAndView();
@@ -975,7 +975,7 @@ public class TsfMypageController extends TsfBaseController {
 	 * @author card007
 	 * @since 2021. 04. 12
 	 */
-	@PostMapping("/cre/cancel/detail/form")
+	@GetMapping("/cre/cancel/detail/form")
 	public ModelAndView mypageCreCancelDetailForm(OrderChange orderChange) {
 		ModelAndView mav = new ModelAndView();
 
@@ -1008,7 +1008,7 @@ public class TsfMypageController extends TsfBaseController {
 	 * @author card007
 	 * @since 2021. 04. 13
 	 */
-	@PostMapping("/cre/return/detail/form")
+	@GetMapping("/cre/return/detail/form")
 	public ModelAndView mypageCreReturnDetailForm(OrderChange orderChange) {
 		ModelAndView mav = new ModelAndView();
 
@@ -1044,7 +1044,7 @@ public class TsfMypageController extends TsfBaseController {
 	 * @author card007
 	 * @since 2021. 04. 13
 	 */
-	@PostMapping("/cre/exchange/detail/form")
+	@GetMapping("/cre/exchange/detail/form")
 	public ModelAndView mypageCreExchangeDetailForm(OrderChange orderChange) {
 		ModelAndView mav = new ModelAndView();
 
@@ -1347,7 +1347,7 @@ public class TsfMypageController extends TsfBaseController {
 	 * @author card007
 	 * @since  2021. 05. 04
 	 */
-	@PostMapping("/delivery/info/form")
+	@GetMapping("/delivery/info/form")
 	@ResponseBody
 	public ModelAndView deliveryInfoForm(Order order) {
 		ModelAndView mav = new ModelAndView();

+ 285 - 29
src/main/java/com/style24/front/biz/web/TsfNoMemberController.java

@@ -98,10 +98,19 @@ public class TsfNoMemberController extends TsfBaseController {
 	public ModelAndView noMemberOrderListForm() {
 		ModelAndView mav = new ModelAndView();
 
+		// 로그인 상태이면 메인으로 리다이렉트 처리
+		if (TsfSession.isLogin()) {
+			mav.setViewName("redirect:/");
+			return mav;
+		}
+
+		log.info("noMemberOrdNo >>> {}", TsfSession.getAttribute("noMemberOrdNo"));
+		log.info("noMemberOrdNm >>> {}", TsfSession.getAttribute("noMemberOrdNm"));
+		log.info("noMemberOrdPhnno >>> {}", TsfSession.getAttribute("noMemberOrdPhnno"));
 		// 비회원 정보 유효성 체크
 		if (StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNo"))
 			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNm"))
-			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberPhnno"))) {
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdPhnno"))) {
 			// 세션에 비회원 정보가 없으면 비회원 주문 조회 화면으로 리다이렉트 처리
 			mav.setViewName("redirect:/customer/noncust/order/confirm/form");
 			return mav;
@@ -113,15 +122,15 @@ public class TsfNoMemberController extends TsfBaseController {
 		order.setOrdNm(TsfSession.getAttribute("noMemberOrdNm"));
 		order.setOrdPhnno(TsfSession.getAttribute("noMemberOrdPhnno"));
 
-		mav.addObject("ordNo", order.getOrdNo());
-		mav.addObject("ordNm", order.getOrdNm());
-		mav.addObject("ordPhnno", order.getOrdPhnno());
-
 		// 핸드폰번호 하이픈 처리
 		if (!order.getOrdPhnno().contains("-")) {
 			order.setOrdPhnno(order.getOrdPhnno().replaceAll("(\\d{3})(\\d{3,4})(\\d{4})", "$1-$2-$3"));
 		}
 
+		mav.addObject("ordNo", order.getOrdNo());
+		mav.addObject("ordNm", order.getOrdNm());
+		mav.addObject("ordPhnno", order.getOrdPhnno());
+
 		// 주문 상태 별 수량 조회
 		mav.addObject("orderCount", coreOrderService.getOrderStatCount(order));
 
@@ -149,10 +158,16 @@ public class TsfNoMemberController extends TsfBaseController {
 	public ModelAndView noMemberOrderDetailForm() {
 		ModelAndView mav = new ModelAndView();
 
+		// 로그인 상태이면 메인으로 리다이렉트 처리
+		if (TsfSession.isLogin()) {
+			mav.setViewName("redirect:/");
+			return mav;
+		}
+
 		// 비회원 정보 유효성 체크
 		if (StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNo"))
 			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNm"))
-			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberPhnno"))) {
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdPhnno"))) {
 			// 세션에 비회원 정보가 없으면 비회원 주문 조회 화면으로 리다이렉트 처리
 			mav.setViewName("redirect:/customer/noncust/order/confirm/form");
 			return mav;
@@ -164,15 +179,15 @@ public class TsfNoMemberController extends TsfBaseController {
 		order.setOrdNm(TsfSession.getAttribute("noMemberOrdNm"));
 		order.setOrdPhnno(TsfSession.getAttribute("noMemberOrdPhnno"));
 
-		mav.addObject("ordNo", order.getOrdNo());
-		mav.addObject("ordNm", order.getOrdNm());
-		mav.addObject("ordPhnno", order.getOrdPhnno());
-
 		// 핸드폰번호 하이픈 처리
 		if (!order.getOrdPhnno().contains("-")) {
 			order.setOrdPhnno(order.getOrdPhnno().replaceAll("(\\d{3})(\\d{3,4})(\\d{4})", "$1-$2-$3"));
 		}
 
+		mav.addObject("ordNo", order.getOrdNo());
+		mav.addObject("ordNm", order.getOrdNm());
+		mav.addObject("ordPhnno", order.getOrdPhnno());
+
 		// 로그인여부 설정
 		mav.addObject("isLogin", false);
 
@@ -291,7 +306,7 @@ public class TsfNoMemberController extends TsfBaseController {
 		if (isFind) {
 			TsfSession.setAttribute("noMemberOrdNm",order.getOrdNm());
 			TsfSession.setAttribute("noMemberOrdNo", String.valueOf(order.getOrdNo()));
-			TsfSession.setAttribute("noMemberPhnno",order.getOrdPhnno());
+			TsfSession.setAttribute("noMemberOrdPhnno",order.getOrdPhnno());
 		}
 
 		result.setBoolean("isFind", isFind);
@@ -448,10 +463,31 @@ public class TsfNoMemberController extends TsfBaseController {
 	public ModelAndView noMemberCancelForm(Order order) {
 		ModelAndView mav = new ModelAndView();
 
-		// ordDtlNo
-		// delvFeeCd
+		// 로그인 상태이면 메인으로 리다이렉트 처리
+		if (TsfSession.isLogin()) {
+			mav.setViewName("redirect:/");
+			return mav;
+		}
+
+		// 비회원 정보 유효성 체크
+		if (StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNo"))
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNm"))
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdPhnno"))) {
+			// 세션에 비회원 정보가 없으면 비회원 주문 조회 화면으로 리다이렉트 처리
+			mav.setViewName("redirect:/customer/noncust/order/confirm/form");
+			return mav;
+		}
 
 		// 비회원 정보 설정
+		order.setOrdNo(Integer.parseInt(TsfSession.getAttribute("noMemberOrdNo")));
+		order.setOrdNm(TsfSession.getAttribute("noMemberOrdNm"));
+		order.setOrdPhnno(TsfSession.getAttribute("noMemberOrdPhnno"));
+
+		// 핸드폰번호 하이픈 처리
+		if (!order.getOrdPhnno().contains("-")) {
+			order.setOrdPhnno(order.getOrdPhnno().replaceAll("(\\d{3})(\\d{3,4})(\\d{4})", "$1-$2-$3"));
+		}
+
 		mav.addObject("ordNo", order.getOrdNo());
 		mav.addObject("ordNm", order.getOrdNm());
 		mav.addObject("ordPhnno", order.getOrdPhnno());
@@ -526,7 +562,31 @@ public class TsfNoMemberController extends TsfBaseController {
 	public ModelAndView returnForm(Order order) {
 		ModelAndView mav = new ModelAndView();
 
+		// 로그인 상태이면 메인으로 리다이렉트 처리
+		if (TsfSession.isLogin()) {
+			mav.setViewName("redirect:/");
+			return mav;
+		}
+
+		// 비회원 정보 유효성 체크
+		if (StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNo"))
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNm"))
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdPhnno"))) {
+			// 세션에 비회원 정보가 없으면 비회원 주문 조회 화면으로 리다이렉트 처리
+			mav.setViewName("redirect:/customer/noncust/order/confirm/form");
+			return mav;
+		}
+
 		// 비회원 정보 설정
+		order.setOrdNo(Integer.parseInt(TsfSession.getAttribute("noMemberOrdNo")));
+		order.setOrdNm(TsfSession.getAttribute("noMemberOrdNm"));
+		order.setOrdPhnno(TsfSession.getAttribute("noMemberOrdPhnno"));
+
+		// 핸드폰번호 하이픈 처리
+		if (!order.getOrdPhnno().contains("-")) {
+			order.setOrdPhnno(order.getOrdPhnno().replaceAll("(\\d{3})(\\d{3,4})(\\d{4})", "$1-$2-$3"));
+		}
+
 		mav.addObject("ordNo", order.getOrdNo());
 		mav.addObject("ordNm", order.getOrdNm());
 		mav.addObject("ordPhnno", order.getOrdPhnno());
@@ -688,7 +748,31 @@ public class TsfNoMemberController extends TsfBaseController {
 	public ModelAndView exchangeForm(Order order) {
 		ModelAndView mav = new ModelAndView();
 
+		// 로그인 상태이면 메인으로 리다이렉트 처리
+		if (TsfSession.isLogin()) {
+			mav.setViewName("redirect:/");
+			return mav;
+		}
+
+		// 비회원 정보 유효성 체크
+		if (StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNo"))
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNm"))
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdPhnno"))) {
+			// 세션에 비회원 정보가 없으면 비회원 주문 조회 화면으로 리다이렉트 처리
+			mav.setViewName("redirect:/customer/noncust/order/confirm/form");
+			return mav;
+		}
+
 		// 비회원 정보 설정
+		order.setOrdNo(Integer.parseInt(TsfSession.getAttribute("noMemberOrdNo")));
+		order.setOrdNm(TsfSession.getAttribute("noMemberOrdNm"));
+		order.setOrdPhnno(TsfSession.getAttribute("noMemberOrdPhnno"));
+
+		// 핸드폰번호 하이픈 처리
+		if (!order.getOrdPhnno().contains("-")) {
+			order.setOrdPhnno(order.getOrdPhnno().replaceAll("(\\d{3})(\\d{3,4})(\\d{4})", "$1-$2-$3"));
+		}
+
 		mav.addObject("ordNo", order.getOrdNo());
 		mav.addObject("ordNm", order.getOrdNm());
 		mav.addObject("ordPhnno", order.getOrdPhnno());
@@ -840,10 +924,35 @@ public class TsfNoMemberController extends TsfBaseController {
 	 * @since 2021. 05. 02
 	 */
 	@GetMapping("/cre/list/form")
-	public ModelAndView mypageCreListForm(Order order) {
+	public ModelAndView mypageCreListForm() {
 		ModelAndView mav = new ModelAndView();
 
+		// 로그인 상태이면 메인으로 리다이렉트 처리
+		if (TsfSession.isLogin()) {
+			mav.setViewName("redirect:/");
+			return mav;
+		}
+
+		// 비회원 정보 유효성 체크
+		if (StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNo"))
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNm"))
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdPhnno"))) {
+			// 세션에 비회원 정보가 없으면 비회원 주문 조회 화면으로 리다이렉트 처리
+			mav.setViewName("redirect:/customer/noncust/order/confirm/form");
+			return mav;
+		}
+
 		// 비회원 정보 설정
+		Order order = new Order();
+		order.setOrdNo(Integer.parseInt(TsfSession.getAttribute("noMemberOrdNo")));
+		order.setOrdNm(TsfSession.getAttribute("noMemberOrdNm"));
+		order.setOrdPhnno(TsfSession.getAttribute("noMemberOrdPhnno"));
+
+		// 핸드폰번호 하이픈 처리
+		if (!order.getOrdPhnno().contains("-")) {
+			order.setOrdPhnno(order.getOrdPhnno().replaceAll("(\\d{3})(\\d{3,4})(\\d{4})", "$1-$2-$3"));
+		}
+
 		mav.addObject("ordNo", order.getOrdNo());
 		mav.addObject("ordNm", order.getOrdNm());
 		mav.addObject("ordPhnno", order.getOrdPhnno());
@@ -914,6 +1023,35 @@ public class TsfNoMemberController extends TsfBaseController {
 	public ModelAndView mypageCreCancelDetailForm(OrderChange orderChange) {
 		ModelAndView mav = new ModelAndView();
 
+		// 로그인 상태이면 메인으로 리다이렉트 처리
+		if (TsfSession.isLogin()) {
+			mav.setViewName("redirect:/");
+			return mav;
+		}
+
+		// 비회원 정보 유효성 체크
+		if (StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNo"))
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNm"))
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdPhnno"))) {
+			// 세션에 비회원 정보가 없으면 비회원 주문 조회 화면으로 리다이렉트 처리
+			mav.setViewName("redirect:/customer/noncust/order/confirm/form");
+			return mav;
+		}
+
+		// 비회원 정보 설정
+		orderChange.setOrdNo(Integer.parseInt(TsfSession.getAttribute("noMemberOrdNo")));
+		orderChange.setOrdNm(TsfSession.getAttribute("noMemberOrdNm"));
+		orderChange.setOrdPhnno(TsfSession.getAttribute("noMemberOrdPhnno"));
+
+		// 핸드폰번호 하이픈 처리
+		if (!orderChange.getOrdPhnno().contains("-")) {
+			orderChange.setOrdPhnno(orderChange.getOrdPhnno().replaceAll("(\\d{3})(\\d{3,4})(\\d{4})", "$1-$2-$3"));
+		}
+
+		mav.addObject("ordNo", orderChange.getOrdNo());
+		mav.addObject("ordNm", orderChange.getOrdNm());
+		mav.addObject("ordPhnno", orderChange.getOrdPhnno());
+
 		// 취소상세 데이터 조회
 		GagaMap map = orderChangeService.getCreCancelDetailInfo(orderChange);
 		OrderChange oneData = (OrderChange) map.get("oneData");
@@ -926,11 +1064,6 @@ public class TsfNoMemberController extends TsfBaseController {
 		order.setOrdNo(orderChange.getOrdNo());
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
 
-		// 비회원 정보 설정
-		mav.addObject("ordNo", orderChange.getOrdNo());
-		mav.addObject("ordNm", orderChange.getOrdNm());
-		mav.addObject("ordPhnno", orderChange.getOrdPhnno());
-
 		mav.setViewName(super.getDeviceViewName("mypage/NoMemberCreCancelDetailForm"));
 
 		return mav;
@@ -948,6 +1081,35 @@ public class TsfNoMemberController extends TsfBaseController {
 	public ModelAndView mypageCreReturnDetailForm(OrderChange orderChange) {
 		ModelAndView mav = new ModelAndView();
 
+		// 로그인 상태이면 메인으로 리다이렉트 처리
+		if (TsfSession.isLogin()) {
+			mav.setViewName("redirect:/");
+			return mav;
+		}
+
+		// 비회원 정보 유효성 체크
+		if (StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNo"))
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNm"))
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdPhnno"))) {
+			// 세션에 비회원 정보가 없으면 비회원 주문 조회 화면으로 리다이렉트 처리
+			mav.setViewName("redirect:/customer/noncust/order/confirm/form");
+			return mav;
+		}
+
+		// 비회원 정보 설정
+		orderChange.setOrdNo(Integer.parseInt(TsfSession.getAttribute("noMemberOrdNo")));
+		orderChange.setOrdNm(TsfSession.getAttribute("noMemberOrdNm"));
+		orderChange.setOrdPhnno(TsfSession.getAttribute("noMemberOrdPhnno"));
+
+		// 핸드폰번호 하이픈 처리
+		if (!orderChange.getOrdPhnno().contains("-")) {
+			orderChange.setOrdPhnno(orderChange.getOrdPhnno().replaceAll("(\\d{3})(\\d{3,4})(\\d{4})", "$1-$2-$3"));
+		}
+
+		mav.addObject("ordNo", orderChange.getOrdNo());
+		mav.addObject("ordNm", orderChange.getOrdNm());
+		mav.addObject("ordPhnno", orderChange.getOrdPhnno());
+
 		// 로그인여부 설정
 		mav.addObject("isLogin", false);
 
@@ -963,11 +1125,6 @@ public class TsfNoMemberController extends TsfBaseController {
 		order.setOrdNo(orderChange.getOrdNo());
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
 
-		// 비회원 정보 설정
-		mav.addObject("ordNo", orderChange.getOrdNo());
-		mav.addObject("ordNm", orderChange.getOrdNm());
-		mav.addObject("ordPhnno", orderChange.getOrdPhnno());
-
 		mav.setViewName(super.getDeviceViewName("mypage/NoMemberCreReturnDetailForm"));
 
 		return mav;
@@ -985,6 +1142,35 @@ public class TsfNoMemberController extends TsfBaseController {
 	public ModelAndView mypageCreExchangeDetailForm(OrderChange orderChange) {
 		ModelAndView mav = new ModelAndView();
 
+		// 로그인 상태이면 메인으로 리다이렉트 처리
+		if (TsfSession.isLogin()) {
+			mav.setViewName("redirect:/");
+			return mav;
+		}
+
+		// 비회원 정보 유효성 체크
+		if (StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNo"))
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdNm"))
+			|| StringUtils.isBlank(TsfSession.getAttribute("noMemberOrdPhnno"))) {
+			// 세션에 비회원 정보가 없으면 비회원 주문 조회 화면으로 리다이렉트 처리
+			mav.setViewName("redirect:/customer/noncust/order/confirm/form");
+			return mav;
+		}
+
+		// 비회원 정보 설정
+		orderChange.setOrdNo(Integer.parseInt(TsfSession.getAttribute("noMemberOrdNo")));
+		orderChange.setOrdNm(TsfSession.getAttribute("noMemberOrdNm"));
+		orderChange.setOrdPhnno(TsfSession.getAttribute("noMemberOrdPhnno"));
+
+		// 핸드폰번호 하이픈 처리
+		if (!orderChange.getOrdPhnno().contains("-")) {
+			orderChange.setOrdPhnno(orderChange.getOrdPhnno().replaceAll("(\\d{3})(\\d{3,4})(\\d{4})", "$1-$2-$3"));
+		}
+
+		mav.addObject("ordNo", orderChange.getOrdNo());
+		mav.addObject("ordNm", orderChange.getOrdNm());
+		mav.addObject("ordPhnno", orderChange.getOrdPhnno());
+
 		// 로그인여부 설정
 		mav.addObject("isLogin", false);
 
@@ -994,11 +1180,6 @@ public class TsfNoMemberController extends TsfBaseController {
 		mav.addObject("exchangeDetailList", map);
 		mav.addObject("oneData", oneData);
 
-		// 비회원 정보 설정
-		mav.addObject("ordNo", orderChange.getOrdNo());
-		mav.addObject("ordNm", orderChange.getOrdNm());
-		mav.addObject("ordPhnno", orderChange.getOrdPhnno());
-
 		mav.setViewName(super.getDeviceViewName("mypage/NoMemberCreExchangeDetailForm"));
 
 		return mav;
@@ -1032,4 +1213,79 @@ public class TsfNoMemberController extends TsfBaseController {
 
 		return result;
 	}
+
+	/**
+	 * 마이페이지 주문목록 조회 (모바일)
+	 *
+	 * @param Order
+	 * @return ModelAndView
+	 * @author jsh77b
+	 * @since 2021. 04. 19
+	 */
+	@ResponseBody
+	@PostMapping("/order/listInfo")
+	public ModelAndView getOrderListInfo(@RequestBody Order order) {
+
+		// 주문목록조회
+		ModelAndView mav = new ModelAndView();
+
+		// 페이징 처리 설정
+		TscPageRequest pageable = new TscPageRequest((order.getPageNo() > 0 ? order.getPageNo() - 1 : 0), order.getPageSize(), order.getPageUnit());
+		int totalCnt = orderService.getPagingOrdNoListCount(order);
+		pageable.setTotalCount(totalCnt);
+		order.setPageable(pageable);
+
+		// 페이징 처리 및 주문정보 조회
+		List<Integer> ordNoList = new ArrayList<>();
+
+		for (Order tmpOrder : orderService.getPagingOrdNoList(order)) {
+			ordNoList.add(tmpOrder.getOrdNo());
+		}
+
+		if (ordNoList.size() > 0) {
+			order.setOrdNoList(ordNoList.stream().mapToInt(Integer::intValue).toArray());
+		}
+
+		mav.addObject("orderList", orderService.getOrderListForMypage(order));
+		mav.setViewName(super.getDeviceViewName("mypage/MypageOrderListInfo"));
+
+		return mav;
+	}
+
+	/**
+	 * 마이페이지 취반교 목록 조회
+	 *
+	 * @param OrderChange
+	 * @return ModelAndView
+	 * @author jsh77b
+	 * @since 2021. 02. 18
+	 */
+	@PostMapping("/cre/listInfo")
+	@ResponseBody
+	public ModelAndView getCreListInfo(@RequestBody OrderChange orderChange) {
+		// 주문목록조회
+		ModelAndView mav = new ModelAndView();
+
+		// 페이징 처리 설정
+		TscPageRequest pageable = new TscPageRequest((orderChange.getPageNo() > 0 ? orderChange.getPageNo() - 1 : 0), orderChange.getPageSize(), orderChange.getPageUnit());
+		pageable.setTotalCount(orderChangeService.getPagingCreListCount(orderChange));
+		orderChange.setPageable(pageable);
+
+		// 페이징 처리 및 주문정보 조회
+		List<Integer> ordChgSqList = new ArrayList<>();
+
+		for (OrderChange tmpOrderChange : orderChangeService.getPagingCreList(orderChange)) {
+			ordChgSqList.add(tmpOrderChange.getOrdChgSq());
+		}
+
+		if (ordChgSqList.size() > 0) {
+			orderChange.setOrdChgSqArr(ordChgSqList.stream().mapToInt(Integer::intValue).toArray());
+		}
+
+		mav.addObject("creList", orderChangeService.getCreList(orderChange));
+		mav.addObject("creInfo", orderChange);
+		mav.setViewName(super.getDeviceViewName("mypage/MypageCreListInfo"));
+
+		return mav;
+	}
 }

+ 0 - 4
src/main/java/com/style24/front/support/interceptor/TsfDefaultInterceptor.java

@@ -35,10 +35,6 @@ public class TsfDefaultInterceptor extends HandlerInterceptorAdapter {
 		log.info("request.getRequestURL(): [{}]", request.getRequestURL());
 		log.info("request.getQueryString(): [{}]", request.getQueryString());
 
-		TsfSession.removeAtrribute("noMemberOrdNo");
-		TsfSession.removeAtrribute("noMemberOrdNm");
-		TsfSession.removeAtrribute("noMemberOrdPhnno");
-
 //		// 설정된 HTTPS 페이지 확인 (사이트 전체가 SSL 적용이 되어야 함으로 해당 부분 체크로직 주석 처리)
 //		String requestUrl = request.getRequestURL().toString();
 //		boolean bHttpsPage = this.isHttpsPage(isSslServer, requestUrl, request.getRequestURI());

+ 15 - 3
src/main/java/com/style24/front/support/interceptor/TsfReturnUrlInterceptor.java

@@ -9,13 +9,13 @@ import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.ModelAndView;
 import org.springframework.web.servlet.handler.HandlerInterceptorAdapter;
 
+import com.gagaframework.web.util.GagaCookieUtil;
+import com.gagaframework.web.util.GagaStringUtil;
 import com.style24.front.support.env.TsfConstants;
+import com.style24.front.support.security.session.TsfSession;
 
 import lombok.extern.slf4j.Slf4j;
 
-import com.gagaframework.web.util.GagaCookieUtil;
-import com.gagaframework.web.util.GagaStringUtil;
-
 /**
  * Return URL Interceptor
  * 
@@ -49,6 +49,18 @@ public class TsfReturnUrlInterceptor extends HandlerInterceptorAdapter {
 			GagaCookieUtil.setCookie(response, TsfConstants.CK_PREFIX + "_return_url", returnUrl, -1);
 		}
 
+		log.info("request.isSecure(): [{}]", request.isSecure());
+		log.info("request.getServerName(): [{}]", request.getServerName());
+		log.info("request.getRequestURI(): [{}]", request.getRequestURI());
+		log.info("request.getRequestURL(): [{}]", request.getRequestURL());
+		log.info("request.getQueryString(): [{}]", request.getQueryString());
+
+		if (!request.getRequestURI().contains("/noMember")) {
+			TsfSession.removeAtrribute("noMemberOrdNo");
+			TsfSession.removeAtrribute("noMemberOrdNm");
+			TsfSession.removeAtrribute("noMemberOrdPhnno");
+		}
+
 		return super.preHandle(request, response, handler);
 	}
 

+ 0 - 39
src/main/webapp/WEB-INF/views/mob/common/layout/NoMemberLayoutMob.html

@@ -16,45 +16,6 @@
 
 	<!-- CONTENT AREA -->
 	<th:block layout:fragment="content"></th:block>
-	<!-- 교환상세 -->
-	<form id="exchangeForm" name="exchangeForm" action="#" th:action="@{'/noMember/exchange/form'}" th:method="post">
-		<input type="hidden" name="ordNo" 		th:value ="${ordNo}"/>
-		<input type="hidden" name="ordNm" 		th:value ="${ordNm}"/>
-		<input type="hidden" name="ordPhnno"	th:value ="${ordPhnno}"/>
-		<input type="hidden" name="ordDtlNo"/>
-		<input type="hidden" name="delvFeeCd"/>
-	</form>
-	<!-- //교환상세 -->
-
-	<!-- 반품상세 -->
-	<form id="returnForm" name="returnForm" action="#" th:action="@{'/noMember/return/form'}" th:method="post">
-		<input type="hidden" name="ordNo" 		th:value ="${ordNo}"/>
-		<input type="hidden" name="ordNm" 		th:value ="${ordNm}"/>
-		<input type="hidden" name="ordPhnno"	th:value ="${ordPhnno}"/>
-		<input type="hidden" name="ordDtlNo"/>
-		<input type="hidden" name="delvFeeCd"/>
-	</form>
-	<!-- //반품상세 -->
-
-	<!-- 취소상세 -->
-	<form id="cancelForm" name="cancelForm" th:action="@{'/noMember/cancel/form'}" th:method="post">
-		<input type="hidden" name="ordNo" 		th:value ="${ordNo}"/>
-		<input type="hidden" name="ordNm" 		th:value ="${ordNm}"/>
-		<input type="hidden" name="ordPhnno"	th:value ="${ordPhnno}"/>
-		<input type="hidden" name="ordDtlNo"/>
-		<input type="hidden" name="delvFeeCd"/>
-	</form>
-	<!-- //취소상세 -->
-	<form id="addPaymentForm" name="addPaymentForm" th:action="@{'/noMember/addPaymentForm'}" th:method="post">
-		<input type="hidden" name="ordNo"/>
-		<input type="hidden" name="ordChgSq"/>
-	</form>
-	<form id="deliveryInfoForm" name="deliveryInfoForm" th:action="@{'/noMember/delivery/info/form'}" th:method="post">
-		<input type="hidden" name="ordNo"/>
-		<input type="hidden" name="ordDtlNo"/>
-		<input type="hidden" name="shipCompCd"/>
-		<input type="hidden" name="invoiceNo"/>
-	</form>
 	<!-- // CONTENT AREA -->
 
 	<!-- Footer -->

+ 12 - 11
src/main/webapp/WEB-INF/views/mob/mypage/MypageCreListFormMob.html

@@ -254,23 +254,24 @@ var fnSetSearchPeriod = function(period) {
 
 // 취반교 상세 페이지 이동
 var fnGoToCreDetail = function(param) {
+	let ordNo = $(param).attr('ordNo');
 	let ordChgSq = $(param).attr('ordChgSq');
 	let chgGb = $(param).attr('chgGb');
-	let ordNo = $(param).attr('ordNo');
-	
+	let url = '';
+
 	if (chgGb == 'G680_20') {
-		$('#cancelForm input[name=ordChgSq]').val(ordChgSq);
-		$('#cancelForm input[name=ordNo]').val(ordNo);
-		document.cancelForm.submit();
+		url = '/mypage/cre/cancel/detail/form';
 	} else if (chgGb == 'G680_30') {
-		$('#returnForm input[name=ordChgSq]').val(ordChgSq);
-		$('#returnForm input[name=ordNo]').val(ordNo);
-		document.returnForm.submit();
+		url = '/mypage/cre/return/detail/form';
 	} else if (chgGb == 'G680_40') {
-		$('#exchangeForm input[name=ordChgSq]').val(ordChgSq);
-		$('#exchangeForm input[name=ordNo]').val(ordNo);
-		document.exchangeForm.submit();
+		url = '/mypage/cre/exchange/detail/form';
 	}
+
+	// 반품/취소/교환 상세페이지 이동
+	url += '?ordChgSq=' + ordChgSq;
+	url += '&ordNo=' + ordNo;
+
+	cfnGoToPage(_frontUrl + url);
 }
 
 // 취반교 배송조회 버튼 클릭 이벤트

+ 313 - 0
src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreListFormMob.html

@@ -0,0 +1,313 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="mob/common/layout/MypageLayoutMob">
+<!--
+ *******************************************************************************
+ * @source  : NoMemberCreListFormMob.html
+ * @desc    : 비회원 > 취소/반품/교환내역 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.04.26   jsh77b     최초 작성
+ *******************************************************************************
+ -->
+<body>
+<th:block layout:fragment="content">
+
+<!-- 취소/반품/교환목록조회 -->
+<form id="searchForm" name="searchForm" th:action="@{'/mypage/cre/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="chgStat" 	value="" />
+	<input type="hidden" name="stDate" 		value="" />
+	<input type="hidden" name="edDate" 		value="" />
+	<input type="hidden" name="ordNo" 		th:value ="${ordNo}"/>
+	<input type="hidden" name="ordNm" 		th:value ="${ordNm}"/>
+	<input type="hidden" name="ordPhnno"	th:value ="${ordPhnno}"/>
+</form>
+
+<main role="" id="" class="container my">
+	<section class="content my_order"> <!-- 210409_수정 : class my_return 변경 -->
+		<div class="inner">
+			<div class="order_sort">
+				<a href="javascript:void(0);" class="od_date_btn">최근 3개월</a>
+				<a href="javascript:void(0);" class="od_status_btn">전체상태</a>
+			</div>
+		</div>
+		
+		<!-- common 주문목록 -->
+		<div data-id="layer_infinite_item" >
+			<section id="infiniteContainer">
+				<div id="listBoxOuter">
+					<div class="area_list" id="listBox">
+					</div>
+				</div>
+			</section>
+ 		</div>
+ 		<!-- common 주문목록 -->
+ 		
+	</section>
+</main>
+
+<!-- 기간 선택 팝업 -->
+<div id="odDatePop" class="popup_box odDatePop">
+	<div class="lap">
+		<div class="popup_close">카테고리닫기</div>
+		<div class="popup_head sr-only">
+			<h2 class="">기간 선택 팝업</h2>
+		</div>
+		<div class="popup_con">
+			<div class="button_list clear">
+				<button type="button" onclick="fnSetSearchPeriod(1);" period="1"><span>최근 1개월</span></button>
+				<button type="button" onclick="fnSetSearchPeriod(3);" period="3"><span>최근 3개월</span></button>
+				<button type="button" onclick="fnSetSearchPeriod(6);" period="6"><span>최근 6개월</span></button>
+				<button type="button" onclick="fnSetSearchPeriod(9);" period="9"><span>최근 9개월</span></button>
+				<button type="button" onclick="fnSetSearchPeriod(12);" period="12"><span>최근 12개월</span></button>
+			</div>
+		</div>
+	</div>
+</div>
+<!-- //기간 선택 팝업 -->
+
+<!-- 주문상태 선택 팝업 -->
+<div id="odStatusPop" class="popup_box odStatusPop">
+	<div class="lap">
+		<div class="popup_close">카테고리닫기</div>
+		<div class="popup_head sr-only">
+			<h2 class="">주문상태 선택 팝업</h2>
+		</div>
+		<div class="popup_con">
+			<div class="button_list clear">
+				<button type="button" class="ordDtlStat on"><span>전체상태</span></button>
+				<th:block th:each="oneData, status : ${chgStatList}">
+					<button type="button" class="ordDtlStat" th:code="${oneData.cd}">
+						<span th:text="${oneData.cdNm}"></span>
+					</button>
+				</th:block>
+			</div>
+		</div>
+	</div>
+</div>		
+<!-- //주문상태 선택 팝업 -->
+
+<script th:inline="javascript">
+//AJAX 로드를 위한 변수 설정
+let ordNo			= [[${ordNo}]];
+let ordNm			= [[${ordNm}]];
+let ordPhnno		= [[${ordPhnno}]];
+let totalCnt 	= [[${totalCnt}]];
+
+/*<![CDATA[*/
+$(document).ready(function() {
+	// 타이틀명
+	$('#htopTitle').text('취소/반품/교환내역');
+
+	jsonObj = {
+		"pageNo" 			: 0
+		, "pageSize" 		: 5
+		, "pageUnit" 		: 10
+		, "chgStat" 		: ""
+		, "stDate" 			: ""
+		, "edDate" 			: ""
+		, "ordNo"			: ordNo
+		, "ordNm"			: ordNm
+		, "ordPhnno"		: ordPhnno
+	}
+	
+	// AJAX 변수 설정
+	jsonData = JSON.stringify(jsonObj);
+	
+	// 전체페이지 구하기
+	totalPage 	= parseInt(totalCnt / 10);
+	remainList 	= totalCnt % 10; 
+	
+	// 나머지가 있으면 전체 페이지 + 1
+	if (remainList > 0) {
+		totalPage = totalPage + 1;
+	}
+	
+	fnSetSearchPeriod(3);
+	
+	var win = $(window);
+	 
+	// Each time the user scrolls
+	win.scroll(function() {
+		// End of the document reached?
+		if ($(document).height() - win.height() == win.scrollTop()) {
+			if (scrollTemp) {
+				var tempPage 	= parseInt($("#searchForm input[name=pageNo]").val());
+				tempPage 		= tempPage + 1;
+				
+				if (totalPage > tempPage) {
+					scrollTemp = false;
+					fnGetInfiniteScrollDataList(tempPage);
+				}
+			}
+		}
+	});
+	
+	// 주문상세상태코드 셀렉트박스 변경 이벤트
+	$('#odStatusPop .popup_con .button_list .ordDtlStat').on('click', function() {
+		let code = $(this).attr('code');
+		$('#searchForm input[name=chgStat]').val(code);
+		jsonObj.chgStat = code;
+
+		$("#odStatusPop .popup_con button").removeClass("on");
+
+		// 기간설정
+		$("#odStatusPop .popup_con button").each(function() {
+			var tempCode = $(this).attr("code");
+			if (tempCode == code) {
+				$(this).addClass("on");
+
+				// 상태값 명칭
+				var ordDtlStatNm = $(this).find("span").text();
+				$(".container .my_order .od_status_btn").text(ordDtlStatNm);
+			}
+		});
+		
+		// 리헷
+		$("#listBox").html("");
+		
+		// 초기화설정
+		fnGetInfiniteScrollDataList(0);
+
+		// 팝업 닫기
+		$(".popup_close").trigger("click");
+	});
+});
+
+//취소,반품,교환목록조회
+var fnGetInfiniteScrollDataList = function(pageNo) {
+
+	// 페이지번호가 없으면 1페이지 설정
+	if (pageNo == null) {
+		pageNo = 1;
+	}
+	
+	// 페이지설정
+	$("#searchForm input[name=pageNo]").val(pageNo);
+	
+	jsonObj.pageNo = pageNo;
+	jsonObj.stDate = $("#searchForm input[name=stDate]").val();
+	jsonObj.edDate = $("#searchForm input[name=edDate]").val();
+	
+	$.ajax( {
+		type		: "POST",
+		url 		: '/noMember/cre/listInfo',
+		data		: JSON.stringify(jsonObj),
+		dataType 	: 'html',
+		beforeSend : function(xhr, settings) {
+			xhr.setRequestHeader("AJAX"			, "true");
+			xhr.setRequestHeader('Accept'		, 'application/json');
+			xhr.setRequestHeader('Content-Type'	, 'application/json');
+		},
+		success 	: function(result) {
+			if (result != null) {
+				$("#listBox").css("display", "block");
+				$("#listBox").append(result);
+				
+				scrollTemp = true;
+				
+			}
+		}
+	});
+}
+
+//검색기간 버튼 클릭 이벤트 처리
+var fnSetSearchPeriod = function(period) {
+	let date 		= new Date();
+	let edDate 		= date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + ('0' + (date.getDate() + 1)).slice(-2);
+	date.setMonth(date.getMonth() - period);
+	let stDate 		= date.getFullYear() + '-' + ('0' + (date.getMonth() + 1)).slice(-2) + '-' + ('0' + (date.getDate() + 1)).slice(-2);
+
+	$('#searchForm input[name=edDate]').val(edDate);
+	$('#searchForm input[name=stDate]').val(stDate);
+	
+	// 리헷
+	$("#listBox").html("");
+	
+	// 초기화설정
+	fnGetInfiniteScrollDataList(0);
+	
+	$("#odDatePop .popup_con button").removeClass("on");
+	
+	// 기간설정
+	$("#odDatePop .popup_con button").each(function() {
+		var tempPeriod = $(this).attr("period");
+		if (tempPeriod == period) {
+			$(this).addClass("on");
+			
+			// 텍스트설정
+			var periodStr = $(this).find("span").text();
+			$(".container .my_order .od_date_btn").text(periodStr);
+		}
+	});
+
+	// 팝업 닫기
+	$(".popup_close").trigger("click");
+}
+
+// 취반교 상세 페이지 이동
+var fnGoToCreDetail = function(param) {
+	let ordChgSq = $(param).attr('ordChgSq');
+	let chgGb = $(param).attr('chgGb');
+	let url = '';
+
+	if (chgGb == 'G680_20') {
+		url = '/noMember/cre/cancel/detail/form';
+	} else if (chgGb == 'G680_30') {
+		url = '/noMember/cre/return/detail/form';
+	} else if (chgGb == 'G680_40') {
+		url = '/noMember/cre/exchange/detail/form';
+	}
+
+	// 반품/취소/교환 상세페이지 이동
+	url += '?ordChgSq=' + ordChgSq;
+
+	cfnGoToPage(_frontUrl + url);
+}
+
+// 취반교 배송조회 버튼 클릭 이벤트
+var fnGoToDeliveryTrack = function(param) {
+	let ordDtlNo = $(param).attr('ordDtlNo');
+	// TODO
+	// 최반교 배송조회 페이지 이동 처리
+}
+/*]]>*/
+</script>
+
+<script>
+	$(document).ready(function(){
+		$(document).on('click','.popup_box .button_list button',function(){
+			$('.popup_box .button_list button').removeClass('on');
+			$(this).addClass('on');
+		})
+	});
+
+	//기간 선택 팝업
+	$(document).on("click", ".order_sort .od_date_btn", function(){
+		$('#odDatePop').show().addClass("active");
+		$("body").css({"overflow":"hidden"});
+	});
+
+	//주문상태 선택 팝업
+	$(document).on("click", ".order_sort .od_status_btn", function(){
+		$('#odStatusPop').show().addClass("active");
+		$("body").css({"overflow":"hidden"});
+	});
+
+	//팝업_닫기
+	$('.popup_close').on("click",function(){
+		$('.popup_box').hide().removeClass('active');
+		$("body").css({"overflow":"visible"});
+	});
+</script>
+
+</th:block>
+
+</body>
+</html>

+ 250 - 0
src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreListInfoMob.html

@@ -0,0 +1,250 @@
+<div class="inner">
+	<div class="part_goods">
+		<!-- 취소,반품,교환목록 있을때 -->
+		<th:block th:if="${#lists.size(creList) > 0}">
+			<!-- 취소,반품,교환목록 -->
+			<th:block th:each="creList , i : ${creList}">
+				<div class="goods_top">
+					<div class="goods_date">주문일<span class="date" th:text="${creList.ordDt}"></span></div>
+					<a href="javascript:void(0);" th:ordChgSq="${creList.ordChgSq}" th:chgGb="${creList.oneData.chgGb}" th:ordNo="${creList.oneData.ordNo}" onclick="fnGoToCreDetail(this);" class="detail_btn">상세보기</a>
+				</div>
+				
+				<th:block th:each="cre , i : ${creList.creList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+					<div class="goods_section">
+						<div class="goods_status">
+							<p class="dlvr_staus" th:text="${cre.chgStatNm}"></p>
+							<p class="dlvr_desc"><th:block th:text="|${cre.chgDate} ${cre.chgTime}|"></p>
+						</div>
+						<div class="goods_detail">
+							<a href="javascript:void(0);">
+								<div class="thumb_box">
+									<img th:src="${imageUrl + '/' + cre.sysImgNm + '?RS=90'}" width="100%" alt="">
+								</div>
+								<div class="info_box">
+									<div class="od_name">
+										<div class="brand">
+											<span th:text="${cre.brandNm}"></span>
+											<div class="badge_wrap">
+												<th:block th:if="${cre.shotDelvYn} == 'Y'">
+													<em class="order_badge">STYLE24 일반배송</em>
+												</th:block>
+												<th:block th:if="${cre.selfGoodsYn} == 'Y' and ${cre.shotDelvYn} == 'N'">
+													<em class="order_badge order_bullet_badge">총알배송</em>
+												</th:block>
+												<th:block th:if="${cre.selfGoodsYn} == 'N' and ${cre.shotDelvYn} == 'N'">
+													<em class="order_badge order_bullet_badge">업체직배송</em>
+												</th:block>
+											</div>
+										</div>
+										<div class="name" th:text="${cre.goodsNm}"></div>
+									</div>
+									<div class="od_opt">
+										<!-- 세트상품일때 -->
+										<th:block th:if="${cre.goodsType} == 'G056_S'">
+											<th:block th:each="option , index2 , ${cre.colorNmArr}">
+												<div class="option">
+													<em th:text="${option]}"></em>
+													<em th:text="${cre.optCd2Arr[index2]}"></em>
+												</div>
+											</th:block>
+										</th:block>
+										<!-- //세트상품일때 -->
+										<!-- 단품상품일때 -->
+										<th:block th:unless="${cre.goodsType} == 'G056_S'">
+											<div class="option">
+												<em th:text="${cre.colorNm}"></em>
+												<em th:text="${cre.optCd2}"></em>
+											</div>
+										</th:block>
+										<!-- //단품상품일때 -->
+									</div>
+									
+									<!-- 교환일때 -->
+									<th:block th:if="${cre.chgGb} == 'G680_40'">
+										<div class="od_exchange_opt">
+											<span>교환옵션</span>
+											<th:block th:each="exchange , index : ${creList.exchangeOptionList}">
+												<th:block th:if="${cre.chgOrdDtlNo} == ${exchange.ordDtlNo}">
+													<!-- 세트상품일때 -->
+													<th:block th:if="${cre.goodsType} == 'G056_S'">
+														<th:block th:each-="option, index2, ${exchange.colorNmArr}">
+															<div class="option">
+																<em th:text="${exchange.itemNmArr[index2]}"></em>
+																<em th:text="${exchange.optCd2Arr[index2]}"></em>
+															</div>
+														</th:block>
+													</th:block>
+													<!-- //세트상품일때 -->
+													<!-- 일반상품일때 -->
+													<th:block th:unless="${cre.goodsType} == 'G056_S'">
+														<div class="option">
+															<em th:text="${exchange.colorNm}"></em>
+															<em th:text="${exchange.optCd2}"></em>
+														</div>
+													</th:block>
+													<!-- //일반상품일때 -->
+												</th:block>
+											</th:block>
+										</div>
+									</th:block>
+									<!-- //교환일때 -->
+									
+									<div class="od_calc">
+										<p class="price">
+											<span class="count"><em th:text="${cre.chgQty}"></em>개</span>
+										</p>
+									</div>
+								</div>
+							</a>
+						</div>
+						<!-- 취소,반품,교환 상태별 버튼기능정의 -->
+						<div class="goods_btn_wrap btn_group_flex">
+							<!-- 신청취소 -->
+<!--							<th:block th:if="${cre.chgStat} == 'G685_20' or ${cre.chgStat} == 'G685_21' or ${cre.chgStat} == 'G685_50' or ${cre.chgStat} == 'G685_51'">-->
+<!--								<div>-->
+<!--									<button type="button" class="btn btn_default" th:ordNo="${cre.ordNo}" th:ordChgSq="${cre.ordChgSq}" th:cancelGb="${cre.chgGb}" onclick="fnCreCancel(this);">-->
+<!--										<span>신청취소</span>-->
+<!--									</button>-->
+<!--								</div>-->
+<!--							</th:block>-->
+							<!-- //신청취소 -->
+							<!-- 결제하기 -->
+							<th:block th:if="${cre.chgStat} == 'G685_21' or ${cre.chgStat} == 'G685_51' or ${cre.chgStat} == 'G685_32'">
+								<div>
+									<button type="button" class="btn btn_default" th:ordNo="${cre.ordNo}" th:ordChgSq="${cre.ordChgSq}" onclick="fnCrePayAddCost(this);">
+										<span>결재하기</span>
+									</button>
+								</div>
+							</th:block>
+							<!-- //결제하기 -->
+							<!-- 배송조회 -->
+							<th:block th:if="${cre.chgStat} == 'G685_40'">
+								<th:block th:each="exchange, index , ${creList.exchangeOptionList}">
+									<th:block th:if="${cre.chgOrdDtlNo} == ${exchange.ordDtlNo} and (${exchange.ordDtlStat} == 'G013_20' or ${exchange.ordDtlStat} == 'G013_30' or ${exchange.ordDtlStat} == 'G013_35' or ${exchange.ordDtlStat} == 'G013_40' or ${exchange.ordDtlStat} == 'G013_50')">
+										<div>
+											<button type="button" class="btn btn_default" th:ordDtlNo="${cre.ordDtlNo}" onclick="fnGoToDeliveryTrack(this);">
+												<span>배송조회</span>
+											</button>
+										</div>
+									</th:block>
+								</th:block>
+							</th:block>
+							<!-- //배송조회 -->
+						</div>
+						<!-- //취소,반품,교환 상태별 버튼기능정의 -->
+						
+						<!-- 취소,반품,교환 상태별 문구정의 -->
+						<!-- 교환접수 -->
+						<th:block th:if="${cre.chgStat} == 'G685_20'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">교환 신청이 접수 되었습니다.<br>신속하게 처리하여 드리겠습니다.</p>
+							</div>
+						</th:block>
+						<!-- //교환접수 -->
+						<!-- 회수요청 -->
+						<th:block th:if="${cre.chgStat} == 'G685_30'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p></p>
+							</div>
+						</th:block>
+						<!-- //회수요청 -->
+						<!-- 상품검수중(교환) -->
+						<th:block th:if="${cre.chgStat} == 'G685_31' and ${cre.chgGb} == 'G680_40'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">고객님이 교환하신 상품을 검수 중에 있습니다.</p>
+							</div>
+						</th:block>
+						<!-- //상품검수중(교환) -->
+						<!-- 결제대기(교환) -->
+						<th:block th:if="${cre.chgStat} == 'G685_32' and ${cre.chgGb} == 'G680_40'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')} 원 결제 후 교환 가능합니다.|"></p>
+							</div>
+						</th:block>
+						<!-- //결제대기(교환) -->
+						<!-- 교환완료 -->
+						<th:block th:if="${cre.chgStat} == 'G680_40'">
+							<th:block th:each="exchange, index , ${creList.exchangeOptionList}">
+								<th:block th:if="${cre.chgOrdDtlNo} == ${exchange.ordDtlNo} and (${exchange.ordDtlStat} == 'G013_60' or ${exchange.ordDtlStat} == 'G013_70')">
+									<div class="goods_txt">
+										<p class="cf_txt cf_desc">교환이 완료되었습니다.</p>
+									</div>
+								</th:block>
+							</th:block>
+						</th:block>
+						<!-- //교환완료 -->
+						<!-- 교환철회 -->
+						<th:block th:if="${cre.chgStat} == 'G685_49'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">요청하신 교환을 취소하였습니다.</p>
+							</div>
+						</th:block>
+						<!-- //교환철회 -->
+						
+						<!-- 반품접수 -->
+						<th:block th:if="${cre.chgStat} == 'G685_50'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">반품 신청이 접수 되었습니다.<br>신속하게 처리하여 드리겠습니다.</p>
+							</div>
+						</th:block>
+						<!-- //반품접수 -->
+						<!-- 반품대기 -->
+						<th:block th:if="${cre.chgStat} == 'G685_51'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')} 원 결제 후 반품 가능합니다.|"></p>
+							</div>
+						</th:block>
+						<!-- //반품대기 -->
+						<!-- 상품검수중(반품) -->
+						<th:block th:if="${cre.chgStat} == 'G685_31' AND ${cre.chgGb} == 'G680_30'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">고객님이 반품하신 상품을 검수 중에 있습니다.</p>
+							</div>
+						</th:block>
+						<!-- //상품검수중(반품) -->	
+						<!-- 결제대기(반품) -->
+						<th:block th:if="${cre.chgStat} == 'G685_32' AND ${cre.chgGb} == 'G680_30'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')} 원 결제 후 반품 가능합니다.|"></p>
+							</div>
+						</th:block>
+						<!-- //결제대기(반품) -->
+						<!-- 환불진행중 -->
+						<th:block th:if="${cre.chgStat} == 'G685_33'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')} 원 환불을 진행하고 있습니다.(영업일 최대 3일 내 환불 예정)|"></p>
+							</div>
+						</th:block>
+						<!-- //환불진행중 -->
+						<!-- 반품완료 -->
+						<th:block th:if="${cre.chgStat} == 'G685_60'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">반품이 완료되었습니다.</p>
+							</div>
+						</th:block>
+						<!-- //반품완료 -->
+						<!-- 반품철회 -->
+						<th:block th:if="${cre.chgStat} == 'G685_69'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">요청하신 반품을 취소하였습니다.</p>
+							</div>
+						</th:block>
+						<!-- //반품철회 -->
+						<!-- //취소,반품,교환 상태별 문구정의 -->
+					</div>
+				</th:block>
+			</th:block>
+		</th:block>
+		<!-- //취소,반품,교환목록 있을때 -->
+		<!-- 취소,반품,교환목록 없을때 -->
+		<th:block th:if="${#lists.size(creList) < 1}">
+			<div class="nodata">
+				<div class="txt_box">
+					<p>취소/반품/교환내역이 없습니다.<br/></p>
+				</div>
+			</div>
+		</th:block>
+		<!-- //취소,반품,교환목록 없을때 -->
+	</div>
+</div>
+

+ 46 - 149
src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderListFormMob.html

@@ -32,30 +32,27 @@
 <!-- //주문목록조회 -->
 
 <main role="" id="" class="container my">
-	<section class="content my">
+	<section class="content my_order">
 		<!-- page nav -->
 		<nav class="pnb">
 			<ul>
 				<li>
-					<a href="" class="on">주문확인/배송조회</a>
+					<a href="javascript:void(0)" class="on" onclick="cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);">주문확인/배송조회</a>
 				</li>
 				<li>
-					<a href="my_return_non.html">취소/반품/교환내역</a>
+					<a href="javascript:void(0)" onclick="cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);">취소/반품/교환내역</a>
 				</li>
 			</ul>
 		</nav>
+		<!-- //page nav -->
 
-		<!-- only 주문목록 -->
-		<th:block th:if="${mypageMainYn} == 'N'">
-			<div class="inner">
-				<div class="order_sort">
-					<a href="javascript:void(0);" class="od_date_btn">최근 3개월</a>
-					<a href="javascript:void(0);" class="od_status_btn">전체상태</a>
-				</div>
+		<div class="inner">
+			<div class="order_sort">
+				<a href="javascript:void(0);" class="od_date_btn">최근 3개월</a>
+				<a href="javascript:void(0);" class="od_status_btn">전체상태</a>
 			</div>
-		</th:block>
-		<!-- only 주문목록 -->
-		
+		</div>
+
 		<!-- common 주문목록 -->
 		<div data-id="layer_infinite_item" >
 			<section id="infiniteContainer">
@@ -66,29 +63,6 @@
 			</section>
  		</div>
  		<!-- common 주문목록 -->
- 		
- 		<!-- only 마이페이지메인 -->
- 		<th:block th:if="${mypageMainYn} == 'Y'">
-	 		<div class="inner wide">
-				<div class="lnb_list">
-					<ul>
-						<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);">주문확인/배송조회</a></li>
-						<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MYPAGE_CRE_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);">STYLE 포인트</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>
-		</th:block>
-		<!-- //only 마이페이지메인 -->
- 		
 	</section>
 </main>
 
@@ -131,21 +105,16 @@
 	</div>
 </div>
 <!-- //주문상태 선택 팝업 -->
-
-<!-- <script src="/ux/plugins/jquery/jquery.history.min.js"></script> -->
-<!-- <script src="/ux/plugins/gaga/gaga.infinite.scrollLayer.js"></script> -->
-<!-- <script src="/ux/plugins/gaga/gaga.paging.js"></script> -->
-
 <script th:inline="javascript">
 // 변수설정
-var custNo 			= [[${customerInfo.custNo}]];
+let ordNo			= [[${ordNo}]];
+let ordNm			= [[${ordNm}]];
+let ordPhnno		= [[${ordPhnno}]];
 var totalCnt		= [[${totalCnt}]];
 var totalPage		= 0;
 var remainList		= 0;
 var jsonObj 		= {};
 var scrollTemp		= true;
-var mypageMainYn	= [[${mypageMainYn}]];
-let customerInfo 	= [[${customerInfo}]];
 
 // 초기설정
 $(document).ready(function() {
@@ -153,6 +122,9 @@ $(document).ready(function() {
 	// 인피니티스크롤 초기화
 	//fnGoodsReviewInfiniteScrollInit();
 
+	// 타이틀명
+	$('#htopTitle').text('마이페이지');
+
 	// AJAX 로드를 위한 변수 설정
 	jsonObj = {
 		"pageNo" 			: 0
@@ -161,56 +133,43 @@ $(document).ready(function() {
 		, "ordDtlStat" 		: ""
 		, "stDate" 			: ""
 		, "edDate" 			: ""
-		, "custNo"			: custNo
+		, "ordNo"			: ordNo
+		, "ordNm"			: ordNm
+		, "ordPhnno"		: ordPhnno
 	}
 	
 	// AJAX 변수 설정
 	jsonData = JSON.stringify(jsonObj);
-	
-	// 마이페이지 메인화면일때 초기 1개월 조회
-	if (mypageMainYn == 'Y') {
-		// 타이틀명
-		$('#htopTitle').text('마이페이지');
 
-		jsonObj.pageSize = 1;
-		jsonObj.pageUnit = 1;
-		fnSetSearchPeriod(1);
+	// 전체페이지 구하기
+	totalPage 	= parseInt(totalCnt / 10);
+	remainList 	= totalCnt % 10;
+
+	// 나머지가 있으면 전체 페이지 + 1
+	if (remainList > 0) {
+		totalPage = totalPage + 1;
 	}
-	// 마이페이지 주문목록화면일때
-	else {
-		// 타이틀명
-		$('#htopTitle').text('주문확인/배송조회');
 
-		// 전체페이지 구하기
-		totalPage 	= parseInt(totalCnt / 10);
-		remainList 	= totalCnt % 10; 
-		
-		// 나머지가 있으면 전체 페이지 + 1
-		if (remainList > 0) {
-			totalPage = totalPage + 1;
-		}
-		
-		fnSetSearchPeriod(3);
-		
-		var win = $(window);
-		 
-		// Each time the user scrolls
-		win.scroll(function() {
-			// End of the document reached?
-			if ($(document).height() - win.height() == win.scrollTop()) {
-				if (scrollTemp) {
-					var tempPage 	= parseInt($("#searchForm input[name=pageNo]").val());
-					tempPage 		= tempPage + 1;
-					
-					if (totalPage > tempPage) {
-						scrollTemp = false;
-						fnGetInfiniteScrollDataList(tempPage);
-					}
+	fnSetSearchPeriod(3);
+
+	var win = $(window);
+
+	// Each time the user scrolls
+	win.scroll(function() {
+		// End of the document reached?
+		if ($(document).height() - win.height() == win.scrollTop()) {
+			if (scrollTemp) {
+				var tempPage 	= parseInt($("#searchForm input[name=pageNo]").val());
+				tempPage 		= tempPage + 1;
+
+				if (totalPage > tempPage) {
+					scrollTemp = false;
+					fnGetInfiniteScrollDataList(tempPage);
 				}
 			}
-		});
-	}
-	
+		}
+	});
+
 	// 주문상세상태코드 셀렉트박스 변경 이벤트
 	$('#odStatusPop .popup_con .button_list .ordDtlStat').on('click', function() {
 		$('#searchForm input[name=ordDtlStat]').val($(this).attr('code'));
@@ -229,11 +188,6 @@ $(document).ready(function() {
 		// 팝업닫기
 		$(".popup_close").trigger("click");
 	});
-
-	// GNB Background Color 변경
-	if (mypageMainYn == 'Y') {
-		$('#htopSub').addClass('my_main');
-	}
 });
 
 // 주문 목록 조회
@@ -253,7 +207,7 @@ var fnGetInfiniteScrollDataList = function(pageNo) {
 	
 	$.ajax( {
 		type		: "POST",
-		url 		: '/mypage/order/listInfo',
+		url 		: '/noMember/order/listInfo',
 		data		: JSON.stringify(jsonObj),
 		dataType 	: 'html',
 		beforeSend : function(xhr, settings) {
@@ -270,13 +224,9 @@ var fnGetInfiniteScrollDataList = function(pageNo) {
 				// 인피니티 스크롤 기억기능
 				//gagaInfiniteScroll.draw(result);
 				//gagaInfiniteScroll.draw('not');
-				
 			}
 		}
 	});
-	
-	//$("#searchForm input[name=pageNo]").val(pageNo+1);
-	//gagajf.ajaxFormSubmit("/mypage/order/listInfo2", document.searchForm,  gagaInfiniteScroll.jsonToHtml);
 }
 
 //검색기간 버튼 클릭 이벤트 처리
@@ -310,7 +260,7 @@ var fnSetSearchPeriod = function(period) {
 	});
 
 	// 팝업닫기
-		$(".popup_close").trigger("click");
+	$(".popup_close").trigger("click");
 }
 
 // 2021.04.21 인피니티 스크롤 기능 구현전 추후 수정
@@ -371,59 +321,6 @@ $(function() { gagaInfiniteScroll.getHistory(); });
 		$('.popup_box').hide().removeClass('active');
 		$("body").css({"overflow":"visible"});
 	});
-
-	/* 210409_추가 : alert 모음 */
-	$(document).on("click", "#btn_purchase_confirm", function(){
-		mcxDialog.confirm("구매확정 후에는 반품/교환이 불가합니다. 구매확정하시겠습니까?", {
-			cancelBtnText: "취소",
-			sureBtnText: "확인",  // Confirmation button text
-			sureBtnClick: function() {  // Confirm button click callback
-				alert("9,999P가 적립되었습니다.");
-			}
-		});
-	});
-
-	$(document).on("click", "#btn_sms_alert", function(){
-		mcxDialog.alert("SMS로 선물내역을 다시 전송하였습니다.", { 
-				//alert("선물하기 SMS를 조금 전 다시 발송하였습니다. 잠시 후 다시 시도해주세요."); : SMS 발송한지 10분이 지나지 않았을 경우
-			sureBtnText: "닫기",  
-		});
-	});
-	/* //210409_추가 : alert 모음 */
-	
-	// 등급쿠폰 다운 클릭 이벤트
-	var fnDownloadCoupon = function() {
-		let url = '/mypage/coupon/download/all';
-
-		let data = {};
-		data.custNo = customerInfo.custNo;
-
-		let jsonData = JSON.stringify(data);
-
-		gagajf.ajaxJsonSubmit(url, jsonData, function() {
-			fnReloadCouponCount();
-		});
-	}
-	
-	// 보유쿠폰 수량 업데이트 처리
-	var fnReloadCouponCount = function() {
-		let url = '/mypage/coupon/count';
-		
-		let data = {};
-		data.custNo = customerInfo.custNo;
-		
-		let jsonData = JSON.stringify(data);
-		
-		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-			$('#couponCnt').text(result.couponCnt);
-			$('#expiredSoonCouponCnt').text(result.expiredSoonCouponCnt);
-		});
-	}
-
-	// 등급혜택 보기 클릭 이벤트
-	var fnGoToCustomerBenefit = function() {
-		cfnGoToPage(_PAGE_CUSTOMER_GRADE_BENEFIT);
-	}
 </script>
 </th:block>
 </body>

+ 287 - 0
src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderListInfoMob.html

@@ -0,0 +1,287 @@
+<div class="inner">
+	<div class="part_goods">
+		<!-- 주문목록이 있을때 -->
+		<th:block th:if="${#lists.size(orderList) > 0}">
+			<th:block th:each="order , i : ${orderList}">
+				<div class="goods_top">
+					<div class="goods_date">주문일<span class="date" th:text="${order.ordDt}"></span></div>
+					<a href="javascript:void(0);" class="detail_btn" th:ordno="${order.ordNo}" onclick="fnGoToOrderDetail(this)">주문상세보기</a>
+				</div>
+				
+				<!-- 주문목록 -->
+				<th:block th:each="ordDtl , j : ${order.ordDtlList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+					<!-- 주문 접수 -->
+					<div class="goods_section">
+						<div class="goods_status">
+							<!-- 일반배송일때 -->
+							<th:block th:if="${ordDtl.giftPackYn} == 'N'">
+								<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_10'}">주문접수</p>
+								<p class="dlvr_staus" th:unless="${ordDtl.ordDtlStat == 'G013_10'}" th:text="${ordDtl.ordDtlStatNm}"></p>
+							</th:block>
+							<!-- //일반배송일때 -->
+						</div>
+						<div class="goods_detail">
+							<a href="javascript:void(0)" th:attr="goodsCd=${ordDtl.goodsCd}" onclick="fnGoToGoodsDetail(this)">
+								<div class="thumb_box">
+									<img th:src="${imageUrl + '/' + ordDtl.sysImgNm + '?RS=90'}" width="100%" alt="">
+								</div>
+								<div class="info_box">
+									<div class="od_name">
+										<div class="brand">
+											<span th:text="${ordDtl.brandNm}"></span>
+											<div class="badge_wrap">
+												<th:block th:if="${ordDtl.shotDelvYn} == 'Y'">
+													<em class="order_badge order_bullet_badge">총알배송</em>
+												</th:block>
+												<th:block th:if="${ordDtl.shotDelvYn == 'N' and ordDtl.selfGoodsYn == 'Y'}">
+													<em class="order_badge">STYLE24 일반배송</em>
+												</th:block>
+												<th:block th:if="${ordDtl.shotDelvYn} != 'Y' and ${ordDtl.selfGoodsYn} != 'Y'">
+													<em class="order_badge">업체직배송</em>
+												</th:block>
+											</div>
+										</div>
+										<div class="name" th:text="${ordDtl.goodsNm}"></div>
+									</div>
+									<div class="od_opt">
+										<div class="option" th:each="colorNm, index : ${ordDtl.colorNmArr}">
+											<em th:text="${colorNm}"></em>
+											<em th:text="${ordDtl.optCd2Arr[index.index]}"></em>
+										</div>
+									</div>
+									<div class="od_calc">
+										<!-- 판매금액과 할인금액이 같으면 표시 안함 -->
+										<th:block th:if="(${ordDtl.ordAmt} - ${ordDtl.cnclRtnAmt}) > ${ordDtl.realOrdAmt} + ${ordDtl.pntDcAmt} + ${ordDtl.gfcdUseAmt}">
+											<p class="sale_price">
+												<del>
+													<em th:text="${#numbers.formatInteger(ordDtl.ordAmt - ordDtl.cnclRtnAmt, 1, 'COMMA')}"></em>원
+												</del>
+											</p>
+										</th:block>
+										<p class="price">
+											<span class="selling_price">
+												<em th:text="${#numbers.formatInteger(ordDtl.realOrdAmt + ordDtl.pntDcAmt + ordDtl.gfcdUseAmt, 1, 'COMMA')}"></em>원
+											</span>
+											<span class="count">
+												<em th:text="${ordDtl.ordQty} - ${ordDtl.cnclRtnQty}"></em>개
+											</span>
+										</p>
+									</div>
+								</div>
+							</a>
+						</div>
+						
+						<!-- 버튼기능정리 -->
+						<!-- 일반배송 -->
+						<th:block th:unless="${ordDtl.giftPackYn} == 'Y'">
+							<!-- 입금대기 (1:1문의, 쇼핑백 담기) -->
+							<th:block th:if="${ordDtl.ordDtlStat == 'G013_10'}">
+								<div class="goods_btn_wrap btn_group_flex">
+									<div>
+										<button type="button" class="btn btn_primary btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);">
+											<span>쇼핑백 담기</span>
+										</button>
+									</div>
+								</div>
+							</th:block>
+							<!-- //입금대기 (1:1문의, 쇼핑백 담기) -->
+
+							<!-- 결제완료, 상품준비중, 출고처지정 (주문취소) -->
+							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_20' or ${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
+								<div class="goods_btn_wrap btn_group_flex">
+									<div>
+										<button type="button" class="btn btn_default btn_cncl_complete" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'cancel', 'noMember');">
+											<span>주문 취소</span>
+										</button>
+									</div>
+								</div>
+							</th:block>
+							<!-- //결제완료, 상품준비중, 출고처지정 (주문취소) -->
+							
+							<!-- 배송준비중-->
+							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_40'">
+							</th:block>
+							<!-- //배송준비중-->
+							
+							<!-- 배송중 (교환가능, 반품가능) -->
+							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55'">
+								<!-- 교환가능, 반품가능 -->
+								<th:block th:if="${ordDtl.changeableYn} == 'Y' or ${ordDtl.returnableYn} == 'Y'">
+									<div class="goods_btn_wrap btn_group_flex">
+										<th:block th:if="${ordDtl.changeableYn} == 'Y'">
+											<div>
+												<button type="button" class="btn btn_default btn_exch_req" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'exchange', 'noMember');">
+													<span>교환 신청</span>
+												</button>
+											</div>
+										</th:block>
+										<th:block th:if="${ordDtl.returnableYn} == 'Y'">
+											<div>
+												<button type="button" class="btn btn_default btn_rtn_req" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'return', 'noMember');">
+													<span>반품 신청</span>
+												</button>
+											</div>
+										</th:block>
+										<div><button type="button" class="btn btn_default btn_delv_sch" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, shipCompCd=${ordDtl.shipCompCd}, invoiceNo=${ordDtl.invoiceNo}" onclick="fnGoToDelivery(this, 'noMember');"><span>배송 조회</span></button></div>
+									</div>
+								</th:block>
+								<!-- //교환가능, 반품가능 -->
+							</th:block>
+							<!-- //배송중 (교환가능, 반품가능) -->
+								
+							<!-- 배송완료 (교환가능, 반품가능) -->
+							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_60'">
+								<div class="goods_btn_wrap btn_group_flex" th:if="${ordDtl.changeableYn == 'Y' or ordDtl.returnableYn == 'Y'}">
+									<!-- 교환가능, 반품가능 -->
+									<th:block th:if="${ordDtl.changeableYn} == 'Y'">
+										<div>
+											<button type="button" class="btn btn_default btn_exch_req" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'exchange', 'noMember');">
+												<span>교환 신청</span>
+											</button>
+										</div>
+									</th:block>
+									<th:block th:if="${ordDtl.returnableYn} == 'Y'">
+										<div>
+											<button type="button" class="btn btn_default btn_rtn_req" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:ordCanChgQty="${ordDtl.ordCanChgQty}" th:delvFeeCd="${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'return', 'noMember');">
+												<span>반품 신청</span>
+											</button>
+										</div>
+									</th:block>
+									<!-- //교환가능, 반품가능 -->
+								</div>
+							</th:block>
+							<!-- //배송완료 (교환가능, 반품가능) -->
+							
+							<!-- 구매확정 -->
+							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_70'">
+								<div class="goods_btn_wrap btn_group_flex">
+									<div>
+										<button type="button" class="btn btn_primary btn_cart_save" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnCreateCart(this);">
+											<span>쇼핑백 담기</span>
+										</button>
+									</div>
+								</div>
+							</th:block>
+							<!-- //구매확정 -->
+						</th:block>
+						<!-- //버튼기능정리 -->
+
+						<!-- 상태문구정리 -->
+						<!-- 배송중, 배송완료 상태 교환, 반품 가능 상태 체크 -->
+						<th:block th:if="${ordDtl.ordDtlStat} == 'G013_50' or ${ordDtl.ordDtlStat} == 'G013_55' or ${ordDtl.ordDtlStat} == 'G013_60'">
+							<div class="goods_alert">
+							<!-- 교환불가능, 반품불가능 -->
+							<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'N'">
+								<p class="cf_txt cf_desc">해당 상품은 교환/반품이 불가능한 상품입니다.<br>문의사항은 1:1 문의를 이용해 주세요.</p>
+							</th:block>
+							<!-- //교환불가능, 반품불가능 -->
+
+							<!-- 교환불가능 -->
+							<th:block th:if="${ordDtl.changeableYn} == 'N'">
+								<p class="cf_txt cf_desc">해당 상품은 교환이 불가능한 상품입니다.<br>문의사항은 1:1 문의를 이용해 주세요.</p>
+							</th:block>
+							<!-- //교환불가능 -->
+
+							<!-- 반품불가능 -->
+							<th:block th:if="${ordDtl.returnableYn} == 'N'">
+								<p class="cf_txt cf_desc">해당 상품은 교환이 불가능한 상품입니다.<br>문의사항은 1:1 문의를 이용해 주세요.</p>
+							</th:block>
+							<!-- //반품불가능 -->
+							</div>
+						</th:block>
+						<!-- //배송중, 배송완료 상태 -->
+
+						<!-- 주문접수 -->
+						<th:block th:if="${ordDtl.ordDtlStat} == 'G013_10'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">주문 완료 / 결제를 기다리고 있습니다.</p>
+								<th:block th:if="${ordDtl.delvResDt} != null">
+									<p class="cf_txt cf_desc" th:text="|예약판매 상품으로 ${ordDtl.delvResDt} 출고 예정입니다.|"></p>
+								</th:block>
+							</div>
+						</th:block>
+						<!-- //주문접수 -->
+
+						<!-- 상품준비중 -->
+						<th:block th:if="${ordDtl.ordDtlStat} == 'G013_30'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">배송할 상품을 준비 중입니다.</p>
+								<th:block th:if="${ordDtl.delvResDt} != null">
+									<p class="cf_txt cf_desc" th:text="|예약판매 상품으로 ${ordDtl.delvResDt} 출고 예정입니다.|"></p>
+								</th:block>
+							</div>
+						</th:block>
+						<!-- //상품준비중 -->
+
+						<!-- 배송준비중 -->
+						<th:block th:if="${ordDtl.ordDtlStat} == 'G013_40'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">상품 준비가 완료되어 곧 배송될 예정입니다.</p>
+								<th:block th:if="${ordDtl.delvResDt} != null">
+									<p class="cf_txt cf_desc" th:text="|예약판매 상품으로 ${ordDtl.delvResDt} 출고 예정입니다.|"></p>
+								</th:block>
+							</div>
+						</th:block>
+						<!-- //배송준비중 -->
+
+						<!-- 배송완료 -->
+						<th:block th:if="${ordDtl.ordDtlStat} == 'G013_60'">
+							<div class="goods_txt">
+								<p class="cf_txt cf_desc">15일 후 자동으로 구매확정됩니다.</p>
+							</div>
+						</th:block>
+						<!-- //배송완료 -->
+
+						<!-- 구매확정 -->
+						<th:block th:if="${ordDtl.ordDtlStat} == 'G013_70'">
+						</th:block>
+						<!-- //구매확정 -->
+						<!-- //상태문구정리 -->
+						
+						<!-- 사은품 영역 -->
+						<th:block th:if="${#lists.size(order.ordDtlList) == j.count}">
+							<th:block th:if="${order.freeGiftList != null and #lists.size(order.freeGiftList) > 0}">
+								<div class="goods_gift">
+									<div class="gift_wrap">
+										<div class="title">사은품</div>
+										<div class="li_gift">
+											<ul>
+												<th:block th:each="freeGift , j : ${order.freeGiftList}">
+													<li>
+														<span class="gift_name" th:text="${freeGift.goodsNm}"></span> 
+														<th:block th:if="${freeGift.usePoint} > 0">
+															<span class="deduct_p" th:text="|(-${#numbers.formatInteger(freeGift.usePoint, 1, 'COMMA')}P)|"></span>
+														</th:block>
+													</li>
+												</th:block>
+											</ul>
+										</div>
+									</div>
+								</div>
+							</th:block>
+						</th:block>
+						<!-- //사은품 영역 -->
+					</div>
+					<!-- //주문 접수 -->
+				</th:block>
+				<!-- //주문목록 -->
+			</th:block>
+		</th:block>
+		<!-- //주문목록이 있을때 -->
+		<!-- 주문목록이 없을때 -->
+		<th:block th:if="${#lists.size(orderList) < 1}">
+			<div class="nodata">
+				<div class="txt_box">
+					<p>주문내역이 없습니다.<br/></p>
+				</div>
+			</div>
+		</th:block>
+		<!-- //주문목록이 없을때 -->
+	</div>
+</div>
+
+<script th:inline="javascript">
+</script>
+
+</th:block>
+

+ 0 - 6
src/main/webapp/WEB-INF/views/web/common/layout/MypageLayoutWeb.html

@@ -40,12 +40,6 @@
 			<input type="hidden" name="ordNo"/>
 			<input type="hidden" name="ordChgSq"/>
 		</form>
-		<form id="deliveryInfoForm" name="deliveryInfoForm" th:action="@{'/mypage/delivery/info/form'}" th:method="post">
-			<input type="hidden" name="ordNo"/>
-			<input type="hidden" name="ordDtlNo"/>
-			<input type="hidden" name="shipCompCd"/>
-			<input type="hidden" name="invoiceNo"/>
-		</form>
 	</div>
 </div>
 

+ 1 - 32
src/main/webapp/WEB-INF/views/web/common/layout/NoMemberLayoutWeb.html

@@ -23,44 +23,13 @@
 	<div class="breadcrumb">
 		<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="fnGoToNoMemberOrderList()">마이페이지</a></li>
+			<li class="bread_2depth"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);">마이페이지</a></li>
 		</ul>
 	</div>
 	<div class="wrap">
 		<!-- CONTENT AREA -->
 		<th:block layout:fragment="content"></th:block>
 		<!-- // CONTENT AREA -->
-		<form id="noMemberOrderListForm" name="noMemberOrderListForm" th:action="@{'/noMember/order/list/form'}" th:method="post">
-			<input type="hidden" name="ordNo" th:value="${ordNo}"/>
-			<input type="hidden" name="ordNm" th:value="${ordNm}"/>
-			<input type="hidden" name="ordPhnno" th:value="${ordPhnno}"/>
-		</form>
-		<form id="noMemberCreListForm" name="noMemberCreListForm" th:action="@{'/noMember/cre/list/form'}" th:method="post">
-			<input type="hidden" name="ordNo" th:value="${ordNo}"/>
-			<input type="hidden" name="ordNm" th:value="${ordNm}"/>
-			<input type="hidden" name="ordPhnno" th:value="${ordPhnno}"/>
-		</form>
-		<form id="exchangeForm" name="exchangeForm" th:action="@{'/noMember/exchange/form'}" th:method="post">
-			<input type="hidden" name="ordNo" th:value="${ordNo}"/>
-			<input type="hidden" name="ordNm" th:value="${ordNm}"/>
-			<input type="hidden" name="ordPhnno" th:value="${ordPhnno}"/>
-			<input type="hidden" name="ordDtlNo"/>
-			<input type="hidden" name="delvFeeCd"/>
-		</form>
-		<form id="returnForm" name="returnForm" th:action="@{'/noMember/return/form'}" th:method="post">
-			<input type="hidden" name="ordNo" th:value="${ordNo}"/>
-			<input type="hidden" name="ordNm" th:value="${ordNm}"/>
-			<input type="hidden" name="ordPhnno" th:value="${ordPhnno}"/>
-			<input type="hidden" name="ordDtlNo"/>
-			<input type="hidden" name="delvFeeCd"/>
-		</form>
-		<form id="cancelForm" name="cancelForm" th:action="@{'/noMember/cancel/form'}" th:method="post">
-			<input type="hidden" name="ordNo" th:value="${ordNo}"/>
-			<input type="hidden" name="ordNm" th:value="${ordNm}"/>
-			<input type="hidden" name="ordPhnno" th:value="${ordPhnno}"/>
-			<input type="hidden" name="ordDtlNo"/>
-			<input type="hidden" name="delvFeeCd"/>
-		</form>
 		<form id="addPaymentForm" name="addPaymentForm" th:action="@{'/order/addPaymentForm'}" th:method="post">
 			<input type="hidden" name="ordNo"/>
 			<input type="hidden" name="ordChgSq"/>

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

@@ -163,18 +163,6 @@
 					<input type="hidden" name="stDate" value="" />
 					<input type="hidden" name="edDate" value="" />
 				</form>
-				<form id="exchangeDetailForm" name="exchangeDetailForm" action="#" th:action="@{'/mypage/cre/exchange/detail/form'}" th:method="post">
-					<input type="hidden" name="ordChgSq"/>
-					<input type="hidden" name="ordNo"/>
-				</form>
-				<form id="returnDetailForm" name="returnDetailForm" action="#" th:action="@{'/mypage/cre/return/detail/form'}" th:method="post">
-					<input type="hidden" name="ordChgSq"/>
-					<input type="hidden" name="ordNo"/>
-				</form>
-				<form id="cancelDetailForm" name="cancelDetailForm" th:action="@{'/mypage/cre/cancel/detail/form'}" th:method="post">
-					<input type="hidden" name="ordChgSq"/>
-					<input type="hidden" name="ordNo"/>
-				</form>
 			</div>
 			<!-- // CONT-BODY -->
 		</div>
@@ -547,23 +535,24 @@
 	
 	// 취반교 상세 페이지 이동
 	var fnGoToCreDetail = function(param) {
+		let ordNo = $(param).attr('ordNo');
 		let ordChgSq = $(param).attr('ordChgSq');
 		let chgGb = $(param).attr('chgGb');
-		let ordNo = $(param).attr('ordNo');
-		
+		let url = '';
+
 		if (chgGb == 'G680_20') {
-			$('#cancelDetailForm input[name=ordChgSq]').val(ordChgSq);
-			$('#cancelDetailForm input[name=ordNo]').val(ordNo);
-			document.cancelDetailForm.submit();
+			url = '/mypage/cre/cancel/detail/form';
 		} else if (chgGb == 'G680_30') {
-			$('#returnDetailForm input[name=ordChgSq]').val(ordChgSq);
-			$('#returnDetailForm input[name=ordNo]').val(ordNo);
-			document.returnDetailForm.submit();
+			url = '/mypage/cre/return/detail/form';
 		} else if (chgGb == 'G680_40') {
-			$('#exchangeDetailForm input[name=ordChgSq]').val(ordChgSq);
-			$('#exchangeDetailForm input[name=ordNo]').val(ordNo);
-			document.exchangeDetailForm.submit();
+			url = '/mypage/cre/exchange/detail/form';
 		}
+
+		// 반품/취소/교환 상세페이지 이동
+		url += '?ordChgSq=' + ordChgSq;
+		url += '&ordNo=' + ordNo;
+
+		cfnGoToPage(_frontUrl + url);
 	}
 	
 	// 취반교 배송조회 버튼 클릭 이벤트

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

@@ -466,21 +466,6 @@
 					</div>
 				</form>
 			</div>
-			<form id="exchangeForm" name="exchangeForm" th:action="@{'/mypage/exchange/form'}" th:method="post">
-				<input type="hidden" name="ordNo"/>
-				<input type="hidden" name="ordDtlNo"/>
-				<input type="hidden" name="delvFeeCd"/>
-			</form>
-			<form id="returnForm" name="returnForm" th:action="@{'/mypage/return/form'}" th:method="post">
-				<input type="hidden" name="ordNo"/>
-				<input type="hidden" name="ordDtlNo"/>
-				<input type="hidden" name="delvFeeCd"/>
-			</form>
-			<form id="cancelForm" name="cancelForm" th:action="@{'/mypage/cancel/form'}" th:method="post">
-				<input type="hidden" name="ordNo"/>
-				<input type="hidden" name="ordDtlNo"/>
-				<input type="hidden" name="delvFeeCd"/>
-			</form>
 			<!-- // CONT-BODY -->
 		</div>
 

+ 0 - 15
src/main/webapp/WEB-INF/views/web/mypage/MypageOrderListFormWeb.html

@@ -185,21 +185,6 @@
 					<input type="hidden" name="stDate" value="" />
 					<input type="hidden" name="edDate" value="" />
 				</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="delvFeeCd"/>
-				</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="delvFeeCd"/>
-				</form>
-				<form id="cancelForm" name="cancelForm" th:action="@{'/mypage/cancel/form'}" th:method="post">
-					<input type="hidden" name="ordNo"/>
-					<input type="hidden" name="ordDtlNo"/>
-					<input type="hidden" name="delvFeeCd"/>
-				</form>
 			</div>
 			<!-- // CONT-BODY -->
 		</div>

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

@@ -189,7 +189,7 @@
 							</p>
 						</div>
 						<div class="btn_footer_area">
-							<button type="button" class="btn btn_default btn_md" onclick="fnGoToNoMemberOrderList();"><span>취소</span></button>
+							<button type="button" class="btn btn_default btn_md" onclick="cfnGoToPage(_PAGE_NOMEMBER_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>
@@ -307,7 +307,7 @@
 			if (result.cancelYn == 'Y') {
 				// 취소 처리
 				gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-					fnGoToNoMemberOrderList();
+					cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
 				}, true);
 			} else {
 				mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');

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

@@ -193,7 +193,7 @@
 						</ul>
 					</div>
 					<div class="btn_footer_area">
-						<button type="button" class="btn btn_dark btn_md" onclick="fnGoToNoMemberCreList()"><span>확인</span></button>
+						<button type="button" class="btn btn_dark btn_md" onclick="cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);"><span>확인</span></button>
 					</div>
 				</div>
 			</div>

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

@@ -278,7 +278,7 @@
 						</div>
 					</th:block>
 					<div class="btn_footer_area">
-						<button type="button" class="btn btn_dark btn_md" onclick="fnGoToNoMemberCreList();"><span>확인</span></button>
+						<button type="button" class="btn btn_dark btn_md" onclick="cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);"><span>확인</span></button>
 					</div>
 				</div>
 			</div>

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

@@ -166,24 +166,6 @@
 					<input type="hidden" name="ordNm" th:value="${ordNm}" />
 					<input type="hidden" name="ordPhnno" th:value="${ordPhnno}" />
 				</form>
-				<form id="exchangeDetailForm" name="exchangeDetailForm" action="#" th:action="@{'/noMember/cre/exchange/detail/form'}" th:method="post">
-					<input type="hidden" name="ordChgSq"/>
-					<input type="hidden" name="ordNo" th:value="${ordNo}" />
-					<input type="hidden" name="ordNm" th:value="${ordNm}" />
-					<input type="hidden" name="ordPhnno" th:value="${ordPhnno}" />
-				</form>
-				<form id="returnDetailForm" name="returnDetailForm" action="#" th:action="@{'/noMember/cre/return/detail/form'}" th:method="post">
-					<input type="hidden" name="ordChgSq"/>
-					<input type="hidden" name="ordNo" th:value="${ordNo}" />
-					<input type="hidden" name="ordNm" th:value="${ordNm}" />
-					<input type="hidden" name="ordPhnno" th:value="${ordPhnno}" />
-				</form>
-				<form id="cancelDetailForm" name="cancelDetailForm" th:action="@{'/noMember/cre/cancel/detail/form'}" th:method="post">
-					<input type="hidden" name="ordChgSq"/>
-					<input type="hidden" name="ordNo" th:value="${ordNo}" />
-					<input type="hidden" name="ordNm" th:value="${ordNm}" />
-					<input type="hidden" name="ordPhnno" th:value="${ordPhnno}" />
-				</form>
 			</div>
 			<!-- // CONT-BODY -->
 		</div>
@@ -553,21 +535,20 @@
 	var fnGoToCreDetail = function(param) {
 		let ordChgSq = $(param).attr('ordChgSq');
 		let chgGb = $(param).attr('chgGb');
-		//let ordNo = $(param).attr('ordNo');
+		let url = '';
 
 		if (chgGb == 'G680_20') {
-			$('#cancelDetailForm input[name=ordChgSq]').val(ordChgSq);
-			//$('#cancelDetailForm input[name=ordNo]').val(ordNo);
-			document.cancelDetailForm.submit();
+			url = '/noMember/cre/cancel/detail/form';
 		} else if (chgGb == 'G680_30') {
-			$('#returnDetailForm input[name=ordChgSq]').val(ordChgSq);
-			//$('#returnDetailForm input[name=ordNo]').val(ordNo);
-			document.returnDetailForm.submit();
+			url = '/noMember/cre/return/detail/form';
 		} else if (chgGb == 'G680_40') {
-			$('#exchangeDetailForm input[name=ordChgSq]').val(ordChgSq);
-			//$('#exchangeDetailForm input[name=ordNo]').val(ordNo);
-			document.exchangeDetailForm.submit();
+			url = '/noMember/cre/exchange/detail/form';
 		}
+
+		// 반품/취소/교환 상세페이지 이동
+		url += '?ordChgSq=' + ordChgSq;
+
+		cfnGoToPage(_frontUrl + url);
 	}
 	
 	// 취반교 배송조회 버튼 클릭 이벤트

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

@@ -258,7 +258,7 @@
 						</ul>
 					</div>
 					<div class="btn_footer_area">
-						<button type="button" class="btn btn_dark btn_md" onclick="fnGoToNoMemberCreList();"><span>확인</span></button>
+						<button type="button" class="btn btn_dark btn_md" onclick="cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);"><span>확인</span></button>
 					</div>
 				</div>
 			</div>

+ 2 - 2
src/main/webapp/WEB-INF/views/web/mypage/NoMemberExchangeFormWeb.html

@@ -286,7 +286,7 @@
 							</p>
 						</div>
 						<div class="btn_footer_area">
-							<button type="button" class="btn btn_default btn_md" onclick="fnGoToNoMemberCreList()"><span>취소</span></button>
+							<button type="button" class="btn btn_default btn_md" onclick="cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);"><span>취소</span></button>
 							<button type="button" id="btn_confirm_exchange" class="btn btn_dark btn_md" onclick="fnExchange()"><span>교환 신청</span></button>
 						</div>
 					</div>
@@ -495,7 +495,7 @@
 
 				document.addPaymentForm.submit();
 			} else {
-				fnGoToNoMemberCreList();
+				cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);
 			}
 		}, true);
 	}

+ 7 - 7
src/main/webapp/WEB-INF/views/web/mypage/NoMemberOrderDetailFormWeb.html

@@ -96,25 +96,25 @@
 												<div class="button_box">
 													<!-- 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중) -->
 													<th:block th:if="${ordDtl.payStat != 'G016_00' && (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}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'cancel');"><span>주문 취소</span></button></p>
+														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'cancel', 'noMember');"><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}, delvFeeCd=${ordDtl.delvFeeCd}" 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}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'return');"><span>반품 신청</span></button></p>
+															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'exchange', 'noMember');"><span>교환 신청</span></button></p>
+															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'return', 'noMember');"><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" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'return');"><span>반품 신청</span></button></p>
+															<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'return', 'noMember');"><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}, delvFeeCd=${ordDtl.delvFeeCd}" 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}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'exchange', 'noMember');"><span>교환 신청</span></button></p>
 														</th:block>
 
 														<!-- 교환/반품 신청 불가 상품 -->
@@ -124,7 +124,7 @@
 													
 													<!-- 배송조회 버튼(배송중) -->
 													<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}, shipCompCd=${ordDtl.shipCompCd}, invoiceNo=${ordDtl.invoiceNo}" onclick="fnGoToDelivery(this);"><span>배송 조회</span></button></p>
+														<p><button type="button" class="btn btn_default btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, shipCompCd=${ordDtl.shipCompCd}, invoiceNo=${ordDtl.invoiceNo}" onclick="fnGoToDelivery(this, 'noMember');"><span>배송 조회</span></button></p>
 													</th:block>
 
 													<!-- 쇼핑백담기 버튼(구매확정) -->
@@ -317,7 +317,7 @@
 							</table>
 						</div>
 						<div class="btn_footer_area">
-							<button type="button" class="btn btn_dark btn_md" onclick="fnGoToNoMemberOrderList()"><span>확인</span></button>
+							<button type="button" class="btn btn_dark btn_md" onclick="cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);"><span>확인</span></button>
 						</div>
 					</div>
 				</form>

+ 7 - 7
src/main/webapp/WEB-INF/views/web/mypage/NoMemberOrderListFormWeb.html

@@ -339,7 +339,7 @@
 				tag += '						<div class="part_goods">\n';
 				tag += '							<div class="goods_head">\n';
 				tag += '								<p>주문일 <span>' + order.ordDt + '</span></p>\n';
-				tag += '								<a href="javascript:void(0)" class="btn_detail_view" ordNo="' + order.ordNo + '" ordNm="' + order.ordNm + '" ordPhnno="' + order.ordPhnno + '" onclick="fnGoToNoMemberOrderDetail(this)">주문상세보기</a>\n';
+				tag += '								<a href="javascript:void(0)" class="btn_detail_view" ordNo="' + order.ordNo + '" ordNm="' + order.ordNm + '" ordPhnno="' + order.ordPhnno + '" onclick="cfnGoToPage(_PAGE_NOMEMBER_ORDER_DETAIL)">주문상세보기</a>\n';
 				tag += '							</div>\n';
 				tag += '							<div class="goods_cont">\n';
 				$.each(order.ordDtlList, function (index, ordDtl) {
@@ -400,23 +400,23 @@
 					// 버튼 처리
 					// 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중)
 					if (ordDtl.payStat != 'G016_00' && (ordDtl.ordDtlStat == 'G013_10' || ordDtl.ordDtlStat == 'G013_20' || ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35' || ordDtl.ordDtlStat == 'G013_40')) {
-						tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" delvFeeCd="' + ordDtl.delvFeeCd + '" onclick="fnCreateChange(this, \'cancel\');"><span>주문 취소</span></button></p>\n';
+						tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" delvFeeCd="' + ordDtl.delvFeeCd + '" onclick="fnCreateChange(this, \'cancel\', \'noMember\');"><span>주문 취소</span></button></p>\n';
 					}
 
 					// 교환신청 버튼(배송중, 출고완료, 배송완료)
 					if (ordDtl.ordDtlStat == 'G013_50' || ordDtl.ordDtlStat == 'G013_55' || ordDtl.ordDtlStat == 'G013_60') {
 						// 교환/반품 가능한 상품
 						if (ordDtl.changeableYn == 'Y' && ordDtl.returnableYn == 'Y') {
-							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" delvFeeCd="' + ordDtl.delvFeeCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'exchange\');"><span>교환 신청</span></button></p>\n';
-							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" delvFeeCd="' + ordDtl.delvFeeCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'return\');"><span>반품 신청</span></button></p>\n';
+							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" delvFeeCd="' + ordDtl.delvFeeCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'exchange\', \'noMember\');"><span>교환 신청</span></button></p>\n';
+							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" delvFeeCd="' + ordDtl.delvFeeCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'return\', \'noMember\');"><span>반품 신청</span></button></p>\n';
 						}
 						// 교환 신청 불가 상품
 						else if (ordDtl.changeableYn == 'N' && ordDtl.returnableYn == 'Y') {
-							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" delvFeeCd="' + ordDtl.delvFeeCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'return\');"><span>반품 신청</span></button></p>\n';
+							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" delvFeeCd="' + ordDtl.delvFeeCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'return\', \'noMember\');"><span>반품 신청</span></button></p>\n';
 						}
 						// 반품 신청 불가 상품
 						else if (ordDtl.changeableYn == 'Y' && ordDtl.returnableYn == 'N') {
-							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" delvFeeCd="' + ordDtl.delvFeeCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'exchange\');"><span>교환 신청</span></button></p>\n';
+							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" delvFeeCd="' + ordDtl.delvFeeCd + '" ordCanChgQty="' + ordDtl.ordCanChgQty + '" onclick="fnCreateChange(this, \'exchange\', \'noMember\');"><span>교환 신청</span></button></p>\n';
 						}
 						// 교환/반품 신청 불가 상품
 						else {
@@ -425,7 +425,7 @@
 
 					// 배송조회 버튼(배송중)
 					if (ordDtl.ordDtlStat == 'G013_50' || ordDtl.ordDtlStat == 'G013_55') {
-						tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnGoToDelivery(this);"><span>배송 조회</span></button></p>\n';
+						tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnGoToDelivery(this, 'noMember');"><span>배송 조회</span></button></p>\n';
 					}
 
 					// 쇼핑백담기 버튼(구매확정)

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

@@ -317,7 +317,7 @@
 							</p>
 						</div>
 						<div class="btn_footer_area">
-							<button type="button" class="btn btn_default btn_md" onclick="fnGoToNoMemberCreList()"><span>취소</span></button>
+							<button type="button" class="btn btn_default btn_md" onclick="cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);"><span>취소</span></button>
 							<button type="button" id="btn_refund_pop" class="btn btn_dark btn_md" onclick="fnReturn()"><span>반품 신청</span></button>
 						</div>
 					</div>
@@ -465,7 +465,7 @@
 
 				document.addPaymentForm.submit();
 			} else {
-				fnGoToNoMemberCreList();
+				cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);
 			}
 		}, true);
 	}

+ 44 - 46
src/main/webapp/biz/mypage.js

@@ -30,8 +30,8 @@ var fnSetMypageLocation = function(depth3, depth3Link, depth4) {
 // 비회원 LNB 처리
 var fnSetNoMemberLnbList = function(lnbLvl) {
 	let tag = '';
-	tag += '<li><a href="javascript:void(0);" onclick="fnGoToNoMemberOrderList()"' + (lnbLvl == 1 ? ' class="on"' : '') + '>주문확인/배송조회</a></li>\n';
-	tag += '<li><a href="javascript:void(0);" onclick="fnGoToNoMemberCreList()"' + (lnbLvl == 2 ? ' class="on"' : '') + '>취소/반품/교환 내역</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);"' + (lnbLvl == 1 ? ' class="on"' : '') + '>주문확인/배송조회</a></li>\n';
+	tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);"' + (lnbLvl == 2 ? ' class="on"' : '') + '>취소/반품/교환 내역</a></li>\n';
 	$('#mypageLnbList').html(tag);
 }
 
@@ -42,25 +42,15 @@ var fnSetNoMemberLocation = function(depth3, depth4) {
 		tag += '<li class="bread_3depth">' + depth3 + '</li>'
 	} else {
 		if (depth3 == '주문확인/배송조회') {
-			tag += '<li className="bread_3depth"><a href="javascript:void(0);" onClick="fnGoToNoMemberOrderList();">' + depth3 + '</a></li>';
+			tag += '<li className="bread_3depth"><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);">' + depth3 + '</a></li>';
 		} else if (depth3 == '취소/반품/교환 내역') {
-			tag += '<li className="bread_3depth"><a href="javascript:void(0);" onClick="fnGoToNoMemberCreList();">' + depth3 + '</a></li>';
+			tag += '<li className="bread_3depth"><a href="javascript:void(0);" onClick="cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);">' + depth3 + '</a></li>';
 		}
 		tag += '<li class="bread_3depth">' + depth4 + '</li>'
 	}
 	$('#location').append(tag);
 }
 
-// 비회원 주문확인/배송조회 페이지 이동
-var fnGoToNoMemberOrderList = function() {
-	document.noMemberOrderListForm.submit();
-}
-
-// 비회원 취소/반품/교환 내역 페이지 이동
-var fnGoToNoMemberCreList = function() {
-	document.noMemberCreListForm.submit();
-}
-
 // 주문상세보기 버튼 클릭 이벤트 처리
 var fnGoToOrderDetail = function(param) {
 	let ordNo = $(param).attr('ordNo');
@@ -74,20 +64,20 @@ var fnGoToGoodsDetail = function(param) {
 }
 
 // 배송조회 버튼 클릭 이벤트
-var fnGoToDelivery = function(param) {
-	let ordNo = $(param).attr('ordNo');
-	let ordDtlNo = $(param).attr('ordDtlNo');
-	let invoiceNo = $(param).attr('invoiceNo');
-	let shipCompCd = $(param).attr('shipCompCd');
+var fnGoToDelivery = function(param, noMember) {
+	let url = '';
 	
-	// TODO
-	// 배송조회 처리
-	$('#deliveryInfoForm input[name=ordNo]').val(ordNo);
-	$('#deliveryInfoForm input[name=ordDtlNo]').val(ordDtlNo);
-	$('#deliveryInfoForm input[name=shipCompCd]').val(shipCompCd);
-	$('#deliveryInfoForm input[name=invoiceNo]').val(invoiceNo);
+	if (meMember == 'noMember') {
+		url = '/noMember/delivery/info/form';
+	} else {
+		url = '/mypage/delivery/info/form';
+	}
+	url += '?ordNo=' + $(param).attr('ordNo');
+	url += '&ordDtlNo=' + $(param).attr('ordDtlNo');
+	url += '&invoiceNo=' + $(param).attr('invoiceNo');
+	url += '&shipCompCd=' + $(param).attr('shipCompCd');
 	
-	document.deliveryInfoForm.submit();
+	cfnGoToPage(_frontUrl + url);
 }
 
 // 구매확정 버튼 클릭 이벤트
@@ -182,41 +172,49 @@ var fnReSendSms = function(param) {
 }
 
 // 반품/취소/교환 버튼 클릭 이벤트
-var fnCreateChange = function(param, gubun) {
+var fnCreateChange = function(param, gubun, noMember) {
 	let ordCanChgQty = $(param).attr('ordCanChgQty');
+	let str = '';
+	let url = '';
 
-	// 반품/취소/교환 가능 여부 체크
-	if (ordCanChgQty == 0) {
-		let str = '';
+	if (noMember == 'noMember') {
 		if (gubun == 'cancel') {
 			str = '취소 가능한 수량이 없습니다.';
+			url = '/noMember/cancel/form';
 		} else if (gubun == 'return') {
 			str = '반품 가능한 수량이 없습니다.';
+			url = '/noMember/return/form';
 		} else if (gubun == 'exchange') {
 			str = '교환 가능한 수량이 없습니다.';
+			url = '/noMember/exchange/form';
 		}
+	} else {
+		if (gubun == 'cancel') {
+			str = '취소 가능한 수량이 없습니다.';
+			url = '/mypage/cancel/form';
+		} else if (gubun == 'return') {
+			str = '반품 가능한 수량이 없습니다.';
+			url = '/mypage/return/form';
+		} else if (gubun == 'exchange') {
+			str = '교환 가능한 수량이 없습니다.';
+			url = '/mypage/exchange/form';
+		}
+	}
 
+	// 반품/취소/교환 가능 여부 체크
+	if (ordCanChgQty == 0) {
 		mcxDialog.alert(str);
 		return false;
 	}
 
 	// 반품/취소/교환 페이지 이동
-	let ordNo = $(param).attr('ordNo');
-	let ordDtlNo = $(param).attr('ordDtlNo');
-	let delvFeeCd = $(param).attr('delvFeeCd');
-
-	$('#' + gubun + 'Form input[name=ordNo]').val(ordNo);
-	$('#' + gubun + 'Form input[name=ordDtlNo]').val(ordDtlNo);
-	$('#' + gubun + 'Form input[name=delvFeeCd]').val(delvFeeCd);
-
-	if (gubun == 'cancel') {
-		document.cancelForm.submit();
-	} else if (gubun == 'return') {
-		document.returnForm.submit();
-	} else if (gubun == 'exchange') {
-		document.exchangeForm.submit();
+	url += '?ordDtlNo=' + $(param).attr('ordDtlNo');
+	url += '&delvFeeCd=' + $(param).attr('delvFeeCd');
+	if (noMember != 'noMember') {
+		url += '&ordNo=' + $(param).attr('ordNo');
 	}
-
+	
+	cfnGoToPage(_frontUrl + url);
 }
 
 // 주문 내역 삭제 처리
@@ -428,7 +426,7 @@ var fnCreCancel = function(param) {
 		sureBtnClick: function() {
 			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 				if (noMember == 'noMember') {
-					fnGoToNoMemberCreList();
+					cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);
 				} else {
 					cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 				}