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

Merge remote-tracking branch 'origin/develop' into jsh77b

jsh77b 4 лет назад
Родитель
Сommit
71d7c314b4

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/cart/CartListFormMob.html

@@ -415,7 +415,7 @@
 <!--위 스크립트를 통해 설정된 전환값과 본 페이지의 로그를 서버에 전송-->
 <script th:inline="javascript">
 	if (!wcs_add) var wcs_add = {};
-	wcs_add["wa"] = [[${@environment.getProperty('naverPay.common.certification.key')}]];
+	wcs_add["wa"] = "[[${@environment.getProperty('naverPay.common.certification.key')}]]";
 	if (!_nasa) var _nasa = {};
 	if (window.wcs) {
 		wcs.inflow("style24.com");

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/common/fragments/FooterMob.html

@@ -790,7 +790,7 @@ $("#daumZipcodePop_close").on("click", function(){
 <script type="text/javascript" src="//wcs.naver.net/wcslog.js"> </script>
 <script type="text/javascript">
  	if (!wcs_add) var wcs_add={};
- 	wcs_add["wa"] = [[${@environment.getProperty('naverPay.common.certification.key')}]];
+ 	wcs_add["wa"] = "[[${@environment.getProperty('naverPay.common.certification.key')}]]";
  	if (!_nasa) var _nasa={};
  	if(window.wcs){
  		wcs.inflow("style24.com");

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/customer/JoinCompleteFormMob.html

@@ -171,7 +171,7 @@ var _nasa={};
 if (window.wcs) _nasa["cnv"] = wcs.cnv("2","0");
 
 if (!wcs_add) var wcs_add = {};
-wcs_add["wa"] = [[${@environment.getProperty('naverPay.common.certification.key')}]];
+wcs_add["wa"] = "[[${@environment.getProperty('naverPay.common.certification.key')}]]";
 if (!_nasa) var _nasa = {};
 if (window.wcs) {
 	wcs.inflow("style24.com");

+ 2 - 2
src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDetailFormMob.html

@@ -202,7 +202,7 @@
 
 									<script th:inline="javascript">
 										if(!wcs_add) var wcs_add = {};
-										wcs_add["wa"] = [[${@environment.getProperty('naverPay.common.certification.key')}]];
+										wcs_add["wa"] = "[[${@environment.getProperty('naverPay.common.certification.key')}]]";
 										wcs.inflow("style24.com");
 										wcs_do();
 									</script>
@@ -1724,7 +1724,7 @@
 <!-- 네이버페이 랜딩페이지 -->
 <script th:inline="javascript">
 	if(!wcs_add) var wcs_add = {};
-	wcs_add["wa"] = [[${@environment.getProperty('naverPay.common.certification.key')}]];
+	wcs_add["wa"] = "[[${@environment.getProperty('naverPay.common.certification.key')}]]";
 	wcs.inflow("style24.com");
 	wcs_do();
 </script>

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -1079,7 +1079,7 @@
 
 								<script th:inline="javascript">
 									if(!wcs_add) var wcs_add = {};
-									wcs_add["wa"] = [[${@environment.getProperty('naverPay.common.certification.key')}]];
+									wcs_add["wa"] = "[[${@environment.getProperty('naverPay.common.certification.key')}]]";
 									wcs.inflow("style24.com");
 									wcs_do();
 								</script>

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/order/OrderCompleteMob.html

@@ -579,7 +579,7 @@ x = document.getElementsByTagName('script')[0]; x.parentNode.insertBefore(s, x);
 <!--위 스크립트를 통해 설정된 전환값과 본 페이지의 로그를 서버에 전송-->
 <script th:inline="javascript">
 	if (!wcs_add) var wcs_add = {};
-	wcs_add["wa"] = [[${@environment.getProperty('naverPay.common.certification.key')}]];
+	wcs_add["wa"] = "[[${@environment.getProperty('naverPay.common.certification.key')}]]";
 	if (!_nasa) var _nasa = {};
 	if (window.wcs) {
 		wcs.inflow("style24.com");

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

@@ -168,7 +168,7 @@
 							th:with="stylelUrl=${@environment.getProperty('domain.front')},  planView=${@environment.getProperty('upload.image.view')}">
 							<span>
 								<button type="button" id="kakao-link-btn" class="kk"
-									th:attr="onclick=|cfnSendToKakaoMob('${stylelUrl+'/planning/detail/form?planSq='+planInfo.planSq}', '${planInfo.planNm}', '${planView+ '/'+planInfo.mainMimg}');|">
+									th:attr="onclick=|cfnSendToKakao('${stylelUrl+'/planning/detail/form?planSq='+planInfo.planSq}', '${planInfo.planNm}', '${planView+ '/'+planInfo.mainMimg}');|">
 									<span>카카오톡</span>
 								</button>
 								<button type="button" class="fb"

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/planning/PlanningEventPollFormMob.html

@@ -213,7 +213,7 @@
 							th:with="stylelUrl=${@environment.getProperty('domain.front')},  planView=${@environment.getProperty('upload.image.view')}">
 							<span>
 								<button type="button" id="kakao-link-btn" class="kk"
-									th:attr="onclick=|cfnSendToKakaoMob('${stylelUrl+'/planning/detail/form?planSq='+pollInfo.planSq}', '${pollInfo.planNm}', '${planView+ '/'+pollInfo.mainMimg}');|">
+									th:attr="onclick=|cfnSendToKakao('${stylelUrl+'/planning/detail/form?planSq='+pollInfo.planSq}', '${pollInfo.planNm}', '${planView+ '/'+pollInfo.mainMimg}');|">
 									<span>카카오톡</span>
 								</button>
 								<button type="button" class="fb"

+ 1 - 1
src/main/webapp/WEB-INF/views/web/cart/CartListFormWeb.html

@@ -309,7 +309,7 @@
 <!--위 스크립트를 통해 설정된 전환값과 본 페이지의 로그를 서버에 전송-->
 <script th:inline="javascript">
 	if (!wcs_add) var wcs_add = {};
-	wcs_add["wa"] = [[${@environment.getProperty('naverPay.common.certification.key')}]];
+	wcs_add["wa"] = "[[${@environment.getProperty('naverPay.common.certification.key')}]]";
 	if (!_nasa) var _nasa = {};
 	if (window.wcs) {
 		wcs.inflow("style24.com");

+ 1 - 1
src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -1450,7 +1450,7 @@ $("#daumZipcodePop_close").on("click", function(){
 <script type="text/javascript" src="//wcs.naver.net/wcslog.js"> </script>
 <script type="text/javascript">
  	if (!wcs_add) var wcs_add={};
- 	wcs_add["wa"] = [[${@environment.getProperty('naverPay.common.certification.key')}]];
+ 	wcs_add["wa"] = "[[${@environment.getProperty('naverPay.common.certification.key')}]]";
  	if (!_nasa) var _nasa={};
  	if(window.wcs){
  		wcs.inflow("style24.com");

+ 1 - 1
src/main/webapp/WEB-INF/views/web/customer/JoinCompleteFormWeb.html

@@ -113,7 +113,7 @@ var _nasa={};
 if (window.wcs) _nasa["cnv"] = wcs.cnv("2","0");
 
 if (!wcs_add) var wcs_add = {};
-wcs_add["wa"] = [[${@environment.getProperty('naverPay.common.certification.key')}]];
+wcs_add["wa"] = "[[${@environment.getProperty('naverPay.common.certification.key')}]]";
 if (!_nasa) var _nasa = {};
 if (window.wcs) {
 	wcs.inflow("style24.com");

+ 1 - 1
src/main/webapp/WEB-INF/views/web/goods/GoodsDealDetailFormWeb.html

@@ -274,7 +274,7 @@
 									<th:block th:with="buttonKey=${@environment.getProperty('naverPay.button.key')}">
 										<script th:inline="javascript">
 											if(!wcs_add) var wcs_add = {};
-											wcs_add["wa"] = [[${@environment.getProperty('naverPay.common.certification.key')}]];
+											wcs_add["wa"] = "[[${@environment.getProperty('naverPay.common.certification.key')}]]";
 											wcs.inflow("style24.com");
 											wcs_do();
 										</script>

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

@@ -393,7 +393,7 @@
 
 										<script th:inline="javascript">
 											if(!wcs_add) var wcs_add = {};
-											wcs_add["wa"] = [[${@environment.getProperty('naverPay.common.certification.key')}]];
+											wcs_add["wa"] = "[[${@environment.getProperty('naverPay.common.certification.key')}]]";
 											wcs.inflow("style24.com");
 											wcs_do();
 										</script>

+ 1 - 1
src/main/webapp/WEB-INF/views/web/order/OrderCompleteWeb.html

@@ -478,7 +478,7 @@ x = document.getElementsByTagName('script')[0]; x.parentNode.insertBefore(s, x);
 <!--위 스크립트를 통해 설정된 전환값과 본 페이지의 로그를 서버에 전송-->
 <script th:inline="javascript">
 	if (!wcs_add) var wcs_add = {};
-	wcs_add["wa"] = [[${@environment.getProperty('naverPay.common.certification.key')}]];
+	wcs_add["wa"] = "[[${@environment.getProperty('naverPay.common.certification.key')}]]";
 	if (!_nasa) var _nasa = {};
 	if (window.wcs) {
 		wcs.inflow("style24.com");