상품권 수정

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

@@ -358,8 +358,8 @@ function giftcardSave() {
 			gagajf.ajaxJsonSubmit(
 					'/mypage/gift/use/confirm', jsonData,
 					function() {
-						$("#gift_input").val('');
-						//cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);
+						//$("#gift_input").val('');
+						cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);
 					});
 		}
 	});
@@ -370,6 +370,7 @@ function giftcardSave() {
 
 /*<![CDATA[*/
 $(document).ready(function() {
+	$('#htopTitle').text('상품권');
 	// 전체내역 표시
 	$("#SearchUseGiftcard").trigger('click');
 	// 셀렉트박스 활성화

src/main/webapp/WEB-INF/views/mob/planning/PlanningMainFormMob.html

@@ -34,15 +34,15 @@
 				<div class="list_content"> <!-- 데이터 없을시 클래스 nodata 추가 -->
 					<div class="count_wrap">
 						<div>
-							<p id="planningTotCnt"></p>
+							<p id="planningTotCnt">></p>
 						</div>
 					</div>
-					<div class="list_defult nodata" style="display: none;" id="divPlanningNoData">
-						<div>
-							<p>등록된 기획전이 없습니다.</p>
-						</div>
-						<button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈으로 가기</span></button>
-					</div>
+					 <div class="list_defult" style="display: none;" id="divPlanningNoData">
+                          <div>
+                              <p>등록된 기획전이 없습니다.</p>
+                          </div>
+                         <button type="button" class="btn btn_default" onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈으로 가기</span></button>
+                     </div>
 					<div class="list_item" style="display: none;" id="divPlanningList">
 					</div>
 				</div>

src/main/webapp/WEB-INF/views/web/mypage/MypageGiftcardFormWeb.html

@@ -216,8 +216,8 @@
 						+ useGiftcard.gfcdAmt.addComma()
 						+ '</em>원';
 				}else{
-					tmtbHtml += '<td><span class="amount_plus"> <em>'
-						+ ' '
+					tmtbHtml += '<td><span class="amount_plus" style="color:#fd4802"> <em>'
+						+ '+'
 						+ useGiftcard.gfcdAmt.addComma()
 						+ '</em>원';
 				}
@@ -355,8 +355,8 @@
 				gagajf.ajaxJsonSubmit(
 						'/mypage/gift/use/confirm', jsonData,
 						function() {
-							$("#gift_input").val('');
-							//cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);
+							//$("#gift_input").val('');
+							cfnGoToPage(_PAGE_MYPAGE_GIFTCARD);
 						});
 			}
 		});

src/main/webapp/WEB-INF/views/web/social/SocialMainFormWeb.html

@@ -27,7 +27,17 @@
 			</ul> 
 		</div>
 		<div class="wrap">
-		<th:block th:if="${socialInfo != null}">
+				<div class="nodata" style="display: none;">
+					<div class="txt_box">
+						<p>진행하는 핫딜이 없습니다.</p>
+					</div>
+					<div class="btn_box">
+						<button class="btn btn_default" onclick="cfnGoToPage(_PAGE_MAIN);">
+							<span>홈으로 가기</span>
+						</button>
+					</div>
+				</div>
+				<th:block th:if="${socialInfo != null}">
 			<div class="content wide dp_hotdeal"> <!-- 페이지특정 클래스 = dp_hotdeal -->
 				<div class="cont_body">
                     <div class="hotdeal">
@@ -166,6 +176,7 @@ var fnDrawInfiniteScrollData = function (result){
 	gagaInfiniteScroll.pageStatus.totalCount = result.totalCnt;
 
 	if (result.dataList != null && result.dataList.length > 0) {
+		$(".nodata").hide();		
 		let lastPage = result.paging.pageable.pageNo;
 		let endRow = result.endRow - result.paging.pageable.pageSize;
 		
@@ -173,22 +184,11 @@ var fnDrawInfiniteScrollData = function (result){
 		gagaInfiniteScroll.draw(htm);
 	}else{
 		if($("#socialForm input[name=pageNo]").val()==1){
-			var html = '';
-			html += '<div class="nodata" >';
-			html += '	<div class="txt_box">';
-			html += '		<p>';
-			html += '			진행하는 핫딜이 없습니다.';
-			html += '		</p>';
-			html += '	</div>';
-			html += '	<div class="btn_box">';
-			html += '		<button class="btn btn_default" onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈으로 가기</span></button>';
-			html += '	</div>';
-			html += '</div>';	
-			
-			$('#listBox').html(html);
+			$(".nodata").show();		
 		}
 		$("#divLastPage").show();
 		gagaInfiniteScroll.draw('not');
+		
 	}
 }
 
@@ -196,6 +196,7 @@ var fnDrawInfiniteScrollData = function (result){
 $(function(){
 	fnSocialListSearch();
        /* 핫딜 countDown */
+    
        function hotdealTimer() {
            var endTime = new Date(socialInfo.socialEddt); // 남은시간 지정
 
@@ -220,7 +221,11 @@ $(function(){
                $('#h-minutes').html(minutes);
                $('#h-seconds').html(seconds);		
        }
-       setInterval(function() { hotdealTimer(); }, 1000);
+       
+     if (socialInfo != null) {
+    	setInterval(function() { hotdealTimer(); }, 1000);
+  	 }
+       
        /* countDown */
 });