Merge branch 'eskim' into develop

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

@@ -233,12 +233,24 @@
 				</div>
 				<!-- //상품설명 노출 -->
 				<!-- 관리자 에디터입력 내용 노출 -->
+				<div class="mdhtml_box">
 					<th:block th:if="${goodsNoticeList != null and !goodsNoticeList.empty}" >
-				<div class="mdhtml_box" th:each="goodsNotice, status : ${goodsNoticeList}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsNotice.noticeContent))}"></div>
+				<th:block  th:each="goodsNotice, status : ${goodsNoticeList}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsNotice.noticeContent))}"></th:block >
 					</th:block>
-				<!-- //관리자 에디터입력 내용 노출 -->
+				<!-- 관리자 에디터입력 내용   공지 html -->
+				<th:block th:each="goodsVideo, status : ${goodsVideoList}">
+				<div class="movblock">
+					<th:block th:if="${goodsVideo.videoGb == 'Y'}">
+					<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+					</th:block>
+					<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
+					</th:block>
+				</div>
+				</th:block>
+				
 				<!-- 관리자 에디터입력 내용 노출  상단 html -->
-				<div class="mdhtml_box" th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></div>
+				<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+				</div>	
 				<!-- 착용컷 노출 -->
 				<div class="view_outfit_box" th:if="${#strings.contains(goodsImgList,'_M1.') 
 													or #strings.contains(goodsImgList,'_M2.')
@@ -447,11 +459,17 @@
 											<em class="ico ico_besttag"></em>
 										</div>
 										<div class="lap">
-											<div class="pic" th:if="${bestReview.reviewAttachList != null and !bestReview.reviewAttachList.empty}">
+											<th:block th:if="${bestReview.reviewAttachList != null and !bestReview.reviewAttachList.empty}">
+											<div class="pic" >
 												<th:block th:each="reviewAttach, attachStatus : ${bestReview.reviewAttachList}" th:if="${attachStatus.first}">
 												<span class="thumb " th:classAppend="${(reviewAttach.fileGb == 'M') ? 'mov' :''}"  th:style="${'background-image:url('+imgUrl+ reviewAttach.sysFileNm+');'}"></span><!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->
 												</th:block>
 											</div>
+											</th:block>
+											<th:block th:unless="${bestReview.reviewAttachList != null and !bestReview.reviewAttachList.empty}">
+											<div class="pic none" >
+											</div>
+											</th:block>
 											<div class="txt_best_review">
 												<p th:text="${bestReview.reviewContent}">옷</p>
 											</div>
@@ -963,8 +981,8 @@
 			$objUp.append(tag);
 			fnSetTotalPrice();
 			
-			// 해야하나 말아야하나
-			//$('.pop_option_select').css("display", "none");
+			$('.pop_option_select').css("display", "none");
+			
 			
 		}, "text");
 	}

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

@@ -35,13 +35,25 @@
 	</div>
 	<!-- //상품설명 노출 -->
 	<!-- 관리자 에디터입력 내용   공지 html -->
+	<!-- 관리자 에디터입력 내용   공지 html -->
+	<div class="mdhtml_box">
 		<th:block th:if="${goodsNoticeList != null and !goodsNoticeList.empty}" >
-	<div class="mdhtml_box" th:each="goodsNotice, status : ${goodsNoticeList}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsNotice.noticeContent))}"></div>
+	<th:block  th:each="goodsNotice, status : ${goodsNoticeList}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsNotice.noticeContent))}"></th:block >
 		</th:block>
 	<!-- 관리자 에디터입력 내용   공지 html -->
+	<th:block th:each="goodsVideo, status : ${goodsVideoList}">
+	<div class="movblock">
+		<th:block th:if="${goodsVideo.videoGb == 'Y'}">
+		<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+		</th:block>
+		<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
+		</th:block>
+	</div>
+	</th:block>
+	
 	<!-- 관리자 에디터입력 내용 노출  상단 html -->
-	<div class="mdhtml_box" th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></div>
-		
+	<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+	</div>	
 	<!-- 착용컷 노출 -->
 	<div class="view_outfit_box" th:if="${#strings.contains(goodsImgList,'_M1.') 
 										or #strings.contains(goodsImgList,'_M2.')

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

@@ -1613,6 +1613,18 @@
 		
 	}
 	
+	 $(document).on('click','.option_box [class^="opt_"] .select_custom .select',function(e){
+
+		 let selectHeight = $(this);
+		 let selectHeight02 = selectHeight.outerHeight();
+
+		 if($(this).find('.opt_name').length){
+			 $(this).siblings('.list').css({"top":selectHeight02});
+		 }else{
+			 $(this).siblings('.list').css({"top":"52px"});
+		 }
+	 });
+	
 /*]]>*/
 </script>
 

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

@@ -100,8 +100,8 @@
 						<div class="item_prod" th:each="goodsInfo, status : ${goodsDealComposeList}">
 							<div class="item_state">
 								<a href="javascript:void(0);" class="itemLink" th:onclick="fnOpenGoodsDealDetail([[${goodsInfo.goodsCd}]],[[${goodsInfo.compsGoodsCd}]])">
-									<div class="shape ranker">
-										<span>상품<em class="number" th:text="${#numbers.formatInteger(status.count,2)}">01</em></span>
+									<div class="shape ranker dealdetail">
+										<span>상품<br><th:block th:text="${#numbers.formatInteger(status.count,2)}">01</th:block></span>
 									</div>
 									<div class="itemPic">
 										<img alt="" class="vLHTC pd_img" th:src="${imgGoodsUrl+'/'+goodsInfo.sysImgNm+'?RS=285'}" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">

src/main/webapp/biz/goods.js

@@ -67,7 +67,8 @@ var fnViewStock = function(obj, goodsCd, optCd, optCd1, optCd2,  minOrdQty, maxO
 			// 모바일에서 작업해야함
 			$("#cartForm  input[name=opt]").each(function(){
 				if ($(this).attr('id') == optCd){
-			//		$(this).prop('checked', true);
+					$("#cartForm  input[name=opt]").parent().find('label').removeClass('on');
+					$(this).parent().find('label').addClass('on');
 				}
 			});
 		}