Merge remote-tracking branch 'origin/develop' into jsh77b

src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDescFormMob.html

@@ -97,7 +97,7 @@
 																			or #strings.contains(goodsImg.sysImgNm,'_C3')
 																			or #strings.contains(goodsImg.sysImgNm,'_C4')
 																			or #strings.contains(goodsImg.sysImgNm,'_C5')}">
-				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=360'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
+				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=1080'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 				</th:block>
 			</div>
 		</div>
@@ -127,7 +127,7 @@
 																				or #strings.contains(goodsImg.sysImgNm,'_D15') or #strings.contains(goodsImg.sysImgNm,'_D16')
 																				or #strings.contains(goodsImg.sysImgNm,'_D17') or #strings.contains(goodsImg.sysImgNm,'_D18')
 																				or #strings.contains(goodsImg.sysImgNm,'_D19') or #strings.contains(goodsImg.sysImgNm,'_D20')}">
-				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=360'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
+				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=1080'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 				</th:block>
 			</div>
 		</div>

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -363,7 +363,7 @@
 																					or #strings.contains(goodsImg.sysImgNm,'_C3')
 																					or #strings.contains(goodsImg.sysImgNm,'_C4')
 																					or #strings.contains(goodsImg.sysImgNm,'_C5')}">
-						<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=360'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
+						<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=1080'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 						</th:block>
 					</div>
 				</div>
@@ -393,7 +393,7 @@
 																					or #strings.contains(goodsImg.sysImgNm,'_D15') or #strings.contains(goodsImg.sysImgNm,'_D16')
 																					or #strings.contains(goodsImg.sysImgNm,'_D17') or #strings.contains(goodsImg.sysImgNm,'_D18')
 																					or #strings.contains(goodsImg.sysImgNm,'_D19') or #strings.contains(goodsImg.sysImgNm,'_D20')}">
-						<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=360'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
+						<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=1080'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 						</th:block>
 					</div>
 				</div>

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

@@ -42,7 +42,7 @@
 							<div class="option_select">
 								<div class="select_custom select_option">
 									<div class="combo">
-										<div class="select">선택</div>
+										<div class="select" th:text="${oneData.optCd2}">선택</div>
 									</div>
 								</div>
 							</div>

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

@@ -52,9 +52,9 @@
 											<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>
+													<em class="order_badge order_bullet_badge"	th:if="${cancel.shotDelvYn == 'Y'}">총알배송</em>
+													<em class="order_badge"						th:if="${cancel.shotDelvYn == 'N' and cancel.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+													<em class="order_badge"						th:if="${cancel.selfGoodsYn == 'N'}">업체직배송</em>
 												</div>
 											</div>
 											<div class="name" th:text="${cancel.goodsNm}"></div>

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

@@ -53,9 +53,9 @@
 										<div class="brand">
 											<span th:text="${cancelDtl.brandNm}"></span>
 											<div class="badge_wrap">
-												<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>
+												<em class="order_badge order_bullet_badge" 	th:if="${cancelDtl.shotDelvYn == 'Y'}">총알배송</em>
+												<em class="order_badge" 					th:if="${cancelDtl.shotDelvYn == 'N' and cancelDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+												<em class="order_badge" 					th:if="${cancelDtl.selfGoodsYn == 'N'}">업체직배송</em>
 											</div>
 										</div>
 										<div class="name" th:text="${cancelDtl.goodsNm}"></div>

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

@@ -60,9 +60,9 @@
 										<div class="brand">
 											<span th:text="${exchangeDtl.brandNm}"></span>
 											<div class="badge_wrap">
-												<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'}">업체직배송</em>
+												<em class="order_badge order_bullet_badge"	th:if="${exchangeDtl.shotDelvYn == 'Y'}">총알배송</em>
+												<em class="order_badge"						th:if="${exchangeDtl.shotDelvYn == 'N' and exchangeDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+												<em class="order_badge"						th:if="${exchangeDtl.selfGoodsYn == 'N'}">업체직배송</em>
 											</div>
 										</div>
 										<div class="name" th:text="${exchangeDtl.goodsNm}"></div>
