Просмотр исходного кода

Merge branch 'develop' into order

card007 5 лет назад
Родитель
Сommit
55521f5a30
26 измененных файлов с 1107 добавлено и 1382 удалено
  1. 10 1
      src/main/java/com/style24/front/biz/dao/TsfCouponDao.java
  2. 4 6
      src/main/java/com/style24/front/biz/dao/TsfPointDao.java
  3. 9 0
      src/main/java/com/style24/front/biz/dao/TsfReviewDao.java
  4. 14 1
      src/main/java/com/style24/front/biz/service/TsfCouponService.java
  5. 6 6
      src/main/java/com/style24/front/biz/service/TsfPointService.java
  6. 11 0
      src/main/java/com/style24/front/biz/service/TsfReviewService.java
  7. 59 0
      src/main/java/com/style24/front/biz/web/TsfGoodsController.java
  8. 44 44
      src/main/java/com/style24/front/biz/web/TsfMypageController.java
  9. 20 0
      src/main/java/com/style24/persistence/domain/Goods.java
  10. 11 0
      src/main/java/com/style24/persistence/domain/Review.java
  11. 42 0
      src/main/java/com/style24/persistence/mybatis/shop/TsfCoupon.xml
  12. 19 0
      src/main/java/com/style24/persistence/mybatis/shop/TsfGoods.xml
  13. 1 0
      src/main/java/com/style24/persistence/mybatis/shop/TsfPlanning.xml
  14. 4 4
      src/main/java/com/style24/persistence/mybatis/shop/TsfPoint.xml
  15. 46 4
      src/main/java/com/style24/persistence/mybatis/shop/TsfReview.xml
  16. 21 5
      src/main/webapp/WEB-INF/views/web/goods/GoodsDetailFormWeb.html
  17. 6 12
      src/main/webapp/WEB-INF/views/web/goods/GoodsReviewBestFormWeb.html
  18. 167 859
      src/main/webapp/WEB-INF/views/web/goods/GoodsReviewFormWeb.html
  19. 72 0
      src/main/webapp/WEB-INF/views/web/mypage/MypageCouponDetailPopWeb.html
  20. 19 28
      src/main/webapp/WEB-INF/views/web/mypage/MypageCouponFormWeb.html
  21. 114 226
      src/main/webapp/WEB-INF/views/web/mypage/MypagePointFormWeb.html
  22. 2 2
      src/main/webapp/ux/pc/css/common.css
  23. 362 171
      src/main/webapp/ux/pc/css/layout.css
  24. 1 1
      src/main/webapp/ux/pc/css/reset.css
  25. 29 0
      src/main/webapp/ux/pc/js/common-ui.js
  26. 14 12
      src/main/webapp/ux/style24_link.js

+ 10 - 1
src/main/java/com/style24/front/biz/dao/TsfCouponDao.java

@@ -71,7 +71,7 @@ public interface TsfCouponDao {
 	Collection<Coupon> getMypageCouponList(Coupon coupon);
 	
 	/**
-	 * 마이페이지 쿠폰 정보 조회
+	 * 마이페이지 (사용가능,만료예정)쿠폰 수 조회
 	 * @param coupon - 쿠폰정보
 	 * @return Coupon
 	 * @author sowon
@@ -79,6 +79,15 @@ public interface TsfCouponDao {
 	 */
 	Coupon getMypageCouponInfo(Coupon coupon);
 	
+	/**
+	 * 마이페이지 쿠폰 디테일 정보
+	 * @param coupon - 쿠폰정보
+	 * @return Coupon
+	 * @author sowon
+	 * @since 2021. 03. 17
+	 */
+	Coupon getCouponDetailInfo(int cpnId);
+	
 	
 	
 }

+ 4 - 6
src/main/java/com/style24/front/biz/dao/TsfPointDao.java

@@ -15,7 +15,7 @@ import com.style24.persistence.domain.Point;
 public interface TsfPointDao {
 	
 	/**
-	 * 포인트정보 조회
+	 * 마이페이지 STYLE24 포인트정보 조회
 	 *
 	 * @param Point
 	 * @author csh9191
@@ -26,16 +26,14 @@ public interface TsfPointDao {
 	Point getExtinctPointInfo(Point point);
 	
 	/**
-	 * 포인트정보 내역조회
+	 * 마이페이지 STYLE24 포인트 전체,적립,사용내역
 	 *
 	 * @param Point
 	 * @author csh9191
 	 * @since 2021. 03. 03
-	 */	
+	 */
+	Collection<Point> getAllPointList(Point point);
 	Collection<Point> getAccumulatePointList(Point point);
 	Collection<Point> getUsePointList(Point point);
-	Collection<Point> getAllPointList(Point point);
-	
-	
 
 }

+ 9 - 0
src/main/java/com/style24/front/biz/dao/TsfReviewDao.java

@@ -16,6 +16,15 @@ import com.style24.persistence.domain.ReviewAttach;
 @ShopDs
 public interface TsfReviewDao {
 
+	/**
+	 * 상품 리뷰 목록 건수
+	 * @param review
+	 * @return 
+	 * @author eskim
+	 * @since 2021. 3. 16
+	 */
+	int getReviewTotalCount(Review review);
+	
 	/**
 	 * 상품 리뷰 목록
 	 * @param review

+ 14 - 1
src/main/java/com/style24/front/biz/service/TsfCouponService.java

@@ -396,7 +396,7 @@ public class TsfCouponService {
 	}
 	
 	/**
-	 * 마이페이지 쿠폰 정보 조회
+	 * 마이페이지 (사용가능,만료예정)쿠폰 수 조회
 	 * @param param
 	 * @return
 	 * @author sowon
@@ -406,4 +406,17 @@ public class TsfCouponService {
 		param.setCustNo(TsfSession.getInfo().getCustNo());
 		return couponDao.getMypageCouponInfo(param);
 	}
+	
+	/**
+	 * 마이페이지 쿠폰 디테일 정보
+	 * @param cpnId
+	 * @return
+	 * @author sowon
+	 * @since 2021. 03. 16
+	 */
+	public Coupon getCouponDetailInfo(int cpnId) {
+		return couponDao.getCouponDetailInfo(cpnId);
+	}
+	
+	
 }

+ 6 - 6
src/main/java/com/style24/front/biz/service/TsfPointService.java

@@ -25,7 +25,7 @@ public class TsfPointService {
 	private TsfPointDao pointDao;
 	
 	/**
-	 * 포인트정보 조회
+	 *  마이페이지 STYLE24 포인트 정보 조회
 	 *
 	 * @param Point
 	 * @author csh9191
@@ -43,21 +43,21 @@ public class TsfPointService {
 	}
 	
 	/**
-	 * 포인트정보 내역조회
+	 * 마이페이지 STYLE24 포인트 전체,적립,사용내역
 	 *
 	 * @param Point
 	 * @author csh9191
 	 * @since 2021. 03. 03
 	 */	
+	public Collection<Point> getAllPointList(Point point) {
+		return pointDao.getAllPointList(point);
+	}
 	public Collection<Point> getAccumulatePointList(Point point) {
 		return pointDao.getAccumulatePointList(point);
 	}
-	
 	public Collection<Point> getUsePointList(Point point) {
 		return pointDao.getUsePointList(point);
 	}
-	public Collection<Point> getAllPointList(Point point) {
-		return pointDao.getAllPointList(point);
-	}
+
 
 }

+ 11 - 0
src/main/java/com/style24/front/biz/service/TsfReviewService.java

