Главная Обзор Помощь
Вход
style24
/
style24.front
2
0
Ответвить 0
Файлы Задачи 0 Запросы на слияние 0 Вики
Просмотр исходного кода

취소/반품/교환 회원 모바일 화면 개잘

tsit14 5 лет назад
Родитель
21734df62c
Сommit
3bd1b76b71
7 измененных файлов с 135 добавлено и 352 удалено
Единый вид Показать статистику Diff
  1. 3 6
      src/main/webapp/WEB-INF/views/mob/mypage/MypageCancelFormMob.html
  2. 22 234
      src/main/webapp/WEB-INF/views/mob/mypage/MypageCreCancelDetailFormMob.html
  3. 79 93
      src/main/webapp/WEB-INF/views/mob/mypage/MypageCreExchangeDetailFormMob.html
  4. 1 1
      src/main/webapp/WEB-INF/views/mob/mypage/MypageCreListInfoMob.html
  5. 24 10
      src/main/webapp/WEB-INF/views/mob/mypage/MypageCreReturnDetailFormMob.html
  6. 3 2
      src/main/webapp/WEB-INF/views/mob/mypage/MypageExchangeFormMob.html
  7. 3 6
      src/main/webapp/WEB-INF/views/mob/mypage/MypageReturnFormMob.html

+ 3 - 6
src/main/webapp/WEB-INF/views/mob/mypage/MypageCancelFormMob.html
Просмотреть файл 

@@ -17,7 +17,7 @@
 
 
 
 <th:block layout:fragment="content">
 
 <th:block layout:fragment="content">
 
 
 
-<main role="" id="" class="container my">
 
+<main class="container my">
 
 	<section class="content my_return">
 
 	<section class="content my_return">
 
 		<form id="cancelForm" class="form_wrap">
 
 		<form id="cancelForm" class="form_wrap">
 
 			<input type="hidden" name="accountNo" 	th:value="${oneData.accountNo}"/>
 
 			<input type="hidden" name="accountNo" 	th:value="${oneData.accountNo}"/>
 
@@ -53,8 +53,8 @@
 
 												<span th:text="${cancel.brandNm}"></span>
 
 												<span th:text="${cancel.brandNm}"></span>
 
 												<div class="badge_wrap">
 
 												<div class="badge_wrap">
 
 													<em class="tag primary" th:if="${cancel.shotDelvYn == 'Y'}">총알배송</em>
 
 													<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>
 
+													<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>
 
 											</div>
 
 											<div class="name" th:text="${cancel.goodsNm}"></div>
 
 											<div class="name" th:text="${cancel.goodsNm}"></div>
 
@@ -185,9 +185,6 @@
 
 								</td>
 
 								</td>
 
 							</tr>
 
 							</tr>
 
 						</table>
 
 						</table>
 
-						<!-- 
-						<button type="button" class="btn btn_default"><span>취소 전표 보기</span></button>
 
-						 -->
 
 					</div>
 
 					</div>
 
 				</div>
 
 				</div>
 
 				<div class="required_group">
 
 				<div class="required_group">

+ 22 - 234
src/main/webapp/WEB-INF/views/mob/mypage/MypageCreCancelDetailFormMob.html
Просмотреть файл 

@@ -14,7 +14,6 @@
 
  *******************************************************************************
 
  *******************************************************************************
 
  -->
 
  -->
 
 <body>
 
 <body>
 
-
 
 <th:block layout:fragment="content">
 
 <th:block layout:fragment="content">
 
 <main role="" id="" class="container my">
 
 <main role="" id="" class="container my">
 
 	<section class="content my_return">
 
 	<section class="content my_return">
 
@@ -37,55 +36,58 @@
 
 					</th:block>
 
 					</th:block>
 
 				</div>
 
 				</div>
 
 				
 				
-				<th:block th:if="${cancelDetailList.cancelDetailList}" th:each="returnDtl, status : ${cancelDetailList.cancelDetailList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 
+				<th:block th:if="${cancelDetailList.cancelDetailList}" th:each="cancelDtl, status : ${cancelDetailList.cancelDetailList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 
 					<div class="goods_section">
 
 					<div class="goods_section">
 
 						<div class="goods_status">
 
 						<div class="goods_status">
 
-							<p class="dlvr_staus" th:if="${returnDtl.chgStat == 'G685_17' or returnDtl.chgStat == 'G685_18'}">주문취소</p>
 
-							<p class="dlvr_staus" th:unless="${returnDtl.chgStat == 'G685_17' or returnDtl.chgStat == 'G685_18'}" th:text="${returnDtl.chgStatNm}"></p>
 
-							<p class="dlvr_desc" th:text="|${returnDtl.chgDate} ${returnDtl.chgTime}|"></p>
 
+							<p class="dlvr_staus" 	th:if="${cancelDtl.chgStat == 'G685_17' or cancelDtl.chgStat == 'G685_18'}">주문취소</p>
 
+							<p class="dlvr_staus" 	th:unless="${cancelDtl.chgStat == 'G685_17' or cancelDtl.chgStat == 'G685_18'}" th:text="${cancelDtl.chgStatNm}"></p>
 
+							<p class="dlvr_desc" 	th:text="|${cancelDtl.chgDate} ${cancelDtl.chgTime}|"></p>
 
 						</div>
 
 						</div>
 
-						
 						<div class="goods_detail">
 
 						<div class="goods_detail">
 
 							<a href="">
 
 							<a href="">
 
 								<div class="thumb_box">
 
 								<div class="thumb_box">
 
-									<img th:src="${imageUrl + '/' + returnDtl.sysImgNm}" width="100%" alt="">
 
+									<img th:src="${imageUrl + '/' + cancelDtl.sysImgNm}" width="100%" alt="">
 
 								</div>
 
 								</div>
 
 								<div class="info_box">
 
 								<div class="info_box">
 
 									<div class="od_name">
 
 									<div class="od_name">
 
 										<div class="brand">
 
 										<div class="brand">
 
-											<span th:text="${returnDtl.brandNm}"></span>
 
+											<span th:text="${cancelDtl.brandNm}"></span>
 
 											<div class="badge_wrap">
 
 											<div class="badge_wrap">
 
-												<em class="tag primary" th:if="${returnDtl.shotDelvYn == 'Y'}">총알배송</em>
 
-												<em class="tag" th:if="${returnDtl.shotDelvYn == 'N' and returnDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
 