@@ -276,7 +276,7 @@
 				</div>
 			</div>
 		</th:block>
-		<th:block th:if="${oneData.addPayCost > 0}">
+		<th:block th:if="${oneData.addPayCost > 0 and not #strings.isEmpty(oneData.pgTid)}">
 			<div class="inner">
 				<!-- 210409_수정 : 환불 정보 -> 결제 정보 영역으로 수정. -->
 				<div class="tbl_wrap pay_wrap">

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

@@ -194,7 +194,7 @@ var fnGetInfiniteScrollDataList = function() {
 					}
 				}
 			});
-		} else {
+		} else if (pageNo == 1) {
 			let html = '<div class="inner">';
 			html += '	<div class="part_goods">';
 			html += '		<div class="nodata">';

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

@@ -1,9 +1,9 @@
-<div class="inner">
-	<div class="part_goods">
-		<!-- 취소,반품,교환목록 있을때 -->
-		<th:block th:if="${#lists.size(creList) > 0}">
-			<!-- 취소,반품,교환목록 -->
-			<th:block th:each="creList , i : ${creList}">
+<!-- 취소,반품,교환목록 있을때 -->
+<th:block th:if="${#lists.size(creList) > 0}">
+	<!-- 취소,반품,교환목록 -->
+	<th:block th:each="creList , i : ${creList}">
+		<div class="inner">
+			<div class="part_goods">
 				<div class="goods_top">
 					<!-- 선물주문여부체크 -->
 					<th:block th:if="${creList.giftPackYn} == 'Y'">
@@ -52,7 +52,7 @@
 													<em class="order_badge">STYLE24 일반배송</em>
 												</th:block>
 												<th:block th:if="${cre.selfGoodsYn} == 'N' and ${cre.shotDelvYn} == 'N'">
-													<em class="order_badge order_bullet_badge">업체직배송</em>
+													<em class="order_badge">업체직배송</em>
 												</th:block>
 											</div>
 										</div>
@@ -235,7 +235,8 @@
 						<!-- 환불진행중 -->
 						<th:block th:if="${cre.chgStat} == 'G685_33'">
 							<div class="goods_txt">
-								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')} 원 환불을 진행하고 있습니다.(영업일 최대 3일 내 환불 예정)|"></p>
+<!--								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')} 원 환불을 진행하고 있습니다.(영업일 최대 3일 내 환불 예정)|"></p>-->
+								<p class="cf_txt cf_desc" th:text="|환불을 진행하고 있습니다.(영업일 최대 3일 내 환불 예정)|"></p>
 							</div>
 						</th:block>
 						<!-- //환불진행중 -->
@@ -256,20 +257,24 @@
 						<!-- //취소,반품,교환 상태별 문구정의 -->
 					</div>
 				</th:block>
-			</th:block>
-		</th:block>
-		<!-- //취소,반품,교환목록 있을때 -->
-		<!-- 취소,반품,교환목록 없을때 -->
-		<th:block th:if="${#lists.size(creList) < 1}">
+			</div>
+		</div>
+	</th:block>
+</th:block>
+<!-- //취소,반품,교환목록 있을때 -->
+<!-- 취소,반품,교환목록 없을때 -->
+<th:block th:if="${#lists.size(creList) < 1}">
+	<div class="inner">
+		<div class="part_goods">
 			<div class="nodata">
 				<div class="txt_box">
 					<p>취소/반품/교환내역이 없습니다.<br/></p>
 				</div>
 			</div>
-		</th:block>
-		<!-- //취소,반품,교환목록 없을때 -->
+		</div>
 	</div>
-</div>
+</th:block>
+<!-- //취소,반품,교환목록 없을때 -->
 
 <script th:inline="javascript">
 	$(document).ready(function() {

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

@@ -58,9 +58,9 @@
 										<div class="brand">
 											<span th:text="${returnDtl.brandNm}"></span>
 											<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="order_badge order_bullet_badge"	th:if="${returnDtl.shotDelvYn == 'Y'}">총알배송</em>
+												<em class="order_badge"						th:if="${returnDtl.shotDelvYn == 'N' and returnDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+												<em class="order_badge" 					th:if="${returnDtl.selfGoodsYn == 'N'}">업체직배송</em>
 											</div>
 										</div>
 										<div class="name" th:text="${returnDtl.goodsNm}"></div>

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

@@ -49,9 +49,9 @@
 											<div class="brand">
 												<span th:text="${exchange.brandNm}"></span>
 												<div class="badge_wrap">
-													<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="order_badge order_bullet_badge"	th:if="${exchange.shotDelvYn == 'Y'}">총알배송</em>
+													<em class="order_badge"						th:if="${exchange.shotDelvYn == 'N' and exchange.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+													<em class="order_badge"						th:if="${exchange.selfGoodsYn == 'N'}">업체직배송</em>
 												</div>
 											</div>
 											<div class="name" th:text="${exchange.goodsNm}"></div>

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

@@ -293,7 +293,7 @@ var fnGetInfiniteScrollDataList = function() {
 					}
 				}
 			});
