somang4819/itsm_ysm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

소스충돌 - 처리

Browse Source
This commit is contained in:
KNKIM 2021-11-18 17:22:59 +09:00
parent 24ce0b267e
commit 3b8b774cb1
1 changed files with 137 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
src/main/webapp/WEB-INF/jsp/nlib/member/alreadySignUpPopup.jsp
View File

@ -6,38 +6,38 @@
<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%> <%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
<script> <script>
$(document).ready(function(){ $(document).ready(function(){
var cnt=${cnt}; var cnt=${cnt};
if(cnt > 0) { if(cnt > 0) {
fn_showLayerPop(); fn_showLayerPop();
} else { } else {
window.close(); window.close();
} }
<%//비밀번호 찾기 페이지에서 다시 돌아왔을 경우 %> <%//비밀번호 찾기 페이지에서 다시 돌아왔을 경우 %>
var previousPage = "${vo.previousPage}"; var previousPage = "${vo.previousPage}";
if(previousPage == "alreadySignUpPopup") if(previousPage == "alreadySignUpPopup")
{ {
$("#alreadySingUpForm").css("display","none"); $("#alreadySingUpForm").css("display","none");
$("#selectAccountForm").css("display","block"); $("#selectAccountForm").css("display","block");
} }
}); });
function selectAccount(mbInfoId,name,email) function selectAccount(mbInfoId,name,email)
{ {
$("#alreadySingUpForm").css("display","none"); $("#alreadySingUpForm").css("display","none");
$("#mbInfoId").val(mbInfoId); $("#mbInfoId").val(mbInfoId);
$("#selectName").text(name); $("#selectName").text(name);
$("#selectEmail").text(email); $("#selectEmail").text(email);
$("#nameTemp").val(name); $("#nameTemp").val(name);
$("#emailTemp").val(email); $("#emailTemp").val(email);
$("#selectAccountForm").css("display","block"); $("#selectAccountForm").css("display","block");
} }
function goPrevious() function goPrevious()
{ {
$("#selectAccountForm").css("display","none"); $("#selectAccountForm").css("display","none");
$("#alreadySingUpForm").css("display","block"); $("#alreadySingUpForm").css("display","block");
} }
function accountLink() function accountLink()
@ -45,29 +45,29 @@ function accountLink()
password=$("#selectPassword").val(); password=$("#selectPassword").val();
if(password == "") if(password == "")
{ {
alert("비밀번호 입력이 필요합니다."); alert("비밀번호 입력이 필요합니다.");
return false; return false;
} }
$.ajax({ $.ajax({
url : "${pageContext.request.contextPath}/member/snsAccountLink.ajax", url : "${pageContext.request.contextPath}/member/snsAccountLink.ajax",
type : "POST", type : "POST",
async: false, async: false,
data : {"mbInfoId":$("#mbInfoId").val() data : {"mbInfoId":$("#mbInfoId").val()
,"password":password ,"password":password
,"name":$("#nameTemp").val() ,"name":$("#nameTemp").val()
,"email":$("#emailTemp").val() ,"email":$("#emailTemp").val()
}, },
success : function(result){ success : function(result){
if(result=="link") if(result=="link")
{ {
alert("계정이 통합되었습니다."); alert("계정이 통합되었습니다.");
location.href="${pageContext.request.contextPath}/member/snsAccountLinkLogin.do" location.href="${pageContext.request.contextPath}/member/snsAccountLinkLogin.do"
}else if(result=="mismatch") }else if(result=="mismatch")
{ {
alert("올바르지 않은 비밀번호입니다."); alert("올바르지 않은 비밀번호입니다.");
} }
},error : function(){ },error : function(){
} }
@ -90,9 +90,9 @@ function accountLink()
</div> </div>
<div class="row First"> <div class="row First">
<c:forEach items="${result}" var="result" varStatus="status"> <c:forEach items="${result}" var="result" varStatus="status">
<div class="Btn" onClick="selectAccount('<c:out value="${result.mbInfoId}"/>','<c:out value="${result.name}"/>','<c:out value="${result.email}"/>');"> <div class="Btn" onClick="selectAccount('<c:out value="${result.mbInfoId}"/>','<c:out value="${result.name}"/>','<c:out value="${result.email}"/>');">
<button type="button"><span class="name"><c:out value="${result.name}"/></span><span class="mail"><c:out value="${result.email}"/></span></button> <button type="button"><span class="name"><c:out value="${result.name}"/></span><span class="mail"><c:out value="${result.email}"/></span></button>
</div> </div>
</c:forEach> </c:forEach>
</div> </div>
<div class="row btn"> <div class="row btn">