Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/service/TsfCartService.java

@@ -511,6 +511,7 @@ public class TsfCartService {
 
 		// 전체 장바구니 정보
 		order.setDelvAllCartList(cartGoodsList);
+		order.setAllCartCnt(cartGoodsList.size());
 
 		return order;
 	}
@@ -931,6 +932,7 @@ public class TsfCartService {
 
 		// 장바구니 총액 계산 상품 총 수량
 		order.setTotCartCnt(notSoldoutCnt);
+		order.setCartGoodsList(cartGoodsList);
 	}
 
 	public void deleteCart(Cart param) {

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

@@ -451,7 +451,7 @@
 					 , I.ITEMKIND_NM 
 		   	         , I.ITEMKIND_CD 
 			         , I.SIZE_GB 
-			         ,DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL #{reviewExpireDay} DAY),NOW()) AS REMAIN_DT -- 남은시간
+			         ,DATEDIFF(DATE_ADD(O.ORD_DT,INTERVAL #{reviewExpireDay} DAY),NOW()) AS REMAIN_DT -- 남은시간
 				  FROM TB_ORDER O
 				 INNER JOIN TB_ORDER_DETAIL OD
 				    ON O.ORD_NO = OD.ORD_NO
@@ -480,13 +480,12 @@
 				LEFT OUTER JOIN TB_COLOR C ON ODI.OPT_CD1 = C.COLOR_CD
 		                                   AND C.USE_YN = 'Y'
 				  WHERE 1=1
-				-- AND O.PAY_DT >  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL #{reviewExpireDay} DAY), '%Y%M%D%H%I%S') 
 				-- AND O.ORD_NO NOT IN (SELECT R.ORD_NO FROM TB_REVIEW R WHERE R.DEL_YN = 'N' AND DISP_YN = 'Y')
 				AND OD.ORD_DTL_NO NOT IN (SELECT R.ORD_DTL_NO FROM TB_REVIEW R WHERE R.DEL_YN = 'N' AND DISP_YN = 'Y' AND R.ORD_NO = O.ORD_NO AND R.ORD_DTL_NO = OD.ORD_DTL_NO AND R.CUST_NO = #{custNo})
 				AND O.CUST_NO = #{custNo}
 				AND O.DISP_YN = 'Y'
 			 	AND O.SITE_CD = #{siteCd}
-				) Z
+				) Z		 
 		 WHERE Z.REMAIN_DT > 0
 		 GROUP BY Z.ORD_NO, Z.ORD_DT, Z.DELV_EDDT, Z.ORD_DTL_NO, Z.ORD_EXCH_GB
 				, Z.GOODS_CD, Z.GOODS_NM, Z.LIST_PRICE, Z.SYS_IMG_NM, Z.ORD_DTL_STAT, Z.ORD_QTY, Z.CNCL_RTN_QTY, Z.ORD_AMT, Z.REAL_ORD_AMT

src/main/resources/config/application-tsit.yml

@@ -22,7 +22,8 @@ domain:
     admin: //tdadmin.style24.com
 #    front: //tdfront.style24.com
     front: //ts5000.ipdisk.co.kr
-    image: //tdimage.style24.com
+#    image: //tdimage.style24.com
+    image: //ts5000.ipdisk.co.kr:8999
 #    uximage: //tdimage.style24.com
     uximage: //ts5000.ipdisk.co.kr
 
@@ -31,7 +32,8 @@ upload:
         target.path: /TSIT/servers/files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png|bmp|txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //tdimage.style24.com
+#        view: //tdimage.style24.com
+        view: //ts5000.ipdisk.co.kr:8999
     goods:
         target.path: /TSIT/servers/files/data/style24/Upload/ProductImage
         max.size: 10
@@ -41,17 +43,20 @@ upload:
         target.path: /TSIT/servers/files/data/style24
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //tdimage.style24.com
+#        view: //tdimage.style24.com
+        view: //ts5000.ipdisk.co.kr:8999
     excel:
         target.path: /TSIT/servers/files/data/style24/excel
         max.size: 10
         allow.extension: xls|xlsx
-        view: //tdimage.style24.com/excel
+#        view: //tdimage.style24.com/excel
+        view: //ts5000.ipdisk.co.kr:8999/excel
     sample:
         target.path: /WIDE/workspace/files/data/style24/sample
         max.size: 10
         allow.extension: txt|doc|docx|ppt|pptx|xls|xlsx|hwp|pdf
-        view: //tdimage.style24.com/sample
+#        view: //tdimage.style24.com/sample
+        view: //ts5000.ipdisk.co.kr:8999/sample
 
 download.path: /TSIT/servers/files/data
 

src/main/webapp/WEB-INF/views/mob/common/fragments/FooterMob.html

@@ -116,10 +116,10 @@
 	$(document).ready(function() {
 		$.getJSON('/cart/goods/not/soldout/cnt', function (order, status) {
 			let cartCnt;
-			if (order.totCartCnt > 99) {
+			if (order.cartGoodsList.length > 99) {
 				cartCnt = "99+";
 			} else {
-				cartCnt = order.totCartCnt;
+				cartCnt = order.cartGoodsList.length;
 			}
 
 			$("header #htopSub .button_wrap .store>span").text(cartCnt);

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

@@ -217,7 +217,8 @@ let oneData = [[${oneData}]];
 var isLogin = [[${isLogin}]];
 
 $(document).ready(function() {
-
+	// 타이틀명
+	$('#htopTitle').text('취소상세');
 });
 /*]]>*/
 </script>

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

@@ -246,7 +246,8 @@
 	let memoGb = '';
 
 	$(document).ready(function() {
-		
+		// 타이틀명
+		$('#htopTitle').text('교환상세');
 	});
 	
 	// 배송메모 및 반품메모 변경 처리

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

@@ -282,7 +282,8 @@ let oneData = [[${oneData}]];
 var isLogin = [[${isLogin}]];
 
 $(document).ready(function() {
-
+	// 타이틀명
+	$('#htopTitle').text('반품상세');
 });
 
 // 회수지 정보 설정

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

@@ -215,6 +215,12 @@
 							<button type="button" id="btn_adrsChange_pop" class="btn_popup" onclick="fnChangeAddr('chger');"><span>회수지 변경</span></button>
 						</div>
 						<div class="tbl">
+							<input type="hidden" name="chgerNm" 		th:value="${deliveryAddrInfo.recipNm}">
+							<input type="hidden" name="chgerPhnno" 		th:value="${deliveryAddrInfo.recipPhnno}">
+							<input type="hidden" name="chgerZipcode" 	th:value="${deliveryAddrInfo.recipZipcode}">
+							<input type="hidden" name="chgerBaseAddr" 	th:value="${deliveryAddrInfo.recipBaseAddr}">
+							<input type="hidden" name="chgerDtlAddr" 	th:value="${deliveryAddrInfo.recipDtlAddr}">
+							<input type="hidden" name="chgerRtnMemo" 	th:value="${deliveryAddrInfo.delvMemo}">
 							<div class="ship_info">
 								<dl>
 									<div class="name">
@@ -231,12 +237,6 @@
 									</div>
 									<div class="desc_txt">택배사에서 반품 상품을 직접 회수할 장소 선택</div>
 								</dl>
-								<input type="hidden" name="chgerNm" 		th:value="${deliveryAddrInfo.recipNm}">
-								<input type="hidden" name="chgerPhnno" 		th:value="${deliveryAddrInfo.recipPhnno}">
-								<input type="hidden" name="chgerZipcode" 	th:value="${deliveryAddrInfo.recipZipcode}">
-								<input type="hidden" name="chgerBaseAddr" 	th:value="${deliveryAddrInfo.recipBaseAddr}">
-								<input type="hidden" name="chgerDtlAddr" 	th:value="${deliveryAddrInfo.recipDtlAddr}">
-								<input type="hidden" name="chgerRtnMemo" 	th:value="${deliveryAddrInfo.delvMemo}">
 							</div>
 						</div>
 					</div>
@@ -270,6 +270,12 @@
 						<button type="button" class="btn_popup" onclick="fnChangeAddr('recip')"><span>배송지 변경</span></button>
 					</div>
 					<div class="tbl">
+						<input type="hidden" name="recipNm" 		th:value="${deliveryAddrInfo.recipNm}">
+						<input type="hidden" name="recipPhnno" 		th:value="${deliveryAddrInfo.recipPhnno}">
+						<input type="hidden" name="recipZipcode" 	th:value="${deliveryAddrInfo.recipZipcode}">
+						<input type="hidden" name="recipBaseAddr" 	th:value="${deliveryAddrInfo.recipBaseAddr}">
+						<input type="hidden" name="recipDtlAddr"	th:value="${deliveryAddrInfo.recipDtlAddr}">
+						<input type="hidden" name="delvMemo" 		th:value="${deliveryAddrInfo.delvMemo}">
 						<div class="ship_info">
 							<dl>
 								<div class="name">
@@ -285,12 +291,6 @@
 									<dd id="recipPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></dd>
 								</div>
 							</dl>
-							<input type="hidden" name="recipNm" 		th:value="${deliveryAddrInfo.recipNm}">
-							<input type="hidden" name="recipPhnno" 		th:value="${deliveryAddrInfo.recipPhnno}">
-							<input type="hidden" name="recipZipcode" 	th:value="${deliveryAddrInfo.recipZipcode}">
-							<input type="hidden" name="recipBaseAddr" 	th:value="${deliveryAddrInfo.recipBaseAddr}">
-							<input type="hidden" name="recipDtlAddr"	th:value="${deliveryAddrInfo.recipDtlAddr}">
-							<input type="hidden" name="delvMemo" 		th:value="${deliveryAddrInfo.delvMemo}">
 						</div>
 					</div>
 				</div>
@@ -301,7 +301,7 @@
 				</div>
 				<!-- //교환 배송비결제 필요할 경우 -->
 				<div class="btn_group btn_group_flex">
-					<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_MYPAGE_CRE_LIST)"><span>취소</span></button></div>
+					<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST)"><span>취소</span></button></div>
 					<div><button type="button" id="btn_exchange_confirm" class="btn btn_dark" onclick="fnExchange()"><span>교환 신청</span></button></div>
 				</div>
 			</div>
@@ -364,15 +364,18 @@ let addrGb 			= '';
 let jsonObj 		= {};
 let ordNo 			= [[${oneData.ordNo}]];
 
-$(document).ready(function() {	
+$(document).ready(function() {
+	// 타이틀명
+	$('#htopTitle').text('교환 신청');
+
 	// 입점업체의 경우 회수방식 직접배송 처리
 	if (oneData.selfGoodsYn != 'Y') {
 		$('#withdraw').click();
 		$('.wdGb').css('display','none');
 	}
 
-	// 타이틀명
-	$('#htopTitle').text('교환 신청');
+	// 교환사유 선택 처리
+	$('#exchangeReasonPop .lap .popup_con .button_list button').eq(0).click();
 });
 
 // 교환수량버튼기능

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

@@ -1006,8 +1006,8 @@
 
 		// 버튼 클래스 설정
 		$.each($('.btn_count'), function(idx, item) {
-			if ($(item).children().length > 3 && !$(item).hasClass('type1')) {
-				$(item).addClass('type1');
+			if ($(item).children().length > 3 && !$(item).hasClass('col2')) {
+				$(item).addClass('col2');
 			}
 		});
 	});

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

@@ -491,8 +491,8 @@
 <script th:inline="javascript">
 // 버튼 클래스 설정
 $.each($('.btn_count'), function(idx, item) {
-	if ($(item).children().length > 3 && !$(item).hasClass('type1')) {
-		$(item).addClass('type1');
+	if ($(item).children().length > 3 && !$(item).hasClass('col2')) {
+		$(item).addClass('col2');
 	}
 });
 </script>

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

@@ -214,6 +214,12 @@
 							<button type="button" id="btn_adrsChange_pop" class="btn_popup" onclick="fnChangeAddr('chger');"><span>회수지 변경</span></button>
 						</div>
 						<div class="tbl">
+							<input type="hidden" name="chgerNm" 		th:value="${deliveryAddrInfo.recipNm}">
+							<input type="hidden" name="chgerPhnno" 		th:value="${deliveryAddrInfo.recipPhnno}">
+							<input type="hidden" name="chgerZipcode" 	th:value="${deliveryAddrInfo.recipZipcode}">
+							<input type="hidden" name="chgerBaseAddr" 	th:value="${deliveryAddrInfo.recipBaseAddr}">
+							<input type="hidden" name="chgerDtlAddr" 	th:value="${deliveryAddrInfo.recipDtlAddr}">
+							<input type="hidden" name="chgerRtnMemo" 	th:value="${deliveryAddrInfo.delvMemo}">
 							<div class="ship_info">
 								<dl>
 									<div class="name">
@@ -230,12 +236,6 @@
 									</div>
 									<div class="desc_txt">택배사에서 반품 상품을 직접 회수할 장소 선택</div>
 								</dl>
-								<input type="hidden" name="chgerNm" 		th:value="${deliveryAddrInfo.recipNm}">
-								<input type="hidden" name="chgerPhnno" 		th:value="${deliveryAddrInfo.recipPhnno}">
-								<input type="hidden" name="chgerZipcode" 	th:value="${deliveryAddrInfo.recipZipcode}">
-								<input type="hidden" name="chgerBaseAddr" 	th:value="${deliveryAddrInfo.recipBaseAddr}">
-								<input type="hidden" name="chgerDtlAddr" 	th:value="${deliveryAddrInfo.recipDtlAddr}">
-								<input type="hidden" name="chgerRtnMemo" 	th:value="${deliveryAddrInfo.delvMemo}">
 							</div>
 						</div>
 					</div>
@@ -269,6 +269,12 @@
 						<button type="button" class="btn_popup" onclick="fnChangeAddr('recip')"><span>배송지 변경</span></button>
 					</div>
 					<div class="tbl">
+						<input type="hidden" name="recipNm" 		th:value="${deliveryAddrInfo.recipNm}">
+						<input type="hidden" name="recipPhnno" 		th:value="${deliveryAddrInfo.recipPhnno}">
+						<input type="hidden" name="recipZipcode" 	th:value="${deliveryAddrInfo.recipZipcode}">
+						<input type="hidden" name="recipBaseAddr" 	th:value="${deliveryAddrInfo.recipBaseAddr}">
+						<input type="hidden" name="recipDtlAddr"	th:value="${deliveryAddrInfo.recipDtlAddr}">
+						<input type="hidden" name="delvMemo" 		th:value="${deliveryAddrInfo.delvMemo}">
 						<div class="ship_info">
 							<dl>
 								<div class="name">
@@ -284,12 +290,6 @@
 									<dd id="recipPhnno" th:text="${deliveryAddrInfo.recipPhnno}"></dd>
 								</div>
 							</dl>
-							<input type="hidden" name="recipNm" 		th:value="${deliveryAddrInfo.recipNm}">
-							<input type="hidden" name="recipPhnno" 		th:value="${deliveryAddrInfo.recipPhnno}">
-							<input type="hidden" name="recipZipcode" 	th:value="${deliveryAddrInfo.recipZipcode}">
-							<input type="hidden" name="recipBaseAddr" 	th:value="${deliveryAddrInfo.recipBaseAddr}">
-							<input type="hidden" name="recipDtlAddr"	th:value="${deliveryAddrInfo.recipDtlAddr}">
-							<input type="hidden" name="delvMemo" 		th:value="${deliveryAddrInfo.delvMemo}">
 						</div>
 					</div>
 				</div>
@@ -300,7 +300,7 @@
 				</div>
 				<!-- //교환 배송비결제 필요할 경우 -->
 				<div class="btn_group btn_group_flex">
-					<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST)"><span>취소</span></button></div>
+					<div><button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST)"><span>취소</span></button></div>
 					<div><button type="button" id="btn_exchange_confirm" class="btn btn_dark" onclick="fnExchange()"><span>교환 신청</span></button></div>
 				</div>
 			</div>
@@ -372,6 +372,9 @@ $(document).ready(function() {
 
 	// 타이틀명
 	$('#htopTitle').text('교환 신청');
+
+	// 교환사유 선택 처리
+	$('#exchangeReasonPop .lap .popup_con .button_list button').eq(0).click();
 });
 
 // 교환수량버튼기능

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

@@ -24,7 +24,7 @@
 					<dt>주문번호</dt>
 					<dd  th:text="${ordNo}"></dd>
 				</dl>
-				<a href="javascript:void(0);" class="delete" onclick="fnDeleteOrder()">주문 내역 삭제</a>
+				<a href="javascript:void(0);" class="delete" onclick="fnDeleteOrder('noMember')">주문 내역 삭제</a>
 			</div>
 		</div>
 		<div class="inner">

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -1042,15 +1042,11 @@
 	// 장바구니
 	let fnGetCartGoodsList = function() {
 		$.getJSON('/cart/quick/cart/list', function(order, status) {
-			let cartCnt;
-			if(order.totCartCnt > 99) {cartCnt = "99+";} else {cartCnt = order.totCartCnt;}
 			$("#quick_menu .shopingbag.quick_con.quick02 .quick_head a").attr("href", _PAGE_CART);
 			$("#header .gnb .btn_cart").attr("href", _PAGE_CART);
-			$("#header .gnb .btn_cart .circle_count").text(cartCnt);
 
 			if (status == 'success') {
 				let quickShoppingBagHtml = "";
-				$("#quick_menu #quick02 .count").text(cartCnt);
 
 				$("#quick_menu .shopingbag.quick_con.quick02 .quick_body").html("");
 				if(order.totCartCnt > 0) {
@@ -1061,8 +1057,9 @@
 					let ordCanCnt = 0;
 					for(let i = 0 ; i < order.delvAllCartList.length ; i++) {
 						let info = order.delvAllCartList[i];
-						//alert(info.soldoutYn + " / " + info.ordCanYn + " / " + info.ordCanQty + " / " + info.goodsQty + " / " + info.minOrdQty + " / " + info.maxOrdQty);
-						if(info.soldoutYn == "N" && info.ordCanYn == "Y" && info.ordCanQty >= info.goodsQty && info.goodsQty >= info.minOrdQty && info.goodsQty <= info.maxOrdQty){
+
+						// 구매하기 버튼에서 장바구니 버튼으로 변경 후 품절 상품 보여주지 말것 이라는 멘트 사라짐. 전체 노출
+						//if(info.soldoutYn == "N" && info.ordCanYn == "Y" && info.ordCanQty >= info.goodsQty && info.goodsQty >= info.minOrdQty && info.goodsQty <= info.maxOrdQty){
 							ordCanCnt++;		// 주문 가능 수량
 							quickShoppingBagHtml += '	<div class="item_prod">';
 							quickShoppingBagHtml += '		<input type="hidden" id="cartSq" value="' + info.cartSq + '">';
@@ -1110,11 +1107,13 @@
 							quickShoppingBagHtml += '			</a>';
 							quickShoppingBagHtml += '		</div>';
 							quickShoppingBagHtml += '	</div>';
-						}
+						//}
 					}
 
 					quickShoppingBagHtml += '</div>';
 					quickShoppingBagHtml += '<button type="button" class="btn btn_default purchase_btn" onclick="cfnGoToPage(_PAGE_CART);"><span>쇼핑백 바로가기</span></button>';
+
+					$("#quick_menu #quick02 .count").text(ordCanCnt);
 				} else {
 					if(!$("#quick_menu .shopingbag.quick_con.quick02 .quick_body").hasClass("nodata")) {
 						$("#quick_menu .shopingbag.quick_con.quick02 .quick_body").addClass("nodata");
@@ -1144,6 +1143,12 @@
 				}
 
 				$("#quick_menu .shopingbag.quick_con.quick02 .quick_body").html(quickShoppingBagHtml);
+
+				let cartCnt = $("#quick_menu #quick02 .count").text();
+				if(!cartCnt) cartCnt = 0;
+				if(cartCnt > 99) cartCnt = "99+";
+				$(".shopingbag .quick_body .product_count .c_primary").text(cartCnt);
+				$("#header .gnb .btn_cart .circle_count").text(cartCnt);
 			}
 		});
 	}

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

@@ -127,7 +127,7 @@
 														<input type="hidden" name="chgReason"/>
 														<div class="select">교환 사유를 선택하세요.</div>
 														<ul class="list">
-															<li class="selected">교환 사유를 선택하세요.</li>
+<!--															<li class="selected">교환 사유를 선택하세요.</li>-->
 															<li th:if="${exchangeReason}" th:each="oneData, status : ${exchangeReason}" th:attr="chgReason=${oneData.cd}" th:text="${oneData.cdNm}" onclick="fnChangeExchangeReason(this);"></li>
 														</ul>
 													</div>
@@ -174,6 +174,10 @@
 						<div class="retrieve_box visit" style="display:block;" id="chgerLocation">
 							<h4 class="subH3">교환 회수지 주소 <span class="tit_info">택배사에서 교환 상품을 직접 회수할 장소 선택</span></h4>
 							<div class="tbl type1">
+								<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
+								<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
+								<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
+								<input type="hidden" name="chgerRtnMemo" th:value="${deliveryAddrInfo.delvMemo}">
 								<table>
 									<colgroup>
 										<col width="210">
@@ -193,13 +197,10 @@
 										<tr>
 											<th>주소</th>
 											<td id="chgerAddr">
-												<th:block th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></th:block>
+												<span th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></span>
+	<!--											<th:block th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></th:block>-->
 												<button type="button" class="btn btn_default btn_sm" onclick="fnChangeAddr('chger');"><span>회수지 변경</span></button>
 											</td>
-											<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
-											<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
-											<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
-											<input type="hidden" name="chgerRtnMemo" th:value="${deliveryAddrInfo.delvMemo}">
 										</tr>
 									</tbody>
 								</table>
@@ -240,6 +241,12 @@
 						</div>
 						<h4 class="subH3">교환 상품 배송지</h4>
 						<div class="tbl type1">
+							<input type="hidden" name="recipNm" th:value="${deliveryAddrInfo.recipNm}">
+							<input type="hidden" name="recipPhnno" th:value="${deliveryAddrInfo.recipPhnno}">
+							<input type="hidden" name="recipZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
+							<input type="hidden" name="recipBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
+							<input type="hidden" name="recipDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
+							<input type="hidden" name="delvMemo" th:value="${deliveryAddrInfo.delvMemo}">
 							<table>
 								<colgroup>
 									<col width="210">
@@ -270,12 +277,6 @@
 												</ul>
 											</div>
 										</td>
-										<input type="hidden" name="recipNm" th:value="${deliveryAddrInfo.recipNm}">
-										<input type="hidden" name="recipPhnno" th:value="${deliveryAddrInfo.recipPhnno}">
-										<input type="hidden" name="recipZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
-										<input type="hidden" name="recipBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
-										<input type="hidden" name="recipDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
-										<input type="hidden" name="delvMemo" th:value="${deliveryAddrInfo.delvMemo}">
 									</tr>
 								</tbody>
 							</table>
@@ -287,7 +288,7 @@
 							</p>
 						</div>
 						<div class="btn_footer_area">
-							<button type="button" class="btn btn_default btn_md" onclick="cfnGoToPage(_PAGE_MYPAGE_CRE_LIST)"><span>취소</span></button>
+							<button type="button" class="btn btn_default btn_md" onclick="cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST)"><span>취소</span></button>
 							<button type="button" id="btn_confirm_exchange" class="btn btn_dark btn_md" onclick="fnExchange()"><span>교환 신청</span></button>
 						</div>
 					</div>
@@ -321,6 +322,9 @@
 			$('#withdraw').click();
 			$('.wdGb').css('display','none');
 		}
+
+		// 교환사유 선택 처리
+		$('.select_reason .combo .list li').eq(0).click();
 	});
 
 	// 교환 옵션 변경 팝업

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

@@ -174,6 +174,10 @@
 						<div class="retrieve_box visit" style="display:block;" id="chgerLocation">
 							<h4 class="subH3">반품 회수지 주소 <span class="tit_info">택배사에서 반품 상품을 직접 회수할 장소 선택</span></h4>
 							<div class="tbl type1">
+								<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
+								<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
+								<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
+								<input type="hidden" name="chgerRtnMemo" th:value="${deliveryAddrInfo.delvMemo}">
 								<table>
 									<colgroup>
 										<col width="210">
@@ -193,13 +197,10 @@
 										<tr>
 											<th>주소</th>
 											<td id="chgerAddr">
-												<th:block th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></th:block>
+												<span th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></span>
+<!--												<th:block th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></th:block>-->
 												<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr();"><span>회수지 변경</span></button>
 											</td>
-											<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
-											<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
-											<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
-											<input type="hidden" name="chgerRtnMemo" th:value="${deliveryAddrInfo.delvMemo}">
 										</tr>
 									</tbody>
 								</table>
@@ -409,7 +410,8 @@
 		let accountNm = $('#returnForm input[name=accountNm]').val();
 		let bankCd = $('#returnForm input[name=bankCd]').val();
 
-		if (paymentInfo.payMeans == 'G014_20' && paymentInfo.payStat == 'G016_30' && (gagajf.isNull(accountNo) || gagajf.isNull(accountNm) || gagajf.isNull(bankCd))) {
+		//if (paymentInfo.payMeans == 'G014_20' && paymentInfo.payStat == 'G016_30' && (gagajf.isNull(accountNo) || gagajf.isNull(accountNm) || gagajf.isNull(bankCd))) {
+		if (true) {
 			let data = {};
 			data.ordNo = oneData.ordNo;
 			data.accountNm = oneData.accountNm;

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

@@ -126,7 +126,7 @@
 														<input type="hidden" name="chgReason"/>
 														<div class="select">교환 사유를 선택하세요.</div>
 														<ul class="list">
-															<li class="selected">교환 사유를 선택하세요.</li>
+<!--															<li class="selected">교환 사유를 선택하세요.</li>-->
 															<li th:if="${exchangeReason}" th:each="oneData, status : ${exchangeReason}" th:attr="chgReason=${oneData.cd}" th:text="${oneData.cdNm}" onclick="fnChangeExchangeReason(this);"></li>
 														</ul>
 													</div>
@@ -173,6 +173,10 @@
 						<div class="retrieve_box visit" style="display:block;" id="chgerLocation">
 							<h4 class="subH3">교환 회수지 주소 <span class="tit_info">택배사에서 교환 상품을 직접 회수할 장소 선택</span></h4>
 							<div class="tbl type1">
+								<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
+								<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
+								<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
+								<input type="hidden" name="chgerRtnMemo" th:value="${deliveryAddrInfo.delvMemo}">
 								<table>
 									<colgroup>
 										<col width="210">
@@ -192,13 +196,9 @@
 										<tr>
 											<th>주소</th>
 											<td id="chgerAddr">
-												<th:block th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></th:block>
+												<span th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></span>
 												<button type="button" class="btn btn_default btn_sm" onclick="fnChangeAddr('chger');"><span>회수지 변경</span></button>
 											</td>
-											<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
-											<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
-											<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
-											<input type="hidden" name="chgerRtnMemo" th:value="${deliveryAddrInfo.delvMemo}">
 										</tr>
 									</tbody>
 								</table>
@@ -239,6 +239,12 @@
 						</div>
 						<h4 class="subH3">교환 상품 배송지</h4>
 						<div class="tbl type1">
+							<input type="hidden" name="recipNm" th:value="${deliveryAddrInfo.recipNm}">
+							<input type="hidden" name="recipPhnno" th:value="${deliveryAddrInfo.recipPhnno}">
+							<input type="hidden" name="recipZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
+							<input type="hidden" name="recipBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
+							<input type="hidden" name="recipDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
+							<input type="hidden" name="delvMemo" th:value="${deliveryAddrInfo.delvMemo}">
 							<table>
 								<colgroup>
 									<col width="210">
@@ -269,12 +275,6 @@
 												</ul>
 											</div>
 										</td>
-										<input type="hidden" name="recipNm" th:value="${deliveryAddrInfo.recipNm}">
-										<input type="hidden" name="recipPhnno" th:value="${deliveryAddrInfo.recipPhnno}">
-										<input type="hidden" name="recipZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
-										<input type="hidden" name="recipBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
-										<input type="hidden" name="recipDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
-										<input type="hidden" name="delvMemo" th:value="${deliveryAddrInfo.delvMemo}">
 									</tr>
 								</tbody>
 							</table>
@@ -286,7 +286,7 @@
 							</p>
 						</div>
 						<div class="btn_footer_area">
-							<button type="button" class="btn btn_default btn_md" onclick="cfnGoToPage(_PAGE_NOMEMBER_CRE_LIST);"><span>취소</span></button>
+							<button type="button" class="btn btn_default btn_md" onclick="cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);"><span>취소</span></button>
 							<button type="button" id="btn_confirm_exchange" class="btn btn_dark btn_md" onclick="fnExchange()"><span>교환 신청</span></button>
 						</div>
 					</div>
@@ -320,6 +320,9 @@
 			$('#withdraw').click();
 			$('.wdGb').css('display','none');
 		}
+
+		// 교환사유 선택 처리
+		$('.select_reason .combo .list li').eq(0).click();
 	});
 
 	// 교환 옵션 변경 팝업

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

@@ -35,7 +35,7 @@
 					<div class="sec_head">
 						<h3 class="subH1">주문상세</h3>
 						<span class="order_number">주문번호&nbsp;:&nbsp;<em th:text="${ordNo}"></em></span>
-						<button type="button" id="btn_order_cancel" class="btn_underline" onclick="fnDeleteOrder()"><span>삭제하기</span></button>
+						<button type="button" id="btn_order_cancel" class="btn_underline" onclick="fnDeleteOrder('noMember')"><span>삭제하기</span></button>
 					</div>
 					<div class="sec_body">
 						<th:block th:if="${orderList}" th:each="order, status : ${orderList}">

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

@@ -172,6 +172,10 @@
 						<div class="retrieve_box visit" style="display:block;" id="chgerLocation">
 							<h4 class="subH3">반품 회수지 주소 <span class="tit_info">택배사에서 반품 상품을 직접 회수할 장소 선택</span></h4>
 							<div class="tbl type1">
+								<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
+								<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
+								<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
+								<input type="hidden" name="chgerRtnMemo" th:value="${deliveryAddrInfo.delvMemo}">
 								<table>
 									<colgroup>
 										<col width="210">
@@ -194,10 +198,6 @@
 												<th:block th:text="|${deliveryAddrInfo.recipBaseAddr} ${deliveryAddrInfo.recipDtlAddr}|"></th:block>
 												<button type="button" class="btn btn_default btn_sm" onclick="fnChangeDeliveryAddr();"><span>회수지 변경</span></button>
 											</td>
-											<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
-											<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
-											<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
-											<input type="hidden" name="chgerRtnMemo" th:value="${deliveryAddrInfo.delvMemo}">
 										</tr>
 									</tbody>
 								</table>

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

@@ -64,7 +64,7 @@
 							<div class="form_field">
 								<div class="input_wrap">
 									<input type="text" id="accountNo" name="accountNo" class="form_control" maxlength="20" data-valid-type="numeric"  placeholder="계좌번호를 입력해 주세요"/>
-									<button type="button" id="btnAccountCheck" class="btn btn_dark">
+									<button type="button" id="btnAccountCheck" class="btn btn_dark btn_sm">
 										<span>계좌인증</span>
 									</button>
 								</div>

src/main/webapp/biz/mypage.js

@@ -222,18 +222,30 @@ var fnCreateChange = function(param, gubun, noMember) {
 }
 
 // 주문 내역 삭제 처리
-var fnDeleteOrder = function() {
-	mcxDialog.confirm('주문 내역을 삭제하시겠습니까?', {
+var fnDeleteOrder = function(noMember) {
+	mcxDialog.confirm('주문내역을 삭제하시면 더 이상 해당 주문의 내용을 확인 및 교환/반품 등을 할 수 없습니다. 계속 하시겠습니까?', {
 		cancelBtnText: "취소",
 		sureBtnText: "확인",
 		sureBtnClick: function(){
+			let url = '';
+			
+			if (noMember == 'noMember') {
+				url = '/noMember/order/delete';
+			} else {
+				url = '/mypage/order/delete';
+			}
+
 			let data = {};
 			data.ordNo = ordNo;
 
 			var jsonData = JSON.stringify(data);
 
-			gagajf.ajaxJsonSubmit('/mypage/order/delete', jsonData, function() {
-				cfnGoToPage(_PAGE_MYPAGE);
+			gagajf.ajaxJsonSubmit(url, jsonData, function() {
+				if (noMember == 'noMember') {
+					cfnGoToPage(_PAGE_NOMEMBER_MAIN);
+				} else {
+					cfnGoToPage(_PAGE_MYPAGE);
+				}
 			});
 		}
 	});

src/main/webapp/ux/style24_link.js

@@ -81,6 +81,7 @@ const _PAGE_WISHLIST_PUT = _frontUrl + "/mypage/wish/list/put";						// 위시
 const _PAGE_WISHLIST_DEL = _frontUrl + "/mypage/wish/list/delete";					// 위시리스트 삭제
 
 //== 마이페이지 ==/
+const _PAGE_NOMEMBER_MAIN = _frontUrl + "/noMember/main/form";						// 비회원 > 메인
 const _PAGE_NOMEMBER_ORDER_LIST = _frontUrl + "/noMember/order/list/form";			// 비회원 > 주문확인/배송조회
 const _PAGE_NOMEMBER_ORDER_DETAIL = _frontUrl + "/noMember/order/detail/form/";		// 비회원 > 주문/배송 상세
 const _PAGE_NOMEMBER_CRE_LIST = _frontUrl + "/noMember/cre/list/form";				// 비회원 > 취소/교환/반품 목록
@@ -290,12 +291,12 @@ function cfnAddCart(cartList) {
 								// 장바구니 수량 조회
 								$.getJSON('/cart/goods/not/soldout/cnt', function (order, status) {
 									let cartCnt;
-									if (order.totCartCnt > 99) {
+									if (order.cartGoodsList.length > 99) {
 										cartCnt = "99+";
 									} else {
-										cartCnt = order.totCartCnt;
+										cartCnt = order.cartGoodsList.length;
 									}
-									
+
 									$("header #htopSub .button_wrap .store>span").text(cartCnt);
 								});
 							}