Merge branch 'card007' into develop

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

@@ -147,7 +147,7 @@
 								<td>
 									<div class="select_custom select_exchange">
 										<div class="combo">
-											<div class="select">사이즈 변경</div>
+											<div class="select">교환 사유를 선택하세요.</div>
 										</div>
 									</div>
 								</td>
@@ -373,9 +373,6 @@ $(document).ready(function() {
 		$('#withdraw').click();
 		$('.wdGb').css('display','none');
 	}
-
-	// 교환사유 선택 처리
-	$('#exchangeReasonPop .lap .popup_con .button_list button').eq(0).click();
 });
 
 // 교환수량버튼기능

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

@@ -121,7 +121,7 @@
 								<td>
 									<div class="select_custom select_return">
 										<div class="combo">
-											<div class="select">단순 변심</div>
+											<div class="select">반품 사유를 선택하세요.</div>
 										</div>
 									</div>
 								</td>
@@ -470,9 +470,6 @@ $(document).ready(function() {
 
 	// 타이틀명
 	$('#htopTitle').text('반품 신청');
-
-	// 반품사유 선택 처리
-	$('#returnReasonPop .lap .popup_con .button_list button').eq(0).click();
 });
 
 // 반품수량버튼기능

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

@@ -146,7 +146,7 @@
 								<td>
 									<div class="select_custom select_exchange">
 										<div class="combo">
-											<div class="select">사이즈 변경</div>
+											<div class="select">교환 사유를 선택하세요.</div>
 										</div>
 									</div>
 								</td>
@@ -372,9 +372,6 @@ $(document).ready(function() {
 
 	// 타이틀명
 	$('#htopTitle').text('교환 신청');
-
-	// 교환사유 선택 처리
-	$('#exchangeReasonPop .lap .popup_con .button_list button').eq(0).click();
 });
 
 // 교환수량버튼기능

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

@@ -120,7 +120,7 @@
 								<td>
 									<div class="select_custom select_return">
 										<div class="combo">
-											<div class="select">단순 변심</div>
+											<div class="select">반품 사유를 선택하세요.</div>
 										</div>
 									</div>
 								</td>
@@ -469,9 +469,6 @@ $(document).ready(function() {
 
 	// 타이틀명
 	$('#htopTitle').text('반품 신청');
-
-	// 반품사유 선택 처리
-	$('#returnReasonPop .lap .popup_con .button_list button').eq(0).click();
 });
 
 // 반품수량버튼기능

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

@@ -157,7 +157,7 @@
 				</div>
 				<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="pageSize" value=10 />
 					<input type="hidden" name="pageUnit" value=10 />
 					<input type="hidden" name="chgStat" value="" />
 					<input type="hidden" name="stDate" value="" />
@@ -192,7 +192,7 @@
 		$('#rdi-month2').click();
 
 		// Initialize a pagination
-		gagaPaging.init('searchForm', fnSearchCallback, 'paging', 5, 10);
+		gagaPaging.init('searchForm', fnSearchCallback, 'paging', 10, 10);
 		
 		// Load data
 		gagaPaging.load(1);

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

@@ -321,9 +321,6 @@
 			$('#withdraw').click();
 			$('.wdGb').css('display','none');
 		}
-
-		// 교환사유 선택 처리
-		$('.select_reason .combo .list li').eq(0).click();
 	});
 
 	// 교환 옵션 변경 팝업

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

@@ -179,7 +179,7 @@
 				</div>
 				<form id="searchForm" name="searchForm" th:action="@{'/mypage/order/list'}" th:method="post">
 					<input type="hidden" name="pageNo" value=1 />
-					<input type="hidden" name="pageSize" value=5 />
+					<input type="hidden" name="pageSize" value=10 />
 					<input type="hidden" name="pageUnit" value=10 />
 					<input type="hidden" name="ordDtlStat" value="" />
 					<input type="hidden" name="stDate" value="" />
@@ -214,7 +214,7 @@
 		$('#rdi-month2').click();
 
 		// Initialize a pagination
-		gagaPaging.init('searchForm', fnSearchCallback, 'paging', 5, 10);
+		gagaPaging.init('searchForm', fnSearchCallback, 'paging', 10, 10);
 		
 		// Load data
 		gagaPaging.load(1);

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

@@ -364,9 +364,6 @@
 			$('#withdraw').click();
 			$('.wdGb').css('display','none');
 		}
-
-		// 반품사유 선택 처리
-		$('.select_reason .combo .list li').eq(0).click();
 	});
 
 	// 반품 처리

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

@@ -157,7 +157,7 @@
 				</div>
 				<form id="searchForm" name="searchForm" th:action="@{'/noMember/cre/list'}" th:method="post">
 					<input type="hidden" name="pageNo" value=1 />
-					<input type="hidden" name="pageSize" value=5 />
+					<input type="hidden" name="pageSize" value=10 />
 					<input type="hidden" name="pageUnit" value=10 />
 					<input type="hidden" name="chgStat" value="" />
 					<input type="hidden" name="stDate" value="" />
@@ -195,7 +195,7 @@
 		$('#rdi-month2').click();
 
 		// Initialize a pagination
