@@ -90,26 +90,26 @@
var nowPage = 1;
var maxPage = 0;
var nextPage = nowPage;
-
+
if(nowPage >= maxPage){
$('.more_btn_box').remove();
}
-
+
$('.more_btn_box').click(function(){
list_more('N');
return false;
- });
+ });
function list_more(is_new) {
if(is_new == 'Y'){
nowPage = 0;
$('#ul_board').empty();
}
-
+
var prd_nm = $('#prd_nm').val();
ajax_data(prd_nm);
}
-
+
$(document).ready(function(){
$("#prd_nm").keyup(function() { list_more('Y'); });
// $('#prd_nm').autocomplete({
@@ -119,18 +119,18 @@
// }
// });
});
-
+
function ajax_data(keyword){
- if (is_loading == false) {
+ if (is_loading == false) {
is_loading = true;
-
+
nextPage = (nowPage + 1);
$.ajax({
url:'${URL_ROOT}/m/db/db_nutrient/ajax_list_db_home_bf.do',
type:'get',
- data: {
- "prd_nm" : keyword ,
+ data: {
+ "prd_nm" : keyword ,
"nowPage":nextPage
},
dataType:'json',
@@ -139,29 +139,29 @@
},
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) {
+ if(result.list != null && result.list.length > 0) {
for(var i=0;i
';
html +='';
html +=' ';
@@ -186,26 +186,26 @@
html +='
';
html +=' ';
html +='';
-
+
}
-
+
ul_board.append(html);
-
+
}
-
+
is_loading = false;
}
- });
+ });
}
- }
-
+ }
+
var ul_board = $('#ul_board');
$(window).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_20220411.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup_20220411.ftl
new file mode 100644
index 0000000..a417d91
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup_20220411.ftl
@@ -0,0 +1,222 @@
+<#include "/m/include/index_top.ftl">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
알레르기
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend.ftl
index 15d07ba..3021ff1 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend.ftl
@@ -67,7 +67,7 @@
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/list_bf_common.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/list_bf_common.ftl
index 4381816..d4338b8 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/include/list_bf_common.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/include/list_bf_common.ftl
@@ -32,7 +32,8 @@
});
}
- //이유식 식재료 상세정보 팝업
+ //이유식 식재료 상세정보 팝업 - 2차 개발 삭제
+ /*
function fncIngredientPop(dbi_no) {
var params = {};
params.dbi_no = dbi_no;
@@ -58,8 +59,9 @@
// console.log("요청이 완료되었습니다!");
});
}
+ */
- //이유식 레시피 검색 팝업
+ //홈메이드 이유식 레시피 검색 버튼 > 팝업
function fncRecipeMadePop() {
var params = {};
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl
index 7b6e6c6..c3f0fe8 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl
@@ -4,7 +4,7 @@