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

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

@@ -756,7 +756,6 @@ public class TsfOrderController extends TsfBaseController {
 		
 		if (TsfSession.isLogin()) {
 			Order vo = coreOrderService.getCustPaymeans(order);
-			
 			if (vo != null) {
 				payMeans 	= vo.getPayMeans();
 				pgGb 		= vo.getPgGb();
@@ -1100,6 +1099,7 @@ public class TsfOrderController extends TsfBaseController {
 			// 2021.05.31 알림톡전송 주문완료정보		
 			if (StringUtils.isNotBlank(orderInfo.getOrdPhnno())) {
 				Integer userNo = orderInfo.getCustNo();
+				
 				try {
 					orderInfo.setGoodsNm((String) resultMap.get("goodsNm"));
 					orderInfo.setGoodsCnt(String.valueOf(resultMap.get("goodsCnt")));
@@ -1157,25 +1157,29 @@ public class TsfOrderController extends TsfBaseController {
 					}
 				} catch (Exception e) {
 					// TODO Auto-generated catch block
-					e.printStackTrace();
+					// e.printStackTrace();
 				}
 			}
 			
-			// 2021.05.31 알림톡전송 선물받기정보 (KCP 무통장입금 제외)
-			if ("Y".equals(orderInfo.getGiftPackYn())) {
-				if ("KCP".equals(orderInfo.getPgGb()) && !TscConstants.PayMeans.BANK_DEPOSIT.value().equals(orderInfo.getPayMeans())) {
-					if (StringUtils.isNotBlank(orderInfo.getRecipPhnno())) {
-						Integer userNo = orderInfo.getCustNo();
-						try {
-							orderInfo.setGoodsNm((String) resultMap.get("goodsNm"));
-							orderInfo.setGoodsCnt(String.valueOf(resultMap.get("goodsCnt")));
-							kakaotalkService.sendOrderGiftComplete(orderInfo, userNo);
-						} catch (Exception e) {
-							// TODO Auto-generated catch block
-							e.printStackTrace();
+			try {
+				// 2021.05.31 알림톡전송 선물받기정보 (KCP 무통장입금 제외)
+				if ("Y".equals(orderInfo.getGiftPackYn())) {
+					if ("KCP".equals(orderInfo.getPgGb()) && !TscConstants.PayMeans.BANK_DEPOSIT.value().equals(orderInfo.getPayMeans())) {
+						if (StringUtils.isNotBlank(orderInfo.getRecipPhnno())) {
+							Integer userNo = orderInfo.getCustNo();
+							try {
+								orderInfo.setGoodsNm((String) resultMap.get("goodsNm"));
+								orderInfo.setGoodsCnt(String.valueOf(resultMap.get("goodsCnt")));
+								kakaotalkService.sendOrderGiftComplete(orderInfo, userNo);
+							} catch (Exception e) {
+								// TODO Auto-generated catch block
+								e.printStackTrace();
+							}
 						}
 					}
 				}
+			} catch (Exception e) {
+				
 			}
 		}
 		

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

@@ -17,6 +17,24 @@
 	<!-- GNB 브랜드그룹 목록 -->
 	<select id="getGnbBrandGroupList" parameterType="Contents" resultType="BrandGroup">
 		/* TsfDisplay.getGnbBrandGroupList */
+		WITH TAB AS (
+		    SELECT  STR_TITLE3
+		    FROM
+		<choose>
+		    <when test='preview != null and preview == "Y"'>
+		        TB_CONTENTS_PREVIEW
+		    </when>
+		    <otherwise>
+		        TB_CONTENTS
+		    </otherwise>
+		</choose>
+		    WHERE 1=1
+		    AND   CONTENTS_LOC = #{contentsLoc}
+		    AND   DISP_STDT <![CDATA[<=]]> NOW()
+		    AND   DISP_EDDT <![CDATA[>=]]> NOW()
+		    GROUP BY STR_TITLE3
+		    LIMIT 1
+		)
 		SELECT B.STR_TITLE1     AS TITLE
 		     , A.BRAND_GROUP_NO
 		     , CASE WHEN A.DISP_NM_LANG = 'EN' THEN A.BRAND_GROUP_ENM
@@ -34,7 +52,9 @@
 		     , TB_CONTENTS B
 		    </otherwise>
 		</choose>
-		WHERE  A.BRAND_GROUP_NO = B.STR_VAR1
+		     , TAB C
+		WHERE  B.STR_TITLE3 = C.STR_TITLE3
+		AND    A.BRAND_GROUP_NO = B.STR_VAR1
 		AND    A.USE_YN = 'Y'
 		AND    B.CONTENTS_LOC = #{contentsLoc}
 		<choose>

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

@@ -1524,7 +1524,7 @@
 		                                                                                        AND A.CATE_NO = #{cate1No}
 		                                                                                        </if>
 		                                                                                    </if>
-		                                                                                    AND A.USE_YN = 'Y' ORDER BY A.CONTENTS_SQ
+		                                                                                    AND A.USE_YN = 'Y' ORDER BY A.DISP_ORD
 		                                                                                    <if test="pageGb == null and pageGb != 'BEST'">
 		                                                                                    LIMIT 1
 		                                                                                    </if>

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

@@ -55,12 +55,13 @@
 			let html = '';
 			$.each(pushListJosn.pushList, function(idx, item) {
 				if (_osType === 'I') {
-					alert('fnDecodeUnicode :' + fnDecodeUnicode(item.title.toLowerCase()) + 'escape :' + escape(item.title)
-					 + ' unescape :' + unescape(item.title)
-					 + ' encodeURI:' + encodeURI(item.title)
-					 + ' decodeURI:' + decodeURI(item.title)
-					 + ' encodeURIComponent:' + encodeURIComponent(item.title)
-					 + ' decodeURIComponent:' + decodeURIComponent(item.title)
+					alert('fnDecodeUnicode :' + fnDecodeUnicode(item.content.toLowerCase())
+					 + 'escape :' + escape(item.content)
+					 + ' unescape :' + unescape(item.content)
+					 + ' encodeURI:' + encodeURI(item.content)
+					 + ' decodeURI:' + decodeURI(item.content)
+					 + ' encodeURIComponent:' + encodeURIComponent(item.content)
+					 + ' decodeURIComponent:' + decodeURIComponent(item.content)
 					);
 				}
 				html += '<div class="inner">\n';

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

@@ -42,7 +42,9 @@
 																<input type="hidden" name="mainTitlee" th:value="${ContentsData.strTitle1}"/>
 															</dd>
 															<!--													<dd>NEW ARRIVAL</dd>-->
-															<dd class="txt_xs" th:text="${ContentsData.subText1}">나만의 가을 스타일 찾기</dd>
+															<dd class="txt_xs mainSubTitle" th:text="${ContentsData.subText1}">
+																<input type="hidden" name="mainSubTitlee" th:value="${ContentsData.subText1}"/>
+															</dd>
 														</dl>
 													</div>
 												</a>
@@ -811,6 +813,13 @@
 				$(this).append(tag);
 			});
 
+			// 몰메인 <br> 태그
+			$('.mainSubTitle').each(function (){
+				var brText = $(this).find("input[name=mainSubTitlee]").val();
+				let tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+				$(this).append(tag);
+			});
+
 			// 브랜드픽 <br> 태그
 			$('#id007 .title').each(function (){
 				var brText = $(this).find("input[name=title]").val();

src/main/webapp/WEB-INF/views/mob/order/OrderFormMob.html

@@ -163,8 +163,8 @@
 
 <!-- 주문고객정보 -->
 <form id="orderForm" name="orderForm">
-<main role="" id="" class="container od od_gift">
-	<section class="content odPayment">
+<main role="" id="" class="container od">
+	<section class="content odPayment od_gift">
 		<form action="" class="form_wrap">
 			<!-- 주문내역 -->
 			<div class="inner wide" id="orderListInfo"  style="display:none"></div>
@@ -541,7 +541,12 @@ var entryInfoSet = function() {
 			
 			// 2021.07.06 개인통관부호 입력완료
 			$(".btn_entryNo").on("click", function(){
-				if ($("#orderForm input[name=entryNo]").val().length > 0 && $("#orderForm input[name=entryNo]").val().length < 13) {
+				if ($("#orderForm input[name=entryNo]").val() == null || $("#orderForm input[name=entryNo]").val() == '') {
+					$("#orderForm .t_err").show();
+					$("#orderForm input[name=entryNo]").addClass("err");
+					mcxDialog.alert("개인통관고유부호를 입력해 주세요.");
+					return false;
+				} else if ($("#orderForm input[name=entryNo]").val().length > 0 && $("#orderForm input[name=entryNo]").val().length < 13) {
 					$("#orderForm .t_err").show();
 					$("#orderForm input[name=entryNo]").addClass("err");
 					$("#orderForm .entryNo").text("");

src/main/webapp/WEB-INF/views/web/cart/CartListFormWeb.html

@@ -305,6 +305,7 @@
         //추천상품 슬라이드
 		var rcmdItemSwiper = new Swiper('.od_recommend .swiper-container', {
 			slidesPerView: 5,
+			slidesPerGroup: 5, //210708_ 추가 : 슬라이드 전환시 5개씩 이동.
 			spaceBetween: 20,
 			navigation: {
 				nextEl: '.od_recommend .swiper-button-next',
@@ -315,10 +316,10 @@
 				clickable: true,
 			},
 		});
-
 		//지금 많이 보고 있어요 슬라이드
 		var realtimeItemSwiper = new Swiper('.od_realtime .swiper-container', {
 			slidesPerView: 5,
+			slidesPerGroup: 5, //210708_ 추가 : 슬라이드 전환시 5개씩 이동.
 			spaceBetween: 20,
 			navigation: {
 				nextEl: '.od_realtime .swiper-button-next',

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

@@ -50,7 +50,9 @@
 															<input type="hidden" name="mainTitlee" th:value="${ContentsData.strTitle1}"/>
 														</dd>
 <!--														<dd>NEW ARRIVAL</dd>-->
-														<dd class="txt_xs" th:text="${ContentsData.subText1}"></dd>
+														<dd class="txt_xs mainSubTitle">
+															<input type="hidden" name="mainSubTitlee" th:value="${ContentsData.subText1}"/>
+														</dd>
 													</dl>
 													<button type="button" class="btn" th:onclick="cfnGoToPage([[${ContentsData.strVar1}]]);"><span>자세히 보기</span></button>
 												</div>
@@ -1481,6 +1483,12 @@ $(document).ready(function() {
 		$(this).append(tag);
 	});
 
+	$('.mainSubTitle').each(function (){
+		var brText = $(this).find("input[name=mainSubTitlee]").val();
+		let tag = brText.replace(/(<br>|<br\/>|<br \/>)/g, '<br>');
+		$(this).append(tag);
+	});
+
 	// 가로긴배너 슬라이드
 	$('.silderBannerArea').each(function (){
 		let tag = '';

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

@@ -692,9 +692,9 @@ header .htop h1 a p{color: #222;line-height: 5.5rem;font-size: 2.0rem;height: 5.
 header .htop .btn_back {margin: 1.0rem 0 0 1.5rem;width: 3.5rem;height: 3.5rem;}
 header .htop .btn_back span {display: block;width: 2.4rem;height: 2.4rem;margin: 0 auto;position: relative;}
 header .htop .btn_back span i {display: block;position: absolute;background: #222;-webkit-transition: all 0.3s ease-out;transition: all 0.3s ease-out;}
-header .htop .btn_back span i.gl1 {left: 0;top: 0.6rem;width: 1.2rem;height: 0.2rem;-webkit-transform: rotate(-45deg);transform: rotate(-45deg);}
+header .htop .btn_back span i.gl1 {left: -0.2rem;top: 0.7rem;width: 1.2rem;height: 0.2rem;-webkit-transform: rotate(-45deg);transform: rotate(-45deg);}
 header .htop .btn_back span i.gl2 {left: 0;top: 50%;-webkit-transform: translateY(-50%);transform: translateY(-50%);width: 2.4rem;height: 0.2rem;}
-header .htop .btn_back span i.gl3 {left: 0;bottom: 0.6rem;width: 1.2rem;height: 0.2rem;-webkit-transform: rotate(45deg);transform: rotate(45deg);}
+header .htop .btn_back span i.gl3 {left: -0.2rem;bottom: 0.7rem;width: 1.2rem;height: 0.2rem;-webkit-transform: rotate(45deg);transform: rotate(45deg);}
 header .htop .btn_back:active span i {left: -2.0rem;}
 
 

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

@@ -1415,14 +1415,17 @@
 .modal.pd_pop[class*="reviewdetail_pop"] .modal-body .pd_review .area_rv_all .review_list{border-top:0;}
 .modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb{position:relative; width:100%; height:100%; min-height:45.6rem;}
 .modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb img,
-.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb video{position: absolute; left: 50%; right: 0; top: 45%; bottom: auto; transform: translate(-50%, -50%); width: auto; height: auto; max-height: 100%; max-width: 100%; margin: auto 0; cursor: pointer;}
-.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb iframe{position: absolute; top: 0;left: 0; right: 0; bottom: auto; transform: translate(0, 100%); height: auto; max-height: 100%; max-width: 100%; margin: auto 0; cursor: pointer;}
+.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb video{position: absolute; left: 50%; right: 0; top: 50%; bottom: auto; transform: translate(-50%, -50%); width: auto; height: auto; max-height: 100%; max-width: 100%; margin: auto 0; cursor: pointer;}
 .modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb{position:relative; background-color:#ddd; /*background-position:center center; background-repeat:no-repeat; background-size:contain;*/}
 .modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb.nodata:before{display:block; content:''; position:absolute; top:0; left:0; width:100%; height:100%; background-color:rgba(0,0,0,.5); z-index:1;}
 .modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb.nodata:after{display:block; content:'리뷰에 등록된 이미지가 없습니다.'; position:absolute; top:50%; left:50%; width:90%; font-size:1.2rem; color:#fff; text-align:center; z-index:2; -webkit-transform:translate(-50%, -50%); transform:translate(-50%, -50%);}
 .modal.pd_pop[class*="reviewdetail_pop"] .area_slider .swiper-pagination {display: inline-block; width: auto; padding: 0.2rem 1rem; border-radius: 2rem; font-size: 1.2rem; color: #fff; background-color: rgba(34,34,34,.5);}
 .modal.pd_pop[class*="reviewdetail_pop"] .area_slider .swiper-pagination::before {content: '';display: block;height: 2.0rem;margin-top: -2.0rem;visibility: hidden;}
-.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .swiper-pagination-fraction {position: absolute; left: 50%; bottom: 6rem; margin:0; -webkit-transform: translateX(-50%); transform: translateX(-50%);}
+.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .swiper-pagination-fraction {position: absolute; left: 50%; bottom: 2.5rem; margin:0; -webkit-transform: translateX(-50%); transform: translateX(-50%);}
+
+.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .thumb.mov {position: relative; }
+.modal.pd_pop[class*="reviewdetail_pop"] .area_slider .btn_play{background: rgb(246 55 55 / 0%);  position: absolute;top: 0;left: 0;width: 100%;height: 100%;border: none;color: transparent;font-size: 0.1rem;z-index: 2;}
+
 .modal.pd_pop[class*="reviewdetail_pop"] .area_rv_all{padding-top:1rem;}
 .modal.pd_pop[class*="reviewdetail_pop"] .area_rv_all .review_list > ul > li {padding-top:1.5rem;}
 .modal.pd_pop[class*="reviewdetail_pop"] .btn_review_open{text-indent:-999999px; background:url(/images/mo/ico_pop_arrow.png) center center no-repeat; background-size:3rem 1rem;}
@@ -1436,17 +1439,20 @@
 .modal.pd_pop[class*="reviewdetail_pop"] .pd_review .area_rv_all .review_list.active .response_box2{display:block;}
 .modal.pd_pop[class*="reviewdetail_pop"] .pd_review .area_rv_all .review_list.active .reply_box{display:block;}
 .modal.pd_pop.pd_photoreviewdetail_pop #btn_more_photoreview{display:inline-block; margin-right:1rem; margin-top: -0.3rem; width:2rem; height:2rem; background:url(/images/mo/ico_thumblist.png) center center no-repeat; background-size:contain; vertical-align:middle;}
-.modal.pd_pop.pd_photoreviewdetail_pop .modal-body .pop_cont{padding-top:0; height:100%;}
+.modal.pd_pop.pd_photoreviewdetail_pop .modal-body .pop_cont{padding-top:0; padding-bottom: 18rem; height:100%;}
 .modal.pd_pop.pd_photoreviewdetail_pop .modal-body .pop_cont .area_slider{height:100%;}
 .modal.pd_pop.pd_photoreviewdetail_pop .modal-body .pop_cont .area_slider .swiper-container{height:100%;}
 /*.modal.pd_pop.pd_bestreviewdetail_pop .pop_cont .nodata{padding-top:0;}*/
-.modal.photo_comment_popup.pd_bestreviewdetail_pop .modal-body .pop_cont{height:calc(var(--vh, 1vh) * 100); padding-top:0}
-.modal.photo_comment_popup.pd_bestreviewdetail_pop .modal-body .pop_cont .area_slider{position: relative;height: 100%;overflow: hidden;}
+.modal.photo_comment_popup.pd_bestreviewdetail_pop .modal-body .pop_cont{height:calc(var(--vh, 1vh) * 100); padding-top:0; padding-bottom: 18rem;}
+.modal.photo_comment_popup.pd_bestreviewdetail_pop .modal-body .pop_cont .area_slider{height: 100%;overflow: hidden;}
 .modal.photo_comment_popup.pd_bestreviewdetail_pop .modal-body .pop_cont .area_slider .swiper-container{height:100%;}
 .modal.photo_comment_popup.pd_bestreviewdetail_pop .pop_detail .review_list{border:0 none;}
 .modal.photo_comment_popup.pd_photoreviewdetail_pop .pop_detail .review_list{border:0 none;}
 .modal.photo_comment_popup.pd_bestreviewdetail_pop .pop_detail .review_list ul li{padding:0;}
-
+.modal.photo_comment_popup .swiper-button-next {top: 35%; margin-top: 0; right: 2rem;}
+.modal.photo_comment_popup .swiper-button-prev {top: 35%; margin-top: 0; left: 2rem;}
+.modal.photo_comment_popup .swiper-button-prev:after {content:''; display:block; position:absolute; top:0px; left:0; width:3.4rem; height:3.4rem; border:0.2rem solid #a7a7a7; border-width:0.2rem 0.2rem 0 0; transform:rotate(-135deg); -webkit-transform:rotate(-135deg);}
+.modal.photo_comment_popup .swiper-button-next:after {content:''; display:block; position:absolute; top:0px; right:0; width:3.4rem; height:3.4rem; border:0.2rem solid #a7a7a7; border-width:0.2rem 0.2rem 0 0; transform:rotate(45deg); -webkit-transform:rotate(45deg);}
 
 
 /* 리뷰 리스트 */

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

@@ -1881,23 +1881,24 @@ background-size:100%;}
 .od .paymethod_box .sel_method:after {content:''; display: block; clear:both;}
 .od .paymethod_box .sel_method li {width: 50%; float:left; margin-bottom: 1.5rem;}
 
-.odPayment .fold_cont .area_overseas .form_field {margin-top: 2.4rem;}
-.odPayment .fold_cont .area_overseas .form_field input[type="radio"] + label {margin-bottom: 1.5rem;}
-.odPayment .fold_cont .area_overseas .form_field > div {}
-.odPayment .fold_cont .area_overseas .info_box {font-size:1.6rem;}
-.odPayment .fold_cont .area_overseas .info_box .t_err {margin-top:0.5rem; font-size:1.1rem;}
-.odPayment .fold_cont .area_overseas .info_box.overs1 {margin-right:0}
-.odPayment .fold_cont .area_overseas .info_box.overs1 .recipient {margin-bottom: 0.5rem; font-size: 1.3rem;}
-.odPayment .fold_cont .area_overseas .info_box.overs1 .recipient em {font-weight: 200;}
-.odPayment .fold_cont .area_overseas .info_box.overs1 .input_wrap {display: block; width: 100%;}
-.odPayment .fold_cont .area_overseas .info_box.overs1 .input_wrap .form_control {width: 100%; color: #222;}
-.odPayment .fold_cont .area_overseas .info_box.overs2 {margin-top:0; margin-right:0; color:#666; font-size: 1.4rem;}
-.odPayment .fold_cont .area_overseas .info_box .agree_overs {margin-top:1.5rem; width:100%; word-break:keep-all;}
-.odPayment .fold_cont .area_overseas .info_box .agree_overs label {line-height:1.4; color:#666; font-size: 1.3rem; text-align: left;}
-.odPayment .fold_cont .area_overseas .info_box .agree_overs label::before,
-.odPayment .fold_cont .area_overseas .info_box .agree_overs label::after {top:1rem !important; transform:translateY(0%) !important;}
-.odPayment .agree_insurance, .od .agree_insurance {display:none; margin:1rem 0 0;}
-.odPayment .agree_insurance .form_field .agree_insurance label, .od .form_field .agree_insurance label {font-size: 1.3rem;}
+.od .fold_cont .area_overseas .form_field {margin-top: 2.4rem;}
+.od .fold_cont .area_overseas .form_field input[type="radio"] + label {margin-bottom: 1.5rem;}
+.od .fold_cont .area_overseas .form_field > div {}
+.od .fold_cont .area_overseas .info_txt {background: #fff6f2; margin-top: 0;}
+.od .fold_cont .area_overseas .info_box {font-size:1.6rem;}
+.od .fold_cont .area_overseas .info_box .t_err {margin-top:0.5rem; font-size:1.1rem;}
+.od .fold_cont .area_overseas .info_box.overs1 {margin-right:0}
+.od .fold_cont .area_overseas .info_box.overs1 .recipient {margin-bottom: 0.5rem; font-size: 1.3rem;}
+.od .fold_cont .area_overseas .info_box.overs1 .recipient em {font-weight: 200;}
+.od .fold_cont .area_overseas .info_box.overs1 .input_wrap {display: block; width: 100%;}
+.od .fold_cont .area_overseas .info_box.overs1 .input_wrap .form_control {width: 100%; color: #222;}
+.od .fold_cont .area_overseas .info_box.overs2 {margin-top:0; margin-right:0; color:#666; font-size: 1.4rem;}
+.od .fold_cont .area_overseas .info_box .agree_overs {margin-top:1.5rem; width:100%; word-break:keep-all;}
+.od .fold_cont .area_overseas .info_box .agree_overs label {line-height:1.4; color:#666; font-size: 1.3rem; text-align: left;}
+.od .fold_cont .area_overseas .info_box .agree_overs label::before,
+.od .fold_cont .area_overseas .info_box .agree_overs label::after {top:1rem !important; transform:translateY(0%) !important;}
+.od .agree_insurance, .od .agree_insurance {display:none; margin:1rem 0 0;}
+.od .agree_insurance .form_field .agree_insurance label, .od .form_field .agree_insurance label {font-size: 1.3rem;}
 .od .agree_insurance p {margin:1rem 0; font-weight: 200; font-size: 1.2rem;}
 .od .agree_insurance .btn {height:auto; padding:1rem 1.3rem; font-weight: 300; font-size: 1.3rem;}
 .od .foldGroup .fold_head .data .total_gift,