From bfb7d7bf1b0168d56edd2bc4943a522180a8220f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=A0=95=EC=9D=B4=EC=86=94?= Date: Sun, 24 Jul 2022 22:25:02 +0900 Subject: [PATCH] =?UTF-8?q?[=EC=88=98=EC=A0=95]=20=EB=A6=AC=EC=8A=A4?= =?UTF-8?q?=ED=8A=B8=20=EA=B2=80=EC=83=89=20=EB=A1=9C=EC=A7=81=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=EB=B0=8F=20=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 기록 단에서 홈메이드, 시판, 간식, 분유 이유식 리스트 들어가면 요청 홈메이드 이유식, 시판 이유식 스크롤 내렸을 때 추가 요청 젖병 에서 popup 형식 변경 --- .../view_bf_daily_nutrition_10.ftl | 59 +++++++- .../view_bf_daily_nutrition_2.ftl | 127 ++++++++++++++---- .../view_bf_daily_nutrition_3.ftl | 55 ++++++++ .../view_bf_daily_nutrition_9.ftl | 57 +++++++- .../ftl/m/bf_food/list_bf_commerce_popup.ftl | 3 +- .../ftl/m/bf_food/list_bf_homemade_popup.ftl | 5 +- 6 files changed, 271 insertions(+), 35 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl index 54c4f82..3f1fb20 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_10.ftl @@ -163,8 +163,63 @@
- diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl index 3d0353f..fec4520 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_3.ftl @@ -165,6 +165,61 @@ var frmLacSnak = { go_snakpopup: function() { $('#snakPopup').addClass("open"); + let dqi_cate = '짠과자'; + nextPage = (nowPage + 1); + + $.ajax({ + url:'${URL_ROOT}/m/db/db_nutrient/ajax_list_db_nutrient.do', + type:'get', + data: { + "dqi_cate" : dqi_cate , + "nowPage":nextPage + }, + contentType: "application/x-www-form-urlencoded; charset=UTF-8", + dataType:'json', + error:function(request,status,error){ + is_stop_more = false; + }, + success:function(result){ + var html = ''; + + nowPage = Number(result.page.nowPage); + maxPage = Number(result.page.maxPage); + + $('#nowPage').text(nowPage); + + if(nowPage == maxPage){ + $('.more_btn_box').remove(); + } + if(result.list != null && result.list.length > 0) { + for(var i=0;i섭취량 이미지' + prd_nm + '(' + company + ')' + ''; + } + + var ul_board = $('#ul_board'); + ul_board.append(html); + + ul_board.on( 'scroll', function(){ + var top =ul_board.height() + ul_board.prop("scrollTop"); + var scrolHeight = ul_board.prop("scrollHeight"); + + if(top > scrolHeight - 5) { + // list_more('N') + } + }); + }else{ + var ul_board = $('#ul_board'); + ul_board.append("
  • 조회되는 자료가 없습니다.
    • "); + } + + is_loading = false; + } + }); }, go_search: function() { var keyword = $("#snak_search").val(); diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl index 99587e6..911c6e8 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_daily_nutrition/view_bf_daily_nutrition_9.ftl @@ -306,7 +306,62 @@ }, go_popup: function() { $('#ul_board').empty(); - $('#popup').addClass('open'); + // $('#popup').addClass('open'); + $.ajax({ + url:'${URL_ROOT}/m/bf_daily_nutrition/ajax_list_db_homemade.do', + type:'get', + data: { + "nowPage": nextPage + }, + dataType:'json', + error:function(request,status,error){ + is_stop_more = false; + console.log("error!"); + }, + success:function(result){ + var html = ''; + + nowPage = Number(result.page.nowPage); + maxPage = Number(result.page.maxPage); + + $('#nowPage').text(nowPage); + + if(nowPage == maxPage){ + $('.more_btn_box').remove(); + } + + if(result.list != null && result.list.length > 0) { + for(var i=0;i"; + + html +='
  • '+ imgurl1 + water_qty + prd_nm + '
    • '; + } + + var ul_board = $('#ul_board'); + ul_board.append(html); + + ul_board.on( 'scroll', function(){ + var top =ul_board.height() + ul_board.prop("scrollTop"); + var scrolHeight = ul_board.prop("scrollHeight"); + + if(top > scrolHeight - 5) { + // list_more('N') + } + }); + }else{ + var ul_board = $('#ul_board'); + ul_board.append("
  • 조회되는 자료가 없습니다.
    • "); + } + + $('#popup').addClass('open'); + is_loading = false; + } + }); }, go_popup_search: function() { $('#popup_search').addClass('open'); diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_commerce_popup.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_commerce_popup.ftl index 043b207..8d05415 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_commerce_popup.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_commerce_popup.ftl @@ -154,7 +154,8 @@ } var ul_board = $('#ul_board'); - $(window).scroll(function() { + var bf_list = $(".bf_search_list"); + bf_list.scroll(function() { if ($(window).scrollTop() + 500 >= ($(document).height() - $(window).height())){ list_more('N'); } diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl index 62d2334..0251a59 100644 --- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl +++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl @@ -161,8 +161,9 @@ } var ul_board = $('#ul_board'); - $(window).scroll(function() { - if ($(window).scrollTop() + 500 >= ($(document).height() - $(window).height())){ + var bf_list = $('.bf_search_list'); + bf_list.scroll(function() { + if (bf_list.scrollTop() + 500 >= bf_list.height()){ list_more('N'); } });