From dc5ac14883b2b90a58540afcc7b284db801acb8a Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Mon, 11 Apr 2022 01:23:18 +0900
Subject: [PATCH] =?UTF-8?q?=ED=99=88>=ED=99=88=EB=A9=94=EC=9D=B4=EB=93=9C?=
 =?UTF-8?q?=20=EC=B6=94=EC=B2=9C=20=EC=9D=B4=EC=9C=A0=EC=8B=9D=20=ED=8D=BC?=
 =?UTF-8?q?=EB=B8=94=EB=A6=AC=EC=8B=B1=EC=9E=91=EC=97=85-1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           |  26 +-
 .../ftl/m/bf_food/list_bf_homemade_popup.ftl  |  52 ++--
 .../list_bf_homemade_popup_20220411.ftl       | 222 ++++++++++++++++++
 .../ftl/m/bf_food/list_bf_ingre_recommend.ftl |   2 +-
 .../views/ftl/m/include/list_bf_common.ftl    |   6 +-
 .../views/ftl/m/login/view_join_member_04.ftl |  14 +-
 .../ftl/m/login/view_join_member_04_1.ftl     |  57 ++---
 .../login/view_join_member_04_1_20220411.ftl  |  50 ++++
 8 files changed, 344 insertions(+), 85 deletions(-)
 create mode 100644 src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup_20220411.ftl
 create mode 100644 src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1_20220411.ftl

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e9af764..f953161 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,22 +9,15 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="">
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_add_popup.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_popup.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend_20220410.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend_20220410.ftl" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_20220410.ftl" afterDir="false" />
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="index_bottom 공유관련 html 스크립트 분리-2">
+      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_popup_20220411.ftl" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1_20220411.ftl" afterDir="false" />
       <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_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/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/list_bf_homemade_recommend_20220217.ftl" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend_20220310.ftl" beforeDir="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_ingre_recommend.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend_20220217.ftl" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend_20220310.ftl" beforeDir="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/login/view_join_member_04.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -70,7 +63,7 @@
     <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
     <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
     <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login" />
+    <property name="last_opened_file_path" value="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food" />
     <property name="project.structure.last.edited" value="프로젝트" />
     <property name="project.structure.proportion" value="0.0" />
     <property name="project.structure.side.proportion" value="0.0" />
@@ -79,15 +72,15 @@
   </component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
+      <recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\bf_food" />
+      <recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\login" />
       <recent name="C:\Users\MSI\IdeaProjects\bf\src\main\webapp\WEB-INF\views\ftl\m\login" />
       <recent name="C:\Users\MSI\IdeaProjects\bf\src\main\webapp\WEB-INF\views\ftl\m\bf_food" />
       <recent name="C:\Users\MSI\IdeaProjects\bf\src\main\webapp\WEB-INF\views\ftl\m\index" />
-      <recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\memory" />
-      <recent name="C:\project\bf\src\main\webapp\WEB-INF\views\ftl\m\member_env" />
     </key>
   </component>
   <component name="RunManager">
-    <configuration name="Tomcat 9.0.43" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 9.0.43" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8" nameIsGenerated="true">
+    <configuration name="Tomcat 8.5.73" type="#com.intellij.j2ee.web.tomcat.TomcatRunConfigurationFactory" factoryName="Local" APPLICATION_SERVER_NAME="Tomcat 8.5.73" ALTERNATIVE_JRE_ENABLED="true" ALTERNATIVE_JRE_PATH="1.8" nameIsGenerated="true">
       <option name="OPEN_IN_BROWSER_URL" value="http://devops.lookylooks.ai:14288/bf/" />
       <option name="COMMON_VM_ARGUMENTS" value="-Dfile.encoding=UTF-8" />
       <option name="UPDATE_ON_FRAME_DEACTIVATION" value="true" />
@@ -384,7 +377,6 @@
         </entry>
       </map>
     </option>
-    <option name="oldMeFiltersMigrated" value="true" />
   </component>
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
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 fbb4548..d49f08c 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
@@ -36,7 +36,7 @@
 			             <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">
@@ -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<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 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">';
@@ -186,26 +186,26 @@
 				                html +='</div>';
 	                            html +=' </a>';
 	                            html +='</li>';
