Merge branch 'master' of http://106.246.249.162:13000/orderqueen/oqpo-view

src/main/webapp/mobile/app/mloanmng/MLOANMNG02010.html

@@ -254,7 +254,7 @@
 		<form id="ITP_POP_FORM_MLOANMNG02010_DPST_REQ" class="form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_POP_FORM_MLOANMNG02010_DPST_REQ_BRAND_ID" name="brandId" value="">
 			<input type="hidden" id="ITP_POP_FORM_MLOANMNG02010_DPST_REQ_STORE_ID" name="storeId" value="">
-			<div class="pop">
+			<div class="pop" style="height:370px;">
 				<div class="header">
 					<div class="header_left">
 						<label>입금등록</label>
@@ -302,7 +302,7 @@
 							</select>
 						</div>
 					</div>
-					<div class="line mt_5" style="height:70px;">
+					<div class="line mt_5">
 						<label>입금계좌번호</label>
 						<div class="search_wrap itp_ip">
 							<input id="ITP_FORM_MLOANMNG02010_POP_DPST_ACCT_NO" name="rcvAcctNo" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="입금계좌번호" type="number" >

src/main/webapp/mobile/app/popup/biz/BIZPOP_PO_PAYMENT.html

@@ -39,7 +39,7 @@
 										<label class="shot">주문번호</label>
 									</div>
 									<div class="info_box">
-										<div class="fnPoOrdNo">ㅁㅇㄹㄴㄹㄴㅁㅇㄹㄴ</div>
+										<div class="fnPoOrdNo"></div>
 									</div>
 								</div>
 								<div class="line shot">
@@ -63,7 +63,7 @@
 										<label class="itp_lb">결제금액*</label>
 									</div>
 									<div class="info_box">
-										<input type="text" id="ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT" class="itp_input" name="goodsAmt" />
+										<input type="number" id="ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT" class="itp_input" name="goodsAmt" />
 									</div>
 								</div>
 								<div class="line shot">

src/main/webapp/mobile/css/style.css

@@ -120,7 +120,7 @@ section .popup2 .pop .popup_scroll li .right button {padding: 0px; font-size: 17
 section .popup2 .pop .popup_scroll li .add button{float: right; width: 60px; height: 55px; margin: 12px 9px; border-radius: 10px; font-size: 1rem; background: rgb(198, 170, 250);}
 section .popup2 .pop .popup_scroll li .right input {width:43px; height:27px; margin:0; padding:3px; text-align:center; border-radius:0px; border:1px solid #E0B8AB;}
 section .popup2 .pop .popup_scroll li .right input:focus {outline:none;}
-section .popup2 .pop .content .line button {width: 35%; height: 35px;font-size: 14px; font-weight:100; padding-top: 7px; margin: 0 10px;}
+section .popup2 .pop .content .line button {width: 35%; height: 26px;font-size: 12pt; font-weight:100; padding-top: 0px; margin: 0 10px;}
 section .popup2	.list_line {width:98%; float:left; height:30px;display: inline-flex; margin:0 1%; font-size:12px;}
 section .popup2 .border {border-bottom: 1px solid #000 !important;}
 section .popup2 .list_line .list_label {width:30%;border:1px solid #000; height:30px; padding-top:4px; border-bottom:none; background:#eee;}
@@ -147,7 +147,7 @@ section .popup2 .search .right button {width:70px; height:34px; font-size:12pt;
 section .popup2 .content .line .search_wrap input {float:right; width:50%; margin-right:0px; margin-top:0;}
 section .popup2 .content .line.mt_5 {margin-top:5px; width:300px;}
 section .popup2 .content .line.ml_10 {}
-section .popup2 .content .line .search_wrap select {float:right; width:50%; height:34px; margin-right:0px;}
+section .popup2 .content .line .search_wrap select {float:right; width:50%; height:26px; margin-right:0px;}
 
 
 section .popup3 {position: absolute; top:0;width: 100%; height: 100vh; background: transparent; z-index: 11;}
@@ -398,10 +398,10 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .list_line .mail select {width:30%; height:34px; font-size:14px; border: 1px solid #aaa;border-radius: 5px;}
 .content .list_line .list_info .pay_info {text-align:left; padding-left:17px; font-size:12pt;}
 .content .table_header {margin-top: 6px; width: 100%; height: 20px;}
-.content .table_btn {margin-top: 6px; width: 100%; height: 30px;}
+.content .table_btn {margin-top: 6px; width: 100%; height: 40px;}
 .content .table_header h1 {margin-left: 15px; margin-top:0px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
-.content .table_btn h1 {margin-left: 15px; margin-top:10px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
-.content .table_btn button {float: right; width: 75px; height:26px; font-size: 10pt; font-weight: 100; padding:0px; margin: 0px 12px 0px 0; border-radius:15px;}
+.content .table_btn h1 {margin-left: 15px; margin-top:16px; margin-bottom:0; font-size: 13px; float: left; color: #000; font-weight: 100;}
+.content .table_btn button {float: right; width: 75px; height:34px; font-size: 10pt; font-weight: 100; padding:0px; margin: 0px 12px 0px 0; border-radius:15px;}
 .detail_content {top: 0px; position: fixed; display:contents; z-index: 10; width:100%; background: #fff;}
 .detail_content .detail_content_fix {background: #f5f6f6; border-bottom:1px solid #E0B8AB;}
 .detail_content .detail_header {width: 330px; height: 50px; margin:0; left:50%; position:relative; transform:translateX(-50%);}

src/main/webapp/mobile/js/app/popup/biz/ITP_BIZPOP_PO_PAYMENT.js

@@ -30,7 +30,16 @@ var popPageObj = {
 			$('#ITP_BIZPOP_PO_PAYMENT').modal('hide'); // 팝업닫기
 		});
 		$('#ITP_BTN_PO_PAYMENT_CONFIRM_POP').on('click', function () {
+			if($('input[id="ITP_FORM_PO_PAYMENT_POPUP_GOODS_AMT"]').val() === '') {
+				alert('결제 금액을 입력하세요.');
+				return;
+			}
+			if($('input[id="ITP_FORM_PO_PAYMENT_POPUP_ORD_TEL"]').val() === '') {
+				alert('휴대폰 번호를 입력하세요.');
+				return;
+			}
 			popPageObj.fnPaymentReq();
+			$('#ITP_BIZPOP_PO_PAYMENT').modal('hide'); // 팝업닫기
 		});
 	}, 
 	change: function() {