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

src/main/java/com/style24/front/biz/service/TsfGoodsService.java

@@ -908,6 +908,19 @@ public class TsfGoodsService {
 					temp.setBenefitArr(temp.getIcon().split(","));
 				}
 			}
+		} else if(cate.getContentsLoc().equals("SOM003")){
+			goodsList = goodsDao.getContentsCategoryGoodsList(cate);
+			for (Goods temp : goodsList) {
+				if (temp.getSizes() != null) {
+					temp.setSizeArr(temp.getSizes().split(","));
+				}
+				if (temp.getColorChips() != null) {
+					temp.setColorArr(temp.getColorChips().split(","));
+				}
+				if (temp.getIcon() != null) {
+					temp.setBenefitArr(temp.getIcon().split(","));
+				}
+			}
 		} else if (cate.getContentsLoc().equals("SBM013") || cate.getContentsLoc().equals("SBMM013")) {
 			GoodsSearch goodsSearch = new GoodsSearch();
 			goodsSearch.setSiteCd(TscConstants.Site.STYLE24.value());
@@ -927,8 +940,8 @@ public class TsfGoodsService {
 				if (temp.getColorChips() != null) {
 					temp.setColorArr(temp.getColorChips().split(","));
 				}
-				if (temp.getIcon() != null) {
-					temp.setBenefitArr(temp.getIcon().split(","));
+				if (temp.getBenefits() != null) {
+					temp.setBenefitArr(temp.getBenefits().split(","));
 				}
 			}
 		} else {

src/main/java/com/style24/front/biz/web/TsfDisplayController.java

@@ -337,12 +337,7 @@ public class TsfDisplayController extends TsfBaseController {
 			brandMain.setCate4Srch(cate4Srch);
 
 			if ("C".equals(brandMain.getContentsYn())) {
-				if (contentsLoc.equals("SBM013") || contentsLoc.equals("SBMM013")) {
-					cate4Srch.setBrandGroupNo(brandMain.getBrandGroupNo());
-					cate4Srch.setMaxRow(50);
-					Collection<Goods> goodsList = goodsService.getContentsCategoryGoodsList(cate4Srch);
-					brandMain.setGoodsList(goodsList);
-				}else if(contentsLoc.equals("SBM017") || contentsLoc.equals("SBM018")||contentsLoc.equals("SBM019")){
+				if(contentsLoc.equals("SBM017") || contentsLoc.equals("SBM018")||contentsLoc.equals("SBM019")){
 					cate4Srch.setBrandGroupNo(brandMain.getBrandGroupNo());
 					cate4Srch.setMaxRow(20);
 					Collection<Goods> goodsList = goodsService.getContentsCategoryGoodsList(cate4Srch);
@@ -350,9 +345,17 @@ public class TsfDisplayController extends TsfBaseController {
 				}
 				brandMain.setContentsList(displayService.getContentsList(contents));
 			} else if("E".equals(brandMain.getContentsYn())){
-
+				Cate4Srch cate4Srch2 = new Cate4Srch();
+				cate4Srch2.setBrandGroupNo(brandMain.getBrandGroupNo());
+				cate4Srch2.setContentsLoc(contentsLoc);
+				if (contentsLoc.equals("SBM013") || contentsLoc.equals("SBMM013")) {
+					cate4Srch2.setMaxRow(50);
+				}else{
+					cate4Srch2.setMaxRow(20);
+				}
+				Collection<Goods> goodsList = goodsService.getContentsCategoryGoodsList(cate4Srch2);
+				brandMain.setGoodsList(goodsList);
 			} else {
-				log.info("getBrandGroupNo   {}",brandMain.getBrandGroupNo());
 				cate4Srch.setBrandGroupNo(brandMain.getBrandGroupNo());
 				if (cate4Srch.getContentsLoc().equals("SBM008")) {
 					cate4Srch.setMaxRow(10);

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -715,22 +715,18 @@ public class TsfMypageController extends TsfBaseController {
 			throw new IllegalStateException(message.getMessage("FAIL_1001"));
 		}
 
-		// TODO
-		// @ 주문취소시 상태값 체크
-		// @ 취소, 반품시 배송비 체크 로직 (선결제 로직)
-
 		// 1. 세션회원조회
 		int custNo = TsfSession.getInfo().getCustNo();
 		orderChange.setCustNo(custNo);
 
 		// 2. 환불 사전 정보 조회
-		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo(orderChange);
+		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo2(orderChange);
 		List<Order> returnReqList = (List<Order>)refundPreInfo.get("cnclReqList");
 		String allLastCanYn = refundPreInfo.getString("allLastCanYn");
 		String supplyCompCd = refundPreInfo.getString("supplyCompCd");
 
 		// 3. 환불금액계산
-		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt(returnReqList);
+		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt2(returnReqList);
 
 		// 4. 주문변경 기본정보 설정
 		result.set("ordNo", orderChange.getOrdNo());					// 주문번호
@@ -759,8 +755,20 @@ public class TsfMypageController extends TsfBaseController {
 		result.set("chgerRtnMemo", orderChange.getChgerRtnMemo());		// 반품메모
 
 		// 6. 주문변경 DB 등록 (TB_ORDER_CHANGE, TB_ORDER_CHANGE_DETAIL, TB_REFUND)
-		coreOrderChangeService.returnRequest(result);
-		// coreOrderChangeService.rtnReq(result, custNo);
+		GagaMap map = coreOrderChangeService.returnRequest(result);
+		Integer ordChgSq = map.getInt("ordChgSq");
+
+		if (ordChgSq > 0) {
+			// 반품 알림톡 관련 정보 조회
+			orderChange = coreOrderChangeService.getKakaoOrderReturnInfo(ordChgSq);
+
+			try {
+				// 반품 알림톡 발송
+				coreKakaotalkService.sendOrderReturnRequest(orderChange, custNo);
+			} catch (Exception e) {
+				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+			}
+		}
 
 		result.set("status", GagaResponseStatus.SUCCESS.getCode());
 		if (orderChange.getAddPayCost() == 0) {
@@ -868,25 +876,19 @@ public class TsfMypageController extends TsfBaseController {
 		// 2. 취소완료 처리
 		GagaMap result = coreOrderChangeService.orderCancelPreInfoTemp(orderChange, custNo);
 
-		// TODO
+		// 3. 취소완료 카카오알림톡 발송
 		Integer ordChgSq = result.getInt("ordChgSq");
 		
-		// ordChgSq 로 아래 정보 조회하는 쿼리 작성 후 데이터 설정
-		// orderChange.setOrdPhnno();
-		// orderChange.setRefundAmt();
-		// orderChange.setOrdNm();
-		// orderChange.setOrdNo();
-		// orderChange.setGoodsNm();
-		// orderChange.setGoodsCnt();
-		// orderChange.setPayMeans();
-		// orderChange.setPayMeansNm();
-		// orderChange.setPgGb();
-		// orderChange.setCustNo();
-		
-		try {
-			coreKakaotalkService.sendOrderCancelComplete(orderChange, custNo);
-		} catch (Exception e) {
-			throw new IllegalStateException(message.getMessage("FAIL_0004"));
+		if (ordChgSq > 0) {
+			// 취소 알림톡 관련 정보 조회
+			orderChange = coreOrderChangeService.getKakaoOrderCancelInfo(ordChgSq);
+
+			try {
+				// 취소 알림톡 발송
+				coreKakaotalkService.sendOrderCancelComplete(orderChange, custNo);
+			} catch (Exception e) {
+				throw new IllegalStateException(message.getMessage("FAIL_0004"));
+			}
 		}
 
 		result.set("status", GagaResponseStatus.SUCCESS.getCode());

src/main/java/com/style24/front/biz/web/TsfNoMemberController.java

@@ -681,11 +681,11 @@ public class TsfNoMemberController extends TsfBaseController {
 		}
 
 		// 2. 환불 사전 정보 조회
-		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo(orderChange);
+		GagaMap refundPreInfo = coreOrderChangeService.getRefundPreInfo2(orderChange);
 		List<Order> returnReqList = (List<Order>)refundPreInfo.get("cnclReqList");
 
 		// 3. 환불금액계산
-		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt(returnReqList);
+		GagaMap result = coreOrderRefundService.cnclRtnRefundAmt2(returnReqList);
 
 		// 4. 주문변경 기본정보 설정
 		result.set("ordNo", orderChange.getOrdNo());					// 주문번호

src/main/java/com/style24/front/biz/web/TsfPlanningController.java

@@ -146,7 +146,7 @@ public class TsfPlanningController extends TsfBaseController {
 	@GetMapping("/detail/form")
 	public ModelAndView PlanningDetailForm(Plan plan) {
 		ModelAndView mav = new ModelAndView();
-		
+		plan.setFrontGb(TsfSession.getFrontGb());
 		// 접근 불가능한 기획전 메시지 조회
 		String inaccessibleMsg = planningService.getInaccessiblePlanningMessage(plan.getPlanSq());
 		if (StringUtils.isNotBlank(inaccessibleMsg)) {
@@ -164,7 +164,6 @@ public class TsfPlanningController extends TsfBaseController {
 		Coupon coupon = new Coupon();
 
 		plan.setSiteCd(TscConstants.Site.STYLE24.value());
-		plan.setFrontGb(TsfSession.getFrontGb());
 		plan.setCustGb(TsfSession.getCustGb());
 		review.setFrontGb(TsfSession.getFrontGb());
 		review.setCustGb(TsfSession.getCustGb());

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

@@ -214,6 +214,7 @@ public class Goods extends TscBaseDomain {
 	private String colorChips;
 	private String sizes;
 	private String icon;
+	private String benefits;
 	private String videos;			// 동영상들(,로 연결된 문자열. 동영상구분:미디어컨텐츠 또는 유튜브동영상ID, ...)
 
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)

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

@@ -3181,7 +3181,7 @@
 	<select id="getBrandNewGoodsList" parameterType="goodsSearch" resultType="Goods">
 		/* TsfGoods.getBrandNewGoodsList */
 		WITH TAB_GOODS AS (
-		       SELECT G.BRAND_GROUP_NM /*브랜드그룹명*/
+		       SELECT DISTINCT G.BRAND_GROUP_NM /*브랜드그룹명*/
 		            , G.GOODS_CD /*상품코드*/
 		            , G.GOODS_NM /*상품명*/
 		            , G.GOODS_GB /*상품구분*/

src/main/webapp/WEB-INF/views/mob/error/InaccessMob.html

@@ -53,7 +53,8 @@
 				<p th:text="${inaccessibleMsg}">모바일웹에서만 접근이 가능합니다.</p>
 			</div>
 			<div class="btn_group">
-				<button class="btn btn_dark" onclick="fnGoToHome();"><span>홈으로 이동</span></button>
+				<button class="btn btn_default" onclick="fnGoToHome();"><span>홈으로 이동</span></button>
+				<button class="btn btn_dark" onclick="javascript:history.back(-1);"><span>목록으로 이동</span></button>
 			</div>
 		</div>
 	</div>

src/main/webapp/WEB-INF/views/mob/planning/PlanningDetailFormMob.html

@@ -129,7 +129,7 @@
 				</div>
 				</th:block>
 				
-				<th:block th:if="${#lists.size(planCornerList)}>0">
+				<th:block th:if="${#lists.size(planCornerList)>0 && planInfo.cornerNmDispYn == 'Y'}">
 				<div class="inner" id="cornerInner">
 					<div class="dp_listItems_wrap typeSelector">
 						<div class="items_option">
@@ -151,7 +151,7 @@
 								<div class="swiper-slide">
 									<a th:onclick="cfnGoToPlanDetail([[${PlanData.planSq}]])" class="dp_lookbook_item" tabindex="0">
 										<div class="img">
-											<img th:src="${@environment.getProperty('upload.image.view')+PlanData.mainImg}" alt="${PlanData.planNm}">
+											<img th:src="${@environment.getProperty('upload.image.view')+PlanData.mainImg+'?RS=960'}" alt="${PlanData.planNm}">
 										</div>
 										<div class="txt">
 											<div class="tit" th:text="${PlanData.planNm}"></div>
@@ -174,7 +174,7 @@
                     </div>
                     <div class="popup_con">
                         <div class="button_list clear">
-                        	<th:block th:if="${planCornerList!=null}" th:each="a, cornerStat : ${planCornerList}">
+                        	<th:block th:if="${planCornerList!=null && planInfo.cornerNmDispYn == 'Y'}" th:each="a, cornerStat : ${planCornerList}">
                            	 <button type="button" th:onclick="fnCornerClick([[${cornerStat.index+1}]], [[${a.cornerNm}]])"><span th:text="${a.cornerNm}"></span></button>
                             </th:block>
                         </div>
@@ -469,7 +469,7 @@ if (notice.length>0) {
 	$("#G082_60").append(html);
 }
 
-if(planCornerList.length>0){
+if(planCornerList.length>0 && plan.cornerNmDispYn == "Y"){
 	
 	var html = '';
 	$.each(planCornerList, function(idx, item)  {
@@ -1035,7 +1035,7 @@ $(document).ready(function(){
 	if(plan.planGb == "P"){
 		$('#htopTitle').text('기획전');
 	}else{
-		$('#htopTitle').text('이벤트');
+		$('#htopTitle').text('이벤트/혜택');
 	}
 	ajaxReplyList();
 	
@@ -1108,11 +1108,11 @@ $(document).ready(function(){
 		centerMode: true,
 	});
 	
-	// 다른기획전
+	/* SLIDE - 다른 기획전,이벤트 보기 */
 	var other_promotion_slide = new Swiper('.other_promotion_slide .swiper-container', {
-		slidesPerView: 2,
+		slidesPerView: 'auto',
 		spaceBetween: 8,
-		centerMode: true,
+		centerMode:true,
 	});
 	
 	 $(document).on('click','.popup_box .button_list button',function(){

src/main/webapp/WEB-INF/views/mob/planning/PlanningEventAttendFormMob.html

@@ -2,7 +2,7 @@
 <html lang="ko"
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-	layout:decorator="mob/common/layout/DefaultLayoutMob">
+	layout:decorator="mob/common/layout/SubLayoutMob">
 <!--
  *******************************************************************************
  * @source  : PlanningEventAttendFormMob.html
@@ -101,10 +101,10 @@
 									<li th:if="${a.benefitGb == 'A'  and ( a.basDays > 0 and a.pntAmt > 0)}">
 										<div class="benfit_coupon">
 											<th:block th:if="${a.dcWay == '%'}">
-												<span th:text="${a.basDays}"></span> 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span> + <span class="c_primary"><em th:text="${a.dcVal}"></em>%</span> <strong>할인 쿠폰</strong>
+												<span th:text="${a.basDays}"></span>일 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span> + <span class="c_primary"><em th:text="${a.dcVal}"></em>%</span> <strong>할인 쿠폰</strong>
 											</th:block>
 											<th:block th:if="${a.dcWay == '원'}">
-												<span th:text="${a.basDays}"></span> 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span> + <span class="c_primary"><em th:text="${a.dcVal}"></em>원</span> <strong>할인 쿠폰</strong>
+												<span th:text="${a.basDays}"></span>일 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span> + <span class="c_primary"><em th:text="${a.dcVal}"></em>원</span> <strong>할인 쿠폰</strong>
 											</th:block>
 										</div>
 									</li>
@@ -141,7 +141,7 @@
 								<div class="swiper-slide">
 									 <a href="javascript:void(0);" th:onclick="cfnGoToPlanDetail([[${PlanData.planSq}]])">
 										<div class="img">
-											<img th:src="${@environment.getProperty('upload.image.view')+PlanData.mainImg}">
+											<img th:src="${@environment.getProperty('upload.image.view')+PlanData.mainImg+'?RS=960'}">
 										</div>
 										<div class="txt">
 											<p class="subject" th:text="${PlanData.planNm}"></p>
@@ -204,6 +204,7 @@ let month =today.getMonth()+1;
 let calendar = [[${month}]];
 let planInfo = [[${planInfo}]];
 let noticeInfo = [[${noticeInfo}]];
+let plan = [[${planInfo}]];
 var custAttendList = [[${custAttendList}]];
 var appendHtml = function () {
 	
@@ -316,6 +317,12 @@ var fnInfoConfirmCallBack = function(result) {
 };
 
 $(document).ready(function() {
+	if(plan.planGb == "P"){
+		$('#htopTitle').text('기획전');
+	}else{
+		$('#htopTitle').text('이벤트/혜택');
+	}
+	
 	$("#monthHead").html("<strong>"+month+"월</strong> 출석체크");
 	appendHtml();
 	
@@ -359,14 +366,10 @@ $(document).ready(function() {
 	});
 	
 	/* SLIDE - 다른 기획전,이벤트 보기 */
-	var ev_ohter_slide = new Swiper('.other_ev_slide .swiper-container', {
+	var other_promotion_slide = new Swiper('.other_promotion_slide .swiper-container', {
 		slidesPerView: 'auto',
 		spaceBetween: 8,
 		centerMode:true,
-		//navigation: {
-		//	nextEl: '.other_ev_slide .swiper-button-next',
-		//	prevEl: '.other_ev_slide .swiper-button-prev',
-		//},
 	});
 	
 })

src/main/webapp/WEB-INF/views/mob/planning/PlanningEventMainFormMob.html

@@ -73,7 +73,7 @@ let fnGetEventList = function() {
 							tag += '					<span>NEW</span>\n';
 							tag += '				</div>\n';
 						}
-						tag += '				<img src="' + _uploadImageUrl + item.mainImg + '" alt="">\n';
+						tag += '				<img src="' + _uploadImageUrl + item.mainImg + '?RS=960" alt="">\n';
 						tag += '			</div>\n';
 						tag += '			<div class="txt">\n';
 						tag += '				<p class="tit">'+item.planNm+'</p>\n';

src/main/webapp/WEB-INF/views/mob/planning/PlanningMainFormMob.html

@@ -84,7 +84,6 @@
 							tag += '			<p class="txt_xs">' + item.dtlTitle1 + '</p>\n';
 							tag += '		</div>\n';
 							tag += '	</div>\n';
-							
 							if (item.planningGoodsList.length > 0) {
 								tag += '	<div class="itemsGrp n3">\n';
 							

src/main/webapp/WEB-INF/views/mob/planning/PlanningReplyPhotoFormMob.html

@@ -10,7 +10,7 @@
  *============================================================================
  * VER  DATE		 AUTHOR	  DESCRIPTION
  * ===  ===========  ==========  =============================================
- * 1.0  2021.04.008   eskim		최초 작성
+ * 1.0  2021.04.08   eskim		최초 작성
  *******************************************************************************
  -->
 <div class="modal-dialog" role="document">
@@ -36,8 +36,7 @@
 					<div class="swiper-pagination"></div>
 				</div>
 				<div class="pop_detail">
-					<button class="pop_open_btn">
-						<span class="sr-only"></span>
+					<button class="pop_open_btn" onclick="togglePopOpen()"><span class="sr-only"></span>
 					</button>
 					<!-- 210414_추가 : comment_wrap 태그 추가. -->
 					
@@ -60,17 +59,21 @@
 	onclick="cfCloseLayer('photo_full_popup')" class="close-modal">Close</a>
 <script th:inline="javascript">
 /* 210414_추가 : swiper fraction 숫자 1자리수 일때 앞에 0 스크립트 추가 */
-
-
+var togglePopOpen = function() {
+	if ($('.pop_detail').hasClass('active')) {
+		$('.pop_detail').removeClass('active');
+	}else{
+		$('.pop_detail').addClass('active');
+	}
+	
+};
 /*<![CDATA[*/
 	$(document).ready( function() {
 		let replyAttchSq = 0; 
 		if (!gagajf.isNull( [[${plan.attachSq}]])){
 			replyAttchSq = [[${plan.attachSq}]];
 		} 
-		$(document).on('click','.pop_open_btn',function(){
-			$('.modal.photo_comment_popup .pop_detail').toggleClass('active');
-		});
+		
 		
 		var photoreplydetailSwiper = new Swiper('.pop_slide .swiper-container', {
 			observer: true,
@@ -81,7 +84,10 @@
 				type: 'fraction',
 			},
 		});
-		
+	/* 	$(document).on('click','.pop_open_btn',function(){
+			$('.modal.photo_comment_popup .pop_detail').toggleClass('active');
+		}); */
+
 		
 		photoreplydetailSwiper.slideTo(replyAttchSq, 0, false);
 		photoreplydetailSwiper.update();

src/main/webapp/WEB-INF/views/web/display/BrandMainFormWeb.html

@@ -36,7 +36,7 @@
 										<div class="swiper-slide">
 											<th:block th:if="${ContentsData.imgPath1!=null && ContentsData.imgPath1!=''}">
 												<div class="txtWrap">
-													<dl class="w">
+													<dl class="w" id="textArea">
 														<dd class="bMainTitle">
 															<input type="hidden" name="mainTitle" th:value="${ContentsData.strTitle1}"/>
 														</dd>
@@ -507,7 +507,22 @@ var fnGoodsPopup = function(obj1,obj2,obj3,obj4,obj5,obj6,obj7){
 }
 
 $(document).ready( function() {
-
+	// 브랜드메인 첫번째 컨텐츠가 메인배너가 아닐때 처리
+	$.each(brandMainLayoutList, function (idx, item){
+		let firstLoc = '';
+		if(item.contentsLoc!='SBM001'&&item.contentsLoc!='SBM002'&&item.contentsLoc!='SBM003'){
+			firstLoc = item.contentsLoc;
+			if(firstLoc=='SBM004'){
+				return false;
+			}else{
+				$("#container").css('backgroundColor','#fff');
+				$(".brand_visual .swiper-slide").each(function (idx,item){
+					$(this).find('[id=textArea]').removeClass();
+				});
+				return false;
+			}
+		}
+	});
 	// 컨텐츠 호출
 	//$("#br_header").load("br_head.html");
 	//$("#footer").load("foot.html");

src/main/webapp/WEB-INF/views/web/display/OutletMainFormWeb.html

@@ -154,12 +154,15 @@
 											<span class=" itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 										</p>
 										<div class="itemcolorchip">
-											<span class="chip_color35" value="ABM">BEIGE</span>
-											<span class="chip_color54" value="BDS">BLACK</span>
-											<span class="chip_color40" value="YBR">WHITE</span>
+											<th:block th:each="option, idx : ${item.colorArr}" th:with="colorArray=${#strings.arraySplit(idx.current,':')}">
+												<span th:if="${colorArray[1]=='#FFFFFF'}" th:style="${'background-color:'+colorArray[1]+';border:1px solid #aaa;'}" class="chip_color" th:value="${colorArray[0]}"></span>
+												<span th:if="${colorArray[1]!='#FFFFFF'}" th:style="${'background-color:'+colorArray[1]+';'}" class="chip_color" th:value="${colorArray[0]}"></span>
+											</th:block>
 										</div>
 										<p class="itemBadge">
-											<span class="badge13">베스트 </span>
+											<th:block th:each="option, idx : ${item.benefitArr}" th:with="iconArray=${#strings.arraySplit(idx.current,':')}" >
+												<span class="badge13" th:if="${idx.index<3}" th:value="${iconArray[0]}" th:text="${iconArray[1]}"></span>
+											</th:block>
 										</p>
 										<div class="itemComment" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 									</a>

src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -295,7 +295,7 @@ if(notice.length>0){
 }
 
 
-if(planCornerList.length>0){
+if(planCornerList.length>0 && plan.cornerNmDispYn == "Y"){
 	var html = '';
 	
 	html += '<div class="cont_head">\n';

src/main/webapp/ux/mo/css/layout_m.css

@@ -1908,7 +1908,7 @@
 .dp .other_promotion_slide .dp_subtitle {padding-top: 0; font-size: 1.6rem;}
 .dp .other_promotion_slide .swiper-container{padding:0 2rem; margin:0 -2rem;}
 /* dp_detail-case - 쿠폰 */
-.dp .coupon_list {margin-bottom:3rem;}
+.dp .coupon_list {padding-bottom:3rem;}
 .dp .coupon_list li {position: relative; position: relative; margin-top:3rem; overflow: hidden;}
 .dp .coupon_list li:first-child{margin-top:0;}
 .dp .coupon_list li .cp_top {position: relative; overflow: hidden;}

src/main/webapp/ux/mo/css/style24_m.css

@@ -617,7 +617,9 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .other_promotion_slide .tit a {position: absolute; top: 50%; right: 0; transform:translateY(-50%); padding-right: 20px; background: url(/images/pc/ico_more_lg.png) no-repeat right top 1px; font-size: 18px; color:#888;}
 /* .ev .other_ev_slide .swiper-container {overflow:visible;} */
 .other_promotion_slide .swiper-slide {width: 42%;}
-.other_promotion_slide .swiper-slide img {width: 100%; height:auto;}
+.other_promotion_slide .swiper-slide .img{position: relative;width: 100%;margin-bottom: 1.5rem;padding-top: 100%;font-size: 0px;overflow: hidden;background: #fff;}
+.other_promotion_slide .swiper-slide img {position: absolute;width: 100%;height: auto;top: 50%;left: 0px;transform: translateY(-50%);}
+/* .other_promotion_slide .swiper-slide img {width: 100%; height:auto;} */
 .other_promotion_slide .swiper-slide .txt {}
 .other_promotion_slide .swiper-slide .txt .subject {margin:1.6rem 0 0; padding:0 0.46rem; font-size: 1.2rem; line-height: 1.6; font-weight: 300; color:#222; overflow: hidden; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; display: -webkit-box; word-break: keep-all;}
 .other_promotion_slide .swiper-button-next:after, .other_promotion_slide .swiper-button-prev:after {content:'';}

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

@@ -4509,6 +4509,39 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.modal.trustPrivacy_pop .text_wrap {padding:20px}
 	.modal.trustPrivacy_pop .modal-footer .btn {width:220px; border-color:#a7a7a7;}
 
+	/*
+		팝업 컨텐츠 공통
+		popup_STYLE24이용약관, popup_개인정보 수집 및 이용 약관, popup_개인정보 취급 위탁
+	*/
+	.modal.trustPrivacy_pop .hookGrp .hook_list,
+	.modal.policiesTerms_pop .hookGrp .hook_list,
+	.modal.policiesPrivacy_pop .hookGrp .hook_list {padding: 20px;}
+	.modal.trustPrivacy_pop .hookGrp .hook_list ul li,
+	.modal.policiesTerms_pop .hookGrp .hook_list ul li,
+	.modal.policiesPrivacy_pop .hookGrp .hook_list ul li {width: 100%;}
+	.modal.trustPrivacy_pop .hookGrp .hook_list ul li a span,
+	.modal.policiesTerms_pop .hookGrp .hook_list ul li a span,
+	.modal.policiesPrivacy_pop .hookGrp .hook_list ul li a span {margin: 0px 0px 20px 0;line-height: 16px;}
+	.modal.trustPrivacy_pop table,
+	.modal.policiesTerms_pop table,
+	.modal.policiesPrivacy_pop table {word-break:keep-all;margin-top: 30px;}
+	.modal.trustPrivacy_pop table th,
+	.modal.policiesTerms_pop table th,
+	.modal.policiesPrivacy_pop table th,
+	.modal.trustPrivacy_pop table td,
+	.modal.policiesTerms_pop table td,
+	.modal.policiesPrivacy_pop table td {position:relative; padding:10px 20px; font-size:14px;color: #222222;letter-spacing:-0.025em;}
+	.modal.trustPrivacy_pop table td,
+	.modal.policiesTerms_pop table td,
+	.modal.policiesPrivacy_pop table td {border-bottom:1px solid #ddd;border-right: 1px solid #ddd;font-weight:200;}
+	.modal.trustPrivacy_pop table td:last-child,
+	.modal.policiesTerms_pop table td:last-child,
+	.modal.policiesPrivacy_pop table td:last-child {border-right: 1px solid transparent;}
+	.modal.trustPrivacy_pop table th,
+	.modal.policiesTerms_pop table th,
+	.modal.policiesPrivacy_pop table th {border-top: 1px solid #000;border-bottom:1px solid #000;border-right: 1px solid transparent;font-weight:500;text-align:center;}
+
+
 	/* popup_비밀번호 변경 팝업 */
 	.modal.pswordModify_pop {width:600px; max-width:none; height:auto;}
 	.modal.pswordModify_pop input {color:#222;}