-		} else {
+		} else if (pageNo == 1 && mypageMainYn != 'Y') {
 			let html = '<div class="inner">';
 			html += '	<div class="part_goods">';
 			html += '		<div class="nodata">';

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

@@ -1,11 +1,10 @@
-<div class="inner">
-	<div class="part_goods">
-		<input type="hidden" name="pageNo" th:value="${pageNo}">
-		<input type="hidden" name="orderListCnt" th:value="${orderListCnt}">
-		
-		<!-- 주문목록이 있을때 -->
-		<th:block th:if="${#lists.size(orderList) > 0}">
-			<th:block th:each="order , i : ${orderList}">
+<input type="hidden" name="pageNo" th:value="${pageNo}">
+<input type="hidden" name="orderListCnt" th:value="${orderListCnt}">
+<!-- 주문목록이 있을때 -->
+<th:block th:if="${#lists.size(orderList) > 0}">
+	<th:block th:each="order , i : ${orderList}">
+		<div class="inner">
+			<div class="part_goods">
 				<div class="goods_top">
 					<th:block th:if="${order.giftPackYn} == 'Y'">
 						<div class="goods_date">선물일<span class="date" th:text="${order.ordDt}"></span></div>
@@ -520,20 +519,25 @@
 					<!-- //주문 접수 -->
 				</th:block>
 				<!-- //주문목록 -->
-			</th:block>
-		</th:block>
-		<!-- //주문목록이 있을때 -->
-		<!-- 주문목록이 없을때 -->
-		<th:block th:if="${#lists.size(orderList) < 1}">
+			</div>
+		</div>
+	</th:block>
+</th:block>
+<!-- //주문목록이 있을때 -->
+<!-- 주문목록이 없을때 -->
+<th:block th:if="${#lists.size(orderList) < 1}">
+	<div class="inner">
+		<div class="part_goods">
 			<div class="nodata">
 				<div class="txt_box">
 					<p>주문내역이 없습니다.<br/></p>
 				</div>
 			</div>
-		</th:block>
-		<!-- //주문목록이 없을때 -->
+		</div>
 	</div>
-</div>
+</th:block>
+		<!-- //주문목록이 없을때 -->
+
 
 <script th:inline="javascript">
 $(document).ready(function() {

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

@@ -53,9 +53,9 @@
 											<div class="brand">
 												<span th:text="${return.brandNm}"></span>
 												<div class="badge_wrap">
-													<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="order_badge order_bullet_badge"	th:if="${return.shotDelvYn == 'Y'}">총알배송</em>
+													<em class="order_badge"						th:if="${return.shotDelvYn == 'N' and return.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+													<em class="order_badge"						th:if="${return.selfGoodsYn == 'N'}">업체직배송</em>
 												</div>
 											</div>
 											<div class="name" th:text="${return.goodsNm}"></div>

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

@@ -51,9 +51,9 @@
 											<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>
+													<em class="order_badge order_bullet_badge"	th:if="${cancel.shotDelvYn == 'Y'}">총알배송</em>
+													<em class="order_badge"						th:if="${cancel.shotDelvYn == 'N' and cancel.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+													<em class="order_badge"						th:if="${cancel.selfGoodsYn == 'N'}">업체직배송</em>
 												</div>
 											</div>
 											<div class="name" th:text="${cancel.goodsNm}"></div>

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

@@ -48,9 +48,9 @@
 										<div class="brand">
 											<span th:text="${cancelDtl.brandNm}"></span>
 											<div class="badge_wrap">
-												<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>
+												<em class="order_badge order_bullet_badge" 	th:if="${cancelDtl.shotDelvYn == 'Y'}">총알배송</em>
+												<em class="order_badge"			 			th:if="${cancelDtl.shotDelvYn == 'N' and cancelDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+												<em class="order_badge" 					th:if="${cancelDtl.selfGoodsYn == 'N'}">업체직배송</em>
 											</div>
 										</div>
 										<div class="name" th:text="${cancelDtl.goodsNm}"></div>

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

@@ -55,9 +55,9 @@
 										<div class="brand">
 											<span th:text="${exchangeDtl.brandNm}"></span>
 											<div class="badge_wrap">
-												<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'}">업체직배송</em>
+												<em class="order_badge order_bullet_badge"	th:if="${exchangeDtl.shotDelvYn == 'Y'}">총알배송</em>
+												<em class="order_badge"				 		th:if="${exchangeDtl.shotDelvYn == 'N' and exchangeDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+												<em class="order_badge"						th:if="${exchangeDtl.selfGoodsYn == 'N'}">업체직배송</em>
 											</div>
 										</div>
 										<div class="name" th:text="${exchangeDtl.goodsNm}"></div>
@@ -261,7 +261,7 @@
 				</div>
 			</div>
 		</th:block>
-		<th:block th:if="${not #strings.isEmpty(oneData.addPayCost)}">
+		<th:block th:if="${oneData.addPayCost > 0 and not #strings.isEmpty(oneData.pgTid)}">
 			<div class="inner">
 				<!-- 210409_수정 : 환불 정보 -> 결제 정보 영역으로 수정. -->
 				<div class="tbl_wrap pay_wrap">

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

@@ -213,7 +213,7 @@ var fnGetInfiniteScrollDataList = function() {
 					}
 				}
 			});
