아기정보입력 생년월일 형식 수정

추천이유식 > 카트팝업 검색 기능 및 조회 적용
dev_bert
jonghwan76 3 years ago
parent 2299aece84
commit 40ccfe0a1d

@ -9,9 +9,12 @@
<option name="autoReloadType" value="SELECTIVE" />
</component>
<component name="ChangeListManager">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.">
<list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.-2">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/src/main/webapp/m/html/bf_food/10.이유식.html" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/m/html/bf_food/10.이유식.html" 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/resources/sqlmap/m/bf_food/com.backoffice.m.bf_food.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_food/com.backoffice.m.bf_food.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/bf_food/list_bf_cart_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_popup.ftl" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@ -213,7 +216,8 @@
<workItem from="1649909664739" duration="214000" />
<workItem from="1649917548966" duration="1302000" />
<workItem from="1649921550394" duration="230000" />
<workItem from="1649928321125" duration="16603000" />
<workItem from="1649928321125" duration="16823000" />
<workItem from="1650020162949" duration="5651000" />
</task>
<task id="LOCAL-00001" summary="최초 커밋">
<created>1645354476031</created>
@ -432,7 +436,14 @@
<option name="project" value="LOCAL" />
<updated>1649954244235</updated>
</task>
<option name="localTasksCounter" value="32" />
<task id="LOCAL-00032" summary="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.-2">
<created>1649954272997</created>
<option name="number" value="00032" />
<option name="presentableId" value="LOCAL-00032" />
<option name="project" value="LOCAL" />
<updated>1649954272997</updated>
</task>
<option name="localTasksCounter" value="33" />
<servers />
</component>
<component name="TypeScriptGeneratedFilesManager">
@ -452,7 +463,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="추천홈메이드이유식 수정" />
<MESSAGE value="추천홈메이드이유식 &gt; 팝업 &gt; 연관식품 삭제" />
<MESSAGE value="예방접종 표시 오류 수정" />
@ -477,6 +487,7 @@
<MESSAGE value="아이정보등록 퍼블리싱" />
<MESSAGE value="D-Day 설정관련 홈화면 오류 수정" />
<MESSAGE value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용." />
<option name="LAST_COMMIT_MESSAGE" value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용." />
<MESSAGE value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.-2" />
<option name="LAST_COMMIT_MESSAGE" value="추천이유식 - 추천이유식 식재료 팝업 및 카트 팝업 적용.-2" />
</component>
</project>

@ -1098,7 +1098,8 @@ public class M_Bf_foodController extends AbstractControllerManager{
result.put("msg", "아이를 선택하세요");
}else {
List<DataMap> lm = bf_foodBO.select_cart_list(paramMap);
DataMap.putToModel(model, "lm", lm);
result.put("lm", lm);
// DataMap.putToModel(model, "lm", lm);
}
}
}catch(Exception ex1){
@ -1106,7 +1107,7 @@ public class M_Bf_foodController extends AbstractControllerManager{
result.put("msg", ex1.getMessage());
}
gmUtil.redirectParam(model, paramMap);
// gmUtil.redirectParam(model, paramMap);
return result;
}

@ -196,7 +196,10 @@
LEFT JOIN tbl_db_bf_ingre dbi ON dbi.dbi_no = x.dbi_no
LEFT JOIN tbl_db_ingre di ON di.di_no = x.di_no
LEFT JOIN tbl_db_bf_commerce dbc ON dbc.dbc_no = x.dbc_no
WHERE 1=1
<isNotEmpty property="search_text">
AND di.di_name like concat('%',#search_text#,'%')
</isNotEmpty>
ORDER BY x.reg_dt DESC
</select>

@ -58,8 +58,8 @@
<div class="p_list_item child_box">
<label for="child_birthday" class="p_label">생년월일<span style="color:#FF9C01">*</span></label>
<div class="p_input_box">
<#if item??><input type="text" id="birthday" name="birthday" value="${model['rm_child']['birthday']?string('yyyy.MM.dd')}" class="" placeholder="YYYY.MM.DD">
<#else><input type="text" id="birthday" name="birthday" value="" class="" placeholder="YYYY.MM.DD"></#if>
<#if item??><input type="text" onkeyup="this.value = date_mask(this.value)" id="birthday" name="birthday" value="${model['rm_child']['birthday']?string('yyyy.MM.dd')}" class="" placeholder="YYYY.MM.DD">
<#else><input type="text" onkeyup="this.value = date_mask(this.value)" id="birthday" name="birthday" value="" class="" placeholder="YYYY.MM.DD"></#if>
</div>
</div>
<div class="p_list_item child_box">
@ -186,7 +186,20 @@
}
}
// 날짜를 yyyy-mm-dd 형식으로 만들어 줌.
function date_mask(objValue) {
var v = objValue.replace("--", ".");
if (v.match(/^\d{4}$/) !== null) {
v = v + '.';
} else if (v.match(/^\d{4}\.\d{2}$/) !== null) {
v = v + '.';
}
v = v.replace(/[a-zA-Z]/g, "");
v = v.replace( /[\{\}\[\]\/?,;:|\)*~`!^\-_+<>@\#$%&\\\=\(\'\"]/gi, "");
return v;
}
</script>
<#include "/m/bf_family_baby/include_return_url.ftl">

@ -5,7 +5,7 @@
<div class="bf_food_modal">
<div class="cart_search">
<input id="search_text" name="search_text" placeholder="구매완료할 식재료를 검색해주세요.">
<input id="search_text" name="search_text" onkeydown="javascript:if(event.keyCode == 13){fncCartList(); return false;}" placeholder="구매완료할 식재료를 검색해주세요.">
<button onclick="fncCartList()">검색</button>
</div>
@ -87,10 +87,45 @@
},
dataType:'json',
error:function(request,status,error){
is_stop_more = false;
},
success:function(result){
console.log(result);
var resultData = result.lm;
// -------- 데이터 입력 --------
$(".cart_list").html("");
$.each(resultData, function(i) {
var strHTML = "";
strHTML += "<input type='hidden' name='c_no' id='c_no' value='" + resultData[i].c_no + "'>";
strHTML += "<input type='hidden' name='di_no' id='di_no' value='" + resultData[i].di_no + "'>";
strHTML += "<input type='hidden' name='dbi_no' id='dbi_no' value='" + resultData[i].dbi_no + "'>";
strHTML += "<input type='hidden' name='dbc_no' id='dbc_no' value='" + resultData[i].dbc_no + "'>";
strHTML += "<div class='item'>";
strHTML += " <div class='box'>";
strHTML += " <input id='check_item_" + resultData[i].c_no + "' name='chk' value='" + resultData[i].c_no + "' type='checkbox' class='check'>";
strHTML += " <label for='check_item_" + resultData[i].c_no + "'></label>";
strHTML += " <div><label for='check_item_" + resultData[i].c_no + "'>";
if(resultData[i].di_no != null) {
strHTML += resultData[i].di_name;
} else if(resultData[i].di_no != null) {
strHTML += resultData[i].dbi_name;
} else if(resultData[i].di_no != null) {
strHTML += resultData[i].dbc_name;
}
strHTML += " </label>";
strHTML += " </div>";
strHTML += " </div>";
strHTML += "<div>" + resultData[i].g + "g</div>";
strHTML += "</div>";
$(".cart_list").append(strHTML);
});
// ul_board.append(html);
}
});

Loading…
Cancel
Save