Merge branch 'develop' into card007

pom.xml

@@ -283,13 +283,6 @@
 			<scope>system</scope>
 			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/xalan.jar</systemPath>
 		</dependency>
-		<dependency>
-			<groupId>xbean</groupId>
-			<artifactId>xbean</artifactId>
-			<version>1.0</version>
-			<scope>system</scope>
-			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/xbean.jar</systemPath>
-		</dependency>
 	</dependencies>
 	
 	<build>

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

@@ -54,7 +54,7 @@
 							<div class="swiper-container thumb_list">
 								<div class="swiper-wrapper">
 									<th:block th:each="goodsImg, status : ${goodsImgList}">
-									<div class="swiper-slide" th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_S1.') 
+									<div class="swiper-slide" th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_F1.') 
 																or #strings.contains(goodsImg.sysImgNm,'_L1.')
 																or #strings.contains(goodsImg.sysImgNm,'_L2.'))}">
 										<div class="thumb" ><img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=1080'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'"></div></div>  <!--  mov -->

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

@@ -321,7 +321,7 @@
 					</th:block>
 				</div>	
 				<!-- 관리자 에디터입력 내용 노출 -->
-				<div class="mdhtml_box">
+				<div class="mdhtml_box" th:if="${goodsVideoList != null and !goodsVideoList.empty}">
 					<!-- 관리자 에디터입력 내용   공지 html -->
 					<th:block th:each="goodsVideo, status : ${goodsVideoList}">
 					<div class="movblock">
@@ -339,14 +339,13 @@
 				<div class="mdhtml_box  bnnoti" 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>
-				</div>	
+				</div>
+				<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >	
 				<div class="mdhtml_box"	>
-					<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
 						<div style="height:4rem"></div><!-- 여백용 html -->
 						<div id="goodsDescHtml"></div>
-					</th:block>
-					
 				</div>
+				</th:block>
 					
 				<th:block th:if="${goodsInfo.tobeFormYn == 'Y'}">	
 				<!-- 착용컷 노출 -->

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

@@ -41,7 +41,7 @@
 										<div class="swiper-wrapper">
 										<th:block th:each="goodsImg, status : ${goodsImgList}">
 											<div class="swiper-slide" th:classappend="${status.first}? 'on' : ''" 
-													th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_S1.') 
+													th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_F1.') 
 															or #strings.contains(goodsImg.sysImgNm,'_L1.')
 															or #strings.contains(goodsImg.sysImgNm,'_L2.'))}">
 											<a th:href="${'#navLocate'+ status.count}"><span class="thumb"><img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=48'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'"></span></a></div>
@@ -56,7 +56,7 @@
 							<ul>
 								<th:block th:each="goodsImg, status : ${goodsImgList}">
 								<li th:id="${'navLocate'+ status.count}"  th:classappend="${status.first}? 'on' : ''" 
-									th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_S1.') 
+									th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_F1.') 
 												or #strings.contains(goodsImg.sysImgNm,'_L1.')
 												or #strings.contains(goodsImg.sysImgNm,'_L2.'))}">
 									<a href="javascript:void(0);"><span class="thumb"><img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=558'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'"></span></a></li>
@@ -406,7 +406,10 @@
 				<a href="" id="btn_close_itemThumbPop">닫기버튼</a>
 			</div>
 			<div class="full_pop_container"  th:with="videoYn=${(goodsVideoList != null and !goodsVideoList.empty)? 'Y' :'N'}">
-			<th:block th:each="goodsImg, status : ${goodsImgList}" th:with="count=${(videoYn == 'Y')?  (status.count +1): status.count }">
+			<th:block th:each="goodsImg, status : ${goodsImgList}" th:with="count=${(videoYn == 'Y')?  (status.count +1): status.count }"
+						th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_F1.') 
+								or #strings.contains(goodsImg.sysImgNm,'_L1.')
+								or #strings.contains(goodsImg.sysImgNm,'_L2.'))}">
 				<div th:id="${'popThumb1'+ count}" class="scaleview" >
 					<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'"></div>
 			</th:block>

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

@@ -1267,7 +1267,10 @@
 				<a href="" id="btn_close_itemThumbPop">닫기버튼</a>
 			</div>
 			<div class="full_pop_container"  th:with="videoYn=${(goodsVideoList != null and !goodsVideoList.empty)? 'Y' :'N'}">
-			<th:block th:each="goodsImg, status : ${goodsImgList}" th:with="count=${(videoYn == 'Y')?  (status.count +1): status.count }">
+			<th:block th:each="goodsImg, status : ${goodsImgList}" th:with="count=${(videoYn == 'Y')?  (status.count +1): status.count }"
+						th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_F1') 
+								or #strings.contains(goodsImg.sysImgNm,'_L1')
+								or #strings.contains(goodsImg.sysImgNm,'_L2'))}">
 				<div th:id="${'popThumb1'+ count}" class="scaleview" >
 					<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'"></div>
 			</th:block>