@@ -23,6 +23,17 @@ public class TsfReviewService {
 	@Autowired
 	private TsfReviewDao reviewDao;
 
+	/**
+	 * 상품 리뷰 목록 건수
+	 * @param review
+	 * @return 
+	 * @author eskim
+	 * @since 2021. 3. 16
+	 */
+	public int  getReviewTotalCount(Review review) {
+		return reviewDao.getReviewTotalCount(review);
+	}
+	
 	/**
 	 * 상품 리뷰 목록
 	 * @param review

+ 59 - 0
src/main/java/com/style24/front/biz/web/TsfGoodsController.java

@@ -198,6 +198,7 @@ public class TsfGoodsController extends TsfBaseController {
 		review.setGoodsCd(goods.getGoodsCd());
 		review.setBestYn("Y");
 		review.setRownum(1);
+		review.setGoodsType(goods.getGoodsType());
 		mav.addObject("bestReviewList", reviewService.getReviewList(review));
 		
 		// 카드 혜택안내
@@ -607,10 +608,68 @@ public class TsfGoodsController extends TsfBaseController {
 
 		// 상품 기본정보
 		mav.addObject("goodsInfo", goods);
+		
+		// 사이즈 정보
+		// 입점은 옵션1 노출
+		// 자사는 옵션2 노출
+		
+		// 상품평 포인트
+		GagaMap reviewPoint = new GagaMap();
+		reviewPoint.set("textReviewPoint", envsetService.getTextReviewPoint(TscConstants.Site.STYLE24.value()));	//텍스트상품평포인트
+		reviewPoint.set("photoReviewPoint", envsetService.getPhotoReviewPoint(TscConstants.Site.STYLE24.value()));	//포토상품평포인트
+		reviewPoint.set("bestReviewPoint", envsetService.getBestReviewPoint(TscConstants.Site.STYLE24.value()));	//베스트상품평포인트
+		mav.addObject("reviewPoint", reviewPoint);
+		
+		Review review = new Review();
+		review.setGoodsCd(goods.getGoodsCd());
+		review.setRownum(1);
+		review.setGoodsType(goods.getGoodsType());
+		mav.addObject("reviewList", reviewService.getReviewList(review));	// 전체상품평 유무 확인
+		
+		
+		review.setBestYn("Y");
+		review.setRownum(0);	// 전체 조회
+		mav.addObject("bestReviewList", reviewService.getReviewList(review));	//베스트상품평
+		
+		review.setPhotoYn("Y");
+		review.setBestYn("");
+		review.setRownum(0);	// 전체 조회
+		mav.addObject("photoReviewList", reviewService.getReviewList(review));	//포토상품평
 
 		mav.setViewName(super.getDeviceViewName("goods/GoodsReviewForm"));
 		return mav;
 	}
+	
+	/**
+	 * 상품평 목록
+	 * @param counsel - 상담정보
+	 * @return
+	 * @author eskim
+	 * @since 2021. 3. 16
+	 */
+	@PostMapping("/review/list")
+	@ResponseBody
+	public GagaMap getGoodsReviewList(@RequestBody Review review) {
+
+		log.info(" getGoodsReviewList =>{}", review);
+
+		GagaMap result = new GagaMap();
+
+		TscPageRequest pageable = new TscPageRequest((review.getPageNo() > 0 ? review.getPageNo() - 1 : 0), review.getPageSize(), review.getPageUnit());
+		pageable.setTotalCount(reviewService.getReviewTotalCount(review));
+		review.setPageable(pageable);
+
+		if (TsfSession.isLogin()) {
+			review.setCustNo(TsfSession.getInfo().getCustNo());
+		}
+		
+		result.set("paging", review);
+		log.info("-------------------------------------------------------------");
+		result.set("dataList", reviewService.getReviewList(review));
+		log.info("-------------------------------------------------------------");
+
+		return result;
+	}
 
 	/**
 	 * 상품상세 -  상품평 - 베스트 레이어

+ 44 - 44
src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -19,6 +19,7 @@ import org.springframework.web.servlet.ModelAndView;
 import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
 import com.gagaframework.web.rest.server.GagaResponseStatus;
+import com.style24.core.biz.service.TscCouponService;
 import com.style24.core.biz.service.TscCustomerService;
 import com.style24.core.biz.service.TscKakaoPayService;
 import com.style24.core.biz.service.TscOrderChangeService;
@@ -106,6 +107,9 @@ public class TsfMypageController extends TsfBaseController {
 
 	@Autowired
 	private NiceCertify niceCertify;
+	
+	@Autowired
+	private TscCouponService coreCouponService;
 
 	/**
 	 * 마이페이지 메인 화면
@@ -534,55 +538,19 @@ public class TsfMypageController extends TsfBaseController {
 		mav.addObject("expectedpointInfo", pointService.getExpectedPointInfo(point));
 		// 한달 이내 소멸 예정 포인트
 		mav.addObject("extinctpointInfo", pointService.getExtinctPointInfo(point));
+		// 전체내역 조회
+		mav.addObject("allPointList",pointService.getAllPointList(point));
+		// 적립내역 조회
+		mav.addObject("accumulatePointList",pointService.getAccumulatePointList(point));
+		// 사용내역 조회
+		mav.addObject("usePointList",pointService.getUsePointList(point));
 		
 		mav.setViewName(super.getDeviceViewName("mypage/MypagePointForm"));
 		return mav;
 	}
 	
 	/**
-	 * 마이페이지 STYLE24 적립내역
-	 *
-	 * @param param
-	 * @return GagaMap
-	 * @author csh9191
-	 * @since 2021. 03. 02
-	 */
-	@PostMapping("/point/list")
-	@ResponseBody
-	public GagaMap getAccumulatePointList(@RequestBody Point point) {
-		GagaMap result = new GagaMap();
-		
-		int custNo = TsfSession.getInfo().getCustNo();
-		point.setCustNo(custNo);
-		
-		result.set("accumulatePointList",pointService.getAccumulatePointList(point));
-		
-		return result;
-	}
-	
-	/**
-	 * 마이페이지 STYLE24 사용내역
-	 *
-	 * @param param
-	 * @return GagaMap
-	 * @author csh9191
-	 * @since 2021. 03. 02
-	 */
-	@PostMapping("/usepoint/list")
-	@ResponseBody
-	public GagaMap getUsePointList(@RequestBody Point point) {
-		GagaMap result = new GagaMap();
-		
-		int custNo = TsfSession.getInfo().getCustNo();
-		point.setCustNo(custNo);
-		
-		result.set("usePointList",pointService.getUsePointList(point));
-		
-		return result;
-	}
-	
-	/**
-	 * 마이페이지 STYLE24 전체내역
+	 * 마이페이지 STYLE24 포인트 전체,적립,사용내역
 	 *
 	 * @param param
 	 * @return GagaMap
@@ -597,7 +565,12 @@ public class TsfMypageController extends TsfBaseController {
 		int custNo = TsfSession.getInfo().getCustNo();
 		point.setCustNo(custNo);
 		
+		// 전체내역 조회
 		result.set("allPointList",pointService.getAllPointList(point));
+		// 적립내역 조회
+		result.set("accumulatePointList",pointService.getAccumulatePointList(point));
+		// 사용내역 조회
+		result.set("usePointList",pointService.getUsePointList(point));
 		
 		return result;
 	}
@@ -726,7 +699,7 @@ public class TsfMypageController extends TsfBaseController {
 	 * @author sowon	
 	 * @since 2021. 03. 16
 	 */
-	@GetMapping({"/coupon/form"})
+	@GetMapping("/coupon/form")
 	public ModelAndView mypageCouponForm(Coupon coupon) {
 		ModelAndView mav = new ModelAndView();
 		mav.addObject("couponList",couponService.getMypageCouponList(coupon));
@@ -735,6 +708,33 @@ public class TsfMypageController extends TsfBaseController {
 		
 		return mav;
 	}
+	
+	/**
+	 * 마이페이지 쿠폰 상세보기 팝업
+	 *
+	 * @return
+	 * @author sowon	
+	 * @since 2021. 03. 17
+	 */
+	@GetMapping(value="/coupon/detailPop")
+	public ModelAndView mypageCouponDetailPop(@RequestParam(value = "cpnId") int cpnId) {
+		ModelAndView mav = new ModelAndView();
+		
+		// 쿠폰 - 기본정보
+		mav.addObject("couponDetailInfo", couponService.getCouponDetailInfo(cpnId));
+		// 쿠폰적용대상 - 공급업체 조회
+		mav.addObject("cpnDtlRefvalSupplyCompList", coreCouponService.getCouponRefvalSupplyCompList(cpnId));
+		// 쿠폰적용대상 - 적용상품 조회
+		mav.addObject("cpnDtlRefvalApplyGoodsList", coreCouponService.getCouponRefvalGoodsList(cpnId, "G260_10"));
+		// 쿠폰적용대상 - 카테고리 조회
+		mav.addObject("cpnDtlRefvalCateList", coreCouponService.getCouponRefvalCategoryList(cpnId));
+		// 쿠폰적용대상 - 브랜드 조회
+		mav.addObject("cpnDtlRefvalBrandList", coreCouponService.getCouponRefvalBrandList(cpnId));
+		// 쿠폰적용대상 - 제외상품 조회
+		mav.addObject("cpnDtlRefvalExceptGoodsList", coreCouponService.getCouponRefvalGoodsList(cpnId, "G260_14"));
+		mav.setViewName(super.getDeviceViewName("mypage/MypageCouponDetailPop"));
+		return mav;
+	}
 
 
 

+ 20 - 0
src/main/java/com/style24/persistence/domain/Goods.java

@@ -117,6 +117,26 @@ public class Goods extends TscBaseDomain {
 	private String delvFeeCrite;	//배송비부과기준(공통코드G078)
 	private int reviewRegCnt;	//상품평등록건수
 	private float score;		//상품 구매평점
+	private int scoreSize1;
+	private int scoreSize2;
+	private int scoreSize3;
+	private int scoreColor1;
+	private int scoreColor2;
+	private int scoreColor3;
+	private int scoreFit1;
+	private int scoreFit2;
+	private int scoreFit3;
+	private int scoreThick1;
+	private int scoreThick2;
+	private int scoreThick3;
+	private int scoreWeight1;
+	private int scoreWeight2;
+	private int scoreWeight3;
+	private int scoreBall1;
+	private int scoreBall2;
+	private int scoreBall3;
+	
+	private String sizeGb;		// 사이즈구분(T:상의, B:하의, S:신발)
 
 	private int floorUnit; // 절사단위(1:일원단위절사, 10:십원단위절사, 100:백원단위절사)
 	private Integer cpnId;			// 쿠폰ID

+ 11 - 0
src/main/java/com/style24/persistence/domain/Review.java

@@ -2,8 +2,10 @@ package com.style24.persistence.domain;
 
 import java.util.Collection;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import com.style24.core.support.util.MaskingUtils;
 import com.style24.persistence.TscBaseDomain;
+import com.style24.persistence.TscPageRequest;
 
 import lombok.Data;
 
@@ -57,6 +59,8 @@ public class Review extends TscBaseDomain {
 	private String scoreThickNm;	// 두께감점수(공통코드G079)
 	private String scoreWeightNm;	// 무게감점수(공통코드G080)
 	private String scoreBallNm;		// 볼넓이점수(공통코드G041)
+	private String photoYn;			// 포토상품평유무
+	private String goodsType;		// 상품유형
 	private int rownum;
 	
 	// Masking
@@ -68,4 +72,11 @@ public class Review extends TscBaseDomain {
 	
 	Collection<Goods> goodsOptionList;			//상품평 상품 옵션목록
 	
+	// Pagination
+	@JsonInclude(JsonInclude.Include.NON_EMPTY)
+	private TscPageRequest pageable;
+
+	private int pageNo = 1;
+	private int pageSize = 10;
+	private int pageUnit = 10;
 }

+ 42 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsfCoupon.xml

@@ -543,4 +543,46 @@
 		  AND A.CPN_STAT = 'G232_11'
 	</select>
 	
+	<select id="getCouponDetailInfo" resultType="Coupon" parameterType="Coupon">
+		/* TsfCoupon.getCouponDetailInfo -- custNo 변경 예정*/
+		SELECT A.CPN_ID
+		     ,A.CPN_NM
+		     ,A.CPN_DESC
+		     ,A.SITE_CD
+		     ,A.AF_LINK_CD
+		     ,A.CPN_TYPE
+		     ,A.APPLY_SCOPE
+		     ,A.DC_WAY
+		     ,A.DC_PVAL
+		     ,A.DC_MVAL
+		     ,A.DC_AVAL
+		     ,A.MAX_DC_AMT
+		     ,A.PD_GB
+		     ,DATE_FORMAT(A.AVAIL_STDT,'%Y-%m-%d') AS AVAIL_STDT
+		     ,DATE_FORMAT(A.AVAIL_EDDT,'%Y-%m-%d') AS AVAIL_EDDT
+		     ,A.AVAIL_DAYS
+		     ,A.CUST_PUB_LIMIT_QTY
+		     ,A.TOT_PUB_LIMIT_QTY
+		     ,A.ONE_PUB_QTY
+		     ,A.DN_GB
+		     ,A.DOWN_STDT
+		     ,A.DOWN_EDDT
+		     ,A.BUY_LIMIT_AMT
+		     ,A.PLAN_SQ
+		     ,A.REISSUANCE
+		     ,A.CPN_STAT
+		     ,A.END_ALIM_YN
+		     ,A.FIRST_ORD_YN
+		     ,A.DOWN_ABL_YN
+		     ,A.DC_CD_GB
+		     ,A.CUST_JOIN_STDT
+		     ,A.CUST_JOIN_EDDT
+		     ,A .BUY_STDT
+		     ,A.BUY_EDDT
+		     ,A.NEW_CUST_YN
+		FROM TB_COUPON A
+		WHERE 1=1
+		 AND A.CPN_ID = #{cpnId}
+	</select>
+	
 </mapper>

+ 19 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsfGoods.xml

@@ -153,6 +153,25 @@
 		     , (CASE WHEN G.SELF_GOODS_YN ='Y' AND IFNULL(DS.GOODS_CD, 'Y') THEN 'Y' ELSE 'N' END ) AS QUIK_DELV_YN
 		     , GS.REVIEW_REG_CNT
 		     , GS.SCORE
+		     , GS.SCORE_SIZE1
+		     , GS.SCORE_SIZE2
+		     , GS.SCORE_SIZE3
+		     , GS.SCORE_COLOR1
+		     , GS.SCORE_COLOR2
+		     , GS.SCORE_COLOR3
+		     , GS.SCORE_FIT1
+		     , GS.SCORE_FIT2
+		     , GS.SCORE_FIT3
+		     , GS.SCORE_THICK1
+		     , GS.SCORE_THICK2
+		     , GS.SCORE_THICK3
+		     , GS.SCORE_WEIGHT1
+		     , GS.SCORE_WEIGHT2
+		     , GS.SCORE_WEIGHT3
+		     , GS.SCORE_BALL1
+		     , GS.SCORE_BALL2
+		     , GS.SCORE_BALL3
+		     , (SELECT TI.SIZE_GB FROM TB_ITEMKIND TI WHERE TI.ITEMKIND_CD = G.ITEMKIND_CD) AS SIZE_GB
 		FROM TB_GOODS G
 		INNER JOIN TB_GOODS_SUMMARY GS ON G.GOODS_CD = GS.GOODS_CD
 		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD

+ 1 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsfPlanning.xml

@@ -81,6 +81,7 @@
 			      ,P.DISP_EDDT 
 			      ,P.DISP_STDT 
 			      ,P.DEL_YN 
+			      ,P.OPEN_YN 
 			FROM TB_PLAN P
 			GROUP BY  P.PLAN_SQ 
 			      ,P.PLAN_NM 

+ 4 - 4
src/main/java/com/style24/persistence/mybatis/shop/TsfPoint.xml

@@ -80,8 +80,8 @@
 		ON (TG.GOODS_CD = TOD.GOODS_CD OR TG.GOODS_CD = TR.GOODS_CD)
 		WHERE TCHP.CUST_NO = #{custNo}
 		AND CASE 																					/* 상품평조건 */
-			WHEN TCHP.REVIEW_SQ IS NULL THEN 1
-			WHEN TCHP.REVIEW_SQ IS NOT NULL AND TR.REVIEW_SQ IS NOT NULL THEN 1
+			WHEN NULLIF(TCHP.REVIEW_SQ, 0) IS NULL THEN 1
+			WHEN NULLIF(TCHP.REVIEW_SQ, 0) IS NOT NULL AND NULLIF(TR.REVIEW_SQ, 0) IS NOT NULL THEN 1
 		END > 0	
 		AND TCHP.OCCUR_GB IN ('G069_12','G069_20','G069_30','G069_90')
 		AND TCHP.PNT_UPLOAD_STAT = 'G070_30'														/* 공통코드 : 반영완료 */
@@ -175,8 +175,8 @@
 		ON (TG.GOODS_CD = TOD.GOODS_CD OR TG.GOODS_CD = TR.GOODS_CD)
 		WHERE TCHP.CUST_NO = #{custNo}
 		AND CASE
-			WHEN TCHP.REVIEW_SQ IS NULL THEN 1
-			WHEN TCHP.REVIEW_SQ IS NOT NULL AND TR.REVIEW_SQ IS NOT NULL THEN 1
+			WHEN NULLIF(TCHP.REVIEW_SQ, 0) IS NULL THEN 1
+			WHEN NULLIF(TCHP.REVIEW_SQ, 0) IS NOT NULL AND NULLIF(TR.REVIEW_SQ, 0) IS NOT NULL THEN 1
 		END <![CDATA[>]]> 0		
 		AND TCHP.OCCUR_GB IN ('G069_12','G069_13','G069_20','G069_30','G069_40','G069_42','G069_90','G069_99')
 		AND TCHP.PNT_UPLOAD_STAT = 'G070_30'

+ 46 - 4
src/main/java/com/style24/persistence/mybatis/shop/TsfReview.xml

@@ -10,13 +10,46 @@
 
 	<!-- 페이징을 위한 select절 하단 -->
 	<sql id="selectForPagingFooter">
-		       ) ORIGINAL
-		WHERE  NUMB BETWEEN #{pageable.startRow} AND #{pageable.endRow}
+		<choose>
+		<when test="pageable != null">
+		    ) ORIGINAL
+		WHERE RNUM BETWEEN  #{pageable.startRow} AND #{pageable.endRow}
+		</when>
+		<otherwise>
+		    ) ORIGINAL
+		</otherwise>
+		</choose>
 	</sql>
 	
+	<!-- 상품 리뷰 목록 count -->
+	<select id="getReviewTotalCount" parameterType="Review" resultType="int">
+		/* TsfReivew.getReviewTotalCount */
+		SELECT COUNT(*)
+		FROM TB_REVIEW R 
+		INNER JOIN TB_GOODS G ON R.GOODS_CD = G.GOODS_CD
+		INNER JOIN TB_ORDER_DETAIL OD ON R.ORD_NO = OD.ORD_NO 
+		                              AND R.ORD_DTL_NO  = OD.ORD_DTL_NO
+		                              AND R.GOODS_CD = OD.GOODS_CD
+		INNER JOIN TB_ORDER_DETAIL_ITEM ODI ON OD.ORD_NO = ODI.ORD_NO 
+		                                    AND OD.ORD_DTL_NO  = ODI.ORD_DTL_NO
+		<if test='goodsType != null and goodsType != "G056_S" '>
+		                              AND OD.GOODS_CD = ODI.ITEM_CD 
+		</if>
+		INNER JOIN TB_CUSTOMER C ON R.REG_NO  = C.CUST_NO
+		AND R.GOODS_CD = #{goodsCd}
+		<if test='bestYn != null and bestYn == "Y"'>
+		AND R.BEST_YN = 'Y'
+		</if>
+		<if test='photoYn != null and photoYn == "Y"'>
+		AND EXISTS (SELECT 1 FROM TB_REVIEW_ATTACH WHERE DEL_YN = 'N' AND REVIEW_SQ = R.REVIEW_SQ)
+		</if>
+		AND R.DEL_YN = 'N'
+	</select>
+		
 	<!-- 상품 리뷰 목록 -->
 	<select id="getReviewList" parameterType="Review" resultType="Review">
 		/* TsfReivew.getReviewList */
+		<include refid="selectForPagingHeader"/>
 		SELECT *
 		FROM (
 		SELECT R.REVIEW_SQ
@@ -60,21 +93,30 @@
 		     , C.CUST_ID 
 		     , (SELECT MAX(SYS_IMG_NM) FROM TB_GOODS_IMG WHERE GOODS_CD = G.GOODS_CD AND COLOR_CD = IFNULL(G.MAIN_COLOR_CD,'XX') AND DEFAULT_IMG_YN = 'Y') AS SYS_IMG_NM
 		     , (SELECT TI.SIZE_GB FROM TB_ITEMKIND TI WHERE TI.ITEMKIND_CD = G.ITEMKIND_CD) AS SIZE_GB
-		     , RANK() OVER(ORDER BY R.REVIEW_SQ DESC) AS NUMB
+		     , RANK() OVER(ORDER BY R.REVIEW_SQ DESC) AS RNUM
 		FROM TB_REVIEW R 
 		INNER JOIN TB_GOODS G ON R.GOODS_CD = G.GOODS_CD
 		INNER JOIN TB_ORDER_DETAIL OD ON R.ORD_NO = OD.ORD_NO 
 		                               AND R.ORD_DTL_NO  = OD.ORD_DTL_NO 
+		INNER JOIN TB_ORDER_DETAIL_ITEM ODI ON OD.ORD_NO = ODI.ORD_NO 
+		                                    AND OD.ORD_DTL_NO  = ODI.ORD_DTL_NO
+		<if test='goodsType != null and goodsType != "G056_S" '>
+		                              AND OD.GOODS_CD = ODI.ITEM_CD 
+		</if>
 		INNER JOIN TB_CUSTOMER C ON R.REG_NO  = C.CUST_NO
 		AND R.GOODS_CD = #{goodsCd}
 		<if test='bestYn != null and bestYn == "Y"'>
 		AND R.BEST_YN = 'Y'
 		</if>
+		<if test='photoYn != null and photoYn == "Y"'>
+		AND EXISTS (SELECT 1 FROM TB_REVIEW_ATTACH WHERE DEL_YN = 'N' AND REVIEW_SQ = R.REVIEW_SQ)
+		</if>
 		AND R.DEL_YN = 'N'
 		)Z
 		<if test="rownum != null and rownum > 0 ">
-		WHERE NUMB = 1
+		WHERE RNUM = 1
 		</if>
+		<include refid="selectForPagingFooter"/>
 	</select>
 	
 	<!-- 상품평 첨부파일 목록 -->

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

@@ -18,8 +18,6 @@
  -->
 <body>
 <th:block layout:fragment="content">
-<link rel="stylesheet" type="text/css" href="/ux/pc/css/swiper.min.css" />
-<script type="text/javascript" src="https://cdnjs.cloudflare.com/ajax/libs/Swiper/4.5.0/js/swiper.min.js"></script>
 <div id="container" class="container pd" th:with="imgGoodsUrl=${@environment.getProperty('upload.goods.view')}, uxImgUrl=${@environment.getProperty('domain.uximage')}, imgUrl=${@environment.getProperty('upload.image.view')}">
 	<th:block th:include="~{web/goods/GoodsIncludeFormWeb :: goodsNaviForm}"></th:block>
 	
@@ -302,8 +300,8 @@
 												<span class="tit">리뷰<em class="number">(
 												<th:block  th:text="${(goodsInfo.reviewRegCnt <= 9999) ? #numbers.formatInteger(goodsInfo.reviewRegCnt, 0,'COMMA')  : '9,999+'}"></th:block>
 												)</em></span>
-												<div class="star_score">
-													<span class="star" th:with="starScore=${#numbers.formatDecimal((goodsInfo.score/5)*100, 0,0)}">
+												<div class="star_score" th:if="${goodsInfo.reviewRegCnt  > 0 }">
+													<span class="star" th:with="starScore=${#numbers.formatDecimal((goodsInfo.score*100/5), 0,0)}">
 														<em class="progbar" th:style="${'width:'+starScore+'%;' }"></em> <!-- 평점 style로 표기 -->
 													</span>
 													<span class="score"><em th:text="${goodsInfo.score}">4.3</em>점</span>
@@ -319,7 +317,7 @@
 													<span class="thumb" th:classAppend="${(reviewAttach.fileGb == 'M') ? 'mov' :''}" th:style="${'background-image:url('+imgUrl+ reviewAttach.sysFileNm+');'}"></span><!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->
 													</th:block>
 												</div>
-												<div class="star_score" th:with="starScore=${#numbers.formatDecimal((bestReview.score/5)*100, 0,0)}">
+												<div class="star_score" th:with="starScore=${#numbers.formatDecimal((bestReview.score*100/5), 0,0)}">
 													<span class="star">
 														<em class="progbar" th:style="${'width:'+starScore+'%;' }"></em> <!-- 평점 style로 표기 -->
 													</span>
@@ -1220,6 +1218,24 @@
 		jfOptionSoldout();
 	});
 	
+	// 상품평 레이어 호출후 콜백에서 호출하므로 여기에 있어야함
+	var reviewAfter = function(){
+		//슬라이드 - 베스트리뷰
+		var bestReviewtSwiper = new Swiper('.area_rv_best .swiper-container', {
+			slidesPerView: 2,
+			spaceBetween: 20,
+			navigation: {
+				nextEl: '.area_rv_best .swiper-button-next',
+				prevEl: '.area_rv_best .swiper-button-prev',
+			},
+			pagination: {
+				el: '.area_rv_best .swiper-pagination',
+				clickable: true,
+			},
+		}); 
+		
+	}
+	
 /*]]>*/
 </script>
 </th:block>

+ 6 - 12
src/main/webapp/WEB-INF/views/web/goods/GoodsReviewBestFormWeb.html

@@ -50,7 +50,7 @@
 								<div class="review_cont">
 									<div class="box_wrap">
 										<div class="star_box">
-											<div class="star_score" th:with="starScore=${#numbers.formatDecimal((review.score/5)*100, 0,0)}">
+											<div class="star_score" th:with="starScore=${#numbers.formatDecimal((review.score*100/5), 0,0)}">
 												<span class="star">
 													<em class="progbar" th:style="${'width:'+starScore+'%;' }"></em> <!-- 평점 style로 표기 -->
 												</span>
@@ -76,7 +76,7 @@
 												</dl>
 											</div>
 											<div th:if="${not #strings.isEmpty(review.sizeGb)}">  <!-- 사이즈구분(T:상의, B:하의, S:신발) -->
-												<dl th:if="${review.sizeGb == 'T' or review.sizeGb == 'B'}"> 
+												<dl > 
 													<div>
 														<dt>사이즈</dt>
 														<dd th:text="${review.scoreSizeNm}">작음</dd>
@@ -85,6 +85,7 @@
 														<dt>컬러</dt>
 														<dd th:text="${review.scoreColorNm}">밝음</dd>
 													</div>
+													<th:block th:if="${review.sizeGb == 'T' or review.sizeGb == 'B'}">
 													<div>
 														<dt>핏</dt>
 														<dd th:text="${review.scoreFitNm}">레귤러</dd>
@@ -93,16 +94,8 @@
 														<dt>두께감</dt>
 														<dd th:text="${review.scoreThickNm}">적당함</dd>
 													</div>
-												</dl>
-												<dl th:unless="${review.sizeGb == 'T' or review.sizeGb == 'B'}"> 
-													<div>
-														<dt>사이즈</dt>
-														<dd th:text="${review.scoreSizeNm}">작음</dd>
-													</div>
-													<div>
-														<dt>컬러</dt>
-														<dd th:text="${review.scoreColorNm}">밝음</dd>
-													</div>
+													</th:block>
+													<th:block th:unless="${review.sizeGb == 'T' or review.sizeGb == 'B'}">
 													<div>
 														<dt>무게감</dt>
 														<dd th:text="${review.scoreWeightNm}">레귤러</dd>
@@ -111,6 +104,7 @@
 														<dt>볼너비</dt>
 														<dd th:text="${review.scoreBallNm}">적당함</dd>
 													</div>
+													</th:block>
 												</dl>
 											</div>
 										</div>

Разница между файлами не показана из-за своего большого размера
+ 167 - 859
src/main/webapp/WEB-INF/views/web/goods/GoodsReviewFormWeb.html


+ 72 - 0
src/main/webapp/WEB-INF/views/web/mypage/MypageCouponDetailPopWeb.html

@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org"
+	style="overflow-x: hidden !important;"
+>
+<!--
+ *******************************************************************************
+ * @source  : CouponDetailPopWeb.html
+ * @desc    : 쿠폰적용대상 리스트 Page
+ *============================================================================
+ * PastelMall
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.03.17   sowon     최초 작성
+ *******************************************************************************
+ -->
+<!-- 쿠폰 상세보기 팝업 -->
+<div class="modal-dialog" role="document">
+	<div class="modal-content">
+		<div class="modal-header">
+			<h5 class="modal-title" th:text="${couponDetailInfo.cpnNm}"></h5>
+		</div>
+		<div class="modal-body">
+			<section class="order_row">
+				<div class="coupon_condition">
+					<dl class="clear">
+						<dt>사용조건</dt>
+						<dd th:if="${couponDetailInfo.buyLimitAmt < 1}">제한없음</dd>
+						<dd th:unless="${couponDetailInfo.buyLimitAmt < 1}">
+							<span th:text="${#numbers.formatInteger(couponDetailInfo.buyLimitAmt,0,'COMMA')}"></span>원 구매 시 최대 <span th:text="${#numbers.formatInteger(couponDetailInfo.maxDcAmt,0,'COMMA')}"></span>원 할인
+						</dd>
+					</dl>
+					<dl class="clear">
+						<dt>발급수량</dt>
+						<dd th:if="${couponDetailInfo.custPubLimitQty < 1}">제한없음</dd>
+						<dd th:unless="${couponDetailInfo.custPubLimitQty < 1}" th:text="'1인 최대 '+${#numbers.formatInteger(couponDetailInfo.custPubLimitQty,0,'COMMA')} + ' 매'"></dd>
+					</dl>
+					<dl class="clear">
+						<dt>유효기간</dt>
+						<dd th:text="${couponDetailInfo.availStdt} + ' ~ ' +${couponDetailInfo.availEddt}"></dd>
+					</dl>
+					<dl class="clear">
+						<dt>적용 브랜드</dt>
+						<th:block th:each="BrandData, BrandStat : ${cpnDtlRefvalBrandList}">
+						<dd th:text="${BrandData.brandEnm}"></dd>
+						</th:block>
+					</dl>
+					<dl class="clear">
+						<dt>적용 카테고리</dt>
+						<th:block th:each="CateData, CateStat : ${cpnDtlRefvalCateList}">
+						<dd th:text="${CateData.cateNm}"></dd>
+						</th:block>
+					</dl>
+					<dl class="clear">
+						<dt>적용 상품</dt>
+						<th:block th:each="GoodsData, GoodsStat : ${cpnDtlRefvalApplyGoodsList}">
+						<dd th:text="'- '+${GoodsData.goodsNm}"></dd><br>
+						</th:block>
+					</dl>
+					<dl class="clear">
+						<dt>제외 상품</dt>
+						<th:block th:each="ExceptData, ExceptStat : ${cpnDtlRefvalExceptGoodsList}">
+						<dd th:text="'- '+${ExceptData.goodsNm}"></dd><br>
+						</th:block>
+					</dl>
+				</div>
+			</section>
+		</div>
+	</div>
+</div>

