개선 #1039 [FRONT] 리뷰 작성 가능 상태 코드 변경

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

@@ -412,7 +412,7 @@
 				  FROM TB_ORDER O
 				 INNER JOIN TB_ORDER_DETAIL OD
 				    ON O.ORD_NO = OD.ORD_NO
-				   AND OD.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60') -- 구매 확정인것만
+				   AND OD.ORD_DTL_STAT = 'G013_70' -- 구매 확정인것만
 				 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 				    ON OD.ORD_NO = ODI.ORD_NO
 				   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
@@ -608,7 +608,7 @@
 				  FROM TB_ORDER O
 				 INNER JOIN TB_ORDER_DETAIL OD
 				    ON O.ORD_NO = OD.ORD_NO
-				   AND OD.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60') -- 구매 확정인것만
+				   AND OD.ORD_DTL_STAT = 'G013_70' -- 구매 확정인것만
 				 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 				    ON OD.ORD_NO = ODI.ORD_NO
 				   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
@@ -693,7 +693,7 @@
 			      ,B.BRAND_ENM 
 			      ,DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL #{reviewExpireDay} DAY),NOW()) AS DT -- 남은시간
 			FROM TB_ORDER O INNER JOIN TB_ORDER_DETAIL OD ON O.ORD_NO = OD.ORD_NO 
-								 				 AND OD.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60') --  구매 확정인것만
+								 				 AND OD.ORD_DTL_STAT = 'G013_70' --  구매 확정인것만
 			                INNER JOIN TB_ORDER_DETAIL_ITEM ODI ON OD.ORD_DTL_NO = ODI.ORD_DTL_NO 
 			                  					 AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 			                INNER JOIN TB_GOODS G ON G.GOODS_CD = OD.GOODS_CD 
@@ -851,7 +851,7 @@
 			      ,B.BRAND_ENM 
 			      ,DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL 90 DAY),NOW()) AS DT -- 남은시간
 			FROM TB_ORDER O INNER JOIN TB_ORDER_DETAIL OD ON O.ORD_NO = OD.ORD_NO 
-								 				 AND OD.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60') --  구매 확정인것만
+								 				 AND OD.ORD_DTL_STAT = 'G013_70' --  구매 확정인것만
 			                INNER JOIN TB_ORDER_DETAIL_ITEM ODI ON OD.ORD_DTL_NO = ODI.ORD_DTL_NO 
 			                  					 AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
 			                INNER JOIN TB_GOODS G ON G.GOODS_CD = OD.GOODS_CD 
@@ -1005,7 +1005,7 @@
 		    FROM TB_ORDER O
 		   INNER JOIN TB_ORDER_DETAIL OD
 		      ON O.ORD_NO = OD.ORD_NO
-		      AND OD.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60') -- 구매 확정인것만
+		      AND OD.ORD_DTL_STAT = 'G013_70' -- 구매 확정인것만
 		   INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		      ON OD.ORD_NO = ODI.ORD_NO
 		     AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO

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

@@ -31,8 +31,8 @@
 	<section class="content my_return"> <!-- 210409_수정 : class my_return 변경 -->
 		<div class="inner">
 			<div class="order_sort">
-				<a href="javascript:void(0);" class="od_date_btn">최근 1주일</a>
-				<a href="javascript:void(0);" class="od_status_btn">전체상태</a>
+				<a href="javascript:void(0);" class="od_date_btn" id="od_date_btn">최근 1주일</a>
+				<a href="javascript:void(0);" class="od_status_btn" id="od_status_btn">전체상태</a>
 			</div>
 		</div>
 		