-		} else {
+		} else if (pageNo == 1) {
 			let html = '<div class="inner">';
 			html += '	<div class="part_goods">';
 			html += '		<div class="nodata">';

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

@@ -1,9 +1,9 @@
-<div class="inner">
-	<div class="part_goods">
-		<!-- 취소,반품,교환목록 있을때 -->
-		<th:block th:if="${#lists.size(creList) > 0}">
-			<!-- 취소,반품,교환목록 -->
-			<th:block th:each="creList , i : ${creList}">
+<!-- 취소,반품,교환목록 있을때 -->
+<th:block th:if="${#lists.size(creList) > 0}">
+	<!-- 취소,반품,교환목록 -->
+	<th:block th:each="creList , i : ${creList}">
+		<div class="inner">
+			<div class="part_goods">
 				<div class="goods_top">
 					<div class="goods_date">주문일<span class="date" th:text="${creList.ordDt}"></span></div>
 					<a href="javascript:void(0);" th:ordChgSq="${creList.ordChgSq}" th:chgGb="${creList.oneData.chgGb}" th:ordNo="${creList.oneData.ordNo}" onclick="fnGoToCreDetail(this);" class="detail_btn">상세보기</a>
@@ -45,7 +45,7 @@
 													<em class="order_badge">STYLE24 일반배송</em>
 												</th:block>
 												<th:block th:if="${cre.selfGoodsYn} == 'N' and ${cre.shotDelvYn} == 'N'">
-													<em class="order_badge order_bullet_badge">업체직배송</em>
+													<em class="order_badge">업체직배송</em>
 												</th:block>
 											</div>
 										</div>
@@ -225,7 +225,8 @@
 						<!-- 환불진행중 -->
 						<th:block th:if="${cre.chgStat} == 'G685_33'">
 							<div class="goods_txt">
-								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')} 원 환불을 진행하고 있습니다.(영업일 최대 3일 내 환불 예정)|"></p>
+<!--								<p class="cf_txt cf_desc" th:text="|${#numbers.formatInteger(cre.addPayCost, 1, 'COMMA')} 원 환불을 진행하고 있습니다.(영업일 최대 3일 내 환불 예정)|"></p>-->
+								<p class="cf_txt cf_desc" th:text="|환불을 진행하고 있습니다.(영업일 최대 3일 내 환불 예정)|"></p>
 							</div>
 						</th:block>
 						<!-- //환불진행중 -->
@@ -246,20 +247,25 @@
 						<!-- //취소,반품,교환 상태별 문구정의 -->
 					</div>
 				</th:block>
-			</th:block>
-		</th:block>
-		<!-- //취소,반품,교환목록 있을때 -->
-		<!-- 취소,반품,교환목록 없을때 -->
-		<th:block th:if="${#lists.size(creList) < 1}">
+			</div>
+		</div>
+	</th:block>
+</th:block>
+<!-- //취소,반품,교환목록 있을때 -->
+<!-- 취소,반품,교환목록 없을때 -->
+<th:block th:if="${#lists.size(creList) < 1}">
+	<div class="inner">
+		<div class="part_goods">
 			<div class="nodata">
 				<div class="txt_box">
 					<p>취소/반품/교환내역이 없습니다.<br/></p>
 				</div>
 			</div>
-		</th:block>
-		<!-- //취소,반품,교환목록 없을때 -->
+		</div>
 	</div>
-</div>
+</th:block>
+<!-- //취소,반품,교환목록 없을때 -->
+
 
 <script th:inline="javascript">
 	$(document).ready(function() {

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

@@ -53,9 +53,9 @@
 										<div class="brand">
 											<span th:text="${returnDtl.brandNm}"></span>
 											<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="order_badge order_bullet_badge"	th:if="${returnDtl.shotDelvYn == 'Y'}">총알배송</em>
+												<em class="order_badge"						th:if="${returnDtl.shotDelvYn == 'N' and returnDtl.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+												<em class="order_badge"						th:if="${returnDtl.selfGoodsYn == 'N'}">업체직배송</em>
 											</div>
 										</div>
 										<div class="name" th:text="${returnDtl.goodsNm}"></div>

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

@@ -48,9 +48,9 @@
 											<div class="brand">
 												<span th:text="${exchange.brandNm}"></span>
 												<div class="badge_wrap">
-													<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="order_badge order_bullet_badge"	th:if="${exchange.shotDelvYn == 'Y'}">총알배송</em>
+													<em class="order_badge"						th:if="${exchange.shotDelvYn == 'N' and exchange.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+													<em class="order_badge"						th:if="${exchange.selfGoodsYn == 'N'}">업체직배송</em>
 												</div>
 											</div>
 											<div class="name" th:text="${exchange.goodsNm}"></div>

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

@@ -199,7 +199,7 @@ var fnGetInfiniteScrollDataList = function() {
 					}
 				}
 			});