-												<em class="tag" th:if="${returnDtl.selfGoodsYn == 'N'}">업체직배송</em>
 
+												<em class="tag primary" 	th:if="${cancelDtl.shotDelvYn == 'Y'}">총알배송</em>
 
+												<em class="tag" 			th:if="${cancelDtl.shotDelvYn == 'N' and cancelDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
 
+												<em class="tag" 			th:if="${cancelDtl.selfGoodsYn == 'N'}">업체직배송</em>
 
 											</div>
 
 											</div>
 
 										</div>
 
 										</div>
 
-										<div class="name" th:text="${returnDtl.goodsNm}"></div>
 
+										<div class="name" th:text="${cancelDtl.goodsNm}"></div>
 
 									</div>
 
 									</div>
 
 									<div class="od_opt">
 
 									<div class="od_opt">
 
 										<div class="option">
 
 										<div class="option">
 
-											<th:block th:if="${returnDtl.goodsType == 'G056_S'}">
 
-												<th:block th:each="option, status : ${returnDtl.colorNmArr}">
 
+											<th:block th:if="${cancelDtl.goodsType == 'G056_S'}">
 
+												<th:block th:each="option, status : ${cancelDtl.colorNmArr}">
 
 													<em th:text="${option}"></em>
 
 													<em th:text="${option}"></em>
 
-													<em th:text="${returnDtl.optCd2Arr[status.index]}"></em>
 
+													<em th:text="${cancelDtl.optCd2Arr[status.index]}"></em>
 
 												</th:block>
 
 												</th:block>
 
 											</th:block>
 
 											</th:block>
 
-											<th:block th:unless="${returnDtl.goodsType == 'G056_S'}">
 
-												<em th:text="${returnDtl.colorNm}"></em>
 
-												<em th:text="${returnDtl.optCd2}"></em>
 
+											<th:block th:unless="${cancelDtl.goodsType == 'G056_S'}">
 
+												<em th:text="${cancelDtl.colorNm}"></em>
 
+												<em th:text="${cancelDtl.optCd2}"></em>
 
 											</th:block>
 
 											</th:block>
 
 										</div>
 
 										</div>
 
 									</div>
 
 									</div>
 
 									<div class="od_calc">
 
 									<div class="od_calc">
 
 										<p class="price">
 
 										<p class="price">
 
-											<span class="count"><em th:text="${returnDtl.chgQty}"></em>개</span>
 
+											<span class="count"><em th:text="${cancelDtl.chgQty}"></em>개</span>
 
 										</p>
 
 										</p>
 
 									</div>
 
 									</div>
 
 								</div>
 
 								</div>
 
 							</a>
 
 							</a>
 
 						</div>
 
 						</div>
 
 						<div class="goods_btn_wrap btn_group_flex">
 
 						<div class="goods_btn_wrap btn_group_flex">
 
-							<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
 
+							<div>
 
+								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">
 
+									<span>1:1 문의</span>
 
+								</button>
 
+							</div>
 
 						</div>
 
 						</div>
 
 					</div>
 
 					</div>
 
 				</th:block>
 
 				</th:block>
 
