Browse Source

몰메인 수정

bin2107 5 years ago
parent
commit
ae43471368

+ 1 - 0
src/main/java/com/style24/persistence/domain/Contents.java

@@ -49,6 +49,7 @@ public class Contents extends TscBaseDomain {
 	private String subText3;		// 서브텍스트3
 	private String subText4;		// 서브텍스트4
 	private String brandGroupNo;	// 브랜드그룹번호
+	private String brandGroupNm;	// 브랜드그룹이름
 	private String brandGroupImg;	// 브랜드그룹이미지경로
 	private String mdTitle;			// MD타이틀
 

+ 26 - 20
src/main/java/com/style24/persistence/mybatis/shop/TsfDisplay.xml

@@ -141,6 +141,9 @@
 		     , SUB_TEXT3       /*서브텍스트3*/
 		     , SUB_TEXT4       /*서브텍스트4*/
 		     , BRAND_GROUP_NO  /*브랜드그룹번호*/
+		     <if test='contentsLoc != null and contentsLoc =="SMM007"'>
+		     , BRAND_GROUP_NM
+		     </if>
 		     , BRAND_GROUP_IMG /*브랜드그룹이미지경로*/
 		     , MD_TITLE        /*MD타이틀*/
 			<if test='contentsLoc != null and contentsLoc =="SMM001"'>
@@ -180,29 +183,32 @@
 		             , A.SUB_TEXT3                                          /*서브텍스트3*/
 		             , A.SUB_TEXT4                                          /*서브텍스트4*/
 		             , A.BRAND_GROUP_NO                                     /*브랜드그룹번호*/
+		             <if test='contentsLoc != null and contentsLoc =="SMM007"'>
+		             , (SELECT FN_GET_BRAND_GROUP_NM(A.BRAND_GROUP_NO)) AS BRAND_GROUP_NM
+		             </if>
 		             <choose>
-						 <when test='contentsLoc != null and contentsLoc =="SMM007"'>
-							 , (SELECT LOGO_FILE_NM FROM TB_BRAND_GROUP WHERE 1=1 AND A.BRAND_GROUP_NO = BRAND_GROUP_NO) AS BRAND_GROUP_IMG		/*브랜드그룹이미지경로*/
-						 </when>
+		                 <when test='contentsLoc != null and contentsLoc =="SMM007"'>
+		                    , (SELECT LOGO_FILE_NM FROM TB_BRAND_GROUP WHERE 1=1 AND A.BRAND_GROUP_NO = BRAND_GROUP_NO) AS BRAND_GROUP_IMG		/*브랜드그룹이미지경로*/
+		                 </when>
 		                 <otherwise>
-							 , A.BRAND_GROUP_IMG	/*브랜드그룹이미지경로*/
-						 </otherwise>
-					 </choose>
+		                    , A.BRAND_GROUP_IMG	/*브랜드그룹이미지경로*/
+		                 </otherwise>
+		             </choose>
 		             , A.MD_TITLE                                           /*MD타이틀*/
-					<if test='contentsLoc != null and contentsLoc =="SMM001"'>
-						, (SELECT count(C.BRAND_GROUP_NO) AS CNT
-							FROM TB_PLAN_BRAND C
-							WHERE B.PLAN_SQ = C.PLAN_SQ
-							) AS PLAN_BRAND_CNT
-						, (SELECT min(C.BRAND_GROUP_NO) AS BRAND_GROUP_NO
-							FROM TB_PLAN_BRAND C
-							WHERE B.PLAN_SQ = C.PLAN_SQ
-							) AS PLAN_BRAND_GROUP_NO
-						, (SELECT FN_GET_BRAND_GROUP_NM(min(C.BRAND_GROUP_NO)) AS BRAND_GROUP_NM
-							FROM TB_PLAN_BRAND C
-							WHERE B.PLAN_SQ = C.PLAN_SQ
-							) AS PLAN_BRAND_GROUP_NM
-					</if>
+		             <if test='contentsLoc != null and contentsLoc =="SMM001"'>
+		                , (SELECT count(C.BRAND_GROUP_NO) AS CNT
+		                   FROM TB_PLAN_BRAND C
+		                   WHERE B.PLAN_SQ = C.PLAN_SQ
+		                   ) AS PLAN_BRAND_CNT
+		                , (SELECT min(C.BRAND_GROUP_NO) AS BRAND_GROUP_NO
+		                   FROM TB_PLAN_BRAND C
+		                   WHERE B.PLAN_SQ = C.PLAN_SQ
+		                   ) AS PLAN_BRAND_GROUP_NO
+		                , (SELECT FN_GET_BRAND_GROUP_NM(min(C.BRAND_GROUP_NO)) AS BRAND_GROUP_NM
+		                   FROM TB_PLAN_BRAND C
+		                   WHERE B.PLAN_SQ = C.PLAN_SQ
+		                   ) AS PLAN_BRAND_GROUP_NM
+		             </if>
 		        <choose>
 		            <when test='preview != null and preview == "Y"'>
 		             , A.PRE_CONTENTS_SQ                       AS CONTENTS_SQ /*컨텐츠일련번호*/

File diff suppressed because it is too large
+ 579 - 1411
src/main/webapp/WEB-INF/views/mob/display/MallMainFormMob.html


+ 3 - 3
src/main/webapp/WEB-INF/views/web/display/MallMainFormWeb.html

@@ -167,7 +167,7 @@
 													<div class="item_state"> <!-- item_state AD soldout -->
 														<button type="button" class="itemLike" th:classappend="${bestItemData.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${bestItemData.goodsCd}, ithrCd='', contentsLoc='SMM004', planDtlSq=''">관심상품 추가</button>
 														<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${bestItemData.goodsCd}]], '', '', 'SMM004');">
-															<div class="shape ranker"><span th:text="${bestItemStat.count}"></span></div>
+															<div class="shape" th:classappend="${bestItemStat.count==1}?'ranker'"><span th:text="${bestItemStat.count}"></span></div>
 															<div class="itemPic">
 																<img alt="BLACK-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + bestItemData.sysImgNm}" >
 															</div>
@@ -473,8 +473,8 @@
 									<th:block th:each="item, stat : ${mainLayoutData.ContentsList}">
 										<div class="swiper-slide">
 											<div class="movbox">
-												<iframe th:if="${item.strVar1=='Y'}" width="100%" height="100%" th:src="${'https://www.youtube.com/embed/'+item.strVar3+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
-												<iframe th:if="${item.strVar1=='M'}" width="100%" height="100%" th:src="${'http://v.kr.kollus.com/'+item.strVar3}" ></iframe>
+												<iframe th:if="${item.strVar1=='Y'}" width="100%" height="100%" th:src="${'https://www.youtube.com/embed/'+item.strVar2+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+												<iframe th:if="${item.strVar1=='M'}" width="100%" height="100%" th:src="${'http://v.kr.kollus.com/'+item.strVar2}" ></iframe>
 											</div>
 										</div>
 									</th:block>

Some files were not shown because too many files changed in this diff