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

Merge branch 'develop' of
http://112.172.147.34:4936/style24/style24.front.git into develop

gagamel 5 лет назад
Родитель
Сommit
982c9bba76

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

@@ -95,7 +95,7 @@
 				tag += '	</div>\n';
 				tag += '	<div class="fold_cont">\n';
 				tag += '		<div class="fold_answer">\n';
-				tag += '			<div class="answer_body">' + item.noticeContent.escapeHtml() + '</div>\n';
+				tag += '			<div class="answer_body">' + item.noticeContent + '</div>\n';
 				tag += '		</div>\n';
 				tag += '	</div>\n';
 				tag += '</li>\n';

+ 0 - 112
src/main/webapp/WEB-INF/views/mob/customer/SupplyComanyLayerFormMob.html

@@ -1,112 +0,0 @@
-<!DOCTYPE html>
-<html lang="ko"
-	  xmlns:th="http://www.thymeleaf.org">
-<!--
- *******************************************************************************
- * @source  : SupplyComanyLayerFormMob.html
- * @desc    : 공급업체 리스트 page
- *============================================================================
- * STYLE24
- * Copyright(C) 2021 TSIT, All rights reserved.
- *============================================================================
- * VER  DATE         AUTHOR      DESCRIPTION
- * ===  ===========  ==========  =============================================
- * 1.0  2021.06.09   jsshin       최초 작성
- *******************************************************************************
- -->
-<div class="modal-dialog" role="document">
-	<div class="modal-content">
-		<div class="modal-header">
-			<h5 class="modal-title" id="exampleFullLabel">업체 리스트</h5>
-		</div>
-		<div class="modal-body">
-			<div class="pop_cont">
-				<!-- 컨텐츠 시작 -->
-				<div class="ps ptn">
-					<table>
-						<colgroup>
-							<col width="*">
-							<col width="30%">
-						</colgroup>
-						<thead>
-							<tr>
-								<th>업체명</th>
-								<th>대표자</th>
-							</tr>
-						</thead>
-						<tbody>
-							<tr>
-								<td>(enercircle)이너서클</td>
-								<td>최인석</td>
-							</tr>
-							<tr>
-								<td>(유)결피부과학연구소</td>
-								<td>이종주</td>
-							</tr>
-							<tr>
-								<td>(유)결피부과학연구소(중복)</td>
-								<td>이종주</td>
-							</tr>
-							<tr>
-								<td>(재)아름다운커피</td>
-								<td>심상달</td>
-							</tr>
-							<tr>
-								<td>(주)CJ오쇼핑</td>
-								<td>이해선</td>
-							</tr>
-							<tr>
-								<td>(주)IDSDK</td>
-								<td>유정현</td>
-							</tr>
-							<tr>
-								<td>(주)L&D코리아</td>
-								<td>심홍섭</td>
-							</tr>
-							<tr>
-								<td>(주)M.O.V</td>
-								<td>김맹규</td>
-							</tr>
-							<tr>
-								<td>(유)결피부과학연구소(중복)</td>
-								<td>이종주</td>
-							</tr>
-							<tr>
-								<td>(enercircle)이너서클</td>
-								<td>최인석</td>
-							</tr>
-						</tbody>
-					</table>
-					<div class="pager">
-						<ul class="pageNav">
-							<li class="prev disabled"><a href="#">‹</a></li>
-							<li class="active"><a href="#">02</a></li>
-							<li class="lastpage"><a href="#">10</a></li>
-							<li class="next"><a href="#">›</a></li>
-						</ul>
-					</div>
-				</div>
-				<!-- 컨텐츠 종료 -->
-			</div>
-		</div>
-	</div>
-</div>
-<script th:inline="javascript">
-/*<![CDATA[*/
-	$(document).ready(function() {
-		$("#supplyCompanyPop").modal({closeExisting: false});
-	});
-
-	//약관내부링크
-	$(function(){
-		$(".hook_list ul li a").on("click", function(){
-			var hookHeader = $(".modal-header").outerHeight() + 3000;
-			var hookHref = $(this).attr("href");
-			var hookPot = $(hookHref == "#" || hookHref == "" ? "body" : hookHref);
-			var hookPos = hookPot.offset().top - hookHeader;
-			$("html, body").animate({ scrollTop: hookPos }, 3000);
-		});
-	});
-/*]]>*/
-</script>
-</html>

