From fcc9f0d122f17ecfa277a45ca0e5f185dc30b9a5 Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Thu, 14 Apr 2022 15:46:41 +0900
Subject: [PATCH] =?UTF-8?q?D-Day=20=EC=84=A4=EC=A0=95=EA=B4=80=EB=A0=A8=20?=
 =?UTF-8?q?=ED=99=88=ED=99=94=EB=A9=B4=20=EC=98=A4=EB=A5=98=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  35 +-
 .../m/bf_food/M_Bf_foodController.java        |   1 -
 .../backoffice/m/index/M_IndexController.java |  21 +-
 .../ftl/m/bf_food/list_bf_homemade_popup.ftl  | 334 +++++++-----------
 .../m/bf_food/list_bf_homemade_recommend.ftl  |  11 +-
 .../ftl/m/bf_food/view_bf_homemade_popup.ftl  |  61 +---
 .../views/ftl/m/include/list_bf_common.ftl    |   7 +-
 .../WEB-INF/views/ftl/m/index/index.ftl       |  14 +-
 8 files changed, 182 insertions(+), 302 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4ef57fe..4a51a17 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,14 +9,16 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="회원가입 퍼블리싱 페이지 적용-2">
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby_20220413.ftl" afterDir="false" />
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="아이정보등록 퍼블리싱">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_family_baby/M_Bf_family_babyBOImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_family_baby.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/admin/bf/com.backoffice.admin.bf.bf_family_baby.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_family_baby/com.backoffice.m.bf_family_baby.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_family_baby/view_bf_family_baby.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_end.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_end.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/index/M_IndexController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/bf.properties" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/bf.properties" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/list_bf_common.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/list_bf_common.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -212,7 +214,11 @@
       <workItem from="1649766300130" duration="9906000" />
       <workItem from="1649776968602" duration="4118000" />
       <workItem from="1649844246447" duration="2069000" />
-      <workItem from="1649847492440" duration="12746000" />
+      <workItem from="1649847492440" duration="12812000" />
+      <workItem from="1649866838129" duration="5432000" />
+      <workItem from="1649906187756" duration="250000" />
+      <workItem from="1649909664739" duration="214000" />
+      <workItem from="1649917548966" duration="1224000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -410,7 +416,14 @@
       <option name="project" value="LOCAL" />
       <updated>1649780972822</updated>
     </task>
-    <option name="localTasksCounter" value="29" />
+    <task id="LOCAL-00029" summary="아이정보등록 퍼블리싱">
+      <created>1649860415035</created>
+      <option name="number" value="00029" />
+      <option name="presentableId" value="LOCAL-00029" />
+      <option name="project" value="LOCAL" />
+      <updated>1649860415035</updated>
+    </task>
+    <option name="localTasksCounter" value="30" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -430,7 +443,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="아이 사진 업로드 오류" />
     <MESSAGE value="SNS 탈퇴 로그인 불가 처리 메시지" />
     <MESSAGE value="한글파일명 음악파일 업로드이슈 수정" />
     <MESSAGE value="이유식레시피, 시판이유식 자동검색 적용" />
@@ -455,6 +467,7 @@
     <MESSAGE value="계정관리 퍼블리싱 적용-1" />
     <MESSAGE value="회원가입 퍼블리싱 페이지 적용" />
     <MESSAGE value="회원가입 퍼블리싱 페이지 적용-2" />
