jsh77b 4 лет назад
Родитель
Сommit
96976bd08c

+ 1 - 1
src/main/java/com/style24/persistence/mybatis/shop/TsfNotice.xml

@@ -38,7 +38,7 @@
 		     , NOTICE_CONTENT                                /*공지내용*/
 		     , URGENT_YN                                     /*긴급여부*/
 		     , READ_CNT                                      /*조회수*/
-		     , DATE_FORMAT(REG_DT,'%Y.%m.%d')    AS REG_DT   /*등록일자*/
+		     , DATE_FORMAT(REG_DT,'%Y%m%d')    AS REG_DT     /*등록일자*/
 		     , (SELECT COUNT(1)
 		        FROM   TB_NOTICE_FILE
 		        WHERE  NOTICE_SQ = A.NOTICE_SQ

+ 3 - 1
src/main/webapp/WEB-INF/views/mob/callcenter/NoticeFormMob.html

@@ -95,7 +95,9 @@
 				tag += '	</div>\n';
 				tag += '	<div class="fold_cont">\n';
 				tag += '		<div class="fold_answer">\n';
-				tag += '			<div class="answer_body">' + item.noticeContent.replaceAll('&lt;','<').replaceAll('&gt;', '>').replaceAll('&quot;', '"') + '</div>\n';
+				
+				// 2021.08.13 &nbsp; 제거
+				tag += '			<div>' + item.noticeContent.replaceAll('&lt;','<').replaceAll('&gt;', '>').replaceAll('&quot;', '"').replaceAll('&amp;nbsp;', ' ') + '</div>\n';
 				tag += '		</div>\n';
 				tag += '	</div>\n';
 				tag += '</li>\n';

+ 7 - 3
src/main/webapp/WEB-INF/views/mob/mypage/MypageGiftcardFormMob.html

@@ -114,13 +114,15 @@ function appendYear() {
 }
 appendYear($("#month"));
 
-//사용내역 조회
+// 사용내역 조회
 $("#SearchUseGiftcard").click(function() {
 	// class제거 추가
 	$("#SearchOwnGiftcard").removeClass("active");
 	$("#SearchUseGiftcard").addClass("active");
 	$("#giftcardList").attr("class", "tab_cont active");
-	$(".select_box").show();
+	
+	// 2021.08.13 날짜 선택박스 활성화 처리
+	$(".select_box select").removeAttr("disabled");
 
 	// 날짜 필드 
 	$("#dateField").css("display", "block");
@@ -197,7 +199,9 @@ $("#SearchOwnGiftcard").click(function() {
 	$("#SearchUseGiftcard").removeClass("active");
 	$("#SearchOwnGiftcard").addClass("active");
 	$("#giftcardList").attr("class", "tab_cont active");
-	$(".select_box").hide();
+	
+	// 2021.08.13 날짜 선택박스 disabled 처리
+	$(".select_box select").attr("disabled","disabled");
 
 	let data = {};
 

+ 3 - 1
src/main/webapp/WEB-INF/views/web/callcenter/NoticeFormWeb.html

@@ -127,7 +127,9 @@
 				tag += '	</div>\n';
 				tag += '	<div class="fold_cont" style="display: none;">\n';
 				tag += '		<div class="fold_detail">\n';
-				tag += '			<div>' + item.noticeContent.replaceAll('&lt;','<').replaceAll('&gt;', '>').replaceAll('&quot;', '"') + '</div>\n';
+				
+				// 2021.08.13 &nbsp; 제거
+				tag += '			<div>' + item.noticeContent.replaceAll('&lt;','<').replaceAll('&gt;', '>').replaceAll('&quot;', '"').replaceAll('&amp;nbsp;', ' ') + '</div>\n';
 				tag += '		</div>\n';
 				tag += '	</div>\n';
 				tag += '</li>\n';