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 5ea2633..32584d2 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 @@ -72,6 +72,11 @@
* 영양성분과 식품군 분석을 통한 이유식이 추천됩니다. +
+ + + +
@@ -120,6 +125,10 @@ $(".modal_close_btn").on("click", function () { $(".modal-wrapper").removeClass("open") }) + + $(".info_btn").on("click", function () { + Swal.fire({text: '* 이유식당 추천은 생후 월령에 맞춘 영양학적 수치를 고려하여 추천되며 실제 섭취할 식품 정보와 일치하지 않을 수 있으므로, 이에 대한 법적 책임은 없습니다.'}).then((result)=>{}) + }) 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 b354bba..022addd 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 @@ -1,10 +1,10 @@ <#include "/m/include/index_top.ftl"> - - - - - - + + + + + + @@ -71,6 +71,11 @@
* 영양성분과 식품군 분석을 통한 식재료가 추천됩니다. +
+ + + +
@@ -109,6 +114,10 @@ $(".modal_close_btn").on("click", function (){ $(".modal-wrapper").removeClass("open") }) + + $(".info_btn").on("click", function () { + Swal.fire({text: '* 이유식당 추천은 생후 월령에 맞춘 영양학적 수치를 고려하여 추천되며 실제 섭취할 식품 정보와 일치하지 않을 수 있으므로, 이에 대한 법적 책임은 없습니다.'}).then((result)=>{}) + }) 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 8681eab..b40e327 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 @@ -32,7 +32,7 @@ ${item_index+1}.${item['di_name']!}
${item['g']!}g - +
@@ -40,6 +40,9 @@ +
+ * 구매가 필요한 식재료를 카트에 담아서 한 눈에 확인해보세요! +
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 91a66f1..b7b2121 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 @@ -191,7 +191,7 @@
<#if model['rm_child']['totalFood']?exists == true> - ${model['rm_child']['totalFood']}% + ${model['rm_child']['totalFood']}점 <#if model['rm_child']['totalFood']?exists == false> - diff --git a/src/main/webapp/m/css/style.css b/src/main/webapp/m/css/style.css index b57eb2f..716cb8c 100644 --- a/src/main/webapp/m/css/style.css +++ b/src/main/webapp/m/css/style.css @@ -9590,6 +9590,7 @@ p.selectbox { position: absolute; top: 15px; right: 0; + display: flex; } .introduce_list_shopping .basket span { @@ -9602,14 +9603,30 @@ p.selectbox { display: block; width: 22px; height: 22px; - background: url(../img/nutrition/nutrition_introduce_ico_basket.png) no-repeat center/100% auto; + /* background: url(../img/nutrition/nutrition_introduce_ico_basket.png) no-repeat center/100% auto; */ } .introduce_list_shopping .basket a.active { - background: url(../img/nutrition/nutrition_introduce_ico_basket_on.png) no-repeat center/100% auto; + /* background: url(../img/nutrition/nutrition_introduce_ico_basket_on.png) no-repeat center/100% auto; */ +} + +.introduce_list_shopping .basket .cart { + width: 22px; + height: 22px; + border: 1px solid #D4D4D4; + border-radius: 4px; + padding: 2px; + display: flex; + justify-content: center; + background: url(../img/cart.svg) no-repeat center/90% auto; } +.introduce_list_shopping .basket .cart.active { + border: 1px solid #FF9C01; + background: url(../img/cart_active.svg) no-repeat center/90% auto; +} + /* 대소변 */ @@ -15567,6 +15584,7 @@ main.sona_cont_measurement { width: 100%; display: flex; justify-content: center; + align-items: center; color: #707070; font-size: 0.75rem; margin-bottom: 1rem; diff --git a/src/main/webapp/m/db/homemade/bowl.png b/src/main/webapp/m/db/homemade/bowl.png index c9dd849..cc73433 100644 Binary files a/src/main/webapp/m/db/homemade/bowl.png and b/src/main/webapp/m/db/homemade/bowl.png differ diff --git a/src/main/webapp/m/db/homemade/bowl_.png b/src/main/webapp/m/db/homemade/bowl_.png new file mode 100644 index 0000000..c9dd849 Binary files /dev/null and b/src/main/webapp/m/db/homemade/bowl_.png differ diff --git a/src/main/webapp/m/html/bf_food/10.이유식.html b/src/main/webapp/m/html/bf_food/10.이유식.html index c557609..bcc74c8 100644 --- a/src/main/webapp/m/html/bf_food/10.이유식.html +++ b/src/main/webapp/m/html/bf_food/10.이유식.html @@ -10,6 +10,9 @@ + + + @@ -223,23 +226,21 @@ 불린 쌀
20g - - +
  • 감자
    20g - - +
  • 오이
    0g - +
    • @@ -334,6 +335,11 @@
    * 영양성분과 식품군 분석을 통한 이유식이 추천됩니다. +
    + + + +
    @@ -416,11 +422,13 @@ $("#homeMadePop").toggleClass("open") }) - - $(".modal_close_btn").on("click", function () { $(".modal-wrapper").removeClass("open") }) + + $(".info_btn").on("click", function () { + Swal.fire({text: '* 이유식당 추천은 생후 월령에 맞춘 영양학적 수치를 고려하여 추천되며 실제 섭취할 식품 정보와 일치하지 않을 수 있으므로, 이에 대한 법적 책임은 없습니다.'}).then((result)=>{}) + }) diff --git a/src/main/webapp/m/img/cart.svg b/src/main/webapp/m/img/cart.svg new file mode 100644 index 0000000..0efd37d --- /dev/null +++ b/src/main/webapp/m/img/cart.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/src/main/webapp/m/img/cart_active.svg b/src/main/webapp/m/img/cart_active.svg new file mode 100644 index 0000000..f724b9a --- /dev/null +++ b/src/main/webapp/m/img/cart_active.svg @@ -0,0 +1,3 @@ + + + \ No newline at end of file