tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'campain'

Browse Source
This commit is contained in:
rosewiper 2023-12-14 17:50:03 +09:00
commit fd5043948d
2 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/webapp/WEB-INF/jsp/web/msgcampain/MsgDataSMLView.jsp
View File

@ -2177,31 +2177,31 @@ $('.registAddr').click(function(){
} }
nameList[i] = name; nameList[i] = name.replaceAll(",","§");
phoneNum[i] = phone; phoneNum[i] = phone;
if(rep1 == "" || rep1 == null){ if(rep1 == "" || rep1 == null){
rep1List[i] = "-"; rep1List[i] = "-";
}else{ }else{
rep1List[i] = rep1; rep1List[i] = rep1.replaceAll(",","§");
} }
if(rep2 == "" || rep2 == null){ if(rep2 == "" || rep2 == null){
rep2List[i] = "-"; rep2List[i] = "-";
}else{ }else{
rep2List[i] = rep2; rep2List[i] = rep2.replaceAll(",","§");
} }
if(rep3 == "" || rep3 == null){ if(rep3 == "" || rep3 == null){
rep3List[i] = "-"; rep3List[i] = "-";
}else{ }else{
rep3List[i] = rep3; rep3List[i] = rep3.replaceAll(",","§");
} }
if(rep4 == "" || rep4 == null){ if(rep4 == "" || rep4 == null){
rep4List[i] = "-"; rep4List[i] = "-";
}else{ }else{
rep4List[i] = rep4; rep4List[i] = rep4.replaceAll(",","§");
} }
/* if(name == "" || name == null){ /* if(name == "" || name == null){

13
src/main/webapp/WEB-INF/jsp/web/pop/testSendPop.jsp
View File

@ -123,9 +123,16 @@ function fn_testSendMsgData(){
form.smsTxt.value = adTxt + $(".preview_auto").find("pre").text() + '\n' + denyTxt + " "; //광고 문구 뒤에 공백을 붙이게되므로, 뒤에 한칸 추가하여 바이트수를 맞춤 form.smsTxt.value = adTxt + $(".preview_auto").find("pre").text() + '\n' + denyTxt + " "; //광고 문구 뒤에 공백을 붙이게되므로, 뒤에 한칸 추가하여 바이트수를 맞춤
} else if (msgKind == 'C') { //선거문자 } else if (msgKind == 'C') { //선거문자
var adTxt = $('.ad_tit').text(); var adTxt = '';
var denyTxt = $('.deny_receipt').html(); var denyTxt = '';
denyTxt = denyTxt.replaceAll("<br>","\n"); var adverYn = opener.document.msgForm.send_adYn.value;
//선거문자 20건 발송에서는 선거 필수문구가 필수가 아니어서 선거문자 필수 문구가 있는지 체크하여 처리함.20231214 추가
if(adverYn == 'Y'){
adTxt = $('.ad_tit').text();
denyTxt = $('.deny_receipt').html();
denyTxt = denyTxt.replaceAll("<br>","\n");
}
form.smsTxt.value = adTxt + '\n' + $(".preview_auto").find("pre").text() + '\n' + denyTxt; form.smsTxt.value = adTxt + '\n' + $(".preview_auto").find("pre").text() + '\n' + denyTxt;