@@ -216,223 +218,9 @@ var isLogin = [[${isLogin}]];
 
 
 
 $(document).ready(function() {
 
 $(document).ready(function() {
 
 
 
-});
 
-
 
-// 회수지 정보 설정
 
-var delvAddrSet = function(delvObj) {
 
-	let ordChgSq 		= oneData.ordChgSq;
 
-	let chgerNm 		= delvObj.recipNm;
 
-	let chgerPhnno 		= delvObj.recipPhnno;
 
-	let chgerZipcode 	= delvObj.recipZipcode;
 
-	let chgerBaseAddr 	= delvObj.recipBaseAddr;
 
-	let chgerDtlAddr 	= delvObj.recipDtlAddr;
 
-	let chgerRtnMemo 	= delvObj.delvMemo;
 
-	let chgerAddr 		= chgerBaseAddr + ' ' + chgerDtlAddr;
 
-
 
-	let data = {};
 
-	data.ordChgSq 		= ordChgSq;
 
-	data.chgerNm 		= chgerNm;
 
-	data.chgerPhnno 	= chgerPhnno;
 
-	data.chgerZipcode 	= chgerZipcode;
 
-	data.chgerBaseAddr 	= chgerBaseAddr;
 
-	data.chgerDtlAddr 	= chgerDtlAddr;
 
-	data.chgerRtnMemo 	= chgerRtnMemo;
 
-
 
-	let jsonData = JSON.stringify(data);
 
-
 
-	gagajf.ajaxJsonSubmit('/mypage/change/chger/addr', jsonData, function(result) {
 
-		if (result.status == '200') {
 
-			$('#chgerNm').text(chgerNm);
 
-			$('#chgerPhnno').text(chgerPhnno);
 
-			$('#chgerAddr').text(chgerAddr);
 
-			$('#chgerRtnMemo').text(chgerRtnMemo);
 
-		}
 
-	});
 
-}
 
-
 
-// 배송메모 설정
 
-var delvMemoSet = function(delvMemoObj) {
 
-	let ordChgSq = oneData.ordChgSq;
 
-	let delvMemo = delvMemoObj.delvMemo;
 
-
 
-	let data = {};
 
-	data.ordChgSq = ordChgSq;
 
-	data.chgerRtnMemo = delvMemo;
 
-	
-	let jsonData = JSON.stringify(data);
 
-	
-	gagajf.ajaxJsonSubmit('/mypage/change/chger/rtn/memo', jsonData, function(result) {
 
-		if (result.status == '200') {
 
-			$("#chgerRtnMemo").text(delvMemo);
 
-		}
 
-	});
 
-	
-}
 
-/*]]>*/
 
-</script>
 
-
 
-</th:block>
 
-					</div>
 
-				</th:block>
 
-			</div>
 
-		</div>
 
-		
-		<div class="inner">
 
-			<div class="tbl_wrap">
 
-				<div class="tbl_tit"> 
-					<h3>상세 정보</h3>
 
-				</div>
 
-				<div class="tbl type1">
 
-					<table>
 
-						<colgroup>
 
-							<col width="107">
 
-							<col width="*">
 
-						</colgroup>   
-						<tr>
 
-							<th>반품 접수 일자</th>
 
-							<td><div><span th:text="${oneData.chgDt}"></span></div></td>
 
-						</tr>
 
-						<tr>
 
-							<th>반품 완료 일자</th>
 
-							<td><div><span th:text="${oneData.completeDt}"></span></div></td>
 
-						</tr>
 
-					</table>
 
-				</div>
 
-			</div>
 
-		</div>
 
-		<div class="inner">
 
-			<div class="tbl_wrap">
 
-				<div class="tbl_tit"> 
-					<h3>반품 회수지 주소</h3>
 
-					<button type="button" id="btn_adrsChange_pop" class="btn_popup" th:if="${oneData.chgStat == 'G685_50' or oneData.chgStat == 'G685_51'}" onclick="fnChangeDeliveryAddr();">
 
-						<span>회수지 변경</span>
 
-					</button>
 
-				</div>
 
-				<div class="tbl">
 
-					<div class="ship_info">
 
-						<dl>
 
-							<div class="name">
 
-								<dt><span class="sr-only">배송지명</span></dt>
 
-								<dd id="chgerNm" th:text="${oneData.chgerNm}"></dd>
 
-							</div>
 
-							<div class="addr">
 
-								<dt><span class="sr-only">배송주소</span></dt>
 
-								<dd id="chgerAddr" th:text="|${oneData.chgerBaseAddr} ${oneData.chgerDtlAddr}|"></dd>
 
-							</div>
 
-							<div class="phone">
 
-								<dt><span class="sr-only">휴대폰 번호</span></dt>
 
-								<dd id="chgerPhnno" th:text="${oneData.chgerPhnno}"></dd>
 
-							</div>
 
-						</dl>
 
-					</div>
 
-				</div>
 
-			</div>
 
-		</div>
 
-		<div class="inner">
 
-			<div class="tbl_wrap pay_wrap">
 
-				<div class="tbl_tit"> 
-					<h3>환불 정보</h3>
 
-					<strong class="pay"><span th:text="${#numbers.formatInteger(oneData.refundAmt + oneData.rfPntAmt + oneData.rfGfcdUseAmt, 1, 'COMMA')}"></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 th:text="${#numbers.formatInteger(oneData.rfCnclAmt, 1, 'COMMA')}"></span>원
 
-											</div>
 
-										</dd>
 
-									</div>
 
-									<div>
 
-										<dt>배송비</dt>
 
-										<dd>
 
-											<div>
 
-												<span th:text="${#numbers.formatInteger(oneData.rfDeliveryFee, 1, 'COMMA')}"></span>원
 
-											</div>
 
-										</dd>
 
-									</div>
 
-									<div>
 
-										<dt>할인 금액 차감</dt>
 
-										<dd>
 
-											<div>
 
-												<span th:text="${#numbers.formatInteger(-(oneData.rfCpn1Amt + oneData.rfTmtb1Amt + oneData.rfTmtb2Amt + oneData.rfGoodsCpnAmt + oneData.rfCartCpnAmt + oneData.rfPrePntAmt), 1, 'COMMA')}"></span>원
 
-											</div>
 
-										</dd>
 
-									</div>
 
-								</dl>
 
-								<dl class="refund_detail">
 
-									<div>
 
-										<dt>환불 수단</dt>
 
-										<dd>
 
-											<div>
 
-												<span th:if="${oneData.pgGb == 'KCP'}" th:text="${oneData.payMeansNm}"></span>
 
-												<span th:if="${oneData.pgGb == 'NAVER'}">네이버페이</span>
 
-												<span th:if="${oneData.pgGb == 'KAKAO'}">카카오페이</span>
 
-												<span th:if="${oneData.pgGb == 'PAYCO'}">PAYCO</span>
 
-											</div>
 
-										</dd>
 
-									</div>
 
-									<div>
 
-										<dt>결제금액 환불</dt>
 
-										<dd>
 
-											<div>
 
-												<span th:text="${#numbers.formatInteger(oneData.refundAmt, 1, 'COMMA')}"></span>원
 
-											</div>
 
-										</dd>
 
-									</div>
 
-									<div>
 
-										<dt>포인트 환불</dt>
 
-										<dd>
 
-											<div>
 
-												<span th:text="${#numbers.formatInteger(oneData.rfPntAmt, 1, 'COMMA')}"></span>P
 
-											</div>
 
-										</dd>
 
-									</div>
 
-									<div>
 
-										<dt>상품권 환불</dt>
 
-										<dd>
 
-											<div>
 
-												<span th:text="${#numbers.formatInteger(oneData.rfGfcdUseAmt, 1, 'COMMA')}"></span>원
 
-											</div>
 
-										</dd>
 
-									</div>
 
-								</dl>
 
-							</td>
 
-						</tr>
 
-					</table>
 
-					<th:block th:if="${refundYn == 'Y' and oneData.pgGb == 'KCP' and oneData.payMeans == 'G014_30'}">
 
-						<button type="button" id="btn_chit_cancle" class="btn btn_default" onclick="fnReceipt('cancel')">
 
-							<span>취소 전표 보기</span>
 
-						</button>
 
-					</th:block>
 
-				</div>
 
-			</div>
 
-			<p class="desc_txt">카드사로 결제 취소 요청이 전달된 후 환불까지는 평일 기준 3 ~7일이<br>소요될 수 있습니다.</p>
 
-			<div class="btn_group btn_group_flex">
 
-				<div><button class="btn btn_dark" onclick="cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);"><span>확인</span></button></div>
 
-			</div>
 
-		</div>
 
-	</section>
 
-</main>
 
-<script th:inline="javascript">
 
-/*<![CDATA[*/
 
-let oneData = [[${oneData}]];
 
-var isLogin = [[${isLogin}]];
 
-
 
-$(document).ready(function() {
 
-
 
 });
 
 });
 
 /*]]>*/
 
 /*]]>*/
 
 </script>
 
 </script>
 
-
 
 </th:block>
 
 </th:block>
 
 
 
 </body>
 
 </body>

+ 79 - 93
src/main/webapp/WEB-INF/views/mob/mypage/MypageCreExchangeDetailFormMob.html
Просмотреть файл 

@@ -35,81 +35,95 @@
 
 					<th:block th:unless="${oneData.giftPackYn == 'Y'}">
 
 					<th:block th:unless="${oneData.giftPackYn == 'Y'}">
 
 						<div class="goods_date">주문일<span class="date" th:text="${oneData.ordDt}"></span></div>
 
 						<div class="goods_date">주문일<span class="date" th:text="${oneData.ordDt}"></span></div>
 
 					</th:block>
 
 					</th:block>
 
