Просмотр исходного кода

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

card007 5 лет назад
Родитель
Сommit
21009bae64

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

@@ -187,6 +187,7 @@
 						</table>
 					</div>
 				</div>
+				<div class="desc_txt">카드사로 결제 취소 요청이 전달된 후 환불까지는 평일 기준 3 ~7일이 소요될 수 있습니다.</div>
 				<div class="required_group" id="addDeliveryFee" style="display:none">
 					<p>배송비 <span class="c_primary" id="addPayCost">0원</span> 추가 결제가 필요합니다.</p>
 				</div>

+ 27 - 34
src/main/webapp/WEB-INF/views/mob/mypage/MypageCreListFormMob.html

@@ -26,24 +26,6 @@
 	<input type="hidden" name="edDate" 		value="" />
 	<input type="hidden" name="custNo" 		th:value ="${custNo}"/>
 </form>
-<!-- 교환상세 -->
-<form id="exchangeForm" name="exchangeForm" action="#" th:action="@{'/mypage/cre/exchange/detail/form'}" th:method="post">
-	<input type="hidden" name="ordChgSq"/>
-	<input type="hidden" name="ordNo"/>
-</form>
-<!-- //교환상세 -->
-<!-- 반품상세 -->
-<form id="returnForm" name="returnForm" action="#" th:action="@{'/mypage/cre/return/detail/form'}" th:method="post">
-	<input type="hidden" name="ordChgSq"/>
-	<input type="hidden" name="ordNo"/>
-</form>
-<!-- //반품상세 -->
-<!-- 취소상세 -->
-<form id="cancelForm" name="cancelForm" th:action="@{'/mypage/cre/cancel/detail/form'}" th:method="post">
-	<input type="hidden" name="ordChgSq"/>
-	<input type="hidden" name="ordNo"/>
-</form>
-<!-- //취소상세 -->
 
 <main role="" id="" class="container my">
 	<section class="content my_return"> <!-- 210409_수정 : class my_return 변경 -->
@@ -163,20 +145,31 @@ $(document).ready(function() {
 	
 	// 주문상세상태코드 셀렉트박스 변경 이벤트
 	$('#odStatusPop .popup_con .button_list .ordDtlStat').on('click', function() {
-		$('#searchForm input[name=chgStat]').val($(this).attr('code'));
-		jsonObj.chgStat = $(this).attr('code');
-		
-		// 상태값 명칭
-		var ordDtlStatNm = $(this).find("span").text();
-		$(".container .my_return .od_status_btn").text(ordDtlStatNm);
-		
+		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_return .od_status_btn").text(ordDtlStatNm);
+			}
+		});
+
 		// 리헷
 		$("#listBox").html("");
-		
+
 		// 초기화설정
 		fnGetInfiniteScrollDataList(0);
 
-		// 팝업 닫기
+		// 팝업닫기
 		$(".popup_close").trigger("click");
 	});
 });
@@ -248,7 +241,7 @@ var fnSetSearchPeriod = function(period) {
 		}
 	});
 
-	// 팝업 닫기
+	// 팝업닫기
 	$(".popup_close").trigger("click");
 }
 
@@ -284,12 +277,12 @@ var fnGoToDeliveryTrack = function(param) {
 </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).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(){

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

@@ -150,59 +150,311 @@
 								
 								<!-- 배송중 (교환가능, 반품가능) -->
 								<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:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'exchange');"><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:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'return');"><span>반품 신청</span></button></div>
-											</th:block>
-										</div>
-									</th:block>
-									<!-- //교환가능, 반품가능 -->
-									
-									<!-- 리뷰사용가능, 리뷰등록전일때 -->
-									<div class="goods_btn_wrap btn_group_flex">
-										<div><button type="button" class="btn btn_default btn_delv_sch"><span>배송 조회</span></button></div>
+									<div class="goods_btn_wrap btn_group_flex btn_count">
+										<!-- 교환불가 -->
+										<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'Y'">
+											<div>
+												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+													<span>1:1 문의</span>
+												</button>
+											</div>
+										</th:block>
+										<!-- //교환불가 -->
+										<!-- 교환가능 -->
+										<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');">
+													<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');">
+													<span>반품 신청</span>
+												</button>
+											</div>
+										</th:block>
+										<!-- 반품가능 -->
+										<!-- 반품불가 -->
+										<th:block th:if="${ordDtl.changeableYn} == 'Y' and ${ordDtl.returnableYn} == 'N'">
+											<div>
+												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+													<span>1:1 문의</span>
+												</button>
+											</div>
+										</th:block>
+										<!-- //반품불가 -->
+
+										<!-- 교환불가, 반품불가 -->
+										<th:block th:if="${ordDtl.returnableYn} == 'N' and ${ordDtl.changeableYn} == 'N'">
+											<div>
+												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+													<span>1:1 문의</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);"><span>배송 조회</span></button></div>
+
 										<!-- 리뷰사용가능, 리뷰등록전일때 -->
 										<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">
 											<div><button type="button" class="btn btn_primary btn_review_write" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></div>
 										</th:block>
 										<!-- //리뷰사용가능, 리뷰등록전일때 -->
 									</div>