-		gagaPaging.init('searchForm', fnSearchCallback, 'paging', 5, 10);
+		gagaPaging.init('searchForm', fnSearchCallback, 'paging', 10, 10);
 		
 		// Load data
 		gagaPaging.load(1);

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

@@ -320,9 +320,6 @@
 			$('#withdraw').click();
 			$('.wdGb').css('display','none');
 		}
-
-		// 교환사유 선택 처리
-		$('.select_reason .combo .list li').eq(0).click();
 	});
 
 	// 교환 옵션 변경 팝업

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

@@ -146,7 +146,7 @@
 					<input type="hidden" name="ordNm" th:value="${ordNm}" />
 					<input type="hidden" name="ordPhnno" th:value="${ordPhnno}" />
 					<input type="hidden" name="pageNo" value=1 />
-					<input type="hidden" name="pageSize" value=5 />
+					<input type="hidden" name="pageSize" value=10 />
 					<input type="hidden" name="pageUnit" value=10 />
 					<input type="hidden" name="ordDtlStat" value="" />
 					<input type="hidden" name="stDate" value="" />
@@ -186,7 +186,7 @@
 		$('#rdi-month2').click();
 
 		// Initialize a pagination
-		gagaPaging.init('searchForm', fnSearchCallback, 'paging', 5, 10);
+		gagaPaging.init('searchForm', fnSearchCallback, 'paging', 10, 10);
 		
 		// Load data
 		gagaPaging.load(1);

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

@@ -362,9 +362,6 @@
 			$('#withdraw').click();
 			$('.wdGb').css('display','none');
 		}
-
-		// 반품사유 선택 처리
-		$('.select_reason .combo .list li').eq(0).click();
 	});
 
 	// 반품 처리

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

@@ -5,6 +5,9 @@
 <div class="modal-body">
 	<div class="pop_cont">
 		<form class="form_wrap" id="refundAccountForm">
+			<input type="hidden" name="confirmedAccountNo"/>
+			<input type="hidden" name="confirmedAccountNm"/>
+			<input type="hidden" name="confirmedBankCd"/>
 			<table>
 				<colgroup>
 					<col width="90">
@@ -89,7 +92,7 @@
 	});
 
 	// 계좌인증 버튼 클릭 이벤트
-	$('#confirmAccount').click(function() {
+	$('#btnAccountCheck').click(function() {
 		if (!isValid) {
 			let url = '/mypage/account/check';
 			let accountNm = $('#refundAccountForm input[name=accountNm]').val();
@@ -110,8 +113,13 @@
 					mcxDialog.alert('계좌인증에 성공했습니다.');
 
 					// 계좌인증 성공 시 Disabled 처리
-					$('#refundAccountForm .select_custom.select_bank').attr('disabled', true);
-					$('#refundAccountForm input[name=accountNo]').attr('disabled', true);
+					//$('#refundAccountForm .select_custom.select_bank').attr('disabled', true);
+					//$('#refundAccountForm input[name=accountNo]').attr('disabled', true);
+
+					// 인증된 계좌 정보 설정
+					$('#refundAccountForm input[name=confirmedAccountNo]').val(accountNo);
+					$('#refundAccountForm input[name=confirmedAccountNm]').val(accountNm);
+					$('#refundAccountForm input[name=confirmedBankCd]').val(bankCd);
 				} else {
 					mcxDialog.alert('계좌정보를 다시 확인해주세요.');
 				}
@@ -122,20 +130,30 @@
 	// 계좌등록 후 환불신청 버튼 클릭 이벤트
 	$('#registerAccount').click(function() {
 		if (isValid) {
+			// 승인된 계좌 정보
+			let confirmedAccountNm = $('#refundAccountForm input[name=confirmedAccountNm]').val();
+			let confirmedAccountNo = $('#refundAccountForm input[name=confirmedAccountNo]').val();
+			let confirmedBankCd = $('#refundAccountForm input[name=confirmedBankCd]').val();
+
+			// 계좌정보
 			let accountNm = $('#refundAccountForm input[name=accountNm]').val();
 			let accountNo = $('#refundAccountForm input[name=accountNo]').val();
 			let bankCd = $('#refundAccountForm input[name=bankCd]').val();
 
-			let data = {};
-			data.accountNm = accountNm;
-			data.accountNo = accountNo;
-			data.bankCd = bankCd;
+			if (accountNm == confirmedAccountNm && accountNo == confirmedAccountNo && bankCd == confirmedBankCd) {
+				let data = {};
+				data.accountNm = accountNm;
+				data.accountNo = accountNo;
+				data.bankCd = bankCd;
 
-			// 부모창으로 정보 전달
-			fnRegisterAccountCallback(data);
+				// 부모창으로 정보 전달
+				fnRegisterAccountCallback(data);
 
-			// 팝업 닫기
-			$(".close-modal").trigger("click");
+				// 팝업 닫기
+				$(".close-modal").trigger("click");
+			} else {
+				mcxDialog.alert('인증받은 계좌정보와 다릅니다.');
+			}
 		} else {
 			mcxDialog.alert('계좌인증이 필요합니다.');
 		}