--- .gitignore
+++ .gitignore
... | ... | @@ -201,3 +201,4 @@ |
| 201 | 201 |
rebel.xml |
| 202 | 202 |
/mvnw |
| 203 | 203 |
/mvnw.cmd |
| 204 |
+/.gemini.zip |
--- src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp
... | ... | @@ -176,6 +176,15 @@ |
| 176 | 176 |
imageInit(); |
| 177 | 177 |
|
| 178 | 178 |
|
| 179 |
+ // 첨부가 없으면 |
|
| 180 |
+ if ($('#sendFailImgSrc').attr('src') != null) {
|
|
| 181 |
+ $('#sendFailImg').hide();
|
|
| 182 |
+ $('#sendFailImgSrc').attr('src', '');
|
|
| 183 |
+ } |
|
| 184 |
+ |
|
| 185 |
+ |
|
| 186 |
+ |
|
| 187 |
+ |
|
| 179 | 188 |
//결제 금액 구하기 |
| 180 | 189 |
totalFtPriceSum(tableL.getRows().length); |
| 181 | 190 |
}); |
... | ... | @@ -589,6 +598,10 @@ |
| 589 | 598 |
$("#templateImageUrl").val(returnData.object.imgUrl);
|
| 590 | 599 |
$(".kakao_image").css("display", "block");
|
| 591 | 600 |
$("#kakaoImg").attr("src", returnData.object.imgUrl);
|
| 601 |
+ |
|
| 602 |
+ // 대체문자 |
|
| 603 |
+ $('#sendFailImg').show();
|
|
| 604 |
+ $('#sendFailImgSrc').attr('src', returnData.object.imgUrl);
|
|
| 592 | 605 |
} |
| 593 | 606 |
|
| 594 | 607 |
} else {
|
... | ... | @@ -2244,7 +2257,16 @@ |
| 2244 | 2257 |
<div class="clearfix"> |
| 2245 | 2258 |
<div class="put_left short"> |
| 2246 | 2259 |
<!-- 업로드한 이미지의 썸네일 영역 --> |
| 2247 |
- <ul class="thumb_wrap liOnImg ui-sortable"></ul> |
|
| 2260 |
+ <ul class="thumb_wrap liOnImg ui-sortable"> |
|
| 2261 |
+ <li class="delLi" id="sendFailImg" style="display: none"> |
|
| 2262 |
+ <div> |
|
| 2263 |
+ <img src="" id="sendFailImgSrc" class="thumb_img edit_y" alt="thumb1"> |
|
| 2264 |
+ </div> |
|
| 2265 |
+<!-- <button type="button" class="file_close"><img src="/publish/images/content/thumb_del.png" alt="첨부파일 삭제"></button> --> |
|
| 2266 |
+<!-- <button type="button" class="file_close_on"><img src="/publish/images/content/thumb_del_on.png" alt="첨부파일 삭제"></button> --> |
|
| 2267 |
+ </li> |
|
| 2268 |
+ |
|
| 2269 |
+ </ul> |
|
| 2248 | 2270 |
<!-- //업로드한 이미지의 썸네일 영역 --> |
| 2249 | 2271 |
<div class="ad_txt" style=""> |
| 2250 | 2272 |
<p>(광고)</p> |
--- src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/include/ftDataIncludeExcel.jsp
+++ src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/include/ftDataIncludeExcel.jsp
... | ... | @@ -283,7 +283,9 @@ |
| 283 | 283 |
|
| 284 | 284 |
// 6. 수량/가격 계산 |
| 285 | 285 |
setAllCntData(result); |
| 286 |
- fn_priceClclt(result.uniqueCount); |
|
| 286 |
+ // fn_priceClclt(result.uniqueCount); |
|
| 287 |
+ //결제 금액 구하기 |
|
| 288 |
+ totalFtPriceSum(tableL.getRows().length); |
|
| 287 | 289 |
|
| 288 | 290 |
|
| 289 | 291 |
$('#closeBtn').click();
|
--- src/main/webapp/js/kakao/ft/addr.js
+++ src/main/webapp/js/kakao/ft/addr.js
... | ... | @@ -203,7 +203,9 @@ |
| 203 | 203 |
$(".closeAddr").trigger("click");
|
| 204 | 204 |
//주소록 레이어 팝업의 Tabulator 데이터 지워주기 |
| 205 | 205 |
tableAddr.clearData(); |
| 206 |
- fn_priceClclt(result.uniqueCount); |
|
| 206 |
+ //결제 금액 구하기 |
|
| 207 |
+ totalFtPriceSum(tableL.getRows().length); |
|
| 208 |
+ // fn_priceClclt(result.uniqueCount); |
|
| 207 | 209 |
} |
| 208 | 210 |
|
| 209 | 211 |
function loadAddrList(){
|
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?