-    <option name="LAST_COMMIT_MESSAGE" value="회원가입 퍼블리싱 페이지 적용-2" />
+    <MESSAGE value="아이정보등록 퍼블리싱" />
+    <option name="LAST_COMMIT_MESSAGE" value="아이정보등록 퍼블리싱" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java
index d4758a4..a9b46f0 100644
--- a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java
+++ b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java
@@ -452,7 +452,6 @@ public class M_Bf_foodController extends AbstractControllerManager{
 	@RequestMapping(value="view_bf_homemade_popup")
 	public String view_bf_homemade_popup(@ModelAttribute("model") ModelMap model, HttpServletRequest  request, HttpServletResponse response, RedirectAttributes ra) {
 		DataMap paramMap = gmUtil.getDataMapFromRequest(request);
-
 		String redirect_url = "m/bf_food/view_bf_homemade_popup";
 
 		try {
diff --git a/src/main/java/com/backoffice/m/index/M_IndexController.java b/src/main/java/com/backoffice/m/index/M_IndexController.java
index 62cc64e..68fcaf8 100644
--- a/src/main/java/com/backoffice/m/index/M_IndexController.java
+++ b/src/main/java/com/backoffice/m/index/M_IndexController.java
@@ -213,14 +213,19 @@ public class M_IndexController extends AbstractControllerManager{
 						// 일일 균형 판정
 						List<DataMap> day_lm = scoreBO.select_daily_list_for_graph(paramMap);
 
-						DataMap tot = scoreBO.select_day_total(day_lm.get(0));
-						NutrientScoreCalculation nut = new NutrientScoreCalculation(tot);
-						DataMap nut_score = nut.getScore();
-						FoodScoreCalculation food = new FoodScoreCalculation(tot);
-						DataMap food_score = food.getScore();
-
-						rm_child.put("totalNutrition", Math.round(nut_score.getLong("totalNutrition")));
-						rm_child.put("totalFood", Math.round(food_score.getLong("totalFood")));
+						if(day_lm.size() > 0) {
+							DataMap tot = scoreBO.select_day_total(day_lm.get(0));
+							NutrientScoreCalculation nut = new NutrientScoreCalculation(tot);
+							DataMap nut_score = nut.getScore();
+							FoodScoreCalculation food = new FoodScoreCalculation(tot);
+							DataMap food_score = food.getScore();
+
+							rm_child.put("totalNutrition", Math.round(nut_score.getLong("totalNutrition")));
+							rm_child.put("totalFood", Math.round(food_score.getLong("totalFood")));
+						} else {
+							rm_child.put("totalNutrition", 0);
+							rm_child.put("totalFood", 0);
+						}
 					}
 				}
 
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 d49f08c..49b680b 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
@@ -1,203 +1,131 @@
 <#include "/m/include/index_top.ftl">
 
-<link rel="stylesheet" href="${URL_STATIC_ROOT}/m/css/swiper.min.css">
-<script src="${URL_STATIC_ROOT}/m/js/swiper.min.js"></script>
-<script src="${URL_STATIC_ROOT}/m/js/jquery_popupoverlay.js"></script>
-<script src="${URL_STATIC_ROOT}/m/js/design.js"></script>
-
-<body>
-
-    <!-- wrap -->
-    <div class="wrap">
-
-        <!-- main_nutrition -->
-        <main class="main_nutrition">
-
-            <!-- nutrition_search_main -->
-            <div class="nutrition_search_main pd0">
-
-				<div class="nutrition_search_fix" style="width:90%;top:40px">
-                    <!-- 영양검색탭 -->
-                    <div class="nutrition_search_tab">
-                        <div class="swiper-wrapper">
-                            <div class="swiper-slide active">
-                                <p>홈메이드 이유식을 검색해 주세요.</p>
-                            </div>
-                            <!--<div class="swiper-slide">
-                            <a href="#foodInfo_subMain_list01">전체</a>
-                            <p>내용내용내용</p>
-                        </div>-->
-                        </div>
-                    </div>
-                    <!-- //영양검색탭 -->
-
-                    <!-- 검색input -->
-					<div class="search_input_wrap">
-			             <p class="search_input"><input type="text" id="prd_nm" name="prd_nm" placeholder="검색"><a href="javascript:list_more('Y');">검색</a></p>
-					</div>
-                </div>
-
-                <!-- 검색결과 -->
-                <div class="search_result_homemade_wrap" style="top:500px">
-                	<div class="search_top">
-                        	<!-- <span><img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_search_season.png" alt="제철음식 아이콘" /> 제철음식</span>  -->
-                        	<span><img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_search_allergy.png" alt="알레르기 아이콘" /> 알레르기</span>
-                    	</div>
-	                <ul id="ul_board" class="search_result_homemade">
-		                <#if model['lm']?has_content>
-		                	<#list model['lm'] as item>
-		                		<li>
-		                            <a href="javascript:fncRecipeMadePopDetail(${item['dhb_no']!})">
-		                                <p class="search_img">
-		                                    <img src="${URL_STATIC_ROOT}/m/db/homemade/${item['dhb_cd']!}-0.png" onerror="this.src='${URL_STATIC_ROOT}/m/db/homemade/bowl.png';" alt="이유식 식재료 검색 사진"/>
-		                                </p>
-		                                <div class="search_txt">
-		                                    <p class="name">
-		                                        <span class="box">${item['dqi_food']!}</span>
-		                                        <span class="tit">${item['name']!}</span>
-		                                        <span class="txt">추천개월 - ${item['for_m']!}</span>
-		                                    </p>
-		                                    <p class="scope">
-		                                        <#list 1..5 as i>
-					                        		<#if i<=item['star']><img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_babyfood_search_star_on.png" alt="별 이미지" />
-					                        		<#else> <img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_babyfood_search_star.png" alt="별 이미지" />
-					                        		</#if>
-					                        	</#list>
-		                                    </p>
-		                                </div>
-		                                <div class="search_display">
-		                                    <#if (item['season']?number > 0)><span><img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_search_season.png" alt="제철음식 아이콘" /></span></#if>
-		                                    <#if (item['allergy']?number > 0)> <span><img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_search_allergy.png" alt="알레르기 아이콘" /></span></#if>
-		                                </div>
-		                            </a>
-		                        </li>
-		                	</#list>
-		                </#if>
-	                </ul>
-				</div>
-            </div>
-            <!-- //nutrition_search_main -->
-
-        </main>
-        <!-- //main_nutrition -->
-
-    </div>
-    <!-- //wrap -->
+<div class="content">
+	<div class="bf_food_modal">
+		<div class="cart_search bf_search">
+			<input id="prd_nm" name="prd_nm" placeholder="이유식 검색">
+			<button onclick="list_more('Y');">검색</button>
+		</div>
+		<div class="bf_search_list">
+			<div class="search_top">
+						<span><img src="../img/nutrition/nutrition_search_allergy.png" alt="알레르기 아이콘" />
+							알레르기</span>
+			</div>
+			<ul id="ul_board" class="search_result_homemade">
+			</ul>
+		</div>
+	</div>
+</div>
 
 <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
 <script type="text/javascript">
-    var is_loading = false;
-    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;
+	var is_loading = false;
+	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);
-    }
+		var prd_nm = $('#prd_nm').val();
+		ajax_data(prd_nm);
+	}
 
