Merge branch 'develop' into bin2107

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

@@ -44,9 +44,12 @@
 			<th:block th:each="goodsVideo, status : ${goodsVideoList}">
 			<div class="movblock">
 				<th:block th:if="${goodsVideo.videoGb == 'Y'}">
+				<div style="height:4rem"></div><!-- 여백용 html -->
 				<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'}">
+				<div style="height:4rem"></div><!-- 여백용 html -->
+				<iframe class="pd_mov" width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey +'?enable_initialize_focus=false&autoplay&mute&controls_activation=none'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 				</th:block>
 			</div>
 			</th:block>
@@ -54,20 +57,28 @@
 			<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
 			<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
 			<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+				<div style="height:4rem"></div><!-- 여백용 html -->
 				<a th:href="${goodsBanner.strVar1}" target="_blank">
 				<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 				</a>
 			</th:block>
 			<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+				<div style="height:4rem"></div><!-- 여백용 html -->
 				<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 			</th:block>
 			</th:block>
 			</th:block>
 			
 			<!-- 관리자 에디터입력 내용 노출  상단 html -->
-			<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty }" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+			<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty }" >
+				<div style="height:4rem"></div><!-- 여백용 html -->
+				<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block>
+			</th:block >
 			
-			<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+			<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
+				<div style="height:4rem"></div><!-- 여백용 html -->
+				<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+			</th:block>
 		</div>	
 			
 		<th:block th:if="${goodsInfo.tobeFormYn == 'Y'}">	

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

@@ -341,9 +341,9 @@
 		let jsonData = JSON.stringify(data);
 		
 		$('.form_field .select_custom.item_opt1').attr('disabled', true);
-		$('.form_field .select_custom.item_opt1').find('.combo .select').html('옵션1선택');
+		$('.form_field .select_custom.item_opt1').find('.combo .select').html('선택');
 		$('.form_field .select_custom.item_opt2').attr('disabled', true);
