Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -287,6 +287,7 @@ public class TsfOrderController extends TsfBaseController {
 			}
 		}
 		mav.addObject("devTempYn"			, devTempYn);								// 개발자모드가능여부
+		mav.addObject("frontGb"				, TsfSession.getFrontGb());					// 프론트구분
 		mav.setViewName(super.getDeviceViewName("order/OrderForm"));
 		
 		return mav;

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

@@ -178,9 +178,9 @@
 		    AND    P.PLAN_SQ = #{planSq}
 		    AND    P.PLAN_GB = 'P' /*기획전*/
 		    AND    P.SITE_CD = #{siteCd}
-		  <!--   <if test="frontGb != null and frontGb != ''">
+		    <if test="frontGb != null and frontGb != ''">
 		    AND    P.FRONT_GB LIKE CONCAT('%',#{frontGb},'%')
-		    </if> -->
+		    </if>
 		    AND    NOW() BETWEEN P.DISP_STDT AND P.DISP_EDDT
 		    AND    P.DEL_YN = 'N' /*삭제안된 기획전*/
 		    AND    P.OPEN_YN = 'Y' /*오픈된 기획전*/

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

@@ -561,8 +561,10 @@
 					 , OD.RETURNABLE_YN
 					 , DATE_FORMAT(OD.REG_DT, '%Y.%m.%d') AS REG_DT 
 					 , G.SELF_GOODS_YN
-				     , CONCAT(B.BRAND_ENM, ' ', B.BRAND_KNM)							AS BRAND_NM
-				     , B.BRAND_ENM
+				     , CASE BG.DISP_NM_LANG WHEN 'EN' THEN BG.BRAND_GROUP_ENM
+		                       ELSE BG.BRAND_GROUP_KNM
+		               END                                                             AS BRAND_NM
+		             , B.BRAND_ENM
 				     , FN_GET_CODE_NM('G013', OD.ORD_DTL_STAT)							AS ORD_DTL_STAT_NM
 					 , IFNULL(OCD.ORD_REQ_CHG_QTY, 0) AS ORD_REQ_CHG_QTY
 					 , OD.ORD_QTY - OD.CNCL_RTN_QTY - IFNULL(OCD.ORD_REQ_CHG_QTY, 0)    AS ORD_CAN_CHG_QTY
@@ -612,6 +614,8 @@
 				    ON OD.GOODS_CD = G.GOODS_CD
 				 INNER JOIN TB_BRAND B
 				    ON B.BRAND_CD = G.BRAND_CD
+				 INNER JOIN TB_BRAND_GROUP BG
+		            ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
 				 LEFT JOIN TB_ITEMKIND I 
 				    ON G.ITEMKIND_CD = I.ITEMKIND_CD 
 				 <if test="reviewStat == 'u'.toString()">
@@ -1018,13 +1022,14 @@
 		      ON B.BRAND_CD = G.BRAND_CD
 		    INNER JOIN TB_BRAND_GROUP BG
 		      ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-		   INNER JOIN TB_REVIEW R ON R.ORD_NO = O.ORD_NO 
+		   INNER JOIN TB_REVIEW R 
+		      ON R.ORD_NO = O.ORD_NO 
+		      AND R.ORD_DTL_NO = OD.ORD_DTL_NO 
 		   LEFT JOIN TB_ITEMKIND I 
-				    ON G.ITEMKIND_CD = I.ITEMKIND_CD 
-		  	AND R.ORD_NO = O.ORD_NO
-		  	AND R.ORD_DTL_NO = OD.ORD_DTL_NO 
-		  	AND R.DEL_YN = 'N'
-		  	AND R.DISP_YN = 'Y'
+		      ON G.ITEMKIND_CD = I.ITEMKIND_CD 
+		      AND R.ORD_NO = O.ORD_NO
+		      AND R.DEL_YN = 'N'
+		      AND R.DISP_YN = 'Y'
 		  LEFT OUTER JOIN TB_COLOR C ON ODI.OPT_CD1 = C.COLOR_CD
 		                               AND C.USE_YN = 'Y'
 		     WHERE 1=1
@@ -1033,7 +1038,7 @@
 		   AND R.CONFIRM_YN = 'Y'
 		   AND OD.ORD_DTL_NO 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.SITE_CD =  #{siteCd}
-		   	) Z
+		   ) Z
 		 GROUP BY     Z.ORD_NO
 		            , Z.ORD_DT
 		            , Z.PAY_DT

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/MypageReviewCreateFormMob.html

@@ -48,7 +48,7 @@
 											<div class="od_name">
 												<div class="goods_date"><span class="date" th:text="${reviewInfo.regDt}"></span> 구매</div>
 												<div class="brand">
-													<span th:text="${reviewInfo.brandEnm}"></span>
+													<span th:text="${reviewInfo.brandNm}"></span>
 												</div>
 												<div class="name" th:text="${reviewInfo.goodsNm}"></div>
 											</div>

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