+					<th:block th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}">
 
+						<a href="javascript:void(0);" th:attr="ordNo=${oneData.ordNo}, ordChgSq=${oneData.ordChgSq}, cancelGb=${oneData.chgGb}" onclick="fnCreCancel(this);" class="detail_btn">전체신청취소</a>
 
+					</th:block>
 
 				</div>
 
 				</div>
 
 				
 				
-				<th:block th:if="${exchangeDetailList.exchangeDetailList}" th:each="returnDtl, status : ${exchangeDetailList.exchangeDetailList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 
+				<th:block th:if="${exchangeDetailList.exchangeDetailList}" th:each="exchangeDtl, status : ${exchangeDetailList.exchangeDetailList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 
 					<div class="goods_section">
 
 					<div class="goods_section">
 
 						<div class="goods_status">
 
 						<div class="goods_status">
 
-							<p class="dlvr_staus" th:text="${returnDtl.chgStatNm}"></p>
 
-							<p class="dlvr_desc" th:text="|${returnDtl.chgDate} ${returnDtl.chgTime}|"></p>
 
+							<p class="dlvr_staus" th:if="${exchangeDtl.chgStat == 'G685_40' && (exchangeDtl.ordDtlStat == 'G013_20' or exchangeDtl.ordDtlStat == 'G013_30' or exchangeDtl.ordDtlStat == 'G013_35' or exchangeDtl.ordDtlStat == 'G013_40' or exchangeDtl.ordDtlStat == 'G013_50')}" th:text="|교환진행중|"></p>
 
+							<p class="dlvr_staus" th:if="${exchangeDtl.chgStat == 'G685_40' && (exchangeDtl.ordDtlStat == 'G013_60' or exchangeDtl.ordDtlStat == 'G013_70')}" th:text="|교환완료|"></p>
 
+							<p class="dlvr_staus" th:if="${exchangeDtl.chgStat == 'G685_49'}" th:text="|접수취소|"></p>
 
+							<p class="dlvr_staus" th:unless="${exchangeDtl.chgStat == 'G685_40' or exchangeDtl.chgStat == 'G685_49'}" th:text="${exchangeDtl.chgStatNm}"></p>
 
+							
+							<p class="dlvr_desc" th:text="|${exchangeDtl.chgDate} ${exchangeDtl.chgTime}|"></p>
 
 						</div>
 
 						</div>
 
 						<div class="goods_detail">
 
 						<div class="goods_detail">
 
 							<a href="">
 
 							<a href="">
 
 								<div class="thumb_box">
 
 								<div class="thumb_box">
 
-									<img th:src="${imageUrl + '/' + returnDtl.sysImgNm}" width="100%" alt="">
 
+									<img th:src="${imageUrl + '/' + exchangeDtl.sysImgNm}" width="100%" alt="">
 
 								</div>
 
 								</div>
 
 								<div class="info_box">
 
 								<div class="info_box">
 
 									<div class="od_name">
 
 									<div class="od_name">
 
 										<div class="brand">
 
 										<div class="brand">
 
-											<span th:text="${returnDtl.brandNm}"></span>
 
+											<span th:text="${exchangeDtl.brandNm}"></span>
 
 											<div class="badge_wrap">
 
 											<div class="badge_wrap">
 
-												<em class="tag primary" th:if="${returnDtl.shotDelvYn == 'Y'}">총알배송</em>
 
-												<em class="tag" th:if="${returnDtl.shotDelvYn == 'N' and returnDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
 
-												<em class="tag" th:if="${returnDtl.selfGoodsYn == 'N'}">업체직배송</span>
 
+												<em class="tag primary" th:if="${exchangeDtl.shotDelvYn == 'Y'}">총알배송</em>
 
+												<em class="tag" 		th:if="${exchangeDtl.shotDelvYn == 'N' and exchangeDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
 
+												<em class="tag" 		th:if="${exchangeDtl.selfGoodsYn == 'N'}">업체직배송</span>
 
 											</div>
 
 											</div>
 
 										</div>
 
 										</div>
 
-										<div class="name" th:text="${returnDtl.goodsNm}"></div>
 
+										<div class="name" th:text="${exchangeDtl.goodsNm}"></div>
 
 									</div>
 
 									</div>
 
 									<div class="od_opt">
 
 									<div class="od_opt">
 
 										<div class="option">
 
 										<div class="option">
 
-											<th:block th:if="${returnDtl.goodsType == 'G056_S'}">
 
-												<th:block th:each="option, status : ${returnDtl.colorNmArr}">
 
+											<th:block th:if="${exchangeDtl.goodsType == 'G056_S'}">
 
+												<th:block th:each="option, status : ${exchangeDtl.colorNmArr}">
 
 													<em th:text="${option}"></em>
 
 													<em th:text="${option}"></em>
 
-													<em th:text="${returnDtl.optCd2Arr[status.index]}"></em>
 
+													<em th:text="${exchangeDtl.optCd2Arr[status.index]}"></em>
 
 												</th:block>
 
 												</th:block>
 
 											</th:block>
 
 											</th:block>
 
-											<th:block th:unless="${returnDtl.goodsType == 'G056_S'}">
 
-												<em th:text="${returnDtl.colorNm}"></em>
 
-												<em th:text="${returnDtl.optCd2}"></em>
 
+											<th:block th:unless="${exchangeDtl.goodsType == 'G056_S'}">
 
+												<em th:text="${exchangeDtl.colorNm}"></em>
 
+												<em th:text="${exchangeDtl.optCd2}"></em>
 
 											</th:block>
 
 											</th:block>
 
 										</div>
 
 										</div>
 
 									</div>
 
 									</div>
 
 									<div class="od_exchange_opt">
 
 									<div class="od_exchange_opt">
 
 										<span>교환옵션</span>
 
 										<span>교환옵션</span>
 
 										<div class="option">
 
 										<div class="option">
 
-											<th:block th:if="${returnDtl.goodsType == 'G056_S'}">
 
-												<th:block th:each="option, status : ${returnDtl.chgColorNmArr}">
 
-													<em th:text="${returnDtl.chgItemNmArr[status.index]}"></em>
 
+											<th:block th:if="${exchangeDtl.goodsType == 'G056_S'}">
 