-								
+
                             }
-                            
+
                             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');
 		}
 	});
-	
+
 </script>
 
 
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">
+
+<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 -->
+
+<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;
+			$('#ul_board').empty();
+    	}
+    	
+    	 var prd_nm = $('#prd_nm').val();
+    	 ajax_data(prd_nm);
+    }
+    
+    $(document).ready(function(){
+		$("#prd_nm").keyup(function() { 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;
+                   }
+            });            
+        }
+    }  
+	
+	var ul_board = $('#ul_board');
+	$(window).scroll(function() {
+		if ($(window).scrollTop() + 500 >= ($(document).height() - $(window).height())){
+			list_more('N');
+		}
+	});
+	
+</script>
+
+
+<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");
+        }
+    });
+</script>
\ 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 @@
             <div class="list">
                 <#if model['ingre']?has_content>
                     <#list model['ingre'] as item>
-                        <a href="javascript:fncIngredientPop(${item['dbi_no']!})" class="recommend_item bf_ingre">${item['name_real']!}</a>
+                        <a href="#" class="recommend_item bf_ingre">${item['name_real']!}</a>
                     </#list>
                 </#if>
             </div>
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 @@
 <div class="wrap">
     <header class="header_wrapper">
         <a href="javascript:history.back();" class="side_Lbtn hidden pre_btn">이전으로</a>
-        <h1 class="header_title">계정 연동 하기</h1>
+        <h1 class="header_title">계정 연동</h1>
         <a href="#" class="side_Rbtn hidden"></a>
     </header>
     <form id="frmJoinMember" name="frmJoinMember" method="post" action="authComplete.do" enctype="multipart/form-data" onsubmit="return false">
@@ -12,8 +12,8 @@
             <div class="l_list">
                 <h1 class="l_title">이미 가입한 사용자 설정에서 인증코드를 입력하세요.</h1>
                 <div class="cont_code input">
-                    <input class="view_code" placeholder="인증코드를 입력하세요.">
-                    <button class="btn_auth" id="btn_auth">인증하기</button>
+                    <input class="view_code" id="sync_num" name="sync_num" placeholder="인증코드를 입력하세요.">
+                    <button class="btn_auth"  onclick="javascript:fncAuth()" id="btn_auth">인증하기</button>
                 </div>
                 <div class="description">
                     * 설정 > 계정 연동 > 인증코드 확인에서 인증코드를 확인할 수 있습니다.
@@ -22,9 +22,9 @@
                 <div class="result">
                     <h1 class="l_title">가입하신 사용자의 아이디를 확인해주세요.</h1>
                     <div class="cont_code">
-<#--                        <div class="view_code">${Session['rm_member']['email']}</div>-->
+                        <div class="view_code">${Session['rm_member']['email']}</div>
                     </div>
-                    <div class="m_set_account_btn"><button type="button" id="" name="" class="btns blue_btn">동기화하기</button></div>
+                    <div class="m_set_account_btn"><button type="button" onclick="fncSync()" id="" name="" class="btns blue_btn">동기화하기</button></div>
                 </div>
             </div>
         </main>
@@ -74,7 +74,7 @@
             type: 'post',
             data: {
                 "sync_num" : $("#sync_num").val(),
-                "email" : $(".view_code").html();
+                "email" : "${Session['rm_member']['email']}"
             },
             dataType : 'json',
             error : function(request,status,error){
@@ -90,7 +90,7 @@
                     return;
                 }
 
-                location.href = "${URL_ROOT}/m/login/view_join_member_04_1.do?email=" + $("#email").val() + "&sync_num=" + $("#sync_num").val();
+                location.href = "${URL_ROOT}/m/login/view_join_member_04_1.do?email=${Session['rm_member']['email']}" + "&sync_num=" + $("#sync_num").val();
             }
         });
     }
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1.ftl
index 2976a68..900e1c4 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1.ftl
@@ -3,43 +3,36 @@
     <link href="../css/style.css?1" rel="stylesheet"  type="text/css" >
 </head>
 