@@ -30,7 +30,7 @@
 							<div class="tip_contents">
 								<p class="tip_txt">
 									<ul>
-										<li>일반 리뷰 작성시 150P, 포토/영상 리뷰는 350P가 추가 적립됩니다.</li>
+										<li>일반 리뷰 작성시 150P, 포토/영상 리뷰는 350P가 적립됩니다.</li>
 										<li>월 최대 10,000P까지 적립 가능합니다. <br> (합산 후 월 1회 지급)</li>
 										<li>베스트 리뷰로 선정되면 10,000P가 추가 적립됩니다.</li>
 										<li>리뷰는 주문일 기준 90일간 작성이 가능합니다.</li>

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/mob/order/OrderFormMob.html

@@ -385,6 +385,8 @@ var foreignBuyYn		= [[${foreignBuyYn}]];			// 해외구매대행여부
 var orderMadeYn			= [[${orderMadeYn}]];			// 주문제작상품여부
 var isLogin				= [[${isLogin}]];				// 로그인여부
 var giftPackYn			= [[${giftPackYn}]];			// 선물받기여부
+var devTempYn			= [[${devTempYn}]];				// 개발자모드가능여부
+var frontGb				= [[${frontGb}]];				// 프론트구분
 
 var custCpnSq 			= 0;
 var cpnIndex			= 0;
@@ -404,7 +406,8 @@ $(document).ready( function() {
 	arr[3] = "delvFeeCdInfo";
 	arr[4] = "orderSumAmtInfo";
 	
-	if (devTemp) {
+	// 개발자모드실행
+	if (devTemp == true && devTempYn == true) {
 		$("table").each(function(){
 			var name = $(this).attr("name");
 			for (i=0 ; i<arr.length ; i++) {
@@ -2345,7 +2348,11 @@ var custCpnSumAmtCal = function() {
 		realOrdSumAmt		= realOrdSumAmt + realOrdAmt1;
 		
 		// 2021.05.11 최종할인금액으로 적립포인트 적용
-		savePntAmt1			= parseInt(realOrdAmt2 * (pntPrate/100));
+		if (frontGb == 'P') {
+			savePntAmt1			= parseInt(realOrdAmt2 * (pntPrate/100));
+		} else {
+			savePntAmt1			= parseInt(realOrdAmt2 * (pntMrate/100));
+		}
 		
 		// 2021.05.27 적립포인트 설정
 		$("#orderForm #orderListInfo .orderListSavePntDcAmt").each(function(){

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/MypageReviewCreateFormWeb.html

@@ -66,7 +66,7 @@
 																<span class="buy_date"><em th:text="${reviewInfo.ordDt}"></em>&nbsp;구매</span>
 															</p>
 															<p>
-																<span class="brand" th:text="${reviewInfo.brandEnm}"></span>
+																<span class="brand" th:text="${reviewInfo.brandNm}"></span>
 																<!-- <span class="tag">STYLE24 일반배송</span> -->
 															</p>
 															<p>

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

@@ -39,7 +39,7 @@
 							<div class="com_info_txt">
 								<p class="tit">리뷰 안내</p>
 								<ul>
-									<li>일반 리뷰 작성 시 150P, 포토/영상 리뷰는 350P가 추가 적립됩니다!</li>
+									<li>일반 리뷰 작성 시 150P, 포토/영상 리뷰는 350P가 적립됩니다!</li>
 									<li>월 최대 10,000 P까지 적립 가능합니다.(합산 후 월 1회 지급)</li>
 									<li>베스트 리뷰로 선정되면 10,000P가 추가 적립됩니다!</li>
 									<li>리뷰는 주문일 기준 90일간 작성이 가능합니다.</li>

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>

src/main/webapp/WEB-INF/views/web/order/OrderFormWeb.html

@@ -463,6 +463,7 @@ var foreignBuyYn		= [[${foreignBuyYn}]];			// 해외구매대행여부
 var orderMadeYn			= [[${orderMadeYn}]];			// 주문제작상품여부
 var isLogin				= [[${isLogin}]];				// 로그인여부
 var devTempYn			= [[${devTempYn}]];				// 개발자모드가능여부
+var frontGb				= [[${frontGb}]];				// 프론트구분
 
 var custCpnSq 			= 0;
 var cpnIndex			= 0;
@@ -2201,7 +2202,11 @@ var custCpnSumAmtCal = function() {
 		realOrdSumAmt		= realOrdSumAmt + realOrdAmt1;
 		
 		// 2021.05.11 최종할인금액으로 적립포인트 적용
-		savePntAmt1			= parseInt(realOrdAmt2 * (pntPrate/100));
+		if (frontGb == 'P') {
+			savePntAmt1			= parseInt(realOrdAmt2 * (pntPrate/100));
+		} else {
+			savePntAmt1			= parseInt(realOrdAmt2 * (pntMrate/100));
+		}
 		
 		// 선포인트사용여부 
 		if (prePntDcAmtYn == "Y") {