+ 2 - 2
src/main/webapp/WEB-INF/views/mob/mypage/MypageOrderDetailFormMob.html

@@ -947,7 +947,7 @@
 				
 				gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 					cfnGoToPage(_PAGE_MYPAGE_ORDER_LIST);
-				});
+				}, true);
 			}
 		});
 	}
@@ -1006,7 +1006,7 @@
 
 		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 			cfnGoToPage(_PAGE_MYPAGE_ORDER_DETAIL + ordNo);
-		});
+		}, true);
 	}
 
 	// 전체구매확정 버튼 클릭 이벤트

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

@@ -284,8 +284,8 @@ var appendHtml = function () {
 
 		$("#monthTbody").append(html);
 		if (cfCheckLogin()) {
+			$('.day').html('<span>' + custAttendList.length + '</span>일');
 			$.each(custAttendList, function(idx1, item1) {
-				$('.day').html('<span>' + custAttendList.length + '</span>일');
 				if(item1.entryDt == item.sun || item1.entryDt == item.mon || item1.entryDt == item.tue|| item1.entryDt == item.wed
 						|| item1.entryDt == item.thu || item1.entryDt == item.fri || item1.entryDt == item.sat){
 					$("#td_"+item1.entryDt).attr("class","complete");
@@ -312,7 +312,7 @@ var fnInfoConfirmCallBack = function(result) {
 	mcxDialog.alert(result.msg);
 	appendHtml();
 	$("#td_"+date).attr("class","complete");
-	$('.day').html('<span>' + (custAttendList.length +1) + '</span>일');
+	$('.day').html('<span>' + result.custAttendList.length + '</span>일');
 	
 };
 
@@ -334,8 +334,9 @@ $(document).ready(function() {
 	
 	if (!cfCheckLogin()) {
 		$(".day").html("<span>0</span>일");
+		$("#td_"+date).attr("class","today");
 	}else{
-		$('.day').html('<span>' + (custAttendList.length +1) + '</span>일');
+		$('.day').html('<span>' + custAttendList.length + '</span>일');
 		$("#td_"+date).attr("class","today"); 
 		$.each(custAttendList, function(idx, item) {
 			if(item.entryDt == date){

+ 2 - 2
src/main/webapp/WEB-INF/views/web/display/CategoryMainFormWeb.html

@@ -81,7 +81,7 @@
 
 			<th:block th:if="${contentsLoc=='002'}">
 				<!-- 신상품 -->
-				<div class="content new_item" th:if="${newGoodsList != null}">
+				<div class="content new_item" th:if="${newGoodsList != null and !newGoodsList.empty}">
 					<div class="cont_head">
 						<h4 th:text="${contentsTitle}">신상품</h4>
 					</div>
@@ -118,7 +118,7 @@
 				<!-- //신상품 -->
 			</th:block>
 			<th:block th:if="${contentsLoc=='003'}">
-				<div class="content dp_best_list" th:if="${bestGoodsList != null}">
+				<div class="content dp_best_list" th:if="${bestGoodsList != null and !bestGoodsList.empty}">
 					<div class="cont_head">
 						<div>
 						<h4 th:text="${contentsTitle}">베스트</h4>

+ 2 - 2
src/main/webapp/WEB-INF/views/web/display/OutletMainFormWeb.html

@@ -85,7 +85,7 @@
 
 			<!-- MD 추천 아이템 -->
 			<th:block th:if="${contentsLoc=='002'}">
-			<div class="content md_item" th:if="${mdPickGoodsList != null}">
+			<div class="content md_item" th:if="${mdPickGoodsList != null and !mdPickGoodsList.empty}">
 				<div class="cont_head">
 					<h4 th:text="${contentsTitle}">MD가 추천하는 아울렛 아이템</h4>
 				</div>
@@ -126,7 +126,7 @@
 			<!-- //MD 추천 아이템 -->
 			<!-- 베스트 상품 리스트 -->
 			<th:block th:if="${contentsLoc=='003'}">
-			<div class="content dp_best_list" th:if="${bestGoodsList != null}">
+			<div class="content dp_best_list" th:if="${bestGoodsList != null and !bestGoodsList.empty}">
 				<div class="cont_head">
 					<div>
 						<h4 th:text="${contentsTitle}">베스트</h4>