java
/
bf
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

5/31 체크리스트 커밋

Browse Source 
#신호등 문구 설명, 위치 - sweetAlert2 적용중
#건강검진, 예방접종-지난 날짜 아래로, 회색 배경 + 해당 날짜 하이라이트 모듈 적용중
dev_bert
정이솔 3 years ago
parent a1d85757be
commit 98988bec73
10 changed files with 70 additions and 17 deletions
Show Stats Download Patch File Download Diff File

9
src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_homemade_recommend.ftl
Unescape View File

@ -72,6 +72,11 @@
<div class="recommend_tooltip"> <div class="recommend_tooltip">
* 영양성분과 식품군 분석을 통한 이유식이 추천됩니다. * 영양성분과 식품군 분석을 통한 이유식이 추천됩니다.
<div class="info_btn" style="margin-left: 5px; cursor: pointer;">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-circle-fill" viewBox="0 0 16 16">
<path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
</svg>
</div>
</div> </div>
<!-- search_cont --> <!-- search_cont -->
@ -120,6 +125,10 @@
$(".modal_close_btn").on("click", function () { $(".modal_close_btn").on("click", function () {
$(".modal-wrapper").removeClass("open") $(".modal-wrapper").removeClass("open")
}) })
$(".info_btn").on("click", function () {
Swal.fire({text: '* 이유식당 추천은 생후 월령에 맞춘 영양학적 수치를 고려하여 추천되며 실제 섭취할 식품 정보와 일치하지 않을 수 있으므로, 이에 대한 법적 책임은 없습니다.'}).then((result)=>{})
})
</script> </script>
</body> </body>

21
src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_ingre_recommend.ftl
Unescape View File

@ -1,10 +1,10 @@
<#include "/m/include/index_top.ftl"> <#include "/m/include/index_top.ftl">
<link rel="stylesheet" href="http://devops.lookylooks.ai:14280/bf/m/css/swiper.min.css"> <link rel="stylesheet" href="${URL_STATIC_ROOT}/m/css/swiper.min.css">
<script src="http://devops.lookylooks.ai:14280/bf/m/js/swiper.min.js"></script> <script src="${URL_STATIC_ROOT}/m/js/swiper.min.js"></script>
<script src="http://devops.lookylooks.ai:14280/bf/m/js/jquery_popupoverlay.js"></script> <script src="${URL_STATIC_ROOT}/m/js/jquery_popupoverlay.js"></script>
<script type="text/javascript" src="http://devops.lookylooks.ai:14280/bf/m/js/masonry.pkgd.min.js"></script> <script type="text/javascript" src="${URL_STATIC_ROOT}/m/js/masonry.pkgd.min.js"></script>
<script src="http://devops.lookylooks.ai:14280/bf/m/js/jquery.bxslider.js"></script> <script src="${URL_STATIC_ROOT}/m/js/jquery.bxslider.js"></script>
<script src="http://devops.lookylooks.ai:14280/bf/m/js/design.js"></script> <script src="${URL_STATIC_ROOT}/m/js/design.js"></script>
<script type="text/javascript" src="/bf/m/js/jquery.bpopup.min.js"></script> <script type="text/javascript" src="/bf/m/js/jquery.bpopup.min.js"></script>
<body> <body>
@ -71,6 +71,11 @@
<div class="recommend_tooltip"> <div class="recommend_tooltip">
* 영양성분과 식품군 분석을 통한 식재료가 추천됩니다. * 영양성분과 식품군 분석을 통한 식재료가 추천됩니다.
<div class="info_btn" style="margin-left: 5px; cursor: pointer;">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-circle-fill" viewBox="0 0 16 16">
<path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
</svg>
</div>
</div> </div>
<!-- search_cont --> <!-- search_cont -->
@ -109,6 +114,10 @@
$(".modal_close_btn").on("click", function (){ $(".modal_close_btn").on("click", function (){
$(".modal-wrapper").removeClass("open") $(".modal-wrapper").removeClass("open")
}) })
$(".info_btn").on("click", function () {
Swal.fire({text: '* 이유식당 추천은 생후 월령에 맞춘 영양학적 수치를 고려하여 추천되며 실제 섭취할 식품 정보와 일치하지 않을 수 있으므로, 이에 대한 법적 책임은 없습니다.'}).then((result)=>{})
})
</script> </script>
</body> </body>