+												<th:block th:each="option, status : ${exchangeDtl.chgColorNmArr}">
 
+													<em th:text="${exchangeDtl.chgItemNmArr[status.index]}"></em>
 
 													<em th:text="${option}"></em>
 
 													<em th:text="${option}"></em>
 
-													<em th:text="${returnDtl.chgOptCd2Arr[status.index]}"></em>
 
+													<em th:text="${exchangeDtl.chgOptCd2Arr[status.index]}"></em>
 
 												</th:block>
 
 												</th:block>
 
 											</th:block>
 
 											</th:block>
 
-											<th:block th:unless="${returnDtl.goodsType == 'G056_S'}">
 
-												<em th:text="${returnDtl.chgColorNm}"></em>
 
-												<em th:text="${returnDtl.chgOptCd2}"></em>
 
+											<th:block th:unless="${exchangeDtl.goodsType == 'G056_S'}">
 
+												<em th:text="${exchangeDtl.chgColorNm}"></em>
 
+												<em th:text="${exchangeDtl.chgOptCd2}"></em>
 
 											</th:block>
 
 											</th:block>
 
 										</div>
 
 										</div>
 
 									</div>
 
 									</div>
 
 									<div class="od_calc">
 
 									<div class="od_calc">
 
 										<p class="price">
 
 										<p class="price">
 
-											<span class="count"><em th:text="${returnDtl.chgQty}"></em>개</span>
 
+											<span class="count"><em th:text="${exchangeDtl.chgQty}"></em>개</span>
 
 										</p>
 
 										</p>
 
 									</div>
 
 									</div>
 
 								</div>
 
 								</div>
 
 							</a>
 
 							</a>
 
 						</div>
 
 						</div>
 
 						<div class="goods_btn_wrap btn_group_flex">
 
 						<div class="goods_btn_wrap btn_group_flex">
 
-							<div th:if="${returnDtl.chgStat == 'G685_20' or returnDtl.chgStat == 'G685_21'}"><button type="button" class="btn btn_default" th:attr="ordNo=${returnDtl.ordNo}, ordChgSq=${returnDtl.ordChgSq}, cancelGb=${returnDtl.chgGb}" onclick="fnCreCancel(this);"><span>신청 취소</span></button></div>
 
-							<div th:if="${returnDtl.chgStat == 'G685_32' or returnDtl.chgStat == 'G685_21'}"><button type="button" class="btn btn_default" th:attr="ordNo=${returnDtl.ordNo}, ordChgSq=${returnDtl.ordChgSq}" onclick="fnCrePayAddCost(this);"><span>결재하기</span></button></div>
 
-							<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
 
+							<div th:if="${exchangeDtl.chgStat == 'G685_32' or exchangeDtl.chgStat == 'G685_21'}">
 
+								<button type="button" class="btn btn_default" th:attr="ordNo=${exchangeDtl.ordNo}, ordChgSq=${exchangeDtl.ordChgSq}" onclick="fnCrePayAddCost(this);">
 
+									<span>결재하기</span>
 
+								</button>
 
+							</div>
 
+							<div>
 
+								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">
 
+									<span>1:1 문의</span>
 
+								</button>
 
+							</div>
 
 						</div>
 
 						</div>
 
 						<div class="goods_txt">
 
 						<div class="goods_txt">
 
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_21' or (returnDtl.chgGb == 'G680_40' and returnDtl.chgStat == 'G685_32')}" th:text="|${returnDtl.addPayCost}원 결제 후 교환 가능합니다.|"></p>
 
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_20'}">교환 신청이 접수 되었습니다.<br> 신속하게 처리하여 드리겠습니다.</p>
 
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_30'}">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p>
 
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_31' and returnDtl.chgGb == 'G680_40'}">고객님이 교환하신 상품을 검수 중에 있습니다.</p>
 
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_40' and (returnDtl.chgOrdDtlStat == 'G013_60' or returnDtl.chgOrdDtlStat == 'G013_70')}">교환이 완료되었습니다.</p>
 
-							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_49'}">요청하신 교환을 취소하였습니다.</p>
 
+							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_21' or (exchangeDtl.chgGb == 'G680_40' and exchangeDtl.chgStat == 'G685_32')}" th:text="|${exchangeDtl.addPayCost}원 결제 후 교환 가능합니다.|"></p>
 
+							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_20'}">교환 신청이 접수 되었습니다.<br> 신속하게 처리하여 드리겠습니다.</p>
 
+							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_30'}">고객님이 요청하신 회수지로 상품을 회수 중에 있습니다.</p>
 
+							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_31' and exchangeDtl.chgGb == 'G680_40'}">고객님이 교환하신 상품을 검수 중에 있습니다.</p>
 
+							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_40' and (exchangeDtl.chgOrdDtlStat == 'G013_60' or exchangeDtl.chgOrdDtlStat == 'G013_70')}">교환이 완료되었습니다.</p>
 
+							<p class="cf_txt cf_desc" th:if="${exchangeDtl.chgStat == 'G685_49'}">요청하신 교환을 취소하였습니다.</p>
 
 						</div>
 
 						</div>
 
 					</div>
 
 					</div>
 
 				</th:block>
 
 				</th:block>
 
@@ -142,9 +156,11 @@
 
 			<div class="tbl_wrap">
 
 			<div class="tbl_wrap">
 
 				<div class="tbl_tit"> 
 				<div class="tbl_tit"> 
 					<h3>교환 상품 배송지</h3>
 
 					<h3>교환 상품 배송지</h3>
 
-					<button type="button" id="btn_adrsChange_pop" class="btn_popup" th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25' or oneData.chgOrdDtlStat == 'G013_30' or oneData.chgOrdDtlStat == 'G013_35' or oneData.chgOrdDtlStat == 'G013_40'}" onclick="fnChangeAddr('recip');">
 
-						<span>배송지 변경</span>
 
-					</button>
 
+					<th:block th:if="${oneData.chgOrdDtlStat == 'G013_20' or oneData.chgOrdDtlStat == 'G013_25' or oneData.chgOrdDtlStat == 'G013_30' or oneData.chgOrdDtlStat == 'G013_35' or oneData.chgOrdDtlStat == 'G013_40'}">
 
+						<button type="button" id="btn_adrsChange_pop" class="btn_popup" onclick="fnChangeAddr('recip');">
 