-		} else {
+		} else if (pageNo == 1) {
 			let html = '<div class="inner">';
 			html += '	<div class="part_goods">';
 			html += '		<div class="nodata">';

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

@@ -1,8 +1,8 @@
-<div class="inner">
-	<div class="part_goods">
-		<!-- 주문목록이 있을때 -->
-		<th:block th:if="${#lists.size(orderList) > 0}">
-			<th:block th:each="order , i : ${orderList}">
+<!-- 주문목록이 있을때 -->
+<th:block th:if="${#lists.size(orderList) > 0}">
+	<th:block th:each="order , i : ${orderList}">
+		<div class="inner">
+			<div class="part_goods">
 				<div class="goods_top">
 					<div class="goods_date">주문일<span class="date" th:text="${order.ordDt}"></span></div>
 					<a href="javascript:void(0);" class="detail_btn" th:ordno="${order.ordNo}" onclick="fnGoToOrderDetail(this, 'noMember')">주문상세보기</a>
@@ -280,20 +280,24 @@
 					<!-- //주문 접수 -->
 				</th:block>
 				<!-- //주문목록 -->
-			</th:block>
-		</th:block>
-		<!-- //주문목록이 있을때 -->
-		<!-- 주문목록이 없을때 -->
-		<th:block th:if="${#lists.size(orderList) < 1}">
+			</div>
+		</div>
+	</th:block>
+</th:block>
+<!-- //주문목록이 있을때 -->
+<!-- 주문목록이 없을때 -->
+<th:block th:if="${#lists.size(orderList) < 1}">
+	<div class="inner">
+		<div class="part_goods">
 			<div class="nodata">
 				<div class="txt_box">
 					<p>주문내역이 없습니다.<br/></p>
 				</div>
 			</div>
-		</th:block>
-		<!-- //주문목록이 없을때 -->
+		</div>
 	</div>
-</div>
+</th:block>
+<!-- //주문목록이 없을때 -->
 
 <script th:inline="javascript">
 </script>

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

@@ -52,9 +52,9 @@
 											<div class="brand">
 												<span th:text="${return.brandNm}"></span>
 												<div class="badge_wrap">
-													<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="order_badge order_bullet_badge"	th:if="${return.shotDelvYn == 'Y'}">총알배송</em>
+													<em class="order_badge"						th:if="${return.shotDelvYn == 'N' and return.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+													<em class="order_badge"						th:if="${return.selfGoodsYn == 'N'}">업체직배송</em>
 												</div>
 											</div>
 											<div class="name" th:text="${return.goodsNm}"></div>

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

@@ -206,10 +206,10 @@
 														<span id="chgerAddr" th:text="|${oneData.chgerBaseAddr} ${oneData.chgerDtlAddr}|"></span>
 														<button type="button" class="btn btn_default btn_sm" th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}" onclick="fnChangeAddr('chger');"><span>회수지 변경</span></button>
 													</li>