-									<!-- //리뷰사용가능, 리뷰등록전일때 -->
+
+
+
+
+
+
+
+
+
+<!--									&lt;!&ndash; 버튼 4개 &ndash;&gt;-->
+<!--									<th:block th:unless="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'N'">-->
+<!--										<div class="goods_btn_wrap btn_group_flex type1">-->
+<!--											&lt;!&ndash; 교환불가 &ndash;&gt;-->
+<!--											<th:block th:if="${ordDtl.changeableYn} == 'N'">-->
+<!--												<div>-->
+<!--													<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">-->
+<!--														<span>1:1 문의</span>-->
+<!--													</button>-->
+<!--												</div>-->
+<!--											</th:block>-->
+<!--											&lt;!&ndash; //교환불가 &ndash;&gt;-->
+<!--											&lt;!&ndash; 교환가능 &ndash;&gt;-->
+<!--											<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');">-->
+<!--														<span>교환 신청</span>-->
+<!--													</button>-->
+<!--												</div>-->
+<!--											</th:block>-->
+<!--											&lt;!&ndash; //교환가능 &ndash;&gt;-->
+<!--											&lt;!&ndash; 반품가능 &ndash;&gt;-->
+<!--											<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');">-->
+<!--														<span>반품 신청</span>-->
+<!--													</button>-->
+<!--												</div>-->
+<!--											</th:block>-->
+<!--											&lt;!&ndash; 반품가능 &ndash;&gt;-->
+<!--											&lt;!&ndash; 반품불가 &ndash;&gt;-->
+<!--											<th:block th:if="${ordDtl.returnableYn} == 'N'">-->
+<!--												<div>-->
+<!--													<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">-->
+<!--														<span>1:1 문의</span>-->
+<!--													</button>-->
+<!--												</div>-->
+<!--											</th:block>-->
+<!--											&lt;!&ndash; //반품불가 &ndash;&gt;-->
+
+<!--											<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);"><span>배송 조회</span></button></div>-->
+
+<!--											&lt;!&ndash; 리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
+<!--											<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">-->
+<!--												<div><button type="button" class="btn btn_primary btn_review_write" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></div>-->
+<!--											</th:block>-->
+<!--											&lt;!&ndash; //리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
+<!--										</div>-->
+<!--										&lt;!&ndash; //리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
+<!--									</th:block>-->
+<!--									&lt;!&ndash; //버튼 4개 &ndash;&gt;-->
+<!--									&lt;!&ndash; 버튼 3개 &ndash;&gt;-->
+<!--									<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'N'">-->
+<!--										<div class="goods_btn_wrap btn_group_flex">-->
+<!--											<div>-->
+<!--												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">-->
+<!--													<span>1:1 문의</span>-->
+<!--												</button>-->
+<!--											</div>-->
+<!--											<div>-->
+<!--												<button type="button" th:id="btn_purchase_confirm" class="btn btn_primary" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);">-->
+<!--													<span>구매 확정</span>-->
+<!--												</button>-->
+<!--											</div>-->
+<!--											&lt;!&ndash; 리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
+<!--											<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">-->
+<!--												<div>-->
+<!--													<button type="button" class="btn btn_primary btn_review_write" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:goodsCd="${ordDtl.goodsCd}" onclick="fnCreateReview(this);">-->
+<!--														<span>리뷰 쓰기</span>-->
+<!--													</button>-->
+<!--												</div>-->
+<!--											</th:block>-->
+<!--											&lt;!&ndash; //리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
+<!--										</div>-->
+<!--									</th:block>-->
+<!--									&lt;!&ndash; //버튼 3개 &ndash;&gt;-->
 								</th:block>
 								<!-- //배송중 (교환가능, 반품가능) -->
-								
+
 								<!-- 배송완료 (교환가능, 반품가능) -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_60'">
-									<div class="goods_btn_wrap btn_group_flex">
-										<!-- 교환가능, 반품가능 -->
+									<div class="goods_btn_wrap btn_group_flex btn_count">
+										<!-- 교환불가 -->
+										<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'Y'">
+											<div>
+												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+													<span>1:1 문의</span>
+												</button>
+											</div>
+										</th:block>
+										<!-- //교환불가 -->
+										<!-- 교환가능 -->
 										<th:block th:if="${ordDtl.changeableYn} == 'Y'">
-											<div><button type="button" class="btn btn_default btn_exch_req" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'exchange');"><span>교환 신청</span></button></div>
+											<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');">
+													<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:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, delvFeeCd=${ordDtl.delvFeeCd}" onclick="fnCreateChange(this, 'return');"><span>반품 신청</span></button></div>
+											<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');">
+													<span>반품 신청</span>
+												</button>
+											</div>
+										</th:block>
+										<!-- //반품가능 -->
+										<!-- 반품불가 -->
+										<th:block th:if="${ordDtl.changeableYn} == 'Y' and ${ordDtl.returnableYn} == 'N'">
+											<div>
+												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+													<span>1:1 문의</span>
+												</button>
+											</div>
 										</th:block>
-										<!-- //교환가능, 반품가능 -->
-										
+										<!-- //반품불가 -->
 										<!-- 교환불가, 반품불가 -->
-										<th:block th:if="${ordDtl.changeableYn} == 'N' or ${ordDtl.returnableYn} == 'N'">
-											<div><button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
+										<th:block th:if="${ordDtl.returnableYn} == 'N' and ${ordDtl.changeableYn} == 'N'">
+											<div>
+												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+													<span>1:1 문의</span>
+												</button>
+											</div>
 										</th:block>
 										<!-- //교환불가, 반품불가 -->
-									</div>
-									<div class="goods_btn_wrap btn_group_flex">
-										<div><button type="button" id="btn_purchase_confirm btn_ord_confirm" class="btn btn_primary" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);"><span>구매 확정</span></button></div>
+
+										<!-- 구매확정 -->
+										<th:block th:if="${ordDtl.ordReqChgQty == 0}">
+											<div>
+												<button type="button" th:id="btn_purchase_confirm" class="btn btn_primary" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);">
+													<span>구매 확정</span>
+												</button>
+											</div>
+										</th:block>
+										<!-- //구매확정 -->
 
 										<!-- 리뷰사용가능, 리뷰등록전일때 -->
 										<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">
-											<div><button type="button" class="btn btn_primary btn_review_write" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></div>
+											<div>
+												<button type="button" class="btn btn_primary btn_review_write" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:goodsCd="${ordDtl.goodsCd}" onclick="fnCreateReview(this);">
+													<span>리뷰 쓰기</span>
+												</button>
+											</div>
 										</th:block>
 										<!-- //리뷰사용가능, 리뷰등록전일때 -->
 									</div>