5
src/main/webapp/WEB-INF/views/ftl/m/bf_food/view_bf_homemade_popup.ftl
Unescape View File

@ -32,7 +32,7 @@
<span class="tit">${item_index+1}.${item['di_name']!}</span> <span class="tit">${item_index+1}.${item['di_name']!}</span>
<div class="basket"> <div class="basket">
<span>${item['g']!}g</span> <span>${item['g']!}g</span>
<a href="javascript:insert_cart(${item['di_no']!},'${item['di_name']!}')" class="hidden <#if item['c_reg_dt']??>active</#if>">장바구니 담기</a> <a href="javascript:insert_cart(${item['di_no']!},'${item['di_name']!}')" class="cart hidden <#if item['c_reg_dt']??>active</#if>">장바구니 담기</a>
</div> </div>
</li> </li>
</#list> </#list>
@ -40,6 +40,9 @@
</ul> </ul>
</div> </div>
<!-- //nutrition_introduce_list --> <!-- //nutrition_introduce_list -->
<div class="description" style="position: relative; bottom: 22px">
* 구매가 필요한 식재료를 카트에 담아서 한 눈에 확인해보세요!
</div>
<!-- nutrition_introduce_box --> <!-- nutrition_introduce_box -->
<div class="nutrition_introduce_box"> <div class="nutrition_introduce_box">

2
src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl
Unescape View File

@ -191,7 +191,7 @@
<div class="main_pofile_info_txt txt02"> <div class="main_pofile_info_txt txt02">
<div class="main_pofile_info_txt02"> <div class="main_pofile_info_txt02">
<#if model['rm_child']['totalFood']?exists == true> <#if model['rm_child']['totalFood']?exists == true>
<strong id="totalFood">${model['rm_child']['totalFood']}</strong>% <strong id="totalFood">${model['rm_child']['totalFood']}</strong>점
</#if> </#if>
<#if model['rm_child']['totalFood']?exists == false> <#if model['rm_child']['totalFood']?exists == false>
<strong id="totalFood">-</strong> <strong id="totalFood">-</strong>

22
src/main/webapp/m/css/style.css
Unescape View File