-													<li>
-														배송요청 사항&nbsp;:&nbsp;<span id="chgerRtnMemo" th:text="${oneData.chgerRtnMemo}"></span>
-														<button type="button" class="btn_underline" th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}" onclick="fnChangeMemo('chger');"><span>변경하기</span></button>
-													</li>
+<!--													<li>-->
+<!--														배송요청 사항&nbsp;:&nbsp;<span id="chgerRtnMemo" th:text="${oneData.chgerRtnMemo}"></span>-->
+<!--														<button type="button" class="btn_underline" th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}" onclick="fnChangeMemo('chger');"><span>변경하기</span></button>-->
+<!--													</li>-->
 												</ul>
 											</div>
 										</td>

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

@@ -163,10 +163,10 @@
 														<span id="chgerAddr" th:text="|${oneData.chgerBaseAddr} ${oneData.chgerDtlAddr}|"></span>
 														<button type="button" class="btn btn_default btn_sm" th:if="${oneData.chgStat == 'G685_50' or oneData.chgStat == 'G685_51'}" onclick="fnChangeDeliveryAddr();"><span>회수지 변경</span></button>
 													</li>
-													<li>
-														배송요청 사항&nbsp;:&nbsp;<span id="chgerRtnMemo" th:text="${oneData.chgerRtnMemo}"></span>
-														<button type="button" class="btn_underline" th:if="${oneData.chgStat == 'G685_50' or oneData.chgStat == 'G685_51'}" onclick="fnChangeDeliveryMemo(this)"><span>변경하기</span></button>
-													</li>
+<!--													<li>-->
+<!--														배송요청 사항&nbsp;:&nbsp;<span id="chgerRtnMemo" th:text="${oneData.chgerRtnMemo}"></span>-->
+<!--														<button type="button" class="btn_underline" th:if="${oneData.chgStat == 'G685_50' or oneData.chgStat == 'G685_51'}" onclick="fnChangeDeliveryMemo(this)"><span>변경하기</span></button>-->
+<!--													</li>-->
 												</ul>
 											</div>
 										</td>

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