+
+
+
+
+
+
+
+
+
+
+
+									<!-- 버튼4개 -->
+<!--									<th:block th:unless="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'N'">-->
+<!--										<div class="goods_btn_wrap btn_group_flex type1">-->
+<!--											&lt;!&ndash; 교환불가 &ndash;&gt;-->
+<!--											<th:block th:if="${ordDtl.changeableYn} == 'N'">-->
+<!--												<div>-->
+<!--													<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">-->
+<!--														<span>1:1 문의</span>-->
+<!--													</button>-->
+<!--												</div>-->
+<!--											</th:block>-->
+<!--											&lt;!&ndash; //교환불가 &ndash;&gt;-->
+<!--											&lt;!&ndash; 교환가능 &ndash;&gt;-->
+<!--											<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');">-->
+<!--														<span>교환 신청</span>-->
+<!--													</button>-->
+<!--												</div>-->
+<!--											</th:block>-->
+<!--											&lt;!&ndash; //교환가능 &ndash;&gt;-->
+<!--											&lt;!&ndash; 반품가능 &ndash;&gt;-->
+<!--											<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');">-->
+<!--														<span>반품 신청</span>-->
+<!--													</button>-->
+<!--												</div>-->
+<!--											</th:block>-->
+<!--											&lt;!&ndash; //반품가능 &ndash;&gt;-->
+<!--											&lt;!&ndash; 반품불가 &ndash;&gt;-->
+<!--											<th:block th:if="${ordDtl.returnableYn} == 'N'">-->
+<!--												<div>-->
+<!--													<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">-->
+<!--														<span>1:1 문의</span>-->
+<!--													</button>-->
+<!--												</div>-->
+<!--											</th:block>-->
+<!--											&lt;!&ndash; //반품불가 &ndash;&gt;-->
+<!--											<div>-->
+<!--												<button type="button" th:id="btn_purchase_confirm" class="btn btn_primary" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);">-->
+<!--													<span>구매 확정</span>-->
+<!--												</button>-->
+<!--											</div>-->
+<!--											&lt;!&ndash; 리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
+<!--											<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">-->
+<!--												<div>-->
+<!--													<button type="button" class="btn btn_primary btn_review_write" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:goodsCd="${ordDtl.goodsCd}" onclick="fnCreateReview(this);">-->
+<!--														<span>리뷰 쓰기</span>-->
+<!--													</button>-->
+<!--												</div>-->
+<!--											</th:block>-->
+<!--											&lt;!&ndash; //리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
+<!--										</div>-->
+<!--									</th:block>-->
+									<!-- //버튼 4개 -->
+									<!-- 버튼 3개 -->
+<!--									<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'N'">-->
+<!--										<div class="goods_btn_wrap btn_group_flex">-->
+<!--											<div>-->
+<!--												<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">-->
+<!--													<span>1:1 문의</span>-->
+<!--												</button>-->
+<!--											</div>-->
+<!--											<div>-->
+<!--												<button type="button" th:id="btn_purchase_confirm" class="btn btn_primary" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);">-->
+<!--													<span>구매 확정</span>-->
+<!--												</button>-->
+<!--											</div>-->
+<!--											&lt;!&ndash; 리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
+<!--											<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">-->
+<!--												<div>-->
+<!--													<button type="button" class="btn btn_primary btn_review_write" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:goodsCd="${ordDtl.goodsCd}" onclick="fnCreateReview(this);">-->
+<!--														<span>리뷰 쓰기</span>-->
+<!--													</button>-->
+<!--												</div>-->
+<!--											</th:block>-->
+<!--											&lt;!&ndash; //리뷰사용가능, 리뷰등록전일때 &ndash;&gt;-->
+<!--										</div>-->
+<!--									</th:block>-->
+									<!-- //버튼 3개 -->
 								</th:block>
 								<!-- //배송완료 (교환가능, 반품가능) -->
 								
@@ -267,19 +519,19 @@
 											<p class="cf_txt cf_desc">해당 상품은 교환/반품이 불가능한 상품입니다.<br>문의사항은 1:1 문의를 이용해 주세요.</p>
 										</th:block>
 										<!-- //교환불가능, 반품불가능 -->
-										
+
 										<!-- 교환불가능 -->
-										<th:block th:if="${ordDtl.changeableYn} == 'N'">
+										<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'Y'">
 											<p class="cf_txt cf_desc">해당 상품은 교환이 불가능한 상품입니다.<br>문의사항은 1:1 문의를 이용해 주세요.</p>
 										</th:block>
 										<!-- //교환불가능 -->
-										
+
 										<!-- 반품불가능 -->
-										<th:block th:if="${ordDtl.returnableYn} == 'N'">
+										<th:block th:if="${ordDtl.changeableYn} == 'Y' and ${ordDtl.returnableYn} == 'N'">
 											<p class="cf_txt cf_desc">해당 상품은 교환이 불가능한 상품입니다.<br>문의사항은 1:1 문의를 이용해 주세요.</p>
 										</th:block>
 										<!-- //반품불가능 -->
-										
+
 									</th:block>
 									<!-- //배송중, 배송완료 상태 -->
 								</div>
@@ -751,6 +1003,13 @@
 			}
 		});
 		*/
+
+		// 버튼 클래스 설정
+		$.each($('.btn_count'), function(idx, item) {
+			if ($(item).children().length > 3 && !$(item).hasClass('type1')) {
+				$(item).addClass('type1');
+			}
+		});
 	});
 	
 	// 2.1 회원 배송지변경 팝업열기

+ 20 - 43
src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderListFormMob.html

@@ -29,30 +29,6 @@
 </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>
-<!-- //취소상세 -->
-
 <main role="" id="" class="container my">
 	<section class="content my_order">
 		
@@ -275,13 +251,24 @@ $(document).ready(function() {
 	
 	// 주문상세상태코드 셀렉트박스 변경 이벤트
 	$('#odStatusPop .popup_con .button_list .ordDtlStat').on('click', function() {
-		$('#searchForm input[name=ordDtlStat]').val($(this).attr('code'));
-		jsonObj.ordDtlStat = $(this).attr('code');
-		
-		// 상태값 명칭
-		var ordDtlStatNm = $(this).find("span").text();
-		$(".container .my_order .od_status_btn").text(ordDtlStatNm);
-		
+		let code = $(this).attr('code');
+		$('#searchForm input[name=ordDtlStat]').val(code);
+		jsonObj.ordDtlStat = 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("");
 		
@@ -332,13 +319,10 @@ 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);
 }
 
 //검색기간 버튼 클릭 이벤트 처리
@@ -372,7 +356,7 @@ var fnSetSearchPeriod = function(period) {
 	});
 
 	// 팝업닫기
-		$(".popup_close").trigger("click");
+	$(".popup_close").trigger("click");
 }
 
 // 2021.04.21 인피니티 스크롤 기능 구현전 추후 수정
@@ -409,13 +393,6 @@ $(function() { gagaInfiniteScroll.getHistory(); });
 </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");

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

@@ -141,44 +141,78 @@
 							
 							<!-- 배송중 (교환가능, 반품가능) -->
 							<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');">