@ -9590,6 +9590,7 @@ p.selectbox {
position: absolute; position: absolute;
top: 15px; top: 15px;
right: 0; right: 0;
display: flex;
} }
.introduce_list_shopping .basket span { .introduce_list_shopping .basket span {
@ -9602,14 +9603,30 @@ p.selectbox {
display: block; display: block;
width: 22px; width: 22px;
height: 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 { .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%; width: 100%;
display: flex; display: flex;
justify-content: center; justify-content: center;
align-items: center;
color: #707070; color: #707070;
font-size: 0.75rem; font-size: 0.75rem;
margin-bottom: 1rem; margin-bottom: 1rem;

BIN
src/main/webapp/m/db/homemade/bowl.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 81 KiB

After

Width:  |  Height:  |  Size: 88 KiB

BIN
src/main/webapp/m/db/homemade/bowl_.png
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 81 KiB

22
src/main/webapp/m/html/bf_food/10.이유식.html
Unescape View File

@ -10,6 +10,9 @@
<link rel="shortcut icon" href="../../img/favicon.ico"> <link rel="shortcut icon" href="../../img/favicon.ico">
<link rel="stylesheet" href="../../css/style.css"> <link rel="stylesheet" href="../../css/style.css">
<script type="text/javascript" src="../../js/jquery-3.3.1.min.js"></script> <script type="text/javascript" src="../../js/jquery-3.3.1.min.js"></script>
<link rel="stylesheet" href="../../css/sweetalert2.min.css" >
<script src="../../js/sweetalert2.all.min.js" type="text/javascript" ></script>
</head> </head>
<body> <body>
@ -223,23 +226,21 @@
<span class="tit">불린 쌀</span> <span class="tit">불린 쌀</span>
<div class="basket"> <div class="basket">
<span>20g</span> <span>20g</span>
<a href="javascript:void(0)" class="hidden">장바구니 담기</a> <a href="javascript:void(0)" class="cart hidden">장바구니 담기</a>
</div> </div>
</li> </li>
<li> <li>
<span class="tit">감자</span> <span class="tit">감자</span>
<div class="basket"> <div class="basket">
<span>20g</span> <span>20g</span>
<div class="cart hidden">장바구니</div>
<a href="javascript:void(0)" class="hidden">장바구니 담기</a>
</div> </div>
</li> </li>
<li> <li>
<span class="tit">오이</span> <span class="tit">오이</span>
<div class="basket"> <div class="basket">
<span>0g</span> <span>0g</span>
<a href="javascript:void(0)" class="hidden">장바구니 담기</a> <div class="cart active hidden">장바구니</div>
</div> </div>
</li> </li>
</ul> </ul>
@ -334,6 +335,11 @@
<div class="recommend_tooltip"> <div class="recommend_tooltip">
* 영양성분과 식품군 분석을 통한 이유식이 추천됩니다. * 영양성분과 식품군 분석을 통한 이유식이 추천됩니다.
<div class="info_btn" style="margin-left: 5px; cursor: pointer;">
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="currentColor" class="bi bi-info-circle-fill" viewBox="0 0 16 16">
<path d="M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16zm.93-9.412-1 4.705c-.07.34.029.533.304.533.194 0 .487-.07.686-.246l-.088.416c-.287.346-.92.598-1.465.598-.703 0-1.002-.422-.808-1.319l.738-3.468c.064-.293.006-.399-.287-.47l-.451-.081.082-.381 2.29-.287zM8 5.5a1 1 0 1 1 0-2 1 1 0 0 1 0 2z"/>
</svg>
</div>
</div> </div>
<!-- search_cont --> <!-- search_cont -->
@ -416,11 +422,13 @@
$("#homeMadePop").toggleClass("open") $("#homeMadePop").toggleClass("open")
}) })
$(".modal_close_btn").on("click", function () { $(".modal_close_btn").on("click", function () {
$(".modal-wrapper").removeClass("open") $(".modal-wrapper").removeClass("open")
}) })
$(".info_btn").on("click", function () {
Swal.fire({text: '* 이유식당 추천은 생후 월령에 맞춘 영양학적 수치를 고려하여 추천되며 실제 섭취할 식품 정보와 일치하지 않을 수 있으므로, 이에 대한 법적 책임은 없습니다.'}).then((result)=>{})
})
</script> </script>
</body> </body>

3
src/main/webapp/m/img/cart.svg
Unescape View File

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#D4D4D4" class="bi bi-cart3" viewBox="0 0 16 16">
<path d="M0 1.5A.5.5 0 0 1 .5 1H2a.5.5 0 0 1 .485.379L2.89 3H14.5a.5.5 0 0 1 .49.598l-1 5a.5.5 0 0 1-.465.401l-9.397.472L4.415 11H13a.5.5 0 0 1 0 1H4a.5.5 0 0 1-.491-.408L2.01 3.607 1.61 2H.5a.5.5 0 0 1-.5-.5zM3.102 4l.84 4.479 9.144-.459L13.89 4H3.102zM5 12a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm7 0a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm-7 1a1 1 0 1 1 0 2 1 1 0 0 1 0-2zm7 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 518 B

3
src/main/webapp/m/img/cart_active.svg
Unescape View File

@ -0,0 +1,3 @@
<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" fill="#FF9C01" class="bi bi-cart3" viewBox="0 0 16 16">
<path d="M0 1.5A.5.5 0 0 1 .5 1H2a.5.5 0 0 1 .485.379L2.89 3H14.5a.5.5 0 0 1 .49.598l-1 5a.5.5 0 0 1-.465.401l-9.397.472L4.415 11H13a.5.5 0 0 1 0 1H4a.5.5 0 0 1-.491-.408L2.01 3.607 1.61 2H.5a.5.5 0 0 1-.5-.5zM3.102 4l.84 4.479 9.144-.459L13.89 4H3.102zM5 12a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm7 0a2 2 0 1 0 0 4 2 2 0 0 0 0-4zm-7 1a1 1 0 1 1 0 2 1 1 0 0 1 0-2zm7 0a1 1 0 1 1 0 2 1 1 0 0 1 0-2z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 518 B

Write Preview
Loading…
Cancel
Save