+							<span>배송지 변경</span>
 
+						</button>
 
+					</th:block>
 
 				</div>
 
 				</div>
 
 				<div class="tbl">
 
 				<div class="tbl">
 
 					<div class="ship_info">
 
 					<div class="ship_info">
 
@@ -175,9 +191,11 @@
 
 				<div class="tbl_wrap">
 
 				<div class="tbl_wrap">
 
 					<div class="tbl_tit"> 
 					<div class="tbl_tit"> 
 						<h3>교환 회수지 주소</h3>
 
 						<h3>교환 회수지 주소</h3>
 
-						<button type="button" id="btn_adrsChange_pop" class="btn_popup" th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}" onclick="fnChangeAddr('chger');">
 
-							<span>회수지 변경</span>
 
-						</button>
 
+						<th:block th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}">
 
+							<button type="button" id="btn_adrsChange_pop" class="btn_popup"  onclick="fnChangeAddr('chger');">
 
+								<span>회수지 변경</span>
 
+							</button>
 
+						</th:block>
 
 					</div>
 
 					</div>
 
 					<div class="tbl">
 
 					<div class="tbl">
 
 						<div class="ship_info">
 
 						<div class="ship_info">
 
@@ -246,36 +264,36 @@
 
 	// 배송지 및 회수지 정보 설정
 
 	// 배송지 및 회수지 정보 설정
 
 	var delvAddrSet = function(delvObj) {
 
 	var delvAddrSet = function(delvObj) {
 
 		let url = '';
 
 		let url = '';
 
-		let ordChgSq = oneData.ordChgSq;
 
-		let delvAddrSq = oneData.delvAddrSq;
 
-		let recipNm = delvObj.recipNm;
 
-		let recipPhnno = delvObj.recipPhnno;
 
-		let recipZipcode = delvObj.recipZipcode;
 
-		let recipBaseAddr = delvObj.recipBaseAddr;
 
-		let recipDtlAddr = delvObj.recipDtlAddr;
 
-		let delvMemo = delvObj.delvMemo;
 
-		let recipAddr = recipBaseAddr + ' ' + recipDtlAddr;
 
+		let ordChgSq 		= oneData.ordChgSq;
 
+		let delvAddrSq 		= oneData.delvAddrSq;
 
+		let recipNm 		= delvObj.recipNm;
 
+		let recipPhnno 		= delvObj.recipPhnno;
 
+		let recipZipcode 	= delvObj.recipZipcode;
 
+		let recipBaseAddr 	= delvObj.recipBaseAddr;
 
+		let recipDtlAddr 	= delvObj.recipDtlAddr;
 
+		let delvMemo 		= delvObj.delvMemo;
 
+		let recipAddr 		= recipBaseAddr + ' ' + recipDtlAddr;
 
 
 
 		let data = {};
 
 		let data = {};
 
 
 
 		if (addrGb == 'chger') {
 
 		if (addrGb == 'chger') {
 
 			url = '/mypage/change/chger/addr';
 
 			url = '/mypage/change/chger/addr';
 
-			data.ordChgSq = ordChgSq;
 
-			data.chgerNm = recipNm;
 
-			data.chgerPhnno = recipPhnno;
 
-			data.chgerZipcode = recipZipcode;
 
-			data.chgerBaseAddr = recipBaseAddr;
 
-			data.chgerDtlAddr = recipDtlAddr;
 
-			data.chgerRtnMemo = delvMemo;
 
+			data.ordChgSq 		= ordChgSq;
 
+			data.chgerNm 		= recipNm;
 
+			data.chgerPhnno 	= recipPhnno;
 
+			data.chgerZipcode 	= recipZipcode;
 
+			data.chgerBaseAddr 	= recipBaseAddr;
 
+			data.chgerDtlAddr 	= recipDtlAddr;
 
+			data.chgerRtnMemo 	= delvMemo;
 
 		} else {
 
 		} else {
 
 			url = '/mypage/change/delvery/addr';
 
 			url = '/mypage/change/delvery/addr';
 
-			data.delvAddrSq = delvAddrSq;
 
-			data.recipNm = recipNm;
 
-			data.recipPhnno = recipPhnno;
 
-			data.recipZipcode = recipZipcode;
 
-			data.recipBaseAddr = recipBaseAddr;
 
-			data.recipDtlAddr = recipDtlAddr;
 
-			data.delvMemo = delvMemo;
 
+			data.delvAddrSq 	= delvAddrSq;
 
+			data.recipNm 		= recipNm;
 
+			data.recipPhnno 	= recipPhnno;
 
+			data.recipZipcode 	= recipZipcode;
 
+			data.recipBaseAddr 	= recipBaseAddr;
 
+			data.recipDtlAddr 	= recipDtlAddr;
 
+			data.delvMemo 		= delvMemo;
 
 		}
 
 		}
 
 
 
 		let jsonData = JSON.stringify(data);
 
 		let jsonData = JSON.stringify(data);
 
@@ -296,38 +314,6 @@
 
 			}
 
 			}
 
 		});
 
 		});
 
 	}
 
 	}
 
-	
-	// 배송메모 설정
 
-	var delvMemoSet = function(delvMemoObj) {
 
-		let url = '';
 
-		let ordChgSq = oneData.ordChgSq;
 
-		let delvAddrSq = oneData.delvAddrSq;
 
-		let delvMemo = delvMemoObj.delvMemo;
 
-		
-		let data = {};
 
-		
-		if (memoGb == 'chger') {
 
-			url = '/mypage/change/chger/rtn/memo';
 
-			data.ordChgSq = ordChgSq;
 
-			data.chgerRtnMemo = delvMemo;
 
-		} else {
 
-			url = '/mypage/change/delvery/memo';
 
-			data.delvAddrSq = delvAddrSq;
 
-			data.delvMemo = delvMemo;
 
-		}
 
-		
-		let jsonData = JSON.stringify(data);
 
-		
-		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 
-			if (result.status == '200') {
 
-				if (memoGb == 'chger') {
 
-					$("#chgerRtnMemo").text(delvMemo);
 
-				} else {
 
-					$("#delvMemo").text(delvMemo);
 
-				}
 
-			}
 
-		});
 