@@ -472,6 +472,7 @@
 								</tr>
 								</tbody>
 							</table>
+							<p class="t_help">※ NPAY등의 대체결제수단으로 결제 시 해당 결제 플랫폼에서 영수증 확인이 가능합니다.</p>
 						</div>
 						<div class="btn_footer_area">
 							<button type="button" class="btn btn_dark btn_md" onclick="cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);"><span>확인</span></button>

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

@@ -203,10 +203,10 @@
 														<span id="chgerAddr" th:text="|${oneData.chgerBaseAddr} ${oneData.chgerDtlAddr}|"></span>
 														<button type="button" class="btn btn_default btn_sm" th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}" onclick="fnChangeAddr('chger');"><span>회수지 변경</span></button>
 													</li>
-													<li>
-														배송요청 사항&nbsp;:&nbsp;<span id="chgerRtnMemo" th:text="${oneData.chgerRtnMemo}"></span>
-														<button type="button" class="btn_underline" th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}" onclick="fnChangeMemo('chger');"><span>변경하기</span></button>
-													</li>
+<!--													<li>-->
+<!--														배송요청 사항&nbsp;:&nbsp;<span id="chgerRtnMemo" th:text="${oneData.chgerRtnMemo}"></span>-->
+<!--														<button type="button" class="btn_underline" th:if="${oneData.chgStat == 'G685_20' or oneData.chgStat == 'G685_21'}" onclick="fnChangeMemo('chger');"><span>변경하기</span></button>-->
+<!--													</li>-->
 												</ul>
 											</div>
 										</td>

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

@@ -161,10 +161,10 @@
 														<span id="chgerAddr" th:text="|${oneData.chgerBaseAddr} ${oneData.chgerDtlAddr}|"></span>
 														<button type="button" class="btn btn_default btn_sm" th:if="${oneData.chgStat == 'G685_50' or oneData.chgStat == 'G685_51'}" onclick="fnChangeDeliveryAddr();"><span>회수지 변경</span></button>
 													</li>
-													<li>
-														배송요청 사항&nbsp;:&nbsp;<span id="chgerRtnMemo" th:text="${oneData.chgerRtnMemo}"></span>
-														<button type="button" class="btn_underline" th:if="${oneData.chgStat == 'G685_50' or oneData.chgStat == 'G685_51'}" onclick="fnChangeDeliveryMemo(this)"><span>변경하기</span></button>
-													</li>
+<!--													<li>-->
+<!--														배송요청 사항&nbsp;:&nbsp;<span id="chgerRtnMemo" th:text="${oneData.chgerRtnMemo}"></span>-->
+<!--														<button type="button" class="btn_underline" th:if="${oneData.chgStat == 'G685_50' or oneData.chgStat == 'G685_51'}" onclick="fnChangeDeliveryMemo(this)"><span>변경하기</span></button>-->
+<!--													</li>-->
 												</ul>
 											</div>
 										</td>

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

@@ -329,6 +329,7 @@
 									</tr>
 								</tbody>
 							</table>
+							<p class="t_help">※ NPAY등의 대체결제수단으로 결제 시 해당 결제 플랫폼에서 영수증 확인이 가능합니다.</p>
 						</div>
 						<div class="btn_footer_area">
 							<button type="button" class="btn btn_dark btn_md" onclick="cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);"><span>확인</span></button>