Merge branch 'develop' into card007

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

@@ -1433,10 +1433,12 @@ public class TsfGoodsController extends TsfBaseController {
 		// 키전체 
 		Collection<CommonCode> reviewHeightList = new ArrayList<CommonCode>();
 		//log.info("goods.getItemkindCd().substring(0, 2) => {} ", goods.getItemkindCd().substring(0, 2));
-		if (itemList.contains(goods.getItemkindCd().substring(0, 2))) {
-			reviewHeightList = rendererService.getAvailCommonCodeList("G091");
-		} else {
-			reviewHeightList = rendererService.getAvailCommonCodeList("G090");
+		if (goods.getItemkindCd().length() > 1) {
+			if (itemList.contains(goods.getItemkindCd().substring(0, 2))) {
+				reviewHeightList = rendererService.getAvailCommonCodeList("G091");
+			} else {
+				reviewHeightList = rendererService.getAvailCommonCodeList("G090");
+			}
 		}
 
 		// 상품평 키
@@ -1445,10 +1447,12 @@ public class TsfGoodsController extends TsfBaseController {
 		// 유야동 몸무게 공통코드 G093, 성인 몸무게 공통코드 G092
 		// 몸무게
 		Collection<CommonCode> reviewWeightList = new ArrayList<CommonCode>();
-		if (itemList.contains(goods.getItemkindCd().substring(0, 2))) {
-			reviewWeightList = rendererService.getAvailCommonCodeList("G093");
-		} else {
-			reviewWeightList = rendererService.getAvailCommonCodeList("G092");
+		if (goods.getItemkindCd().length() > 1) {
+			if (itemList.contains(goods.getItemkindCd().substring(0, 2))) {
+				reviewWeightList = rendererService.getAvailCommonCodeList("G093");
+			} else {
+				reviewWeightList = rendererService.getAvailCommonCodeList("G092");
+			}
 		}
 
 		// 상품평 몸무게

src/main/webapp/WEB-INF/views/mob/common/advertisements/GoodsDetailScriptsMob.html

@@ -51,6 +51,36 @@
 			collect: {},
 			conversion: { product: [] }
 		};
+		
+		// 광고 스크립트용
+		var goodsNavigation = [[${goodsNavigation}]];
+		var cate1No = "";
+		var cate2No = "";
+		var cate3No = "";
+		var cate4No = "";
+		var cate5No = "";
+		var cate1Nm = "";
+		var cate2Nm = "";
+		var cate3Nm = "";
+		var cate4Nm = "";
+		var cate5Nm = "";
+		if (!gagajf.isNull(goodsNavigation)) {
+			cate1No = goodsNavigation.cate1No;
+			cate2No = goodsNavigation.cate2No;
+			cate3No = goodsNavigation.cate3No;
+			cate4No = goodsNavigation.cate4No;
+			cate5No = goodsNavigation.cate5No;
+			cateNm  = cate3No;
+			cate1Nm = goodsNavigation.cate1Nm;
+			cate2Nm = goodsNavigation.cate2Nm;
+			cate3Nm = goodsNavigation.cate3Nm;
+			cate4Nm = goodsNavigation.cate4Nm;
+			cate5Nm = goodsNavigation.cate5Nm;
+		}
+		// 광고 스크립트용
+
+		var snsGoodsImg = _uploadGoodsUrl + "/" + [[${goodsInfo.sysImgNm}]];
+		
 		ENP_VAR.collect.productCode = [[${goodsInfo.goodsCd}]];
 		ENP_VAR.collect.productName = [[${goodsInfo.goodsFullNm}]];
 		ENP_VAR.collect.price = [[${goodsInfo.listPrice}]];

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

@@ -117,22 +117,24 @@
 						<dt>쇼핑혜택</dt>
 						<dd>
 							<th:block th:if="${goodsCoupon1List != null and !goodsCoupon1List.empty}">
-							<span th:each="goodsCoupon, status : ${goodsCoupon1List}" th:if="${status.first}"><em>
-								<th:block th:if="${goodsCoupon.dcWay == 'G240_10'}" th:text="|${#numbers.formatInteger(goodsCoupon.dcVal, 0,'COMMA')}원|"></th:block>
-								<th:block th:unless="${goodsCoupon.dcWay == 'G240_10'}" th:text="|${goodsCoupon.dcVal}%|"></th:block>
-								</em> 즉시할인</span>
+								<span th:each="goodsCoupon, status : ${goodsCoupon1List}" th:if="${status.first}"><em>
+									<th:block th:if="${goodsCoupon.dcWay == 'G240_10'}" th:text="|${#numbers.formatInteger(goodsCoupon.dcVal, 0,'COMMA')}원|"></th:block>
+									<th:block th:unless="${goodsCoupon.dcWay == 'G240_10'}" th:text="|${goodsCoupon.dcVal}%|"></th:block>
+									</em> 즉시할인
+								</span>
 							</th:block> 
 							<th:block th:if="${goodsCouponList != null and !goodsCouponList.empty}">
-							<span th:each="goodsCoupon, status : ${goodsCouponList}" th:if="${status.first}">최대 <em>
-							<th:block th:if="${goodsCoupon.dcWay == 'G240_10'}" th:text="|${#numbers.formatInteger(goodsCoupon.dcVal, 0,'COMMA')}원|"></th:block>
-							<th:block th:unless="${goodsCoupon.dcWay == 'G240_10'}" th:text="|${goodsCoupon.dcVal}%|"></th:block>
-							</em> 쿠폰 할인</span>
+								<span th:each="goodsCoupon, status : ${goodsCouponList}" th:if="${status.first}">최대 <em>
+									<th:block th:if="${goodsCoupon.dcWay == 'G240_10'}" th:text="|${#numbers.formatInteger(goodsCoupon.dcVal, 0,'COMMA')}원|"></th:block>
+									<th:block th:unless="${goodsCoupon.dcWay == 'G240_10'}" th:text="|${goodsCoupon.dcVal}%|"></th:block>
+									</em> 쿠폰 할인
+								</span>
 							</th:block> 
 							<th:block th:if="${tmtbList != null and !tmtbList.empty}">
-							<span th:each="tmtb, status : ${tmtbList}" th:if="${status.first}">
-								<em><th:block th:text="${#numbers.formatInteger(tmtb.sectionVal, 0,'COMMA')}"></th:block><th:block th:text="${(tmtb.sectionGb == 'G810_10')? '개':'금액'}"></th:block></em> 이상 구매 시 
-								<em><th:block th:text="${#numbers.formatInteger(tmtb.dcVal, 0,'COMMA')}"></th:block><th:block th:text="${(tmtb.dcWay == 'G240_10')? '원':'%'}"></th:block></em></em> 할인
-							</span>
+								<span th:each="tmtb, status : ${tmtbList}" th:if="${status.first}">
+									<em><th:block th:text="${#numbers.formatInteger(tmtb.sectionVal, 0,'COMMA')}"></th:block><th:block th:text="${(tmtb.sectionGb == 'G810_10')? '개':'금액'}"></th:block></em> 이상 구매 시 
+									<em><th:block th:text="${#numbers.formatInteger(tmtb.dcVal, 0,'COMMA')}"></th:block><th:block th:text="${(tmtb.dcWay == 'G240_10')? '원':'%'}"></th:block></em></em> 할인
+								</span>
 							</th:block>
 							<span th:if="${freeGoodsList != null and !freeGoodsList.empty}">
 							<th:block th:each="freeGoods, status : ${freeGoodsList}" th:if="${status.first}">
@@ -140,7 +142,7 @@
 							<button type="button" id="btn_bnfShopping_pop" class="btn_popup" th:onclick="cfGoodsShopBenefitInfo([[${goodsInfo.goodsCd}]])"><span>자세히</span></button>
 						</dd>
 					</dl>
-					<dl class="bnf_card">
+					<dl class="bnf_card"  th:if="${cardInfoList != null and !cardInfoList.empty}">
 						<dt>카드혜택</dt>
 						<dd>
 							<th:block th:each="cardInfo, status : ${cardInfoList}">

src/main/webapp/WEB-INF/views/web/goods/GoodsDealDetailFormWeb.html

@@ -1588,9 +1588,6 @@
 	if (typeof (params.colorCd) != 'undefined') snsUrl += "&colorCd=" + params.colorCd;
 	var snsGoodsFullNm = [[${goodsInfo.goodsFullNm}]];
 	
-	// 2021.08.25 sns 공유 이미지 수정
-	snsGoodsImg = "https:" + snsGoodsImg;
-	
 	<!-- 페이스북 카카오스토리 연동 관련 메타태그 -->
 	$("meta[property='og:url']").attr('content', snsUrl);
 	$("meta[property='og:title']").attr('content', snsGoodsFullNm);

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

@@ -1668,7 +1668,7 @@ button.alertCls {-webkit-appearance: none;padding: 0;cursor: pointer;background:
 
 /* .popWrap, .popup */
 .popWrap{position: relative; height: 100%; padding: 3.0rem 0; background-color: #fff;}
-.popup{display: none; position: fixed; left: 0; top: 5.5rem; width: 100%; height: auto; background-color: #ffffff; padding: 0; z-index: 80;}
+.popup{display: none; position: fixed; left: 0; top: 5.5rem; width: 100%; height: auto; background-color: #ffffff; padding: 0; z-index: 80;overscroll-behavior-y: none;}
 .popup::before{content: ''; display: block; position: fixed; left: 0; top: 0; right: 0; bottom: 0; background-color: rgba(0, 0, 0, 0.5);}
 .popup .btn_popClose{position: absolute; top: -4.5rem; right: 1.5rem; width: 3.5rem; height: 3.5rem; background-color: black; z-index: 10;}
 .popup .btn_popClose span{display: block; width: 2.4rem; height: 2.4rem; margin: 0 auto; position: relative;}
@@ -1681,13 +1681,13 @@ button.alertCls {-webkit-appearance: none;padding: 0;cursor: pointer;background:
 .blocker{position:fixed;top:0;right:0;bottom:0;left:0;width:100%;height:100%;overflow:auto;z-index:999;padding:0;box-sizing:border-box;background-color:#000;background-color:rgba(0,0,0,0.75);text-align:center;}
 .blocker:before{content:"";display:inline-block;height:100%;vertical-align:middle;margin-right:-0.05em;}
 .blocker.behind{background-color:transparent;}
-.modal{display:none; vertical-align:middle;position:relative;z-index:2;max-width:96.0rem;box-sizing:border-box;width:90%;background:#fff;padding:0;text-align:left; -webkit-box-shadow:0 0 1.0rem #000;-moz-box-shadow:0 0 1.0rem #000;-o-box-shadow:0 0 1.0rem #000;-ms-box-shadow:0 0 1.0rem #000;box-shadow:0 0 1.0rem #000;}
+.modal{display:none; vertical-align:middle;position:relative;z-index:2;max-width:96.0rem;box-sizing:border-box;width:90%;background:#fff;padding:0;text-align:left; -webkit-box-shadow:0 0 1.0rem #000;-moz-box-shadow:0 0 1.0rem #000;-o-box-shadow:0 0 1.0rem #000;-ms-box-shadow:0 0 1.0rem #000;box-shadow:0 0 1.0rem #000;overscroll-behavior-y: none;}
 .modal a.close-modal{position: absolute;top:2.4rem;right:2.1rem;display:block;width:1.7rem;height:1.7rem;text-indent:-999.9rem;background-size:contain;background-repeat:no-repeat;background-position:center center;background-image:url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADwAAAA8CAYAAAA6/NlyAAAAAXNSR0IArs4c6QAAA3hJREFUaAXlm8+K00Acx7MiCIJH/yw+gA9g25O49SL4AO3Bp1jw5NvktC+wF88qevK4BU97EmzxUBCEolK/n5gp3W6TTJPfpNPNF37MNsl85/vN/DaTmU6PknC4K+pniqeKJ3k8UnkvDxXJzzy+q/yaxxeVHxW/FNHjgRSeKt4rFoplzaAuHHDBGR2eS9G54reirsmienDCTRt7xwsp+KAoEmt9nLaGitZxrBbPFNaGfPloGw2t4JVamSt8xYW6Dg1oCYo3Yv+rCGViV160oMkcd8SYKnYV1Nb1aEOjCe6L5ZOiLfF120EjWhuBu3YIZt1NQmujnk5F4MgOpURzLfAwOBSTmzp3fpDxuI/pabxpqOoz2r2HLAb0GMbZKlNV5/Hg9XJypguryA7lPF5KMdTZQzHjqxNPhWhzIuAruOl1eNqKEx1tSh5rfbxdw7mOxCq4qS68ZTjKS1YVvilu559vWvFHhh4rZrdyZ69Vmpgdj8fJbDZLJpNJ0uv1cnr/gjrUhQMuI+ANjyuwftQ0bbL6Erp0mM/ny8Fg4M3LtdRxgMtKl3jwmIHVxYXChFy94/Rmpa/pTbNUhstKV+4Rr8lLQ9KlUvJKLyG8yvQ2s9SBy1Jb7jV5a0yapfF6apaZLjLLcWtd4sNrmJUMHyM+1xibTjH82Zh01TNlhsrOhdKTe00uAzZQmN6+KW+sDa/JD2PSVQ873m29yf+1Q9VDzfEYlHi1G5LKBBWZbtEsHbFwb1oYDwr1ZiF/2bnCSg1OBE/pfr9/bWx26UxJL3ONPISOLKUvQza0LZUxSKyjpdTGa/vDEr25rddbMM0Q3O6Lx3rqFvU+x6UrRKQY7tyrZecmD9FODy8uLizTmilwNj0kraNcAJhOp5aGVwsAGD5VmJBrWWbJSgWT9zrzWepQF47RaGSiKfeGx6Szi3gzmX/HHbihwBser4B9UJYpFBNX4R6vTn3VQnez0SymnrHQMsRYGTr1dSk34ljRqS/EMd2pLQ8YBp3a1PLfcqCpo8gtHkZFHKkTX6fs3MY0blKnth66rKCnU0VRGu37ONrQaA4eZDFtWAu2fXj9zjFkxTBOo8F7t926gTp/83Kyzzcy2kZD6xiqxTYnHLRFm3vHiRSwNSjkz3hoIzo8lCKWUlg/YtGs7tObunDAZfpDLbfEI15zsEIY3U/x/gHHc/G1zltnAgAAAABJRU5ErkJggg=='); z-index: 98; background-image: url('//image.istyle24.com/Style24/images/mo/ico_pop_cls.png');}
 
 .modal .modal-header{margin-top: 0;margin-bottom: 0; padding: 2.4rem 1.88rem 2.0rem;}
 .modal .modal-header > *{font-size: 1.7rem;font-weight: 400;}
 .modal .modal-body{box-sizing: border-box; padding: 0rem 1.33rem;}
-.modal .modal-body .pop_cont{overflow: auto;max-height: 45.0rem; font-size: 1.6rem; line-height: 1.62; font-weight: 200; color:#666;}
+.modal .modal-body .pop_cont{overflow: auto;max-height: 45.0rem; font-size: 1.6rem; line-height: 1.62; font-weight: 200; color:#666;overscroll-behavior-y: none;}
 .modal .modal-body .fx_r {position: fixed;right: 0;top: auto;bottom: auto;left: auto;}
 .modal .modal-footer{margin-top: 3.0rem;}
 .modal .modal-footer .btn{width: 100%; border-width: 0;}

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

@@ -1020,7 +1020,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .my .ship_info dl > div.ship_request .ship_option {margin-top: 0.5rem;}
 .my .ship_info dl > div.ship_request span {display: inline-block; font-weight: 300; color: #222;}
 .my .ship_info div:after {content:''; display: block; clear:both;}
-.my .ship_info div dt, .my .ship_info div dd {float:left; color: #222; font-weight: 300;}
+.my .ship_info div dt, .my .ship_info div dd {float:left; color: #222; font-weight: 300;word-break: break-all;}
 .my .ship_info div.ship_request dt {position: relative; margin-right: 1rem; padding-right: 1rem; font-weight: 200;}
 .my .ship_info div.ship_request dt:after {content:''; position: absolute; top: 0.2rem; right: 0; width: 0.1rem; height: 1.2rem; background: #ddd;}
 .my .ship_info div.ship_request.ship_select {margin-top: 1.5rem;}