-	}
 
 
 
 	var fnGoToWithdrawDelivery = function(param) {
 
 	var fnGoToWithdrawDelivery = function(param) {
 
 		// TODO
 
 		// TODO

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/mypage/MypageCreListInfoMob.html
Просмотреть файл 

@@ -106,7 +106,7 @@
 
 						</div>
 
 						</div>
 
 						<!-- 취소,반품,교환 상태별 버튼기능정의 -->
 
 						<!-- 취소,반품,교환 상태별 버튼기능정의 -->
 
 						<div class="goods_btn_wrap btn_group_flex">
 
 						<div class="goods_btn_wrap btn_group_flex">
 
-							<!-- 신청취소 -->
 
+							<!-- 신청취소 
 							<th:block th:if="${cre.chgStat} == 'G685_20' or ${cre.chgStat} == 'G685_21' or ${cre.chgStat} == 'G685_50' or ${cre.chgStat} == 'G685_51'">
 
 							<th:block th:if="${cre.chgStat} == 'G685_20' or ${cre.chgStat} == 'G685_21' or ${cre.chgStat} == 'G685_50' or ${cre.chgStat} == 'G685_51'">
 
 								<div>
 
 								<div>
 
 									<button type="button" class="btn btn_default" th:ordNo="${cre.ordNo}" th:ordChgSq="${cre.ordChgSq}" th:cancelGb="${cre.chgGb}" onclick="fnCreCancel(this);">
 
 									<button type="button" class="btn btn_default" th:ordNo="${cre.ordNo}" th:ordChgSq="${cre.ordChgSq}" th:cancelGb="${cre.chgGb}" onclick="fnCreCancel(this);">

+ 24 - 10
src/main/webapp/WEB-INF/views/mob/mypage/MypageCreReturnDetailFormMob.html
Просмотреть файл 

@@ -34,13 +34,18 @@
 
 					<th:block th:unless="${oneData.giftPackYn == 'Y'}">
 
 					<th:block th:unless="${oneData.giftPackYn == 'Y'}">
 
 						<div class="goods_date">주문일<span class="date" th:text="${oneData.ordDt}"></span></div>
 
 						<div class="goods_date">주문일<span class="date" th:text="${oneData.ordDt}"></span></div>
 
 					</th:block>
 
 					</th:block>
 
+					<th:block th:if="${oneData.chgStat == 'G685_50' or oneData.chgStat == 'G685_51'}">
 
+						<a href="javascript:void(0);" th:attr="ordNo=${oneData.ordNo}, ordChgSq=${oneData.ordChgSq}, cancelGb=${oneData.chgGb}" onclick="fnCreCancel(this);" class="detail_btn">전체신청취소</a>
 
+					</th:block>
 
 				</div>
 
 				</div>
 
 				
 				
 				<th:block th:if="${returnDetailList.returnDetailList}" th:each="returnDtl, status : ${returnDetailList.returnDetailList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 
 				<th:block th:if="${returnDetailList.returnDetailList}" th:each="returnDtl, status : ${returnDetailList.returnDetailList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
 
 					<div class="goods_section">
 
 					<div class="goods_section">
 
 						<div class="goods_status">
 
 						<div class="goods_status">
 
-							<p class="dlvr_staus" th:text="${returnDtl.chgStatNm}"></p>
 
-							<p class="dlvr_desc" th:text="|${returnDtl.chgDate} ${returnDtl.chgTime}|"></p>
 
+							<p class="dlvr_staus" th:if="${returnDtl.chgStat == 'G685_33'}" th:text="|환불진행중|"></p>
 
+							<p class="dlvr_staus" th:if="${returnDtl.chgStat == 'G685_69'}" th:text="|접수취소|"></p>
 
+							<p class="dlvr_staus" th:unless="${returnDtl.chgStat == 'G685_33' or returnDtl.chgStat == 'G685_69'}" th:text="${returnDtl.chgStatNm}"></p>
 
+							<p class="dlvr_desc"  th:text="|${returnDtl.chgDate} ${returnDtl.chgTime}|"></p>
 
 						</div>
 
 						</div>
 
 						
 						
 						<div class="goods_detail">
 
 						<div class="goods_detail">
 
@@ -54,8 +59,8 @@
 
 											<span th:text="${returnDtl.brandNm}"></span>
 
 											<span th:text="${returnDtl.brandNm}"></span>
 
 											<div class="badge_wrap">
 
 											<div class="badge_wrap">
 
 												<em class="tag primary" th:if="${returnDtl.shotDelvYn == 'Y'}">총알배송</em>
 
 												<em class="tag primary" th:if="${returnDtl.shotDelvYn == 'Y'}">총알배송</em>
 
-												<em class="tag" th:if="${returnDtl.shotDelvYn == 'N' and returnDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
 
-												<em class="tag" th:if="${returnDtl.selfGoodsYn == 'N'}">업체직배송</span>
 
+												<em class="tag" 		th:if="${returnDtl.shotDelvYn == 'N' and returnDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
 
+												<em class="tag" 		th:if="${returnDtl.selfGoodsYn == 'N'}">업체직배송</span>
 
 											</div>
 
 											</div>
 
 										</div>
 
 										</div>
 
 										<div class="name" th:text="${returnDtl.goodsNm}"></div>
 
 										<div class="name" th:text="${returnDtl.goodsNm}"></div>
 
@@ -83,9 +88,16 @@
 
 							</a>
 
 							</a>
 
 						</div>
 
 						</div>
 
 						<div class="goods_btn_wrap btn_group_flex">
 
 						<div class="goods_btn_wrap btn_group_flex">
 
-							<div th:if="${returnDtl.chgStat == 'G685_50' or returnDtl.chgStat == 'G685_51'}"><button type="button" class="btn btn_default" th:attr="ordNo=${returnDtl.ordNo}, ordChgSq=${returnDtl.ordChgSq}, cancelGb=${returnDtl.chgGb}" onclick="fnCreCancel(this);"><span>신청 취소</span></button></div>
 
-							<div th:if="${returnDtl.chgStat == 'G685_32' or returnDtl.chgStat == 'G685_51'}"><button type="button" class="btn btn_default" th:attr="ordNo=${returnDtl.ordNo}, ordChgSq=${returnDtl.ordChgSq}" onclick="fnCrePayAddCost(this);"><span>결재하기</span></button></div>
 
-							<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);"><span>1:1 문의</span></button></div>
 
+							<div th:if="${returnDtl.chgStat == 'G685_32' or returnDtl.chgStat == 'G685_51'}">
 
+								<button type="button" class="btn btn_default" th:attr="ordNo=${returnDtl.ordNo}, ordChgSq=${returnDtl.ordChgSq}" onclick="fnCrePayAddCost(this);">
 
+									<span>결재하기</span>
 
+								</button>
 
+							</div>
 
+							<div>
 
+								<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_ONETOONE_QNA_REG);">
 