-  <body class="bg_setting">
-    <div class="wrap">
-        <!--회원가입 상자(가입확인, 정보입력, 가입 완료) -->
-        <div class="main_cont_status">
-            <div>
-                <p>가입 확인</p>
-            </div>
-            <div>
-                <p>정보 입력</p>
-            </div>
-            <div id="active">
-                <p>가입 완료</p>
+<body class="bg_setting">
+<div class="wrap">
+    <header class="header_wrapper">
+        <a href="javascript:history.back();" class="side_Lbtn hidden pre_btn">이전으로</a>
+        <h1 class="header_title">계정 연동</h1>
+        <a href="#" class="side_Rbtn hidden"></a>
+    </header>
+    <main class="m_set_account connect">
+        <div class="l_list">
+            <h1 class="l_title"></h1>
+            <div class="cont_code">
+                <div class="view_code">
+                    [${model['member_info']['email']}]님과 계정 연동이 완료되었습니다.
+                </div>
             </div>
-        </div>
 
-    <form id="frmJoinMember" name="frmJoinMember" method="post" action="authComplete.do" enctype="multipart/form-data" onsubmit="return false">
-
-      <main class="m_join_member">
-        <div class="profile_wrap">
-          <h1 class="l_title">[${model['member_info']['email']}]님과 계정연동이 완료 되었습니다.</h1>
-            <div class="profile_cont phone_cont">
-                <h2 class="p_title">함께하는 사용자</h2>
-                <div class="p_list_item p_border_box">
-                    <#list model['member_list'] as item>
-                        <div class="p_input_box">${item['email']!}</div>
-                    </#list>
-                </div>
+            <h1 class="l_title">함께하는 사용자</h1>
+            <div class="cont_code01">
+                <#list model['member_list'] as item>
+                    <div class="view_code">
+                        ${item['email']!}
+                    </div>
+                </#list>
             </div>
 
+            <div class="m_set_account_btn"><button type="button" onclick="fncGoBaby()" id="" name="" class="btns blue_btn">완료</button></div>
         </div>
-      </main>
-    </form>
-
-    <button type="button" onclick="javascript:fncGoBaby()" class="btns blue_btn">가입완료</button>
-
-    </div>
-  </body>
+    </main>
+</div>
+</body>
 
 <script>
     //로그인 처리 및 자녀추가 URL이동
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1_20220411.ftl b/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1_20220411.ftl
new file mode 100644
index 0000000..2976a68
--- /dev/null
+++ b/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_04_1_20220411.ftl
@@ -0,0 +1,50 @@
+<#include "/m/include/index_top.ftl">
+<head>
+    <link href="../css/style.css?1" rel="stylesheet"  type="text/css" >
+</head>
+
+  <body class="bg_setting">
+    <div class="wrap">
+        <!--회원가입 상자(가입확인, 정보입력, 가입 완료) -->
+        <div class="main_cont_status">
+            <div>
+                <p>가입 확인</p>
+            </div>
+            <div>
+                <p>정보 입력</p>
+            </div>
+            <div id="active">
+                <p>가입 완료</p>
+            </div>
+        </div>
+
+    <form id="frmJoinMember" name="frmJoinMember" method="post" action="authComplete.do" enctype="multipart/form-data" onsubmit="return false">
+
+      <main class="m_join_member">
+        <div class="profile_wrap">
+          <h1 class="l_title">[${model['member_info']['email']}]님과 계정연동이 완료 되었습니다.</h1>
+            <div class="profile_cont phone_cont">
+                <h2 class="p_title">함께하는 사용자</h2>
+                <div class="p_list_item p_border_box">
+                    <#list model['member_list'] as item>
+                        <div class="p_input_box">${item['email']!}</div>
+                    </#list>
+                </div>
+            </div>
+
+        </div>
+      </main>
+    </form>
+
+    <button type="button" onclick="javascript:fncGoBaby()" class="btns blue_btn">가입완료</button>
+
+    </div>
+  </body>
+
+<script>
+    //로그인 처리 및 자녀추가 URL이동
+    function fncGoBaby() {
+        location.href = "${URL_ROOT}/m/bf_family_baby/list_bf_family_baby.do";
+    }
+</script>
+<#include "/m/include/index_bottom.ftl">
\ No newline at end of file