-													<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');">
-													<span>반품 신청</span>
-												</button>
-											</div>
-										</th:block>
-									</div>
-								</th:block>
-								<!-- //교환가능, 반품가능 -->
-								
-								<!-- 리뷰사용가능, 리뷰등록전일때 -->
-								<div class="goods_btn_wrap btn_group_flex">
+								<div class="goods_btn_wrap btn_group_flex btn_count">
+									<!-- 교환불가 -->
+									<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'Y'">
+										<div>
+											<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+												<span>1:1 문의</span>
+											</button>
+										</div>
+									</th:block>
+									<!-- //교환불가 -->
+									<!-- 교환가능 -->
+									<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');">
+												<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');">
+												<span>반품 신청</span>
+											</button>
+										</div>
+									</th:block>
+									<!-- 반품가능 -->
+									<!-- 반품불가 -->
+									<th:block th:if="${ordDtl.changeableYn} == 'Y' and ${ordDtl.returnableYn} == 'N'">
+										<div>
+											<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+												<span>1:1 문의</span>
+											</button>
+										</div>
+									</th:block>
+									<!-- //반품불가 -->
+
+									<!-- 교환불가, 반품불가 -->
+									<th:block th:if="${ordDtl.returnableYn} == 'N' and ${ordDtl.changeableYn} == 'N'">
+										<div>
+											<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+												<span>1:1 문의</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);"><span>배송 조회</span></button></div>
+
 									<!-- 리뷰사용가능, 리뷰등록전일때 -->
 									<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">
 										<div><button type="button" class="btn btn_primary btn_review_write" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></div>
 									</th:block>
 									<!-- //리뷰사용가능, 리뷰등록전일때 -->
 								</div>
-								<!-- //리뷰사용가능, 리뷰등록전일때 -->
 							</th:block>
 							<!-- //배송중 (교환가능, 반품가능) -->
 								
 							<!-- 배송완료 (교환가능, 반품가능) -->
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_60'">
-								<div class="goods_btn_wrap btn_group_flex">
-									<!-- 교환가능, 반품가능 -->
+								<div class="goods_btn_wrap btn_group_flex btn_count">
+									<!-- 교환불가 -->
+									<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'Y'">
+										<div>
+											<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+												<span>1:1 문의</span>
+											</button>
+										</div>
+									</th:block>
+									<!-- //교환불가 -->
+									<!-- 교환가능 -->
 									<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');">
@@ -186,6 +220,8 @@
 											</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');">
@@ -193,9 +229,18 @@
 											</button>
 										</div>
 									</th:block>
-									<!-- //교환가능, 반품가능 -->
+									<!-- //반품가능 -->
+									<!-- 반품불가 -->
+									<th:block th:if="${ordDtl.changeableYn} == 'Y' and ${ordDtl.returnableYn} == 'N'">
+										<div>
+											<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
+												<span>1:1 문의</span>
+											</button>
+										</div>
+									</th:block>
+									<!-- //반품불가 -->
 									<!-- 교환불가, 반품불가 -->
-									<th:block th:if="${ordDtl.changeableYn} == 'N' or ${ordDtl.returnableYn} == 'N'">
+									<th:block th:if="${ordDtl.returnableYn} == 'N' and ${ordDtl.changeableYn} == 'N'">
 										<div>
 											<button type="button" class="btn btn_default btn_qna_write" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA);">
 												<span>1:1 문의</span>
@@ -203,13 +248,17 @@
 										</div>
 									</th:block>
 									<!-- //교환불가, 반품불가 -->
-								</div>
-								<div class="goods_btn_wrap btn_group_flex">
-									<div>
-										<button type="button" id="btn_purchase_confirm" class="btn btn_primary" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);">
-											<span>구매 확정</span>
-										</button>
-									</div>
+
+									<!-- 구매확정 -->
+									<th:block th:if="${ordDtl.ordReqChgQty == 0}">
+										<div>
+											<button type="button" th:id="btn_purchase_confirm" class="btn btn_primary" th:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);">
+												<span>구매 확정</span>
+											</button>
+										</div>
+									</th:block>
+									<!-- //구매확정 -->
+
 									<!-- 리뷰사용가능, 리뷰등록전일때 -->
 									<th:block th:if="${ordDtl.reviewableYn} == 'Y' and ${ordDtl.reviewSq} == null">
 										<div>
@@ -300,13 +349,13 @@
 								<!-- //교환불가능, 반품불가능 -->
 
 								<!-- 교환불가능 -->
-								<th:block th:if="${ordDtl.changeableYn} == 'N'">
+								<th:block th:if="${ordDtl.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'Y'">
 									<p class="cf_txt cf_desc">해당 상품은 교환이 불가능한 상품입니다.<br>문의사항은 1:1 문의를 이용해 주세요.</p>
 								</th:block>
 								<!-- //교환불가능 -->
 
 								<!-- 반품불가능 -->
-								<th:block th:if="${ordDtl.returnableYn} == 'N'">
+								<th:block th:if="${ordDtl.returnableYn} == 'N'and ${ordDtl.returnableYn} == 'Y'">
 									<p class="cf_txt cf_desc">해당 상품은 교환이 불가능한 상품입니다.<br>문의사항은 1:1 문의를 이용해 주세요.</p>
 								</th:block>
 								<!-- //반품불가능 -->
@@ -440,6 +489,12 @@
 </div>
 
 <script th:inline="javascript">
+// 버튼 클래스 설정
+$.each($('.btn_count'), function(idx, item) {
+	if ($(item).children().length > 3 && !$(item).hasClass('type1')) {
+		$(item).addClass('type1');
+	}
+});
 </script>
 
 </th:block>

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

