Преглед изворни кода

Merge branch 'jsshin' into develop

jsshin пре 4 година
родитељ
комит
1d8f5e183e

+ 6 - 4
src/main/webapp/WEB-INF/views/mob/planning/PlanningCustGradeBenefitFormMob.html

@@ -2,7 +2,7 @@
 <html lang="ko"
 	xmlns:th="http://www.thymeleaf.org"
 	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
-	layout:decorator="mob/common/layout/DefaultLayoutMob">
+	layout:decorator="mob/common/layout/SubLayoutMob">
 <!--
  *******************************************************************************
  * @source  : PlanningCustGradeBenefitFormMob.html
@@ -295,6 +295,7 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
  	let exptCustGradeMap = [[${exptCustGradeMap}]];
+ 	let customerInfo = [[${customerInfo}]];
 	let isLogin = [[${isLogin}]];
 
  	var fnInit = function () {
@@ -346,10 +347,10 @@
 		$vipGrade.hide();
 
 		if (remnantBuyAmt > 0) {
-			$realOrdAmtSpan.show()
+			$realOrdAmtSpan.show();
 			$realOrdAmt.text(remnantBuyAmt.addComma()+'원');
 		} else {
-			$realOrdAmtSpan.hide()
+			$realOrdAmtSpan.hide();
 		}
 
 		if (remnantBuyCnt > 0) {
@@ -367,7 +368,7 @@
 
 	// 기존 VIP / 새로운 VIP 구분
 	var fnDisplayVipText = function (expctCustGrade) {
- 		let custGradeNm = [[${customerInfo.custGradeNm}]];
+ 		let custGradeNm = customerInfo.custGradeNm;
 		let $etcGrade = $('#etcGrade');
 		let $sameVipGrade = $('#sameVipGrade');
 		let $vipGrade = $('#vipGrade');
@@ -401,6 +402,7 @@
 	}
 
 	$(document).ready(function() {
+		$('#htopTitle').text('회원등급혜택');
 		if (isLogin) {
 			fnInit();
 		}

+ 5 - 4
src/main/webapp/WEB-INF/views/web/planning/PlanningCustGradeBenefitFormWeb.html

@@ -267,7 +267,8 @@
 
 <script th:inline="javascript">
 /*<![CDATA[*/
-	let exptCustGradeMap = [[${exptCustGradeMap}]]
+	let exptCustGradeMap = [[${exptCustGradeMap}]];
+	let customerInfo = [[${customerInfo}]];
 	let isLogin = [[${isLogin}]];
 
  	var fnInit = function () {
@@ -319,10 +320,10 @@
 		$vipGrade.hide();
 
 		if (remnantBuyAmt > 0) {
-			$realOrdAmtSpan.show()
+			$realOrdAmtSpan.show();
 			$realOrdAmt.text(remnantBuyAmt.addComma()+'원');
 		} else {
-			$realOrdAmtSpan.hide()
+			$realOrdAmtSpan.hide();
 		}
 
 		if (remnantBuyCnt > 0) {
@@ -340,7 +341,7 @@
 
 	// 기존 VIP / 새로운 VIP 구분
 	var fnDisplayVipText = function (expctCustGrade) {
- 		let custGradeNm = [[${customerInfo.custGradeNm}]];
+ 		let custGradeNm = customerInfo.custGradeNm;
 		let $etcGrade = $('#etcGrade');
 		let $sameVipGrade = $('#sameVipGrade');
 		let $vipGrade = $('#vipGrade');