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

src/main/java/com/style24/front/biz/dao/TsfCustomerDao.java

@@ -180,16 +180,6 @@ public interface TsfCustomerDao {
 	 */
 	CustGrade getCustGradeOrderInfo(CustGrade custGrade);
 
-	/**
-	 * 고객 생년월일 저장
-	 *
-	 * @param customer - 고객번호, 생년월일
-	 * @return int - 결과
-	 * @author jsshin
-	 * @since 2021. 05. 10
-	 */
-	int saveBatchBirth(Customer customer);
-
 	/**
 	 * SMS수신거부 처리
 	 * @param custNo - 고객번호

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

@@ -261,6 +261,11 @@ public class TsfCustomerService {
 	@Transactional("shopTxnManager")
 	public boolean saveJoinCustomer(Customer customer) {
 		boolean isJoin = true;
+
+		if (customer.getBirthYmd().length() == 8) {
+			String birthMm = customer.getBirthYmd().substring(4, 6);
+			customer.setBirthMm(birthMm);
+		}
 		customer.setHypenCellPhone();
 		customer.encryptData();
 		customer.setEncodedPasswd(passwordEncoder.encodeSha256(customer.getPasswd()));
@@ -270,7 +275,6 @@ public class TsfCustomerService {
 		customer.setCustGrade(TscConstants.CustGrade.WELCOME.value());
 		
 		int custCnt = customerDao.createCustomer(customer);
-		customerDao.saveBatchBirth(customer);
 
 		if (custCnt > 0) {
 			saveJoinPostProcessing(customer);
@@ -311,6 +315,10 @@ public class TsfCustomerService {
 	@Transactional("shopTxnManager")
 	public boolean saveJoinCustomerSns(Customer customer) {
 		boolean isJoin = true;
+		if (customer.getBirthYmd().length() == 8) {
+			String birthMm = customer.getBirthYmd().substring(4, 6);
+			customer.setBirthMm(birthMm);
+		}
 		String snsId = customer.getSnsType().equals(TscConstants.SnsType.YES24.value()) ? customer.getMemNo() : customer.getSnsId();
 		customer.setEncodedPasswd(" ");
 		customer.setCustId(customer.getSnsType() + "_" + snsId);
@@ -325,7 +333,6 @@ public class TsfCustomerService {
 
 		int custCnt = customerDao.createCustomer(customer);
 		customerDao.createCustomerSns(customer);
-		customerDao.saveBatchBirth(customer);
 
 		if (custCnt > 0) {
 			saveJoinPostProcessing(customer);
@@ -417,10 +424,14 @@ public class TsfCustomerService {
 			}
 
 			if (TscConstants.CustStat.ACTIVE.value().equals(custInfo.getCustStat())) {
+
 				custInfo.setSnsId(custSnsInfo.getSnsId());
 				custInfo.setSnsType(custSnsInfo.getSnsType());
 				customerDao.createCustomerSns(custInfo);
+
 				resultMap.setString("custStat", "SUCC_CUST");
+				resultMap.setString("snsId", custSnsInfo.getSnsId());
+				resultMap.setString("snsType", custSnsInfo.getSnsType());
 				return resultMap;
 			}
 
@@ -430,29 +441,24 @@ public class TsfCustomerService {
 				resultMap.setString("custStat", "EMPTY_PHONE_CUST");
 				return resultMap;
 			}
-
 			boolean isFindByPhone = getCustomerFindByCellPhnnoCount(custSnsInfo.getCellPhnno().replace("-", ""));
 			if (isFindByPhone) {
 				resultMap.setString("custStat", "DUP_PHONE_CUST"); // 휴대폰 중복
 				return resultMap;
 			}
-
 			boolean isFindByEmail = getCustomerFindByEmailCount(custSnsInfo.getEmail());
 			if (isFindByEmail) {
 				resultMap.setString("custStat", "DUP_EMAIL_CUST"); // 이메일 중복
 				return resultMap;
 			}
-
 			Customer customer = objectMapper.convertValue(custSnsInfo, Customer.class);
 			boolean isJoin = saveJoinCustomerSns(customer);
-
-			if (isJoin) {
-				resultMap.setString("custNo", String.valueOf(customer.getCustNo()));
-				resultMap.setString("custStat", "NEW_CUST");
-			} else {
+			if (!isJoin) {
 				resultMap.setString("custStat", "FAIL_CUST");
+				return resultMap;
 			}
-
+			resultMap.setString("custNo", String.valueOf(customer.getCustNo()));
+			resultMap.setString("custStat", "NEW_CUST");
 		}
 
 		return resultMap;
@@ -737,11 +743,16 @@ public class TsfCustomerService {
 	@Transactional("shopTxnManager")
 	public GagaMap saveCertification(Customer customer) {
 		GagaMap resultMap = new GagaMap();
+		if (customer.getBirthYmd().length() == 8) {
+			String birthMm = customer.getBirthYmd().substring(4, 6);
+			customer.setBirthMm(birthMm);
+		}
 		customer.setRegNo(customer.getCustNo());
 		customer.setUpdNo(customer.getCustNo());
 		customer.setHypenCellPhone();
 		customer.encryptData();
 		boolean isSuccess = false;
+
 		// CI 유효성 체크
 		Customer custInfo = getCustomerFindByCi(customer.getCi());
 		if (custInfo != null) {
@@ -754,7 +765,6 @@ public class TsfCustomerService {
 		coreCustomerService.createCustomerHistory(customer);
 		// 2.CI 업데이트
 		int resultCnt = customerDao.updateCustomerCi(customer);
-		customerDao.saveBatchBirth(customer);
 
 		if (resultCnt > 0) {
 			isSuccess = true;
@@ -826,6 +836,10 @@ public class TsfCustomerService {
 	@Transactional("shopTxnManager")
 	public GagaMap updateCustomerAuth(Customer customer) {
 		GagaMap result = new GagaMap();
+		if (customer.getBirthYmd().length() == 8) {
+			String birthMm = customer.getBirthYmd().substring(4, 6);
+			customer.setBirthMm(birthMm);
+		}
 		customer.setRegNo(customer.getCustNo());
 		customer.setUpdNo(customer.getCustNo());
 		customer.setHypenCellPhone();
@@ -835,7 +849,6 @@ public class TsfCustomerService {
 
 		// 2. 이름, 휴대전화 번호, 생년월일 저장
 		int updateCnt = customerDao.updateCustomerAuth(customer);
-		customerDao.saveBatchBirth(customer);
 
 		boolean isSuccess = updateCnt > 0; // 변경 성공시 true
 

src/main/java/com/style24/front/biz/thirdparty/Yes24Login.java

@@ -127,16 +127,16 @@ public class Yes24Login {
 	 */
 	public GagaMap getUserInfo(String inpin) {
 		GagaMap result = new GagaMap();
+		try {
+			// 1. ipin 복호화
+			String decryptIpin = CryptoUtils.decryptYes24AES(inpin);
 
-		// 1. ipin 복호화
-		String decryptIpin = CryptoUtils.decryptAES(inpin);
+			// 2. ipin 값에서 ci 값 분리
+			String decryptIpinValues[] = decryptIpin.split("\\|");
 
-		// 2. ipin 값에서 ci 값 분리
-		String decryptIpinValues[] = decryptIpin.split("\\|");
+			// 3. Ci 다시 암호화
+			String encryptCi = CryptoUtils.encryptYes24AES(decryptIpinValues[1]);
 
-		// 3. Ci 다시 암호화
-		String encryptCi = CryptoUtils.encryptAES(decryptIpinValues[1]);
-		try {
 			MultiValueMap<String, String> params = new LinkedMultiValueMap<>();
 			params.add("str_ci", encryptCi);
 			params.add("str_Type", type);
@@ -224,7 +224,7 @@ public class Yes24Login {
 	 */
 	public void saveLink(CustSnsInfo custSnsInfo) {
 		// 1. Ci 다시 암호화
-		String encryptCi = CryptoUtils.encryptAES(custSnsInfo.getCi());
+		String encryptCi = CryptoUtils.encryptYes24AES(custSnsInfo.getCi());
 		String joinGb = TsfSession.getFrontGb().equals("P") ? "P" : "M";
 
 		try {
@@ -266,7 +266,7 @@ public class Yes24Login {
 		String joinGb = TsfSession.getFrontGb().equals("P") ? "P" : "M";
 
 		// 1. Ci 다시 암호화
-		String encryptCi = CryptoUtils.encryptAES(custSnsInfo.getCi());
+		String encryptCi = CryptoUtils.encryptYes24AES(custSnsInfo.getCi());
 
 		try {
 			MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

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

@@ -924,10 +924,9 @@ public class TsfCustomerController extends TsfBaseController {
 	 */
 	@GetMapping("/use/terms/form")
 	public ModelAndView useTermsForm() {
-		ModelAndView mav = new ModelAndView(super.getDeviceViewName("customer/UseTermsForm"));
-
+		ModelAndView mav = new ModelAndView();
 		mav.addObject("clause", clauseService.getClause(TscConstants.Site.STYLE24.value(), "G057_10"));
-
+		mav.setViewName("web/customer/UseTermsFormWeb");
 		return mav;
 	}
 
@@ -939,10 +938,10 @@ public class TsfCustomerController extends TsfBaseController {
 	 */
 	@GetMapping("/privacy/policy/form")
 	public ModelAndView privacyPolicyForm() {
-		ModelAndView mav = new ModelAndView(super.getDeviceViewName("customer/PrivacyPolicyForm"));
-
+		ModelAndView mav = new ModelAndView();
 		mav.addObject("clause", clauseService.getClause(TscConstants.Site.STYLE24.value(), "G057_11"));
 		mav.addObject("clauseList", clauseService.getClauseList(TscConstants.Site.STYLE24.value(), "G057_11"));
+		mav.setViewName("web/customer/PrivacyPolicyFormWeb");
 		return mav;
 	}
 

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

@@ -9,6 +9,7 @@ import java.util.HashMap;
 
 import javax.servlet.http.HttpServletResponse;
 
+import com.gagaframework.web.util.GagaStringUtil;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.mobile.device.Device;
@@ -272,7 +273,15 @@ public class TsfDisplayController extends TsfBaseController {
 	public Collection<Contents> getGnbTopBannerList(Contents contents, @RequestParam(value = "contentsLoc") String contentsLoc) {
 		contents.setContentsLoc(contentsLoc);
 		contents.setMaxRow(1);
-		return displayService.getContentsList(contents);
+		Collection<Contents> bannerList = displayService.getContentsList(contents);
+
+		for(Contents tempContents : bannerList){
+			tempContents.setHtml(GagaStringUtil.replace(GagaStringUtil.replace(tempContents.getHtml(), "&lt;", "<"), "&gt;", ">"));
+		}
+
+		log.info("getGnbTopBannerList>>>>{}",bannerList);
+
+		return bannerList;
 	}
 
 //	/**

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

@@ -8,8 +8,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
-import com.style24.core.biz.service.TscKakaotalkService;
-import com.style24.front.biz.service.TsfCouponService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -214,7 +212,12 @@ public class TsfIndexController extends TsfBaseController {
 	 * @since 2021. 02. 23
 	 */
 	@RequestMapping("/signin/snsLoginCallback")
-	public ModelAndView signinSnsLoginCallback(@RequestParam(value = "snsType", required = false) String snsType, HttpSession session, @RequestParam(value = "code", required = false) String code, @RequestParam(value = "state", required = false) String state, @RequestParam(value = "error", required = false) boolean isError, HttpServletRequest request) {
+	public ModelAndView signinSnsLoginCallback(@RequestParam(value = "snsType", required = false) String snsType
+			, @RequestParam(value = "code", required = false) String code
+			, @RequestParam(value = "state", required = false) String state
+			, @RequestParam(value = "error", required = false) boolean isError
+			, HttpSession session
+			, HttpServletRequest request) {
 
 		ModelAndView mav = new ModelAndView();
 
@@ -258,7 +261,7 @@ public class TsfIndexController extends TsfBaseController {
 		GagaMap resultMap = new GagaMap();
 		if (isSnsLoing) {
 			CustSnsInfo custSnsInfo = objectMapper.convertValue(userInfo, CustSnsInfo.class);
-			log.info("custSnsInfo ==> {}", custSnsInfo.toString());
+			//log.info("custSnsInfo ==> {}", custSnsInfo.toString());
 
 			//SNS 로그인 처리
 			resultMap = customerService.customerSnsProcessing(custSnsInfo);
@@ -276,6 +279,8 @@ public class TsfIndexController extends TsfBaseController {
 			if ("EMPTY_PHONE_CUST".equals(custStat)) {
 				session.setAttribute("custSnsInfo", custSnsInfo);
 			}
+		} else {
+			resultMap.setString("custStat", "FAIL_CUST");
 		}
 
 		mav.addObject("resultMap", resultMap);
@@ -313,8 +318,7 @@ public class TsfIndexController extends TsfBaseController {
 		// SNS 로그인 성공시 정보 세션 저장
 		if (isSnsLoing) {
 			CustSnsInfo custSnsInfo = objectMapper.convertValue(userInfo, CustSnsInfo.class);
-			log.info("custSnsInfo ==> {}", custSnsInfo.toString());
-
+			//log.info("custSnsInfo ==> {}", custSnsInfo.toString());
 			resultMap.setString("snsId", custSnsInfo.getSnsId());
 			resultMap.setString("snsType", custSnsInfo.getSnsType());
 
@@ -327,6 +331,9 @@ public class TsfIndexController extends TsfBaseController {
 				resultMap.setString("custNm", custSnsInfo.getCustNm());
 				resultMap.setString("custStat", "NEED_AGREE_CUST");
 			}
+
+		} else {
+			resultMap.setString("custStat", "FAIL_CUST");
 		}
 
 		mav.addObject("resultMap", resultMap);

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

@@ -2051,13 +2051,15 @@ public class TsfMypageController extends TsfBaseController {
 	@RequestMapping("/customer/modify/form")
 	public ModelAndView getCustomerModifyForm(@RequestParam(required = false) String confirmYn,
 											  @RequestParam(value = "sEncData", required = false) String sEncData ,
-											  @RequestParam(value = "authMethod", required = false) String authMethod) {
+											  @RequestParam(value = "authMethod", required = false) String authMethod,
+											  HttpServletRequest request) {
 
 		ModelAndView mav = new ModelAndView();
 		String referer = StringUtils.defaultIfBlank(TsfSession.getHttpServletRequest().getHeader("referer"), "");
 		boolean redirect = false;
 
-		log.info("referer ==>  {}", referer);
+		log.info("referer1 ==>  {}", referer);
+		log.info("referer2 ==>  {}", request.getHeader("Referer"));
 
 		if (StringUtils.isBlank(referer)) {
 			redirect = true;

src/main/java/com/style24/front/support/security/handler/TsfLoginSuccessHandler.java

@@ -51,7 +51,8 @@ public class TsfLoginSuccessHandler implements AuthenticationSuccessHandler {
 		"/customer/dormant/certify/form",			// 휴면해제화면
 		"/customer/dormant/certify/complete/form",	// 휴면해제완료
 		"/customer/certification/form",				// 본인인증화면
-		"/customer/noncust/order/confirm/form"		// 비회원주문화면
+		"/customer/noncust/order/confirm/form",		// 비회원주문화면
+		"/customer/consent/useinfo/form"			// YES24동의화면
 	};
 
 	private static final int CHANG_PWD_CAMPAIGN_DAY = 90;	// 비밀번호 변경 캠페인일자

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

@@ -206,6 +206,7 @@
 		     , SECEDE_RSN
 		     , SECEDE_DTL_RSN
 		     , SECEDE_DT
+		     , BIRTH_MM
 		     , REG_NO
 		     , REG_DT
 		     , UPD_NO
@@ -264,6 +265,7 @@
 		     , #{secedeRsn}                        AS SECEDE_RSN
 		     , #{secedeDtlRsn}                     AS SECEDE_DTL_RSN
 		     , #{secedeDt}                         AS SECEDE_DT
+		     , #{encodedBirthMm}                   AS BIRTH_MM
 		     , 0                                   AS REG_NO
 		     , NOW()                               AS REG_DT
 		     , 0                                   AS UPD_NO
@@ -528,6 +530,7 @@
 		     , CELL_PHNNO = #{encodedCellPhnno}
 		     , SEX_GB = #{encodedSexGb}
 		     , BIRTH_YMD = #{encodedBirthYmd}
+		     , BIRTH_MM = #{encodedBirthMm}
 		     , AUTH_DT = NOW()
 		     , UPD_NO = #{updNo}
 		     , UPD_DT = NOW()
@@ -552,6 +555,7 @@
 		     , CELL_PHNNO = #{encodedCellPhnno}
 		     , SEX_GB = #{encodedSexGb}
 		     , BIRTH_YMD = #{encodedBirthYmd}
+		     , BIRTH_MM = #{encodedBirthMm}
 		     , UPD_DT = NOW()
 		     , UPD_NO = #{updNo}
 		WHERE  CUST_NO = #{custNo}
@@ -656,30 +660,6 @@
 		) A
 	</select>
 
-	<!--배치 생년월일 -->
-	<insert id="saveBatchBirth" parameterType="Customer">
-		/*TsfCustomer.saveBatchBirth*/
-		INSERT INTO TB_BATCH_BIRTH (
-		       CUST_NO
-		     , BIRTH_YMD
-		     , REG_DT
-		     , REG_NO
-		     , UPD_DT
-		     , UPD_NO
-		) VALUES (
-		       #{custNo}
-		     , #{birthYmd}
-		     , NOW()
-		     , #{custNo}
-		     , NOW()
-		     , #{custNo}
-		)
-		ON DUPLICATE KEY UPDATE
-		       BIRTH_YMD = #{birthYmd}
-		    ,  UPD_DT = NOW()
-		    ,  UPD_NO = #{updNo}
-	</insert>
-	
 	<!-- SMS수신거부 처리 -->
 	<update id="updateSmsReceptionRefuse" parameterType="Integer">
 		/* TsfCustomer.updateSmsReceptionRefuse */

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

@@ -838,81 +838,147 @@
 	<!-- 몰메인 브랜드픽 조회 -->
 	<select id="getContentsBannerList" parameterType="Contents" resultType="Contents">
 		/* TsfDisplay.getContentsBannerList */
+		WITH CONTENTS_DATA AS (
+		    SELECT BRAND_GROUP_NO
+		         , IMG_PATH1
+		         , STR_VAR1
+		         , STR_TITLE1
+		         , SUB_TEXT1
+		    FROM TB_CONTENTS
+		    WHERE 1 = 1
+		      AND CONTENTS_LOC =  #{contentsLoc}
+		      AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		      AND USE_YN = 'Y'
+		      AND BRAND_GROUP_NO =  #{brandGroupNo}
+		      AND IMG_PATH1 IS NOT NULL
+		      AND IMG_PATH1 <![CDATA[<>]]> ''
+		    UNION ALL
+		    SELECT BRAND_GROUP_NO
+		         , IMG_PATH2
+		         , STR_VAR2
+		         , STR_TITLE2
+		         , SUB_TEXT2
+		    FROM TB_CONTENTS
+		    WHERE 1 = 1
+		      AND CONTENTS_LOC =  #{contentsLoc}
+		      AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		      AND USE_YN = 'Y'
+		      AND BRAND_GROUP_NO =  #{brandGroupNo}
+		      AND IMG_PATH2 IS NOT NULL
+		      AND IMG_PATH2 <![CDATA[<>]]> ''
+		    UNION ALL
+		    SELECT BRAND_GROUP_NO
+		         , IMG_PATH3
+		         , STR_VAR3
+		         , STR_TITLE3
+		         , SUB_TEXT3
+		    FROM TB_CONTENTS
+		    WHERE 1 = 1
+		      AND CONTENTS_LOC =  #{contentsLoc}
+		      AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		      AND USE_YN = 'Y'
+		      AND BRAND_GROUP_NO =  #{brandGroupNo}
+		      AND IMG_PATH3 IS NOT NULL
+		      AND IMG_PATH3 <![CDATA[<>]]> ''
+		    UNION ALL
+		    SELECT BRAND_GROUP_NO
+		         , IMG_PATH4
+		         , STR_VAR4
+		         , STR_TITLE4
+		         , SUB_TEXT4
+		    FROM TB_CONTENTS
+		    WHERE 1 = 1
+		      AND CONTENTS_LOC =  #{contentsLoc}
+		      AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		      AND USE_YN = 'Y'
+		      AND BRAND_GROUP_NO =  #{brandGroupNo}
+		      AND IMG_PATH4 IS NOT NULL
+		      AND IMG_PATH4 <![CDATA[<>]]> ''
+		    UNION ALL
+		    SELECT BRAND_GROUP_NO
+		         , IMG_PATH5
+		         , STR_VAR5
+		         , STR_TITLE5
+		         , SUB_TEXT5
+		    FROM TB_CONTENTS
+		    WHERE 1 = 1
+		      AND CONTENTS_LOC =  #{contentsLoc}
+		      AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		      AND USE_YN = 'Y'
+		      AND BRAND_GROUP_NO =  #{brandGroupNo}
+		      AND IMG_PATH5 IS NOT NULL
+		      AND IMG_PATH5 <![CDATA[<>]]> ''
+		)
 		SELECT BRAND_GROUP_NO
-			 , IMG_PATH1
-			 , IMG_PATH2
-			 , STR_VAR1
-			 , STR_VAR2
-			 , STR_TITLE1
-			 , STR_TITLE2
-			 , SUB_TEXT1
-			 , SUB_TEXT2
+		     , IMG_PATH1
+		     , IMG_PATH2
+		     , STR_VAR1
+		     , STR_VAR2
+		     , STR_TITLE1
+		     , STR_TITLE2
+		     , SUB_TEXT1
+		     , SUB_TEXT2
 		FROM (
-				 SELECT BRAND_GROUP_NO
-					  , IMG_PATH1
-					  , IMG_PATH2
-					  , STR_VAR1
-					  , STR_VAR2
-					  , STR_TITLE1
-					  , STR_TITLE2
-					  , SUB_TEXT1
-					  , SUB_TEXT2
-				 FROM TB_CONTENTS
-				 WHERE 1 = 1
-				   AND CONTENTS_LOC = #{contentsLoc}
-				   AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
-				   AND USE_YN = 'Y'
-				   AND BRAND_GROUP_NO = #{brandGroupNo}
-				 UNION ALL
-				 SELECT BRAND_GROUP_NO
-					  , IMG_PATH1
-					  , IMG_PATH2
-					  , STR_VAR1
-					  , STR_VAR2
-					  , STR_TITLE1
-					  , STR_TITLE2
-					  , SUB_TEXT1
-					  , SUB_TEXT2
-				 FROM (
-						  SELECT BRAND_CD                      AS BRAND_GROUP_NO
-							   , ORG_TNFILE_NM                 AS IMG_PATH1
-							   , ''                            AS IMG_PATH2
-							   , CONCAT('/display/lookbook/detail/form?lookbookGb=L&amp;lookbookSq=',LOOKBOOK_SQ ,'&amp;brandCd=',BRAND_CD) AS STR_VAR1
-							   , ''                            AS STR_VAR2
-							   , TITLE                         AS STR_TITLE1
-							   , ''                            AS STR_TITLE2
-							   , ''                            AS SUB_TEXT1
-							   , ''                            AS SUB_TEXT2
-						  FROM TB_LOOKBOOK
-						  WHERE 1 = 1
-							AND BRAND_CD = #{brandGroupNo}
-							AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
-							AND DISP_YN = 'Y'
-						  ORDER BY REG_DT DESC
-						  LIMIT 1
-					  ) A
-				 UNION ALL
-				 SELECT PB.BRAND_GROUP_NO
-					  , P.MAIN_PIMG                                        AS IMG_PATH1
-					  , ''                                                 AS IMG_PATH2
-					  , CONCAT('/planning/detail/form?planSq=', P.PLAN_SQ) AS STR_VAR1
-					  , ''                                                 AS STR_VAR2
-					  , P.DTL_TITLE1                                       AS STR_TITLE1
-					  , P.DTL_TITLE2                                       AS STR_TITLE2
-					  , ''                                                 AS SUB_TEXT1
-					  , ''                                                 AS SUB_TEXT2
-				 FROM TB_PLAN P
-						  INNER JOIN TB_PLAN_BRAND PB ON P.PLAN_SQ = PB.PLAN_SQ AND PB.DISP_YN = 'Y'
-				 WHERE 1 = 1
-				   AND BRAND_GROUP_NO = #{brandGroupNo}
-				   AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
-				   AND PLAN_GB = 'P'
-				   AND DEL_YN = 'N'
-				   AND OPEN_YN = 'Y'
-				<if test="frontGb != null and frontGb != ''">
-				   AND FRONT_GB LIKE CONCAT('%',#{frontGb},'%')
-				</if>
-			 ) AS Z
+		        SELECT BRAND_GROUP_NO
+		             , IMG_PATH1
+		             , '' AS IMG_PATH2
+		             , STR_VAR1
+		             , '' AS STR_VAR2
+		             , STR_TITLE1
+		             , '' AS STR_TITLE2
+		             , SUB_TEXT1
+		             , '' AS SUB_TEXT2
+		        FROM CONTENTS_DATA
+		        UNION ALL
+		         SELECT BRAND_GROUP_NO
+		              , IMG_PATH1
+		              , IMG_PATH2
+		              , STR_VAR1
+		              , STR_VAR2
+		              , STR_TITLE1
+		              , STR_TITLE2
+		              , SUB_TEXT1
+		              , SUB_TEXT2
+		         FROM (
+		              SELECT BRAND_CD                      AS BRAND_GROUP_NO
+		                   , ORG_TNFILE_NM                 AS IMG_PATH1
+		                   , ''                            AS IMG_PATH2
+		                   , CONCAT('/display/lookbook/detail/form?lookbookGb=L&amp;lookbookSq=',LOOKBOOK_SQ ,'&amp;brandCd=',BRAND_CD) AS STR_VAR1
+		                   , ''                            AS STR_VAR2
+		                   , TITLE                         AS STR_TITLE1
+		                   , ''                            AS STR_TITLE2
+		                   , ''                            AS SUB_TEXT1
+		                   , ''                            AS SUB_TEXT2
+		              FROM TB_LOOKBOOK
+		              WHERE 1 = 1
+		                AND BRAND_CD = #{brandGroupNo}
+		                AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		                AND DISP_YN = 'Y'
+		              ORDER BY REG_DT DESC
+		              LIMIT 1
+		              ) A
+		         UNION ALL
+		         SELECT PB.BRAND_GROUP_NO
+		              , P.MAIN_PIMG                                        AS IMG_PATH1
+		              , ''                                                 AS IMG_PATH2
+		              , CONCAT('/planning/detail/form?planSq=', P.PLAN_SQ) AS STR_VAR1
+		              , ''                                                 AS STR_VAR2
+		              , P.DTL_TITLE1                                       AS STR_TITLE1
+		              , P.DTL_TITLE2                                       AS STR_TITLE2
+		              , ''                                                 AS SUB_TEXT1
+		              , ''                                                 AS SUB_TEXT2
+		         FROM TB_PLAN P
+		         INNER JOIN TB_PLAN_BRAND PB ON P.PLAN_SQ = PB.PLAN_SQ AND PB.DISP_YN = 'Y'
+		         WHERE 1 = 1
+		           AND BRAND_GROUP_NO = #{brandGroupNo}
+		           AND NOW() BETWEEN DISP_STDT AND DISP_EDDT
+		           AND PLAN_GB = 'P'
+		           AND DEL_YN = 'N'
+		           AND OPEN_YN = 'Y'
+		        <if test="frontGb != null and frontGb != ''">
+		           AND FRONT_GB LIKE CONCAT('%',#{frontGb},'%')
+		        </if>
+		     ) AS Z
 		LIMIT 5
 	</select>
 
@@ -1246,6 +1312,8 @@
 		      , Z.SUB_TEXT1
 		      , Z.SUB_TEXT2
 		FROM    (
+		    SELECT *
+		    FROM   (
 		            SELECT  'ADMIN' AS BANNER_GB
 		                  , IMG_PATH1
 		                  , STR_VAR1
@@ -1267,6 +1335,11 @@
 		            AND     USE_YN = 'Y'
 		            AND    DISP_STDT <![CDATA[<=]]> NOW()
 		            AND    DISP_EDDT <![CDATA[>=]]> NOW()
+		            ORDER BY  DISP_ORD
+		        <if test="maxRow != null and maxRow != ''">
+		            LIMIT #{maxRow}
+		        </if>
+		    ) AS TC
 		            UNION ALL
 		            SELECT  'PLAN' AS BANNER_GB
 		                  , A.MAIN_PIMG AS IMG_PATH1

src/main/webapp/WEB-INF/views/mob/customer/PrivacyPolicyLayerFormMob.html

@@ -23,9 +23,16 @@
 			<div class="pop_cont">
 
 				<!-- 컨텐츠 시작 -->
-				<div class="ps" th:utext="${#strings.replace(#strings.replace(clause,'&amplt;','<'),'&ampgt;','>')}"></div>
+				<div class="ps" id="prvc_content" th:utext="${#strings.replace(#strings.replace(clause,'&amplt;','<'),'&ampgt;','>')}"></div>
 				<!-- 컨텐츠 종료 -->
-
+				<div class="ps" id="prvc_sel">
+					<h4><span>이전 개인정보처리방침 보기</span></h4>
+					<ol>
+						<th:block th:if="${clauseList}" th:each="oneData, status : ${clauseList}">
+							<li th:text="'- '+${oneData.clauseTitle}" th:onclick="fnGetCaluseInfo([[${oneData.clauseSq}]]);"></li>
+						</th:block>
+					</ol>
+				</div>
 			</div>
 		</div>
 	</div>
@@ -35,6 +42,15 @@
 	$("#partners").on('click', function() {
 		cfnSupplyComanyLayer();
 	});
+
+	var fnGetCaluseInfo = function (clauseSq) {
+		$.get('/customer/privacy/policy/info/' + clauseSq
+			, function (data) {
+			if(!gagajf.isNull(data.clauseContent)) {
+				$('#prvc_content').html(data.clauseContent.replaceAll('&lt;','<').replaceAll('&gt;', '>').replaceAll('&quot;', '"'));
+			}
+		});
+	};
 	//약관내부링크
 	$(function(){
 		$(".hook_list ul li a").on("click", function(){

src/main/webapp/WEB-INF/views/mob/customer/SupplyCompanyLayerFormMob.html

@@ -82,7 +82,7 @@
 
 	$(document).ready(function() {
 		fnGetSupplyCompanyList();
-		$('#supplyCompanyPop .close-modal').on('click', function () {
+		$('#partnersPop .close-modal').on('click', function () {
 			cfnPrivacyPolicyLayer(mallGb);
 		});
 	});

src/main/webapp/WEB-INF/views/mob/display/BrandSearchGoodsListFormMob.html

@@ -251,7 +251,7 @@
 			<div class="filter_top">
 				<div class="tt">필터</div>
 				<div>
-					<button class="fillter_reset" onclick="fnMobFilterReset();"><span>초기화</span></button>
+					<button class="fillter_reset" onclick="fnMobFilterReset('brandSearch');"><span>초기화</span></button>
 					<button class="close">닫기</button>
 				</div>
 			</div>
@@ -1036,55 +1036,6 @@
 		freeMode: true,
 	});
 
-	// 필터 초기화
-	var fnMobFilterReset = function (){
-		$(".list_defult").hide();
-		$("#searchGoodsForm input:hidden[name=cate1No]").remove();
-		$("#searchGoodsForm input:hidden[name=cate2No]").remove();
-		$("#searchGoodsForm input:hidden[name=cate3No]").remove();
-		$("#searchGoodsForm input:hidden[name=cate4No]").remove();
-		$("#searchGoodsForm input:hidden[name=cate5No]").remove();
-		$("#searchGoodsForm input:hidden[name=brandGroupArr]").remove();
-		$("#searchGoodsForm input:hidden[name=sizeArr]").remove();
-		$("#searchGoodsForm input:hidden[name=dcRateArr]").remove();
-		$("#searchGoodsForm input:hidden[name=priceArr]").remove();
-		$("#searchGoodsForm input:hidden[name=ageArr]").remove();
-		$("#searchGoodsForm input:hidden[name=seasonArr]").remove();
-		$("#searchGoodsForm input:hidden[name=colorArr]").remove();
-		$("#searchGoodsForm input:hidden[name=benefitArr]").remove();
-		$("#searchGoodsForm input:hidden[name=newGoods]").val('');
-		$("#unisex").prop('checked',false);
-		$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
-		$("#searchGoodsForm input:hidden[name=unisex]").remove();
-		$("#newGoods").prop('checked',false);
-		$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
-		$('.allFilter .chkFilter').find('input[type=checkbox]').each(function (idx){
-			$(this).prop('checked',false);
-		});
-		$('.allFilter .chkFilter .daps1').find('span').each(function (idx){
-			$(this).text('');
-		});
-		$("#categoryFilterDiv").find('.daps4').each(function (idx){
-			$(this).parent().find('a').removeClass('on');
-			$(this).css('display','none');
-		});
-		$("#categoryFilterDiv").find('.daps3').each(function (idx){
-			$(this).parent().find('a').removeClass('on');
-			$(this).css('display','none');
-		});
-		$("#categoryFilterDiv").find('.daps2').each(function (idx){
-			$(this).parent().find('a').removeClass('on');
-		});
-		$('.allFilter').find('.daps1').each(function (idx){
-			$(this).removeClass('on');
-			$(this).parent().find('ul').css('display','none');
-		});
-		fnCategoryGoodsInfiniteScrollInit();
-		fnSearchGoodsListSearch();
-		fnGetSearchPlanningList();
-		fnGetSearchEventList();
-	}
-
 	/*]]>*/
 </script>
 

src/main/webapp/WEB-INF/views/mob/display/CategoryGoodsListFormMob.html

@@ -379,9 +379,9 @@
 		<input type="hidden" name="cate3No" th:value="${cateInfo.cate3No}"/>
 		<input type="hidden" name="cate4No" th:value="${cateInfo.cate4No}"/>
 		<input type="hidden" name="sortingType" value="NEW"/>
-<!--		<input type="hidden" name="newGoods" th:value="${cateInfo.formalGb=='G009_20'?'':'40'}" />-->
+		<input type="hidden" name="newGoods" th:unless="${cateInfo.formalGb=='G009_20'}" th:value="${cateInfo.formalGb=='G009_20'?'':'40'}" />
 		<input type="hidden" name="keyword" value=""/>
-		<input type="hidden" name="benefitArr" th:unless="${cateInfo.formalGb=='G009_20'}" th:value="${cateInfo.formalGb=='G009_20'?'':'40:신상'}"/>
+<!--		<input type="hidden" name="benefitArr" th:unless="${cateInfo.formalGb=='G009_20'}" th:value="${cateInfo.formalGb=='G009_20'?'':'40:신상'}"/>-->
 	</form>
 
 
@@ -608,35 +608,6 @@
 
 		});
 
-		// 필터 초기화
-		var fnMobFilterReset = function (){
-			$(".list_defult").hide();
-			$("#searchGoodsForm input:hidden[name=brandGroupArr]").remove();
-			$("#searchGoodsForm input:hidden[name=sizeArr]").remove();
-			$("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
-			$("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
-			$("#searchGoodsForm input:hidden[name=priceFrom]").remove();
-			$("#searchGoodsForm input:hidden[name=priceTo]").remove();
-			$("#searchGoodsForm input:hidden[name=ageArr]").remove();
-			$("#searchGoodsForm input:hidden[name=seasonArr]").remove();
-			$("#searchGoodsForm input:hidden[name=colorArr]").remove();
-			$("#searchGoodsForm input:hidden[name=benefitArr]").remove();
-			$("#searchGoodsForm input:hidden[name=newGoods]").val('');
-			$("#unisex").prop('checked',false);
-			$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
-			$("#searchGoodsForm input:hidden[name=unisex]").remove();
-			$("#newGoods").prop('checked',false);
-			$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
-			$('.allFilter .chkFilter').find('input[type=checkbox]').each(function (idx){
-				$(this).prop('checked',false);
-			});
-			$('.allFilter .chkFilter .daps1').find('span').each(function (idx){
-				$(this).remove();
-			});
-			fnCategoryGoodsInfiniteScrollInit();
-			fnGoodsListSearch();
-		}
-
 		// TOP 카테고리 노출
 		var fnCreateDepthList = function (){
 			let cateList = [[${cateList}]];
@@ -1031,10 +1002,11 @@
 				if(stat=='on'){
 					$(obj).attr('onclick','fnFilterOption(this,\'off\');');
 					// tag += '<input type="hidden" name="newGoods" value="40"/>\n';
-					tag += '<input type="hidden" name="benefitArr" value="40:신상"/>\n';
+					// tag += '<input type="hidden" name="benefitArr" value="40:신상"/>\n';
 					$("#searchGoodsForm").append(tag);
 				}else{
 					$(obj).attr('onclick','fnFilterOption(this,\'on\');');
+					$("#searchGoodsForm input:hidden[name=newGoods]").remove();
 					$("#searchGoodsForm input:hidden[name=benefitArr]").each(function(){
 						if($(this).val() == "40:신상"){
 							$(this).remove();
@@ -1615,7 +1587,7 @@
 				}
 
 				if(brandGroupNo > 0){
-					$.each(brandCateList, function(idx,item){
+					$.each(cateList, function(idx,item){
 						$.each(allCateList, function (allIdx, allItem){
 							if(item.cate1No==allItem.cate1No){
 								if(idx<1) {
@@ -1632,13 +1604,16 @@
 								tag += ');">'+item.cate1Nm+'</a></li>';
 							}
 						});
-						if(item.cate2List != null && item.cate2List.length > 0){
-							let leafTag = '';
+						let leafTag = '';
+						if(idx<1){
 							leafTag += '<a href="javascript:void(0);" class="on" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\', \'\' ';
 							if(formalGb=='G009_20'){
 								leafTag += ' ,\'\',\'\',\'\',\'\',\''+formalGb+'\'';
 							}
 							leafTag += ');">전체</a>';
+						}
+
+						if(item.cate2List != null && item.cate2List.length > 0){
 							$.each(item.cate2List, function (idx, item){
 								leafTag += '<a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + [[${cateInfo.cateGb}]] + '\', ' + item.cate1No + ' , ' + item.cate2No + ' ';
 								if(formalGb=='G009_20'){
@@ -1646,8 +1621,8 @@
 								}
 								leafTag += ');">'+item.cate2Nm+'</a>';
 							});
-							$('#leafCateList').append(leafTag);
 						}
+						$('#leafCateList').append(leafTag);
 					});
 				}else{
 					$.each(cateList, function(idx,item){

src/main/webapp/WEB-INF/views/mob/display/SearchGoodsListFormMob.html

@@ -22,13 +22,13 @@
 	<main role="" id="" class="container sch">
 		<section class="sch_result">
 			<div class="inner">
-				<form id="InnerSearchForm" name="InnerSearchForm">
-					<div class="sch_title">
-						<input type="text" class="form_control" id="keyword" name="keyword" th:value="${params.keyword}" placeholder="" maxlength="100">
-						<!-- <button class="btn_x">X</button> -->
-						<button type="button" class="btn_sch" onclick="fnSearchData();"><img src="/images/mo/ico_btn_search.png" alt=""></button>
-					</div>
-				</form>
+				<div class="sch_title">
+					<form id="InnerSearchForm" name="InnerSearchForm">
+					<input type="text" class="form_control" id="keyword" name="keyword" th:value="${params.keyword}" placeholder="" maxlength="100">
+					<!-- <button class="btn_x">X</button> -->
+					<button type="button" class="btn_sch" onclick="fnSearchData();"><img src="/images/mo/ico_btn_search.png" alt=""></button>
+					</form>
+				</div>
 				<div class="related_keyword">
 					<div class="sub_category">
 						<div class="cate_wrap">
@@ -1107,54 +1107,7 @@
 		freeMode: true,
 	});
 
-	// 필터 초기화
-	var fnMobFilterReset = function (){
-		$(".list_defult").hide();
-		$("#searchGoodsForm input:hidden[name=cate1No]").remove();
-		$("#searchGoodsForm input:hidden[name=cate2No]").remove();
-		$("#searchGoodsForm input:hidden[name=cate3No]").remove();
-		$("#searchGoodsForm input:hidden[name=cate4No]").remove();
-		$("#searchGoodsForm input:hidden[name=cate5No]").remove();
-		$("#searchGoodsForm input:hidden[name=brandGroupArr]").remove();
-		$("#searchGoodsForm input:hidden[name=sizeArr]").remove();
-		$("#searchGoodsForm input:hidden[name=dcRateArr]").remove();
-		$("#searchGoodsForm input:hidden[name=priceArr]").remove();
-		$("#searchGoodsForm input:hidden[name=ageArr]").remove();
-		$("#searchGoodsForm input:hidden[name=seasonArr]").remove();
-		$("#searchGoodsForm input:hidden[name=colorArr]").remove();
-		$("#searchGoodsForm input:hidden[name=benefitArr]").remove();
-		$("#searchGoodsForm input:hidden[name=newGoods]").val('');
-		$("#unisex").prop('checked',false);
-		$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
-		$("#searchGoodsForm input:hidden[name=unisex]").remove();
-		$("#newGoods").prop('checked',false);
-		$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
-		$('.allFilter .chkFilter').find('input[type=checkbox]').each(function (idx){
-			$(this).prop('checked',false);
-		});
-		$('.allFilter .chkFilter .daps1').find('span').each(function (idx){
-			$(this).text('');
-		});
-		$("#categoryFilterDiv").find('.daps4').each(function (idx){
-			$(this).parent().find('a').removeClass('on');
-			$(this).css('display','none');
-		});
-		$("#categoryFilterDiv").find('.daps3').each(function (idx){
-			$(this).parent().find('a').removeClass('on');
-			$(this).css('display','none');
-		});
-		$("#categoryFilterDiv").find('.daps2').each(function (idx){
-			$(this).parent().find('a').removeClass('on');
-		});
-		$('.allFilter').find('.daps1').each(function (idx){
-			$(this).removeClass('on');
-			$(this).parent().find('ul').css('display','none');
-		});
-		fnCategoryGoodsInfiniteScrollInit();
-		fnSearchGoodsListSearch();
-		fnGetSearchPlanningList();
-		fnGetSearchEventList();
-	}
+
 
 	/*]]>*/
 </script>

src/main/webapp/WEB-INF/views/mob/display/SearchLayerMob.html

@@ -772,6 +772,14 @@
 		gagajf.setCookie('st24ck_today_keyword',keyword, -1);
 	}
 
+	// 검색어 입력 후 엔터키
+	$('#searchMainForm input[name=keyword]').keypress(function (event) {
+		if (event.which === 13) {
+			event.preventDefault();
+			$('#btnSearchKeyword').trigger('click');
+		}
+	});
+
 	/*]]>*/
 </script>
 

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

@@ -985,8 +985,21 @@ var usePlanInfoCoupon = function (id) {
 //설문조사 참여 버튼 클릭
 var fnJoinConfirm = function () {
 	let planSq = plan.planSq;
-	
-	cfnGoToPollDetail(planSq);
+	if (!cfCheckLogin()) {
+		// mcxDialog.alert("로그인 후 참여 가능합니다.");
+		var btn = ["확인"];
+		mcxDialog.confirmC("로그인 후 참여 가능합니다.", { //내용
+			btn: btn,
+			btnClick: function (index) {
+				if (index == 1) { //button1 일때 처리문
+					location.href = "/signin";
+				}
+			}
+		});
+		return false;
+	}else{
+		cfnGoToPollDetail(planSq);
+	}
 
 }
 
@@ -1031,7 +1044,16 @@ var fnReviewDetailLayerCollBack = function(){
 var fnTextConfirm = function() {
 	//로그인 확인
 	if (!cfCheckLogin()) {
-		mcxDialog.alert("로그인 후 참여 가능합니다.");
+		//mcxDialog.alert("로그인 후 참여 가능합니다.");
+		var btn = ["확인"];
+		mcxDialog.confirmC("로그인 후 참여 가능합니다.", { //내용
+			btn: btn,
+			btnClick: function(index){
+				if (index == 1) { //button1 일때 처리문
+					location.href="/signin";
+				}
+			}
+		});
 		$("#replyText").val('');
 		return false;
 	}

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

@@ -298,7 +298,16 @@ var appendHtml = function () {
 
 var fnAttendEntry = function () {
 	if (!cfCheckLogin()) {
-		mcxDialog.alert("로그인 후 참여 가능합니다.");
+		// mcxDialog.alert("로그인 후 참여 가능합니다.");
+		var btn = ["확인"];
+		mcxDialog.confirmC("로그인 후 참여 가능합니다.", { //내용
+			btn: btn,
+			btnClick: function(index){
+				if (index == 1) { //button1 일때 처리문
+					location.href="/signin";
+				}
+			}
+		});
 		return false;
 	}
 	

src/main/webapp/WEB-INF/views/web/callcenter/GoodsQnaFormWeb.html

@@ -121,7 +121,7 @@
 				tag += '				<span class="fold_state ' + (item.ansStat == "G060_10" ? "doing" : "done") + '">' + item.ansStatNm + '</span>\n'; //답변완료 : done / 처리중 : doing
 				tag += '				<div class="fold_tit">\n';
 				tag += '					<span class="prod">' + item.goodsNm + ' ' + item.relGoodsCd + '</span>\n';
-				tag += '					<span>' + item.questContent.replace(/(\r\n)/g, '<br/>') + '</span>\n';
+				tag += '					<span>' + item.questContent+ '</span>\n';
 				tag += '				</div>\n';
 				tag += '				<span class="data">' + item.questDt + '</span>\n';
 				tag += '			</div>\n';

src/main/webapp/WEB-INF/views/web/common/fragments/GnbWeb.html

@@ -448,9 +448,7 @@
 								}else{
 									tag +=' 	<a href="'+item.strVar1+'" target="">';
 									tag +=' 		<img src="'+bannerImgUrl+''+item.imgPath1+'" alt="">';
-									tag +=' 		<div class="open_bnr_area">';
-									tag += '		'+item.html+' ';
-									tag +=' 		</div>';
+									tag +=' 		<div class="open_bnr_area">'+item.html+'</div>';
 									tag +=' 	</a>';
 									tag +=' 	<button class="btn_toggle_bnr">열기</button>';
 								}

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

@@ -702,7 +702,7 @@ $(document).ready( function() {
 
 
 	/* SLIDE - MD’S PICK */
-	var mdPickCont = $('.post-pick-nav .swiper-slide');
+	var mdPickCont = $('.md_item .swiper-slide');
 	var mdPickLength = mdPickCont.length;
 	if(mdPickLength < 6){
 		var br_md_slide = new Swiper('.brand_main .md_item .swiper-container', {

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

@@ -443,7 +443,7 @@
 <!--													<a href="javascript:;" class="filter_delete"></a >-->
 <!--												</span>-->
 											</div>
-											<button type="button" class="fillter_reset" onclick="fnFilterReset();"><span>전체 초기화</span></button>
+											<button type="button" class="fillter_reset" onclick="fnFilterReset('brandSearch');"><span>전체 초기화</span></button>
 										</div>
 										<!-- //필터 -->
 									</div>
@@ -484,7 +484,7 @@
 											</p>
 										</div>
 										<div class="btn_box">
-											<button type="button" class="btn btn_default" onclick="fnFilterReset();"><span>초기화</span></button>
+											<button type="button" class="btn btn_default" onclick="fnFilterReset('brandSearch');"><span>초기화</span></button>
 										</div>
 									</div>
 									<!-- //검색필터 결과 없을 시 노출 -->
@@ -1064,48 +1064,6 @@
 			});
 		}
 
-		// 필터 초기화
-		var fnFilterReset = function (){
-			//document.location.href = currUrl;
-			$("#searchGoodsForm input:hidden[name=brandGroupArr]").remove();
-			$("#searchGoodsForm input:hidden[name=sizeArr]").remove();
-			$("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
-			$("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
-			$("#searchGoodsForm input:hidden[name=priceFrom]").remove();
-			$("#searchGoodsForm input:hidden[name=priceTo]").remove();
-			$("#searchGoodsForm input:hidden[name=ageArr]").remove();
-			$("#searchGoodsForm input:hidden[name=seasonArr]").remove();
-			$("#searchGoodsForm input:hidden[name=colorArr]").remove();
-			$("#searchGoodsForm input:hidden[name=benefitArr]").remove();
-			$("#searchGoodsForm input:hidden[name=cate1No]").remove();
-			$("#searchGoodsForm input:hidden[name=cate2No]").remove();
-			$("#searchGoodsForm input:hidden[name=cate3No]").remove();
-			$("#searchGoodsForm input:hidden[name=cate4No]").remove();
-			$("#searchGoodsForm input:hidden[name=cate5No]").remove();
-			$("#searchGoodsForm input:hidden[name=newGoods]").remove();
-			$("#unisex").prop('checked',false);
-			$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
-			$("#searchGoodsForm input:hidden[name=unisex]").remove();
-			$("#newGoods").prop('checked',false);
-			$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
-
-			$("#ulAllCate").find('.sub_cate').each(function (idx){
-				$(this).css('display','none');
-				$(this).parent().parent().find('li').removeClass('on');
-			});
-			// fnFilterSliderMove(0,5);
-			// fnDcRateFilterSliderMove(0,10);
-			$('.filter_content .sort').find('input[type=checkbox]').each(function (idx){
-				$(this).prop('checked',false);
-			});
-			$('#ulAllCate').find('input[type=checkbox]').each(function (idx){
-				$(this).prop('checked',false);
-			});
-			$("#filterData").html('');
-			fnCategoryGoodsInfiniteScrollInit();
-			fnSearchGoodsListSearch();
-		}
-
 
 	</script>
 

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

@@ -294,9 +294,9 @@
 		<input type="hidden" name="cate3No" th:value="${cateInfo.cate3No}"/>
 		<input type="hidden" name="cate4No" th:value="${cateInfo.cate4No}"/>
 		<input type="hidden" name="sortingType" value="NEW"/>
-<!--		<input type="hidden" name="newGoods" th:value="${cateInfo.formalGb=='G009_20'?'':'40'}" />-->
+		<input type="hidden" name="newGoods" th:unless="${cateInfo.formalGb=='G009_20'}" th:value="${cateInfo.formalGb=='G009_20'?'':'40'}" />
 		<input type="hidden" name="keyword" value=""/>
-		<input type="hidden" name="benefitArr" th:unless="${cateInfo.formalGb=='G009_20'}" th:value="${cateInfo.formalGb=='G009_20'?'':'40:신상'}"/>
+<!--		<input type="hidden" name="benefitArr" th:unless="${cateInfo.formalGb=='G009_20'}" th:value="${cateInfo.formalGb=='G009_20'?'':'40:신상'}"/>-->
 	</form>
 
 	<script src="/ux/plugins/gaga/gaga.infinite.scrollSession.js"></script>
@@ -322,6 +322,7 @@
 					$(".br_header").css('background-color','#fff');
 				}
 			}
+
 			//가격 슬라이드
 			//var custom_values = ['9,000원', '230,000원', '487,000원', '700,000원', '1,360,000원', '1,799,000원'];
 
@@ -559,11 +560,7 @@ console.log(allCateList);
 					if(formalGb=='G009_20'){
 						navNm += '<li class="bread_2depth" id="navNm1"><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',\'\',\'\',\'\',\'\',\'\',\'' + formalGb + '\');">아울렛</a></li>\n';
 					}
-					navNm += '<li class="bread_2depth" id="navNm1"><a href="javascript:void(0);"  onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + cate1.cate1No + ' ';
-					if(formalGb=='G009_20'){
-						navNm += ' ,\'\',\'\',\'\',\'\',\'' + formalGb + '\'  ';
-					}
-					navNm += ');">' + cate1.cate1Nm + '</a></li>\n';
+					navNm += '<li class="bread_2depth" id="navNm1">' + cate1.cate1Nm + '</li>\n';
 					if (brandGroupNo == 0) {
 						$("#navHome").attr('href', '/');
 						$("#navArea").append(navNm);
@@ -649,11 +646,7 @@ console.log(allCateList);
 										navNm += ' ,\'\',\'\',\'\',\'' + formalGb + '\' ';
 									}
 									navNm += ')";>' + cate2.cate2Nm + '</a></li>';
-									navNm += '<li class="bread_2depth" id="navNm3"><a href="javascript:void(0);" onclick="cfnGoToGoodsList(' + brandGroupNo + ',\'' + cateGb + '\',' + cate1.cate1No + ',' + cate2.cate2No + ',' + cate3.cate3No + ' ';
-									if(formalGb=='G009_20'){
-										navNm += ' ,\'\',\'\',\'' + formalGb + '\' ';
-									}
-									navNm += ')";>' + cate3.cate3Nm + '</a></li>';
+									navNm += '<li class="bread_2depth" id="navNm3">' + cate3.cate3Nm + '</li>';
 									$("#navArea").append(navNm);
 									$("#formTitle").text(cate3.cate3Nm);
 								}else if(cate3.cate3No == cate3No){
@@ -700,11 +693,7 @@ console.log(allCateList);
 												navNm += ' ,\'\',\'\',\'' + formalGb + '\' ';
 											}
 											navNm += ')";>' + cate3.cate3Nm + '</a></li>';
-											navNm += '<li class="bread_2depth" id="navNm3"><a href="javascript:void(0);" onclick="cfnGoToGoodsList( ' + brandGroupNo + ',\'' + cateGb + '\',' + cate1.cate1No + ',' + cate2.cate2No + ',' + cate3.cate3No + ',' + cate4.cate4No + ' ';
-											if(formalGb=='G009_20'){
-												navNm += ' ,\'\',\'' + formalGb + '\' ';
-											}
-											navNm += ')";>' + cate4.cate4Nm + '</a></li>';
+											navNm += '<li class="bread_2depth" id="navNm3">' + cate4.cate4Nm + '</li>';
 											$("#navArea").append(navNm);
 											$("#formTitle").text(cate4.cate4Nm);
 										}
@@ -742,21 +731,25 @@ console.log(allCateList);
 			if(thisId == 'unisex'){
 				if(stat=='on'){
 					$(obj).attr('onclick','fnFilterOption(this,\'off\');');
+					$(obj).attr('checked', true);
 					tag += '<input type="hidden" name="unisex" value="G007_Z"/>\n';
 					$("#searchGoodsForm").append(tag);
 				}else{
 					$(obj).attr('onclick','fnFilterOption(this,\'on\');');
+					$(obj).attr('checked', false);
 					$("#searchGoodsForm input:hidden[name=unisex]").remove();
 				}
 			}else{
 				if(stat=='on'){
 					$(obj).attr('onclick','fnFilterOption(this,\'off\');');
-					// tag += '<input type="hidden" name="newGoods" value="40"/>\n';
-					tag += '<input type="hidden" name="benefitArr" value="40:신상"/>\n';
+					$(obj).attr('checked', true);
+					tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+					// tag += '<input type="hidden" name="benefitArr" value="40:신상"/>\n';
 					$("#searchGoodsForm").append(tag);
 				}else{
 					$(obj).attr('onclick','fnFilterOption(this,\'on\');');
-					// $("#searchGoodsForm input:hidden[name=newGoods]").remove();
+					$(obj).attr('checked', false);
+					$("#searchGoodsForm input:hidden[name=newGoods]").remove();
 					$("#searchGoodsForm input:hidden[name=benefitArr]").each(function(){
 						if($(this).val() == "40:신상"){
 							$(this).remove();
@@ -764,6 +757,7 @@ console.log(allCateList);
 					});
 				}
 			}
+			fnSetFilterHtml();
 			fnCategoryGoodsInfiniteScrollInit();
 			fnGoodsListSearch();
 		}
@@ -796,40 +790,10 @@ console.log(allCateList);
 			fnFilterSlider('dcrate' , custom_values02[min].replace('%',''), custom_values02[max].replace('%',''));
 		}
 
-		// 필터 초기화
-		var fnFilterReset = function (){
-			//document.location.href = currUrl;
-			$("#searchGoodsForm input:hidden[name=brandGroupArr]").remove();
-			$("#searchGoodsForm input:hidden[name=sizeArr]").remove();
-			// $("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
-			// $("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
-			// $("#searchGoodsForm input:hidden[name=priceFrom]").remove();
-			// $("#searchGoodsForm input:hidden[name=priceTo]").remove();
-			$("#searchGoodsForm input:hidden[name=priceArr]").remove();
-			$("#searchGoodsForm input:hidden[name=dcRateArr]").remove();
-			$("#searchGoodsForm input:hidden[name=ageArr]").remove();
-			$("#searchGoodsForm input:hidden[name=seasonArr]").remove();
-			$("#searchGoodsForm input:hidden[name=colorArr]").remove();
-			$("#searchGoodsForm input:hidden[name=benefitArr]").remove();
-			$("#searchGoodsForm input:hidden[name=newGoods]").val('');
-			$("#unisex").prop('checked',false);
-			$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
-			$("#searchGoodsForm input:hidden[name=unisex]").remove();
-			$("#newGoods").prop('checked',false);
-			$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
-			// $("#searchGoodsForm input:hidden[name=newGoods]").val('40');
-
-			fnFilterSliderMove(0,5);
-			fnDcRateFilterSliderMove(0,10);
-			$('.filter_content .sort').find('input[type=checkbox]').each(function (idx){
-				$(this).prop('checked',false);
-			});
-			$("#filterData").html('');
-			fnCategoryGoodsInfiniteScrollInit();
-			fnGoodsListSearch();
-		}
+
 
 		var fnGoodsListSearch = function (){
+			console.log('here6');
 			gagaInfiniteScroll.getHistory();
 		}
 
@@ -837,6 +801,7 @@ console.log(allCateList);
 		var idx = 1;
 		// 상품 검색
 		var fnGetInfiniteScrollDataList = function (pageNum){
+			console.log('here7');
 			$("#searchGoodsForm input[name=pageNo]").val(pageNum+1);
 			// if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
 			// 	idx++;
@@ -845,6 +810,7 @@ console.log(allCateList);
 		}
 
 		var fnDrawInfiniteScrollData = function (result){
+			console.log('here8');
 			totalCnt = result.paging.totalCount;
 			$("#totCntId").text(totalCnt.addComma());
 			gagaInfiniteScroll.pageStatus.totalCount = totalCnt;
@@ -1404,10 +1370,12 @@ console.log(allCateList);
 				}
 			});
 			if ( (event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2)) {
+				$("#searchGoodsForm input:hidden[name=unisex]").remove();
+				$("#searchGoodsForm input:hidden[name=newGoods]").remove();
 				if( history.scrollRestoration ) window.history.scrollRestoration = 'manual';
 				var historyData = sessionStorage.getItem(document.location.href);
 				if(historyData!=null){
-					// console.log('historyData>>'+historyData);
+					console.log('historyData>>'+historyData);
 					historyData = JSON.parse(historyData);
 				}else{
 					historyData = {};
@@ -1426,7 +1394,7 @@ console.log(allCateList);
 					filterStatHtml = historyData.filterStatHtml;
 				}
 				if(typeof historyData.totalCount!='undefined' && historyData.totalCount!=''){
-					$("#totCntId").text(historyData.totalCount);
+					$("#totCntId").text(historyData.totalCount.addComma());
 				}
 				if(!gagajf.isNull($("#searchGoodsForm").find('input[name=priceFrom]').val())){
 					$("#filterForm").find('input[name=hPriceFrom]').val($("#searchGoodsForm").find('input[name=priceFrom]').val());
@@ -1440,19 +1408,38 @@ console.log(allCateList);
 				if(!gagajf.isNull($("#searchGoodsForm").find('input[name=dcRateTo]').val())){
 					$("#filterForm").find('input[name=hDcRateTo]').val($("#searchGoodsForm").find('input[name=dcRateTo]').val());
 				}
+				idx++;
+				if(gagajf.isNull($("#searchGoodsForm").find("input[name=unisex]").val())){
+					$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
+					$("#unisex").attr('checked', false);
+				}else{
+					$("#unisex").attr('onclick','fnFilterOption(this,\'off\');');
+					$("#unisex").attr('checked', true);
+				}
+
+				if(gagajf.isNull($("#searchGoodsForm").find("input[name=newGoods]").val())){
+					$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
+					$("#newGoods").attr('checked', false);
+				}else{
+					$("#newGoods").attr('onclick','fnFilterOption(this,\'off\');');
+					$("#newGoods").attr('checked', true);
+				}
 				if(typeof historyData.sortingType!='undefined' && historyData.sortingType!=''){
 					$("#searchGoodsForm input:hidden[name=sortingType]").val(historyData.sortingType);
 					fnSortingChange(this,historyData.sortingType,'back');
 					$(".fillter").show();
+					console.log('here1');
 				}else{
 					$(".fillter").show();
 					fnGoodsListSearch();
 					fnSetPriceFilter();
 					fnImgOnoff();
+					console.log('here2');
 					// console.log('here*++ '+historyData.scroll);
 					// $('html, body').animate({scrollTop: historyData.backScroll});
 				}
 			}else{
+				console.log('here3');
 				fnCategoryGoodsInfiniteScrollInit();
 				var sortingType = $("#searchGoodsForm input:hidden[name=sortingType]").val();
 				if(sortingType=='BEST' || sortingType=='REVIEW'){
@@ -1462,8 +1449,10 @@ console.log(allCateList);
 
 					$(this).addClass("on");
 					fnSortingChange(this, sortingType);
+					console.log('here4');
 				}else{
 					fnGoodsListSearch();
+					console.log('here5');
 				}
 			}
 		});

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

@@ -1230,47 +1230,7 @@
 			});
 		}
 
-		// 필터 초기화
-		var fnFilterReset = function (){
-			//document.location.href = currUrl;
-			$("#searchGoodsForm input:hidden[name=brandGroupArr]").remove();
-			$("#searchGoodsForm input:hidden[name=sizeArr]").remove();
-			$("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
-			$("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
-			$("#searchGoodsForm input:hidden[name=priceFrom]").remove();
-			$("#searchGoodsForm input:hidden[name=priceTo]").remove();
-			$("#searchGoodsForm input:hidden[name=ageArr]").remove();
-			$("#searchGoodsForm input:hidden[name=seasonArr]").remove();
-			$("#searchGoodsForm input:hidden[name=colorArr]").remove();
-			$("#searchGoodsForm input:hidden[name=benefitArr]").remove();
-			$("#searchGoodsForm input:hidden[name=cate1No]").remove();
-			$("#searchGoodsForm input:hidden[name=cate2No]").remove();
-			$("#searchGoodsForm input:hidden[name=cate3No]").remove();
-			$("#searchGoodsForm input:hidden[name=cate4No]").remove();
-			$("#searchGoodsForm input:hidden[name=cate5No]").remove();
-			$("#searchGoodsForm input:hidden[name=newGoods]").remove();
-			$("#unisex").prop('checked',false);
-			$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
-			$("#searchGoodsForm input:hidden[name=unisex]").remove();
-			$("#newGoods").prop('checked',false);
-			$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
 
-			$("#ulAllCate").find('.sub_cate').each(function (idx){
-				$(this).css('display','none');
-				$(this).parent().parent().find('li').removeClass('on');
-			});
-			// fnFilterSliderMove(0,5);
-			// fnDcRateFilterSliderMove(0,10);
-			$('.filter_content .sort').find('input[type=checkbox]').each(function (idx){
-				$(this).prop('checked',false);
-			});
-			$('#ulAllCate').find('input[type=checkbox]').each(function (idx){
-				$(this).prop('checked',false);
-			});
-			$("#filterData").html('');
-			fnCategoryGoodsInfiniteScrollInit();
-			fnSearchGoodsListSearch();
-		}
 
 
 	</script>

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

@@ -855,8 +855,22 @@ var fnPlanCouponCallBack = function(result){
 // 설문조사 참여 버튼 클릭
 var fnJoinConfirm = function () {
 	let planSq = plan.planSq;
-	
-	cfnGoToPollDetail(planSq);
+
+	if (!cfCheckLogin()) {
+		// mcxDialog.alert("로그인 후 참여 가능합니다.");
+		var btn = ["확인"];
+		mcxDialog.confirmC("로그인 후 참여 가능합니다.", { //내용
+			btn: btn,
+			btnClick: function (index) {
+				if (index == 1) { //button1 일때 처리문
+					location.href = "/signin";
+				}
+			}
+		});
+		return false;
+	}else{
+		cfnGoToPollDetail(planSq);
+	}
 
 }
 
@@ -1202,7 +1216,16 @@ $(document).ready( function() {
 	// 첨부파일 갯수제한
 	$('.imgUpload .fileAdd').click(function(){
 		if (!cfCheckLogin()) {
-			mcxDialog.alert("로그인 후 참여 가능합니다.");
+			// mcxDialog.alert("로그인 후 참여 가능합니다.");
+			var btn = ["확인"];
+			mcxDialog.confirmC("로그인 후 참여 가능합니다.", { //내용
+				btn: btn,
+				btnClick: function(index){
+					if (index == 1) { //button1 일때 처리문
+						location.href="/signin";
+					}
+				}
+			});
 			$("#replyText").val('');
 			return false;
 		}

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

@@ -328,7 +328,17 @@ var appendHtml = function () {
 
 var fnAttendEntry = function () {
 	if (!cfCheckLogin()) {
-		mcxDialog.alert("로그인 후 참여 가능합니다.");
+		// mcxDialog.alert("로그인 후 참여 가능합니다.");
+		//
+		var btn = ["확인"];
+		mcxDialog.confirmC("로그인 후 참여 가능합니다.", { //내용
+			btn: btn,
+			btnClick: function(index){
+				if (index == 1) { //button1 일때 처리문
+					location.href="/signin";
+				}
+			}
+		});
 		return false;
 	}
 	

src/main/webapp/biz/goods.js

@@ -328,7 +328,7 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 			tag += '			</div>';
 
 			tag += '			<p class="itemBrand">' + item.brandGroupNm + '</p>';
-			if (item.goodsTnm != null) {
+			if (item.goodsTnm != null && item.goodsTnm != '') {
 				tag += '			<div class="itemComment">' + item.goodsTnm + '</div>';
 			}
 			tag += '			<div class="itemName">' + item.goodsFullNm + '</div>';
@@ -514,7 +514,7 @@ var fnFilterSet = function (searchId, sizeGb, appGb){
 		});
 		if(searchId=='benefit'){
 			if ($('#newGoods').is(":checked")) {
-				tag = '<input type="hidden" name="'+searchId+'Arr" value="40:신상"/>\n';
+				// tag = '<input type="hidden" name="'+searchId+'Arr" value="40:신상"/>\n';
 				$("#searchGoodsForm").append(tag);
 			}
 		}
@@ -602,7 +602,12 @@ var fnSetFilterHtml = function (gubun, staus, mobGb){
 		dcRateVal += ',' + $("#filterForm input[name=hDcRateTo]").val();
 	}
 	filterHtml += '<input type="hidden" name="dcRateArr" value="'+dcRateVal+'"/>\n';
-
+	if($('#filterForm').find("input:checkbox[id='unisex']").is(":checked") == true){
+		filterHtml += '<input type="hidden" name="unisex" value="G007_Z"/>\n';
+	}
+	if($('#filterForm').find("input:checkbox[id='newGoods']").is(":checked") == true){
+		filterHtml += '<input type="hidden" name="newGoods" value="40"/>\n';
+	}
 	// console.log('filterHtml>>'+filterHtml);
 	gagaInfiniteScroll.pageStatus.filterHtml = filterHtml;
 }
@@ -1123,4 +1128,70 @@ var fnPushHistory = function(){
 	);
 }
 
+// 필터 초기화
+var fnFilterReset = function (){
+	//document.location.href = currUrl;
+	$("#searchGoodsForm input:hidden[name=brandGroupArr]").remove();
+	$("#searchGoodsForm input:hidden[name=sizeArr]").remove();
+	// $("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
+	// $("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
+	// $("#searchGoodsForm input:hidden[name=priceFrom]").remove();
+	// $("#searchGoodsForm input:hidden[name=priceTo]").remove();
+	$("#searchGoodsForm input:hidden[name=priceArr]").remove();
+	$("#searchGoodsForm input:hidden[name=dcRateArr]").remove();
+	$("#searchGoodsForm input:hidden[name=ageArr]").remove();
+	$("#searchGoodsForm input:hidden[name=seasonArr]").remove();
+	$("#searchGoodsForm input:hidden[name=colorArr]").remove();
+	$("#searchGoodsForm input:hidden[name=benefitArr]").remove();
+	$("#searchGoodsForm input:hidden[name=newGoods]").val('');
+	$("#unisex").prop('checked',false);
+	$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
+	$("#searchGoodsForm input:hidden[name=unisex]").remove();
+	$("#newGoods").prop('checked',false);
+	$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
+	// $("#searchGoodsForm input:hidden[name=newGoods]").val('40');
+
+	fnFilterSliderMove(0,5);
+	fnDcRateFilterSliderMove(0,10);
+	$('.filter_content .sort').find('input[type=checkbox]').each(function (idx){
+		$(this).prop('checked',false);
+	});
+	gagaInfiniteScroll.pageStatus.filterHtml = '';
+	gagaInfiniteScroll.pageStatus.filterStatHtml = '';
+	$("#filterData").html('');
+	fnCategoryGoodsInfiniteScrollInit();
+	fnGoodsListSearch();
+}
+
+// 필터 초기화
+var fnMobFilterReset = function (){
+	$(".list_defult").hide();
+	$("#searchGoodsForm input:hidden[name=brandGroupArr]").remove();
+	$("#searchGoodsForm input:hidden[name=sizeArr]").remove();
+	$("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
+	$("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
+	$("#searchGoodsForm input:hidden[name=priceFrom]").remove();
+	$("#searchGoodsForm input:hidden[name=priceTo]").remove();
+	$("#searchGoodsForm input:hidden[name=ageArr]").remove();
+	$("#searchGoodsForm input:hidden[name=seasonArr]").remove();
+	$("#searchGoodsForm input:hidden[name=colorArr]").remove();
+	$("#searchGoodsForm input:hidden[name=benefitArr]").remove();
+	$("#searchGoodsForm input:hidden[name=newGoods]").val('');
+	$("#unisex").prop('checked',false);
+	$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
+	$("#searchGoodsForm input:hidden[name=unisex]").remove();
+	$("#newGoods").prop('checked',false);
+	$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
+	$('.allFilter .chkFilter').find('input[type=checkbox]').each(function (idx){
+		$(this).prop('checked',false);
+	});
+	$('.allFilter .chkFilter .daps1').find('span').each(function (idx){
+		$(this).remove();
+	});
+	gagaInfiniteScroll.pageStatus.filterHtml = '';
+	gagaInfiniteScroll.pageStatus.filterStatHtml = '';
+	fnCategoryGoodsInfiniteScrollInit();
+	fnGoodsListSearch();
+}
+
 //****************상품리스트  end **********************************

src/main/webapp/biz/search.js

@@ -107,7 +107,7 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 			tag += '			</div>';
 
 			tag += '			<p class="itemBrand">'+item.brandGroupNm+'</p>';
-			if(item.goodsTnm != null){
+			if(item.goodsTnm != null && item.goodsTnm != ''){
 				tag += '			<div class="itemComment">'+item.goodsTnm+'</div>';
 			}
 			tag += '			<div class="itemName">'+item.goodsFullNm+'</div>';
@@ -218,11 +218,11 @@ var fnFilterOption = function (obj, stat){
 		if(stat=='on'){
 			$(obj).attr('onclick','fnFilterOption(this,\'off\');');
 			// tag += '<input type="hidden" name="newGoods" value="40"/>\n';
-			tag += '<input type="hidden" name="benefitArr" value="40:신상"/>\n';
+			// tag += '<input type="hidden" name="benefitArr" value="40:신상"/>\n';
 			$("#searchGoodsForm").append(tag);
 		}else{
 			$(obj).attr('onclick','fnFilterOption(this,\'on\');');
-			// $("#searchGoodsForm input:hidden[name=newGoods]").remove();
+			$("#searchGoodsForm input:hidden[name=newGoods]").remove();
 			$("#searchGoodsForm input:hidden[name=benefitArr]").each(function(){
 				if($(this).val() == "40:신상"){
 					$(this).remove();
@@ -312,7 +312,7 @@ var fnFilterSet = function (searchId, sizeGb, appGb){
 		});
 		if(searchId=='benefit'){
 			if ($('#newGoods').is(":checked")) {
-				tag = '<input type="hidden" name="'+searchId+'Arr" value="40:신상"/>\n';
+				// tag = '<input type="hidden" name="'+searchId+'Arr" value="40:신상"/>\n';
 				$("#searchGoodsForm").append(tag);
 			}
 		}
@@ -1002,4 +1002,105 @@ var fnFilterSliderMove = function (min, max){
 	//$inputTo.prop("value",max);
 	fnSetFilterHtml();
 }
+
+// 필터 초기화
+var fnMobFilterReset = function (pageGb){
+	$(".list_defult").hide();
+	$("#searchGoodsForm input:hidden[name=cate1No]").remove();
+	$("#searchGoodsForm input:hidden[name=cate2No]").remove();
+	$("#searchGoodsForm input:hidden[name=cate3No]").remove();
+	$("#searchGoodsForm input:hidden[name=cate4No]").remove();
+	$("#searchGoodsForm input:hidden[name=cate5No]").remove();
+	$("#searchGoodsForm input:hidden[name=brandGroupArr]").remove();
+	$("#searchGoodsForm input:hidden[name=sizeArr]").remove();
+	$("#searchGoodsForm input:hidden[name=dcRateArr]").remove();
+	$("#searchGoodsForm input:hidden[name=priceArr]").remove();
+	$("#searchGoodsForm input:hidden[name=ageArr]").remove();
+	$("#searchGoodsForm input:hidden[name=seasonArr]").remove();
+	$("#searchGoodsForm input:hidden[name=colorArr]").remove();
+	$("#searchGoodsForm input:hidden[name=benefitArr]").remove();
+	$("#searchGoodsForm input:hidden[name=newGoods]").val('');
+	$("#unisex").prop('checked',false);
+	$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
+	$("#searchGoodsForm input:hidden[name=unisex]").remove();
+	$("#newGoods").prop('checked',false);
+	$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
+	$('.allFilter .chkFilter').find('input[type=checkbox]').each(function (idx){
+		$(this).prop('checked',false);
+	});
+	$('.allFilter .chkFilter .daps1').find('span').each(function (idx){
+		$(this).text('');
+	});
+	$("#categoryFilterDiv").find('.daps4').each(function (idx){
+		$(this).parent().find('a').removeClass('on');
+		$(this).css('display','none');
+	});
+	$("#categoryFilterDiv").find('.daps3').each(function (idx){
+		$(this).parent().find('a').removeClass('on');
+		$(this).css('display','none');
+	});
+	$("#categoryFilterDiv").find('.daps2').each(function (idx){
+		$(this).parent().find('a').removeClass('on');
+	});
+	$('.allFilter').find('.daps1').each(function (idx){
+		$(this).removeClass('on');
+		$(this).parent().find('ul').css('display','none');
+	});
+	gagaInfiniteScroll.pageStatus.filterHtml = '';
+	gagaInfiniteScroll.pageStatus.filterStatHtml = '';
+	fnCategoryGoodsInfiniteScrollInit();
+	fnSearchGoodsListSearch();
+	if(pageGb!='brandSearch'){
+		fnGetSearchPlanningList();
+		fnGetSearchEventList();
+	}
+}
+
+// 필터 초기화
+var fnFilterReset = function (){
+	//document.location.href = currUrl;
+	$("#searchGoodsForm input:hidden[name=brandGroupArr]").remove();
+	$("#searchGoodsForm input:hidden[name=sizeArr]").remove();
+	$("#searchGoodsForm input:hidden[name=dcRateFrom]").remove();
+	$("#searchGoodsForm input:hidden[name=dcRateTo]").remove();
+	$("#searchGoodsForm input:hidden[name=priceFrom]").remove();
+	$("#searchGoodsForm input:hidden[name=priceTo]").remove();
+	$("#searchGoodsForm input:hidden[name=ageArr]").remove();
+	$("#searchGoodsForm input:hidden[name=seasonArr]").remove();
+	$("#searchGoodsForm input:hidden[name=colorArr]").remove();
+	$("#searchGoodsForm input:hidden[name=benefitArr]").remove();
+	$("#searchGoodsForm input:hidden[name=cate1No]").remove();
+	$("#searchGoodsForm input:hidden[name=cate2No]").remove();
+	$("#searchGoodsForm input:hidden[name=cate3No]").remove();
+	$("#searchGoodsForm input:hidden[name=cate4No]").remove();
+	$("#searchGoodsForm input:hidden[name=cate5No]").remove();
+	$("#searchGoodsForm input:hidden[name=newGoods]").remove();
+	$("#unisex").prop('checked',false);
+	$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
+	$("#searchGoodsForm input:hidden[name=unisex]").remove();
+	$("#newGoods").prop('checked',false);
+	$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
+
+	$("#ulAllCate").find('.sub_cate').each(function (idx){
+		$(this).css('display','none');
+		$(this).parent().parent().find('li').removeClass('on');
+	});
+	// fnFilterSliderMove(0,5);
+	// fnDcRateFilterSliderMove(0,10);
+	$('.filter_content .sort').find('input[type=checkbox]').each(function (idx){
+		$(this).prop('checked',false);
+	});
+	$('#ulAllCate').find('input[type=checkbox]').each(function (idx){
+		$(this).prop('checked',false);
+	});
+	$("#filterData").html('');
+	gagaInfiniteScroll.pageStatus.filterHtml = '';
+	gagaInfiniteScroll.pageStatus.filterStatHtml = '';
+	fnCategoryGoodsInfiniteScrollInit();
+	fnSearchGoodsListSearch();
+	if(pageGb!='brandSearch'){
+		fnGetSearchPlanningList();
+		fnGetSearchEventList();
+	}
+}
 //****************상품리스트  end **********************************

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

@@ -685,11 +685,11 @@ header #htopSub{border-bottom: 0 solid #e5e5e5;box-sizing: border-box;}
 header #htopSubs{border-bottom: 0 solid #000000;box-sizing: border-box;}
 header #htopSub.my_main {background-color: #f5f5f5; border-bottom: 0.1rem solid rgba(0, 0, 0, 0.0)!important;}
 header .htop h1 {display: inline-block;position: relative;width:auto;max-width: calc(100% - 14.5rem);height: 5.5rem;line-height: 5.5rem;vertical-align: middle;margin: 0 0 0 2.0rem;font-size: 1.8rem;color: #222;}
-header .htop h1#htopTitle {display: inline-block;position: relative;max-width: 18rem;width: auto;height: 100%;line-height: 4.5rem;vertical-align: middle;padding: 0 1.5rem 0 0rem;font-size: 1.8rem;color: #222;}
+header .htop h1#htopTitle {display: inline-block;position: relative;max-width: 18rem;width: auto;height: 100%;line-height: 5.8rem;vertical-align: middle;padding: 0 1.5rem 0 0rem;font-size: 1.8rem;color: #222;}
 header .htop h1 a {height: 100%;width: 100%;display: block;}
 header .htop h1 img {margin: 0;width: 11.5rem;height: auto;line-height: 1.6rem;vertical-align: middle;}
 header .htop h1 a p{color: #222;line-height: 5.5rem;font-size: 2.0rem;height: 5.5rem;display: inline;vertical-align: middle;display: -webkit-box;word-break: break-all;text-overflow: ellipsis;-webkit-line-clamp: 1;-webkit-box-orient: vertical;overflow: hidden;}
-header .htop .btn_back {margin: 1.0rem 0 0 1.5rem;width: 3.5rem;height: 3.5rem;}
+header .htop .btn_back {margin: 1.0rem 0 0 1.5rem;width: 3.5rem;height: 3.5rem; float: left;}
 header .htop .btn_back span {display: block;width: 2.4rem;height: 2.4rem;margin: 0 auto;position: relative;}
 header .htop .btn_back span i {display: block;position: absolute;background: #222;-webkit-transition: all 0.3s ease-out;transition: all 0.3s ease-out;}
 header .htop .btn_back span i.gl1 {left: -0.2rem;top: 0.7rem;width: 1.2rem;height: 0.2rem;-webkit-transform: rotate(-45deg);transform: rotate(-45deg);}
@@ -722,7 +722,7 @@ header .btn_gnb span i {display: block;position: absolute;left: 0;width:100%;hei
 /* header .btn_gnb.on span i.gl1 {transform: rotate(45deg);-webkit-transform: rotate(45deg);} */
 /* header .btn_gnb.on span i.gl2 {transform: rotate(-45deg);-webkit-transform: rotate(-45deg);} */
 
-header .subs .btn_gnbs {position: absolute;top: 0;right: -2.0rem;width: 3.5rem;height: 4.5rem;z-index: 10;}
+header .subs .btn_gnbs {position: absolute;top: 0.8rem;right: -2.0rem;width: 3.5rem;height: 4rem;z-index: 10;}
 header .subs .btn_gnbs span i {display: block;position: absolute;left: 0;width: 100%;height: 100%;-webkit-transition: all 0.5s ease-out;transition: all 0.5s ease-out;}
 /* header .subs .btn_gnbs span {display: block;width: 2.4rem;height: 2.4rem;margin: 0 auto;position: relative;} */
 /* header .subs .btn_gnbs span i {display: block;position: absolute;left: 0;width: 2.4rem;height: 0.2rem;background: #222;-webkit-transition: all 0.15s ease-out;transition: all 0.15s ease-out;} */

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

@@ -416,7 +416,8 @@
 .itemLike.likeit::before {opacity: 1;}
 .item_prod .itemLink {position: relative;text-decoration: none;color: rgb(102, 102, 102);cursor: pointer;display: block;}
 .item_prod .itemPic {position: relative;width: 100%;margin-bottom: 1.5rem;padding-top: 150%;font-size: 0;overflow: hidden; background: #fff;}
-.item_prod .itemPic::after {content: "";display: block;position: absolute;top: 0;left: 0;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 2;}
+.item_prod .itemPic::before {content: "";display: block;position: absolute;top: 0;left: 0;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 2;}
+/* .item_prod .itemPic::after {content: "";display: block;position: absolute;top: 0;left: 0;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 2;} */
 .item_prod .itemPic .pd_img {position: absolute;width: 100%;height: auto;top: 50%;left: 0;transform: translateY(-50%);}
 .item_prod .itemPic .pd_mov {position: absolute;width: 100%;height: 100%;top: 50%;left: 0;transform: translateY(-50%);z-index: 2;}
 .item_prod .itemBrand {display: inline-block; margin: 0 0.5rem 0.3rem; font-size: 1rem;font-weight: 300;color: rgb(137, 137, 137); text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;width:10rem;overflow:hidden;}

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

@@ -403,8 +403,8 @@
 .main_pick .inner_body .pick-cont .swiper-container a:after {content:''; position: absolute; left: 0; bottom: 0; width: 100%; height: 60%; background: linear-gradient(0deg, rgba(0,0,0,0.5) 0%, transparent 100%);}
 .main_pick .inner_body .pick-cont a {position: relative;display: block;}
 .main_pick .inner_body .pick-cont a .txtWrap{position: absolute;bottom: 4rem;margin-left: 1.9rem; z-index: 1;}
-.main_pick .inner_body .pick-cont a .txtWrap p{font-size: 2.3rem;font-weight: 500;color: #fff;font-weight: 300;}
-.main_pick .inner_body .pick-cont a .txtWrap span{font-size: 1.2rem;font-weight: 100;color: #fff;margin-top: 0.5rem;display: block;}
+.main_pick .inner_body .pick-cont a .txtWrap p{font-size: 2.3rem;font-weight: 500;color: #fff;font-weight: 300;overflow: hidden;white-space: normal;overflow-wrap: break-word;display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 2;-webkit-box-orient: vertical;}
+.main_pick .inner_body .pick-cont a .txtWrap span{font-size: 1.2rem;font-weight: 100;color: #fff;margin-top: 0.5rem;display: block;overflow: hidden;white-space: normal;overflow-wrap: break-word;display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 1;-webkit-box-orient: vertical;}
 .main_pick .inner_body .pick-cont a img{width: 100%;height: auto;}
 .main_pick .inner_body .btn_group_flex > div > button > span {display: inline-block;background: url(/images/mo/ico_btn_brand.png) no-repeat;background-size: 1.1rem 1.1rem;width: 1.1rem;height: 1.1rem;margin-left: 0.8rem;}
 
@@ -523,12 +523,18 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .hookGrp .hook_cont div::before{content: ""; display: block; height: 7.5rem; margin-top: -7.5rem; visibility: hidden;}
 .hookGrp .hook_cont div:last-child{margin-bottom: 5.0rem;}
 
-.hookGrp .hook_cont h4, .hookGrp #prvc_sel h4 {font-size:1.4rem;font-weight:500;color:#222222;line-height:1.6rem;letter-spacing:-0.025em;}
-.hookGrp .hook_cont p, .hookGrp #prvc_sel p {font-size:1.2rem;color:#666666;line-height:2.2rem;letter-spacing:-0.025em;}
-.hookGrp .hook_cont p em, .hookGrp #prvc_sel p em{font-size:1.2rem;font-weight:400;color:#222222;line-height:2.2rem;letter-spacing:-0.025em;}
-.hookGrp .hook_cont ol li, .hookGrp #prvc_sel ol li {font-size:1.2rem;padding-left: 0.3rem;} 
-.hookGrp #prvc_sel ol li {line-height: 2.6rem;} 
-.hookGrp #prvc_sel {margin-bottom: 5.0rem;}
+.hookGrp .hook_cont h4{font-size:1.4rem;font-weight:500;color:#222222;line-height:1.6rem;letter-spacing:-0.025em;}
+.hookGrp .hook_cont p {font-size:1.2rem;color:#666666;line-height:2.2rem;letter-spacing:-0.025em;}
+.hookGrp .hook_cont p em{font-size:1.2rem;font-weight:400;color:#222222;line-height:2.2rem;letter-spacing:-0.025em;}
+.hookGrp .hook_cont ol li{font-size:1.2rem;padding-left: 0.3rem;} 
+
+
+.ps#prvc_sel {margin-bottom: 5.0rem;}
+.ps#prvc_sel h4 {font-size:1.4rem;font-weight:500;color:#222222;line-height:1.6rem;letter-spacing:-0.025em;}
+.ps#prvc_sel p {font-size:1.2rem;color:#666666;line-height:2.2rem;letter-spacing:-0.025em;}
+.ps#prvc_sel p em{font-size:1.2rem;font-weight:400;color:#222222;line-height:2.2rem;letter-spacing:-0.025em;}
+.ps#prvc_sel ol li {font-size:1.2rem;padding-left: 0.3rem; line-height: 2.6rem;} 
+.ps#prvc_sel ol li a.on{font-weight: 400;}
 
 .pager {height: 100%;margin-top: 2.0rem;margin-bottom: 2.0rem;}
 .pager .pageNav {display: table;margin-left: auto;margin-right: auto;}
@@ -994,7 +1000,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .my .mem_info .mem_box > .mem_coupon .coupon_txt02 {font-size: 1.6rem; font-weight: 500;}
 .my .mem_info .mem_box > .mem_coupon .coupon_txt02 span {font-size: 1.8rem;}
 .my .mem_info .mem_box > div:last-child {margin-right: 0;}
-.my .mem_info .mem_box > div a, .my .mem_info .mem_box > div .coupon_txt01 {font-size: 1.6rem; color: #000; font-weight: 500;}
+.my .mem_info .mem_box > div .coupon_txt01 {font-size: 1.6rem; color: #000; font-weight: 500;}
 .my .mem_info .mem_box > div .tit {font-size: 1.1rem; font-weight: 300; color: #888; margin-bottom: 0.2rem;}
 .my .mem_info .mem_box > div em {display: inline-block; font-size: 1.4rem; font-weight: 500;}
 
@@ -1887,7 +1893,7 @@ background-size:100%;}
 .od .fold_cont .area_overseas .form_field {margin-top: 2.4rem;}
 .od .fold_cont .area_overseas .form_field input[type="radio"] + label {margin-bottom: 1.5rem;}
 .od .fold_cont .area_overseas .form_field > div {}
-.od .fold_cont .area_overseas .info_txt {background: #fff6f2; margin-top: 0;}
+/* .od .fold_cont .area_overseas .info_txt {background: #fff6f2; margin-top: 0;} */
 .od .fold_cont .area_overseas .info_box {font-size:1.6rem;}
 .od .fold_cont .area_overseas .info_box .t_err {margin-top:0.5rem; font-size:1.1rem;}
 .od .fold_cont .area_overseas .info_box.overs1 {margin-right:0}
@@ -2589,7 +2595,7 @@ main.container .od_gift .inner:last-child {padding-bottom: 0;}
 .od_gift .tbl_wrap .tbl.tbl_request input[type="text"]::placeholder {}
 .od_gift .tbl_wrap .tbl.tbl_request .desc_txt {margin-top: 1rem;}
 
-.od_gift .info_txt {margin-top: 2.4rem; background: #f5f5f5;}
+/* .od_gift .info_txt {margin-top: 2.4rem; background: #f5f5f5;} */
 
 .part_goods .goods_section > .od_calc {margin: 1rem 0 0 0; padding:1.3rem 0 0 0; position: relative; line-height: 1; border-top: 0.1rem solid #ddd;}
 .part_goods .goods_section > .od_calc .price {top: auto; bottom: 0;}

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

@@ -807,7 +807,8 @@ content: "〉";font-size: 12px;padding-left: 8px;
 
 .itemLink {z-index:20;position: relative;text-decoration: none;color: rgb(102, 102, 102);cursor: pointer;display: block;}
 .itemPic {position: relative;width: 100%;margin-bottom:20px;padding-top: 150%;font-size: 0px;overflow: hidden;}
-.itemPic::after {content: "";display: block;position: absolute;top: 0px;left: 0px;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 999;}
+.itemPic::before {content: "";display: block;position: absolute;top: 0px;left: 0px;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 98;}
+/* .itemPic::after {content: "";display: block;position: absolute;top: 0px;left: 0px;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 999;} */
 .itemPic .pd_img,
 .itemPic .pd_mov {position: absolute;width: 100%;height: auto;top: 50%;left: 0px;transform: translateY(-50%);}
 .itemPic .pd_mov {z-index: 2;height: 100%;left: -83.45%;width: 267%;}

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

@@ -165,7 +165,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .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 img{top: 50%;left: 0px;transform: translateY(-50%);}
 .common_header.br_header .depth_menu .head_banner li:first-child {margin-right:0;}
 .common_header.br_header .depth_menu .item_prod {width: 100%;}
 .common_header.br_header > .area {height:90px;background: inherit;}
@@ -4907,7 +4907,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.modal.lookbook_item_pop .itemsGrp .item_prod .itemLink {display: table-cell; position: static; vertical-align: middle;}
 	.modal.lookbook_item_pop .itemsGrp .item_prod .itemPic {position: absolute; top: 0; left: 0; margin-bottom: 0; width: 260px; height:390px; padding:0; background: #f9f9f9;}
 	/* .modal.lookbook_item_pop .itemsGrp .item_state.soldout .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; text-align: center;} */
-	.modal.lookbook_item_pop .itemsGrp .item_prod .itemBrand {margin:0px 0px 15px; font-size: 14px; font-weight: 300;}
+	.modal.lookbook_item_pop .itemsGrp .item_prod .itemBrand {margin:0px 0px 15px; font-size: 14px; font-weight: 300; line-height: 14px;}
 	.modal.lookbook_item_pop .itemsGrp .item_prod .itemName {margin:0px 0px 25px; font-size: 18px; font-weight: 300; line-height: 28px; height:56px;}
 	.modal.lookbook_item_pop .itemsGrp .item_prod .itemPrice {font-size: 26px; line-height: 1; font-weight: 500; margin:0;}
 	.modal.lookbook_item_pop .itemsGrp .item_prod .itemPrice_original {display: inline-block; margin-left:0; margin-bottom:10px; font-size: 20px; font-weight: 200;}

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

@@ -505,7 +505,7 @@
 .fy_nav .btn_shape div span {color:#888888; font-size:18px; font-weight:300; line-height:1;display: inline;}
 .fy_nav .btn_shape div::after {content: ''; display: inline-block; clear: both; }
 .fy_nav .btn_shape div .number { float: left; padding-right:25px; color:#222222; font-size:20px; font-weight:500;}
-.fy_nav .btn_shape div .number + span {color:#888888; font-size:18px; font-weight:300; line-height:1.2;width: 162px;display: inline-block;overflow: hidden;white-space: normal;overflow-wrap: break-word;display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 1;-webkit-box-orient: vertical;}
+.fy_nav .btn_shape div .number + span {color:#888888; font-size:18px; font-weight:300; line-height:1.2;width: 151px;display: inline-block;overflow: hidden;white-space: normal;overflow-wrap: break-word;display: -webkit-box;text-overflow: ellipsis;-webkit-line-clamp: 1;-webkit-box-orient: vertical;}
 .fy_nav .btn_shape + a {display:none;}
 .fy_nav .btn_shape.active {position:relative; background:#222222; border-color:rgb(245 245 245);}
 .fy_nav .btn_shape.active span {position:relative; color:#ffffff;}

src/main/webapp/ux/style24_link.js

@@ -1065,16 +1065,16 @@ function cfnPrivacyPolicyLayer(mallGb) {
 function cfnSupplyComanyLayer(mallGb) {
 	let str;
 	if (_frontGb === 'P') {
-		str ='<div class="modal fade pd_pop psptn_pop" id="supplyCompanyPop" tabIndex="-1" role="dialog" aria-labelledby="psptnLabel" aria-hidden="true"></div>'
+		str ='<div class="modal fade pd_pop psptn_pop" id="partnersPop" tabIndex="-1" role="dialog" aria-labelledby="psptnLabel" aria-hidden="true"></div>'
 	} else {
-		str = '<div class="modal pop_full fade" id="supplyCompanyPop" role="dialog" aria-labelledby="partnersPopFullLabel" aria-hidden="true"></div>';
+		str = '<div class="modal pop_full fade" id="partnersPop" role="dialog" aria-labelledby="partnersPopFullLabel" aria-hidden="true"></div>';
 	}
-	if($('#supplyCompanyPop').length == 0) {
+	if($('#partnersPop').length == 0) {
 		$('body').append(str);
 	}
 	let params = {}
 	params.mallGb = mallGb;
-	cfnOpenLayer(_PAGE_SUPPLY_COMPANY_LAYER,'supplyCompanyPop');
+	cfnOpenLayer(_PAGE_SUPPLY_COMPANY_LAYER,'partnersPop');
 }