Merge branch 'eskim' into develop

src/main/webapp/WEB-INF/views/mob/goods/CardPrmtFormMob.html

@@ -41,7 +41,10 @@
 											</th:block>
 											<th:block th:unless="${cardInfo.dcGb == '3'}">
 											<p th:text="${#numbers.formatInteger(cardInfo.dcVal, 0,'COMMA')+ cardInfo.dcWayNm + ' ' + cardInfo.prmtGbNm}">5% 즉시할인</p>
-											<p th:text="${#numbers.formatInteger(cardInfo.minPayAmt, 0,'COMMA')  + '원 이상 구매 시 최대 ' + #numbers.formatInteger(cardInfo.maxDcAmt, 0,'COMMA') + '원 할인 '}">7만원 이상 구매 시 최대 5만원 할인</p>
+											<p>
+											<th:block th:text="${#numbers.formatInteger(cardInfo.minPayAmt, 0,'COMMA')  + '원 이상 구매 시'}"></th:block><br/>
+											<th:block th:text="${'최대 ' + #numbers.formatInteger(cardInfo.maxDcAmt, 0,'COMMA') + '원 할인 '}"></th:block>
+											</p>
 											</th:block>
 											<th:block th:if="${not #strings.isEmpty(cardInfo.linkUrl)}"><a th:href="${cardInfo.linkUrl}" target="_blank" class="link" >자세히보기</a></th:block>
 										</div>

src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDescFormMob.html

@@ -365,7 +365,7 @@
 	
  //상품상세 적용
 	// 입점 html 에 태그가 정상적이지 않아 스크립트로 처리
-	let goodsDesc = [[${goodsInfo.goodsDesc}]];
+	var goodsDesc = [[${goodsInfo.goodsDesc}]];
 	if ("N" == [[${goodsInfo.tobeFormYn}]] && !gagajf.isNull(goodsDesc)){
 		$('#goodsDescHtml').html([[${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}]]);
 	}

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

@@ -167,7 +167,7 @@
 		<div>
 			<!-- 구매하기팝업 -->
 			<div class="btPop btPopAuto pd_pop Purchase_pop" id="btPopAuto_back">
-				<a class="btn btPop_close">Close </a>
+				<a href="javascript:void(0);"  class="btn btPop_close">Close </a>
 				<div class="header btPop_head btPopAuto_head">
 					구매하기팝업
 				</div>

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

@@ -2365,7 +2365,7 @@
 		
 		//상품상세 적용
 		// 입점 html 에 태그가 정상적이지 않아 스크립트로 처리
-		let goodsDesc = [[${goodsInfo.goodsDesc}]];
+		var goodsDesc = [[${goodsInfo.goodsDesc}]];
 		if ("N" == [[${goodsInfo.tobeFormYn}]] && !gagajf.isNull(goodsDesc)){
 			$('#goodsDescHtml').html([[${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}]]);
 		}

src/main/webapp/WEB-INF/views/web/goods/GoodsReviewDetailFormWeb.html

@@ -85,7 +85,7 @@
 					});	
 				}else{
 				tag +='		<span class="thumb">\n';
-				tag +='			<img src="'+_uploadGoodsUrl +'/'+review.sysImgNm+'?RS=365" alt="" onerror="' + _uximgUrl + '/images/pc/thumb/bg_item_none.png"  />\n';
+				tag +='			<img src="'+_uploadGoodsUrl +'/'+review.sysImgNm+'?RS=545" alt="" onerror="' + _uximgUrl + '/images/pc/thumb/bg_item_none.png"  />\n';
 				tag +='		</span>\n';	
 				}
 				tag +='	</div>\n';