@@ -0,0 +1,661 @@
+<!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/NoMemberLayoutMob">
+<!--
+ *******************************************************************************
+ * @source  : NoMemberCancelFormMob.html
+ * @desc    : 비회원 > 취소신청 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.05.14   card007     최초 작성
+ *******************************************************************************
+ -->
+<body>
+
+<th:block layout:fragment="content">
+
+<main class="container my">
+	<section class="content my_return">
+		<form id="cancelForm" class="form_wrap">
+			<input type="hidden" name="accountNo" 	th:value="${oneData.accountNo}"/>
+			<input type="hidden" name="accountNm" 	th:value="${oneData.accountNm}"/>
+			<input type="hidden" name="bankCd" 		th:value="${oneData.bankCd}"/>
+					
+			<div class="inner wide bg_beige">
+				<div class="order_number">
+					<dl class="clear">
+						<dt>주문번호</dt>
+						<dd th:text="${oneData.ordNo}"></dd>
+					</dl>
+				</div>
+			</div>
+			<div class="inner">
+				<div class="part_goods">
+					<div class="goods_top">
+						<div class="goods_date">주문일<span class="date" th:text="${oneData.ordDt}"></span></div>
+					</div>
+					
+					<!-- 취소상품목록 -->
+					<th:block th:if="${cancelList.cancelList}" th:each="cancel, status : ${cancelList.cancelList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+						<div class="goods_section">
+							<div class="goods_detail">
+								<a href="">
+									<div class="thumb_box">
+										<img th:src="${imageUrl + '/' + cancel.sysImgNm + '?RS=90'}" width="100%" alt="">
+									</div>
+									<div class="info_box">
+										<div class="od_name">
+											<div class="brand">
+												<span th:text="${cancel.brandNm}"></span>
+												<div class="badge_wrap">
+													<em class="tag primary" th:if="${cancel.shotDelvYn == 'Y'}">총알배송</em>
+													<em class="tag" 		th:if="${cancel.shotDelvYn == 'N' and cancel.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+													<em class="tag" 		th:if="${cancel.selfGoodsYn == 'N'}">업체직배송</em>
+												</div>
+											</div>
+											<div class="name" th:text="${cancel.goodsNm}"></div>
+										</div>
+										<div class="od_opt">
+												<div class="option">
+													<th:block th:if="${cancel.goodsType == 'G056_S'}" th:each="option, status : ${cancel.colorNmArr}">
+														<em th:text="${cancel.itemNmArr[status.index]}"></em>
+														<em th:text="${cancel.optCd2Arr[status.index]}"></em>
+													</th:block>
+													<th:block th:unless="${cancel.goodsType == 'G056_S'}">
+														<em th:text="${cancel.colorNm}"></em>
+														<em th:text="${cancel.optCd2}"></em>
+													</th:block>
+												</div>
+										</div>
+										<div class="od_calc">
+											<th:block th:if="${(cancel.ordAmt - cancel.cnclRtnAmt) > (cancel.realOrdAmt + cancel.pntDcAmt + cancel.gfcdUseAmt)}">
+												<p class="sale_price">
+													<del><em th:text="${#numbers.formatInteger(cancel.ordAmt - cancel.cnclRtnAmt, 1, 'COMMA')}"></em>원</del>
+												</p>
+											</th:block>
+											<p class="price">
+												<span class="selling_price">
+													<em th:text="${#numbers.formatInteger(cancel.realOrdAmt + cancel.pntDcAmt + cancel.gfcdUseAmt, 1, 'COMMA')}"></em>원
+												</span>
+											</p>
+										</div>
+									</div>
+								</a>
+							</div>
+							<div class="goods_select">
+								<div class="select_custom select_count">
+									<div class="combo">
+										<input type="hidden" name="chgQty" value="0" th:attr="ordDtlNo=${cancel.ordDtlNo}, ordCanChgQty=${cancel.ordCanChgQty}"/>
+										<div class="select">수량 0개</div>
+									</div>
+								</div>
+							</div>
+							<th:block th:if="${#lists.size(cancelList.cancelList) == status.count}">
+								<div class="goods_txt">
+									<p class="cf_txt cf_desc">취소하실 상품의 수량을 선택하신 후<br>취소 신청을 하실 수 있습니다.</p>
+								</div>
+							</th:block>
+						</div>
+					</th:block>
+					<!-- //취소상품목록 -->
+					
+				</div>
+			</div>
+			<div class="inner">
+				<div class="tbl_wrap pay_wrap">
+					<div class="tbl_tit"> 
+						<h3>환불 정보</h3>
+						<strong class="pay"><span id="returnAmt">0</span>원</strong>
+					</div>
+					<div class="tbl type1">
+						<table>
+							<colgroup>
+								<col width="227">
+								<col width="*">
+							</colgroup>   
+							<tr>
+								<td>
+									<dl class="refund_deduct">
+										<div>
+											<dt>상품 취소 금액</dt>
+											<dd>
+												<div>
+													<span id="goodsCancelAmt">0</span>원
+												</div>
+											</dd>
+										</div>
+										<div>
+											<dt>배송비</dt>
+											<dd>
+												<div>
+													<span id="deliveryFee">0</span>원
+												</div>
+											</dd>
+										</div>
+										<div>
+											<dt>할인 금액 차감</dt>
+											<dd>
+												<div>
+													<span id="deductDcAmt">0</span>원
+												</div>
+											</dd>
+										</div>
+									</dl>
+									<dl class="refund_detail">
+										<div>
+											<dt>환불 수단</dt>
+											<dd>
+												<div>
+													<span th:if="${paymentInfo.pgGb == 'KCP'}" th:text="${paymentInfo.payMeansNm}"></span>
+													<span th:if="${paymentInfo.pgGb == 'NAVER'}" th:text="|네이버페이|"></span>
+													<span th:if="${paymentInfo.pgGb == 'KAKAO'}" th:text="|카카오페이|"></span>
+													<span th:if="${paymentInfo.pgGb == 'PAYCO'}" th:text="|PAYCO|"></span>
+												</div>
+											</dd>
+										</div>
+										<div>
+											<dt>결제금액 환불</dt>
+											<dd>
+												<div>
+													<span id="refundPayAmt">0</span>원
+												</div>
+											</dd>
+										</div>
+										<div>
+											<dt>포인트 환불</dt>
+											<dd>
+												<div>
+													<span id="refundPoint">0</span>P
+												</div>
+											</dd>
+										</div>
+										<div>
+											<dt>상품권 환불</dt>
+											<dd>
+												<div>
+													<span id="refundGiftCard">0</span>원
+												</div>
+											</dd>
+										</div>
+									</dl>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</div>
+				<div class="desc_txt">카드사로 결제 취소 요청이 전달된 후 환불까지는 평일 기준 3 ~7일이 소요될 수 있습니다.</div>
+				<div class="required_group" id="addDeliveryFee" style="display:none">
+					<p>배송비 <span class="c_primary" id="addPayCost">0원</span> 추가 결제가 필요합니다.</p>
+				</div>
+				<div class="btn_group btn_group_flex">
+					<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);"><span>취소</span></button></div>
+					<div><button type="button" class="btn btn_dark" onclick="fnCancel();"><span>주문 취소</span></button></div>
+				</div>
+			</div>
+		</form>
+	</section>
+</main>
+
+<!-- 210408_취소 수량 선택 팝업 -->
+<th:block th:if="${cancelList.cancelList}" th:each="cancel, status : ${cancelList.cancelList}">
+	<div class="popup_box cancelCountPop">
+		<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" qty=0 onclick="fnChangeCancelQty(this);"><span>수량 0개</span></button>
+					<th:block th:each="num : ${#numbers.sequence(1, cancel.ordCanChgQty)}">
+						<button type="button" th:qty="${num}" onclick="fnChangeCancelQty(this);"><span th:text="|수량 ${num}개|"></span></button>
+					</th:block>
+					<input type="hidden" name="ordDtlNo" th:value="${cancel.ordDtlNo}">
+				</div> 
+			</div>
+		</div>
+	</div>
+</th:block>
+<!-- //210408_취소 수량 선택 팝업 -->
+
+<!-- 210408_ 추가 : 환불 계좌 등록 팝업 -->
+<div id="refundAccountPop" class="popup_box refundAccountPop">
+	<div class="lap">
+		<div class="popup_close">카테고리닫기</div>
+		<div class="popup_head sr-only">
+			<h2 class="">환불 계좌 등록 팝업</h2>
+		</div>
+		<div class="popup_con">
+			<div class="tbl_wrap">
+				<div class="tbl_tit"> 
+					<h3>환불 계좌 등록</h3>
+				</div>
+				<div class="tbl type1">
+					<table>
+						<colgroup>
+							<col width="*">
+						</colgroup>   
+						<tbody>
+							<tr>
+								<th>예금주</th>
+								<td>
+									<div class="form_field">
+										<input type="text" name="accountNm" class="form_control" th:value="${customerInfo.custNm}" placeholder="이름를 입력해 주세요" readonly="readonly">
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<th>은행명</th>
+								<td>
+									<div class="form_field">
+										<div class="select_custom select_bank">
+											<div class="combo">
+												<div class="select">선택</div>
+												<input type="hidden" name="bankCd" value=""/>
+											</div>
+										</div>
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<th>계좌번호</th>
+								<td>
+									<div class="input_wrap certi_wrap">
+										<input type="tel" class="form_control" value="" placeholder="">
+										<button type="button" id="btn_bank_certi" class="btn btn_dark"><span>계좌인증</span></button>
+									</div>
+								</td>
+							</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
+			
+		</div>
+		<div class="pop_foot">
+			<div class="btn_group_flex">
+				<div class="">
+					<button type="submit" id="btn_bank_return" class="btn btn_dark btn_block"><span>계좌 등록 후 환불 신청</span></button>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<!-- //210408_ 추가 : 환불 계좌 등록 토스트 팝업 -->
+
+<!-- 210408_ 추가 : 은행 선택 팝업 -->
+<div id="refundBankPop" class="popup_box refundBankPop">
+	<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">
+				<th:block th:if="${bankList}" th:each="oneData, status : ${bankList}">
+					<button type="button" th:id="|bankCd_${oneData.cd}|"><span th:text="${oneData.cdNm}"></span></button>
+				</th:block>
+			</div>
+		</div>
+	</div>
+</div>
+<!-- //210408_ 추가 : 은행 선택 팝업 -->
+
+<script src="/ux/plugins/gaga/gaga.paging.js"></script>
+<script th:inline="javascript">
+let cancelList 		= [[${cancelList}]];
+let oneData 		= [[${oneData}]];
+let paymentInfo 	= [[${paymentInfo}]];
+let addPayCost 		= 0;
+
+$(document).ready(function() {
+	// 타이틀명
+	$('#htopTitle').text('주문취소');
+});
+
+// 취소수량버튼기능
+$("#cancelForm .select_custom.select_count").each(function(idx){
+	$(this).on("click", function(){
+		// 전체비활성화
+		$(".cancelCountPop").hide();
+		
+		// 수량팝업활성화
+		$(".cancelCountPop").eq(idx).show().addClass("active");
+		$("body").css({"overflow":"hidden"});
+	});
+});
+
+// 취소 처리
+var fnCancel = function() {
+	// 주문상세번호 및 취소 수량 설정
+	let ordDtlNoArr 			= [];
+	let cnclRtnReqQtyArr 		= [];
+	let chkQty 					= 0;
+	
+	$.each($('#cancelForm input[name=chgQty]'), function(idx, item) {
+		let chgQty 		= $(item).val();
+		let ordDtlNo 	= $(item).attr('ordDtlNo');
+		
+		ordDtlNoArr.push(Number(ordDtlNo));
+		cnclRtnReqQtyArr.push(Number(chgQty));
+		chkQty += chgQty;
+	});
+
+	// 취소 수량 체크
+	if (chkQty == 0) {
+		mcxDialog.alert('취소하실 상품의 수량을 선택해주세요.');
+		return false;
+	}
+
+	// 환불계좌 체크
+	let accountNo 	= $('#cancelForm input[name=accountNo]').val();
+	let accountNm 	= $('#cancelForm input[name=accountNm]').val();
+	let bankCd 		= $('#cancelForm input[name=bankCd]').val();
+
+	// 무통장입금, 결제완료 일때 환불계좌정보 체크
+	if (paymentInfo.payMeans == 'G014_20' && paymentInfo.payStat == 'G016_30' && (gagajf.isNull(accountNo) || gagajf.isNull(accountNm) || gagajf.isNull(bankCd))) {
+		let data = {};
+		data.ordNo 			= oneData.ordNo;
+		data.accountNm 		= oneData.accountNm;
+		
+		$('#refundAccountPop').show().addClass("active");
+		$("body").css({"overflow":"hidden"});
+		
+		return false;
+	}
+
+	// 취소요청 데이터 설정
+	let url = '/noMember/cancel';
+
+	// 취소 처리
+	let data 				= {};
+	data.ordNo 				= oneData.ordNo;
+	data.chgReason 			= 'G686_10';
+	data.chgReasonNm 		= '고객변심';
+	data.accountNo 			= accountNo;
+	data.accountNm 			= accountNm;
+	data.bankCd 			= bankCd;
+	data.isCustomer 		= 'Y';
+	data.reqGbn 			= 'cnclComplete';
+	data.pgTid 				= paymentInfo.pgTid;
+	data.payAmt 			= paymentInfo.payAmt;
+	data.ordDtlNoArr 		= ordDtlNoArr;
+	data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
+
+	let jsonData = JSON.stringify(data);
+	
+	// 취소 처리 가능 여부 조회
+	gagajf.ajaxJsonSubmit('/mypage/wms/cancel/available', jsonData, function(result) {
+		if (result.cancelYn == 'Y') {
+			// 취소 처리
+			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+				cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
+			});
+		} else {
+			mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');
+		}
+	});
+}
+
+// 취소 수량 변경 이벤트 처리
+var fnChangeCancelQty = function(param) {
+	let url = '/mypage/cancel/refund/amt/calculate';
+	
+	// 취소수량설정
+	if (param != null) {
+		$("#cancelForm input[name=chgQty]").each(function(idx){
+			var ordDtlNo = $(this).attr("ordDtlNo");
+			if (ordDtlNo == $(param).parent().find("input[name=ordDtlNo]").val()) {
+				$(this).val($(param).attr("qty"));
+				$(this).parent().find(".select").text($(param).find("span").text());
+			}
+		});
+	}
+
+	// 취소 수량 설정
+	let cnclRtnReqQtyArr 	= [];
+	let ordDtlNoArr 		= [];
+	let ordCanChgQtyArr 	= [];
+	
+	$.each($('#cancelForm input[name=chgQty]'), function(idx, item) {
+		let chgQty 			= $(item).val();
+		let ordDtlNo		= $(item).attr('ordDtlNo');
+		let ordCanChgQty 	= $(item).attr('ordCanChgQty');
+		
+		cnclRtnReqQtyArr.push(Number(chgQty));
+		ordDtlNoArr.push(Number(ordDtlNo));
+		ordCanChgQtyArr.push(Number(ordCanChgQty));
+	});
+
+	let data = {};
+	data.ordNo 				= oneData.ordNo;
+	data.ordDtlNoArr 		= ordDtlNoArr;
+	data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
+
+	let jsonData = JSON.stringify(data);
+
+	gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
+		// 환불포인트, 환불상품권 금액 계산
+		let refundPoint 		= Number(result.spanPntDcAmt);
+		let refundGiftCard 		= Number(result.spanGfcdUseAmt);
+
+		let spanCnclRtnAmt 		= Number(result.spanCnclRtnAmt);
+		let sumDeliveryFee 		= Number(result.sumDeliveryFee);
+		let spanTotDeliveryFee 	= Number(result.spanTotDeliveryFee);
+		let spanCpnDcAmt 		= Number(result.spanCpnDcAmt);
+		let spanTmtbDcAmt 		= Number(result.spanTmtbDcAmt);
+		let spanPrePntDcAmt 	= Number(result.spanPrePntDcAmt);
+		let spanRefundAmt 		= Number(result.spanRefundAmt);
+
+		let goodsCancelAmt 		= spanCnclRtnAmt;											// 상품취소금액
+		let deliveryFee 		= sumDeliveryFee - spanTotDeliveryFee;						// 배송비
+		let deductDcAmt 		= 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;		// 할인금액 차감(쿠폰+다다익선+선포인트)
+		let refundPayAmt 		= spanRefundAmt;											// 결제금액 환불
+		let returnAmt 			= refundPayAmt + refundPoint + refundGiftCard;				// 환불예정금액
+
+		// 추가배송비 영역 설정
+		if (refundPayAmt < 0) {
+			refundPayAmt = spanRefundAmt;
+			$('#addDeliveryFee').css('display', '');
+			$('#addPayCost').text(spanTotDeliveryFee.addComma() + '원');
+			addPayCost = spanTotDeliveryFee;
+		} else {
+			$('#addPayCost').text(spanTotDeliveryFee.addComma() + '원');
+			addPayCost = 0;
+		}
+
+		// 금액 설정
+		$('#returnAmt').text(returnAmt.addComma());
+		$('#goodsCancelAmt').text(goodsCancelAmt.addComma());
+		$('#deliveryFee').text(deliveryFee.addComma());
+		$('#deductDcAmt').text(deductDcAmt.addComma());
+		$('#refundPayAmt').text(refundPayAmt.addComma());
+		$('#refundPoint').text(refundPoint.addComma());
+		$('#refundGiftCard').text(refundGiftCard.addComma());
+	});
+}
+
+let isValid = false;
+
+// 계좌인증
+$('#btn_bank_certi').on('click', function () {
+	
+	if (gagajf.isNull($('#refundAccountPop input[name=bankCd]').val())) {
+		mcxDialog.alert('은행을 선택해주세요.');
+		return false;
+	}
+	
+	if (gagajf.isNull($('#refundAccountPop input[name=accountNo]').val())) {
+		mcxDialog.alert('계좌번호를 입력해주세요.');
+		return false;
+	}
+	
+	if (!isValid) {
+		let url 		= '/mypage/account/check';
+		let accountNm 	= $('#refundAccountPop input[name=accountNm]').val();
+		let accountNo 	= $('#refundAccountPop input[name=accountNo]').val();
+		let bankCd 		= $('#refundAccountPop input[name=bankCd]').val();
+		
+		let data = {};
+		data.accountNm 	= accountNm;
+		data.accountNo 	= accountNo;
+		data.bankCd 	= bankCd;
+		data.ordNo 		= ordNo;
+		
+		let jsonData = JSON.stringify(data);
+		
+		gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
+			isValid = result.isValid;
+			
+			if (isValid) {
+				mcxDialog.alert('계좌인증에 성공했습니다.');
+				// 계좌인증 성공 시 Disabled 처리
+				$('#refundAccountPop .select_custom.select_bank').attr('disabled', true);
+				$('#refundAccountPop input[name=accountNo]').attr('disabled', true);
+				return false;
+			} else {
+				mcxDialog.alert('계좌정보를 다시 확인해주세요.');
+				return false;
+			}
+		});
+	}
+});
+
+//계좌등록 후 환불신청 버튼 클릭 이벤트
+$('#btn_bank_return').click(function() {
+	if (isValid) {
+		let accountNm 	= $('#refundAccountPop input[name=accountNm]').val();
+		let accountNo 	= $('#refundAccountPop input[name=accountNo]').val();
+		let bankCd 		= $('#refundAccountPop input[name=bankCd]').val();
+		
+		// 부모창의 input 값으로 환불계좌정보 설정
+		$('#returnForm input[name=accountNo]').val(accountNo);
+		$('#returnForm input[name=accountNm]').val(accountNm);
+		$('#returnForm input[name=bankCd]').val(bankCd);
+
+		// 팝업 닫기
+		$(".close-modal").trigger("click");
+		
+		// 취소신청
+		fnCancel();
+	} else {
+		mcxDialog.alert('계좌인증이 필요합니다.');
+	}
+});
+
+//팝업_닫기
+$('.popup_close').on("click",function(){
+	$('.popup_box').hide().removeClass('active');
+	$("body").css({"overflow":"visible"});
+});
+</script>
+
+<script>
+// 버튼 색
+$(document).on('click','.popup_box .button_list button',function(){
+	$('.popup_box .button_list button').removeClass('on');
+	$(this).addClass('on');
+});
+
+// 210408_송장번호 input 글자 수 제한
+function handleOnInput(el, maxlength) {
+	if(el.value.length > maxlength)  {
+		el.value = el.value.substr(0, maxlength);
+	}
+}
+
+$(document).ready(function(){
+	/*
+	// 세부 사유 글자 수 제한
+	$('.doc_return').keyup(function(e){
+		var content = $(this).val();
+		$('#return_cnt').html(content.length);
+		if (content.length > 200){
+			mcxDialog.alert("최대 200자까지 입력 가능합니다."); //210420_수정 : 시스템 alert -> dialog 변경.
+			$(this).val(content.substring(0, 200));
+			$('#return_cnt').html("200");
+		}
+	});
+
+	//210408_추가 : 스크립트 추가.
+	//반품회수방법 선택 스크립트 추가
+	$(document).on('change','.my_return .retrieve_method #rdi_retrieve_visit',function(e){
+		$('.my_return .retrieve_box.direct').hide();
+		$('.my_return .retrieve_box.visit').show();
+		return false;
+	}).on('change','.my_return .retrieve_method #rdi_retrieve_direct',function(e){
+		$('.my_return .retrieve_box.visit').hide();
+		$('.my_return .retrieve_box.direct').show();
+		return false;
+	});
+
+	//버튼 색
+	$(document).on('click','.popup_box .button_list button',function(){
+		$('.popup_box .button_list button').removeClass('on');
+		$(this).addClass('on');
+	});
+
+	// 반품 수량 선택 팝업
+	//$(document).on("click",".select_custom.select_count",function(e){
+		//$('#returnCountPop').show().addClass("active");
+		//$("body").css({"overflow":"hidden"});
+	//});
+
+	//반품 사유 선택 팝업
+	$(document).on("click",".select_custom.select_return",function(e){
+		$('#returnReasonPop').show().addClass("active");
+		$("body").css({"overflow":"hidden"});
+	});
+
+	//팝업_닫기
+	$('.popup_close').on("click",function(){
+		$('.popup_box').hide().removeClass('active');
+		$("body").css({"overflow":"visible"});
+	});
+
+	//배송지추가_팝업
+	$(document).on('click','#btn_adrsAdd_pop',function(e){
+		$("#adrsAddPop").modal("show");
+		return false;
+	});      
+	$("#adrsAddPop_close").click(function() {
+		$("#adrsAddPop").modal("hide");
+	});
+
+	//배송지정보_팝업
+	$(document).on('click','#btn_adrsChange_pop',function(e){
+		$("#adrsChangePop").modal("show");
+		return false;
+	});
+	$("#adrsChangePop_close").click(function() {
+		$("#adrsChangePop").modal("hide");
+	});
+
+	//배송지수정_팝업
+	$(document).on('click','#btn_addrModify_pop',function(e){
+		$("#adrsModifyPop").modal("show");
+		return false;
+	});
+	$("#adrsModifyPop_close").click(function() {
+		$("#adrsModifyPop").modal("hide");
+	});
+
+	$(document).on("click", "#btn_order_return", function(){
+		mcxDialog.alert("반품 신청이 접수되었습니다.", {
+				//alert("반품하실 상품의 수량을 선택해주세요.") : 클릭 시 반품 수량을 모두 0개로 선택한 경우
+				//alert("반품 사유를 선택해주세요.") : 반품 사유를 선택하지 않는 경우
+			sureBtnText: "확인",  // Confirmation button text
+		});
+	});
+	*/
+
+});
+</script>
+
+</th:block>
+
+</body>
+</html>

