Merge branch 'develop' into bin2107

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/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,16 @@
 	$("#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;', '"'));
+				 $("html, body").animate({scrollTop : $(".modal-header").outerHeight()},100)
+			}
+		});
+	};
 	//약관내부링크
 	$(function(){
 		$(".hook_list ul li a").on("click", function(){

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

@@ -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 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;}
+.ps#prvc_sel ol li {line-height: 2.6rem;}
+.ps#prvc_sel {margin-bottom: 5.0rem;}
 
 .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;}