Merge branch 'master' into kakaoFT

src/main/java/itn/let/mjo/pay/web/MjonPayController.java

@@ -3003,6 +3003,41 @@ public class MjonPayController {
   			try { wb.close(); } catch(Exception ignore) {}
   		}
 	}
+	
+	
+    @RequestMapping(value= {"/web/member/pay/PrintPayUserSWListAjax.do"})
+	public String printPayUserSWListAjax(
+			@ModelAttribute("searchVO") MjonMsgVO mjonMsgVO
+			, RedirectAttributes redirectAttributes
+			, ModelMap model) throws Exception {
+		//로그인 권한정보 불러오기
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
+		String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
+		String userNm = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getName());
+		
+		mjonMsgVO.setUserId(userId);
+		model.addAttribute("userNm", userNm);
+		
+		
+		mjonMsgVO.setFirstIndex(0);
+		mjonMsgVO.setRecordCountPerPage(10000);
+		
+		//결제 리스트 정보 불러오기
+		List<MjonMsgVO> payUserList =  mjonMsgDataService.selectPayUserSWList(mjonMsgVO);
+		model.addAttribute("payUserList", payUserList);
+		
+		Calendar cal = Calendar.getInstance();
+
+		int year = cal.get(Calendar.YEAR);
+		int month = cal.get(Calendar.MONTH) + 1;
+		int day = cal.get(Calendar.DAY_OF_MONTH);
+		
+		model.addAttribute("year", year);
+		model.addAttribute("month", month);
+		model.addAttribute("day", day);
+
+		return "web/pay/PrintPayUserSWListPopUp";
+	}
     
     
     

src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp

