-
+
@@ -36,6 +36,13 @@
${item['g']!}g
+
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 2a2475c..c30fedf 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
@@ -60,7 +60,7 @@
+
+
+
+
<#if model['ingre']?has_content>
<#list model['ingre'] as item>
- ${item['name_real']!}
+ ${item['name_real']!}
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 e988872..b43c615 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
@@ -43,7 +43,7 @@
${item['meaning']!}
-
-<#if (model['rm_child']['m']>5)&&(model['rm_child']['m']<60)>
-
- 조리과정
+레시피
<#if model['rm']['recipe1']?exists>${model['rm']['recipe1']!} <#if model['rm']['recipe2']?exists>${model['rm']['recipe2']!} @@ -76,36 +76,6 @@
-
-
-
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl
index 22e47a8..7a3893f 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl
@@ -36,13 +36,14 @@
//SMS 아이디 또는 패스워드를 찾기 위한 인증코드 발송
function ajax_send_sms(flag) {
+
if (is_loading == false) {
is_loading = true;
-
var phone_num = $('#phone').val();
if(phone_num == ''){
Swal.fire({ text: "휴대폰 번호를 입력해주세요.", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
+ is_loading == false
// stop_timer();
}else{
$.ajax({
@@ -57,8 +58,7 @@
dataType:'json',
error:function(request,status,error){
alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
-
- // stop_timer();
+ is_loading == false
},
success:function(result){
console.log(result);
@@ -69,25 +69,65 @@
if(RESULT == "true") {
if(s_no != ''){
- // start_timer();
- // Swal.fire({ text: "발송되었습니다.", icon: 'success', showConfirmButton: false, timer: 1500 }); // success
-
- //아이디 찾기의 경우
- if(flag == 1) {
+ if(flag == 1) { //아이디 찾기의 경우
location.href = "${URL_ROOT}/m/login/view_find_id_02.do?phone_num=" + phone_num + "&s_no=" + s_no;
} else if(flag == 2) { //패스워드 찾기의 경우
location.href = "${URL_ROOT}/m/login/view_pw_reset_phone_02.do?phone_num=" + phone_num + "&s_no=" + s_no;
}
-
}else{
Swal.fire({ text: "인증코드가 발송되지 않았습니다.", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
- // stop_timer();
}
} else {
- // Swal.fire({ text: RESULT_MSG, icon: 'success', showConfirmButton: false, timer: 1500 }); // success
- // stop_timer();
location.href='${URL_ROOT}/m/login/view_find_id_no_result.do?email=' + RESULT_MSG;
}
+ is_loading = false;
+ }
+ });
+ }
+ }
+ }
+
+ //전화번호 변경을 위한 인증코드 발송
+ function ajax_send_change_phone(flag) {
+
+ if (is_loading == false) {
+ is_loading = true;
+ var phone_num = $('#phone').val();
+
+ if(phone_num == ''){
+ Swal.fire({ text: "휴대폰 번호를 입력해주세요.", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
+ is_loading == false
+ }else{
+ $.ajax({
+ url:'${URL_ROOT}/api/sms/send_sms_change_phone.do?1=1',
+ type:'get',
+ data: {
+ "pt": 0
+ ,"is_test":"N"
+ ,"phone_num": phone_num
+ ,"sms_use_cd_no": "SMS_CHANGE_PWD"
+ },
+ dataType:'json',
+ error:function(request,status,error){
+ alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+ is_loading == false
+ },
+ success:function(result){
+ console.log(result);
+
+ var RESULT = result.RESULT;
+ var RESULT_MSG = result.MSG;
+ var s_no = result.s_no;
+
+ if(RESULT == "true") {
+ if(s_no != ''){
+ location.href = "${URL_ROOT}/m/member_env/view_set_account_phone_confirm.do?phone_num=" + phone_num + "&s_no=" + s_no;
+ }else{
+ Swal.fire({ text: "인증코드가 발송되지 않았습니다.", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
+ }
+ } else {
+ Swal.fire({ text: RESULT_MSG, icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
+ }
is_loading = false;
}
@@ -145,6 +185,88 @@
}
}
+ //전화번호 변경을 위한 인증번호 확인
+ function ajax_confirm_change_phone_sms() {
+ if (is_loading == false) {
+ is_loading = true;
+
+ var s_no = $('#s_no').val();
+ var phone_num = $('#phone').val();
+ var check_num = $('#check_num').val();
+
+ if(check_num == ''){
+ Swal.fire({ text: "인증번호를 입력해주세요.", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
+ is_loading = false;
+ }else{
+ $.ajax({
+ url:'${URL_ROOT}/api/sms/confirm_change_phone_sms.do?1=1',
+ type:'post',
+ data: {
+ "pt": 0
+ ,"is_test":"N"
+ ,"s_no": s_no
+ ,"phone_num": phone_num
+ ,"check_num": check_num
+ ,"sms_use_cd_no": "SMS_CHANGE_PWD"
+ },
+ dataType:'json',
+ error:function(request,status,error){
+ alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+ // stop_timer();
+ },
+ success:function(result){
+ console.log(result);
+ // var RESULT = result.RESULT;
+ // var RESULT_MSG = result.RESULT_MSG;
+
+ if(result.check_status == 'Y'){
+ // stop_timer();
+ location.href='${URL_ROOT}/m/member_env/view_set_account_phone_02.do?phone=' + phone_num + "&check_num=" + check_num;
+ }else{
+ Swal.fire({ text: "인증에 실패했습니다.", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
+ is_loading = false;
+ }
+
+ $('#check_status').val(result.check_status);
+ }
+ });
+ }
+ }
+ }
+
+ //전화번호 변경 처리
+ function ajax_change_phone() {
+ if (is_loading == false) {
+ is_loading = true;
+ var phone_num = $('#phone').val();
+
+ $.ajax({
+ url:'${URL_ROOT}/api/sms/ajax_change_phone.do?1=1',
+ type:'post',
+ data: {
+ "phone_num": phone_num
+ },
+ dataType:'json',
+ error:function(request,status,error){
+ is_loading = false;
+ alert("code:"+request.status+"\n"+"message:"+request.responseText+"\n"+"error:"+error);
+ },
+ success:function(result){
+ console.log(result);
+ // var RESULT = result.RESULT;
+ // var RESULT_MSG = result.RESULT_MSG;
+
+ if(result.RESULT_CODE == '200'){
+ Swal.fire({text: '전화번호가 변경 되었습니다.'}).then((result)=>{ window.location.href = '${URL_ROOT}/m/member_env/setting_nm.do?return_url=setting&view_nm=view_set_account' })
+ }else{
+ Swal.fire({ text: "전화번호 변경처리 실패했습니다.", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
+ }
+ is_loading = false;
+ }
+ });
+ }
+ }
+
//SMS 패스워드변경을 위한 인증번호 확인
function ajax_confirm_pw_sms() {
if (is_loading == false) {
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/index_bottom.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/index_bottom.ftl
index d9b0044..29c0008 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/include/index_bottom.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/include/index_bottom.ftl
@@ -162,6 +162,8 @@
<#--location.href = "${URL_ROOT}/m/bf_food/list_bf_homemade_recommend.do?smc_no=" + $("#smc_no").val() + "&return_url=list_bf_homemade_recommend";-->
location.href = "${URL_ROOT}/m/bf_food/list_bf_homemade_recommend.do?return_url=list_bf_homemade_recommend";
}
+
+
영양추천
-
-
- 연관식재료
--
- <#if model['ingre']?has_content>
- <#list model['ingre'] as item>
-
-
-
-
-
${item['name_real']!}
--
-
- - <#if item['keyword1']?exists>${item['keyword1']!} - <#if item['keyword2']?exists>, ${item['keyword2']!} - <#if item['keyword3']?exists>, ${item['keyword3']!} - -
- 조회수 ${item['views']!} -
-
-
-