+ 19 - 28
src/main/webapp/WEB-INF/views/web/mypage/MypageCouponFormWeb.html

@@ -65,7 +65,7 @@
 						</th:block>
 						
 						<div class="cp_info">
-							<button type="button" id="" class="coupon_pop_btn"><span>사용안내</span></button>
+							<button type="button" th:onclick="useInfoCoupon([[${CouponData.cpnId}]])" class="coupon_pop_btn"><span>사용안내</span></button>
 						</div>
 					</li>
 					</th:block>
@@ -75,32 +75,27 @@
 	</div>
 	
 	<!-- 쿠폰 사용 내역 팝업 -->
-		<div class="modal coupon_popup" tabindex="-1" role="dialog" aria-labelledby="PopupBasicLabel" aria-hidden="true">
-			<div class="modal-dialog" role="document">
-			  <div class="modal-content">
-				<div class="modal-header">
-					<h5 class="modal-title">사용 조건</h5>
-				</div>
-				<div class="modal-body">
-					<section class="order_row">
-						<div class="coupon_condition">
-							<dl class="clear">
-								<dt>사용조건</dt>
-								<dd><span>9,999,999</span>원 구매 시 최대 <span>9,999,999</span>원 할인</dd>
-							</dl>
-							<dl class="clear">
-								<dt>대상조건</dt>
-								<dd>남성,여성,유아동 카테고리</dd>
-							</dl>
-						</div>
-					</section>
-				</div>
-			  </div>
-			</div>
-		</div>
+	<div class="modal coupon_popup" tabindex="-1" role="dialog" aria-labelledby="PopupBasicLabel" aria-hidden="true" id="couponDetailPop"></div>
 
 	<!-- // container -->	
 <script th:inline="javascript">
