Merge branch 'develop' into eskim

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

@@ -1115,15 +1115,9 @@ public class TsfOrderService {
 		// 로그인 정보 조회
 		if(TsfSession.isLogin()) {
 			param.setCustNo(TsfSession.getInfo().getCustNo());
-			param.setOrdNm(TsfSession.getInfo().getCustNm());
-			param.setOrdPhnno(TsfSession.getInfo().getCellPhnno());
-			param.setEmail(TsfSession.getInfo().getEmail());
 		} else {
 			param.setCustNo(0);
 			param.setJsessionId(TsfSession.getSessionId());
-			param.setOrdNm("비회원");
-			param.setOrdPhnno("000-0000-0000");
-			param.setEmail("naverpay@naverpay.com");
 		}
 
 		try {

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

@@ -936,10 +936,17 @@ public class TsfCustomerController extends TsfBaseController {
 		return mav;
 	}
 
-	@GetMapping("/clause/info/{clauseSq}")
+	/**
+	 * 개인정보취급방침 정보
+	 *
+	 * @return Clause
+	 * @author jsshin
+	 * @since 2021. 06. 10
+	 */
+	@GetMapping("/privacy/policy/info/{clauseSq}")
 	@ResponseBody
-	public Clause getClauseInfo(@PathVariable Integer clauseSq) {
-		return clauseService.getClauseInfo(clauseSq);
+	public Clause getPrivacyPolicyInfo(@PathVariable Integer clauseSq) {
+		return clauseService.getPrivacyPolicyInfo(clauseSq);
 	}
 
 	/**

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

@@ -877,25 +877,17 @@ public class TsfMypageController extends TsfBaseController {
 		GagaMap result = coreOrderChangeService.orderCancelPreInfoTemp(orderChange, custNo);
 
 		// 3. 취소완료 카카오알림톡 발송
-		int ordChgSq = result.getInt("ordChgSq");
+		Integer ordChgSq = result.getInt("ordChgSq");
 		
 		if (ordChgSq > 0) {
-			try {
-				// 취소 알림톡 관련 정보 조회
-				orderChange = coreOrderChangeService.getKakaoOrderCancelInfo(ordChgSq);
+			// 취소 알림톡 관련 정보 조회
+			orderChange = coreOrderChangeService.getKakaoOrderCancelInfo(ordChgSq);
+			
+			GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
 
+			try {
 				// 취소 알림톡 발송
-				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
-					coreKakaotalkService.sendOrderCancelComplete(orderChange, custNo);
-				}
-
-				// 취소 안내 메일 정보 조회
-				GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
-
-				// 취소 안내 메일 발송
-				if (StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
-					mailService.sendOrderCancel(replaceInfo, custNo);
-				}
+				coreKakaotalkService.sendOrderCancelComplete(orderChange, custNo);
 			} catch (Exception e) {
 				throw new IllegalStateException(message.getMessage("FAIL_0004"));
 			}

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

@@ -19,9 +19,7 @@ import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
 import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.style24.core.biz.service.TscCustomerService;
-import com.style24.core.biz.service.TscKakaotalkService;
 import com.style24.core.biz.service.TscKcpService;
-import com.style24.core.biz.service.TscMailService;
 import com.style24.core.biz.service.TscOrderChangeService;
 import com.style24.core.biz.service.TscOrderRefundService;
 import com.style24.core.biz.service.TscOrderService;
@@ -102,12 +100,6 @@ public class TsfNoMemberController extends TsfBaseController {
 	@Autowired
 	private TscKcpService coreKcpService;
 
-	@Autowired
-	private TscKakaotalkService coreKakaotalkService;
-
-	@Autowired
-	private TscMailService coreMailService;
-
 	/**
 	 * 비회원 주문 내역
 	 *
@@ -571,30 +563,8 @@ public class TsfNoMemberController extends TsfBaseController {
 		// GagaMap result = coreOrderChangeService.orderCancelPreInfo(orderChange, 0);
 		GagaMap result = coreOrderChangeService.orderCancelPreInfoTemp(orderChange, 0);
 
-		// 2. 취소완료 카카오알림톡 발송
-		int ordChgSq = result.getInt("ordChgSq");
-
-		if (ordChgSq > 0) {
-			try {
-				// 취소 알림톡 관련 정보 조회
-				orderChange = coreOrderChangeService.getKakaoOrderCancelInfo(ordChgSq);
-
-				// 취소 알림톡 발송
-				if (StringUtils.isNotBlank(orderChange.getOrdPhnno())) {
-					coreKakaotalkService.sendOrderCancelComplete(orderChange, 0);
-				}
-
-				// 취소 안내 메일 정보 조회
-				GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
-
-				// 취소 안내 메일 발송
-				if (StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
-					coreMailService.sendOrderCancel(replaceInfo, 0);
-				}
-			} catch (Exception e) {
-				throw new IllegalStateException(message.getMessage("FAIL_0004"));
-			}
-		}
+		// TODO
+		// 취소 완료 알림톡 발송 에정
 
 		result.set("status", GagaResponseStatus.SUCCESS.getCode());
 		result.set("message", message.getMessage("CANCEL_0001"));

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

@@ -948,7 +948,7 @@
 		             , G.MAIN_COLOR_CD
 		             , G.SELF_GOODS_YN
 		             , MAX(CD.CART_DTL_SQ) AS CART_DTL_SQ
-		             , MIN(ST.DISP_ORD) AS DISP_ORD
+		             , MAX(ST.DISP_ORD) AS DISP_ORD
 		             , MAX(CD.OPT_CD1) AS CART_OPT_CD1
 		             , MAX(CD.OPT_CD2) AS CART_OPT_CD2
 		             , MAX(CD.OPT_CD) AS CART_OPT_CD
@@ -972,7 +972,7 @@
 		LEFT   OUTER JOIN TB_COLOR C
 		ON     A.CART_OPT_CD1 = C.COLOR_CD
 		AND    C.USE_YN = 'Y'
-		ORDER  BY A.DISP_ORD, A.COLOR_NM
+		ORDER  BY NULLIF(C.COLOR_KNM, A.CART_OPT_CD1)
 	</select>
 
 	<!-- 장바구니 상품 사이즈 정보 조회 -->

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

@@ -87,7 +87,7 @@
 		WHERE  CD_GB = 'G085'
 		AND    CD = 'SEARCHSYNCYN'
 	</select>
-	
+
 	<select id="getSupplyCompanyCount" resultType="int">
 		/* TsfCommon.getSupplyCompanyCount */
 		SELECT COUNT(*) AS CNT

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

@@ -295,6 +295,20 @@
 		                   WHERE  BRAND_GROUP_NO = #{brandGroupNo}
 		                  )
 		</if>
+		AND    EXISTS (SELECT 1
+		               FROM   TB_CATE_STOCK
+		               WHERE  SITE_CD = C4.SITE_CD
+		               AND    CATE_NO = C4.CATE1_NO
+		               <if test='brandGroupNo != null'>
+		               AND    BRAND_GROUP_NO = #{brandGroupNo}
+		               </if>
+		               <if test='formalGb != null'>
+		               AND    FORMAL_GB = #{formalGb}
+		               </if>
+		               <if test='soldoutGoodsDispYn != null and soldoutGoodsDispYn =="N"'>
+		               AND    STOCK_QTY > 0 /*품절상품전시여부가 N일 때 재고가 있는 카테고리만*/
+		               </if>
+		              )
 		<if test="keyword != null and keyword != ''"> <!-- 상품검색키워드 -->
 		AND    LEAF_CATE_NO IN (SELECT CG.CATE_NO
 		                        FROM   TB_CATE_GOODS CG

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

@@ -287,7 +287,6 @@
 		                      WHEN VS.CURR_STOCK_QTY - G.MIN_ORD_QTY >= 0 THEN VS.CURR_STOCK_QTY
 		                      ELSE 0 END) AS STOCK_QTY
 		           , IFNULL(GC.QTY , 1) AS QTY
-		           , MIN(O.DISP_ORD) AS DISP_ORD
 		      FROM TB_GOODS G
 		      INNER JOIN TB_OPTION O ON G.GOODS_CD = O.GOODS_CD
 		                             AND O.DISP_YN = 'Y'
@@ -306,7 +305,7 @@
 		<if test='optionSoldoutSkip != null and optionSoldoutSkip == "Y" '>
 		AND A.STOCK_QTY > 0
 		</if>
-		ORDER BY A.GOODS_CD, A.DISP_ORD, IFNULL(C.COLOR_KNM, A.OPT_CD1)
+		ORDER BY A.GOODS_CD, NULLIF(C.COLOR_KNM, A.OPT_CD1)
 	</select>
 		
 	<!-- 상품 옵션2 목록  - 자사용-->

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

@@ -148,7 +148,6 @@
 				    ON O.ORD_NO = P.ORD_NO
 				   AND P.PAY_GB = 'O'
 				   AND P.PAY_STAT IN ('G016_10', 'G016_30')
-		           AND P.PG_GB <![CDATA[<>]]> 'NAVER_ORDER'
 				  LEFT OUTER JOIN TB_REVIEW R
 				    ON R.ORD_NO = OD.ORD_NO
 				   AND R.ORD_DTL_NO = OD.ORD_DTL_NO
@@ -237,11 +236,6 @@
 				  FROM TB_ORDER O
 				 INNER JOIN TB_ORDER_DETAIL OD
 				    ON O.ORD_NO = OD.ORD_NO
-		         INNER JOIN TB_PAYMENT P
-		            ON O.ORD_NO = P.ORD_NO
-		           AND P.PAY_STAT IN ('G016_10', 'G016_30')
-		           AND P.PAY_GB = 'O'
-		           AND P.PG_GB <![CDATA[<>]]> 'NAVER_ORDER'
 				 WHERE O.DISP_YN = 'Y'
 				   AND OD.ORD_QTY - OD.CNCL_RTN_QTY > 0
 				   AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25', 'G013_97', 'G013_98', 'G013_99')
@@ -281,11 +275,6 @@
 		  FROM TB_ORDER O
 		 INNER JOIN TB_ORDER_DETAIL OD
 		    ON O.ORD_NO = OD.ORD_NO
-		 INNER JOIN TB_PAYMENT P
-		    ON O.ORD_NO = P.ORD_NO
-		   AND P.PAY_STAT IN ('G016_10', 'G016_30')
-		   AND P.PAY_GB = 'O'
-		   AND P.PG_GB <![CDATA[<>]]> 'NAVER_ORDER'
 		 WHERE O.DISP_YN = 'Y'
 		   AND OD.ORD_QTY - OD.CNCL_RTN_QTY > 0
 		   AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25', 'G013_97', 'G013_98', 'G013_99')

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

@@ -490,7 +490,6 @@
 		          FROM TB_ORDER_CHANGE OC
 		         INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
 		            ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
-		           AND OCD.CHG_STAT NOT IN ('G685_10', 'G685_11')
 		          LEFT OUTER JOIN (SELECT ORD_CHG_SQ
 		                                , ORD_DTL_NO
 		                                , CHG_STAT
@@ -514,11 +513,6 @@
 		           AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
 		         INNER JOIN TB_ORDER O
 		            ON OD.ORD_NO = O.ORD_NO
-		         INNER JOIN TB_PAYMENT P
-		            ON O.ORD_NO = P.ORD_NO
-		           AND P.PAY_STAT IN ('G016_10', 'G016_30')
-		           AND P.PAY_GB = 'O'
-		           AND P.PG_GB <![CDATA[<>]]> 'NAVER_ORDER'
 		         INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		            ON OD.ORD_NO = ODI.ORD_NO
 		           AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
@@ -610,7 +604,6 @@
 		          FROM TB_ORDER_CHANGE OC
 		         INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
 		            ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
-		           AND OCD.CHG_STAT NOT IN ('G685_10', 'G685_11')
 		         INNER JOIN TB_ORDER_CHANGE_DETAIL_HST OCDH
 		            ON OCD.ORD_CHG_SQ = OCDH.ORD_CHG_SQ
 		           AND OCD.ORD_DTL_NO = OCDH.ORD_DTL_NO
@@ -620,14 +613,10 @@
 		           AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
 		         INNER JOIN TB_ORDER O
 		            ON OD.ORD_NO = O.ORD_NO
-		         INNER JOIN TB_PAYMENT P
-		            ON O.ORD_NO = P.ORD_NO
-		           AND P.PAY_STAT IN ('G016_10', 'G016_30')
-		           AND P.PAY_GB = 'O'
-		           AND P.PG_GB <![CDATA[<>]]> 'NAVER_ORDER'
 		         INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		            ON OD.ORD_NO = ODI.ORD_NO
 		           AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
+		           AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
 		         INNER JOIN TB_GOODS G1
 		            ON OD.GOODS_CD = G1.GOODS_CD
 		         INNER JOIN TB_GOODS G2
@@ -697,7 +686,6 @@
 		  FROM TB_ORDER_CHANGE OC
 		 INNER JOIN TB_ORDER_CHANGE_DETAIL OCD
 		    ON OC.ORD_CHG_SQ = OCD.ORD_CHG_SQ
-		   AND OCD.CHG_STAT NOT IN ('G685_10', 'G685_11')
 		 INNER JOIN TB_ORDER_CHANGE_DETAIL_HST OCDH
 		    ON OCD.ORD_CHG_SQ = OCDH.ORD_CHG_SQ
 		   AND OCD.ORD_DTL_NO = OCDH.ORD_DTL_NO
@@ -707,14 +695,10 @@
 		   AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
 		 INNER JOIN TB_ORDER O
 		    ON OD.ORD_NO = O.ORD_NO
-		 INNER JOIN TB_PAYMENT P
-		    ON O.ORD_NO = P.ORD_NO
-		   AND P.PAY_STAT IN ('G016_10', 'G016_30')
-		   AND P.PAY_GB = 'O'
-		   AND P.PG_GB <![CDATA[<>]]> 'NAVER_ORDER'
 		 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		    ON OD.ORD_NO = ODI.ORD_NO
 		   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
+		   AND OD.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25')
 		 INNER JOIN TB_GOODS G1
 		    ON OD.GOODS_CD = G1.GOODS_CD
 		 INNER JOIN TB_GOODS G2

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

@@ -422,7 +422,7 @@
 				    ON B.BRAND_CD = G.BRAND_CD
 				 INNER JOIN TB_BRAND_GROUP BG
 		            ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-				LEFT OUTER JOIN TB_COLOR C ON ODI.OPT_CD1 = C.COLOR_CD
+				 LEFT OUTER JOIN TB_COLOR C ON ODI.OPT_CD1 = C.COLOR_CD
 		                                   AND C.USE_YN = 'Y'
 				  WHERE 1=1
 				-- AND O.ORD_NO NOT IN (SELECT R.ORD_NO FROM TB_REVIEW R WHERE R.DEL_YN = 'N' AND DISP_YN = 'Y')
@@ -937,6 +937,7 @@
 		     , Z.ADM_RPL
 		     , Z.ADM_RPL_REG_NO
 		     , Z.ADM_RPL_DT
+		     , Z.SIZE_GB
 		     , ROW_NUMBER() OVER(ORDER BY Z.ORD_DT DESC) AS RNUM
 		       FROM (    
 		             SELECT O.ORD_NO
@@ -1001,6 +1002,7 @@
 		                   , DATE_FORMAT(R.UPD_DT , '%Y.%m.%d') AS UPD_DT
 		                   , R.ADM_RPL
 		                   , R.ADM_RPL_REG_NO
+		                   , I.SIZE_GB
 		                   , DATE_FORMAT(R.ADM_RPL_DT , '%Y.%m.%d') AS ADM_RPL_DT
 		                   , DATEDIFF( DATE_ADD(O.PAY_DT,INTERVAL   365 /**P*/ DAY),NOW()) AS REMAIN_DT -- 남은시간
 		    FROM TB_ORDER O
@@ -1017,6 +1019,8 @@
 		    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 
+		   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'
@@ -1067,6 +1071,7 @@
 		            , Z.ADM_RPL
 		            , Z.ADM_RPL_REG_NO
 		            , Z.ADM_RPL_DT
+		            , Z.SIZE_GB
 		ORDER BY Z.ORD_NO DESC
 		<include refid="selectForPagingFooter"/>
 		</select>

src/main/webapp/WEB-INF/views/mob/callcenter/NoticeFormMob.html

@@ -95,7 +95,7 @@
 				tag += '	</div>\n';
 				tag += '	<div class="fold_cont">\n';
 				tag += '		<div class="fold_answer">\n';
-				tag += '			<div class="answer_body">' + item.noticeContent.escapeHtml() + '</div>\n';
+				tag += '			<div class="answer_body">' + item.noticeContent + '</div>\n';
 				tag += '		</div>\n';
 				tag += '	</div>\n';
 				tag += '</li>\n';

src/main/webapp/WEB-INF/views/mob/display/CategoryMainFormMob.html

@@ -61,7 +61,7 @@
 				</th:block>
 
 				<th:block th:if="${contentsLoc=='002'}">
-					<div class="inner wide" th:if="${newGoodsList != null and !newGoodsList.empty}">
+					<div class="inner wide" th:if="${newGoodsList != null}">
 						<div class="new_item">
 							<h2 class="dp_subtitle" th:text="${contentsTitle}">신상품</h2>
 							<div class="swiper-container item_list">
@@ -93,7 +93,7 @@
 				</th:block>
 
 				<th:block th:if="${contentsLoc=='003'}">
-					<div class="inner" th:if="${bestGoodsList != null and !bestGoodsList.empty}">
+					<div class="inner" th:if="${bestGoodsList != null}">
 						<div class="best_item">
 							<h2 class="dp_subtitle" th:text="${contentsTitle}">베스트 상품</h2>
 							<div class="item_list">

src/main/webapp/WEB-INF/views/mob/display/MallMainFormMob.html

@@ -93,7 +93,7 @@
 
 					<th:block th:if="${contentsLoc=='003'}">
 						<!-- 3. 트렌디한 신상아이템 -->
-						<div class="inner" th:if="${mainData.goodsList != null and !mainData.goodsList.empty}">
+						<div class="inner" th:if="${mainData.goodsList != null}">
 							<div class="main_trendy">
 								<th:block th:if="${mainData.contentsTitle != null and !mainData.contentsTitle.empty}">
 									<div class="titWrap">
@@ -143,9 +143,11 @@
 						<div class="inner">
 							<div class="main_it">
 								<div class="titWrap">
-									<a href="javascript:void(0)" onclick="cfnGoToPage(_PAGE_BEST_MAIN);">
-										<h2 th:text="${contentsTitle}"></h2>
-									</a>
+									<th:block th:each="ContentsData, ContentsStat : ${mainData.ContentsList}">
+										<a href="javascript:void(0)" th:onclick="cfnGoToPage([[${ContentsData.strVar1}]]);">
+											<h2 th:text="${contentsTitle}"></h2>
+										</a>
+									</th:block>
 								</div>
 								<div class="inner_head">
 									<ul class="it_nav">
@@ -238,7 +240,7 @@
 					<th:block th:if="${contentsLoc=='006'}">
 						<!-- 6. 타임딜 : 슬라이드 -->
 						<th:block th:each="socialData, socialStat : ${mainData.socialInfo}">
-						<div class="inner bg_dark" th:if="${socialData.socialGoodsList != null and !socialData.socialGoodsList.empty}">
+						<div class="inner bg_dark" th:if="${socialData.socialGoodsList != null}">
 							<div class="main_deal">
 								<div class="titWrap">
 									<a href="javascript:void(0)" onclick="cfnGoToPage(_PAGE_SOCIAL_MAIN);">
@@ -291,7 +293,7 @@
 
 					<th:block th:if="${contentsLoc=='007'}">
 						<!-- 7. 브랜드픽 -->
-						<div class="inner" th:if="${mainData.ContentsList != null and !mainData.ContentsList.empty}">
+						<div class="inner" th:if="${mainData.ContentsList != null}">
 							<div class="main_pick" >
 								<div class="titWrap">
 									<h2 th:text="${contentsTitle}"></h2>
@@ -366,7 +368,7 @@
 
 					<th:block th:if="${contentsLoc=='008'}">
 						<!-- 8. 가로 긴 배너 슬라이드 -->
-						<div class="inner wide" th:if="${mainData.ContentsList != null and !mainData.ContentsList.empty}">
+						<div class="inner wide">
 							<div class="main_1stage">
 								<div class="swiper-container post-bnnWide">
 									<div class="swiper-wrapper">
@@ -397,7 +399,7 @@
 
 					<th:block th:if="${contentsLoc=='009'}">
 						<!-- 9. MD추천 스타일 -->
-						<div class="inner" th:if="${mainData.mdPickList != null and !mainData.mdPickList.empty}">
+						<div class="inner">
 							<div class="main_recomm">
 								<div class="titWrap">
 									<h2 th:text="${contentsTitle}">MD가 추천하는 스타일</h2>
@@ -721,7 +723,7 @@
 
 					<th:block th:if="${contentsLoc=='011'}">
 						<!-- 11. TV 슬라이드 -->
-						<div class="inner wide bg_dark" th:if="${mainData.ContentsList != null and !mainData.ContentsList.empty}">
+						<div class="inner wide bg_dark" th:if="${mainData.ContentsList != null}">
 							<div class="titWrap">
 								<h2 data-style="unusual" th:text="${mainData.contentsTitle}">STYLE24 TV</h2>
 							</div>
@@ -753,53 +755,44 @@
 		var mainLayoutList = [[${mainLayoutList}]];
 		// console.log(mainLayoutList);
 
-		if(!gagajf.isNull($("#socailForm").find("input[name=targetTime]").val())){
-			var targetTime = $("#socailForm").find("input[name=targetTime]").val().toDate("YYYYMMDD");
-			if(targetTime != null && targetTime != ''){
-				/* 핫딜 countDown */
-				var endTime = new Date(targetTime); // 남은시간 지정
-				endTime = (Date.parse(endTime) / 1000);
+		var targetTime = $("#socailForm").find("input[name=targetTime]").val().toDate("YYYYMMDD");
+		if(targetTime != null && targetTime != ''){
+			/* 핫딜 countDown */
+			var endTime = new Date(targetTime); // 남은시간 지정
+			endTime = (Date.parse(endTime) / 1000);
 
-				var countdown = document.getElementById("tiles"); // get tag element
+			var countdown = document.getElementById("tiles"); // get tag element
 
-				getCountdown();
+			getCountdown();
 
-				setInterval(function () { getCountdown(); }, 1000);
+			setInterval(function () { getCountdown(); }, 1000);
 
-				function getCountdown(){
-					// find the amount of "seconds" between now and target
-					var now = new Date();
-					now = (Date.parse(now) / 1000);
+			function getCountdown(){
+				// find the amount of "seconds" between now and target
+				var now = new Date();
+				now = (Date.parse(now) / 1000);
 
-					var timeLeft = endTime - now;
+				var timeLeft = endTime - now;
 
-					var days = Math.floor(timeLeft / 86400);
-					var hours = Math.floor((timeLeft - (days * 86400)) / 3600);
-					var minutes = Math.floor((timeLeft - (days * 86400) - (hours * 3600 )) / 60);
-					var seconds = Math.floor((timeLeft - (days * 86400) - (hours * 3600) - (minutes * 60)));
+				var days = Math.floor(timeLeft / 86400);
+				var hours = Math.floor((timeLeft - (days * 86400)) / 3600);
+				var minutes = Math.floor((timeLeft - (days * 86400) - (hours * 3600 )) / 60);
+				var seconds = Math.floor((timeLeft - (days * 86400) - (hours * 3600) - (minutes * 60)));
 
-					if (hours < '10') { hours = '0' + hours; }
-					if (minutes < '10') { minutes = '0' + minutes; }
-					if (seconds < '10') { seconds = '0' + seconds; }
+				if (hours < '10') { hours = '0' + hours; }
+				if (minutes < '10') { minutes = '0' + minutes; }
+				if (seconds < '10') { seconds = '0' + seconds; }
 
-					// format countdown string + set tag value
-					countdown.innerHTML = "<span>" + hours + "</span><span>" + minutes + "</span><span>" + seconds + "</span>";
-				}
+				// format countdown string + set tag value
+				countdown.innerHTML = "<span>" + hours + "</span><span>" + minutes + "</span><span>" + seconds + "</span>";
+			}
 
-				function pad(n) {
-					return (n < 10 ? '0' : '') + n;
-				}
+			function pad(n) {
+				return (n < 10 ? '0' : '') + n;
 			}
 		}
-
 		// 컨텐츠 호출
 		$(document).ready(function() {
-			function noneImg(noneSrc){
-				$(noneSrc).parents('.itemPic').css({'background':'url(/images/pc/thumb/bg_item_none.png)'});
-				$(noneSrc).css({'opacity':'0'});
-				//$(noneSrc).attr("src", no_src);
-			}
-
 			// 몰메인 띠배너 표출
 			$("#divTopbanner").show();
 

src/main/webapp/WEB-INF/views/mob/display/OutletMainFormMob.html

@@ -55,7 +55,7 @@
 				</th:block>
 
 				<th:block th:if="${contentsLoc=='002'}">
-					<div class="inner wide" th:if="${mdPickGoodsList != null and !mdPickGoodsList.empty}">
+					<div class="inner wide" th:if="${mdPickGoodsList != null}">
 						<div class="md_item">
 							<h2 class="dp_subtitle" th:text="${contentsTitle}">MD가 추천하는 아울렛 아이템</h2>
 							<div class="swiper-container item_list">
@@ -91,7 +91,7 @@
 				</th:block>
 
 				<th:block th:if="${contentsLoc=='003'}">
-					<div class="inner" th:if="${bestGoodsList != null and !bestGoodsList.empty}">
+					<div class="inner" th:if="${bestGoodsList != null}">
 						<div class="best_item">
 							<h2 class="dp_subtitle" th:text="${contentsTitle}">베스트 상품</h2>
 							<div class="item_list">

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

@@ -410,7 +410,7 @@ var fnCancel = function() {
 		} else {
 			mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');
 		}
-	}, true);
+	});
 }
 
 // 취소 수량 변경 이벤트 처리

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

@@ -405,11 +405,11 @@ var fnCancel = function() {
 			// 취소 처리
 			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 				cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
-			});
+			}, true);
 		} else {
 			mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');
 		}