-		$('.form_field .select_custom.item_opt2').find('.combo .select').html('옵션2선택');
+		$('.form_field .select_custom.item_opt2').find('.combo .select').html('선택');
 		
 		gagajf.ajaxJsonSubmit('/goods/detail/compsGoods/list', jsonData, function(result) {
 			if (result.dataList != null && result.dataList.length > 0) {
@@ -418,9 +418,9 @@
 					};
 		let jsonData = JSON.stringify(data);
 		
-		$('.form_field .select_custom.item_opt1').find('.combo .select').html('옵션1선택');
+		$('.form_field .select_custom.item_opt1').find('.combo .select').html('선택');
 		$('.form_field .select_custom.item_opt2').attr('disabled', true);
-		$('.form_field .select_custom.item_opt2').find('.combo .select').html('옵션2선택');
+		$('.form_field .select_custom.item_opt2').find('.combo .select').html('선택');
 		
 		gagajf.ajaxJsonSubmit('/goods/detail/option1/list', jsonData, function(result) {
 			
@@ -439,7 +439,7 @@
 						//------
 						tag1 += '<div class="select_custom item_opt1">\n';	
 						tag1 += '<div class="combo">\n';
-						tag1 += '<div class="select">옵션1선택</div>\n';
+						tag1 += '<div class="select">선택</div>\n';
 						tag1 += '<ul class="list">\n';
 						//------
 						//tag1 += '<li class="selected" id="goodsOpt1">옵션1선택</li>\n';	
@@ -657,9 +657,9 @@
 			//$('.pd_detail .opt_select .select_custom.deal_opt_item').find('.combo .select').html(dTag);
 			//var opt_selecter_item = new sCombo('.opt_select .select_custom.deal_opt_item');
 			$('.form_field .select_custom.item_opt1').attr('disabled', true);
-			$('.form_field .select_custom.item_opt1').find('.combo .select').html('옵션1선택');
+			$('.form_field .select_custom.item_opt1').find('.combo .select').html('선택');
 			$('.form_field .select_custom.item_opt2').attr('disabled', true);
-			$('.form_field .select_custom.item_opt2').find('.combo .select').html('옵션2선택');
+			$('.form_field .select_custom.item_opt2').find('.combo .select').html('선택');
 			
 			$('.pop_option_select').css("display", "none");
 			

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

@@ -305,9 +305,11 @@
 					<th:block th:each="goodsVideo, status : ${goodsVideoList}">
 					<div class="movblock">
 						<th:block th:if="${goodsVideo.videoGb == 'Y'}">
+						<div style="height:4rem"></div><!-- 여백용 html -->
 						<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'}">
+						<div style="height:4rem"></div><!-- 여백용 html -->
 						<iframe class="pd_mov" width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey +'?enable_initialize_focus=false&autoplay&mute&controls_activation=none'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 						</th:block>
 					</div>
@@ -316,18 +318,27 @@
 					<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
 					<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
 					<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+						<div style="height:4rem"></div><!-- 여백용 html -->
 						<a th:href="${goodsBanner.strVar1}" target="_blank">
 						<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 						</a>
 					</th:block>
 					<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+						<div style="height:4rem"></div><!-- 여백용 html -->
 						<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 					</th:block>
 					</th:block>
 					</th:block>
-					<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty }" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+					<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty }" >
+					<div style="height:4rem"></div><!-- 여백용 html -->
+					<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block>
+					</th:block >
 					
-					<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+					
+					<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
+						<div style="height:4rem"></div><!-- 여백용 html -->
+						<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+					</th:block>
 					
 				</div>
 					

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

@@ -44,9 +44,11 @@
 		<th:block th:each="goodsVideo, status : ${goodsVideoList}">
 		<div class="movblock">
 			<th:block th:if="${goodsVideo.videoGb == 'Y'}">
+			<div style="height:100px"></div><!-- 여백용 html -->
 			<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'}">
+			<div style="height:100px"></div><!-- 여백용 html -->
 			<iframe width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey +'?player_version=html5'}" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe>
 			</th:block>
 		</div>
@@ -55,18 +57,22 @@
 		<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
 		<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
 		<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+			<div style="height:100px"></div><!-- 여백용 html -->
 			<a th:href="${goodsBanner.strVar1}" target="_blank">
 			<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 			</a>
 		</th:block>
 		<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+			<div style="height:100px"></div><!-- 여백용 html -->
 			<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 		</th:block>
 		</th:block>
 		</th:block>
 		
 		<!-- 관리자 에디터입력 내용 노출  상단 html -->
-		<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty }" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+		<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty }" >
+		<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block>
+		</th:block >
 		
 		<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
 	</div>	
@@ -151,7 +157,7 @@
 	<div class="view_detail_box" th:if="${not #strings.contains(goodsImgList,'_01')}">
 		<div class="view">
 			<th:block th:each="goodsImg, status : ${goodsImgList}" >
-				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="">
+				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 				</th:block>
 		</div>
 	</div>

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

@@ -663,6 +663,7 @@
 					<!-- 관리자 에디터입력 내용   공지 html -->
 					<th:block th:each="goodsVideo, status : ${goodsVideoList}">
 					<div class="movblock">
+					 	<div style="height:100px"></div><!-- 여백용 html -->
 						<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>
@@ -675,20 +676,28 @@
 					<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
 					<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
 					<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+						 <div style="height:100px"></div><!-- 여백용 html -->
 						<a th:href="${goodsBanner.strVar1}" target="_blank">
 						<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 						</a>
 					</th:block>
 					<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+					 	<div style="height:100px"></div><!-- 여백용 html -->
 						<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 					</th:block>
 					</th:block>
 					</th:block>
 					
 					<!-- 관리자 에디터입력 내용 노출  상단 html -->
-					<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+					<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty}" >
+						<div style="height:100px"></div><!-- 여백용 html -->
+						<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block> 
+					</th:block >
 					
-					<th:block th:if="${ goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+					<th:block th:if="${ goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
+						<div style="height:100px"></div><!-- 여백용 html -->
+						<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+					</th:block>
 				</div>	
 					
 				<th:block th:if="${goodsInfo.tobeFormYn == 'Y'}">
@@ -773,7 +782,7 @@
 				<div class="view_detail_box" th:if="${not #strings.contains(goodsImgList,'_01')}">
 					<div class="view">
 						<th:block th:each="goodsImg, status : ${goodsImgList}" >
-							<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="">
+							<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 							</th:block>
 					</div>
 				</div>