+ 20 - 7
src/main/webapp/WEB-INF/views/mob/mypage/NoMemberCreListFormMob.html

@@ -31,6 +31,19 @@
 
 <main role="" id="" class="container my">
 	<section class="content my_order"> <!-- 210409_수정 : class my_return 변경 -->
+		<!-- page nav -->
+		<nav class="pnb">
+			<ul>
+				<li>
+					<a href="javascript:void(0)" onclick="cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);">주문확인/배송조회</a>
+				</li>
+				<li>
+					<a href="javascript:void(0)" class="on" onclick="cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);">취소/반품/교환내역</a>
+				</li>
+			</ul>
+		</nav>
+		<!-- //page nav -->
+
 		<div class="inner">
 			<div class="order_sort">
 				<a href="javascript:void(0);" class="od_date_btn">최근 3개월</a>
@@ -157,7 +170,7 @@ $(document).ready(function() {
 
 		$("#odStatusPop .popup_con button").removeClass("on");
 
-		// 기간설정
+		// 상태값설정
 		$("#odStatusPop .popup_con button").each(function() {
 			var tempCode = $(this).attr("code");
 			if (tempCode == code) {
@@ -281,12 +294,12 @@ var fnGoToDeliveryTrack = function(param) {
 </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).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(){

+ 26 - 15
src/main/webapp/WEB-INF/views/mob/mypage/NoMemberOrderListFormMob.html

@@ -172,20 +172,31 @@ $(document).ready(function() {
 
 	// 주문상세상태코드 셀렉트박스 변경 이벤트
 	$('#odStatusPop .popup_con .button_list .ordDtlStat').on('click', function() {
-		$('#searchForm input[name=ordDtlStat]').val($(this).attr('code'));
-		jsonObj.ordDtlStat = $(this).attr('code');
-		
-		// 상태값 명칭
-		var ordDtlStatNm = $(this).find("span").text();
-		$(".container .my_order .od_status_btn").text(ordDtlStatNm);
-		
+		let code = $(this).attr('code');
+		$('#searchForm input[name=ordDtlStat]').val(code);
+		jsonObj.ordDtlStat = 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");
 	});
 });
@@ -297,12 +308,12 @@ $(function() { gagaInfiniteScroll.getHistory(); });
 </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).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(){

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

@@ -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, 'noMember');"><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';
 					}
 
 					// 쇼핑백담기 버튼(구매확정)