@@ -1524,7 +1524,7 @@ function actionLogin() {
 	            						<li><a href="<c:out value='/web/pay/PayGuide.do'/>" rel="nosublink">요금안내/견적내기</a></li>
 	            						<li><a href="<c:out value='/web/member/pay/PayView.do'/>" rel="nosublink">결제하기</a></li>
 	            						<li><a href="<c:out value='/web/member/pay/PayList.do'/>" rel="nosublink">요금 결제내역</a></li>
-	            						<li><a href="<c:out value='/web/member/pay/PayUserList.do'/>" rel="nosublink">요금 사용내역</a></li>
+	            						<li><a href="<c:out value='/web/member/pay/PayUserSWList.do'/>" rel="nosublink">요금 사용내역</a></li>
 										<!-- 현금영수증 자동발행 주석 -->
 	            						<%-- <li><a href="<c:out value='/web/member/pay/BillPub.do'/>" rel="nosublink">계산서/현금영수증 발행 등록</a></li> --%>
 	            						<li><a href="<c:out value='/web/member/pay/BillPub.do'/>" rel="nosublink">세금계산서 발행</a></li>

src/main/webapp/WEB-INF/jsp/web/pay/BillPub.jsp

@@ -495,7 +495,7 @@
                     <li class="tab"><button type="button" onclick="location.href='/web/pay/PayGuide.do'">요금안내/견적내기</button></li>
 	                <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayView.do'">결제하기</button></li>
 	                <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayList.do'">요금 결제내역</button></li>
-	                <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserList.do'">요금 사용내역</button></li>
+	                <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserSWList.do'">요금 사용내역</button></li>
 	                <!-- <li class="tab active"><button type="button">계산서/현금영수증 발행 등록</button></li> -->
 	                <li class="tab active"><button type="button">세금계산서 발행 등록</button></li>
                 </ul><!--// tab button -->

src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp

@@ -405,7 +405,7 @@ function getMberGrdChk() {
 				<li class="tab active"><button type="button">요금안내/견적내기</button></li>
 				<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayView.do'">결제하기</button></li>
 				<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayList.do'">요금 결제내역</button></li>
-				<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserList.do'">요금 사용내역</button></li>
+				<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserSWList.do'">요금 사용내역</button></li>
 				<li class="tab"><button type="button" onclick="location.href='/web/member/pay/BillPub.do'">세금계산서 발행 등록</button></li>
 			</ul>
 			<!--// tab button -->

src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp

@@ -171,7 +171,7 @@ function fnShowRefundPrintPopup(){
 			<li class="tab"><button type="button" onclick="location.href='/web/pay/PayGuide.do'">요금안내/견적내기</button></li>
 			<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayView.do'">결제하기</button></li>
 			<li class="tab active"><button type="button" >요금 결제내역</button></li>
-			<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserList.do'">요금 사용내역</button></li>
+			<li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserSWList.do'">요금 사용내역</button></li>
 			<!-- 현금영수증 자동발행 주석 -->
 			<!-- <li class="tab"><button type="button" onclick="location.href='/web/member/pay/BillPub.do'">계산서/현금영수증 발행 등록</button></li> -->
 			<li class="tab"><button type="button" onclick="location.href='/web/member/pay/BillPub.do'">세금계산서 발행 등록</button></li>

src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWList.jsp

@@ -358,6 +358,10 @@ function fnRevDetailPop03(msgGroupId){
 									</span>원
 								</p>
 							</div>
+							<dl>
+								<dt>* 당월 납부 예상 포인트</dt>
+								<dd>- 납부 예상금액 결제 시 적립되는 포인트</dd>
+							</dl>
 						</div>
 						
 						<%-- 현재 회원의 보유잔액(캐시) --%>

src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp

@@ -160,7 +160,7 @@ function fnPayUserPrintPopup(){
 
 	$("#listForm").attr("target","msgSentPrint");
 	window.open('', 'msgSentPrint', 'width='+ popup_wid +', height='+ popup_ht +', left=' + popup_left + ', top='+ popup_top );
-	$("#listForm").attr({"action":"/web/member/pay/PrintPayUserListAjax.do", "method":"post"}).submit();
+	$("#listForm").attr({"action":"/web/member/pay/PrintPayUserSWListAjax.do", "method":"post"}).submit();
 }
 
 //환불요청 내역 프린트 출력 팝업

src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp

@@ -800,7 +800,7 @@ function getMberGrdChk() {
                     <li class="tab"><button type="button" onclick="location.href='/web/pay/PayGuide.do'">요금안내/견적내기</button></li>
                     <li class="tab active"><button type="button">결제하기</button></li>
                     <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayList.do'">요금 결제내역</button></li>
-                    <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserList.do'">요금 사용내역</button></li>
+                    <li class="tab"><button type="button" onclick="location.href='/web/member/pay/PayUserSWList.do'">요금 사용내역</button></li>
 					<!-- 현금영수증 자동발행 주석 -->
 					<!-- <li class="tab"><button type="button" onclick="location.href='/web/member/pay/BillPub.do'">계산서/현금영수증 발행 등록</button></li> -->
 					<li class="tab"><button type="button" onclick="location.href='/web/member/pay/BillPub.do'">세금계산서 발행 등록</button></li>

src/main/webapp/WEB-INF/jsp/web/pay/PrintPayUserSWListPopUp.jsp

@@ -0,0 +1,227 @@
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
+<%@ page import="itn.com.cmm.LoginVO" %>
+<!DOCTYPE html>
+<html lang="ko">
+	<head>
+		<meta charset="UTF-8">
+		<meta http-equiv="X-UA-Compatible" content="IE=edge">
+		<title>요금 사용내역</title>
+		<link href="https://fonts.googleapis.com/css2?family=Noto+Sans+KR:wght@100;300;400;500;700;900&display=swap" rel="stylesheet">
+		<link rel="stylesheet" href="/publish/css/reset.css">
+		<link rel="stylesheet" href="/publish/css/common.css">
+		<link rel="stylesheet" href="/publish/css/estimate.css">
+		<link rel="stylesheet" href="/publish/css/font.css">
+		<link rel="stylesheet" href="/publish/css/button.css">
+	</head>
+	<script type="text/javascript">
+		function f_print(){
+			
+			document.getElementById('est_btn_wrap').style.display = 'none';
+			var initBody = document.body.innerHTML;
+			window.onbeforeprint = function(){
+			// print_area는 인쇄하고자 하는 영역의 ID를 말합니다.( 필수 )
+// 			document.body.innerHTML = document.getElementById("print_area").innerHTML;
+			}
+			window.onafterprint = function(){
+				document.body.innerHTML = initBody;
+			}
+			window.print();
+			document.getElementById('est_btn_wrap').style.display = '';
+		}
+	</script>
+	<body>
+		<!-- 견적서 -->
+		<div class="estimate_wrap">
+			<div class="estimate">
+				<div class="est_head clearfix">
+					<img src="/publish/images/CI.png" alt="문자온 CI">
+					<div class="clearfix">
+						<p>(12248) 경기도 남양주시 다산순환로 20, A동 735호(다산동, 현대프리미어캠퍼스)</p>
+						<p>TEL  010-8432-9333</p>
+					</div>
+				</div>
+				<div class="est_body">
+					<h2>요금 사용내역</h2>
+					<div class="cont1 tb_ver2">
+						<div>
+							<table class="est_table">
+								<caption>발신자 정보</caption>
+								<colgroup>
+									<col style="width: 50px;">
+									<col style="width: auto;">
+								</colgroup>
+								<tbody>
+									<tr>
+										<th></th>
+										<td colspan="2" class="colspan">
+											<span><c:out value="${userNm}"/></span> &nbsp;님의 사용내역을 아래와 같이 확인합니다.
+										</td>
+									</tr>
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<div class="cont3">
+						<div class="est_table2_wrap">
+							<table class="est_table2">
+								<caption>사용날짜, 문자유형, 문자내용, 충전 충전금, 충전 포인트, 사용 충전금, 사용 포인트, 잔액 충전금, 잔액 포인트를 제공하는 표</caption>
+								<colgroup>
+									<col style="width: 15%;">
+									<col style="width: 10%;">
+									<col style="width: 15%;">
+									<col style="width: 15%;">
+									<col style="width: 10%;">
+									<%-- <col style="width: 10%;">
+									<col style="width: 15%;">
+									<col style="width: 10%;"> --%>
+								</colgroup>
+								<thead>
+									<tr>
+										<th rowspan="2" style=" vertical-align : middle;">
+											날짜
+										</th>
+										<th rowspan="2" style=" vertical-align : middle;">
+											문자유형
+										</th>
+										<th rowspan="2" style=" vertical-align : middle;border-right:1px solid #ccc;">
+											발송건수
+										</th>
+										<!-- <th colspan="2">충전</th> -->
+										<th colspan="2">사용</th>
+										<!-- <th colspan="2">잔액</th> -->
+									</tr>
+									<tr>
+										<th>충전금</th>
+										<th>포인트</th>
+										<!-- <th>충전금</th>
+										<th>포인트</th>
+										<th>충전금</th>
+										<th>포인트</th> -->
+									</tr>
+								</thead>
+								<tbody>
+								<c:choose>
+									<c:when test="${not empty payUserList}">
+										<c:forEach var="payUserInfo" items="${payUserList}" varStatus="status">
+											<tr>
+												<td>
+													<c:out value="${payUserInfo.regDate}"/>
+												</td>
+												<td>
+													<p style="text-align:center;">
+													<c:choose>
+														<c:when test="${payUserInfo.msgTypeTxt eq '6' && payUserInfo.fileCnt eq 0 }">
+															장문
+														</c:when>
+														<c:when test="${payUserInfo.msgTypeTxt eq '6' && payUserInfo.fileCnt ne 0 }">
+															그림
+														</c:when>
+														<c:when test="${payUserInfo.msgTypeTxt eq '8'}">
+															알림톡
+														</c:when>
+														<c:when test="${payUserInfo.msgTypeTxt eq '9'}">
+															친구톡
+														</c:when>
+														<c:when test="${payUserInfo.msgTypeTxt eq 'fax'}">
+															펙스
+														</c:when>
+														<c:otherwise>
+															단문
+														</c:otherwise>
+													</c:choose>
+													</p>
+												</td>
+												<td>
+													<c:out value="${payUserInfo.succSendCnt}"/>
+													<c:if test="${payUserInfo.msgTypeTxt eq 'fax'}">
+													(<c:out value="${payUserInfo.fileCnt}"/>)
+													</c:if>
+												</td>
+												<td>
+													<p class="fwRg c_002c9a" style="text-align:center;">
+														<fmt:formatNumber type="number" maxFractionDigits="3" value="${payUserInfo.succSendPrice}" var="succCash" />
+														<c:out value="${succCash}"/>
+													</p>
+												</td>
+												<td>
+													<p class="fwRg c_002c9a" style="text-align:center;">
+														0
+													</p>
+												</td>
+												<%-- <td>
+													<p class="fwRg c_002c9a">
+														<fmt:formatNumber type="number" maxFractionDigits="3" value="${payUserInfo.totPrice}" var="totPrice" />
+														<c:out value="${totPrice}"/>
+													</p>
+												</td>
+												<td>
+													<p class="fwRg c_002c9a">
+														0
+													</p>
+												</td>
+												<td>
+													<p class="fwRg c_222">
+														<fmt:formatNumber type="number" maxFractionDigits="3" value="${payUserInfo.thisPoint}" var="thisPoint" />
+														<c:out value="${thisPoint}"/>
+													</p>
+												</td>
+												<td>
+													<p class="fwRg c_222">
+														<c:out value="${payUserInfo.befPoint}"/>
+													</p>
+												</td> --%>
+											</tr>
+										</c:forEach>
+									</c:when>
+									<c:otherwise>
+										<tr>
+											<td colspan="5">
+												사용내역이 없습니다.
+											</td>
+										</tr>
+									</c:otherwise>
+								</c:choose>
+								</tbody>
+							</table>
+						</div>
+					</div>
+					<div class="cont4">
+						<table class="est_table">
+							<caption>공급가액, 부가세, 총 결제금액에 대한 표</caption>
+							<colgroup>
+								<col style="width: 64px;">
+								<col style="width: auto;">
+							</colgroup>
+							<tbody>
+								<tr>
+									<th>대표번호</th>
+									<td>010-8432-9333</td>
+								</tr>
+								<tr>
+									<th>이메일</th>
+									<td>help@iten.co.kr</td>
+								</tr>
+							</tbody>
+						</table>
+					</div>
+					<div class="cont5">
+						<p><span><c:out value="${year}"/></span> 년&nbsp;&nbsp;<span><c:out value="${month}"/></span> 월&nbsp;&nbsp;<span><c:out value="${day}"/></span> 일</p>
+						<div>
+							<span>주식회사 아이티앤 대표이사</span>
+							<span>유&nbsp;인&nbsp;식</span>
+                        <span class="big_stamp"><img src="/publish/images/content/big_stamp.png"></span>
+						</div>
+					</div>
+				</div>
+				<div class="est_btn_wrap" id="est_btn_wrap">
+					<button type="button" class="btnType" onclick="javascript:f_print(); return false;"><i class="print_img"></i>인쇄하기</button>
+				</div>
+			</div>
+		</div>
+		<!--// 견적서 -->
+	</body>
+</html>

src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp

@@ -484,7 +484,7 @@ function getMberGrdChk() {
 						</c:otherwise>
 					</c:choose>
 					
-					<button type="button" onclick="location.href='/web/member/pay/PayUserList.do';">
+					<button type="button" onclick="location.href='/web/member/pay/PayUserSWList.do';">
 						<img src="/publish/images/content/mypage_plus.png" alt="더보기">
 					</button>
 					<div class="table_wrap">

src/main/webapp/publish/css/content.css

@@ -477,11 +477,11 @@ input[type=text]::-ms-reveal, input[type=password]::-ms-reveal, input[type=email
 .send_top .top_content {background-color: #fff;padding: 30px 40px;border-radius: 10px;}
 .send_top .send_price {display: inline-block;position: relative;margin-left:50px;vertical-align: middle;line-height: 25px;height: 27.5px;}
 .send_top .send_price::after {content: "";position: absolute;background-color: #002c9a;width: 3px;height: 20px;border-radius: 2px; top: 50%;transform: translateY(-50%);left: -30px;}
-.send_top .send_price li {display: inline-block;color: #555;padding-right: 12px;margin-right: 6px;position: relative; font-size: 15px; letter-spacing: -0.5px;}
+.send_top .send_price li {display: inline-block;color: #555;padding-right: 7px;margin-right: 5px;position: relative; font-size: 15px; letter-spacing: -0.5px;}
 .send_top .heading .send_price li:first-child {margin-right:28px;}
 .send_top .send_price .price_line::after {content: "/";position: absolute;top: 50%;transform: translateY(-50%);right: 0;color: #ababab;font-size: 14px;}
 .send_top .send_price li .type {border: 1px solid #46484a;border-radius: 3px;margin-right: 8px; color: #46484a;padding: 0 4px;}
-.send_top .send_price li .price {color: #e40000;font-size: 18px;font-weight: 700;}
+.send_top .send_price li .price {color: #e40000;font-size: 16px;font-weight: 700;}
 .send_top .send_general {width: 100%;display: flex;display: -ms-flexbox; justify-content: space-between; position: relative;}
 /* left area 내용 입력 */
 .send_top .send_left {max-width: 870px;flex-basis: 68%;}
@@ -1051,7 +1051,7 @@ button.check_validity:hover  {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
 .hisroy_price .hisroy_price_in>div>p:last-child {float: right;}
 .hisroy_price .hisroy_price_in>div>p>span {font-size: 22px; font-family: 'GmarketSansBold'; color: #002c9a; padding-right: 5px;}
 	/*후불회원 요금 사용내역*/
-.hisroy_price .hisroy_defprice_in {background-color: #f2f2f2; width: calc(100%/4 - 20px); padding: 28px 22px; border-radius: 5px; box-sizing: border-box;}
+.hisroy_price .hisroy_defprice_in {position:relative; background-color: #f2f2f2; width: calc(100%/4 - 20px); padding: 28px 22px 40px 22px; border-radius: 5px; box-sizing: border-box;}
 .hisroy_price .hisroy_defprice_in>p {font-size: 20px; font-weight: 600;  margin-bottom: 25px;  font-family: 'GmarketSansBold';}
 .hisroy_price .hisroy_defprice_in i{background-size: 100%;}
 .hisroy_price .hisroy_defprice_in:nth-child(1) i {background-image: url(/publish/images/content/history_icon1.png); width: 23px; height: 26px; margin: 0 10px 2px 0;}
@@ -1064,6 +1064,11 @@ button.check_validity:hover  {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
 .hisroy_price .hisroy_defprice_in>div>p:first-child {float: left;}
 .hisroy_price .hisroy_defprice_in>div>p:last-child {float: right;}
 .hisroy_price .hisroy_defprice_in>div>p>span {font-size: 22px; font-family: 'GmarketSansBold'; color: #002c9a; padding-right: 5px;}
+.hisroy_price .hisroy_defprice_in .clearfix{ display: flex; justify-content: space-between; align-items: center; height: 40px; background-color: #fff; padding: 5px 15px; border-radius: 5px; margin: 0 0 10px 0;}
+.hisroy_price .hisroy_defprice_in .clearfix:last-child{margin: 0 0 0 0; text-align: right;}
+.hisroy_price .hisroy_defprice_in .clearfix p:nth-child(2n){width: calc(100% - 50px); text-align: right;}
+.hisroy_price .hisroy_defprice_in dl {position: absolute; font-size:13px; color:#777; padding:0; top:178px;}
+.hisroy_price .hisroy_defprice_in dl dd {padding:2px 0 0 8px;}
 
 .history_details .tType1_title{margin: 0;}
 .history_details .tType1_title img{margin: -4px 0 0 0;}
@@ -2076,6 +2081,10 @@ button.check_validity:hover  {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
 	.sub .election .receipt_number_table_wrap+.list_bottom .list_bottom_right button{font-size:14px;letter-spacing:-1px;}
 	.sub .election .receipt_number_table_wrap+.list_bottom .list_bottom_right .btn_gray.fill{padding:0 5px;}
 	.sub .election .receipt_number_table_wrap+.list_bottom .list_bottom_right .btn_yellow.fill{padding:0 3px;} 
+		
+	/* 후불회원 요금사용내역*/
+	.hisroy_price .hisroy_defprice_in>p {font-size: 18px; font-weight: 600;  margin-bottom: 25px;  font-family: 'GmarketSansBold';}
+	.hisroy_price .hisroy_defprice_in>div>p>span {font-size: 18px; font-family: 'GmarketSansBold'; color: #002c9a; padding-right: 5px;}
 }
 
 @media only screen and (max-width:1480px){
@@ -2216,7 +2225,8 @@ button.check_validity:hover  {border: 1px solid #a3a3a3;box-shadow: 0px 0px 5px
 	.kakaotalkset_cont .kakao_wrap .template_category{width: 259px;}
 	
 	/* 선거문자 */
-	.sub .election .list_bottom .list_bottom_right button{width:90px;height:30px;font-size:14px;letter-spacing:-1.4px;}
+	.sub .election .list_bottom .list_bottom_right button{width:90px;height:30px;font-size:14px;letter-spacing:-1.4px;}	
+	
 }
 
 @media only screen and (max-width:1300px){

src/main/webapp/publish/css/mem.css

@@ -317,8 +317,8 @@ input[type="password"].list_inputType1 {padding: 0px;background-color: transpare
 .my_dashboard .event_text span{font-size: 15px; font-weight: bold; color: #e40000; padding: 0 0 0 0;} */
 .my_dashboard .send_price{display: flex;width: calc(100% - 490px); height: 80%; margin: 0 0 0 0; line-height: 1; align-items: stretch;}
 .my_dashboard .send_price::after{display: none;}
-.my_dashboard .send_price .price_title{display: flex; width: 100px; background-color: #eea301; color: #fff; font-size: 20px; font-weight: bold; border-radius: 10px 0 0 10px; align-items: center; justify-content: center; line-height: 1.5;}
+.my_dashboard .send_price .price_title{display: flex; width: 100px; background-color: #eea301; color: #fff; font-size: 18px; font-weight: bold; border-radius: 10px 0 0 10px; align-items: center; justify-content: center; line-height: 1.5;}
-.my_dashboard .send_price .price_wrap{width: calc(100% - 100px); background-color: #fff; border-radius: 0 10px 10px 0;}
+.my_dashboard .send_price .price_wrap{width: calc(135% - 100px); background-color: #fff; border-radius: 0 10px 10px 0;}
 .my_dashboard .send_price ul{display: flex; width: calc(100% - 0px); border-bottom: 1px dashed #d5d5d5; margin: 0 auto; padding: 10px 14px; align-items: center; flex-wrap: wrap; box-sizing: border-box;}
 .my_dashboard .send_price ul:last-child{border: 0; align-items: flex-start;}
 .my_dashboard .send_price ul:first-child li:last-child{margin: 0; padding: 0}
@@ -673,8 +673,8 @@ input[type="password"].list_inputType1 {padding: 0px;background-color: transpare
 /* 마이페이지 */
 /*등급제 아이콘 추가*/
 @media only screen and (max-width:1540px){
-	.my_dashboard .send_price{width: calc(100% - 486px);}
+	.my_dashboard .send_price{width: calc(102% - 486px);}
-	.my_dashboard .send_price .price_wrap{width: calc(100% - 73px);}
+	.my_dashboard .send_price .price_wrap{width: calc(105% - 73px);}
 	.my_dashboard .send_price .price_title{width: 65px;}
 	.send_top .send_price li{margin-right: 2px; padding-right:6px;}
 	.my_dashboard>.my_dashboard_cont1, .my_dashboard>.my_dashboard_cont3{flex-wrap: nowrap;}
@@ -698,9 +698,10 @@ input[type="password"].list_inputType1 {padding: 0px;background-color: transpare
     .my_dashboard .my_dashboard_cont1 button {font-size: 16px; padding: 0 8px; margin: 0 0 0 13px; color: #002c9a;}
     .my_dashboard_cont1 .level_icon{margin: 0 22px 0 0;}
     .my_dashboard .send_price{margin: 0 -24px 0 0;}
-    .my_dashboard .send_price .price_wrap{width: calc(100% - 88px);}
+    .my_dashboard .send_price .price_wrap{width: calc(104% - 88px);}
     .my_dashboard .title_wrap .btnType{margin: 0 10px 0 0;}
 	/*.my_dashboard .send_price .price_title{width: 75px;}*/
+	.my_dashboard .send_price .price_title{width: 50px; font-size: 16px; line-height: 1.4:}
 }
 
 @media only screen and (max-width:1380px){
@@ -710,9 +711,8 @@ input[type="password"].list_inputType1 {padding: 0px;background-color: transpare
 @media only screen and (max-width:1300px){
     /* join3 */
     .mem_cont.join3 .text_middle>div {font-size: 16px;}
-    .my_dashboard .send_price .price_wrap{width:calc(100% - 80px);}
+    .my_dashboard .send_price .price_wrap{width:calc(101% - 72px);}
-    .my_dashboard .send_price .price_title{width: 60px; font-size:18px; line-height:1.4;}
+    .my_dashboard .send_price{width: calc(102% - 320px);}
-    .my_dashboard .send_price{width: calc(100% - 375px);}
 }
 @media only screen and (max-width:1280px{
 	.my_dashboard .send_price ul{padding: 10px 10px;}