-	}, true);
+	});
 }
 
 // 취소 수량 변경 이벤트 처리

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

@@ -718,12 +718,12 @@
 				data.reqGbn = 'cnclComplete';
 				data.ordDtlNoArr = ordDtlNoArr;
 				data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
-
+				console.log(data);
 				let jsonData = JSON.stringify(data);
 				
 				gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 					cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
-				}, true);
+				});
 			}
 		});
 	}
@@ -782,7 +782,7 @@
 
 		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 			cfnGoToPage(_PAGE_NOMEMBER_ORDER_DETAIL);
-		}, true);
+		});
 	}
 </script>
 

src/main/webapp/WEB-INF/views/mob/planning/PlanningEventAttendFormMob.html

@@ -284,8 +284,8 @@ var appendHtml = function () {
 
 		$("#monthTbody").append(html);
 		if (cfCheckLogin()) {
+			$('.day').html('<span>' + custAttendList.length + '</span>일');
 			$.each(custAttendList, function(idx1, item1) {
-				$('.day').html('<span>' + custAttendList.length + '</span>일');
 				if(item1.entryDt == item.sun || item1.entryDt == item.mon || item1.entryDt == item.tue|| item1.entryDt == item.wed
 						|| item1.entryDt == item.thu || item1.entryDt == item.fri || item1.entryDt == item.sat){
 					$("#td_"+item1.entryDt).attr("class","complete");
@@ -312,7 +312,7 @@ var fnInfoConfirmCallBack = function(result) {
 	mcxDialog.alert(result.msg);
 	appendHtml();
 	$("#td_"+date).attr("class","complete");
-	$('.day').html('<span>' + (custAttendList.length +1) + '</span>일');
+	$('.day').html('<span>' + result.custAttendList.length + '</span>일');
 	
 };
 
@@ -334,8 +334,9 @@ $(document).ready(function() {
 	
 	if (!cfCheckLogin()) {
 		$(".day").html("<span>0</span>일");
+		$("#td_"+date).attr("class","today");
 	}else{
-		$('.day').html('<span>' + (custAttendList.length +1) + '</span>일');
+		$('.day').html('<span>' + custAttendList.length + '</span>일');
 		$("#td_"+date).attr("class","today"); 
 		$.each(custAttendList, function(idx, item) {
 			if(item.entryDt == date){

src/main/webapp/WEB-INF/views/web/customer/PrivacyPolicyFormWeb.html

@@ -70,7 +70,7 @@
 	});
 
 	var fnGetCaluseInfo = function (clauseSq) {
-		$.get('/customer/clause/info/' + clauseSq
+		$.get('/customer/privacy/policy/info/' + clauseSq
 			, function (data) {
 			if(!gagajf.isNull(data.clauseContent)) {
 				$('.cont_body').html(data.clauseContent);

src/main/webapp/WEB-INF/views/web/display/BrandMainFormWeb.html

@@ -25,7 +25,7 @@
 <!--			<th:block th:if="${brandMainLayoutData.ContentsList != null and !brandMainLayoutData.ContentsList.empty}">-->
 				<th:block th:if="${contentsLoc=='004'}">
 					<!-- 1. 비주얼 슬라이드 -->
-					<div class="content wide main_visual brand_visual" th:if="${brandMainLayoutData.ContentsList != null and !brandMainLayoutData.ContentsList.empty}">
+					<div class="content wide main_visual brand_visual" th:if="${brandMainLayoutData.ContentsList != null}">
 						<div class="cont_head dpnone">
 							<p class="t_c">비주얼 슬라이드</p>
 						</div>

src/main/webapp/WEB-INF/views/web/display/MallMainFormWeb.html

@@ -107,7 +107,7 @@
 
 				<!-- 3. 트렌디한 신상아이템 -->
 				<th:block th:if="${contentsLoc=='003'}">
-					<div class="content main_trendy" th:if="${mainLayoutData.goodsList != null and !mainLayoutData.goodsList.empty}">
+					<div class="content main_trendy" th:if="${mainLayoutData.goodsList != null}">
 						<div class="cont_head">
 							<p class="displayH t_c" th:text="${mainLayoutData.contentsTitle}"></p>
 						</div>
@@ -147,12 +147,14 @@
 
 				<!-- 4. 잇 아이템 -->
 				<th:block th:if="${contentsLoc=='004'}">
-					<div class="content main_it" th:if="${mainLayoutData.BestItemList != null and !mainLayoutData.BestItemList.empty}">
+					<div class="content main_it" th:if="${mainLayoutData.BestItemList != null}">
 						<div class="cont_head">
 							<p class="displayH" id="id004">
 								<input type="hidden" name="title" th:value="${mainLayoutData.contentsTitle}">
 							</p>
-							<a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_BEST_MAIN);"><span>전체보기</span></a>
+							<th:block th:each="ContentsData, ContentsStat : ${mainLayoutData.ContentsList}">
+								<a href="javascript:void(0);" th:onclick="cfnGoToPage([[${ContentsData.strVar1}]]);"><span>전체보기</span></a>
+							</th:block>
 						</div>
 						<div class="cont_body">
 							<div class="it_nav">
@@ -203,7 +205,7 @@
 
 				<!-- 5. 프로모션배너 -->
 				<th:block th:if="${contentsLoc=='005'}">
-					<div class="content main_2stage" th:if="${mainLayoutData.ContentsList != null and !mainLayoutData.ContentsList.empty}">
+					<div class="content main_2stage" th:if="${mainLayoutData.ContentsList != null}">
 						<div class="cont_head dpnone">
 							<p class="t_c">프로모션배너</p>
 						</div>
@@ -238,7 +240,7 @@
 				<!-- 6. 타임딜 : 슬라이드 -->
 				<th:block th:if="${contentsLoc=='006'}">
 					<th:block th:each="socialData, socialStat : ${mainLayoutData.socialInfo}">
-					<div class="content wide main_deal" th:if="${socialData.socialGoodsList != null and !socialData.socialGoodsList.empty}">
+					<div class="content wide main_deal" th:if="${socialData.socialGoodsList != null}">
 						<div class="cont_head">
 							<p class="displayH" id="id006">
 								<input type="hidden" name="title" th:value="${mainLayoutData.contentsTitle}">
@@ -269,57 +271,55 @@
 							<script>
 								/* 핫딜 countDown */
 								// var target_date = new Date().getTime() + (1000*3600*8); // set the countdown date
-								if(!gagajf.isNull($("#socailForm").find("input[name=targetTime]").val())){
-									var target_date = $("#socailForm").find("input[name=targetTime]").val().toDate("YYYYMMDD");
-									var days, hours, minutes, seconds; // variables for time units
-
-									var countdown = document.getElementById("tiles"); // get tag element
+								var target_date = $("#socailForm").find("input[name=targetTime]").val().toDate("YYYYMMDD");
+								var days, hours, minutes, seconds; // variables for time units
 
-									getCountdown();
+								var countdown = document.getElementById("tiles"); // get tag element
 
-									var timerStop = setInterval(function () { getCountdown(); }, 1000);
+								getCountdown();
 
-									var fixDate = new Date().getTime();
-									var fixTarget = (target_date - fixDate) / 1000;
-									var width = (86400-fixTarget)*100/86400;
+								var timerStop = setInterval(function () { getCountdown(); }, 1000);
 
-									function getCountdown(){
+								var fixDate = new Date().getTime();
+								var fixTarget = (target_date - fixDate) / 1000;
+								var width = (86400-fixTarget)*100/86400;
 
-										// find the amount of "seconds" between now and target
-										var current_date = new Date().getTime();
-										var seconds_left = (target_date - current_date) / 1000;
+								function getCountdown(){
 
-										seconds_left = seconds_left % 86400;
+									// find the amount of "seconds" between now and target
+									var current_date = new Date().getTime();
+									var seconds_left = (target_date - current_date) / 1000;
 
-										hours = pad( parseInt(seconds_left / 3600) );
-										seconds_left = seconds_left % 3600;
+									seconds_left = seconds_left % 86400;
 
-										minutes = pad( parseInt(seconds_left / 60) );
-										seconds = pad( parseInt( seconds_left % 60 ) );
+									hours = pad( parseInt(seconds_left / 3600) );
+									seconds_left = seconds_left % 3600;
 
-										// format countdown string + set tag value
-										countdown.innerHTML = "<span>" + hours + "</span><span>" + minutes + "</span><span>" + seconds + "</span>";
+									minutes = pad( parseInt(seconds_left / 60) );
+									seconds = pad( parseInt( seconds_left % 60 ) );
 
-										var elem = document.getElementById("barCurrent");
-										function progressMove(){
-											width += (100-width)/fixTarget;
-											elem.style.width = width + "%";
-										}
-										progressMove();
-
-										if(seconds_left < 1){
-											clearInterval(timerStop);
-											elem.style.width = "100%";
-										}
+									// format countdown string + set tag value
+									countdown.innerHTML = "<span>" + hours + "</span><span>" + minutes + "</span><span>" + seconds + "</span>";
 
+									var elem = document.getElementById("barCurrent");
+									function progressMove(){
+										width += (100-width)/fixTarget;
+										elem.style.width = width + "%";
 									}
+									progressMove();
 
-									function pad(n) {
-										return (n < 10 ? '0' : '') + n;
+									if(seconds_left < 1){
+										clearInterval(timerStop);
+										elem.style.width = "100%";
 									}
-									/* countDown */
+
 								}
 
+								function pad(n) {
+									return (n < 10 ? '0' : '') + n;
+								}
+								/* countDown */
+
 							</script>
 						</div>
 						<div class="cont_body">
@@ -362,7 +362,7 @@
 
 				<!-- 7. 브랜드픽 -->
 				<th:block th:if="${contentsLoc=='007'}">
-					<div class="content main_pick" th:if="${mainLayoutData.ContentsList != null and !mainLayoutData.ContentsList.empty}">
+					<div class="content main_pick">
 						<div class="cont_head">
 							<p class="displayH t_c" th:text="${mainLayoutData.contentsTitle}">브랜드 PICK1</p>
 						</div>
@@ -441,7 +441,7 @@
 				<!-- 8. 가로 긴 배너 슬라이드 -->
 				<!-- bnn_1stage -->
 				<th:block th:if="${contentsLoc=='008'}">
-					<div class="content wide main_1stage" th:if="${mainLayoutData.ContentsList != null and !mainLayoutData.ContentsList.empty}">
+					<div class="content wide main_1stage">
 						<div class="cont_head dpnone">
 							<p class="t_c">배너 슬라이드</p>
 						</div>
@@ -479,7 +479,7 @@
 
 				<!-- 9. MD추천 스타일 -->
 				<th:block th:if="${contentsLoc=='009'}">
-					<div class="content main_recomm" th:if="${mainLayoutData.mdPickList != null and !mainLayoutData.mdPickList.empty}">
+					<div class="content main_recomm" >
 						<div class="cont_head">
 							<p class="displayH t_c" th:text="${mainLayoutData.contentsTitle}"></p>
 						</div>
@@ -541,7 +541,7 @@
 
 				<!-- 11. TV 슬라이드 -->
 				<th:block th:if="${contentsLoc=='011'}">
-					<div class="content wide main_tv" th:if="${mainLayoutData.ContentsList != null and !mainLayoutData.ContentsList.empty}">
+					<div class="content wide main_tv" th:if="${mainLayoutData.ContentsList != null}">
 						<div class="cont_head">
 							<p class="displayH t_c" th:text="${mainLayoutData.contentsTitle}"></p>
 						</div>
@@ -901,12 +901,6 @@ $(document).ready( function() {
 
 	let randomNum = Math.floor( ( Math.random() * 4 ) );
 	$(".it_nav .btn").eq(randomNum).trigger('click');
-
-	function noneImg(noneSrc){
-		$(noneSrc).parents('.itemPic').css({'background':'url(/images/pc/thumb/bg_item_none.png)'});
-		$(noneSrc).css({'opacity':'0'});
-		//$(noneSrc).attr("src", no_src);
-	}
 });
 
 /* SLIDE - MAIN_VISUAL */

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

@@ -157,7 +157,7 @@
 															<div class="select">선택</div>
 															<ul class="list">
 																<li id="bankCd_" class="selected">
-																	<div text="선택"></div>
+																	<div>선택</div>
 																	<input type="hidden" name="bankCd" value=""/>
 																</li>
 																<th:block th:if="${bankList}" th:each="oneData, status : ${bankList}">

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

@@ -597,7 +597,7 @@
 					} else {
 						mcxDialog.alert('이미 배송처리 되어 전체취소 처리에 실패 하였습니다.');
 					}
-				}, true);
+				});
 				
 				
 			}
@@ -675,7 +675,7 @@
 		
 		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 			cfnGoToPage(_PAGE_MYPAGE_ORDER_DETAIL + ordNo);
-		}, true);
+		});
 	}
 	
 	// 전체구매확정 버튼 클릭 이벤트

src/main/webapp/biz/mypage.js

@@ -481,7 +481,7 @@ var fnCreCancel = function(param, noMember) {
 				} else {
 					cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
 				}
-			}, true);
+			});
 		}
 	});
 }

