Merge branch 'develop' into bin2107

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

@@ -225,6 +225,9 @@ public interface TsfReviewDao {
 	 */
 	void createReviewPointHst(Point point);
 	
+
+
+	
 	
 	
 }

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

@@ -445,5 +445,16 @@ public class TsfReviewService {
 		return reviewDao.getReviewPointGiveCount(review);
 	}
 	
+	/**
+	 * 상품평 첨부파일 목록
+	 * @param review
+	 * @return 
+	 * @author eskim
+	 * @since 2021. 3. 15
+	 */
+	public Collection<ReviewAttach> getReviewAttachList(Review review){
+		return reviewDao.getReviewAttachList(review);
+	}
+	
 	
 }

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

@@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import com.style24.front.biz.thirdparty.Yes24Login;
+import com.style24.front.support.env.TsfConstants;
 import com.style24.persistence.domain.CustSnsInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -706,9 +707,16 @@ public class TsfCustomerController extends TsfBaseController {
 		if (StringUtils.isBlank(custNo) || StringUtils.isBlank(customer.getEncData())) {
 			throw new IllegalStateException("로그인 다시 시도해주세요.");
 		}
-		GagaMap resultInfo = niceCertify.getCertifyCellPhoneResultInfo(customer);
 
-		customer.setCi(resultInfo.getString("sCi"));
+		GagaMap resultInfo;
+		if (TscConstants.AuthMethod.MOBILE.value().equals(customer.getAuthMethod())){
+			resultInfo = niceCertify.getCertifyCellPhoneResultInfo(customer);
+			customer.setCi(resultInfo.getString("sCi"));
+		} else {
+			resultInfo = niceCertify.getCertifyIpinResultInfo(customer);
+			customer.setCi(resultInfo.getString("sConnInfo"));
+		}
+
 		customer.setCustNo(Integer.parseInt(custNo));
 		session.removeAttribute("custNo"); // 고객번호 세션 삭제
 		return customerService.releaseDormantCustomer(customer);

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

@@ -1662,9 +1662,11 @@ public class TsfMypageController extends TsfBaseController {
 
 		GagaMap result = new GagaMap();
 		review.setCustNo(TsfSession.getInfo().getCustNo());
-		if (reviewService.reviewDeleteConfirm(review).getCount() > 0) {
-			review.setReviewSq(reviewService.reviewDeleteConfirm(review).getReviewSq());
-		}
+		/*
+		 * if (reviewService.reviewDeleteConfirm(review).getCount() > 0) {
+		 * review.setReviewSq(reviewService.reviewDeleteConfirm(review).getReviewSq());
+		 * }
+		 */
 
 		reviewService.updateMypageReview(review);
 		result.set("status", "200");

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

@@ -266,6 +266,9 @@ public class TsfNoMemberController extends TsfBaseController {
 	@ResponseBody
 	public GagaMap getOrderInfoValidation(@RequestBody Order order) {
 		GagaMap result = new GagaMap();
+		if (!order.getOrdPhnno().contains("-")) {
+			order.setOrdPhnno(order.getOrdPhnno().replaceAll("(\\d{3})(\\d{3,4})(\\d{4})", "$1-$2-$3"));
+		}
 		boolean isFind = orderService.getPagingOrdNoListCount(order) > 0;
 		result.setBoolean("isFind", isFind);
 		return result;

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

@@ -23,7 +23,7 @@
 	<section class="content mb_idInquiry_7">
 		<div class="inner">
 			<div class="close">
-				<a href="javascript:void(0);" class="btn_close" onclick="cfnGoToPage(_PAGE_MAIN);"><span></span><span></span></a>
+				<a href="javascript:void(0);" class="btn_close" onclick="cfnGoToPage(_PAGE_LOGIN);"><span></span><span></span></a>
 			</div>
 		</div>
 		<div class="inner">

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

@@ -69,10 +69,11 @@
 	const authMethod = [[${authMethod}]]; //인증 후 해당 페이지로 리다이렉트함
 
 	// 나이스 본인인증 후 콜백
-	var fnNiceCallBack = function(encData) {
+	var fnNiceCallBack = function(encData, authMethod) {
 		if (!gagajf.isNull(encData)) {
 			let custInfo = {};
 			custInfo.encData = encData;
+			custInfo.authMethod = authMethod;
 			let jsonData = JSON.stringify(custInfo);
 			gagajf.ajaxJsonSubmit('/customer/dormant/release', jsonData, fnRelaseCallback);
 		}

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

@@ -24,7 +24,7 @@
 	<section class="content mb_join_1">
 		<div class="inner">
 			<div class="close">
-				<a href="javascript:history.back();" class="btn_close" ><span></span><span></span></a>
+				<a href="javascript:void(0);" class="btn_close" onclick="cfnGoToPage(_PAGE_MAIN);"><span></span><span></span></a>
 			</div>
 		</div>
 		<div class="inner">

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

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="ko"
+	  xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : PrivacyPolicyLayerFormMob.html
+ * @desc    : 개인정보 수집 및 이용
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.04.28   jsshin       최초 작성
+ *******************************************************************************
+ -->
+<div class="modal-dialog" role="document">
+	<div class="modal-content">
+		<div class="modal-header">
+			<h5 class="modal-title" id="exampleFullLabel">개인정보 수집 및 이용</h5>
+		</div>
+		<div class="modal-body">
+			<div class="pop_cont">
+
+				<!-- 컨텐츠 시작 -->
+				<div class="ps" th:utext="${#strings.replace(#strings.replace(clause,'&amplt;','<'),'&ampgt;','>')}"></div>
+				<!-- 컨텐츠 종료 -->
+
+			</div>
+		</div>
+	</div>
+</div>
+</html>

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

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html lang="ko"
+	  xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : PrivacyTrustLayerFormMob.html
+ * @desc    : 개인정보 취급 위탁
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.04.28   jsshin       최초 작성
+ *******************************************************************************
+ -->
+<div class="modal-dialog" role="document">
+	<div class="modal-content">
+		<div class="modal-header">
+			<h5 class="modal-title" id="exampleFullLabel">개인정보 취급 위탁</h5>
+		</div>
+		<div class="modal-body">
+			<div class="pop_cont">
+
+				<!-- 컨텐츠 시작 -->
+				<div class="ps" th:utext="${#strings.replace(#strings.replace(clause,'&amplt;','<'),'&ampgt;','>')}"></div>
+				<!-- 컨텐츠 종료 -->
+
+			</div>
+		</div>
+	</div>
+</div>
+</html>

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

@@ -0,0 +1,32 @@
+<html lang="ko"
+	  xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : UseTermsLayerFormMob.html
+ * @desc    : STYLE24이용약관
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.04.28   jsshin       최초 작성
+ *******************************************************************************
+ -->
+<div class="modal-dialog" role="document">
+	<div class="modal-content">
+		<div class="modal-header">
+			<h5 class="modal-title" id="exampleFullLabel">이용약관</h5>
+		</div>
+		<div class="modal-body">
+			<div class="pop_cont">
+
+				<!-- 컨텐츠 시작 -->
+				<div class="ps" th:utext="${#strings.replace(#strings.replace(clause,'&amplt;','<'),'&ampgt;','>')}"></div>
+				<!-- 컨텐츠 종료 -->
+
+			</div>
+		</div>
+	</div>
+</div>
+</html>

src/main/webapp/WEB-INF/views/mob/mypage/MypageCustPwdModifyFormMob.html

@@ -14,426 +14,257 @@
  * 1.0  2021.04.01   jsshin       최초 작성
  *******************************************************************************
  -->
-<body>
-<th:block layout:fragment="content">
-	<div class="app">
-		<a href="#mainCon" class="skipNav">본문바로가기</a>
-		<header class=""> <!-- 서브페이지에서는 <header>의 클래스.main 제거 -->
-			<section class="htop" id="htopSub">
-				<button class="btn_back" title="이전페이지로">
-					<span><i class="gl1"></i><i class="gl2"></i><i class="gl3"></i></span>
-				</button>
-				<h1 id="htopTitle">내 정보 관리</h1>
-				<div class="button_wrap">
-					<button class="home">
-						<img src="/images/mo/ico_btn_home.png" alt="홈">
-					</button>
-					<button class="search">
-						<img src="/images/mo/ico_btn_search.png" alt="검색">
-					</button>
-					<button class="store">
-						<img src="/images/mo/ico_btn_store.png" alt="쇼핑백">
-						<span>99+</span>
-					</button>
-				</div>
-			</section>
-		</header>
-		<main role="" id="" class="container my">
-			<section class="content my_page_edit">
-				<form action="" class="form_wrap">
-					<div class="inner">
-						<div class="tbl_wrap">
-							<div class="tbl_tit"> 
-								<h3>회원 정보</h3>
-								<button type="button" class="btn_popup"><span>개명 본인인증</span></button>
-							</div>
-							<div class="tbl">
-								<div class="tbl_row">
-									<table>
-										<colgroup>
-											<col width="*">
-										</colgroup>   
-										<tr>
-											<th>이름</th>
-											<td>
-												<div class="form_field">
-													<input type="text" class="form_control" value="홍길동" placeholder="" readonly="readonly">
-												</div>
-											</td>
-										</tr>
-										<tr>
-											<th>생년월일</th>
-											<td>
-												<div class="form_field">
-													<input type="text" class="form_control" value="19921005" placeholder="" readonly="readonly">
-												</div>
-											</td>
-										</tr>
-									</table>
-									<p class="desc_txt">본인인증을 통해 자동으로 수집되는 정보입니다.</p>
-								</div>
-								<div class="tbl_row">
-									<table>
-										<colgroup>
-											<col width="*">
-										</colgroup>   
-										<tr>
-											<th>아이디</th>
-											<td>
-												<div class="form_field">
-													<input type="text" class="form_control" value="gunuid" placeholder="" readonly="readonly">
-												</div>
-											</td>
-										</tr>
-										<tr>
-											<th>비밀번호</th>
-											<td>
-												<div class="form_field password">
-													<button id="btn_password_pop" class="btn btn_primary"><span>비밀번호 변경하기</span></button> <!-- 210407_ID 추가 -->
-												</div>
-											</td>
-										</tr>
-										<tr>
-											<th>이메일</th>
-											<td>
-												<div class="form_field">
-													<input type="text" class="form_control" value="abced@naver.com" >
-												</div>
-											</td>
-										</tr>
-										<tr>
-											<th>휴대폰 인증</th>
-											<td>
-												<div class="input_wrap certi_wrap">
-													<input type="text" class="form_control" value="01047159121" placeholder="" readonly="readonly">
-													<button type="button" class="btn btn_dark"><span>본인인증</span></button>
-												</div>
-											</td>
-										</tr>
-									</table>
+<style>
+	.hide{display: none;}
+</style>
+	<div class="modal-dialog" role="document">
+		<div class="modal-content">
+			<div class="modal-header htop">
+				<h5 class="modal-title" id="passwordChangeLabel">비밀번호 변경</h5>
+			</div>
+			<div class="modal-body">
+				<div class="pop_cont">
+					<div class="pass_confirm">
+						<form id="pwdModifyForm" class="form_wrap">
+							<input type="hidden" name="custId" th:value="${custId}"/>
+							<div class="form_field">
+								<label class="input_label sr-only">기존 비밀번호를 입력해주세요.</label>
+								<div class="ui_col_12">
+									<input type="password" nid="orgPasswd" name="orgPasswd" placeholder="기존 비밀번호를 입력해주세요." class="form_control" minlength="8" maxlength="20" required="required" data-valid-name="기존 비밀번호"/>
 								</div>
 							</div>
-						</div>
-					</div>
-					<div class="inner">
-						<div class="tbl_wrap">
-							<div class="tbl_tit"> 
-								<h3>마케팅 정보 수신설정</h3>
-							</div>
-							<div class="tbl tbl_radio">
-								<table>
-									<colgroup>
-										<col width="*">
-									</colgroup>   
-									<tr>
-										<th class="sr-only">이름</th>
-										<td>
-											<div class="form_field">
-												<input id="chk-1" type="checkbox" name="test1"><label for="chk-1"><span>이메일</span></label> <!-- 210406_input type radio -> checkbox 변경 -->
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<th class="sr-only">생년월일</th>
-										<td>
-											<div class="form_field">
-												<input id="chk-2" type="checkbox" name="test1"><label for="chk-2"><span>SMS</span></label> <!-- 210406_input type radio -> checkbox 변경 -->
-											</div>
-										</td>
-									</tr>
-								</table>
-								<p class="desc_txt">회원정보, 구매 정보 및 서비스 주요 정책 관련 내용은 수신동의 여부와<br>관계없이 발송됩니다.</p>
-							</div>
-						</div>
-					</div>
-					<div class="inner">
-						<div class="tbl_wrap">
-							<div class="tbl_tit"> 
-								<h3>환불 계좌정보</h3>
-							</div>
-							<div class="tbl type1">
-								<table>
-									<colgroup>
-										<col width="*">
-									</colgroup>   
-									<tr>
-										<th>예금주</th>
-										<td>
-											<div class="form_field">
-												<input type="text" class="form_control" value="gunuid" placeholder="비밀번호를 입력해 주세요" readonly="readonly"> <!-- 210406_input readonly 추가 -->
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<th>은행명</th>
-										<td>
-											<div class="form_field">
-												<!-- <div class="select_custom type1" disabled > 셀렉트 자체 비활성 -->
-												<div class="select_custom select_bank"> <!-- 210408_ 수정 : select_bank 클래스 변경  -->
-													<div class="combo">
-														<div class="select">선택</div>
-														<!-- 
-														210408_ 삭제
-														<ul class="list">
-															<li class="selected">선택</li>
-															<li>상품옵션01</li>
-															<li> <input type="radio" > 상품옵션02</li>
-															<li>
-																<div>03. 상품옵션 : 두줄처리</div>
-																<div>120,000원</div>
-															</li>
-															<li aria-disabled="true" data-soldout="true">
-																<div>04. 상품옵션 : 두줄처리</div>
-																<div>120,000원</div>
-															</li>
-															<li>상품옵션04</li>
-															<li>상품옵션05</li>
-															<li aria-disabled="true" data-soldout="true">상품옵션06</li>
-															<li>상품옵션07</li>
-														</ul> -->
-													</div>
-												</div>
-											</div>
-										</td>
-									</tr>
-									<tr>
-										<th>계좌번호</th>
-										<td>
-											<div class="input_wrap certi_wrap">
-												<input type="tel" class="form_control" value="1234567894123456789" placeholder=""> <!-- 210409_input type tel 변경 -->
-												<button type="button" id="btn_bank_certi" class="btn btn_dark"><span>계좌인증</span></button> <!-- 210409_추가 : btn_bank_certi id 추가 -->
-											</div>
-										</td>
-									</tr>
-								</table>
-							</div>
-						</div>
-						<div class="btn_group_flex">
-							<div class="">
-								<button type="button" id="btn_myedit_confirm" class="btn btn_dark btn_block"><span>확인</span></button> <!-- 210409_추가 : btn_myedit_confirm id 추가 -->
-							</div>
-						</div>
-					</div>
-				</form>
-			</section>
-		</main>
-
-		<nav id="tabbar" class="tabbar fixed">
-		<!-- <nav id="tabbar" class="tabbar"> -->
-			<div class="tabbar-inner">
-				<a href="javascript:menu;" class="btn-menu" data-popup-trigger="" data-target="#menu">Menu</a>
-				<a href="javascript:myPage" class="btn-my">Mypage</a>
-				<a href="javascript:home" class="btn-home">Home</a>
-				<a href="javascript:wish" class="btn-wish">Wish</a>
-				<a href="javascript:history" class="btn-history">History</a>
-			</div>
-				<!-- 
-					<span class="txt-balloon" id="tutorial_mycloset" style=""> 툴팁예제</span>
-				-->
-		</nav>
-
-		<!-- 210407_비밀번호 변경 팝업 추가 -->
-		<div class="modal pop_full password_change_pop" id="passwordChangePop" tabindex="-1" role="dialog" aria-labelledby="passwordChangeLabel" aria-hidden="true">
-			<div class="modal-dialog" role="document">
-				<div class="modal-content">
-					<div class="modal-header htop">
-						<h5 class="modal-title" id="passwordChangeLabel">비밀번호 변경</h5>
-					</div>
-					<div class="modal-body">
-						<div class="pop_cont">
-							<div class="pass_confirm">
-								<form action="" class="form_wrap">
-									<div class="form_field">
-										<label class="input_label sr-only">기존 비밀번호를 입력해주세요.</label>
-										<div class="ui_col_12">
-											<input type="password" name="userConfirm" placeholder="기존 비밀번호를 입력해주세요." id="Password" class="form_control">
-										</div>
-									</div>
-									<div class="form_field">
-										<label class="input_label sr-only">신규 비밀번호를 입력해주세요.</label>
-										<div class="ui_col_12">
-											<input type="password" name="userPassword" placeholder="신규 비밀번호를 입력해주세요." id="txtPassword" class="form_control">
-											<!-- case (사용불가 비밀번호일경우,사용가능한 비밀번호일경우) -->
-											<div class="help_block">
-												<!-- 사용불가 비밀번호일경우 -->
-												<p class="mt10">
-													<span class="c_red2"><i class="ico ico_check red mr5"></i>영문(대/소문자), 숫자, 특수문자 중 2가지 이상 조합(8~20자)</span><br>
-													<span class="c_red2"><i class="ico ico_check red mr5"></i>4개이상연속되거나 동일한 문자, 숫자 제외</span><br>
-													<span class="c_red2"><i class="ico ico_check red mr5"></i>아이디제외</span>
-												</p>
-												<!-- //사용불가 비밀번호일경우 -->
-												<!-- 사용가능한 비밀번호일경우 -->
-												<p class="mt10">
-													<span class="c_black2"><i class="ico ico_check black mr5"></i>사용 가능한 비밀번호입니다</span>
-												</p>
-												<!-- //사용가능한 비밀번호일경우 -->
-											</div>
-											<!-- //case (사용불가 비밀번호일경우,사용가능한 비밀번호일경우) -->
-										</div>
-									</div>
-									<div class="form_field">
-										<label class="input_label sr-only">신규 비밀번호를 다시 입력해주세요.</label>
-										<div class="ui_col_12">
-											<input type="password" name="userConfirm" placeholder="신규 비밀번호를 다시 입력해주세요." id="txtConfirm" class="form_control">
-										</div>
+							<div class="form_field">
+								<label class="input_label sr-only">신규 비밀번호를 입력해주세요.</label>
+								<div class="ui_col_12">
+									<input type="password" id="passwd" name="passwd" placeholder="신규 비밀번호를 입력해주세요.(8~20자 영문, 숫자, 특수문자 중 2가지 이상 조합)" class="form_control" minlength="8" maxlength="20" required="required" data-valid-name="신규 비밀번호"/>
+									<!-- case (사용불가 비밀번호일경우,사용가능한 비밀번호일경우) -->
+									<div class="help_block">
+										<!-- 사용불가 비밀번호일경우 -->
+										<p class="mt10">
+											<span id="firstFailed" class="c_gray">
+												<i class="ico ico_check gray mr5"></i>영문(대/소문자), 숫자, 특수문자 중 2가지 이상 조합(8~20자)<br>
+											</span>
+											<span id="secondFailed" class="c_gray">
+												<i class="ico ico_check gray mr5"></i>4개이상연속되거나 동일한 문자, 숫자 제외<br>
+											</span>
+											<span id="thirdFailed" class="c_gray">
+												<i class="ico ico_check gray mr5"></i>아이디제외
+											</span>
+										</p>
+										<!-- //사용불가 비밀번호일경우 -->
+										<!-- 사용가능한 비밀번호일경우 -->
+										<p id="avlPwd" class="mt10 hide">
+											<span class="c_black2">
+												<i class="ico ico_check black mr5"></i>사용 가능한 비밀번호입니다.
+											</span>
+										</p>
+										<!-- //사용가능한 비밀번호일경우 -->
 									</div>
-									<div class="btn_group_flex">
-										<div class="">
-											<button type="button" class="btn btn_default"><span>취소</span></button>
-										</div>
-										<div class="">
-											<button type="button" id="btn_password_confirm" class="btn btn_dark"><span>변경</span></button> <!-- 210409_추가 : btn_password_confirm id 추가 -->
-										</div>
+									<!-- //case (사용불가 비밀번호일경우,사용가능한 비밀번호일경우) -->
+								</div>
+							</div>
+							<div class="form_field">
+								<label class="input_label sr-only">신규 비밀번호를 다시 입력해주세요.</label>
+								<div class="ui_col_12">
+									<input type="password" id="confirmPassword" name="confirmPassword" placeholder="신규 비밀번호를 다시 입력해주세요." class="form_control" minlength="8" maxlength="20" required="required" data-valid-name="신규 비밀번호 확인"/>
+									<div class="help_block">
+										<!-- 비밀번호확인 틀렸을경우 -->
+										<p id="misPwd" class="hide">
+											<span class="t_err">
+												새 비밀번호가 일치하지 않습니다.
+											</span>
+										</p>
+										<!-- //비밀번호확인 틀렸을경우 -->
+										<!-- 비밀번호 일치할경우 -->
+										<p id="avlConPwd" class=" hide">
+											<span class="c_black2">
+												<i class="ico ico_check black mr5"></i>새 비밀번호가 일치합니다.
+											</span>
+										</p>
+										<!-- //비밀번호 일치할경우 -->
 									</div>
-								</form>
+								</div>
 							</div>
-						</div>
+							<div class="btn_group_flex">
+								<div>
+									<button type="button" id="btnClose" class="btn btn_default"><span>취소</span></button>
+								</div>
+								<div>
+									<button type="button" id="btnSavePassword" class="btn btn_dark"><span>변경</span></button> <!-- 210409_추가 : btn_password_confirm id 추가 -->
+								</div>
+							</div>
+						</form>
 					</div>
-					<div class="modal-footer" style="display:none;"></div>
 				</div>
 			</div>
-			<a href="#close-modal" rel="modal:close" id="passwordPop_close" class="close-modal">Close</a>
+			<div class="modal-footer" style="display:none;"></div>
 		</div>
-		<!-- //210407_비밀번호 변경 팝업 추가 -->
+	</div>
+	<a href="#close-modal" rel="modal:close" id="passwordPop_close" class="close-modal">Close</a>
 
-		<!-- 210408_ 추가 : 은행 선택 팝업 -->
-		<div id="refundBankPop" class="popup_box refundBankPop">
-			<div class="lap">
-				<div class="popup_close">카테고리닫기</div>
-				<div class="popup_head sr-only">
-					<h2 class="">은행 선택 팝업</h2>
-				</div>
-				<div class="popup_con">
-					<div class="button_list clear">
-						<button type="button"><span>국민은행</span></button>
-						<button type="button"><span>기업은행</span></button>
-						<button type="button"><span>하나은행</span></button>
-						<button type="button"><span>우리은행</span></button>
-						<button type="button"><span>산업은행</span></button>
-						<button type="button"><span>대구은행</span></button>
-					</div>
-				</div>
-			</div>
-		</div>
-		<!-- //210408_ 추가 : 은행 선택 팝업 -->
-		<footer>
-			<button class="btn_top" title="페이지 맨위로 이동">
-				<span>
-					<i class="gl1"></i>
-					<i class="gl2"></i>
-					<i class="gl3"></i>
-				</span>
-			</button>
-			<section class="f1">
-				<div class="inner">
-					<ul class="link wider">
-						<li><a href="#none">고객센터</a></li>
-						<li><a href="#none">이용약관</a></li>
-						<li><a href="#none">개인정보취급방침</a></li>
-					</ul>
+<script th:src="@{'/biz/customer.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/biz/customer.js"></script>
+<script th:inline="javascript">
+	/*<![CDATA[*/
+	let checkPwd;
+	let checkConfirmPwd;
 
-					<div class="collapse">
-						<div class="btnWrap">
-							<button class="btn_infos">아이스타일이십사 주식회사</button>
-						</div>
-						<ul class="infos info">
-							<li class="fn">대표이사 : 윤종선</li>
-							<li class="fn">주소 : 서울시 영등포구 은행로 11, 8층(여의도동, 일신빌딩)</li>
-							<li class="fn">사업자등록번호 : 116-81-32499 </li>
-							<li class="fn">개인정보관리책임자 : 이정득 </li>
-							<li class="fn">통신판매업신고번호 : 제 2020-서울영등포1432</li>
-							<li class="fn">개인정보보호책임자 : 김명인</li>
-							<li class="fn">호스팅 서비스 : 아이스타일이십사㈜</li>
-						</ul>
-					</div>
-					
-					<ul class="link">
-						<li><a href="#none">사업자정보확인</a></li>
-						<li><a href="#none">PC버전</a></li>
-						<li><a href="#none">APP 다운로드</a></li>
-						<li><a href="#none">SN&#64;PP</a></li>
-					</ul>
-					<ul class="copy">
-						<li>COPYRIGHTⓒ2020 STYLE24 ALL RIGHTS RESERVED.</li>
-					</ul>
-					<ul class="sns">
-						<li><a href="#none" class="insta">Instagram</a></li>
-						<li><a href="#none" class="facebook">facebook</a></li>
-					</ul>
-				</div>
-			</section>
-		</footer>
-	</div>
-	<!-- 210407_비밀번호 변경 팝업 스크립트 -->
-	<script>
-		$(document).ready(function(){
-            $(document).on('click','#btn_password_pop',function(e){
-                $("#passwordChangePop").modal("show");
-                return false;
-            });
-            $("#passwordPop_close").click(function() {
-                $("#passwordChangePop").modal("hide");
-            });
+	$("#btnClose").on('click', function() {
+		$.modal.close();
+	});
 
-			//버튼 색
-			$(document).on('click','.popup_box .button_list button',function(){
-				$('.popup_box .button_list button').removeClass('on');
-				$(this).addClass('on');
-			});
+	// 신규 비밀번호 입력
+	$('#pwdModifyForm input[name=passwd]').on('focusout keyup keydown', function () {
+		fnCheckPassword();
+	});
 
-			//210408_ 추가 : 환불계좌등록 팝업 스크립트
-			$(document).on("click","#btn_refund_pop",function(e){
-				$('#refundAccountPop').show().addClass("active");
-				$("body").css({"overflow":"hidden"});
-			});
-			
-			//210408_ 추가 : 은행선택 팝업 스크립트
-			$(document).on("click",".select_bank",function(e){
-				$('#refundBankPop').show().addClass("active");
-				$('#refundBankPop').css({"z-index":"1000"});
-				$("body").css({"overflow":"hidden"});
-			});
+	// 신규 비밀번호 확인 입력
+	$('#pwdModifyForm input[name=confirmPassword]').on('focusout keyup keydown', function () {
+		fnCheckConfirmPassword();
+	});
 
-			//210408_ 추가 : 은행선택 팝업 스크립트 닫기
-			$('.refundBankPop .popup_close').on("click",function(){
-				$('.refundBankPop').hide().removeClass('active');
-				$("body").css({"overflow":"visible"});
-			});
+	// 비밀번호 확인
+	var fnCheckPassword = function () {
+		const $firstFailed = $('#firstFailed');
+		const $secondFailed = $('#secondFailed');
+		const $thirdFailed = $('#thirdFailed');
+		const $avlPwd = $('#avlPwd');
+		const red = 'c_red2';
+		const gray = 'c_gray';
+		let custId = $('#pwdModifyForm input[name=custId]').val();
+		let password = $('#pwdModifyForm input[name=passwd]').val();
+		let confirmPassword = $('#pwdModifyForm input[name=confirmPassword]').val();
+		let pwdCheck = true;
 
-			/* 210409_추가 : alert 모음 */
-			$(document).on("click", "#btn_bank_certi", function(){
-				mcxDialog.alert("계좌인증에 성공했습니다.", {
-						//alert("계좌정보를 다시 확인해주세요.") : 계좌인증 실패/유효하지 않은 경우
-						//alert("은행을 선택해주세요.") : 은행을 선택하지 않은 경우
-						//alert("계좌번호를 입력해주세요.") : 계좌번호를 입력하지 않은 경우
-					sureBtnText: "확인",  // Confirmation button text
-				});
-			});
+		// 영문, 숫자, 특수문자 2종 이상 혼용 || 길이
+		if (fnValidtaionPwdMixedWord(password) || fnValidationPwdLength(password)) {
+			pwdCheck = false;
+			$firstFailed.removeClass(gray);
+			$firstFailed.addClass(red);
+		} else {
+			$firstFailed.removeClass(red);
+			$firstFailed.addClass(gray);
+		}
 
-			$(document).on("click", "#btn_myedit_confirm", function(){
-				mcxDialog.alert("회원정보가 수정되었습니다.", {
-						//alert("이메일 주소를 입력해주세요.") : 이메일을 입력하지 않은 경우
-						//alert("이메일 주소를 정확하게 입력해주세요.") : 이메일이 유효하지 않은 경우
-						//alert("이미 사용중인 이메일 주소 입니다.") : 이메일이 중복/사용중인 경우
-						//alert("계좌인증이 필요합니다.") : 계좌정보에 대해 계좌인증이 안된 경우
-						//alert("환불 계좌정보를 다시 확인하시고 계좌인증을 해주세요.") : 인증 받은 계좌정보와 입력된 계좌정보가 다른 경우
-					sureBtnText: "확인",  // Confirmation button text
-				});
-			});
+		// 동일한 문자/숫자 4자이상 || 연속된 문자가 4자이상
+		if (fnValidationPwdSameWord(password) || fnValidtaionPwdCntnsWord(password)) {
+			pwdCheck = false;
+			$secondFailed.removeClass(gray);
+			$secondFailed.addClass(red);
+		} else {
+			$secondFailed.removeClass(red);
+			$secondFailed.addClass(gray);
+		}
+
+		// 아이디 포함
+		if (fnValidationPwdSameId(password, custId)) {
+			pwdCheck = false;
+			$thirdFailed.removeClass(gray);
+			$thirdFailed.addClass(red);
+		} else {
+			$thirdFailed.removeClass(red);
+			$thirdFailed.addClass(gray);
+		}
+
+		if (pwdCheck) {
+			$firstFailed.hide();
+			$secondFailed.hide();
+			$thirdFailed.hide();
+			$avlPwd.show();
+			checkPwd = true;
+		} else {
+			$firstFailed.show();
+			$secondFailed.show();
+			$thirdFailed.show();
+			$avlPwd.hide();
+			checkPwd = false;
+		}
+
+		if (!gagajf.isNull(confirmPassword)) {
+			fnCheckConfirmPassword();
+		}
 
-			$(document).on("click", "#btn_password_confirm", function(){
-				mcxDialog.alert("비밀번호가 변경되었습니다.", {
-						//alert("기존 비밀번호를 입력해주세요.") : 기존 비밀번호를 입력하지 않은 경우
-						//alert("신규 비밀번호를 입력해주세요.") : 신규 비밀번호를 입력하지 않은 경우
-						//alert("비밀번호가 일치하지 않습니다. 다시 확인해주세요.") : 입력한 비밀번호가 일치하지 않는 경우
-					sureBtnText: "확인",  // Confirmation button text
-				});
+	};
+
+	// 비밀번호체크
+	var fnCheckConfirmPassword = function () {
+		const $misPwd = $('#misPwd');
+		const $avlConPwd = $('#avlConPwd');
+		const $btnSavePassword = $('#btnSavePassword');
+		let password = $('#pwdModifyForm input[name=passwd]').val();
+		let confirmPassword = $('#pwdModifyForm input[name=confirmPassword]').val();
+
+		let sameConfirmPwd = fnValidationPwdSameConfirmPwd(password, confirmPassword);
+
+		if (sameConfirmPwd) {
+			$avlConPwd.show();
+			$misPwd.hide();
+			checkConfirmPwd = true;
+			//$btnSavePassword.attr('disabled', false);
+		} else {
+			$misPwd.show();
+			$avlConPwd.hide();
+			checkConfirmPwd = false;
+			//$btnSavePassword.attr('disabled', true);
+		}
+
+	};
+
+	// 패스워드 저장
+	$('#btnSavePassword').on('click', function () {
+		let pwdModifyForm = $('#pwdModifyForm').serializeObject();
+
+		if (gagajf.isNull(pwdModifyForm.orgPasswd)) {
+			mcxDialog.alert('기존 비밀번호 입력해주세요.');
+			return;
+		}
+
+		if (gagajf.isNull(pwdModifyForm.passwd)) {
+			mcxDialog.alert('신규 비밀번호를 입력해주세요.');
+			return;
+		}
+
+		if (gagajf.isNull(pwdModifyForm.confirmPassword)) {
+			mcxDialog.alert('신규 비밀번호 확인을 입력해주세요.');
+			return;
+		}
+
+		if (!checkPwd) {
+			mcxDialog.alert('유효하지 않은 신규 비밀번호 입니다.');
+			return;
+		}
+
+		if (!checkConfirmPwd) {
+			mcxDialog.alert('유효하지 않은 신규 비밀번호 입니다.');
+			return;
+		}
+
+		if (pwdModifyForm.passwd !== pwdModifyForm.confirmPassword) {
+			mcxDialog.alert('신규 비밀번호가 일치하지 않습니다. 다시 확인해주세요.');
+			return;
+		}
+
+		fnCheckPassword();
+		fnCheckConfirmPassword();
+		let jsonData = JSON.stringify(pwdModifyForm);
+		gagajf.ajaxJsonSubmit('/mypage/password/change', jsonData, fnChangePasswordCallback);
+	});
+
+	var fnChangePasswordCallback = function (result) {
+		if (result.isSuccess) {
+			mcxDialog.alertC("비밀번호가 변경되었습니다.", {
+				sureBtnText: "확인",
+				sureBtnClick: function() {
+					$.modal.close();
+				}
 			});
+		} else {
+			if (result.resultType === 'WRONG_PWD') {
+				mcxDialog.alert('기존 비밀번호가 일치하지 않습니다. 다시 확인해주세요.');
+			}
+		}
+	};
+
 
-			/* 210409_추가 : alert 모음 */
-		})
-	</script>
-	<!-- //210407_비밀번호 변경 팝업 스크립트 -->
-</th:block>
-</body>
+	/*]]>*/
+</script>
 </html>

src/main/webapp/WEB-INF/views/web/customer/DormantCertifyFormWeb.html

@@ -61,10 +61,11 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 	// 나이스 본인인증 후 콜백
-	var fnNiceCallBack = function(encData) {
+	var fnNiceCallBack = function(encData, authMethod) {
 		if (!gagajf.isNull(encData)) {
 			let custInfo = {};
 			custInfo.encData = encData;
+			custInfo.authMethod = authMethod;
 			let jsonData = JSON.stringify(custInfo);
 			gagajf.ajaxJsonSubmit('/customer/dormant/release', jsonData, fnRelaseCallback);
 		}

src/main/webapp/WEB-INF/views/web/mypage/MypageCustPwdModifyFormWeb.html

@@ -51,7 +51,7 @@
 							<!-- 사용가능한 비밀번호일경우 -->
 							<p id="avlPwd" class="hide">
 								<span class="c_black2">
-									<i class="ico ico_check black"></i>사용 가능한 비밀번호입니다
+									<i class="ico ico_check black"></i>사용 가능한 비밀번호입니다.
 								</span>
 							</p>
 							<!-- //사용가능한 비밀번호일경우 -->

src/main/webapp/WEB-INF/views/web/mypage/MypageReviewCreateFormWeb.html

@@ -382,6 +382,7 @@
 let reviewList = [[${reviewInfo}]];
 let reviewStat = [[${reviewStat}]];
 let reviewAttach = [[${alreadyReviewAttach}]];
+console.log(reviewAttach);
 let reviewUrl =[[${@environment.getProperty('upload.image.view')}]];
 // 별점 class="on"
 var $starEls = $('#star button#starBtn');
@@ -523,36 +524,33 @@ var reviewUpdate = function() {
 }
 var fnSaveCallback = function (result) {
 	if(result.status == "200"){
-		if (document.getElementById("kufKey1")==null && document.getElementById("orgFileNm1")==null) {
-			mcxDialog.confirm("상품리뷰를 등록 하였습니다. 150P 적립 예정입니다.", {
+		if (document.getElementsByName("kufKeyArr").length>0 || document.getElementsByName("orgFileNmArr").length>0) {
+			mcxDialog.confirm("상품리뷰를 등록 하였습니다. 350P 적립 예정입니다.", {
 				sureBtnText: "확인",
 				sureBtnClick: function() { 
 					cfnGoToPage(_PAGE_MYPAGE_REVIEW);
 				}
 			});
 		}else{
-			mcxDialog.confirm("상품리뷰를 등록 하였습니다. 350P 적립 예정입니다.", {
+			mcxDialog.confirm("상품리뷰를 등록 하였습니다. 150P 적립 예정입니다.", {
 				sureBtnText: "확인",
 				sureBtnClick: function() { 
 					cfnGoToPage(_PAGE_MYPAGE_REVIEW);
 				}
 			});
 		}
-		
-	
 	}
 }
 
 var fnUpdateCallback = function (result) {
 	if(result.status == "200"){
-		if (document.getElementById("kufKey1")==null && document.getElementById("orgFileNm1")==null) {
-			mcxDialog.confirm("상품 리뷰를 수정하였습니다.", {
-				sureBtnText: "확인",
-				sureBtnClick: function() { 
-					cfnGoToPage(_PAGE_MYPAGE_REVIEW);
-				}
-			});
-		}
+		mcxDialog.confirm("상품 리뷰를 수정하였습니다.", {
+			sureBtnText: "확인",
+			sureBtnClick: function() { 
+				cfnGoToPage(_PAGE_MYPAGE_REVIEW);
+			}
+		}); 
+		
 	}
 }
 
@@ -577,6 +575,16 @@ var fnChooseFile = function(obj) {
 	
 	// multiple 속성이 있으면 files에는 다수의 객체가 할당됨
 	var file = obj.files[0];
+	
+/* 	if (!gagajf.isNull(file.size) && Number(file.size) > (10 * 1000000)) {        
+		mcxDialog.alertC('이미지는 최대 10MB 이하 파일만 가능합니다.', {                          
+			sureBtnText: "확인",                                                    
+			sureBtnClick: function() {                                            
+				$(obj).parent('.imgUpload').find('.removes').trigger('click');    
+			}                                                                     
+		});                                                                       
+		return false;                                                             
+	}                 */                                                             
 
 	if (!gagajf.isNull(file.name)) {
 		var extension = "\.(jpg|jpeg|png)$";
@@ -605,15 +613,7 @@ var fnChooseFile = function(obj) {
 		}
 	}
 	// 이거 왜 안먹히지 
-//	if (!gagajf.isNull(file.size) && Number(file.size) > (10 * 1000000)) {
-//		mcxDialog.alertC('이미지는 최대 10MB 이하 파일만 가능합니다.', {
-//			sureBtnText: "확인",
-//			sureBtnClick: function() {
-//				$(obj).parent('.imgUpload').find('.removes').trigger('click');
-//			}
-//		});
-//		return false;
-//	} 
+
 	
 	// 파일 업로드
 /* 	 gagajf.ajaxFileUpload('/common/file/upload?subDir=/review'
@@ -693,20 +693,23 @@ $(document).ready(function() {
 		
 		if(reviewAttach.length>0){
 			for (var i = 0; i < reviewAttach.length; i++) {
-				if(reviewAttach[i].fileGb == "I"){
-					$("<span class=\"pics\">" +
-							"<img class=\"picsThumbs\" src=\"" + reviewUrl + '/' + reviewAttach[i].sysFileNm + "\" />" +
-							"<input type='hidden' name='orgFileNmArr' value='"+reviewAttach[i].orgFileNm+"'>" +
-							"<input type='hidden' name='sysFileNmArr' value='"+reviewAttach[i].sysFileNm+"'>" +
-							"<br/><span class=\"removes\">Removes image</span>" +
-							"</span>").insertAfter("#fileAdd");
-				}else{
-					$("<span class=\"pics\">" +
-							"<img class=\"picsThumbs\" src=\"" + _kollusMediaUrl + '/' + attachList[i].kmcKey + "\" />" +
-							"<input type='hidden' name='kufKeyArr' value='" + attachList[i].kmcKey + "'>" + 
-							"<br/><span class=\"removes\">Removes image</span>" +
-							"</span>").insertAfter("#fileAdd");
+				if(reviewAttach[i].reviewSq == reviewList.reviewSq){
+					if(reviewAttach[i].fileGb == "I"){
+						$("<span class=\"pics\">" +
+								"<img class=\"picsThumbs\" src=\"" + reviewUrl + '/' + reviewAttach[i].sysFileNm + "\" />" +
+								"<input type='hidden' name='orgFileNmArr' value='"+reviewAttach[i].orgFileNm+"'>" +
+								"<input type='hidden' name='sysFileNmArr' value='"+reviewAttach[i].sysFileNm+"'>" +
+								"<br/><span class=\"removes\">Removes image</span>" +
+								"</span>").insertAfter("#fileAdd");
+					}else{
+						$("<span class=\"pics\">" +
+								"<img class=\"picsThumbs\" src=\"" + _kollusMediaUrl + '/' + attachList[i].kmcKey + "\" />" +
+								"<input type='hidden' name='kufKeyArr' value='" + attachList[i].kmcKey + "'>" + 
+								"<br/><span class=\"removes\">Removes image</span>" +
+								"</span>").insertAfter("#fileAdd");
+					}
 				}
+				
 			}
 			$(".removes").click(function(){
 				$(this).parent(".pics").remove();

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

@@ -33,24 +33,24 @@
                         <h3>총알배송</h3>
                     </div>
 				</div>
-				<div class="cont_body" th:utext="${#strings.replace(#strings.replace(shotHtml.fsrcPc,'<','<'),'>','>')}">
-                     <div class="bulletship">
-                        <div class="bulletship_head">
+				<div class="cont_body">
+				    <div class="bulletship">
+						<div class="bulletship_head">
                             <img src="/images/pc/thumb/bullet_bg1.png" alt="10시까지 주문하면 당일도착">
                         </div>
                         <div class="bulletship_body" id="shotHtml">
                          			<!--   비로그인 상태 or 로그인을 했지만 주소정보를 못 가져오는 경우 -->
-                            <div class="txt_result">
+                       <!--     <div class="txt_result">
                                 <p>오전10시 이전 주문 당일도착</p>
                                 <p><span>총알배송이 가능한 지역</span>인지<br>확인해보세요!</p>
                                 <div class="bulletshop_btn">
                                     <button type="button" class="btn btn_default btn_block"><span>내 배송지 확인하기</span></button>
                                 </div>
-                                <p>서울&middot;경기&middot;인천 중 일부지역은 총알배송이 불가합니다.</p>
-                            </div>
+                                <p>서울·경기·인천 중 일부지역은 총알배송이 불가합니다.</p>
+                            </div> -->
                             		<!-- 비로그인 상태 or 로그인을 했지만 주소정보를 못 가져오는 경우 -->                      
                         </div>
-                        <div class="bulletship_foot">
+                        <div class="bulletship_foot"><div class="bulletship_foot"><br></div></div><div class="bulletship_foot"><br></div><div class="bulletship_foot">
                             <img src="/images/pc/thumb/bullet_bg2.png" alt="주문/도착, 배송일, 대상상품">
                         </div>
                     </div> 

src/main/webapp/ux/style24_link.js

@@ -833,13 +833,21 @@ function cfnConsentUseInfo(custNm) {
  * </pre>
  */
 function cfnPasswordModify() {
-	let str = '<div class="modal fade pswordModify_pop" id="pswordModifyPop" tabindex="-1" role="dialog" aria-labelledby="pswordModifyLabel" aria-hidden="true"></div>';
+	let str;
+	if (_frontGb === 'P') {
+		str = '<div class="modal fade pswordModify_pop" id="pswordModifyPop" tabindex="-1" role="dialog" aria-labelledby="pswordModifyLabel" aria-hidden="true"></div>';
+	} else {
+		str = '<div class="modal pop_full password_change_pop" id="pswordModifyPop" tabIndex="-1" role="dialog" aria-labelledby="pswordModifyPop" aria-hidden="true"></div>';
+	}
 
 	if ($('#pswordModifyPop').length == 0) {
 		$('body').append(str);
+		cfOpenLayer(_PAGE_PASSWORD_MODIFY, 'pswordModifyPop');
+	} else {
+		$('#pswordModifyPop').modal("show");
 	}
 
-	cfOpenLayer(_PAGE_PASSWORD_MODIFY, 'pswordModifyPop');
+
 }
 
 /**
@@ -851,7 +859,13 @@ function cfnPasswordModify() {
  * </pre>
  */
 function cfnUseTermsLayer() {
-	let str = '<div class="modal fade policiesTerms_pop" id="policiesTermsPop" tabindex="-1" role="dialog" aria-labelledby="policiesTermsLabel" aria-hidden="true"></div>';
+	let str;
+	if (_frontGb === 'P') {
+		str = '<div class="modal fade policiesTerms_pop" id="policiesTermsPop" tabindex="-1" role="dialog" aria-labelledby="policiesTermsLabel" aria-hidden="true"></div>';
+	}  else {
+		str = '<div class="modal pop_full fade" id="policiesTermsPop" tabindex="-1" role="dialog" aria-labelledby="policiesTermsLabel" aria-hidden="true"></div>';
+	}
+
 	if ($('#policiesTermsPop').length == 0) {
 		$('body').append(str);
 	}
@@ -861,13 +875,18 @@ function cfnUseTermsLayer() {
 /**
  * @type   : function
  * @access : public
- * @desc   : 개인정보취급방침 레이어
+ * @desc   : 개인정보취급방침
  * <pre>
  *		cfnPrivacyPolicyLayer();
  * </pre>
  */
 function cfnPrivacyPolicyLayer() {
-	let str = '<div class="modal fade policiesPrivacy_pop" id="policiesPrivacyPop" tabindex="-1" role="dialog" aria-labelledby="policiesPrivacyLabel" aria-hidden="true"></div>';
+	let str;
+	if (_frontGb === 'P') {
+		str = '<div class="modal fade policiesPrivacy_pop" id="policiesPrivacyPop" tabindex="-1" role="dialog" aria-labelledby="policiesPrivacyLabel" aria-hidden="true"></div>';
+	} else {
+		str = '<div class="modal pop_full fade" id="policiesPrivacyPop" tabindex="-1" role="dialog" aria-labelledby="policiesPrivacyLabel" aria-hidden="true"></div>'
+	}
 	if ($('#policiesPrivacyPop').length == 0) {
 		$('body').append(str);
 	}
@@ -883,7 +902,13 @@ function cfnPrivacyPolicyLayer() {
  * </pre>
  */
 function cfnPrivacyTrustLayer() {
-	let str = '<div class="modal fade trustPrivacy_pop" id="trustPrivacyPop" tabindex="-1" role="dialog" aria-labelledby="trustPrivacyLabel" aria-hidden="true"></div>';
+	let str;
+	if (_frontGb === 'P') {
+		str = '<div class="modal fade trustPrivacy_pop" id="trustPrivacyPop" tabindex="-1" role="dialog" aria-labelledby="trustPrivacyLabel" aria-hidden="true"></div>';
+	} else {
+		str = '<div class="modal pop_full fade" id="trustPrivacyPop" tabindex="-1" role="dialog" aria-labelledby="trustPrivacyLabel" aria-hidden="true"></div>';
+	}
+
 	if ($('#trustPrivacy_pop').length == 0) {
 		$('body').append(str);
 	}