+									<span>1:1 문의</span>
 
+								</button>
 
+							</div>
 
 						</div>
 
 						</div>
 
 						<div class="goods_txt">
 
 						<div class="goods_txt">
 
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_51' or (returnDtl.chgGb == 'G680_30' and returnDtl.chgStat == 'G685_32')}" th:text="|${returnDtl.addPayCost}원 결제 후 반품 가능합니다.|"></p>
 
 							<p class="cf_txt cf_desc" th:if="${returnDtl.chgStat == 'G685_51' or (returnDtl.chgGb == 'G680_30' and returnDtl.chgStat == 'G685_32')}" th:text="|${returnDtl.addPayCost}원 결제 후 반품 가능합니다.|"></p>
 
@@ -128,9 +140,11 @@
 
 			<div class="tbl_wrap">
 
 			<div class="tbl_wrap">
 
 				<div class="tbl_tit"> 
 				<div class="tbl_tit"> 
 					<h3>반품 회수지 주소</h3>
 
 					<h3>반품 회수지 주소</h3>
 
-					<button type="button" id="btn_adrsChange_pop" class="btn_popup" th:if="${oneData.chgStat == 'G685_50' or oneData.chgStat == 'G685_51'}" onclick="fnChangeDeliveryAddr();">
 
-						<span>회수지 변경</span>
 
-					</button>
 
+					<th:block th:if="${oneData.chgStat == 'G685_50' or oneData.chgStat == 'G685_51'}">
 
+						<button type="button" id="btn_adrsChange_pop" class="btn_popup" onclick="fnChangeDeliveryAddr();">
 
+							<span>회수지 변경</span>
 
+						</button>
 
+					</th:block>
 
 				</div>
 
 				</div>
 
 				<div class="tbl">
 
 				<div class="tbl">
 
 					<div class="ship_info">
 
 					<div class="ship_info">

+ 3 - 2
src/main/webapp/WEB-INF/views/mob/mypage/MypageExchangeFormMob.html
Просмотреть файл 

@@ -21,6 +21,7 @@
 
 	<section class="content my_exchange my_return">
 
 	<section class="content my_exchange my_return">
 
 		<form id="exchangeForm" class="form_wrap">
 
 		<form id="exchangeForm" class="form_wrap">
 
 			<input type="hidden" name="chgReason"/>
 
 			<input type="hidden" name="chgReason"/>
 
+			
 			<div class="inner wide bg_beige">
 
 			<div class="inner wide bg_beige">
 
 				<div class="order_number">
 
 				<div class="order_number">
 
 					<dl class="clear">
 
 					<dl class="clear">
 
@@ -49,8 +50,8 @@
 
 												<span th:text="${exchange.brandNm}"></span>
 
 												<span th:text="${exchange.brandNm}"></span>
 
 												<div class="badge_wrap">
 
 												<div class="badge_wrap">
 
 													<em class="tag primary" th:if="${exchange.shotDelvYn == 'Y'}">총알배송</em>
 
 													<em class="tag primary" th:if="${exchange.shotDelvYn == 'Y'}">총알배송</em>
 
-													<em class="tag" th:if="${exchange.shotDelvYn == 'N' and exchange.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
 
-													<em class="tag" th:if="${exchange.selfGoodsYn == 'N'}">업체직배송</em>
 
+													<em class="tag" 		th:if="${exchange.shotDelvYn == 'N' and exchange.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
 
+													<em class="tag" 		th:if="${exchange.selfGoodsYn == 'N'}">업체직배송</em>
 
 												</div>
 
 												</div>
 
 											</div>
 
 											</div>
 
 											<div class="name" th:text="${exchange.goodsNm}"></div>
 
 											<div class="name" th:text="${exchange.goodsNm}"></div>

+ 3 - 6
src/main/webapp/WEB-INF/views/mob/mypage/MypageReturnFormMob.html
Просмотреть файл 

@@ -17,7 +17,7 @@
 
 
 
 <th:block layout:fragment="content">
 
 <th:block layout:fragment="content">
 
 
 
-<main role="" id="" class="container my">
 
+<main class="container my">
 
 	<section class="content my_return">
 
 	<section class="content my_return">
 
 		<form id="returnForm" class="form_wrap">
 
 		<form id="returnForm" class="form_wrap">
 
 			<input type="hidden" name="accountNo" 	th:value="${oneData.accountNo}"/>
 
 			<input type="hidden" name="accountNo" 	th:value="${oneData.accountNo}"/>
 
@@ -54,8 +54,8 @@
 
 												<span th:text="${return.brandNm}"></span>
 
 												<span th:text="${return.brandNm}"></span>
 
 												<div class="badge_wrap">
 
 												<div class="badge_wrap">
 
 													<em class="tag primary" th:if="${return.shotDelvYn == 'Y'}">총알배송</em>
 
 													<em class="tag primary" th:if="${return.shotDelvYn == 'Y'}">총알배송</em>
 
-													<em class="tag" th:if="${return.shotDelvYn == 'N' and return.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
 
-													<em class="tag" th:if="${return.selfGoodsYn == 'N'}">업체직배송</em>
 
+													<em class="tag" 		th:if="${return.shotDelvYn == 'N' and return.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
 
+													<em class="tag" 		th:if="${return.selfGoodsYn == 'N'}">업체직배송</em>
 
 												</div>
 
 												</div>
 
 											</div>
 
 											</div>
 
 											<div class="name" th:text="${return.goodsNm}"></div>
 
 											<div class="name" th:text="${return.goodsNm}"></div>
 
@@ -313,9 +313,6 @@
 
 								</td>
 
 								</td>
 
 							</tr>
 
 							</tr>
 
 						</table>
 
 						</table>
 
-						<!-- 
-						<button type="button" class="btn btn_default"><span>취소 전표 보기</span></button>
 
-						 -->
 
 					</div>
 
 					</div>
 
 				</div>
 
 				</div>
 
 				<div class="required_group" id="addDeliveryFee" style="display:none">
 
 				<div class="required_group" id="addDeliveryFee" style="display:none">