src/main/webapp/ux/mo/css/common_m.css

@@ -938,7 +938,7 @@ footer{background-color: #f1f1f1;}
 footer .btn_top{position: fixed; bottom: 9%; right: 2.0rem; opacity: 0; background-color: rgba(0, 0, 0, 0.4); width: 4.1rem; height: 4.0rem; font-size: 0; z-index: 500; background:url(/images/mo/mo_btn_top.png) no-repeat;}
 footer .btn_top span{display: block;width: 2.4rem;height: 2.4rem;margin: 0 auto;position: relative;opacity: 1;color: #222222;font-size: 1.1rem;font-weight: 600;line-height: 3.4rem;letter-spacing: -0.025em;}
 footer .btn_back{position: fixed; bottom: 9%; left: 2.0rem; opacity: 0; background-color: rgba(0, 0, 0, 0.4); width: 4.1rem; height: 4.0rem; font-size: 0; z-index: 500; background:url(/images/mo/mo_btn_back.png) no-repeat; bottom: calc(env(safe-area-inset-bottom) + 6.5rem);}
-footer .btn_back span{display: block;width: 2.4rem;height: 2.4rem;margin: 0 0.6rem;position: relative;opacity: 1;color: #222222;font-size: 1.1rem;font-weight: 600;line-height: 3.4rem;letter-spacing: -0.025em;}
+footer .btn_back span{display: block;width: 2.4rem;height: 2.4rem;margin: 0 0.6rem;position: relative;opacity: 1;color: #222222;font-size: 1.1rem;font-weight: 600;line-height: 3.4rem;letter-spacing: -0.025em; text-indent:-999rem;}
 footer .f1{background-color: #f1f1f1;padding: 0 0 4.5rem; position: relative;}
 footer .f1 .inner{padding: 0 2.0rem 2.0rem;}
 footer .f1 .link{padding-top: 20px;}

src/main/webapp/ux/mo/css/layout_m.css

@@ -485,7 +485,7 @@
 
 .pd_detail .movbox {position: relative;height: 0;padding-top: 100%;padding-bottom:50.25%;overflow: hidden;transition: all 300ms ease;transform: scale(1);}
 .pd_detail .movbox #prodMovBtn{background: rgb(246 55 55 / 0%);  position: absolute;top: 0;left: 0;width: 100%;height: 100%;border: none;color: transparent;font-size: 1px;z-index: 2;}
-.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;pointer-events:none;}
+.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;}
 
 
 .pd_detail .thumb_box{position: relative;}
@@ -545,7 +545,7 @@
 .pd_detail .option_box .opt_color ul::after {content:''; position: relative; display:inline-block; width:2rem; height:1px;}
 .pd_detail .option_box .opt_color ul li {margin-right:0.5rem; display:inline-block; width:5rem;height: 7.5rem;}
 .pd_detail .option_box .opt_color ul li:last-child {margin-right:0;}
-.pd_detail .option_box .opt_color ul li a {position:relative; display:block; padding-bottom:0%; box-sizing:border-box; width:5rem;height: 7.5rem;}
+.pd_detail .option_box .opt_color ul li a {position:relative; display:block; padding-bottom:0%; box-sizing:border-box; width:5rem;height: 7.4rem;}
 .pd_detail .option_box .opt_color ul li a img {position: absolute;width: 100%;height: auto;top: 50%;left: 0;transform: translateY(-50%); }
 .pd_detail .option_box .opt_color ul li a.on:after{display:block; content:''; position:absolute; left:0; right:0; top:0; bottom:0; border:1px solid #fd4802; box-sizing:border-box;}
 .pd_detail .option_box > [class^="opt_"] .opt_header {margin-bottom:0.5rem;}

src/main/webapp/ux/mo/css/style24_m.css

@@ -419,8 +419,8 @@
 
 .main_1stage {padding: 2rem 0 0rem 0;}
 .main_1stage .bnnbox{position: relative; /*height:11.3rem;*/ overflow:hidden; padding-top: 35%;}
-.main_1stage .txtWrap{margin: 0 auto; position: absolute; top: 50%; left: 2rem; transform:translate(0%, -50%); z-index: 1;}
-.main_1stage .txtWrap p{font-size: 1.8rem;font-weight: 500;letter-spacing: -0.025em;text-align: left;line-height: 1;color: #222222;padding-bottom:1.0rem;}
+.main_1stage .txtWrap{width: 18.5rem; margin: 0 auto; position: absolute; top: 50%; left: 2rem; transform:translate(0%, -50%); z-index: 1;}
+.main_1stage .txtWrap p{display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 2;-webkit-box-orient: vertical;overflow: hidden; font-size: 1.8rem;font-weight: 500;letter-spacing: -0.025em;text-align: left;line-height: 1.2;color: #222222;padding-bottom:1.0rem;}
 .main_1stage .txtWrap p:last-child {padding-bottom:0px;}
 .main_1stage img {position: absolute; top: 50%; left:50%; transform:translate(-60%, -50%); max-width:none; width:auto; height:100%;}
 
@@ -607,7 +607,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .dp .dp_btn_area .btn_wrap a.btn span:after {content:''; position: absolute; top: 50%; right: -1.3rem; transform:translateY(-50%); background:url(/images/mo/ico_more_arrow.png) no-repeat center/100%; width: 0.53rem; height: 0.9rem; display: none;}
 .dp .dp_btn_area .btn_wrap a.btn.go_next span:after {display: block;}
 .dp .dp_btn_area .btn_wrap button.btn {width: 100%; padding:1.5rem 0; height:auto; font-size: 1.2rem; color: #fff; font-weight: 500; border:none;}
-.dp .announce_txt {margin-top:-1.2rem; padding:2.4rem 0;}
+.dp .announce_txt {margin-top:-3.2rem; padding:2.4rem 0;}
 .dp .announce_txt .announce_list {padding-bottom: 0;}
 
 /* 다른 이벤트 보기 슬라이드 */
@@ -738,6 +738,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 
 /* ev_check */
 /* .ev .check {background: #f5f5f5;} */
+.stamp_event {padding-bottom: 2.0rem;}
 .stamp_event .event_calander {position: relative; background-color: #f4f3ef; padding:4.3rem 2rem 3rem; overflow:hidden;}
 .stamp_event .event_calander:after {content:''; position: absolute; top: 12rem; left: -3rem; background:url('/images/mo/bg_check01.png'); background-size: 100%; width: 12.5rem; height: 84.1rem; z-index: 1;}
 .stamp_event .event_calander:before {content:''; position: absolute; top: 0; right: 0; background:url('/images/mo/bg_check02.png'); background-size: 100%; width: 12.5rem; height: 84.1rem; z-index: 1;}
@@ -1236,11 +1237,13 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 
 
 /* my_order_1 */
-.my .order_sort {padding-top: 2rem; text-align: right;}
+.my .order_sort {padding-top: 2rem;padding-bottom: 1.2rem;margin-bottom: -2.4rem; text-align: right;}
 .my .order_sort a {display: inline-block; font-size: 1.2rem; font-weight: 300; padding-right: 1.4rem; background: url('/images/mo/ico_sort_arrow.png') no-repeat right center; background-size:0.7rem 0.43rem;}
 .my .order_sort a:first-child {margin-right: 2rem;}
-.my .my_order .inner .part_goods {margin-bottom: 1.2rem; margin-top: -1.2rem;}
+.my .my_order .inner .part_goods {margin-bottom: 1.2rem; margin-top: -1.2rem;margin-top: 1.2rem;}
 .my .my_order .inner .part_goods:last-child {margin-bottom: 0;}
+/* .my .my_order .inner:first-child .part_goods {margin-top: -1.2rem;} */
+/* .my .my_order .inner .part_goods:last-child {margin-bottom: 0;margin-top: -1.2rem;} */
 .popup_box .button_list button {width: 100%; padding:1.1rem 0; border:1px solid #eee; text-align: center; margin-bottom: 0.6rem; border-radius:3rem; font-size: 1.4rem; font-weight: 300; color: #666;}
 .popup_box .button_list button[disabled] {background: #f5f5f5; color: #bbb;}
 .popup_box .button_list button[disabled] span {text-decoration: line-through; }
@@ -1252,10 +1255,11 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .my .my_order .inner {margin-bottom: 1.2rem;}
 .my .my_order .inner:last-child {margin-bottom: 0;}
 .my .inner.bg_beige {background: #fff6f2;}
-.my .order_number {padding:2rem; position: relative; margin-bottom:0;}
+.my .order_number {padding:2rem; position: relative; margin-bottom:0; margin-bottom: -2rem;}
+.my .order_number dl{display: inline-block;}
 .my .order_number dt, .my .order_number dd {float:left; font-size: 1.4rem; font-weight: 500;}
 .my .order_number dt {margin-right: 0.8rem;}
-.my .order_number .delete {position: absolute; top: 50%; right: 2rem; transform:translateY(-50%); font-size: 1.1rem; color: #666; border-bottom: 1px solid #666;}
+.my .order_number .delete {position: absolute; top: 45%; right: 2rem; transform:translateY(-50%); font-size: 1.1rem; color: #666; border-bottom: 1px solid #666;}
 .my .foldGroup {margin-bottom: 0;}
 .my .foldGroup > ul > li {border-bottom: 0;}
 .my .fold_answer {background: #fff; padding-top: 0;}
@@ -1394,6 +1398,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 
 /* my_return_2 */
 .my .my_return .inner {margin-bottom: 1.2rem;}
+.my .my_return .inner .part_goods {margin-top: 1.2rem;}
 .my .my_return .ship_info dl > div.addr {width: 100%;}
 .my .my_return .desc_txt,.my .my_exchange .desc_txt {margin-top: -1.5rem; margin-bottom: 4.2rem;}
 .my .my_return .tbl .desc_txt {margin-top: 1.3rem; margin-bottom: 0;}
@@ -2454,53 +2459,56 @@ main.container .shopping_bag .inner:last-child {padding-bottom: 0;}
 .optModifyPop .opt_header > span {float:left;}
 .optModifyPop .opt_header .info {margin-left: 2rem; color: #666;}
 .optModifyPop .opt_header .form_field {position: absolute; top: 0; right: 0; width:auto;}
-.optModifyPop .area_order .opt_color::before {content: ''; display: block; width:100%;border-top: 1px solid #dddddd;position: relative;top: -1.2rem;left: auto;right: auto;}
+.optModifyPop .area_order .opt_color::before {content: ''; display: block; width:100%;border-top: 0.1rem solid #dddddd;position: relative;top: -1.2rem;left: auto;right: auto;}
 .optModifyPop .area_order .opt_color ul {font-size: 0; width: 100%; white-space: nowrap; overflow-x: auto;}
-.optModifyPop .area_order .opt_color ul li {display: inline-block; margin:0 3px; margin-top:6px}
-.optModifyPop .area_order .opt_color ul li a {display:block; box-sizing:border-box; width:70px; height:105px;}
-.optModifyPop .area_order .opt_color ul li a.on img {border:1px solid #fd4802}
-.optModifyPop .area_order .opt_size {padding-bottom:40px; border-bottom:1px solid #ddd;}
+.optModifyPop .area_order .opt_color ul li {display: inline-block; margin:0 0.3rem; margin-top:0.6rem;}
+.optModifyPop .area_order .opt_color ul li a {display:block; background: #f5f5f5; position: relative; padding-bottom: 0%;box-sizing: border-box;width: 7.0rem;height: 10.5rem;}
+.optModifyPop .area_order .opt_color ul li a::after {display: block;content: '';position: absolute;left: 0;right: 0;top: 0;bottom: 0;box-sizing: content-box;border: 0.1rem solid #f5f5f5;}
+.optModifyPop .area_order .opt_color ul li a.on::after {display: block;content: '';border: 0.1rem solid #fd4802;}
+.optModifyPop .area_order .opt_color ul li a img {position: absolute;width: 100%;height: auto;top: 50%;left: 0;transform: translateY(-50%);}
+/* .optModifyPop .area_order .opt_color ul li a.on img {border:1px solid #fd4802} */
+.optModifyPop .area_order .opt_size {padding-bottom:4.0rem; border-bottom:0.1rem solid #ddd;}
 .optModifyPop .area_order .opt_size .form_field {display:block; width:100%; font-size: 0;}
-.optModifyPop .area_order .opt_size .form_field > div {float:none; width:20%; display: inline-block; margin:6px 0 0; padding:0 0.78%;}
+.optModifyPop .area_order .opt_size .form_field > div {float:none; width:20%; display: inline-block; margin:0.6rem 0 0; padding:0 0.78%;}
 .optModifyPop .area_order .opt_size .form_field > div {}
 /* .optModifyPop .area_order .opt_size .form_field > div:nth-child(6n-5) {margin-left:0px;} */
-.optModifyPop .area_order .opt_size .form_field input[type="radio"] + label {position: relative; display:block; width:100%; height:40px; padding:0; line-height:40px; text-align:center; background:#fff; box-sizing:border-box; border:1px solid #ddd; color:#222; font-weight:200; font-size:14px;}
-.optModifyPop .area_order .opt_size .form_field input[type="radio"] + label span {position:absolute; top:50%; left:0%; width:100%; padding:0 6px; line-height:1.2; transform:translateY(-50%); display:inline-block; text-overflow:ellipsis; overflow:hidden;}
+.optModifyPop .area_order .opt_size .form_field input[type="radio"] + label {position: relative; display:block; width:100%; height:4.0rem; padding:0; line-height:4.0rem; text-align:center; background:#fff; box-sizing:border-box; border:0.1rem solid #ddd; color:#222; font-weight:200; font-size:1.4rem;}
+.optModifyPop .area_order .opt_size .form_field input[type="radio"] + label span {position:absolute; top:50%; left:0%; width:100%; padding:0 0.6rem; line-height:1.2; transform:translateY(-50%); display:inline-block; text-overflow:ellipsis; overflow:hidden;}
 .optModifyPop .area_order .opt_size .form_field input[type="radio"] + label::before,
 .optModifyPop .area_order .opt_size .form_field input[type="radio"] + label::after {display:none;}
-.optModifyPop .area_order .opt_size .form_field input[type="radio"]:checked + label {border:1px solid #fd4802;}
+.optModifyPop .area_order .opt_size .form_field input[type="radio"]:checked + label {border:0.1rem solid #fd4802;}
 .optModifyPop .area_order .opt_size .form_field input[type="radio"]:disabled + label {background:#f5f5f5; border-color:#f5f5f5; color:#bbb; opacity:1;}
 .optModifyPop .area_order .opt_size .form_field input[type="radio"]:disabled + label span {text-decoration:line-through;}
 
-.optModifyPop .area_order .opt_select .select_custom .combo .select {height:45px; padding:15px;}
-.optModifyPop .area_order .opt_select .select_custom .combo .list > li {height:45px; padding:15px; font-size:14px; line-height:1;}
+.optModifyPop .area_order .opt_select .select_custom .combo .select {height:4.5rem; padding:1.5rem;}
+.optModifyPop .area_order .opt_select .select_custom .combo .list > li {height:4.5rem; padding:1.5rem; font-size:1.4rem; line-height:1;}
 .optModifyPop .area_order .opt_count .opt_count {padding-bottom:0;}
-.optModifyPop .area_order .opt_count .number_count {display:inline-block; border:1px solid #ddd}
+.optModifyPop .area_order .opt_count .number_count {display:inline-block; border:0.1rem solid #ddd;}
 .optModifyPop .area_order .opt_count .number_count::after {content:''; clear:both; display:block;}
 .optModifyPop .area_order .opt_count .number_count span,
 .optModifyPop .area_order .opt_count .number_count input[type='text']{float:left;}
-.optModifyPop .area_order .opt_count .number_count span {cursor:pointer; position:relative; display:inline-block; width:40px; height:40px; text-align:center;}
-.optModifyPop .area_order .opt_count .number_count span::after {content:''; position:absolute; left:50%; top:50%; transform: translate(-50%, -50%);; width:12px; height:12px; background:url('/images/pc/btn_count.png') no-repeat 100% 0; image-rendering:pixelated;}
+.optModifyPop .area_order .opt_count .number_count span {cursor:pointer; position:relative; display:inline-block; width:4.0rem; height:4.0rem; text-align:center;}
+.optModifyPop .area_order .opt_count .number_count span::after {content:''; position:absolute; left:50%; top:50%; transform: translate(-50%, -50%); width:1.2rem; height:1.2rem; background:url('/images/pc/btn_count.png') no-repeat 100% 0; image-rendering:pixelated;}
 .optModifyPop .area_order .opt_count .number_count span.min_val,
 .optModifyPop .area_order .opt_count .number_count span.max_val {opacity:0.2;}
 .optModifyPop .area_order .opt_count .number_count .plus::after {content:''; background-position:100% 0;}
 .optModifyPop .area_order .opt_count .number_count .minus::after {content:''; background-position:0 0;}
-.optModifyPop .area_order .opt_count .number_count input[type='text'] {width:44px; height:40px; padding:0; text-align:center; color:#222; font-size:15px; font-weight:200; border:none;}
-.optModifyPop .area_order .btn_group_block .btn {height:60px; font-size:18px; font-weight:300;}
+.optModifyPop .area_order .opt_count .number_count input[type='text'] {width:4.4rem; height:4.0rem; padding:0; text-align:center; color:#222; font-size:1.5rem; font-weight:200; border:none;}
+.optModifyPop .area_order .btn_group_block .btn {height:6.0rem; font-size:1.8rem; font-weight:300;}
 
 .popup_box .part_goods .od_calc {margin-top: 0;}
 .popup_box .part_goods .od_calc .price {position: static;}
 
 /* popup_다다익선 */
-.moresalePop .area_benefit {padding-top:2.4rem; color:#fd4802; font-size:14px;}
+.moresalePop .area_benefit {padding-top:2.4rem; color:#fd4802; font-size:1.4rem;}
 .moresalePop .area_benefit::after {content:''; clear:both; display:block;}
 .moresalePop .area_benefit .tag {float:left; width:3.2rem; font-size: 1rem; padding: 0.5rem 0; text-align: center; height:auto;}
 .moresalePop .area_benefit p {float:left;}
 .moresalePop .area_benefit p span {position:relative; display: block; padding:0px 1rem; display: block; line-height: 2.2rem;}
 .moresalePop .area_benefit p span:first-child::before {display:none;}
 .moresalePop .popup_con {padding:0 2rem;}
-.moresalePop .part_goods ul {border-top: 1px solid #eeeeee;}
-.moresalePop .part_goods li {border-bottom: 1px solid #eeeeee; padding:2rem 0;}
+.moresalePop .part_goods ul {border-top: 0.1rem solid #eeeeee;}
+.moresalePop .part_goods li {border-bottom: 0.1rem solid #eeeeee; padding:2rem 0;}
 .moresalePop .part_goods li:last-child {border-bottom: 0;}
 .moresalePop .part_goods .sale_price {margin-left: 1rem;}
 .moresalePop .part_goods .sale_percent {margin-left: 1.5rem;}

src/main/webapp/ux/pc/css/layout.css

@@ -2778,7 +2778,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.option_box .info_restock a.btn_popup {position:relative; padding-left:22px; padding-right:15px; color:#666; font-size:14px; font-weight:300; border:none;}
 	.option_box .info_restock a.btn_popup::before {content:''; position:absolute; left:0; top:50%; transform:translateY(-50%); width:12px; height:13px; background:url('/images/pc/ico_bell.png') no-repeat 0 0;}
 	.option_box .info_restock a.btn_popup::after {content:''; position:absolute; right:0px; top:50%; transform:translateY(-50%); width:6px; height:11px; background:url('/images/pc/ico_more_lg.png') no-repeat 100% 50%; background-size:contain;}	
-
+	
 	/* pd_deal_컬러선택 */
 	.pd .option_box .opt_color {}
 	.pd .option_box .opt_color .title {margin-right: 16px;}
@@ -2786,9 +2786,9 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.option_box .opt_color ul::after {content:''; clear:both; display:block;}
 	.option_box .opt_color ul li {float:left; margin-left:8px; margin-top:8px}
 	.option_box .opt_color ul li:nth-child(7n-6) {margin-left:0;}
-	.option_box .opt_color ul li a {display:block; box-sizing:border-box; width:66px; height:99px;}
-	.option_box .opt_color ul li a img {width:100%;}
-	.option_box .opt_color ul li a.on img {border:1px solid #fd4802;}
+	.option_box .opt_color ul li a {position: relative; display:block; box-sizing:border-box; width:66px; height:99px; line-height: 0; font-size: 0; overflow: hidden;background: #f5f5f5; border: 1px solid #f5f5f5; box-sizing: content-box;}
+	.option_box .opt_color ul li a img {position: absolute;left: 0;top: 50%;width: 100%;transform: translateY(-50%);z-index: 2;	}
+	.option_box .opt_color ul li a.on {border:1px solid #fd4802;}
 
 	/* pd_deal_컬러선택 폼 */
 	.pd .option_box .opt_size {}
@@ -4673,7 +4673,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.modal.optModify_pop .modal-header {margin-bottom:20px;}
 	.modal.optModify_pop .modal-header h5.modal-title {margin-bottom:20px}
 	.modal.optModify_pop button span {line-height:1;}
-	.modal.optModify_pop img {width:100%}
+	.modal.optModify_pop img {position: absolute;width: 100%;height: auto;top: 50%;left: 0;transform: translateY(-50%);}
 	.modal.optModify_pop .form_field,
 	.modal.optModify_pop .form_field > div {display:block; width:100%;}
 	.modal.optModify_pop .opt_header {margin-bottom:18px; font-size:14px;}
@@ -4683,6 +4683,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.modal.optModify_pop .opt_header .text {margin-left:20px; color:#666; font-weight:200;}
 	.modal.optModify_pop .area_pic {float:left; width:360px;}
 	.modal.optModify_pop .area_pic .pic_list {margin-top:-5px}
+	.modal.optModify_pop .area_pic .pic_list .thumb {position: relative;display: block;padding-bottom: 0%;box-sizing: border-box;width: 175px;height: 261px;border: 1px solid #eee;background: #f5f5f5;}
 	.modal.optModify_pop .area_pic .pic_list li {float:left; width:50%; padding-top:5px; padding-bottom:5px;}
 	.modal.optModify_pop .area_pic .pic_list li:nth-child(odd) {padding-right:5px;}
 	.modal.optModify_pop .area_pic .pic_list li:nth-child(even) {padding-left:5px;}
@@ -4692,8 +4693,9 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.modal.optModify_pop .area_order .opt_color ul {margin-top:-6px;}
 	.modal.optModify_pop .area_order .opt_color ul li {float:left; margin-left:6px; margin-top:6px}
 	.modal.optModify_pop .area_order .opt_color ul li:nth-child(5n-4) {margin-left:0} 
-	.modal.optModify_pop .area_order .opt_color ul li a {display:block; box-sizing:border-box; width:70px; height:105px;}
-	.modal.optModify_pop .area_order .opt_color ul li a.on img {border:1px solid #fd4802}
+	.modal.optModify_pop .area_order .opt_color ul li a {display:block; position: relative; box-sizing:border-box; width:70px; height:103px;padding-bottom: 0%;border: 1px solid #eee;background: #f5f5f5;}
+	.modal.optModify_pop .area_order .opt_color ul li a::after {display: block;content: '';position: absolute;left: 0;right: 0;top: 0;bottom: 0;border: 1px solid #f5f5f5;box-sizing: border-box;}
+	.modal.optModify_pop .area_order .opt_color ul li a.on::after {display: block;content: '';border:1px solid #fd4802;}
 	.modal.optModify_pop .area_order .opt_size {padding-bottom:40px; border-bottom:1px solid #ddd;}
 	.modal.optModify_pop .area_order .opt_size .form_field {display:block; width:95%; margin-top:-6px;}
 	.modal.optModify_pop .area_order .opt_size .form_field > div {margin-left:6px; margin-top:6px;}

src/main/webapp/ux/pc/css/main.css

@@ -456,8 +456,8 @@
 /* main_1stage */
 .main .wrap .content.main_1stage {}
 .main_1stage .bnnbox{position:relative;}
-.main_1stage .txtWrap{margin:0 auto; position:absolute; top:50%; left:31.25%; transform:translate(0, -50%);z-index:1; text-align:left;}
-.main_1stage .txtWrap p{color:#222222; font-size:40px; font-weight:500; text-align:left; line-height:1.25;}
+.main_1stage .txtWrap{width: 445px; margin:0 auto; position:absolute; top:50%; left:31.25%; transform:translate(0, -50%);z-index:1; text-align:left;}
+.main_1stage .txtWrap p{line-height: 1; display: -webkit-box; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; color:#222222; font-size:40px; font-weight:500; text-align:left; line-height:1.25;}
 .main_1stage .txtWrap .btn{position:relative; width:160px; height:52px; border:1px solid #959899; margin:20px auto 0; text-align:center; font-weight:300; }
 .main_1stage img {margin:0 auto;width:100%;}
 .post-bnnWide .swiper-button-next {right:70px;}

src/main/webapp/ux/style24_link.js

@@ -1029,6 +1029,7 @@ function cfnSupplyComanyLayer(mallGb) {
 	cfnOpenLayer(_PAGE_SUPPLY_COMPANY_LAYER,'supplyCompanyPop');
 }
 
+
 /**
  * @type   : function
  * @access : public