Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

src/main/java/com/style24/persistence/domain/GoodsCompose.java

@@ -38,6 +38,9 @@ public class GoodsCompose extends TscBaseDomain {
 	private String compsGoodsFullNm;
 	private String colorCd;
 
+	private String goodsGbNm;
+	private String originNm;
+	private String brandGroupNm;
 	private String selfGoodsYn;
 	private String supplyCompCd;
 

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

@@ -885,6 +885,9 @@
 		     , DATE_FORMAT(G.SELL_EDDT ,'%Y%m%d%H%i%S') AS SELL_EDDT
 		     , (SELECT TI.SIZE_GB FROM TB_ITEMKIND TI WHERE TI.ITEMKIND_CD = G.ITEMKIND_CD) AS SIZE_GB
 		     , A.COMPS_CURR_PRICE
+		     , FN_GET_CODE_NM('G073',G.GOODS_GB) AS GOODS_GB_NM
+		     , FN_GET_CODE_NM('G076',G.ORIGIN_CD) AS ORIGIN_NM
+		      , (CASE WHEN D.DISP_NM_LANG = 'EN' THEN D.BRAND_GROUP_ENM ELSE D.BRAND_GROUP_KNM END) AS BRAND_GROUP_NM
 		FROM TB_GOODS_COMPOSE A
 		INNER JOIN TB_GOODS G ON A.COMPS_GOODS_CD = G.GOODS_CD
 		                      AND G.SELF_MALL_YN = 'Y' -- 자사몰 노출
@@ -893,6 +896,8 @@
 		INNER JOIN TB_SITE_BRAND SB ON B.BRAND_CD  = SB.BRAND_CD
 		                            AND SB.USE_YN = 'Y'
 		                            AND SB.SITE_CD = #{siteCd}
+		INNER JOIN TB_BRAND_GROUP D ON B.BRAND_GROUP_NO = D.BRAND_GROUP_NO
+		                            AND D.USE_YN = 'Y'
 		WHERE A.GOODS_CD = #{goodsCd}
 		AND A.GOODS_TYPE = 'G056_S'
 		AND A.USE_YN = 'Y'

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

@@ -381,6 +381,7 @@
 					</p>
 					<div class="area_infotbl">
 						<span class="title">상품기본정보</span>
+						<th:block th:if="${goodsInfo.goodsType == 'G056_N'} ">
 						<div class="tbl type1">
 							<table>
 								<tbody>
@@ -400,10 +401,14 @@
 										<th>상품명</th>
 										<td th:text="${goodsInfo.goodsNm}">남성 테이퍼드 핏 겨울 기모면 스판 올 밴딩 팬츠</td>
 									</tr>
+									<th:block th:if="${goodsNotiList != null and !goodsNotiList.empty}">
+									<th:block th:each="goodsNoti, status : ${goodsNotiList}"  th:if="${goodsNoti.niItemCd == 'G005_005'}">
 									<tr>
-										<th>제조자</th>
-										<td>한세엠케이(주)==============>노출필요성 확인</td>
+										<th th:text="${goodsNoti.niItemNm}">제조사</th>
+										<td th:text="${goodsNoti.niContent}"></td>
 									</tr>
+									</th:block>
+									</th:block>
 									<tr>
 										<th>제조국</th>
 										<td th:text="${goodsInfo.originNm}">베트남</td>
@@ -411,6 +416,47 @@
 								</tbody>
 							</table>
 						</div>
+						</th:block>
+						<th:block th:unless="${goodsInfo.goodsType == 'G056_N'} ">
+						<th:block th:if="${goodsComposeList != null and !goodsComposeList.empty}">
+						<th:block th:each="goodsCompose, status : ${goodsComposeList}">
+						<div class="tbl type1">
+							<table>
+								<tbody>
+									<tr>
+										<th>상품코드</th>
+										<td th:text="${goodsCompose.compsGoodsCd}">14443216</td>
+									</tr>
+									<tr>
+										<th>상품구분</th>
+										<td th:text="${goodsCompose.goodsGbNm}">병행수입</td>
+									</tr>
+									<tr>
+										<th>브랜드</th>
+										<td th:text="${goodsCompose.brandGroupNm}">TBJ</td>
+									</tr>
+									<tr>
+										<th>상품명</th>
+										<td th:text="${goodsCompose.compsGoodsNm}">남성 테이퍼드 핏 겨울 기모면 스판 올 밴딩 팬츠</td>
+									</tr>
+									<th:block th:if="${goodsCompose.goodsNotiList != null and !goodsCompose.goodsNotiList.empty}">
+									<th:block th:each="goodsNoti, status : ${goodsCompose.goodsNotiList}"  th:if="${goodsNoti.niItemCd == 'G005_005'}">
+									<tr>
+										<th th:text="${goodsNoti.niItemNm}">제조사</th>
+										<td th:text="${goodsNoti.niContent}"></td>
+									</tr>
+									</th:block>
+									</th:block>
+									<tr>
+										<th>제조국</th>
+										<td th:text="${goodsCompose.originNm}">베트남</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						</th:block>
+						</th:block>
+						</th:block>
 						<p class="t_info dot_info mt10">
 							주문제작 상품의 경우 주문 후 제작되어 판매되는 상품으로 제작 시점부터 반품/교환이 어려울 수 있습니다.
 						</p>

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

@@ -212,10 +212,14 @@
 							<th>상품명</th>
 							<td th:text="${goodsInfo.goodsNm}">남성 테이퍼드 핏 겨울 기모면 스판 올 밴딩 팬츠</td>
 						</tr>
-						<tr>
-							<th>제조자</th>
-							<td >한세엠케이(주)==============>노출필요성 확인</td>
-						</tr>
+						<th:block th:if="${goodsInfo.goodsType == 'G056_N' and goodsNotiList != null and !goodsNotiList.empty}">
+									<th:block th:each="goodsNoti, status : ${goodsNotiList}"  th:if="${goodsNoti.niItemCd == 'G005_005'}">
+									<tr>
+										<th th:text="${goodsNoti.niItemNm}">제조사</th>
+										<td th:text="${goodsNoti.niContent}"></td>
+									</tr>
+									</th:block>
+									</th:block>
 						<tr>
 							<th>제조국</th>
 							<td th:text="${goodsInfo.originNm}">베트남</td>

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

@@ -120,7 +120,7 @@
 								<p>
 									<span class="tit">남은시간</span>
 									<span class="timer">
-										<em id="d-days">0</em>
+										<em id="d-days" style="display:none;">0</em>
 										<em id="d-hours">0</em>
 										<em id="d-minutes">0</em>
 										<em id="d-seconds">0</em>
@@ -623,6 +623,7 @@
 					</div>
 					<div class="area_infotbl">
 						<span class="title">상품기본정보</span>
+						<th:block th:if="${goodsInfo.goodsType == 'G056_N'} ">
 						<div class="tbl type1 mt30">
 							<table>
 								<tbody>
@@ -642,10 +643,14 @@
 										<th>상품명</th>
 										<td th:text="${goodsInfo.goodsNm}">남성 테이퍼드 핏 겨울 기모면 스판 올 밴딩 팬츠</td>
 									</tr>
+									<th:block th:if="${goodsNotiList != null and !goodsNotiList.empty}">
+									<th:block th:each="goodsNoti, status : ${goodsNotiList}"  th:if="${goodsNoti.niItemCd == 'G005_005'}">
 									<tr>
-										<th>제조자</th>
-										<td >한세엠케이(주)==============>노출필요성 확인</td>
+										<th th:text="${goodsNoti.niItemNm}">제조사</th>
+										<td th:text="${goodsNoti.niContent}"></td>
 									</tr>
+									</th:block>
+									</th:block>
 									<tr>
 										<th>제조국</th>
 										<td th:text="${goodsInfo.originNm}">베트남</td>
@@ -653,6 +658,47 @@
 								</tbody>
 							</table>
 						</div>
+						</th:block>
+						<th:block th:unless="${goodsInfo.goodsType == 'G056_N'} ">
+						<th:block th:if="${goodsComposeList != null and !goodsComposeList.empty}">
+						<th:block th:each="goodsCompose, status : ${goodsComposeList}">
+						<div class="tbl type1 mt30">
+							<table>
+								<tbody>
+									<tr>
+										<th>상품코드</th>
+										<td th:text="${goodsCompose.compsGoodsCd}">14443216</td>
+									</tr>
+									<tr>
+										<th>상품구분</th>
+										<td th:text="${goodsCompose.goodsGbNm}">병행수입</td>
+									</tr>
+									<tr>
+										<th>브랜드</th>
+										<td th:text="${goodsCompose.brandGroupNm}">TBJ</td>
+									</tr>
+									<tr>
+										<th>상품명</th>
+										<td th:text="${goodsCompose.compsGoodsNm}">남성 테이퍼드 핏 겨울 기모면 스판 올 밴딩 팬츠</td>
+									</tr>
+									<th:block th:if="${goodsCompose.goodsNotiList != null and !goodsCompose.goodsNotiList.empty}">
+									<th:block th:each="goodsNoti, status : ${goodsCompose.goodsNotiList}"  th:if="${goodsNoti.niItemCd == 'G005_005'}">
+									<tr>
+										<th th:text="${goodsNoti.niItemNm}">제조사</th>
+										<td th:text="${goodsNoti.niContent}"></td>
+									</tr>
+									</th:block>
+									</th:block>
+									<tr>
+										<th>제조국</th>
+										<td th:text="${goodsCompose.originNm}">베트남</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+						</th:block>
+						</th:block>
+						</th:block>
 						<p class="t_info dot_info mt20">
 							주문제작 상품의 경우 주문 후 제작되어 판매되는 상품으로 제작 시점부터 반품/교환이 어려울 수 있습니다.
 						</p>
@@ -1471,7 +1517,8 @@
 					if (Number(days) > 0 ){
 						$('#d-days').html(days);	
 					}else{
-						$('#d-days').css('display','none');
+						//$('#d-days').css('display','none');
+						$('#d-days').remove();
 					}
 					$('#d-hours').html(hours);
 					$('#d-minutes').html(minutes);

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

@@ -802,6 +802,13 @@ content: "〉";font-size: 12px;padding-left: 8px;
 .itemPic .pd_mov {z-index: 3;height: 100%;}
 .itemPic .pd_img {z-index: 2;transition: 0.5s;}
 /* .itemPic .pd_img {position: absolute;width: 100%;width: auto; height: auto;max-height: 500px;top: 50%;left: 50%;transform: translate(-50%,-50%);} */
+.itemOpt{z-index:10;position: absolute;bottom: -120px; left: 0; right: 0; width: 100%; height:111px;padding: 32px 0; text-align:center; color: #fff; background: rgb(0 0 0 / 0.8); }
+.itemOpt p{font-size: 12px;line-height: 1.2;padding-bottom: 15px;}
+.itemOpt ul{display: block;margin: 0 auto;width: auto;}
+.itemOpt ul li{font-size: 14px;line-height: 1.2;display: inline-block;margin-left: 10px;}
+.itemOpt ul .none{opacity: 0.5;text-decoration: line-through;}
+.itemOpt ul li:first-child{margin-left: 0px;}
+.itemOpt .exc{font-size: 14px;line-height: 1.2;display: inline-block;margin-left: 10px;}
 .itemBrand {margin: 0px 5px 12px;line-height: 12px;font-size: 12px;font-weight: 300;color: rgb(137, 137, 137);height:12px;}
 .itemComment{margin:20px 5px 0px;line-height: 1; font-size: 14px;font-weight: 300;color: #fd4802;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
 .itemName {	margin: 0px 5px 15px;line-height:20px;font-size: 14px;font-weight: 200;color:#222; height:40px;}

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

@@ -580,13 +580,14 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .filter_content .sort.tap02 {padding-left:0; padding-right:0;}
 .filter_content .sort.tap02 ul::after {content:''; display: block; clear:both;}
 .filter_content .sort.tap02 ul li {float:left; padding-left:40px; padding-right:40px; margin-bottom:20px;}
-.filter_content .sort.tap03 ul li {border-bottom: 1px solid #ccc;}
+.filter_content .sort.tap03 ul li {position: relative; border-bottom: 1px solid #ccc; padding-left: 100px;}
 .filter_content .sort.tap03 ul li::after {content: ''; display: block; clear: both;}
 .filter_content .sort.tap03 ul li:first-child {padding-bottom: 30px;}
+.filter_content .sort.tap03 ul li:first-child strong {top: 2px;}
 .filter_content .sort.tap03 ul li:nth-child(2) {padding-top: 30px;padding-bottom: 30px;}
 .filter_content .sort.tap03 ul li:last-child {padding-top: 30px; border: none;}
-.filter_content .sort.tap03 ul li strong {/*margin-right:40px;*/width:100px;color:#222; font-weight:300; height: 21px;float: left;}
-.filter_content .sort.tap03 ul li label {color:#666; margin-right:40px; line-height: 1.4; display: inline-block; word-break:keep-all;position:relative;}
+.filter_content .sort.tap03 ul li strong {/*margin-right:40px;*/width:100px;color:#222; font-weight:300; height: 21px;float: left; position: absolute; top: 32px; left: 0;}
+.filter_content .sort.tap03 ul li label {color:#666; margin-right:40px; margin-bottom: 3px; line-height: 1.4; display: inline-block; word-break:keep-all;position:relative;}
 .filter_content .sort.tap03 ul li label:last-child {margin-right:0}
 .filter_content .sort.tap03 ul li label span {}
 .filter_content .sort.tap03 ul li .size_btn,
@@ -1905,7 +1906,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.cmt_wrap .pics .picsThumbs {max-width: 100%; max-height: 100%;}
 	.cmt_wrap .cmt_write .cmt_tarea {margin-bottom: 20px;}
 	.cmt_wrap .cmt_write .cmt_tarea textarea {background: #fff; padding: 20px; resize: none; width: 100%; height: 140px; font-size: 14px; line-height: 1.3;}
-	.cmt_wrap .cmt_write .cmt_thumb + .btn {display:block; margin-top:40px; margin-left:auto; margin-right:auto; width:220px; height:60px; font-size:13px; font-weight:300;}
+	.cmt_wrap .cmt_write .cmt_thumb + .btn {display:block; margin-top:40px; margin-left:auto; margin-right:auto; width:220px; height:60px; font-size:18px; font-weight:300;}
 	.cmt_wrap .cmt_group {margin-top:90px}
 	.cmt_wrap .cmt_group .cmt_list_tit {padding-bottom:30px; border-bottom:1px solid #ddd;}
 	.cmt_wrap .cmt_group .cmt_list_tit strong {margin-right: 10px; font-size: 26px; font-weight: 500;}
@@ -4253,7 +4254,10 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.survey .survey_wrap .survey_con .survey_row .answer textarea {height:220px; padding:20px;}
 	.survey .survey_wrap .survey_con .survey_row .answer ul {/*margin-top:-30px;*/ margin-right:-60px}
 	.survey .survey_wrap .survey_con .survey_row .answer ul li {float:left; position:relative; margin-bottom:42px; margin-right:48px;}
-	.survey .survey_wrap .survey_con .survey_row .answer input[type='text'].etc_input {visibility:hidden;margin-left:20px; width:300px !important; max-width:300px !important; height:52px;}
+	.survey .survey_wrap .survey_con .survey_row .answer ul li:last-child {} 
+	
+	.survey .survey_wrap .survey_con .survey_row .answer input[type='text'].etc_input {visibility:hidden;margin-left:20px; width:300px !important; max-width:300px !important; height:52px; margin-top: -33px;}
+	.survey .survey_wrap .survey_con .survey_row .answer ul li .etc_radio:checked + label + .etc_input {margin-top: 0;}
 	.survey .survey_wrap .survey_con .btn_wrap {margin-top:20px} 
 
 	/* ev_rank 회원등급 혜택 */

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

@@ -582,7 +582,21 @@ header.minify .common_header.br_header::after {bottom:-565px;}
 .brand_main .post-visual .swiper-slide .txtWrap {opacity:0; position:absolute; padding-left:0px; top:110px; bottom:auto; left:0px; right:auto; z-index:1;}
 .brand_main .post-visual .txtWrap dt {font-size:0; padding-bottom:0;}
 .brand_main .post-visual .swiper-slide-active {opacity:1;}
-.brand_main .post-visual .swiper-slide-active .txtWrap {opacity:1;}
+.brand_main .post-visual .swiper-slide-active .txtWrap {animation-name: fade-in;animation-duration: 1.5s;animation-delay: 1s;animation-fill-mode: both;}
+
+@keyframes fade-in {
+	from {
+	  opacity: 0;
+	  left:0;
+	  transform: translateY(100px);
+	}
+	to {
+	  opacity: 1;
+	  left:0;
+	  transform: translateY(0);
+	}
+}
+
 .brand_main .post-visual .swiper-slide-prev {opacity:0;}
 .brand_main .post-visual .swiper-slide-next {padding-left:0px; padding-right:440px;}
 .brand_main .post-visual .swiper-controls {position:absolute; width:auto; bottom:100px; left:190px; padding-right:15px; z-index:10;}