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

fix bug

Browse Source
dev_bert
Shallwe 3 years ago
parent 3d5580dc40
commit 8270cafdfa
7 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File

2
src/main/resources/sqlmap/m/bf_growth/com.backoffice.m.bf_growth.xml
Unescape View File

@ -404,7 +404,7 @@
left join tbl_bf_family_baby fb
on fb.smc_no = #smc_no#
where not now() > date_add(date_add(fb.birthday, interval dvs.end_label month), interval -1 day)
order by recmnd_from_dt , dvs.dv_no, dvs.round
order by recmnd_from_dt desc , dvs.dv_no, dvs.round
</select>
<select id="select_bf_vac_schedule_list_prvs" resultClass="dataMap" parameterClass="dataMap">

4
src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01.ftl
Unescape View File

@ -20,7 +20,7 @@
<form id="frmJoinMember" name="frmJoinMember" method="post" action="authComplete.do" enctype="multipart/form-data">
<div class="sign_up">
<div class="sign_up_chk">
<h5>이름</h5>
<h5 style="margin-bottom: 10px;">이름</h5>
<div class="input_name">
<#if Session['rm_member']?exists>
<input type="text" id="name" name="name" value="${Session.rm_member['name']!}" placeholder="이름을 입력하세요" maxlength="30" class="input_box" onfocus="this.placeholder=''"
@ -30,7 +30,7 @@
onblur="this.placeholder='이름을 입력하세요'" />
</#if>
</div>
<h5>전화번호</h5>
<h5 style="margin-bottom: 10px;">전화번호</h5>
<div class="input_phone">
<#if Session['rm_member']?exists>
<input type="text" maxlength="15" id="phone" name="phone" value="${Session.rm_member['phone']!}" onkeyup="this.value = phone_mask(this.value)" placeholder="010-xxxx-zzzz" value="" class="input_box" onfocus="this.placeholder=''"

8
src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01_confirm.ftl
Unescape View File

@ -22,20 +22,20 @@
<div class="sign_up">
<div class="sign_up_chk">
<h5>이름</h5>
<h5 style="margin-bottom: 10px;">이름</h5>
<div class="input_name">
<input readonly type="text" id="name" name="name" value="${Session.rm_member['name']}" class="input_box" onfocus="this.placeholder=''"
onblur="this.placeholder='이름을 입력하세요'" />
</div>
<h5>전화번호</h5>
<h5 style="margin-bottom: 10px;">전화번호</h5>
<div class="input_phone">
<input readonly type="number" id="phone" name="phone" value="${Session.rm_member['phone']!}" class="input_box" onfocus="this.placeholder=''"
onblur="this.placeholder='전화번호를 입력하세요'" />
<p>* 번호로 인증코드를 발송하였습니다.</p>
</div>
<h5>인증코드</h5>
<h5 style="margin-bottom: 10px;">인증코드</h5>
<div class="input_sign_phone">
<input type="text" maxlength="4" id="check_num" name="check_num" placeholder="인증코드를 입력해 주세요." class="input_box" />
<input style="margin-bottom: 10px" type="text" maxlength="4" id="check_num" name="check_num" placeholder="인증코드를 입력해 주세요." class="input_box" />
남은시간 <span id="id_limit_time"></span>
</div>

4
src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_02.ftl
Unescape View File

@ -26,13 +26,13 @@
<div class="sign_up">
<div class="sign_up_chk">
<h6>이메일</h6>
<h6 style="margin-bottom: 10px">이메일</h6>
<div class="input_email">
<input type="text" id="email" name="email" maxlength="30" value="${Session.rm_member['userEmail']!}" placeholder="이메일을 입력해주세요" class="input_box" onfocus="this.placeholder=''"
onblur="this.placeholder='이메일을 입력해주세요'" />
</div>
<p>* 로그인과 비밀번호 분실 시 이용되므로 실제 사용하는 이메일 주소를 정확하게 입력해 주세요.</p>
<h6>닉네임</h6>
<h6 style="margin-bottom: 10px">닉네임</h6>
<div class="input_phone">
<input type="text" onkeyup="characterCheck(this)" onkeydown="characterCheck(this)" onfocusout="check_nickname()" id="nickname" name="nickname" maxlength="25" value="${Session.rm_member['userNm']!}" placeholder="닉네임을 입력해주세요" class="input_box" onfocus="this.placeholder=''"
onblur="this.placeholder='닉네임을 입력해주세요'" />

20
src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
Unescape View File

@ -154,10 +154,10 @@
<li></li>
</ul>
<div class="time_bar" style="top:-9px;">
<span></span>
<div class="time_bar" style="top:-9px;;z-index: 999999999">
<span style="background: #000"></span>
<div class="time_bar_number">
<img src="../img/time_bar02.png" alt="">
<img src="../img/time_bar02.png" alt="" style="filter: brightness(0);">
<p>00:00</p>
</div>
</div>
@ -170,13 +170,13 @@
<ul class="number_bottom">
<li>${model['dayList']['day1']!}</li>
<li>${model['dayList']['day2']!}</li>
<li>${model['dayList']['day3']!}</li>
<li>${model['dayList']['day4']!}</li>
<li>${model['dayList']['day5']!}</li>
<li>${model['dayList']['day6']!}</li>
<li>${model['dayList']['day7']!}</li>
<li>${model['dayList']['day1']?substring(5)!}</li>
<li>${model['dayList']['day2']?substring(5)!}</li>
<li>${model['dayList']['day3']?substring(5)!}</li>
<li>${model['dayList']['day4']?substring(5)!}</li>
<li>${model['dayList']['day5']?substring(5)!}</li>
<li>${model['dayList']['day6']?substring(5)!}</li>
<li>${model['dayList']['day7']?substring(5)!}</li>
</ul>
<ul class="number_right">

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

@ -4774,8 +4774,10 @@ main {
.m_set_description {
color: rgb(128, 128, 128);
font-size: 14px;
line-height: 20px;
line-height: 24px;
padding: 0 20px;
margin:10px 0;
}
/*****************************/

2
src/main/webapp/m/html/memory/memory_week.html
Unescape View File

@ -127,7 +127,7 @@
<li></li>
</ul>
<div class="time_bar" style="top:-9px;">
<div class="time_bar" style="top:-9px">
<span></span>
<div class="time_bar_number">
<img src="../../img/time_bar02.png" alt="">

Write Preview
Loading…
Cancel
Save