@@ -139,6 +139,7 @@ $(document).ready(function() {
 $(window).on("pageshow", function(event) {
 	if ((event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2)) {
 		// 캐쉬페이징
+		fnGetPrePageInfo();
 	} else {
 		// 2021.05.28 인피니티스크롤 초기화
 		fnMypageCreListInfiniteScrollInit();
@@ -295,7 +296,10 @@ $('#odStatusPop .popup_con .button_list .ordDtlStat').on('click', function() {
 // 2021.04.21 인피니티 스크롤 기능 구현전 추후 수정
 var fnMypageCreListInfiniteScrollInit = function(){
 	sessionStorage.removeItem(document.location.href);
-	
+	localStorage.setItem('scrollpos', '0');
+	localStorage.setItem('pageNo', '0');
+	localStorage.setItem('period', '');
+	localStorage.setItem('code', '');
 	pageNo = 0;
 	
 	// History 초기화
@@ -304,9 +308,8 @@ var fnMypageCreListInfiniteScrollInit = function(){
 
 // 취반교 상세 페이지 이동
 var fnGoToCreDetail = function(param) {
-	// 2021.05.27 인피니스크롤위치이동
-	let scrollpos = $(window).scrollTop();
-	localStorage.setItem('scrollpos', scrollpos);
+	// 이전 페이지 정보 세션 저장
+	fnSetPrePageInfo()
 	
 	let ordNo = $(param).attr('ordNo');
 	let ordChgSq = $(param).attr('ordChgSq');

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

@@ -201,12 +201,6 @@
 										<!-- //교환불가, 반품불가 -->
 
 <!--										<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>
 								<!-- //배송중 (교환가능, 반품가능) -->
@@ -269,16 +263,6 @@
 											</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:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:goodsCd="${ordDtl.goodsCd}" onclick="fnCreateReview(this);">
-													<span>리뷰 쓰기</span>
-												</button>
-											</div>
-										</th:block>
-										<!-- //리뷰사용가능, 리뷰등록전일때 -->
 									</div>
 								</th:block>
 								<!-- //배송완료 (교환가능, 반품가능) -->

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

@@ -222,13 +222,13 @@
 										</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>
+											<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>
+										<!-- //배송조회 -->
 									</div>
 								</th:block>
 								<!-- //배송중 (교환가능, 반품가능) -->
@@ -236,15 +236,6 @@
 								<!-- 배송완료 (교환가능, 반품가능) -->
 								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_60'">
 									<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>
@@ -263,6 +254,22 @@
 											</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.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' and ${ordDtl.returnableYn} == 'N'">
 											<div>
@@ -291,20 +298,10 @@
 											</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:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:goodsCd="${ordDtl.goodsCd}" onclick="fnCreateReview(this);">
-													<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">

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

@@ -93,8 +93,8 @@
 		<th:block th:if="${mypageMainYn} == 'N'">
 			<div class="inner">
 				<div class="order_sort">
-					<a href="javascript:void(0);" class="od_date_btn">최근 1주일</a>
-					<a href="javascript:void(0);" class="od_status_btn">전체상태</a>
+					<a href="javascript:void(0);" class="od_date_btn" id="od_date_btn">최근 1주일</a>
+					<a href="javascript:void(0);" class="od_status_btn" id="od_status_btn">전체상태</a>
 				</div>
 			</div>
 		</th:block>
@@ -226,6 +226,7 @@ $(document).ready(function() {
 $(window).on("pageshow", function(event) {
 	if ((event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2)) {
 		// 캐쉬페이징
+		fnGetPrePageInfo();
 	} else {
 		// 인피니티스크롤 초기화
 		fnMypageOrderListInfiniteScrollInit();
@@ -401,6 +402,9 @@ $('#odStatusPop .popup_con .button_list .ordDtlStat').on('click', function() {
 var fnMypageOrderListInfiniteScrollInit = function(){
 	sessionStorage.removeItem(document.location.href);
 	localStorage.setItem('scrollpos', '0');
+	localStorage.setItem('pageNo', '0');
+	localStorage.setItem('period', '');
+	localStorage.setItem('code', '');
 	pageNo = 0;
 	
 	// History 초기화

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

@@ -226,13 +226,13 @@
 									</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>
+										<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>
+									<!-- //배송조회 -->
 								</div>
 							</th:block>
 							<!-- //배송중 (교환가능, 반품가능) -->
@@ -240,15 +240,6 @@
 							<!-- 배송완료 (교환가능, 반품가능) -->
 							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_60'">
 								<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="fnGoToOneToOnePage();">
-												<span>1:1 문의</span>
-											</button>
-										</div>
-									</th:block>
-									<!-- //교환불가 -->
 									<!-- 교환가능 -->
 									<th:block th:if="${ordDtl.changeableYn} == 'Y'">
 										<div>
@@ -267,6 +258,22 @@
 										</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.changeableYn} == 'N' and ${ordDtl.returnableYn} == 'Y'">
+										<div>
+											<button type="button" class="btn btn_default btn_qna_write" onclick="fnGoToOneToOnePage();">
+												<span>1:1 문의</span>
+											</button>
+										</div>
+									</th:block>
+									<!-- //교환불가 -->
 									<!-- 반품불가 -->
 									<th:block th:if="${ordDtl.changeableYn} == 'Y' and ${ordDtl.returnableYn} == 'N'">
 										<div>
@@ -295,16 +302,6 @@
 										</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:ordNo="${ordDtl.ordNo}" th:ordDtlNo="${ordDtl.ordDtlNo}" th:goodsCd="${ordDtl.goodsCd}" onclick="fnCreateReview(this);">
-												<span>리뷰 쓰기</span>
-											</button>
-										</div>
-									</th:block>
-									<!-- //리뷰사용가능, 리뷰등록전일때 -->
 								</div>
 							</th:block>
 							<!-- //배송완료 (교환가능, 반품가능) -->

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

@@ -158,6 +158,7 @@ $(document).ready(function() {
 $(window).on("pageshow", function(event) {
 	if ((event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2)) {
 		// 캐쉬페이징
+		fnGetPrePageInfo();
 	} else {
 		// 2021.05.28 인피니티스크롤 초기화
 		fnMypageCreListInfiniteScrollInit();
@@ -314,7 +315,10 @@ $('#odStatusPop .popup_con .button_list .ordDtlStat').on('click', function() {
 // 인피니티 스크롤 초기화
 var fnMypageCreListInfiniteScrollInit = function(){
 	sessionStorage.removeItem(document.location.href);
-	
+	localStorage.setItem('scrollpos', '0');
+	localStorage.setItem('pageNo', '0');
+	localStorage.setItem('period', '');
+	localStorage.setItem('code', '');
 	pageNo = 0;
 	
 	// History 초기화
@@ -323,9 +327,8 @@ var fnMypageCreListInfiniteScrollInit = function(){
 
 // 취반교 상세 페이지 이동
 var fnGoToCreDetail = function(param) {
-	// 2021.05.27 인피니스크롤위치이동
-	let scrollpos = $(window).scrollTop();
-	localStorage.setItem('scrollpos', scrollpos);
+	// 이전 페이지 정보 세션 저장
+	fnSetPrePageInfo()
 	
 	let ordChgSq = $(param).attr('ordChgSq');
 	let chgGb = $(param).attr('chgGb');

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

@@ -146,6 +146,7 @@ $(document).ready(function() {
 $(window).on("pageshow", function(event) {
 	if ((event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2)) {
 		// 캐쉬페이징
+		fnGetPrePageInfo();
 	} else {
 		// 인피니티스크롤 초기화
 		fnMypageOrderListInfiniteScrollInit();
@@ -300,7 +301,10 @@ $('#odStatusPop .popup_con .button_list .ordDtlStat').on('click', function() {
 // 인피니티 스크롤 초기화
 var fnMypageOrderListInfiniteScrollInit = function(){
 	sessionStorage.removeItem(document.location.href);
-	
+	localStorage.setItem('scrollpos', '0');
+	localStorage.setItem('pageNo', '0');
+	localStorage.setItem('period', '');
+	localStorage.setItem('code', '');
 	pageNo = 0;
 	
 	// History 초기화

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

@@ -570,10 +570,6 @@
 	
 	// 취반교 상세 페이지 이동
 	var fnGoToCreDetail = function(param) {
-		// 2021.05.27 인피니스크롤위치이동
-		let scrollpos = $(window).scrollTop();
-		localStorage.setItem('scrollpos', scrollpos);
-		
 		let ordNo = $(param).attr('ordNo');
 		let ordChgSq = $(param).attr('ordChgSq');
 		let chgGb = $(param).attr('chgGb');

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

@@ -166,7 +166,7 @@
 													</th:block>
 
 													<!-- 배송조회 버튼(배송중) -->
-													<th:block th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55'}">
+													<th:block th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55' or ordDtl.ordDtlStat == 'G013_60'}">
 <!--														<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>-->
 													</th:block>
 
@@ -176,7 +176,7 @@
 													</th:block>
 
 													<!-- 리뷰작성 버튼(구매확정) -->
-													<th:block th:if="${(ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55' or ordDtl.ordDtlStat == 'G013_60' or ordDtl.ordDtlStat == 'G013_70') and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
+													<th:block th:if="${ordDtl.ordDtlStat == 'G013_70' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
 														<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>
 													</th:block>
 

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

@@ -171,8 +171,8 @@
 															</th:block>
 														</th:block>
 														
-														<!-- 배송조회 버튼(배송중) -->
-														<th:block th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55'}">
+														<!-- 배송조회 버튼(배송중, 배송완료) -->
+														<th:block th:if="${ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55' or ordDtl.ordDtlStat == 'G013_60'}">
 															<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>
 														</th:block>
 	
@@ -182,7 +182,7 @@
 														</th:block>
 	
 														<!-- 리뷰작성 버튼(구매확정) -->
-														<th:block th:if="${(ordDtl.ordDtlStat == 'G013_50' or ordDtl.ordDtlStat == 'G013_55' or ordDtl.ordDtlStat == 'G013_60' or ordDtl.ordDtlStat == 'G013_70') and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
+														<th:block th:if="${ordDtl.ordDtlStat == 'G013_70' and ordDtl.reviewableYn == 'Y' and ordDtl.reviewSq == null}">
 															<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}, goodsCd=${ordDtl.goodsCd}" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>
 														</th:block>
 	

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

@@ -554,8 +554,8 @@
 							}
 						}
 
-						// 배송조회 버튼(배송중)
-						if (ordDtl.ordDtlStat == 'G013_50' || ordDtl.ordDtlStat == 'G013_55') {
+						// 배송조회 버튼(배송중, 배송완료)
+						if (ordDtl.ordDtlStat == 'G013_50' || ordDtl.ordDtlStat == 'G013_55' || ordDtl.ordDtlStat == 'G013_60') {
 							tag += '											<p><button type="button" class="btn btn_default btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" shipCompCd="' + ordDtl.shipCompCd + '" invoiceNo="' + ordDtl.invoiceNo + '" onclick="fnGoToDelivery(this);"><span>배송 조회</span></button></p>\n';
 						}
 
@@ -564,8 +564,8 @@
 							tag += '											<p><button type="button" class="btn btn_primary_line btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnDecideOrder(this);"><span>구매 확정</span></button></p>\n';
 						}
 
-						// 리뷰작성 버튼(배송중, 배송완료, 구매확정)
-						if ((ordDtl.ordDtlStat == 'G013_50' || ordDtl.ordDtlStat == 'G013_55' || ordDtl.ordDtlStat == 'G013_60' || ordDtl.ordDtlStat == 'G013_70') && ordDtl.reviewableYn == 'Y' && ordDtl.reviewSq == null) {
+						// 리뷰작성 버튼(구매확정)
+						if (ordDtl.ordDtlStat == 'G013_70' && ordDtl.reviewableYn == 'Y' && ordDtl.reviewSq == null) {
 							tag += '											<p><button type="button" class="btn btn_primary_line btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" goodsCd="' + ordDtl.goodsCd + '" onclick="fnCreateReview(this);"><span>리뷰 쓰기</span></button></p>\n';
 						}
 

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

@@ -552,10 +552,6 @@
 	
 	// 취반교 상세 페이지 이동
 	var fnGoToCreDetail = function(param) {
-		// 2021.05.27 인피니스크롤위치이동
-		let scrollpos = $(window).scrollTop();
-		localStorage.setItem('scrollpos', scrollpos);
-		
 		let ordChgSq = $(param).attr('ordChgSq');
 		let chgGb = $(param).attr('chgGb');
 		let url = '';

src/main/webapp/biz/mypage.js

@@ -53,9 +53,8 @@ var fnSetNoMemberLocation = function(depth3, depth4) {
 
 // 주문상세보기 버튼 클릭 이벤트 처리
 var fnGoToOrderDetail = function(param, noMember) {
-	// 2021.05.27 인피니스크롤위치이동
-	let scrollpos = $(window).scrollTop();
-	localStorage.setItem('scrollpos', scrollpos);
+	// 이전 페이지 정보 세션 저장
+	fnSetPrePageInfo()
 	
 	if (noMember == 'noMember') {
 		cfnGoToPage(_PAGE_NOMEMBER_ORDER_DETAIL);
@@ -67,9 +66,8 @@ var fnGoToOrderDetail = function(param, noMember) {
 
 // 상품상세 페이지 이동 처리
 var fnGoToGoodsDetail = function(param) {
-	// 2021.05.27 인피니스크롤위치이동
-	let scrollpos = $(window).scrollTop();
-	localStorage.setItem('scrollpos', scrollpos);
+	// 이전 페이지 정보 세션 저장
+	fnSetPrePageInfo()
 	
 	let goodsCd = $(param).attr('goodsCd');
 	let colorCd = $(param).attr('optCd1');
@@ -79,18 +77,16 @@ var fnGoToGoodsDetail = function(param) {
 
 // 1:1문의 페이지 이동 처리
 var fnGoToOneToOnePage = function(param) {
-	// 2021.05.27 인피니스크롤위치이동
-	let scrollpos = $(window).scrollTop();
-	localStorage.setItem('scrollpos', scrollpos);
+	// 이전 페이지 정보 세션 저장
+	fnSetPrePageInfo()
 	
 	cfnGoToPage(_PAGE_ONETOONE_QNA);
 }
 
 // 배송조회 버튼 클릭 이벤트
 var fnGoToDelivery = function(param, noMember) {
-	// 2021.05.27 인피니스크롤위치이동
-	let scrollpos = $(window).scrollTop();
-	localStorage.setItem('scrollpos', scrollpos);
+	// 이전 페이지 정보 등록
+	fnSetPrePageInfo();
 	
 	let url = '';
 	
@@ -145,9 +141,8 @@ var fnDecideOrder = function(param) {
 
 // 리뷰작성 버튼 클릭 이벤트
 var fnCreateReview = function(param) {
-	// 2021.05.27 인피니스크롤위치이동
-	let scrollpos = $(window).scrollTop();
-	localStorage.setItem('scrollpos', scrollpos);
+	// 이전 페이지 정보 세션 저장
+	fnSetPrePageInfo()
 	
 	let ordNo = $(param).attr('ordNo');
 	let ordDtlNo = $(param).attr('ordDtlNo');
@@ -214,9 +209,8 @@ var fnReSendSms = function(param) {
 
 // 반품/취소/교환 버튼 클릭 이벤트
 var fnCreateChange = function(param, gubun, noMember) {
-	// 2021.05.27 인피니스크롤위치이동
-	let scrollpos = $(window).scrollTop();
-	localStorage.setItem('scrollpos', scrollpos);
+	// 이전 페이지 정보 세션 저장
+	fnSetPrePageInfo()
 	
 	let ordCanChgQty = $(param).attr('ordCanChgQty');
 	let str = '';
@@ -564,3 +558,53 @@ var fnSetInitPeriod = function() {
 	$('#stDate').val(stDate);
 	$('#searchForm input[name=stDate]').val(stDate);
 }
+
+// 이전 페이지 정보 세션 저장
+var fnSetPrePageInfo = function() {
+	// 인피니스크롤위치이동
+	let scrollpos = $(window).scrollTop();
+	localStorage.setItem('scrollpos', scrollpos);
+	
+	// PageNo 저장
+	let pageNo = $("#searchForm input[name=pageNo]").val();
+	localStorage.setItem('pageNo', pageNo);
+
+	// 검색기간 저장
+	$.each($('#odDatePop button'), function(idx, item) {
+		if ($(item).hasClass('on')) {
+			localStorage.setItem('period', $(item).attr('period'));
+		}
+	});
+
+	// 상태값 저장
+	$.each($('#odStatusPop button'), function(idx, item) {
+		if ($(item).hasClass('on')) {
+			localStorage.setItem('code', $(item).attr('code'));
+		}
+	});
+}
+
+// 캐쉬페이징 정보 설정
+var fnGetPrePageInfo = function() {
+	pageNo = localStorage.getItem('pageNo');
+	
+	var period = localStorage.getItem('period');
+	$.each($('#odDatePop button'), function(idx, item) {
+		if ($(item).attr('period') == period) {
+			$(item).addClass('on');
+			$('#od_date_btn').text($(item).children().text());
+		} else {
+			$(item).removeClass('on');
+		}
+	});
+	
+	var code = localStorage.getItem('code');
+	$.each($('#odStatusPop button'), function(idx, item) {
+		if ($(item).attr('code') == code) {
+			$(item).addClass('on');
+			$('#od_status_btn').text($(item).children().text());
+		} else {
+			$(item).removeClass('on');
+		}
+	});
+}