-    $(document).ready(function(){
+	$(document).ready(function(){
 		$("#prd_nm").keyup(function() { list_more('Y'); });
-    	// $('#prd_nm').autocomplete({
-    	// 	 minLength: 1,
-    	// 	 source: function call_ajax(){
-    	// 		 list_more('Y');
-    	// 	 }
-    	// });
-    });
+	});
 
 	function ajax_data(keyword){
 		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 ,
-                       "nowPage":nextPage
-                   },
-                   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<result.list.length;i++) {
-                                var dhb_no = result.list[i].dhb_no;
-                                var dhb_cd = result.list[i].dhb_cd;
-                                var name = result.list[i].name;
-								var for_m = result.list[i].for_m;
-								var star = result.list[i].star;
-								var season = result.list[i].season;
-								var allergy = result.list[i].allergy;
-								var dqi_food = result.list[i].dqi_food;
-
-								var imgUrl = "${URL_STATIC_ROOT}/m/db/homemade/" + dhb_cd + "-0.png";
-
-                                html +='<li>';
-                                html +='<a href="view_bf_homemade.do?return_url=list_bf_homemade&amp;dhb_no='+dhb_no+'">';
-                                html +=' <p class="search_img">';
-                                html +='<img src="${URL_STATIC_ROOT}/m/db/homemade/'+dhb_cd+'-0.png" onerror="this.src=\'${URL_STATIC_ROOT}/m/db/homemade/bowl.png\';" alt="이유식 식재료 검색 사진"/>';
-                                html +=' </p>';
-                                html +=' <div class="search_txt">';
-                                html +=' <p class="name">';
-                                html +='     <span class="box">'+dqi_food+'</span>';
-                                html +=' <span class="tit">'+name+'</span>';
-                                html +='  <span class="txt">추천개월 - '+for_m+'</span>';
-                                html +=' </p>';
-                                html +='  <p class="scope">';
-                                for(var j=1; j<=5 ;j++){
-                                	if(j<=star)	html +='<img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_babyfood_search_star_on.png" alt="별 이미지" />';
-                                	else		html +='<img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_babyfood_search_star.png" alt="별 이미지" />';
-                                }
-    				            html +='   </p>';
-    				            html +='</div>';
-    	                        html +='     <div class="search_display">';
-    	                        if(season>0) html += '<span><img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_search_season.png" alt="제철음식 아이콘" /></span>';
-    	                        if(allergy>0) html += '<span><img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_search_allergy.png" alt="알레르기 아이콘" /></span>';
-				                html +='</div>';
-	                            html +=' </a>';
-	                            html +='</li>';
-
-                            }
-
-                            ul_board.append(html);
-
-                        }
-
-                        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 ,
+					"nowPage":nextPage
+				},
+				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<result.list.length;i++) {
+							var dhb_no = result.list[i].dhb_no;
+							var dhb_cd = result.list[i].dhb_cd;
+							var name = result.list[i].name;
+							var for_m = result.list[i].for_m;
+							var star = result.list[i].star;
+							var season = result.list[i].season;
+							var allergy = result.list[i].allergy;
+							var dqi_food = result.list[i].dqi_food;
+
+							var imgUrl = "${URL_STATIC_ROOT}/m/db/homemade/" + dhb_cd + "-0.png";
+
+							html +='<li>';
+							// html +='<a href="view_bf_homemade.do?return_url=list_bf_homemade&amp;dhb_no='+dhb_no+'">';
+							html +='<a href="javascript:fncRecipeMadePopDetail(' + dhb_no + ')">';
+							html +=' <p class="search_img">';
+							html +='<img src="${URL_STATIC_ROOT}/m/db/homemade/'+dhb_cd+'-0.png" onerror="this.src=\'${URL_STATIC_ROOT}/m/db/homemade/bowl.png\';" alt="이유식 식재료 검색 사진"/>';
+							html +=' </p>';
+							html +=' <div class="search_txt">';
+							html +=' <p class="name">';
+							html +='     <span class="box">'+dqi_food+'</span>';
+							html +=' <span class="tit">'+name+'</span>';
+							html +='  <span class="txt">추천개월 - '+for_m+'</span>';
+							html +=' </p>';
+							html +='  <p class="scope">';
+							for(var j=1; j<=5 ;j++){
+								if(j<=star)	html +='<img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_babyfood_search_star_on.png" alt="별 이미지" />';
+								else		html +='<img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_babyfood_search_star.png" alt="별 이미지" />';
+							}
+							html +='   </p>';
+							html +='</div>';
+							html +='     <div class="search_display">';
+							if(season>0) html += '<span><img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_search_season.png" alt="제철음식 아이콘" /></span>';
+							if(allergy>0) html += '<span><img src="${URL_STATIC_ROOT}/m/img/nutrition/nutrition_search_allergy.png" alt="알레르기 아이콘" /></span>';
+							html +='</div>';
+							html +=' </a>';
+							html +='</li>';
+
+						}
+
+						ul_board.append(html);
+
+					}
+
+					is_loading = false;
+				}
+			});
+		}
+	}
 
 	var ul_board = $('#ul_board');
 	$(window).scroll(function() {
@@ -210,19 +138,19 @@
 
 
 <script>
-    // 영양 검색 탭
-    var swiper = new Swiper('.nutrition_search_tab', {
-        slidesPerView: 5,
-        slidesPerGroup: 1,
-        spaceBetween: 10,
-        loopFillGroupWithBlank: true,
-    });
-    $(".nutrition_search_tab .swiper-slide").click(function(e) {
-        e.stopPropagation();
-
-        if (!$(this).hasClass("active")) {
-            $(this).siblings().removeClass("active");
-            $(this).addClass("active");
-        }
-    });
+	// 영양 검색 탭
+	var swiper = new Swiper('.nutrition_search_tab', {
+		slidesPerView: 5,
+		slidesPerGroup: 1,
+		spaceBetween: 10,
+		loopFillGroupWithBlank: true,
+	});
+	$(".nutrition_search_tab .swiper-slide").click(function(e) {
+		e.stopPropagation();
+
+		if (!$(this).hasClass("active")) {
+			$(this).siblings().removeClass("active");
+			$(this).addClass("active");
+		}
+	});
 </script>
\ No newline at end of file
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl
index a739715..b6b1347 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl
@@ -9,20 +9,13 @@
 <body>
 
 <!-- modal-wrapper : 홈메이드 이유식 레시피 검색 팝업 -->
-<div id="homeMadeSearchPop" class="modal-wrapper">
+<div class="modal-wrapper">
     <div class="modal_content" style="width: calc(100% - 30px)">
         <div class="head">
             <div class="title">&nbsp;</div>
             <div class="modal_close_btn"><img src="../img/close_ico.png"></div>
         </div>
-        <div class="content scroll">
-            <div class="nutrition_introduce_main">
-                <div class="cart_search bf_search">
-                    <input placeholder="이유식 검색">
-                    <button>검색</button>
-                </div>
-                <div class="bf_search_list"></div>
-            </div>
+        <div id="homeMadeSearchPop" class="content scroll">
         </div>
     </div>
     <div class="modal_layer"></div>
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl
index 83afe3e..13bad5a 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl
@@ -1,26 +1,8 @@
 <#include "/m/include/index_top.ftl">
-
-    <link rel="stylesheet" href="${URL_STATIC_ROOT}/m/css/swiper.min.css">
-    <script src="${URL_STATIC_ROOT}/m/js/swiper.min.js"></script>
-    <script src="${URL_STATIC_ROOT}/m/js/jquery_popupoverlay.js"></script>
-    <script src="${URL_STATIC_ROOT}/m/js/design.js"></script>
-
-<body>
-    <header class="header_wrapper" style="top:40px">
-        <a href="javascript:fncRecipeMadePop()" class="side_Lbtn hidden pre_btn">이전으로</a>
-    </header>
-    <!-- wrap -->
-    <div class="wrap">
-        <!-- main_nutrition -->
-        <main class="main_nutrition">
-
-            <!-- nutrition_introduce_main -->
+           <!-- nutrition_introduce_main -->
             <div class="nutrition_introduce_main">
                 <!-- nutrition_introduce_img -->
                 <div class="nutrition_introduce_img">
-                    <p class="nutrition_introduce_img_big">
-                        <img src="${URL_STATIC_ROOT}/m/db/homemade/${model['rm']['dhb_cd']!}-0.png" onerror="this.src='${URL_STATIC_ROOT}/m/db/homemade/bowl.png';" alt="홈메이드 이유식 소개 이미지" />
-                    </p>
                     <div class="nutrition_introduce_txt">
                         <p class="introduce_txt01">${model['rm']['for_m']!}</p>
                         <p class="introduce_txt02">${model['rm']['name']!}</p>
@@ -96,41 +78,6 @@
                 <!-- nutrition_subMain_suggest -->
                 <div class="nutrition_subMain_suggest">
                     <h2>영양추천</h2>
-<#--                    <div class="nutrition_subMain_suggest_in">-->
-<#--                        <h3>연관제품</h3>-->
-<#--                        <ul class="nutrition_subMain_suggest_list">-->
-<#--                         <li>-->
-<#--                                <a href="#">-->
-<#--                                    <p class="img"><img src="${URL_STATIC_ROOT}/m//img/nutrition/nutrition_subMain_suggest_img01.png"></p>-->
-<#--                                    <p class="tit">베이비오 유기농</p>-->
-<#--                                    <ul>-->
-<#--                                        <li>비타민C, 무기질, 엽산</li>-->
-<#--                                        <li>조회수 135</li>-->
-<#--                                    </ul>-->
-<#--                                </a>-->
-<#--                            </li>-->
-<#--                            <li>-->
-<#--                                <a href="#">-->
-<#--                                    <p class="img"><img src="${URL_STATIC_ROOT}/m//img/nutrition/nutrition_subMain_suggest_img02.png"></p>-->
-<#--                                    <p class="tit">베이비 본</p>-->
-<#--                                    <ul>-->
-<#--                                        <li>단백질, 지방, 칼슘 </li>-->
-<#--                                        <li>조회수 135</li>-->
-<#--                                    </ul>-->
-<#--                                </a>-->
-<#--                            </li>-->
-<#--                            <li>-->
-<#--                                <a href="#">-->
-<#--                                    <p class="img"><img src="${URL_STATIC_ROOT}/m//img/nutrition/nutrition_subMain_suggest_img03.png"></p>-->
-<#--                                    <p class="tit">얼스베스트 완두콩 </p>-->
-<#--                                    <ul>-->
-<#--                                        <li>단백질, 칼륨, 아연, 식이섬유</li>-->
-<#--                                        <li>조회수 135</li>-->
-<#--                                    </ul>-->
-<#--                                </a>-->
-<#--                            </li>-->
-<#--                        </ul>-->
-<#--                    </div>-->
                     <div class="nutrition_subMain_suggest_in">
                         <h3>연관식재료</h3>
                         <ul class="nutrition_subMain_suggest_list">
@@ -160,12 +107,6 @@
             </div>
             <!-- //nutrition_introduce_main -->
 
-        </main>
-        <!-- //main_nutrition -->
-
-    </div>
-    <!-- //wrap -->
-
 <script>
 	//swiper 슬라이더
 	new Swiper('.swiper-container', {
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 d4338b8..2f26b9b 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
@@ -76,7 +76,7 @@
         })
             // HTTP 요청이 성공하면 요청한 데이터가 done() 메소드로 전달됨.
             .done(function (data) {
-                $(".nutrition_introduce_main").html(data);
+                $("#homeMadeSearchPop").html(data);
                 $('.modal-wrapper').addClass('open');
             })
             // HTTP 요청이 실패하면 오류와 상태에 관한 정보가 fail() 메소드로 전달됨.
@@ -103,8 +103,9 @@
         })
             // HTTP 요청이 성공하면 요청한 데이터가 done() 메소드로 전달됨.
             .done(function (data) {
-                $(".nutrition_introduce_main").html(data);
-                $('.modal-wrapper').addClass('open');
+                // $(".nutrition_introduce_main").html(data);
+                $("#homeMadeSearchPop").html(data);
+                // $('.modal-wrapper').addClass('open');
             })
             // HTTP 요청이 실패하면 오류와 상태에 관한 정보가 fail() 메소드로 전달됨.
             .fail(function (xhr, status, errorThrown) {})
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
index 56f65df..ba3490a 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
@@ -102,7 +102,7 @@
 															${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
 														</#if>
 													<#elseif item['day365'] gt 0>
-														<#if item['diff_d_day'] gt item['day360'] || item['diff_d_day'] lt 0>
+														<#if item['diff_d_day'] gt item['day365'] || item['diff_d_day'] lt 0>
 															첫돌 D-${(item['day365'])!}일,${item['day365date']!}
 														<#elseif item['diff_d_day'] gt 0>
 															${(item['d_title'])!} D-${(item['diff_d_day'])!}일,${item['d_day']!}
@@ -135,10 +135,10 @@
 
 								<!-- main_pofile_info_txt -->
 								<#if model['rm_last_w']?exists == true>
-								<div class="main_pofile_info_txt txt02">
-									<div class="main_pofile_info_txt02">
-										<strong><#if model['rm_last_w']['weight']?exists>${model['rm_last_w']['weight']!}kg<#else>-</#if></strong></div>
-								</div>
+									<div class="main_pofile_info_txt txt02">
+										<div class="main_pofile_info_txt02">
+											<strong><#if model['rm_last_w']['weight']?exists>${model['rm_last_w']['weight']!}kg<#else>-</#if></strong></div>
+									</div>
 								</#if>
 								<div class="main_pofile_info_tit">
 									<span class="txt01 active">cm</span>
@@ -266,8 +266,8 @@
 									<div class="img_preview">
 										<#if (item['nutirition_cd_no_title'])?has_content>
 											<#assign nutirition_cd_no_title = item['nutirition_cd_no_title']>
-										 	<#assign memo = item['memo']!>
-										 	<#assign time_text = item['time_val']!>
+											<#assign memo = item['memo']!>
+											<#assign time_text = item['time_val']!>
 										</#if>
 										<img src="<#if item['append_300_img_file']?exists>${URL_ROOT}/file/get_img.do?mt_file_seq=${item['append_300_img_file']}<#else>${URL_STATIC_ROOT}/m/img/child/child_pic_02.png</#if>" alt="사진영역">
 									</div>