+// 사용안내 모달
+var useInfoCoupon = function (id) {
+	 $.ajax( {
+		type		: "GET",
+		url 		: '/mypage/coupon/detailPop?cpnId='+ id,
+		dataType 	: 'html',
+		success 	: function(result) {
+			if (result != null) {
+				$("#couponDetailPop").html(result);
+				$("#couponDetailPop").modal("show");
+			}
+		}
+	});
+	
+	return false; 
+}
+
 $(document).ready(function() {
 
 	// 마이페이지 LNB 설정
@@ -110,10 +105,6 @@ $(document).ready(function() {
 	fnSetMypageLocation('쿠폰', '_PAGE_MYPAGE_COUPON');
 	
 
-	$(".coupon_pop_btn").click(function() {
-		$(".coupon_popup").modal("show");
-	});
-
 });
 </script>
 </th:block>

+ 114 - 226
src/main/webapp/WEB-INF/views/web/mypage/MypagePointFormWeb.html

@@ -13,7 +13,7 @@
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION
  * ===  ===========  ==========  =============================================
- * 1.0  2021.02.25   csh9191     최초 작성
+ * 1.0  2021.02.26   csh9191     최초 작성
  *******************************************************************************
  -->
 <body>
@@ -37,9 +37,9 @@
 							</div>
 							<div class="my_tab coupon_tab">
 								<ul>
-									<li><a href="javascript:void(0);" id="SearchFullHistory">전체내역</a></li>
-									<li><a href="javascript:void(0);" id="SearchCollectHistory">적립내역</a></li>
-									<li><a href="javascript:void(0);" id="SearchUsedHistory">사용내역</a></li>
+									<li><a href="javascript:void(0);" id="allPointList">전체내역</a></li>
+									<li><a href="javascript:void(0);" id="accumulatePointList">적립내역</a></li>
+									<li><a href="javascript:void(0);" id="usePointList">사용내역</a></li>
 								</ul>
 <!-- 								<div class="form_field"> -->
 <!-- 									<select id="searchDt" name="searchDt" onchange="fnSearchDate(this);"> -->
@@ -48,6 +48,7 @@
 								<div class="form_field">
 									<div class="select_custom type1">
 										<div class="combo">
+											<input type="hidden" name="pointDate" value="0"/> 
 											<div class="select"></div> <!-- 셀렉박스 -->
 												<ul id="searchDt" class="list" style="width:200px; margin:0 auto">
 												</ul>
@@ -82,252 +83,135 @@
 						</div>
 					</div>
 <script th:inline="javascript">
+	let accumulatePointList = [[${accumulatePointList}]];
+	let usePointList = [[${usePointList}]];
+	let allPointList = [[${allPointList}]];
 
-		// select 날짜 생성
-		var date = new Date();
-		var year = date.getFullYear();
-		var month = date.getMonth() +1;
-		
-		var oneYearAgo = year -1;
-		var oneYearLater = year +1;
-		
-		if(10 > month){
-			month = 0 + "" + (date.getMonth()+1);
+	// select 날짜 생성
+	var date = new Date();
+	var year = date.getFullYear();
+	var month = date.getMonth() +1;
+
+	// TODO - 퍼블확정시
+	var oneYearAgo = year -1;
+	var twoYearAgo = year -2;
+	
+	// 이번년도
+	for(var i = 1;i <= 12; i++){
+		if(i < 10 && i != month){
+			$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + 0 + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
 		}
-		// Select this year month
-		var checkYm = year + "" + month;
-		
-		// 작년
-// 		for(var i = 1;i <= 12; i++){
-// 			if(i < 10 && i != month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearAgo + "" + 0 + i +"'>"+ oneYearAgo + "년" + " " + i + "월" +"</li>");
-// 			}
-// 			else if(i < 10 && i == month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearAgo + "" + 0 + i +"'>" + oneYearAgo + "년" + " " + i + "월" +"</li>");
-// 			}
-// 			else if(i > 9 && i != month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearAgo + "" + i +"'>"+ oneYearAgo + "년" + " " + i + "월" +"</li>");
-// 			}
-// 			else if(i > 9 && i == month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearAgo + "" + i +"'>"+ oneYearAgo + "년" + " " + i + "월" +"</li>");
-// 			}
-// 		}
-		
-		// 이번년도
-		for(var i = 1;i <= 12; i++){
-			if(i < 10 && i != month){
-				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + 0 + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
-			}
-			else if(i < 10 && i == month){
-				$(".select").append("<li class='selected' value='"+ year + "" + 0 + i +"'>" + year + "년" + " " + i + "월" +"</li>");
-				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + 0 + i +"'>" + year + "년" + " " + i + "월" +"</li>");
-			}
-			else if(i > 9 && i != month){
-				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
-			}
-			else if(i > 9 && i == month){
-				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
-			}
+		else if(i < 10 && i == month){
+			//셀렉트박스 이번 달 표시설정
+			$('.select').append("<li style='pointer-events: none' onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + 0 + i +"'>" + year + "년" + " " + i + "월" +"</li>");
+			$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + 0 + i +"'>" + year + "년" + " " + i + "월" +"</li>");
+		}
+		else if(i > 9 && i != month){
+			$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
+		}
+		else if(i > 9 && i == month){
+			$('.select').append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + ""  + i +"'>" + year + "년" + " " + i + "월" +"</li>");
+			$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
 		}
-		
-		// 내년
-// 		for(var i = 1;i <= 12; i++){
-// 			if(i < 10 && i != month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearLater + "" + 0 + i +"'>"+ oneYearLater + "년" + " " + i + "월" +"</li>");
-// 			}
-// 			else if(i < 10 && i == month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearLater + "" + 0 + i +"'>" + oneYearLater + "년" + " " + i + "월" +"</li>");
-// 			}
-// 			else if(i > 9 && i != month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearLater + "" + i +"'>"+ oneYearLater + "년" + " " + i + "월" +"</li>");
-// 			}
-// 			else if(i > 9 && i == month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearLater + "" + i +"'>"+ oneYearLater + "년" + " " + i + "월" +"</li>");
-// 			}
-// 		}
-		
-	// 날짜변경 이벤트
-	var fnChangeDate = function(parm) {
-		
-		let url = '/mypage/allpoint/list';		
-		let data = {};
-
-		data.searchDt = $('#searchDt').find('.selected').val();
-
-		var jsonData = JSON.stringify(data);
-		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-			
-			if($("#SearchFullHistory").hasClass("on")){
-				$("#SearchFullHistory").click();
-			}else if($("#SearchCollectHistory").hasClass("on")){
-				$("#SearchCollectHistory").click();
-			}else if($("#SearchUsedHistory").hasClass("on")){
-				$("#SearchUsedHistory").click();
-			}
-		});
 	}
 
-		
-	// 전체내역 조회
-	$("#SearchFullHistory").click(function(){
-		// class제거 추가
-		$("#SearchCollectHistory").removeClass("on");
-		$("#SearchUsedHistory").removeClass("on");
-		$("#SearchFullHistory").addClass("on");
-		$("#plusMinus").text("증감/차감");
-		
+	// 날짜변경 이벤트
+	var fnChangeDate = function(param) {
+		let url = '/mypage/allpoint/list';
+		
+ 		$(param).parent().parent().find('input[name=pointDate]').val($(param).val());
+ 		var pointData = $(param).parent().parent().find('input[name=pointDate]').val();
+ 		
+ 		if(10 > month){
+ 			month = "0" + month;
+ 		}
+ 		
+ 		// 포인트화면 로딩시 이번달 설정 리스트 표시하기 위함
+ 		if(pointData == null){
+ 			pointData = year + "" + month;
+ 		}
+ 		
 		let data = {};
 		
-		// 처음 화면 로딩시 이번 달 선택
-		if($('.select').find('.selected').val() == checkYm){
-			data.searchDt = $('.select').find('.selected').val();
-		}else{
-			data.searchDt = $('#searchDt').find('.selected').val();
-		}
-
-		var jsonData = JSON.stringify(data);
+		data.searchDt = pointData;
 		
-		$.ajax(
-				{
-					type 	 : "POST",
-					data	 : jsonData,
-					url 	 : '/mypage/allpoint/list',
-					contentType: 'application/json',
-  					dataType : 'json',
-					success  : function(result){
-						PointAllListInfo(result);
-					}
-				}
-		)
-	});
-
-	function PointAllListInfo(result) {
+ 		console.log(data);
 		
-		let allPointList = result.allPointList;
+		var jsonData = JSON.stringify(data);
 		
-		let tmtbHtml = "";
-		for(let i=0; i<allPointList.length; i++){
-			let point = allPointList[i];
-			tmtbHtml +='<tr>';
-			tmtbHtml +='<td>'+ point.occurGb + '</td>';
-			tmtbHtml += '<td class="t_l pl40">'+ point.occurDtlDesc + '</td>';
-			if(point.pntAmt > 0){
-				tmtbHtml += '<td class="c_blue">'+ point.pntAmt + '</td>';
+		gagajf.ajaxJsonSubmit('/mypage/allpoint/list', jsonData, function(result){
+						accumulatePointList = result.accumulatePointList;
+						usePointList = result.usePointList;
+						allPointList = result.allPointList;
+						
+						// 클릭상태 확인
+						if($("#accumulatePointList").hasClass("on")){
+							$("#accumulatePointList").click();
+						}else if($("#usePointList").hasClass("on")){
+							$("#usePointList").click();
+						}else if($("#allPointList").hasClass("on")) {
+							$("#allPointList").click();
+						}
+						// 첫화면 전체내역 조회
+						fnGetPointTableInfo();
+		});
+	}
+	
+	// HTML 그리기
+	var fnGetPointTableInfo = function(param) {
+		let tag = "";
+		$.each(param, function(idx,item){
+			tag +='<tr>';
+			tag +='<td>'+ item.occurGb + '</td>';
+			tag += '<td class="t_l pl40">'+ item.occurDtlDesc + '</td>';
+			// 증감 : 파랑, 차감 : 빨강으로 표시
+			if(item.pntAmt > 0){
+				tag += '<td class="c_blue">'+ item.pntAmt + '</td>';
 			}else{
-				tmtbHtml += '<td class="c_primary">'+ point.pntAmt + '</td>';
+				tag += '<td class="c_primary">'+ item.pntAmt + '</td>';
 			}
-			tmtbHtml += '<td>'+ point.pntUploadDt + '</td>';
-			tmtbHtml += '</tr>';
-		}
-		$("#pointAjaxList").html(tmtbHtml);
+			tag += '<td>'+ item.pntUploadDt + '</td>';
+			tag += '</tr>';
+		});
+		$("#pointAjaxList").html(tag);
 	}
+	
+	// 전체내역 조회
+	$("#allPointList").click(function(){
 
+ 		$("#accumulatePointList").removeClass("on");
+ 		$("#usePointList").removeClass("on");
+ 		
+ 		$("#allPointList").addClass("on");
+ 		$("#plusMinus").text("증감/차감");
+ 		
+ 		fnGetPointTableInfo(allPointList);
+	});
 	
 	// 적립내역 조회
-	$("#SearchCollectHistory").click(function(){
-		// Class제거 추가
-		$("#SearchFullHistory").removeClass("on");
-		$("#SearchUsedHistory").removeClass("on");
-		$("#SearchCollectHistory").addClass("on");
-		
-		// 적립내역 포인트 블루
-		$("#pntAmt").removeClass("c_primary");
-		$("#pntAmt").addClass("c_blue");
-		$("#plusMinus").text("증감");
-		
-		let data = {};
-		
-		if($('.select').find('.selected').val() == checkYm){
-			data.searchDt = $('.select').find('.selected').val();
-		}else{
-			data.searchDt = $('#searchDt').find('.selected').val();
-		}
-		
-		let jsonData = JSON.stringify(data);
+	$("#accumulatePointList").click(function(){
+
+ 		$("#allPointList").removeClass("on");
+ 		$("#usePointList").removeClass("on");
+ 		
+ 		$("#accumulatePointList").addClass("on");
+ 		$("#plusMinus").text("증감");
 		
-		$.ajax(
-				{
-					type 	 : "POST",
-					data	 : jsonData,
-					url 	 : '/mypage/point/list',
-					contentType: 'application/json',
-  					dataType : 'json',
-					success  : function(result){
-						PointCollectListInfo(result);
-					}
-				}
-		)
+ 		fnGetPointTableInfo(accumulatePointList);
 	});
 	
-	function PointCollectListInfo(result) {
-		
-		let pointList = result.accumulatePointList;
-		
-		let tmtbHtml = "";
-		for(let i=0; i<pointList.length; i++){
-			let point = pointList[i];
-			tmtbHtml +='<tr>';
-			tmtbHtml +='<td>'+ point.occurGb + '</td>';
-			tmtbHtml += '<td class="t_l pl40">'+ point.occurDtlDesc + '</td>';
-			tmtbHtml += '<td class="c_blue">'+ point.pntAmt + '</td>';
-			tmtbHtml += '<td>'+ point.pntUploadDt + '</td>';
-			tmtbHtml += '</tr>';
-		}
-		$("#pointAjaxList").html(tmtbHtml);
-	}
-	
 	// 사용내역 조회
-	$("#SearchUsedHistory").click(function(){
-		// Class제거 추가
-		$("#SearchCollectHistory").removeClass("on");
-		$("#SearchFullHistory").removeClass("on");
-		$("#SearchUsedHistory").addClass("on");
-		
-		// 사용내역 포인트 블루
-		$("#pntAmt").removeClass("c_blue");
-		$("#pntAmt").addClass("c_primary");
-		$("#plusMinus").text("차감");
-		
-		let data = {};
+	$("#usePointList").click(function(){
 		
-		if($('.select').find('.selected').val() == checkYm){
-			data.searchDt = $('.select').find('.selected').val();
-		}else{
-			data.searchDt = $('#searchDt').find('.selected').val();
-		}
+		$("#accumulatePointList").removeClass("on");
+		$("#allPointList").removeClass("on");
 		
-		let jsonData = JSON.stringify(data);
+		$("#usePointList").addClass("on");
+		$("#plusMinus").text("차감");
 		
-		$.ajax(
-				{
-					type 	 : "POST",
-					data	 : jsonData,
-					url 	 : '/mypage/usepoint/list',
-					contentType: 'application/json',
-  					dataType : 'json',
-					success  : function(result){
-						UsePointListInfo(result);
-					}
-				}
-		)
+		fnGetPointTableInfo(usePointList);
 	});
 	
-	function UsePointListInfo(result) {
-		
-		let usePointList = result.usePointList;
-		let tmtbHtml = "";
-		for(let i=0; i<usePointList.length; i++){
-			let usePoint = usePointList[i];
-			tmtbHtml +='<tr>';
-			tmtbHtml +='<td>'+ usePoint.occurGb + '</td>';
-			tmtbHtml += '<td class="t_l pl40">'+ usePoint.occurDtlDesc + '</td>';
-			tmtbHtml += '<td class="c_primary">'+  usePoint.pntAmt + '</td>';
-			tmtbHtml += '<td>'+ usePoint.pntUploadDt + '</td>';
-			tmtbHtml += '</tr>';
-		}
-		$("#pointAjaxList").html(tmtbHtml);
-	}
-
 	$(document).ready(function() {
 		// 마이페이지 LNB 설정
 		fnSetMypageLnbList(5);
@@ -336,12 +220,16 @@
 		fnSetMypageLocation('STYLE24 포인트', '_PAGE_MYPAGE_POINT');
 		
 		// 전체내역 표시
- 		$("#SearchFullHistory").trigger('click');
+ 		$("#allPointList").trigger('click');
 
 		// 셀렉트박스 활성화
 		$('.select_custom.type1').each(function(index) {
 			var selecter01 = new sCombo($(this));
 		});
+
+		// 셀렉트박스 데이터 설정
+		fnChangeDate();
+
 	});
 
 </script>

+ 2 - 2
src/main/webapp/ux/pc/css/common.css

@@ -1,7 +1,7 @@
 @charset "utf-8";
 
 @import "reset.css";
-@import "font.css?v=2021031602";
+@import "font.css";
 @import "layout.css";
 
 
@@ -1710,7 +1710,7 @@ button.alertCls {-webkit-appearance: none;padding: 0;cursor: pointer;background:
 
 .modal .modal-header{margin-top: 0;margin-bottom: 40px;}
 .modal .modal-header > *{font-size: 16px;font-weight: 400;}
-.modal .modal-header .modal-title {color:#222; font-size:24px; font-weight:500;}
+.modal .modal-header .modal-title {margin-top:0; color:#222; font-size:24px; font-weight:500;}
 .modal .modal-body{box-sizing: border-box;}
 .modal .modal-body .pop_cont{overflow: auto;max-height: 450px; font-size: 16px; line-height: 1.62; font-weight: 200; color:#666;}
 .modal .modal-body .fx_r {position: fixed;right: 0;top: auto;bottom: auto;left: auto;}

+ 362 - 171
src/main/webapp/ux/pc/css/layout.css

@@ -130,9 +130,27 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .minify .common_header .gnb .nav .bundle > li > .depth_menu {top:80px;}
 
 /* Brand HEADER */
+#br_header {-webkit-transition:all .3s ease-in-out;transition:all .3s ease-in-out;} 
+#br_header.minify {position:fixed; top:0; left:0; right:0; z-index:100;}
 .common_header.br_header .search .ico_search:before {width:25px; height:25px;}
 .common_header.br_header .search .btn_open_search {display:block;}
 .common_header.br_header .nav {margin-left:-25px;}
+.common_header.br_header .logo h1 {font-size: 28px;letter-spacing: -0.07em;color: #ffffff;font-weight: 400;}
+.common_header.br_header .depth_menu .head_category { width: 68%; padding:50px 70px 50px 20px;}
+.common_header.br_header .depth_menu .head_category .menu ul.maintabs {border-left:0}
+.common_header.br_header .depth_menu .head_banner {background: #ffffff; width:32%;}
+.common_header.br_header .depth_menu .head_banner li { width: 33.333%;}
+.common_header.br_header .depth_menu .head_banner li img{top: 50%;left: 0px;}
+.common_header.br_header .depth_menu .head_banner li:first-child {margin-right:0;}
+.common_header.br_header .depth_menu .item_prod {width: 100%;}
+
+.minify .common_header.br_header > .area {height: 0; padding: 0;}
+/* .minify .common_header.br_header .util_group{ display: none;} */
+.minify .common_header.br_header .logo{position: absolute;top: 25px;left: 60px;}
+.minify .common_header.br_header .nav {margin-left: 260px;}
+
+
+
 
 /* common_search */
 .common_search {display:none; position:fixed; left:0; right:0; top:0; bottom:0; width:100%; height:100%; background:#fff; z-index:200; }
@@ -168,52 +186,36 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .common_search .default_box .recent_blk ul li a:active,
 .common_search .default_box .popular_blk ul li a:hover,
 .common_search .default_box .popular_blk ul li a:active {color:#fd4802;}
-.common_search .default_box .recent_blk .btn_delete_all {position:absolute; right:0; top:0;}
+.common_search .default_box .recent_blk .btn_underline {position:absolute; right:0; top:0;}
 .common_search .default_box .recent_blk ul li {padding-right:18px;}
 .common_search .default_box .recent_blk ul li .btn_delete {position:absolute; right:0; top:0; width:9px; height:9px; font-size:1px; text-indent:-9999px; overflow:hidden; background:url('/images/pc/ico_close1.png') no-repeat 50% 50%; background-size:100% auto;}
 .common_search .default_box .popular_blk ul li a::before {content:'#';}
 .common_search .default_box .realtime_blk {width:100%; margin-top:50px; margin-right:0px; padding-top:50px; padding-bottom:50px;}
-.common_search .default_box .realtime_blk::before {content:''; position:absolute; left:50%; top:0; bottom:-30px; width:3000px; transform:translateX(-50%); background:#f5f5f5; z-index:-1;}
+.common_search .default_box .realtime_blk::before {content:''; display: none; position:absolute; left:50%; top:0; bottom:-30px; width:3000px; transform:translateX(-50%); background:#f5f5f5; z-index:-1;}
 .common_search .default_box .realtime_blk .modify_timer {position:absolute; right:0; top:50px;}
-.common_search .default_box .realtime_blk .realtime_slider {}
-.common_search .realtime_slider .swiper-button-prev::after,
-.common_search .realtime_slider .swiper-button-next::after {content: '';}
-.common_search .realtime_slider .swiper-button-prev,
-.common_search .realtime_slider .swiper-button-next {top:50%; transform:translateY(-50%); margin:0; display:inline-block; width:27.5px; height:50px; margin-top:-40px; background:url(/images/pc/ico_arr_lg.png) no-repeat; }
-.common_search .realtime_slider .swiper-button-prev {left:-70px; background-position:0 50%;}
-.common_search .realtime_slider .swiper-button-next {right:-70px; background-position:100% 50%;}
-.common_search .realtime_slider .controls {position:absolute; left:0; right:0; bottom:-40px; width:100%; text-align:center;}
-.common_search .realtime_slider .controls .swiper-pagination {position:relative; display:inline-block; width:auto; margin:0;}
-.common_search .realtime_slider .swiper-pagination .swiper-pagination-bullet {width:10px; height:10px; margin:0; margin-left:10px; background:#ddd; opacity:1;}
-.common_search .realtime_slider .swiper-pagination .swiper-pagination-bullet-active {background:#fd4802}
-.common_search .realtime_slider .swiper-pagination .swiper-pagination-bullet:first-child {margin-left:0;} 
-.common_search .realtime_slider .controls .btn_controls {display:inline-block; vertical-align:middle; margin-left:5px}
-.common_search .realtime_slider .controls .btn_controls span {float:left; display:inline-block; width:8px; height:12px; cursor:pointer;}
-.common_search .realtime_slider .controls .btn_controls .btn_play {position:relative; display:none; width:8px; height:12px; font-size:0;}
-.common_search .realtime_slider .controls .btn_controls .btn_play:after {content:""; position:absolute; top:0; left:0; border:6px solid transparent; border-left:9px solid #888; border-right:0;}
-.common_search .realtime_slider .controls .btn_controls .btn_pause {font-size:0;text-align: left;}
-.common_search .realtime_slider .controls .btn_controls .btn_pause:after, 
-.common_search .realtime_slider .controls .btn_controls .btn_pause:before {content:""; display:inline-block; width:2px;height: 12px; background: #888;}
-.common_search .realtime_slider .controls .btn_controls .btn_pause:before {float:right;}
-.common_search .realtime_slider {position:relative; width:100%; box-sizing:border-box; padding:0px}
-.common_search .realtime_slider .swiper-container .item_prod {width:100%;}
-.common_search .realtime_slider .swiper-container .item_prod .item_state {padding:0}
-.common_search .realtime_slider .swiper-container .item_prod .itemClick {margin-top:10px; text-align:center; font-size:12px;}
+.common_search .default_box .realtime_blk .modify_timer button {color:#888; font-weight: 300; padding-right: 20px; }
+.common_search .default_box .realtime_blk .modify_timer button:after {content:''; position: absolute; top: 50%; right: 0; width: 14px; height: 14px; background: url('/images/pc/ico_filter_reset02.png') no-repeat center; margin-top: -6px;}
+.common_search .realtime_wrap .item_prod .itemName {color:#000; margin:0 0 15px;}
+.common_search .realtime_wrap .item_prod .viewCount {display:table; width: fit-content;height: 30px;color: #fd4802;line-height: 1;font-size: 14px;font-weight: 400;text-align: center;vertical-align: middle;letter-spacing: -.025rem;padding: 6px 12px;border: 2px solid #fd4802;border-radius: 50px;box-sizing: border-box;}
 
 .common_search .cont_search .area_result .searching_box {margin-top:30px;}
-.common_search .cont_search .area_result .searching_box h3 {margin-bottom:24px; color:#222; font-size:18px; font-weight:500;}
+.common_search .cont_search .area_result .searching_box h3 {margin-bottom:24px; color:#222; font-size:18px; font-weight:500}
+.common_search .cont_search .area_result .searching_box .find_brand h3 {border-bottom: 1px solid #ddd;}
 .common_search .searching_box .pd_list.relate {margin-top:30px;}
 .common_search .searching_box [class*="_blk"] {float:left; position:relative; width:calc(50% - 60px); margin-right:60px;}
 .common_search .searching_box .autokeyword_blk ul li a em,
 .common_search .searching_box .exfind_blk .find_brand h3 a em,
 .common_search .searching_box .exfind_blk .find_category a em {color:#fd4802;}
-.common_search .searching_box .autokeyword_blk ul li {margin-bottom:10px; color:#666; font-size:14px; font-weight:300;}
-.common_search .searching_box .exfind_blk .find_brand h3 a {color:#222}
-.common_search .searching_box .exfind_blk .find_brand h3 a::after {content:'>';}
-.common_search .searching_box .exfind_blk .find_category ul li {margin-bottom:10px; font-weight:300;}
-.common_search .searching_box .exfind_blk .find_category ul li a::after {content:'>';}
+.common_search .searching_box .autokeyword_blk ul li {margin-bottom:10px; color:#666; font-size:14px; font-weight:300; float:left; margin-right: 20px;}
 .common_search .searching_box .exfind_blk .find_category ul li a:last-child::after {display:none;}
 
+.common_search .itemPrice.cols .itemPrice_original {display: table-cell;width: 100%;}
+.common_search .itemPrice.cols .itemPercent{top: auto;bottom: 0;}
+
+/* 브랜드검색 */
+.common_search.schBrand .default_box .recent_blk {width: 100%; margin-right: 0;}
+.common_search.schBrand .default_box .popular_blk {display: none;}
+.common_search.schBrand .searching_box [class*="_blk"] {width: 100%; margin-right: 0;}
 
 /* footer */
 #footer {position:relative;}
@@ -277,6 +279,9 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .common_footer .sp_cmfooter, 
 .common_footer .cmfooter_corp_wrap .cmfooter_corp_cs .cmfooter_cs_tel:before {display: inline-block;vertical-align: top;}
 
+.partners_pop {max-width: 600px;padding: 60px;}
+.partners_pop .modal-body p{color: #666;font-size: 16px;line-height: 26px;letter-spacing: -0.04em;padding-bottom: 30px;}
+.partners_pop .tbl.type2 table th, .partners_pop .tbl.type2 table td{font-size: 14px;}
 
 /* 퀵메뉴 */
 #quick_menu {position:fixed; bottom:0; right:-363px; z-index:90; padding-left: 60px; transition:all 0.3s;}
@@ -474,6 +479,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 
 /* .container .wrap.wide {min-width: 100%;} */
 .container .wrap .content {position:relative;  /*max-width: 1460px;*/ margin:0 auto; }
+.container .wrap .content:after {content:''; display: block; clear:both;}
 .container.my .wrap .content {max-width:1460px;} /* 마이페이지 서브 레이아웃 */
 .container .wrap .content.wide{width:100%; /*max-width: 1920px;padding: 0px 0px;*/ padding-left: 0px; padding-right: 0px; margin:0 auto;}
 .container .wrap .content section {/*width: 100%;*/ display:block;}
@@ -539,6 +545,8 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.common_footer,
 	#header.minify .common_header > .area,
 	#header.minify .common_header > .gnb,
+	#br_header.minify .common_header > .area,
+	#br_header.minify .common_header > .gnb,
 	.container.dp .wrap
 	{padding-left:70px; padding-right:70px;}
 	.container .wrap {}
@@ -585,11 +593,17 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 /* LNB_layout */
 .lnb,.my_lnb {float: left; /*width: 17%;*/ width:17.80822%;}
 .lnb + .cont,.my_cont {float: left; /*width: 83%;*/ width:82.191780%;}
+.lnb + .cont {float:right;}
 .lnb_tit,.sec_head {margin-bottom: 60px;}
 .lnb_tit h2 {font-size: 36px; font-weight: 500;}
 .lnb_list ul li {margin-bottom:35px; line-height:1;}
 .lnb_list ul li a {color:#888; font-size:19px; font-weight:200; letter-spacing:-0.025em;}
 .lnb_list ul li a.on {color:#222; border-bottom: 2px solid #222; font-weight:500;}
+.lnb .lnb_category ul > li {margin-bottom: 10px;}
+.lnb .lnb_category > ul > li > a {font-size: 20px;}
+.lnb .lnb_category > ul > li > .sub_cate > ul > li > .sub_cate {padding-left: 20px;}
+.lnb .lnb_category ul > li a.on {color:#fd4800}
+.lnb .lnb_category .sub_cate {display: none; margin:10px 0;}
 .lnb_foot {padding-top:30px; line-height:1;}
 .lnb_foot ul li {margin-bottom:20px;}
 .lnb_foot ul li p {color:#222; font-weight:300; font-size:14px; line-height:1;}
@@ -597,6 +611,10 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .lnb_foot ul li:nth-child(2) p {font-size:28px; font-weight:800;}
 .lnb_foot ul li:nth-child(3) p {color:#888; line-height:20px;}
 
+.dp .lnb, .sch_result .lnb {width: 230px;}
+.dp .lnb_tit, .sch_result .lnb_tit {margin-bottom: 30px;}
+.dp .lnb_tit h3, .sch_result .lnb_tit h3 {padding:22px 0; margin-bottom: 0; max-height:60px; min-height:60px; border-top: 1px solid #222; border-bottom: 1px solid #ddd;}
+.dp .lnb_tit h3, .sch_result .lnb_tit h3 {font-size: 18px;}
 
 /* 상품리스트 > 상품 form */
 .item_gd {}
@@ -614,7 +632,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .item_gd figure figcaption .price .discount {color:#fd4802; font-size:16px; font-weight:300;}
 .item_gd figure figcaption .option {color:#888; font-size:12px; line-height:1.4;}
 .item_gd span.thumb {display:block; position:relative; height:0; line-height:0; padding-top:150%; background-color:#eee;}
-.item_gd span.thumb img {position:absolute; left:0; right:0; top:0; bottom:0; width:100%; height:100%; z-index:2;}
+.item_gd span.thumb img {position:absolute; left:0; top:50%; transform:translateY(-50%); bottom:0; width:100%; z-index:2;}
 
 /* 상품리스트 slide */
 .item_slide {}
@@ -708,6 +726,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 
 /* 배송관련 아이콘  */
 .tag {display:inline-block; height:22px; padding:5px 8px; background:#fff; border:1px solid #ddd; color:#666; font-size:11px; font-weight:300; text-align:center; line-height:1;}
+.tag.gray {background:#f5f5f5; border-color:#f5f5f5; color:#666;}
 .tag.primary {background:#fd4802; border-color:#fd4802; color:#fff;}
 .tag.primary_line {background:#fff3f2; border-color:#fd4802; color:#fd4802;}
 
@@ -1286,7 +1305,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.container.dp .cont_head > div.item_header {padding: 80px 0 60px;}
 	.container.dp .cont_head > div.item_header h3 {padding: 20px 0 0; font-size: 30px; line-height: 1;}
 	.container.dp .cont_head > div h3 {text-align: center; margin-bottom: 0; padding-bottom: 60px; font-size: 40px; line-height: 1;}
-	.container .filter_list {padding: 20px 30px; border-top: 1px solid #222; border-bottom: 1px solid #ddd;}
+	.container .filter_list {padding: 22px 30px; border-top: 1px solid #222; border-bottom: 1px solid #ddd; max-height:60px; min-height:60px;}
 	.container .filter_list::after,.container .count_wrap::after {content:''; display: block; clear:both;}
 	.container .filter_list .form_field {float: right; width:inherit;}
 	.dp_list .form_field input[type="checkbox"] + label {font-weight: 200; line-height: 1;}
@@ -1637,7 +1656,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.dp .itemsGrp.rowtype .item_prod.sold_out .itemPic:before {content:'SOLD OUT'; position: absolute; top: 50%; left: 50%; font-size: 20px; color:#fff; background: rgba(0,0,0,.5); width: 100%; height: 100%; transform:translate(-50%, -50%); line-height: 420px; z-index: 99; text-align: center;}
 	.dp .itemsGrp.rowtype .item_prod .itemBrand {margin:0px 6px 65px; font-size: 16px; font-weight: 300;}
 	.dp .itemsGrp.rowtype .item_prod .itemComment {position: absolute; left: 340px; top: 150px; font-size: 16px; font-weight: 300; margin:0;}
-	.dp .itemsGrp.rowtype .item_prod .itemName {margin:0px 6px 40px; font-size: 30px; font-weight: 200; line-height: 1.2; max-height:80px;}
+	.dp .itemsGrp.rowtype .item_prod .itemName {margin:0px 6px 40px; font-size: 30px; font-weight: 200; line-height: 1.2; max-height:70px; height: 70px;}
 	.dp .itemsGrp.rowtype .item_prod .itemPrice {font-size: 30px; line-height: 1; font-weight: 500;}
 	.dp .itemsGrp.rowtype .item_prod .itemPrice_original {font-size: 20px; font-weight: 200;}
 	.dp .itemsGrp.rowtype .item_prod .itemPercent {font-size: 42px; line-height: 0.8;}
@@ -1651,7 +1670,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.dp_Exhibition .best_nav ul li:hover button::after, .dp_Exhibition .best_nav ul li button.active::after{content:''; position: absolute; bottom:-3px; left:0; width:100%; height: 2px; background: #222; }
 	.dp_Exhibition .best_nav ul li:hover button::after {content:''; position: absolute; bottom:-3px; left:0; width:100%; height: 2px; background: #222;}
 	.dp_Exhibition .best_nav ul li:last-child {margin-right: 0;}
-	.dp_Exhibition .cont_body > .ui_row {margin-bottom: 40px;}
+	.dp_Exhibition .cont_body > .ui_row {margin-bottom: 20px;}
 	.dp_Exhibition .ui_row .ui_col_12 {margin: 0;}
 	.dp_Exhibition .ui_row .ui_col_12::after {content:''; display: block; clear: both;}
 	.dp_Exhibition .ui_row .ui_col_12 .form_count {float: left; margin-top: 25px;}
@@ -1719,17 +1738,13 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.dp .ui_row .ui_col_12 .btn_group .dropdown_menu .ui_row button {width:92px;}
 	.dp .ui_row .ui_col_12 .btn_group .dropdown_menu .ui_row button:last-child {background: #222;}
 	.dp .ui_row .ui_col_12 .btn_group .dropdown_menu .ui_row button:last-child span {color:#fff;}
-	.dp_Exhibition .list_content {max-width: 1780px;}
-	.dp_Exhibition .itemPic {padding-top: 100%;}
-	.dp_Exhibition .item_prod {width: 340px; margin-bottom: 80px;}
-	.dp_Exhibition .item_prod .itemName {font-size: 18px; line-height: 1.5; overflow:visible; max-height: none;}
-	.dp_Exhibition .item_prod .item_state {padding: 0;}
+	.dp_Exhibition .exhi_list {max-width: 1780px;}
+	.dp_Exhibition .item_prod .item_state {display: table; vertical-align: middle; padding: 0; width: 100%; padding-left: 130px; height: 100%;}
 	.dp_Exhibition .item_prod .summary {display: inline-block; margin: 0px 6px 0; line-height: 1; font-size:14px; font-weight: 400; color: rgb(137, 137, 137);}
 	.dp_Exhibition .item_prod:nth-child(5n+0) {margin-right: 0;}
 	.dp_Exhibition .item_prod:nth-child(6n+0) {margin-right: 20px;}
 	.dp_Exhibition .itemsGrp {margin-bottom: 80px;}
-	.dp_Exhibition .itemsGrp .exhi_item {float:left; width: 24.15%; overflow: hidden; margin:0 1.12% 40px 0;}
-	.dp_Exhibition .itemsGrp .exhi_item {float:left; width: 24.15%; overflow: hidden; margin:0 1.12% 40px 0;}
+	.dp_Exhibition .itemsGrp .exhi_item {float:left; width: 24.15%; overflow: hidden; margin:0 1.12% 80px 0;}
 	.dp_Exhibition .itemsGrp .exhi_item:nth-child(4n) {margin:0 0 40px 0;}
 	.dp_Exhibition .itemsGrp .exhi_item .exhi_item_img {width: 430px; height: 430px; overflow: hidden;} 
 	.dp_Exhibition .itemsGrp .exhi_item .exhi_item_img img {position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); width: 100%; height:auto;}
@@ -1743,15 +1758,16 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.dp_Exhibition .itemsGrp .exhi_item .exhi_item_img .exhi_detail .brand {font-size: 14px;}
 	.dp_Exhibition .itemsGrp .exhi_item .exhi_item_img .exhi_detail .tit {margin:20px 0 15px; max-height:66px; font-size: 24px; line-height: 1.4; word-break: keep-all;}
 	.dp_Exhibition .itemsGrp .exhi_item .exhi_item_img .exhi_detail .sale {font-size: 14px;}
-
+	.dp_Exhibition .itemsGrp .exhi_item_pr li {height: 150px; margin-bottom: 16px;}
+	.dp_Exhibition .itemsGrp .exhi_item_pr li:last-child {margin-bottom: 0;}
+	.dp_Exhibition .itemsGrp .exhi_item_pr .item_prod {width: 100%; margin-right: 0; margin-bottom: 0; height: 150px;}
 	.dp_Exhibition .itemsGrp .exhi_item_pr {background: #fff; padding: 20px; position: relative; z-index: 99; width: 380px; margin:-70px auto 0;}
-	.dp_Exhibition .itemsGrp .exhi_item_pr li {float:left; width: 100px; margin-right: 20px;}
-	.dp_Exhibition .itemsGrp .exhi_item_pr li:last-child {margin-right: 0;}
-	.dp_Exhibition .itemsGrp .exhi_item_pr li .img {position: relative; background: #f5f5f5; width: 100%; height: 150px; overflow: hidden;}
-	.dp_Exhibition .itemsGrp .exhi_item_pr li .img img {position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%);}
-	.dp_Exhibition .itemsGrp .exhi_item_pr li .txt p {display: -webkit-box; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; color: #222; word-break: keep-all;}
-	.dp_Exhibition .itemsGrp .exhi_item_pr li .txt .pr_tit {margin:20px 0; line-height: 1.4; font-size: 14px; max-height:38px;}
-	.dp_Exhibition .itemsGrp .exhi_item_pr li .txt .price {font-size: 16px; font-weight: 300;}
+	.dp_Exhibition .itemsGrp .exhi_item_pr .itemPic {position: absolute; left: 0; top: 0; width: 100px; height: 150px; padding-top: 0; margin-bottom: 0;}
+	.dp_Exhibition .itemsGrp .exhi_item_pr .itemLink {position: static; display: table-cell; vertical-align:middle;}
+	.dp_Exhibition .itemsGrp .exhi_item_pr .itemName {font-size: 14px; line-height: 1.4; max-height: none; margin: 0px 0px 15px; height:auto;}
+	.dp_Exhibition .itemsGrp .exhi_item_pr .itemPrice {margin-left: 0; margin-right: 0;}
+
+	
 	
 	/* dp_Bulletship */
 	.Bulletship {padding-bottom: 120px;}
@@ -1772,7 +1788,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.Bulletship .Bulletship_body .bullet_able,.Bulletship .Bulletship_body  .normal_able {width:720px; padding: 26px 112px; margin-bottom: 30px; box-sizing: border-box; background: #f5f5f5;}
 	.Bulletship .Bulletship_body > div {width:720px; margin: 0 auto;}
 	.dp .bullet_sticky_nav {margin-bottom: 0px !important; padding:20px 0; background: #fff; border-top:1px solid #222; border-bottom:1px solid #222; z-index: 20;}
-	.container.dp .bullet_sticky_nav.sticky {position: fixed; max-width: 1780px; top: 0px;}
+	.container.dp .bullet_sticky_nav.sticky {position: fixed; width:100%; max-width: 1780px; top: 79px;}
 	/* .dp .bullet_sticky_nav ul {overflow-x: scroll; white-space: nowrap; -ms-overflow-style: none; cursor: grab;}
 	.dp .bullet_sticky_nav ul::-webkit-scrollbar {display: none;} */
 	.dp .bullet_sticky_nav ul li {position: relative; display: inline-block; padding: 20px 40px;}
@@ -2059,7 +2075,9 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	/* od 공통 */
 	.container.od .wrap .content {max-width:1460px;}
 	.od {padding-top:120px; padding-bottom:150px;}
+	.od div::after {clear:both; display:block; content:'';}
 	.od .cont_head h2 {margin-bottom:0; font-size:40px; font-weight:500; line-height:1; text-align:center; letter-spacing:-1px;}
+	.od .btn span {line-height:1;}
 	.od .item_slide .item_gd a .price {margin-top:15px}
 	.od .info_txt {padding:30px; line-height:1.2; background:#fff6f2;}
 	.od .info_txt ul li {position: relative; font-size: 14px; color: #888; padding-left: 15px; margin-bottom: 10px;}
@@ -2087,9 +2105,11 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.od .cont_head .oder_steps ul li:first-of-type::before {border:none;}
 	.od .od_cont {float:left; width:calc(100% - 380px); min-height:400px;}
 	.od .od_cont .tmark_required {color:#fd4802; font-size:12px; font-weight:300; line-height:14px;}
-	.od .od_cont .tmark_optional {color:#888; font-size:12px; font-weight:300; line-height:14px;}
+	.od .od_cont .tmark_optional {color:#888; font-size:12px; font-weight:200;}
 	.od .od_cont button span {/*vertical-align:middle;*/ line-height:1;}
-	.od .od_cont .form_control {min-width:400px; height:42px; padding-left:20px; font-size:14px;} 
+	.od .od_cont button.btn_sm {height:34px; min-width:70px; padding:9px; font-size:14px; font-weight:200;}
+	.od .od_cont button.btn_dark {font-weight:200;}
+	.od .od_cont .form_control {min-width:400px; height:42px; padding-left:18px; font-size:14px;} 
 	.od .od_cont .sec_head {margin-bottom:60px;}
 	.od .od_cont .sec_head .tbl .number {color:#fd4802; font-weight:500;}
 	.od .od_cont .sec_head .tbl td {text-align:left;}
@@ -2099,17 +2119,16 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.od .od_cont .sec_head .tbl td > span:first-child::before {display:none;}
 	.od .od_cont .sec_head .tbl td > span em {margin-left:10px; margin-right:5px;}
 	.od .od_cont .sec_body {}
-	.od .od_cont .sec_body .foldGroup {}
+	.od .od_cont .sec_body .foldGroup {float:none;}
 	.od .od_cont .sec_body .foldGroup > ul > li {padding:0px 30px;}
-	.od_cont .foldGroup .btn.btn_dark {height:42px; line-height:1; padding:10px 20px;}
+	/*.od_cont .foldGroup .btn.btn_dark {height:42px; line-height:1; padding:10px 20px;}*/
 	.od_cont .foldGroup .btn_popup {display:inline-block; position:absolute; left:auto; top:50%; transform:translateY(-50%); margin-left:10px; padding:0px 13px; height:34px; color:#222; font-size:14px; font-weight:200; border:1px solid #a7a7a7; box-sizing:border-box;}
 	.od_cont .foldGroup .btn_popup span {vertical-align:top;}
-	.od_cont .foldGroup .btn_link_popup {display:inline-block; position:absolute; left:auto; top:50%; margin-top:-12px; margin-left:10px; padding:0px; box-sizing:border-box;}
-	.od_cont .foldGroup .btn_link_popup span {color:#888; font-size:12px; font-weight:200; border-bottom:1px solid #888;}
+	.od_cont .foldGroup .btn_underline span {color:#888; font-size:12px}
 	.od_cont .foldGroup .fold_head::after {right:0px; z-index:-1;}
 	.od_cont .foldGroup .fold_head a {padding:0;}
-	.od_cont .foldGroup .fold_head .fold_tit {width:auto; padding:35px 0px;}
-	.od_cont .foldGroup .fold_head .fold_tit span {font-size:24px;}
+	.od_cont .foldGroup .fold_head .fold_tit {width:auto; padding:30px 0px;}
+	.od_cont .foldGroup .fold_head .fold_tit span {font-size:24px; font-weight:500;}
 	.od_cont .foldGroup .fold_head .data {position:absolute; top:50%; right:50px; transform:translateY(-50%); color:#000; font-size:16px; font-weight:200; z-index:-1;}
 	.od_cont .foldGroup .fold_head .data.maxdisc {z-index:2;}
 	.od_cont .foldGroup .fold_head .data span {display:inline-block; position:relative; padding-left:20px; margin-left:20px;}
@@ -2117,7 +2136,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.od_cont .foldGroup .fold_head .data span:first-of-type {margin-left:0; padding-left:0;}
 	.od_cont .foldGroup .fold_head .data span:first-of-type::before {display:none;}
 	.od_cont .foldGroup .fold_mbinfo .fold_head.on .data {display:none;}
-	.od_cont .foldGroup .fold_cont {padding:10px 0 40px; line-height:1; box-sizing:border-box; overflow:hidden;}
+	.od_cont .foldGroup .fold_cont {padding:10px 0 40px; line-height:1; box-sizing:border-box;}
 	.od_cont .foldGroup .fold_cont > div {}
 	.od_cont .foldGroup dl {font-size:16px;}
 	.od_cont .foldGroup dl .btn span {vertical-align:middle;}
@@ -2125,13 +2144,13 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.od_cont .foldGroup dl > div:first-of-type {margin-top:0px}
 	.od_cont .foldGroup dl > div dt {float:left; margin-right:40px; font-weight:300;}
 	.od_cont .foldGroup dl > div dt .mid {display:inline-block; margin-top:12px}
-	.od_cont .foldGroup dl > div dd {position:relative; float:left; width:780px;}
+	.od_cont .foldGroup dl > div dd {position:relative; float:left; width:calc(100% - 170px);}
 	.od_cont .foldGroup dl::after,
 	.od_cont .foldGroup dl div::after {content:''; display:block; clear:both;}
 
 	.od .od_side {float:right; width:320px;}
 	.od .od_side h3 {color:#222; font-size:24px; font-weight:500;}
-	.od .od_side h4 {margin-bottom:20px; color:#222; font-size:18px; font-weight:300; letter-spacing:-0.025em;}
+	.od .od_side h4 {font-size:18px; font-weight:500; margin-bottom:20px;}
 	.od .od_side .item_gd figure {position:relative; height:150px;}
 	.od .od_side .item_gd figure::after {content: ''; display: block; clear: both;}
 	.od .od_side .item_gd figure .thumb {float:left; width:100px; height:150px; padding-top:0;} 
@@ -2146,11 +2165,12 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.od .od_side .area_order {border:1px solid #ddd; border-top-color:#222;}
 	.od .od_side .area_order dl dt {float:left;}
 	.od .od_side .area_order dl dd {float:right;}
+	.od .od_side .area_order div::after,
 	.od .od_side .area_order dl::after,
 	.od .od_side .area_order dl div::after {content:''; display:block; clear:both;}
 	.od .od_side .area_order .tit_box {padding:20px 30px; border-bottom:1px solid #ddd;}
 	.od .od_side .area_order .tit_box h3 {display:inline-block; margin-bottom:0}
-	.od .od_side .area_order .tit_box span {display:inline-block; margin-top:2px; margin-left:5px; color:#888; font-size:14px; font-weight:200; vertical-align:top}
+	.od .od_side .area_order .tit_box span {float:right; display:inline-block; margin-top:6px; margin-left:5px; color:#888; font-size:16px; font-weight:200; vertical-align:top}
 	.od .od_side .area_order .tit_box span em.number {color:#fd4802; font-weight:500;}
 	.od .od_side .area_order .od_item_box {padding:0px 30px 0; border-bottom:1px solid #ddd;}
 	.od .od_side .area_order .od_item_box .part_dlvr {padding:30px 0px 30px; border-top:1px solid #ddd}
@@ -2168,6 +2188,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.od .od_side .area_order .od_amount_box {padding:35px 30px 30px; color:#888; font-size:14px; font-weight:200;}
 	.od .od_side .area_order .od_amount_box dl div {margin-top:20px;}
 	.od .od_side .area_order .od_amount_box dl div:first-child {margin-top:0px}
+	.od .od_side .area_order .od_amount_box dl dt {font-weight:300;}
 	.od .od_side .area_order .od_amount_box dl dd {color:#222; font-weight:300;}
 	.od .od_side .area_order .od_amount_box dl dd em {font-size:16px}
 	.od .od_side .area_order .od_amount_box dl .disc_amount {color:#fd4802; font-weight:300;}
@@ -2176,39 +2197,39 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.od .od_side .area_order .od_amount_box .btn_link::after {display:none;}
 	.od .od_side .area_order .totalprice_box {padding:0px 30px 30px}
 	.od .od_side .area_order .totalprice_box dl {padding:30px 0 0; border-top:1px solid #ddd; font-size:16px; font-weight:300;}
+	.od .od_side .area_order .totalprice_box dl dt {margin-top:5px; font-size:16px; font-weight:500;}
+	.od .od_side .area_order .totalprice_box dl dd {color:#fd4802; font-size:18px; font-weight:700;}
 	.od .od_side .area_order .totalprice_box dl dd span {font-size:24px;}
-	.od .od_side .area_order .totalprice_box .info_point {margin-top:25px; padding:15px 10px; background:#f5f5f5; color:#888; font-size:14px; font-weight:300; text-align:center;}
-	.od .od_side .area_order .totalprice_box .info_point .save_point {color:#fd4802;}
+	.od .od_side .area_order .totalprice_box .info_point {margin-top:12px; color:#888; font-size:14px; font-weight:300; text-align:right; line-height:16px;}
+	.od .od_side .area_order .totalprice_box .info_point .save_point {display:inline-block; padding-left:22px; height:16px; background:url('/images/pc/ico_point.png') no-repeat 0 50%; color:#fd4802;}
 	.od .od_side .area_order .btn_box {padding:0px 30px 35px;}
+	.od .od_side .area_order .btn_box .btn {height:60px; font-weight:300; padding:20px}
 	.od .od_side .area_salecoupon {margin-top:35px}
-	.od .od_side .area_salecoupon input {font-size:14px; font-weight:200;}
-	.od .od_side .area_salecoupon .input_wrap {float:left; width:242px}
-	.od .od_side .area_salecoupon .btn {padding:14px 20px; height:50px; box-sizing:border-box; font-size:14px; font-weight:200}
-	.od .od_side .area_salecoupon .coupon_box {width:100%; margin-top:10px; padding:30px; background:#f5f5f5; box-sizing:border-box;}
-	.od .od_side .area_salecoupon .coupon_box .coupon {position:relative; border:1px solid #ddd; box-sizing:border-box; background:#fff;}
-	.od .od_side .area_salecoupon .coupon_box .coupon .btn_close_code {position:absolute; right:14px; top:14px; z-index:2;}
+	.od .od_side .area_salecoupon input {height:42px; padding:15px; color:#222; font-size:14px; font-weight:300;}
+	.od .od_side .area_salecoupon .input_wrap {float:left; width:240px}
+	.od .od_side .area_salecoupon .btn {width:70px; height:42px; box-sizing:border-box; font-size:14px; font-weight:200}
+	.od .od_side .area_salecoupon .coupon_box {width:100%; margin-top:20px;}
+	.od .od_side .area_salecoupon .coupon_box .coupon {position:relative; margin-top:10px; border:1px solid #ddd; box-sizing:border-box; background:#fff;}
+	.od .od_side .area_salecoupon .coupon_box .coupon:first-child {margin-top:none}
 	.od .od_side .area_salecoupon .coupon_box .coupon > div {position:relative;}
-	.od .od_side .area_salecoupon .coupon_box .coupon > div::after {content:''; position:absolute; top:50%; right:-1px; transform:translateY(-50%); width:15px; height:30px; background:#f5f5f5; z-index:2; border:1px solid #ddd; border-right:none; border-top-left-radius:15px; border-bottom-left-radius:15px; overflow:hidden;}
+	.od .od_side .area_salecoupon .coupon_box .coupon > div::after {content:''; position:absolute; top:50%; right:-1px; transform:translateY(-50%); width:15px; height:30px; background:#fff; z-index:2; border:1px solid #ddd; border-right:none; border-top-left-radius:15px; border-bottom-left-radius:15px; overflow:hidden;}
 	.od .od_side .area_salecoupon .coupon_box .coupon p {padding:0 20px;}
 	.od .od_side .area_salecoupon .coupon_box .coupon .cp_name {padding-top:30px; color:#222; font-size:14px; font-weight:300;}
-	.od .od_side .area_salecoupon .coupon_box .coupon .cp_cont {margin-top:15px;} 
-	.od .od_side .area_salecoupon .coupon_box .coupon .cp_cont span {color:#fd4802; font-size:20px; font-weight:500;}
-	.od .od_side .area_salecoupon .coupon_box .coupon .cp_cont span em {font-size:24px;}
-	.od .od_side .area_salecoupon .coupon_box .coupon .cp_condition {margin-top:10px; padding-bottom:15px; color:#888; font-size:12px; font-weight:300; line-height:1.4;}
-	.od .od_side .area_salecoupon .coupon_box .coupon .cp_condition span {display:block; margin-top:5px}
-	.od .od_side .area_salecoupon .coupon_box .coupon .cp_condition span .tag {display:inline-block; min-width:55px; height:22px; background:#fff6f2; color:#fd4802; font-size:11px; font-weight:300; box-sizing:border-box; border:1px solid #fd4802; text-align:center;}
-	.od .od_side .area_salecoupon .coupon_box .coupon .cp_date {padding:13px 0; border-top:1px dashed #ddd; text-align:center; font-size:14px; font-weight:200;}
-	.od .od_side .area_salecoupon .coupon_box .info_coupon {text-align:center;}
-	.od .od_side .area_salecoupon .coupon_box .info_coupon button {display:inline-block; margin-top:12px; border-bottom:1px solid #888; color:#888; font-size:12px; font-weight:200; line-height:1.2;}
+	.od .od_side .area_salecoupon .coupon_box .coupon .cp_cont {margin-top:10px;} 
+	.od .od_side .area_salecoupon .coupon_box .coupon .cp_cont span {color:#fd4802; font-size:22px; font-weight:700;}
+	.od .od_side .area_salecoupon .coupon_box .coupon .cp_cont span em {font-size:28px;}
+	.od .od_side .area_salecoupon .coupon_box .coupon .cp_condition {margin-top:15px; padding-bottom:15px; color:#888; font-size:12px; font-weight:300; line-height:1.4;}
+	.od .od_side .area_salecoupon .coupon_box .coupon .cp_condition span {display:block; margin-top:10px}
+	.od .od_side .area_salecoupon .coupon_box .coupon .cp_date {padding:20px 0; border-top:1px dashed #ddd; text-align:center; color:#222; font-size:14px; font-weight:200;}
+	.od .od_side .area_salecoupon .coupon_box .btn_underline {display:block; margin:23px auto 0; color:#888; border-color:#888; font-size:12px;}
 	.od .od_side .area_saleitem {margin-top:40px}
-	.od .od_side .area_saleitem .more_sale {margin-bottom:10px; padding:20px; box-sizing:border-box; border:1px solid #ddd}
+	/*.od .od_side .area_saleitem .more_sale {margin-bottom:10px; padding:20px; box-sizing:border-box; border:1px solid #ddd}
 	.od .od_side .area_saleitem .more_sale .txt a {display:block; position:relative; padding-left:45px; color:#fd4802; font-size:14px; font-weight:200;}
 	.od .od_side .area_saleitem .more_sale .txt a span {display:block; line-height:20px;}
 	.od .od_side .area_saleitem .more_sale .item_gd {margin-bottom:20px;}
 	.od .od_side .area_saleitem .more_sale .name {-webkit-line-clamp:3; max-height:60px;}
 	.od .od_side .area_saleitem .more_sale .item_gd + .txt {padding-top:20px; border-top:1px dashed #ddd;}
-	.od .od_side .area_saleitem .more_sale .txt .ico {position:absolute; left:0; top:50%; transform:translateY(-50%);}
-
+	.od .od_side .area_saleitem .more_sale .txt .ico {position:absolute; left:0; top:50%; transform:translateY(-50%);}*/
 
 	/* od_shopping_Bag */
 	.od .shopping_bag  {}
@@ -2232,13 +2253,14 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.od_recommend .swiper-container .swiper-wrapper {}
 	.od_recommend .swiper-container .swiper-wrapper .swiper-slide .item_prod {width:100%}
 	.od_recommend .swiper-container .swiper-wrapper .swiper-slide .item_state {padding:0;}
-	.od_recommend .swiper-button-prev {left:-100px; top:275px}
-	.od_recommend .swiper-button-next {right:-100px; top:275px}
+	.od_recommend .swiper-button-prev {left:-70px; top:275px}
+	.od_recommend .swiper-button-next {right:-70px; top:275px}
 	.od_recommend .swiper-button-prev::after,
 	.od_recommend .swiper-button-next::after {content: ''; display:inline-block; width:27.5px; height:50px; background:url(/images/pc/ico_arr_lg.png) no-repeat;}
 	.od_recommend .swiper-button-prev::after {background-position:0 50%;}
 	.od_recommend .swiper-button-next::after {background-position:100% 50%;}
 	.od_recommend .swiper-container .swiper-pagination {position:relative; display:block; left:auto; right:auto; bottom:auto; margin-top:60px}
+	@media screen and (max-width:1460px) {}
 
 
 	/* od_odPayment */
@@ -2246,17 +2268,26 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.odPayment .icon_tag {display:inline-block; margin-top:-3px;}
 	.odPayment .icon_tag::after {content:''; clear:both; display:inline-block; font-weight:300;}
 	.odPayment .icon_tag [class*="tag_"] {float:left; display:inline-block; height:22px; box-sizing:border-box; margin:0px 0 0 4px; padding:0 5px; border:1px solid #ddd; background: #fff; color:#888888; font-size: 11px; font-weight:300; vertical-align:top; line-height:21px;}
-	.odPayment .icon_tag .tag_stype1 {border-color:#f5f5f5; background:#f5f5f5}
-	.odPayment .icon_tag .tag_stype2 {border-color:#fd4802; background:#fff6f2; color:#fd4802;}
-	.odPayment .maxdisc_amount,
-	.odPayment .fold_head .data .total_gift,
-	.odPayment .fold_head .data .total_deduct {color:#fd4802; font-weight:300;}
+	/*.odPayment .icon_tag .tag_stype1 {border-color:#f5f5f5; background:#f5f5f5}
+	.odPayment .icon_tag .tag_stype2 {border-color:#fd4802; background:#fff6f2; color:#fd4802;}*/
+	.odPayment .foldGroup .fold_head .data .total_gift,
+	.odPayment .foldGroup .fold_head .data .total_deduct {color:#fd4802; font-weight:500;}
+	.odPayment .foldGroup .fold_head .data .maxdisc_amount {padding:0; margin:0; color:#fd4802;}
+	.odPayment .foldGroup .fold_head .data .maxdisc_amount::before {display:none;}
+	.odPayment .foldGroup .fold_head .data .maxdisc_amount em {font-weight:500;}
 	.odPayment .fold_cont .area_overseas,
 	.odPayment .fold_cont .area_customitem,
 	.odPayment .fold_cont .area_selpoint {padding-top:30px; margin-top:30px; border-top:1px dashed #ddd;}
 	.odPayment .fold_cont .area_overseas .info_txt,
 	.odPayment .fold_cont .area_customitem .info_txt {margin-top:30px;}
 
+	.odPayment .fold_cont .area_mbinfo {}
+	.odPayment .fold_cont .area_mbinfo > dl > div {float:left; position:relative; margin-top:0; height:16px; padding:0;}
+	.odPayment .fold_cont .area_mbinfo > dl > div::after {content:''; position:absolute; left:-1px; top:50%; transform:translateY(-50%); width:1px; height:10px; background-color:#ddd;}
+	.odPayment .fold_cont .area_mbinfo > dl > div dd {width:auto;}
+	.odPayment .fold_cont .area_mbinfo > dl > div dd .btn {margin-top:-9px; margin-left:10px; vertical-align:top;}
+	.odPayment .fold_cont .area_receiveinfo {}
+
 	.odPayment .fold_cont .area_overseas .form_field .agree_overs {margin-top:15px;}
 	.odPayment .fold_cont .area_overseas .form_field > div {float:left; margin-right:40px}
 	.odPayment .fold_cont .area_overseas .info_box,
@@ -2296,18 +2327,38 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.odPayment .gift_box .form_field .gift label .name {width:160px; color:#666; font-size:14px; line-height:1.4; font-weight:200;}
 	.odPayment .gift_box .form_field .gift label .deduct {margin-top:5px;color:#fd4802; font-weight:300; font-size:14px;}
 	.odPayment .form_field .agree_gift {display:block; width:100%; padding-top:30px; margin-top:30px; border-top:1px dashed #ddd; text-align:center;}
+	.odPayment .form_field .agree_gift .btn_underline {display:inline-block; margin-left:10px; padding:0px; border-bottom-color:#888;}
 	.odPayment .form_field .agree_gift p {color:#888; font-size:14px;}
 	.odPayment .form_field .agree_gift p label {color:#222; font-size:16px; font-weight:300;}
 	.odPayment .form_field .agree_gift p.txt {position:relative; margin-top:20px}
 
 	.odPayment .area_seldiscount {}
-	/*.odPayment .area_seldiscount .maxdisc {display:block; width:100%; margin-bottom:30px;}*/
 	.odPayment .area_seldiscount dl > div dt {width:170px; margin-right:0;}
 	.odPayment .area_seldiscount dl > div dd {width:485px;}
+	.odPayment .area_seldiscount .sale_coupon_box {}
+	.odPayment .area_seldiscount .sale_coupon_box button.btn_sm {height:42px; min-width:70px; padding:13px; font-size:14px; font-weight:300;}
+	.odPayment .area_seldiscount .sale_coupon_box .btn_default {width:80px; margin-left:14px; margin-top:-13px; vertical-align:top;}
+	.odPayment .area_seldiscount .sale_coupon_box .maxdisc_amount {color:#fd4802; font-weight:300;}
+	.odPayment .area_seldiscount .sale_coupon_box .form_field {margin-top:18px}
+	.odPayment .area_seldiscount .dlvr_fee_box {height:90%;}
+	.odPayment .area_seldiscount .dlvr_fee_box .select_custom {height:90px;}
+	.odPayment .area_seldiscount .dlvr_fee_box .select_custom .combo .select {height:90px; padding:0;}
+	.odPayment .area_seldiscount .dlvr_fee_box .select_custom .combo .select:after {top:50%; right:20px; transform:translateY(-50%);}
+	.odPayment .area_seldiscount .dlvr_fee_box .select_custom .combo .list {top:89px; padding:0;}
+	.odPayment .area_seldiscount .dlvr_fee_box .select_custom .combo .list > li {line-height:1; height:90px; padding:0; border-top:1px solid #ddd;}
+	.odPayment .area_seldiscount .dlvr_fee_box .select_custom .combo .dlvr_coupon {padding:14px 18px;}
+	.odPayment .area_seldiscount .dlvr_fee_box .select_custom .combo .dlvr_coupon .name {color:#222; font-size:14px; font-weight:300;}
+	.odPayment .area_seldiscount .dlvr_fee_box .select_custom .combo .dlvr_coupon .txt {margin-top:10px; color:#888; font-size:14px; font-weight:200;}
+	.odPayment .area_seldiscount .dlvr_fee_box .select_custom .combo .dlvr_coupon .txt span {font-weight:300;}
+	.odPayment .area_seldiscount .dlvr_fee_box .select_custom .combo .dlvr_coupon .discount {margin-top:10px;  color:#fd4802; font-size:16px; font-weight:300;}
+	.odPayment .area_seldiscount .dlvr_fee_box .select_custom .combo .dlvr_coupon .discount span {font-weight:500;}
+	.odPayment .area_seldiscount .dlvr_fee_box .select_custom .combo .dlvr_coupon .empty {margin-top:22px; color:#222; font-size:14px; font-weight:300;}
+	.odPayment .area_seldiscount .dlvr_fee_box .select_custom .combo .list > li[aria-disabled="true"] .dlvr_coupon p {color:#888;}
+
 	.odPayment .form_field .maxdisc input[type="checkbox"] + label {color:#222; font-size:16px;}
 	.odPayment .form_field .input_wrap input[type="text"]:disabled {background:#f5f5f5;}
 	.odPayment .form_field .input_wrap input[type="text"]:disabled::placeholder{color:#222; font-weight:300;}
-	.odPayment .btn_coupon_toggle {display:inline-block; position:relative; padding-right:22px; color:#222; font-weight:300; }
+	/*.odPayment .btn_coupon_toggle {display:inline-block; position:relative; padding-right:22px; color:#222; font-weight:300; }
 	.odPayment .btn_coupon_toggle::after {content:''; position:absolute; right:0; top:2px; width:11px; height:9px; background:url('/images/pc/ico_mb_arrow.png') no-repeat 0% 100%; background-size:100% auto;}
 	.odPayment .btn_coupon_toggle.on::after {top:3px; background-position:0 0;}
 	.odPayment .btn_coupon_toggle span {color:#fd4802}
@@ -2333,19 +2384,20 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.odPayment .coupon_list ul li .coupon .cp_discount .btn_del_coupon span {position:absolute; display:inline-block; width:1px; height:1px; font-size:1px; text-indent:-999px; overflow:hidden;}
 	.odPayment .coupon_list ul li .coupon_discount {} 
 	.odPayment .coupon_list ul li .coupon_cart {} 
-	.odPayment .coupon_list ul li .coupon_dlvrfee {} 
+	.odPayment .coupon_list ul li .coupon_dlvrfee {} */
 
 	.odPayment .area_selpoint {}
 	.odPayment .area_selpoint dl > div dt {width:170px; margin-right:0;}
 	.odPayment .area_selpoint .form_field > div {float:left; margin-right:40px}
 	.odPayment .area_selpoint .form_field > div.input_wrap {float:none; margin-right:0;}
-	.odPayment .area_selpoint .form_field .remain_point {margin-right:10px; color:#fd4802; font-size:14px; font-weight:300;}
-	.odPayment .area_selpoint .form_field label + .remain_point {margin-left:10px; vertical-align:middle;}
-	.odPayment .area_selpoint .form_field p {margin-top:10px; color:#888; font-size:14px;}
+	.odPayment .area_selpoint .form_field .useable_point {margin-right:10px; color:#fd4802; font-size:16px; font-weight:200; vertical-align:middle;}
+	.odPayment .area_selpoint .form_field .useable_point em {font-weight:500;}
+	.odPayment .area_selpoint .form_field .remain_point {margin-right:10px; color:#fd4802; font-size:14px; font-weight:200;}
+	.odPayment .area_selpoint .form_field p {margin-top:15px; color:#888; font-size:14px;}
 	.odPayment .area_selpoint .form_field .agree_receipt {margin-top:20px;}
 	.odPayment .area_selpoint .form_field .agree_receipt .info_box {margin-top:10px;}
 
-	.odPayment .fold_paymethod .fold_cont {padding-top:20px; margin-top:-10px;}
+	.odPayment .fold_paymethod .fold_cont {margin-top:-10px;}
 	.odPayment .area_paymethod {}
 	.odPayment .area_paymethod .radio_blk {padding:0px 30px; border:1px solid #ddd; margin-top:-1px;}
 	.odPayment .area_paymethod .radio_blk:first-of-type {margin-top:0;}
@@ -2356,16 +2408,16 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.odPayment .area_paymethod .radio_blk .paymethod_radio .quickpay_bnr::before {content :""; display:block; position:absolute; left:15px; bottom:-10px; border:5px solid transparent; border-top-color:#222;}
 	.odPayment .area_paymethod .radio_blk .paymethod_radio .quickpay_bnr::after {content :""; display:block; position:absolute; right:-8px; bottom:-8px; border:8px solid transparent; border-right-color:#fff; transform:rotate(225deg);}
 	.odPayment .area_paymethod .radio_blk .paymethod_radio .quickpay_bnr .btn_close_bnr {display:inline-block; width:10px; height:10px; margin-left:4px; margin-top:1px; background:url('/images/pc/ico_pop_cls02.png') no-repeat 50% 50%; background-size:100% auto;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box {}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .card_quickpay {}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .card_quickpay button.btn_addcard {display:block; width:340px; height:214px; box-sizing:border-box; border:1px solid #ddd; border-radius:10px; background:#f5f5f5; color:#222; font-size:16px; font-weight:200;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .card_quickpay button.btn_addcard span {display:inline-block; position:relative; padding-top:55px;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .card_quickpay button.btn_addcard span::before {content:''; position:absolute; left:50%; top:0; margin-left:-20px; width:40px; height:40px; background:#fd4800 url('/images/pc/ico_plus.png') no-repeat 50% 50%; border-radius:50%;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .card_quickpay .empty {padding:30px 0; border-bottom:1px solid #ddd;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .card_quickpay .empty button.btn_addcard {margin:auto;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .card_quickpay .list_card {position:relative; padding:30px 0; margin-left:-30px; margin-right:-30px; overflow:visible;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .card_quickpay .list_card::before {content:''; position:absolute; left:-2px; top:0; bottom:0; border-right:2px solid #fd4802; z-index:2;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .card_quickpay .list_card::after {content:''; position:absolute; right:-2px; top:0; bottom:0; border-right:2px solid #fd4802; z-index:2;}
+	.odPayment .area_paymethod .paymethod_box {}
+	.odPayment .area_paymethod .paymethod_box .card_quickpay {}
+	.odPayment .area_paymethod .paymethod_box .card_quickpay button.btn_addcard {display:block; width:340px; height:214px; box-sizing:border-box; border:1px solid #ddd; border-radius:10px; background:#f5f5f5; color:#222; font-size:16px; font-weight:200;}
+	.odPayment .area_paymethod .paymethod_box .card_quickpay button.btn_addcard span {display:inline-block; position:relative; padding-top:55px;}
+	.odPayment .area_paymethod .paymethod_box .card_quickpay button.btn_addcard span::before {content:''; position:absolute; left:50%; top:0; margin-left:-20px; width:40px; height:40px; background:#fd4800 url('/images/pc/ico_plus.png') no-repeat 50% 50%; border-radius:50%;}
+	.odPayment .area_paymethod .paymethod_box .card_quickpay .empty {padding:30px 0; border-bottom:1px solid #ddd;}
+	.odPayment .area_paymethod .paymethod_box .card_quickpay .empty button.btn_addcard {margin:auto;}
+	.odPayment .area_paymethod .paymethod_box .card_quickpay .list_card {position:relative; padding:30px 0; margin-left:-30px; margin-right:-30px; overflow:visible;}
+	.odPayment .area_paymethod .paymethod_box .card_quickpay .list_card::before {content:''; position:absolute; left:-2px; top:0; bottom:0; border-right:2px solid #fd4802; z-index:2;}
+	.odPayment .area_paymethod .paymethod_box .card_quickpay .list_card::after {content:''; position:absolute; right:-2px; top:0; bottom:0; border-right:2px solid #fd4802; z-index:2;}
 	.odPayment .area_paymethod .radio_blk.on {border:2px solid #fd4802}
 	.odPayment .area_paymethod .radio_blk.on .paymethod_radio {border-bottom:1px solid #ddd;}
 	.odPayment .card_quickpay .list_card .swiper-slide {width:340px; height:214px;}
@@ -2394,41 +2446,47 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.odPayment .card_quickpay .list_card .card .select .select_options {border:none}
 	.odPayment .card_quickpay .list_card .card .select .select_options li {background:#3259a8; font-size:14px; color:#fff;}
 	.odPayment .card_quickpay .list_card .card .select .select_options li:hover {background:#093895;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .info_quick {padding:30px 0; border-top:1px solid #ddd;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .info_quick li {position:relative; font-size:14px; color:#888; padding-left:15px; margin-top:10px;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .info_quick li:first-of-type {margin-top:0;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .info_quick li::before {content:''; position:absolute; top:5px; left:0; background:#858585; width:3px; height:3px;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .sel_method {margin-bottom:30px; padding-top:30px;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .sel_method::after {content:''; clear:both; display:block;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .sel_method li {float:left; margin-left:40px;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .sel_method li:first-child {margin-left:0;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .sel_method li label span {display:inline-block; height:28px; color:#222; font-size:14px; line-height:28px;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .sel_method li label .payimg {display:inline-block; height:28px; background-position:0 50%; background-repeat:no-repeat;}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .sel_method li label .payimg.kakao {width:79px; background-image:url('/images/pc/pay_kakao.png');}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .sel_method li label .payimg.naver {width:68px; background-image:url('/images/pc/pay_naver.png');}
-	.odPayment .area_paymethod .radio_blk .paymethod_box .sel_method li label .payimg.payco {width:66px; background-image:url('/images/pc/pay_payco.png');}
-	.odPayment .area_paymethod .agree_insurance {display:none; margin:30px 0 0; padding-top:30px; border-top:1px solid #ddd;}
-	.odPayment .area_paymethod .agree_insurance input[type="checkbox"] + label {color:#666; font-size:16px; font-weight:200;}
-	.odPayment .area_paymethod .agree_insurance p {padding:15px 30px 30px; color:#888; font-size:14px; line-height:20px;}
+	.odPayment .area_paymethod .paymethod_box .info_quick {padding:30px 0; border-top:1px solid #ddd;}
+	.odPayment .area_paymethod .paymethod_box .info_quick li {position:relative; font-size:14px; color:#888; padding-left:15px; margin-top:10px;}
+	.odPayment .area_paymethod .paymethod_box .info_quick li:first-of-type {margin-top:0;}
+	.odPayment .area_paymethod .paymethod_box .info_quick li::before {content:''; position:absolute; top:5px; left:0; background:#858585; width:3px; height:3px;}
+	.odPayment .area_paymethod .paymethod_box .sel_method {}
+	.odPayment .area_paymethod .paymethod_box .sel_method::after {content:''; clear:both; display:block;}
+	.odPayment .area_paymethod .paymethod_box .sel_method li {float:left; width:calc(100% / 7);}
+	.odPayment .area_paymethod .paymethod_box .sel_method li label::before,
+	.odPayment .area_paymethod .paymethod_box .sel_method li label::after {display:none;}
+	.odPayment .area_paymethod .paymethod_box .sel_method li label span {display:inline-block; height:26px; color:#222; font-size:16px; font-weight:200; line-height:27px;}
+	.odPayment .area_paymethod .paymethod_box .sel_method li label .payimg {display:inline-block; width:66px; height:26px; background-position:50% 50%; background-repeat:no-repeat; background-size:auto 100%;}
+	.odPayment .area_paymethod .paymethod_box .sel_method li label .payimg.kakao {background-image:url('/images/pc/pay_kakao.png');}
+	.odPayment .area_paymethod .paymethod_box .sel_method li label .payimg.naver {background-image:url('/images/pc/pay_naver.png');}
+	.odPayment .area_paymethod .paymethod_box .sel_method li label .payimg.payco {background-image:url('/images/pc/pay_payco.png');}
+	.odPayment .area_paymethod .paymethod_box .sel_method li input[type="radio"] + label {display:block; height:64px; padding:17px 0; border:1px solid #ddd; border-right:none; text-align:center;}
+	.odPayment .area_paymethod .paymethod_box .sel_method li:last-child input[type="radio"] + label {border-right:1px solid #ddd;}
+	.odPayment .area_paymethod .paymethod_box .sel_method li input[type="radio"]:checked + label {border:2px solid #fd4802;}
+	.odPayment .area_paymethod .paymethod_box .sel_method li input[type="radio"]:checked + label span {color:#fd4802; font-weight:500;}
+	.odPayment .area_paymethod .agree_insurance {display:none; margin:25px 0 0;}
+	.odPayment .area_paymethod .agree_insurance input[type="checkbox"] + label {color:#666; font-size:14px; font-weight:200;}
+	.odPayment .area_paymethod .agree_insurance p {padding:15px 30px 0px; color:#888; font-size:14px; line-height:20px;}
 	.odPayment .area_paymethod .agree_paymethod {margin-top:20px;}
-	.odPayment .area_paymethod .agree_paymethod label {font-size:16px; font-weight:200;}
+	.odPayment .area_paymethod .agree_paymethod input[type="checkbox"] + label {color:#666; font-size:14px; font-weight:200;}
 	
 	.odPayment .area_paymentinfo {margin-top:30px;}
 	.odPayment .paymentinfo {}
 	.odPayment .paymentinfo.on {}
 	.odPayment .paymentinfo .payinfo_blk {border:1px solid #ddd; border-top:none;}
 	.odPayment .paymentinfo .payinfo_blk:first-child {border-top:1px solid #ddd;}
-	.odPayment .paymentinfo .payinfo_blk a {display:block; padding:40px; color:#222; font-size:16px; font-weight:300;}
+	.odPayment .paymentinfo .payinfo_blk a {display:block; padding:30px 40px; color:#222; font-size:16px; font-weight:300;}
 	.odPayment .paymentinfo .payinfo_blk a::after {clear:both; display:block; width:100%;}
 	.odPayment .paymentinfo .payinfo_blk a span {float:right; position:relative; padding-right:22px; color:#222; font-size:14px;}
 	.odPayment .paymentinfo .payinfo_blk a span::after {content:''; position:absolute; right:0; top:2px; width:11px; height:9px; background:url('/images/pc/ico_mb_arrow.png') no-repeat 0% 100%; background-size:100% auto;}
-	.odPayment .paymentinfo .payinfo_blk.on a span::after {top:3px; background-position:0 0;}
-
 	.odPayment .paymentinfo .payinfo_blk .infotxt {display:none; max-height:190px; margin-top:20px; color:#888; font-size:14px; line-height:26px; overflow-y:scroll;}
-	.odPayment .paymentinfo .payinfo_blk.on .infotxt {display:block; margin:0px 40px 40px;}
-	.odPayment .area_paymentinfo .agree_payment {margin:40px 0 30px; color:#666; font-size:16px; font-weight:200;}
-	.odPayment .area_paybtn .btn {height:80px; font-size:18px; font-weight:300;}
-
+	.odPayment .paymentinfo .payinfo_blk.on {background:#f5f5f5;}
+	.odPayment .paymentinfo .payinfo_blk.on a {padding-bottom:15px;}
+	.odPayment .paymentinfo .payinfo_blk.on a span::after {top:3px; transform:rotate(-180deg);}
+	.odPayment .paymentinfo .payinfo_blk.on .infotxt {display:block; margin:0px 40px 20px;}
+	.odPayment .area_paymentinfo .agree_payment {margin:40px 0 40px; color:#222; font-size:18px; font-weight:200; text-align:center;}
+	.odPayment .area_paybtn .btn {height:80px; font-size:20px; font-weight:300;}
+	.odPayment .area_paybtn .btn em {font-weight:500;}
 
 	/* od_completed */
 	.od .completed {}
@@ -2495,44 +2553,119 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.nonMBorder .adress_area dl div dd {width: calc(100% - 50px); line-height:24px;}
 
 	/* od_popup */
-	.modal.od_pop .modal-header h5.modal-title {margin-top:0; font-size:24px; font-weight:300;}
+	.modal.od_pop {padding:60px;}
+	.modal.od_pop button span {line-height:1;}
+	.modal.od_pop .modal-body .pop_cont {line-height:1; max-height:none;}
 	.modal.od_pop .modal-header .txt {margin-top:20px; color:#666; font-size:16px; font-weight:300;}
 	.modal.od_pop .form_field,
 	.modal.od_pop .form_field > div {display:block; width:100%;}
+	.modal.od_pop div::after,
+	.modal.od_pop ul::after,
+	.modal.od_pop dl::after {content:''; clear:both; display:block; width:100%;}
+	.modal.od_pop .form_field input[type="radio"] + label {padding-left:30px;}
+	.modal.od_pop .form_field input[type="radio"] + label:before,
+	.modal.od_pop .form_field input[type="radio"]:checked + label:after,
+	.modal.od_pop .form_field input[type="checkbox"] + label:before,
+	.modal.od_pop .form_field input[type="checkbox"]:checked + label:after,
+	.modal.od_pop .form_field input[type="checkbox"]:disabled + label:after {top:50%; transform:translateY(-50%);}
 
 	/* od_shoppingbag_popup */
-	.modal.opt_modify_pop {max-width:900px; max-height:900px;}
+	.modal.od_pop {max-width:950px; height:auto; /*max-height:670px;*/}
+	.modal.od_pop .area_slider .swiper-container .item_prod {width:100%;}
+	.modal.od_pop .area_slider .swiper-container .item_prod .item_state {padding:0}
+	.modal.od_pop .area_slider .swiper-container .item_prod .item_state .btn {margin-top:20px; width:100%; height:34px; padding:10px; font-size:14px;} 
+	.modal.od_pop .area_slider .swiper-container .item_prod .item_state .itemPrice {position:relative; padding-top:20px;}
+	.modal.od_pop .area_slider .swiper-container .item_prod .item_state .itemPrice_original {position:absolute; top:0; left:0; margin:0;}
+	.modal.od_pop .area_slider .swiper-scrollbar {background:#ddd}
+	.modal.od_pop .area_slider .swiper-scrollbar-drag {border-radius:0; background:#222;}
+	.modal.od_pop .area_slider .swiper-container-horizontal>.swiper-scrollbar {position:relative; left:auto; right:auto; bottom:auto; margin-top:60px; width:100%; height:2px; opacity: 1 !important;}
+	.modal.opt_modify_pop {max-width:890px; max-height:890px;}
+	.modal.opt_modify_pop img {width:100%}
 	.modal.opt_modify_pop .modal-header {margin-bottom:20px;}
-	.modal.opt_modify_pop .modal-header h5.modal-title {margin-bottom:40px}
+	.modal.opt_modify_pop .modal-header h5.modal-title {margin-bottom:20px}
 	.modal.opt_modify_pop .modal-body .pop_cont {max-height:680px;}
-	.modal.opt_modify_pop .prod_title {}
-	.modal.opt_modify_pop .opt_header {font-size:14px;}
-	.modal.opt_modify_pop .opt_header .title {color:#222; font-weight:300}
-	.modal.opt_modify_pop .opt_header .color {color:#666; font-weight:200;}
-	.modal.opt_modify_pop img {width:100%}
-	.modal.opt_modify_pop ul::after {content:''; clear:both; display:block; width:100%;}
-	.modal.opt_modify_pop .prod_info {position:relative;}
-	.modal.opt_modify_pop .prod_info::after {content:''; clear:both; display:block; width:100%;}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_pic {float:left; width:360px;}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_pic .pic_list {}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_pic .pic_list li {float:left; width:50%;}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order {float:right; width:380px;}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order .opt_color ul {}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order .opt_color ul li {float:left; margin-left:6px; margin-bottom:6px}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order .opt_color ul li a {display:block; box-sizing:border-box; width:70px; height:105px;}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order .opt_color ul li a.on img {border:1px solid #222}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order .opt_size .form_field {}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order .opt_size .form_field input[type="radio"] + label {display:block; width:50px; height:40px; padding:0; line-height:41px; text-align:center; background:#f5f5f5; box-sizing:border-box;}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order .opt_size .form_field input[type="radio"] + label::before,
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order .opt_size .form_field input[type="radio"] + label::after {display:none;}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order .opt_size .form_field input[type="radio"]:checked + label {border:1px solid #222;}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order .opt_size .form_field input[type="radio"]:disabled + label {text-decoration:line-through;}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order .opt_size .form_field > div {float:left; width:auto;}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order .opt_count .number_count span {cursor:pointer; display:inline-block; width:30px; height:30px; background:#f5f5f5; text-align:center;}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order .opt_count .number_count .plus::after {content:'+';}
-	.modal.opt_modify_pop .prod_info .prod_preview .area_order .opt_count .number_count .minus::after {content:'-';}
+	.modal.opt_modify_pop .opt_header {margin-bottom:18px; font-size:14px;}
+	.modal.opt_modify_pop .opt_header > span {float:left; display:inline-block;}
+	.modal.opt_modify_pop .opt_header .title {color:#222; font-weight:500}
+	.modal.opt_modify_pop .opt_header .color {margin-left:20px; color:#666; font-weight:200;}
+	.modal.opt_modify_pop .opt_header .text {margin-left:20px; color:#666; font-weight:200;}
+	.modal.opt_modify_pop .area_pic {float:left; width:360px;}
+	.modal.opt_modify_pop .area_pic .pic_list {margin-top:-5px}
+	.modal.opt_modify_pop .area_pic .pic_list li {float:left; width:50%; padding-top:5px; padding-bottom:5px;}
+	.modal.opt_modify_pop .area_pic .pic_list li:nth-child(odd) {padding-right:5px;}
+	.modal.opt_modify_pop .area_pic .pic_list li:nth-child(even) {padding-left:5px;}
+	.modal.opt_modify_pop .area_order {float:right; width:380px;}
+	.modal.opt_modify_pop .area_order > div {margin-top:40px}
+	.modal.opt_modify_pop .area_order > div:first-child {margin-top:0}
+	.modal.opt_modify_pop .area_order .opt_color ul {margin-top:-6px;}
+	.modal.opt_modify_pop .area_order .opt_color ul li {float:left; margin-left:6px; margin-top:6px}
+	.modal.opt_modify_pop .area_order .opt_color ul li:nth-child(5n-4) {margin-left:0} 
+	.modal.opt_modify_pop .area_order .opt_color ul li a {display:block; box-sizing:border-box; width:70px; height:105px;}
+	.modal.opt_modify_pop .area_order .opt_color ul li a.on img {border:1px solid #fd4802}
+	.modal.opt_modify_pop .area_order .opt_size {padding-bottom:40px; border-bottom:1px solid #ddd;}
+	.modal.opt_modify_pop .area_order .opt_size .form_field {display:block; width:95%; margin-top:-6px;}
+	.modal.opt_modify_pop .area_order .opt_size .form_field > div {margin-left:6px; margin-top:6px;}
+	.modal.opt_modify_pop .area_order .opt_size .form_field > div:nth-child(6n-5) {margin-left:0px;}
+	.modal.opt_modify_pop .area_order .opt_size .form_field input[type="radio"] + label {display:block; width:50px; height:40px; padding:0; line-height:40px; text-align:center; background:#fff; box-sizing:border-box; border:1px solid #ddd; color:#222; font-weight:200; font-size:14px;}
+	.modal.opt_modify_pop .area_order .opt_size .form_field input[type="radio"] + label::before,
+	.modal.opt_modify_pop .area_order .opt_size .form_field input[type="radio"] + label::after {display:none;}
+	.modal.opt_modify_pop .area_order .opt_size .form_field input[type="radio"]:checked + label {border:1px solid #fd4802;}
+	.modal.opt_modify_pop .area_order .opt_size .form_field input[type="radio"]:disabled + label {text-decoration:line-through; background:#f5f5f5; border-color:#f5f5f5; color:#bbb; opacity:1;}
+	.modal.opt_modify_pop .area_order .opt_size .form_field > div {float:left; width:auto;}
+	.modal.opt_modify_pop .area_order .opt_count .opt_count {padding-bottom:0;}
+	.modal.opt_modify_pop .area_order .opt_count .number_count {display:inline-block; border:1px solid #ddd}
+	.modal.opt_modify_pop .area_order .opt_count .number_count::after {content:''; clear:both; display:block;}
+	.modal.opt_modify_pop .area_order .opt_count .number_count span,
+	.modal.opt_modify_pop .area_order .opt_count .number_count input[type='text']{float:left;}
+	.modal.opt_modify_pop .area_order .opt_count .number_count span {cursor:pointer; position:relative; display:inline-block; width:40px; height:40px; text-align:center;}
+	.modal.opt_modify_pop .area_order .opt_count .number_count span::after {content:''; position:absolute; left:50%; top:50%; transform: translate(-50%, -50%);; width:12px; height:12px; background:url('/images/pc/btn_count.png') no-repeat 100% 0; image-rendering:pixelated;}
+	.modal.opt_modify_pop .area_order .opt_count .number_count span.min_val,
+	.modal.opt_modify_pop .area_order .opt_count .number_count span.max_val {opacity:0.2;}
+	.modal.opt_modify_pop .area_order .opt_count .number_count .plus::after {content:''; background-position:100% 0;}
+	.modal.opt_modify_pop .area_order .opt_count .number_count .minus::after {content:''; background-position:0 0;}
+	.modal.opt_modify_pop .area_order .opt_count .number_count input[type='text'] {width:44px; height:40px; padding:0; text-align:center; color:#222; font-size:15px; font-weight:200; border:none;}
+
+
 
 	/* od_odPayment_popup */
+	.modal.couponModify_pop {width:630px; padding-bottom:0;}
+	.modal.couponModify_pop .modal-body .pop_cont {max-height:600px;}
+	.modal.couponModify_pop .modal-footer {margin-top:0; margin-left:-60px; margin-right:-60px;}
+	.modal.couponModify_pop h6 {margin-bottom:20px;}
+	.modal.couponModify_pop .area_item_coupon {margin-bottom:40px;}
+	.modal.couponModify_pop .area_item_coupon .apply_item {margin-top:30px;}
+	.modal.couponModify_pop .area_item_coupon .apply_item:first-child {margin-top:0}
+	.modal.couponModify_pop .area_item_coupon .apply_item .item_gd {margin-bottom:20px}
+	.modal.couponModify_pop .area_item_coupon .apply_item .item_gd figure {height:120px;}
+	.modal.couponModify_pop .area_item_coupon .apply_item .item_gd figure > div {display:inline-block;}
+	.modal.couponModify_pop .area_item_coupon .apply_item .item_gd figure .thumb {float:left; width:80px; height:120px; padding-top:0;}
+	.modal.couponModify_pop .area_item_coupon .apply_item .item_gd figure figcaption {display:table-cell; padding-left:20px; width:calc(100% - 140px); height:120px; vertical-align:middle;}
+	.modal.couponModify_pop .area_item_coupon .apply_item .item_gd figure figcaption .name {margin-top:10px}
+	.modal.couponModify_pop .area_item_coupon .apply_item .item_gd figure figcaption .option {margin-top:15px}
+	.modal.couponModify_pop .area_item_coupon .select_custom {height:90px;}
+	.modal.couponModify_pop .area_item_coupon .select_custom .combo .select {height:90px; padding:0;}
+	.modal.couponModify_pop .area_item_coupon .select_custom .combo .select:after {top:50%; right:20px; transform:translateY(-50%);}
+	.modal.couponModify_pop .area_item_coupon .select_custom .combo .list {top:89px; padding:0;}
+	.modal.couponModify_pop .area_item_coupon .select_custom .combo .list > li {line-height:1; height:90px; padding:0; border-top:1px solid #ddd;}
+	.modal.couponModify_pop .area_item_coupon .select_custom .combo .item_coupon {padding:14px 18px;}
+	.modal.couponModify_pop .area_item_coupon .select_custom .combo .item_coupon .name {color:#222; font-size:14px; font-weight:300;}
+	.modal.couponModify_pop .area_item_coupon .select_custom .combo .item_coupon .txt {margin-top:10px; color:#888; font-size:14px; font-weight:200;}
+	.modal.couponModify_pop .area_item_coupon .select_custom .combo .item_coupon .txt span {font-weight:300;}
+	.modal.couponModify_pop .area_item_coupon .select_custom .combo .item_coupon .discount {margin-top:10px;  color:#fd4802; font-size:16px; font-weight:300;}
+	.modal.couponModify_pop .area_item_coupon .select_custom .combo .item_coupon .discount span {font-weight:500;}
+	.modal.couponModify_pop .area_item_coupon .select_custom .combo .item_coupon .empty {margin-top:22px; color:#222; font-size:14px; font-weight:300;}
+	.modal.couponModify_pop .area_item_coupon .select_custom .combo .list > li[aria-disabled="true"] .item_coupon p {color:#888;}
+	.modal.couponModify_pop .area_cart_coupon {margin-bottom:40px;}
+	.modal.couponModify_pop .area_cart_coupon .form_field > div {border-bottom:1px solid #ddd}
+	.modal.couponModify_pop .area_cart_coupon .form_field > div:first-child {border-top:1px solid #ddd;}
+	.modal.couponModify_pop .area_cart_coupon .form_field > div label {width:100%;}
+	.modal.couponModify_pop .area_cart_coupon .cart_coupon {padding:20px 0px;}
+	.modal.couponModify_pop .area_cart_coupon .cart_coupon .name {color:#222; font-size:14px; font-weight:300;}
+	.modal.couponModify_pop .area_cart_coupon .cart_coupon .txt {margin-top:10px; color:#888; font-size:14px; font-weight:200;}
+	.modal.couponModify_pop .area_cart_coupon .cart_coupon .txt span {font-weight:300;}
+	.modal.couponModify_pop .area_cart_coupon .cart_coupon .discount {margin-top:10px;  color:#fd4802; font-size:16px; font-weight:300;}
+	.modal.couponModify_pop .area_cart_coupon .cart_coupon .discount span {font-weight:500;}
+
 	.modal.qPayAgree_pop {}
 	.modal.qPayAgree_pop .area_QpayCk {margin-top:10px;}
 	.modal.qPayAgree_pop .area_QpayCk:first-child {margin-top:0;}
@@ -3514,23 +3647,23 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.sch_result .nodata .btn_box {margin-top:40px;}
 	.sch_result .nodata .btn_box .btn span {color:#222; font-size:14px; font-weight:300;}
 	.sch_result .cont_head {}
-	.sch_result .area_info {} 
+	.sch_result .area_info {width: 830px; margin: 0 auto;} 
 	.sch_result .area_info .info_result {color:#222; font-size:26px; font-weight:200;}
 	.sch_result .area_info .info_result .keyword {font-weight:500;}
 	.sch_result .area_info .info_result .number {color:#fd4802; font-size:28px; font-weight:500;}
-	.sch_result .area_info .inner_search {position:absolute; right:0; top:-8px; border-bottom:2px solid #222; z-index:2;}
-	.sch_result .area_info .inner_search input[type='text'] {width:305px; border:none; padding:2px 0px 5px; color:#222; font-size:18px;}
+	.sch_result .area_info .inner_search {position: relative; display: inline-block; width: 100%; border-bottom:2px solid #222; z-index:2;}
+	.sch_result .area_info .inner_search input[type='text'] {width:96%; border:none; padding:2px 0px 5px; color:#222; font-size:18px;}
 	.sch_result .area_info .inner_search input[type='text']::placeholder {color:#888}
 	.sch_result .area_info .inner_search button {display:inline-block; width:24px; height:24px; background:url('/images/pc/ico_search_faq.png') no-repeat 50% 50%; background-size:100% auto; overflow:hidden; font-size:1px; text-indent:-999px;}
-	.sch_result .area_info .inner_search .autokeyword {display:none; position:absolute; left:0; top:34px; width:100%; padding:0px; background:#fff; border:1px solid #222;}
+	.sch_result .area_info .inner_search .autokeyword {display:none; position:absolute; left:0; top:34px; width:100%; padding:0px; background:#fff; border:1px solid #222; z-index:5;}
 	.sch_result .area_info .inner_search .autokeyword.active {display:block;}
 	.sch_result .area_info .inner_search .autokeyword ul li a {display:block; padding:10px 15px; color:#888;}
 	.sch_result .area_info .inner_search .autokeyword ul li a em {color:#fd4802;}
 	.sch_result .area_info .inner_search .autokeyword ul li a:hover,
 	.sch_result .area_info .inner_search .autokeyword ul li a:active {background:#f5f5f5; color:#222}
-	.sch_result .area_info .related_keyword {clear:both; display:block; position:relative; margin-top:40px; padding:15px 30px 15px 150px; border:1px solid #eee; box-sizing:border-box;}
-	.sch_result .area_info .related_keyword .title {display:inline-block; position:absolute; left:30px; top:20px; padding-right:20px; color:#222; font-size:18px; font-weight:500;}
-	.sch_result .area_info .related_keyword .title::after {content:''; position:absolute; right:0; top:50%; transform:translateY(-50%); height:17px; border-left:1px solid #ddd;}
+	.sch_result .area_info .related_keyword {clear:both; display:block; position:relative; margin-top:40px; padding:0 0 0 103px; box-sizing:border-box;}
+	.sch_result .area_info .related_keyword .title {display:inline-block; position:absolute; left:0; top:4px; padding-right:20px; color:#222; font-size:18px; font-weight:500;}
+	.sch_result .area_info .related_keyword .title::after {content:''; position:absolute; right:0; top:50%; transform:translateY(-50%); height:17px; border-left:1px solid #ddd; display: none;}
 	.sch_result .area_info .related_keyword ul li {float:left; padding:5px 10px}
 	.sch_result .area_info .related_keyword ul li:first-of-type {margin-left:0}
 	.sch_result .area_info .related_keyword ul li a {display:inline-block; color:#666; font-size:14px; font-weight:300;}
@@ -3550,8 +3683,33 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.sch_result .cont_body .sch_result_cont .event_list li .ev_img img {width: 100%; height: auto;}
 	.sch_result .cont_body .sch_result_cont .event_list li .txt .tit {display: -webkit-box; -webkit-line-clamp:2; -webkit-box-orient:vertical; margin: 20px 0; min-height:66px; max-height:66px; overflow: hidden; text-overflow: ellipsis; font-size: 24px; line-height: 1.4; color: #222; font-weight: 300; word-break: keep-all;}
 
-
-	/* br */ 
+	/* 검색결과_기획전 */
+	.sch_result .cont_body .sch_result_cont .exhi_list .item_prod .item_state {display: table; vertical-align: middle; padding: 0; width: 100%; padding-left: 130px; height: 100%;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .item_prod:nth-child(5n+0) {margin-right: 0;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .item_prod:nth-child(6n+0) {margin-right: 20px;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp {margin-bottom: 80px;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item {float:left; width: 24.15%; overflow: hidden; margin:0 1.12% 80px 0;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item:nth-child(4n) {margin:0 0 40px 0;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item .exhi_item_img {width: 430px; height: 430px; overflow: hidden;} 
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item .exhi_item_img img {position: absolute; top: 50%; left: 50%; transform: translate(-50%, -50%); width: 100%; height:auto;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item .exhi_item_img a {position: relative; width: 100%; height: 100%; display: block; padding-bottom: 100px;}
+	
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item .exhi_item_img a:after {content:''; position: absolute; left: 0; bottom: 0; width: 100%; height: 342px; background: linear-gradient(0deg, rgba(0,0,0,1) 0%, transparent 100%); z-index: 8;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item .exhi_item_img .exhi_detail {position: absolute; left: 0; bottom: 100px; z-index: 9; padding: 23px; padding-bottom: 0;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item .exhi_item_img .exhi_detail * {display: -webkit-box; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; color: #fff; font-weight: 300; letter-spacing: 0;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item .exhi_item_img .exhi_detail .brand {font-size: 14px;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item .exhi_item_img .exhi_detail .tit {margin:20px 0 15px; max-height:66px; font-size: 24px; line-height: 1.4; word-break: keep-all;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item .exhi_item_img .exhi_detail .sale {font-size: 14px;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item_pr li {height: 150px; margin-bottom: 16px;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item_pr li:last-child {margin-bottom: 0;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item_pr .item_prod {width: 100%; margin-right: 0; margin-bottom: 0; height: 150px;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item_pr {background: #fff; padding: 20px; position: relative; z-index: 99; width: 380px; margin:-70px auto 0;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item_pr .itemPic {position: absolute; left: 0; top: 0; width: 100px; height: 150px; padding-top: 0; margin-bottom: 0;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item_pr .itemLink {position: static; display: table-cell; vertical-align:middle;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item_pr .itemName {font-size: 14px; line-height: 1.4; max-height: none; margin: 0px 0px 15px; height:auto;}
+	.sch_result .cont_body .sch_result_cont .exhi_list .itemsGrp .exhi_item_pr .itemPrice {margin-left: 0; margin-right: 0; font-size: 16px;}
+
+	/* br */  
 	.br {padding-bottom:160px;}
 	.br div::after,
 	.br dl::after,
@@ -4600,3 +4758,36 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.ev .other_ev_slide .swiper-button-next:after, .ev .other_ev_slide .swiper-button-prev:after {content:'';}
 	.ev .other_ev_slide .swiper-button-next {background: url(/images/pc/slide_next.png) no-repeat center; right: 70px; opacity: 0.6; margin-top: -10px;}
 	.ev .other_ev_slide .swiper-button-prev {background: url(/images/pc/slide_prev.png) no-repeat center; left: 70px; opacity: 0.6; margin-top: -10px;}
+
+
+
+
+	/* 이용약관,개인정보취급방침 */
+	.ps .cont_head > div h3{text-align: center;margin-bottom: 0;padding-bottom: 60px;font-size: 40px;line-height: 1;}
+	.ps .cont_body {width: 1200px;margin: 0 auto;}
+	.ps p {font-size:16px;color:#666666;line-height:26px;letter-spacing:-0.025em;}
+	.ps {padding:0; border-top:1px solid #000;} 
+	.ps table {word-break:keep-all;margin-top: 30px;}
+	.ps table th,
+	.ps table td {position:relative; padding:20px 40px; font-size:16px;color: #222222;letter-spacing:-0.025em;}
+	.ps table td {border-bottom:1px solid #ddd;border-right: 1px solid #ddd;font-weight:200;}
+	.ps table td:last-child {border-right: 1px solid transparent;}
+	.ps table th {border-top: 1px solid #000;border-bottom:1px solid #000;border-right: 1px solid transparent;font-weight:500;text-align:center;}
+	.hookGrp{margin-top: 40px;}
+	.hookGrp .hook_list{border: 1px solid #f5f5f5;padding: 40px;}
+	.hookGrp .hook_list ul{}
+	.hookGrp .hook_list ul:after{content: ''; clear:both; display: block;}
+	.hookGrp .hook_list ul li{float: left;width: 33.333%;}
+	.hookGrp .hook_list ul li a{display: table; color: #222222;}
+	.hookGrp .hook_list ul li a span{margin: 0px 0px 18px 0;display: block;font-size: 16px;font-weight: 300;}
+	.hookGrp .hook_list ul li a span::after{content: ''; display: block; box-sizing: border-box; border: 1px solid transparent;}
+	.hookGrp .hook_list ul li a:hover,
+	.hookGrp .hook_list ul li a:focus{color: #fd4802;}
+	.hookGrp .hook_list ul li a:hover span:after,
+	.hookGrp .hook_list ul li a:focus span:after{content: '';display: block; color: #fd4802; box-sizing: border-box; border-bottom: 1px solid #fd4802;}
+	.hookGrp .hook_cont {font-size:16px;color:#666666;line-height:26px;letter-spacing:-0.025em;}
+	.hookGrp .hook_cont div{margin-top: 62px;}
+	.hookGrp .hook_cont div:last-child{margin-bottom: 160px;}
+	.hookGrp .hook_cont h4 {font-size:24px;font-weight:500;color:#222222;line-height:26px;letter-spacing:-0.025em;}
+	.hookGrp .hook_cont p {font-size:16px;color:#666666;line-height:26px;letter-spacing:-0.025em;}
+	.hookGrp .hook_cont ol li {padding-left: 15px;}

+ 1 - 1
src/main/webapp/ux/pc/css/reset.css

@@ -8,7 +8,7 @@ table,caption,thead,tfoot,tbody,tr,th,td,
 address,img,span,em,strong,pre {margin:0; padding:0;}
 
 * {box-sizing:border-box;}
-html,body {/*width:100%; height:100%;*/}
+html,body {/*width:100%; height:100%;*/scroll-behavior: smooth;}
 html * {outline: none !important;-ms-text-size-adjust: 100%;-webkit-text-size-adjust: 100%;}
 body {line-height:1; background-color:#fff;  word-break:break-all;text-rendering: optimizeLegibility;-webkit-font-smoothing: antialiased;}
 ::selection {background-color:#efe7e5;}

+ 29 - 0
src/main/webapp/ux/pc/js/common-ui.js

@@ -49,6 +49,24 @@ $(document).ready(function(){
 		});
 	});
 
+	// brand-header minify
+	$(function(){
+		$(window).scroll(function(){
+			//var scroll = $(this).scrollTop();
+			var brheaderH =  $('#br_header').outerHeight();
+			if ($(window).scrollTop() > brheaderH){
+				//header minify
+				$("#br_header").addClass("minify");
+				$("#br_header .hd_top_banner,#br_header .common_header.br_header .util_group").hide();
+			}
+			else {
+				//header minify
+				$("#br_header").removeClass("minify");
+				$("#br_header .hd_top_banner,#br_header .common_header.br_header .util_group").show();
+			}
+		});
+	});
+
 	// history back
 	$(".back").on("click", function () {
 		history.back()
@@ -65,6 +83,17 @@ $(document).ready(function(){
 		return false;
 	});		
 
+	//브랜드 통합검색 - 레이어 열고닫기
+	$(document).on('click','.common_header.br_header .search .promotion_search, .common_header.br_header .search .btn_open_search',function(e){
+		$('body').addClass('lock');
+		$("#br_header .common_search.schBrand").addClass('active'); 
+		return false;
+	}).on('click','.common_search .btn_close_search',function(e){
+		$("#br_header .common_search.schBrand").removeClass('active'); 
+		$('body').removeClass('lock');
+		return false;
+	});
+
 	//통합검색 - 검색어 입력 시 
 	$(document).on('keyup','.common_search .area_input input',function(e){
 		var searchValue = $(this).val();

+ 14 - 12
src/main/webapp/ux/style24_link.js

@@ -431,7 +431,7 @@ function cfGoodsCouponInfo(goodsCd) {
 		return false;
 	}
 	
-	var str = '<div class="modal fade pd_pop salecoupon_pop" id="layer_goods_coupon" tabindex="-1" role="dialog" aria-labelledby="saleCouponLabel" aria-hidden="true">';
+	var str = '<div class="modal fade pd_pop salecoupon_pop" id="layer_goods_coupon" tabindex="-1" role="dialog" aria-labelledby="saleCouponLabel" aria-hidden="true"></div>';
 
 	if ($('#layer_goods_coupon').length == 0) {
 		$('body').append(str);
@@ -449,7 +449,7 @@ function cfGoodsCouponInfo(goodsCd) {
 * </pre>
 */
 function cfGoodsShopBenefitInfo(goodsCd) {
-	var str = '<div class="modal fade pd_pop bnf_shopping_pop" id="layer_shopping_benefit" tabindex="-1" role="dialog" aria-labelledby="bnfShoppingLabel" aria-hidden="true">';
+	var str = '<div class="modal fade pd_pop bnf_shopping_pop" id="layer_shopping_benefit" tabindex="-1" role="dialog" aria-labelledby="bnfShoppingLabel" aria-hidden="true"></div>';
 
 	if ($('#layer_shopping_benefit').length == 0) {
 		$('body').append(str);
@@ -467,7 +467,7 @@ function cfGoodsShopBenefitInfo(goodsCd) {
 * </pre>
 */
 function cfGoodsSizeInfo(goodsCd, colorCd) {
-	var str = '<div class="modal fade pd_pop info_size_pop" id="layer_size_info" tabindex="-1" role="dialog" aria-labelledby="infoSizeLabel" aria-hidden="true">';
+	var str = '<div class="modal fade pd_pop info_size_pop" id="layer_size_info" tabindex="-1" role="dialog" aria-labelledby="infoSizeLabel" aria-hidden="true"></div>';
 
 	if ($('#layer_size_info').length == 0) {
 		$('body').append(str);
@@ -491,7 +491,7 @@ function cfGoodsInstockAlarmInfo(goodsCd, colorCd) {
 		return false;
 	}
 	
-	var str = '<div class="modal fade pd_pop push_restock_pop" id="layer_instock_alarm" tabindex="-1" role="dialog" aria-labelledby="pushRestockLabel" aria-hidden="true">';
+	var str = '<div class="modal fade pd_pop push_restock_pop" id="layer_instock_alarm" tabindex="-1" role="dialog" aria-labelledby="pushRestockLabel" aria-hidden="true"></div>';
 
 	if ($('#layer_instock_alarm').length == 0) {
 		$('body').append(str);
@@ -509,7 +509,7 @@ function cfGoodsInstockAlarmInfo(goodsCd, colorCd) {
 * </pre>
 */
 function cfGoodsBestReview(goodsCd) {
-	var str = '<div class="modal fade pd_pop pd_bestreviewdetail_pop" id="layer_review_best" tabindex="-1" role="dialog" aria-labelledby="pdBestReviewLabel" aria-hidden="true">';
+	var str = '<div class="modal fade pd_pop pd_bestreviewdetail_pop" id="layer_review_best" tabindex="-1" role="dialog" aria-labelledby="pdBestReviewLabel" aria-hidden="true"></div>';
 
 	if ($('#layer_review_best').length == 0) {
 		$('body').append(str);
@@ -527,7 +527,7 @@ function cfGoodsBestReview(goodsCd) {
 * </pre>
 */
 function cfGoodsReviewPhoto(goodsCd) {
-	var str = '<div class="modal fade pd_pop pd_photoreviewlist_pop" id="layer_review_photo" tabindex="-1" role="dialog" aria-labelledby="pdPhotoReviewListLabel" aria-hidden="true">';
+	var str = '<div class="modal fade pd_pop pd_photoreviewlist_pop" id="layer_review_photo" tabindex="-1" role="dialog" aria-labelledby="pdPhotoReviewListLabel" aria-hidden="true"></div>';
 
 	if ($('#layer_review_photo').length == 0) {
 		$('body').append(str);
@@ -545,7 +545,7 @@ function cfGoodsReviewPhoto(goodsCd) {
 * </pre>
 */
 function cfGoodsReviewPhotoDetail(goodsCd) {
-	var str = '<div class="modal fade pd_pop pd_photoreviewdetail_pop" id="layer_review_photo_detail" tabindex="-1" role="dialog" aria-labelledby="pdPhotoReviewDetailLabel" aria-hidden="true">';
+	var str = '<div class="modal fade pd_pop pd_photoreviewdetail_pop" id="layer_review_photo_detail" tabindex="-1" role="dialog" aria-labelledby="pdPhotoReviewDetailLabel" aria-hidden="true"></div>';
 
 	if ($('#layer_review_photo_detail').length == 0) {
 		$('body').append(str);
@@ -579,6 +579,7 @@ function cfOpenFullLayer(page, tgt, oParam, callbackFnc) {
 				callbackFnc();
 		}
 		, "html");
+
 	return false;
 }
 
@@ -612,7 +613,7 @@ function cfCloseFullLayer(tgt) {
 */
 function cfGoodsQng(goodsCd) {
 	var Param = new Object();
-	var str = '<div class="pd_pop full_pop pd_qnalist_pop" id="layer_goods_qna">';
+	var str = '<div class="pd_pop full_pop pd_qnalist_pop" id="layer_goods_qna"></div>';
 
 	if ($('#layer_goods_qna').length == 0) {
 		$('body').append(str);
@@ -631,7 +632,7 @@ function cfGoodsQng(goodsCd) {
 */
 function cfGoodsQngCreate(goodsCd) {
 	var Param = new Object();
-	var str = '<div class="modal fade pd_pop pd_qnawrite_pop" id="layer_goods_qna_reg" tabindex="-1" role="dialog" aria-labelledby="pdQnaWriteLabel" aria-hidden="true">';
+	var str = '<div class="modal fade pd_pop pd_qnawrite_pop" id="layer_goods_qna_reg" tabindex="-1" role="dialog" aria-labelledby="pdQnaWriteLabel" aria-hidden="true"></div>';
 
 	if ($('#layer_goods_qna_reg').length == 0) {
 		$('body').append(str);
@@ -650,7 +651,7 @@ function cfGoodsQngCreate(goodsCd) {
 */
 function cfGoodsDelivery(goodsCd) {
 	var Param = new Object();
-	var str = '<div class="pd_pop full_pop pd_delivery_pop" id="layer_goods_delivery">';
+	var str = '<div class="pd_pop full_pop pd_delivery_pop" id="layer_goods_delivery"></div>';
 
 	if ($('#layer_goods_delivery').length == 0) {
 		$('body').append(str);
@@ -669,13 +670,14 @@ function cfGoodsDelivery(goodsCd) {
 */
 function cfGoodsReview(goodsCd) {
 	var Param = new Object();
-	var str = '<div class="pd_pop full_pop pd_review_pop" id="layer_goods_review">';
+	var str = '<div class="pd_pop full_pop pd_review_pop" id="layer_goods_review"></div>';
 
 	if ($('#layer_goods_review').length == 0) {
 		$('body').append(str);
+		
 	}
 
-	cfOpenFullLayer(_PAGE_GOODS_REVIEW_LAYER + goodsCd, 'layer_goods_review');
+	cfOpenFullLayer(_PAGE_GOODS_REVIEW_LAYER + goodsCd, 'layer_goods_review',null , reviewAfter);
 }
 
 /**

Некоторые файлы не были показаны из-за большого количества измененных файлов