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

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

@@ -1,5 +1,5 @@
 <section id="ITP_MOBILE_MLOANMNG02010">
-	<div id="ITP_AJAX_MLOANMNG02010_LIST_CONTAINER">
+	<div id="ITP_AJAX_MLOANMNG02010_LIST_CONTAINER" style="display: none;">
 		<form id="ITP_FORM_MLOANMNG02010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 			<input type="hidden" id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
@@ -32,10 +32,11 @@
 				<input id="ITP_FORM_MLOANMNG02010_LIST_SEARCH_TO_DT" name="toDt" class="year" type="date">
 			  </div>
 			</div>
-			<div class="line">
+			<div class="line" style="height:45px;">
 			  <div class="search">
+			  	<button id="ITP_BTN_MLOANMNG02010_LIST_PAY" class="col_3 btn-danger btn-sm ">결제하기</button>
 				<button id="ITP_BTN_MLOANMNG02010_LIST_ADD" class="col_3 btn-yellow btn-sm ">입금등록</button>
-				<button id="ITP_BTN_MLOANMNG02010_LIST_SEARCH" class="col_5 btn-primary btn-sm ADB">검색</button>
+				<button id="ITP_BTN_MLOANMNG02010_LIST_SEARCH" class="col_3 btn-primary btn-sm ADB">검색</button>
 			  </div>
 			</div>
 			<div class="table_header">
@@ -44,7 +45,7 @@
 		  </div>
 			<div id="ITP_LIST_MLOANMNG02010_LIST_ITEM_AREA" class="scroll_area row-2">
 			  <ul id="ITP_LIST_MLOANMNG02010_LIST_ITEM_ROWS" class="panel-group"></ul>
-			  <div id="ITP_LIST_MLOANMNG02010_LIST_ITEM_ROWCOPY" style="display: none;">
+			  <div id="ITP_LIST_MLOANMNG02010_LIST_ITEM_ROWCOPY" style="display: block;">
 				<li class="history_list4 list-row">
 				  <div class="button_right btn-dpst" style="display: none;">
 					<button id="ITP_BTN_MLOANMNG02010_LIST_AGREE" class="btn-primary AGR">승인</button>
@@ -97,6 +98,25 @@
 		  </div>
 	  </form>
 	</div>
+	<div id="ITP_AJAX_MLOANMNG02010_VIEW_CONTAINER" style="display: block;">
+	  <form id="ITP_FORM_MLOANMNG02010_VIEW_SEARCH" class="form-horizontal" onsubmit="return false;">
+		<input type="hidden" id="ITP_FORM_MLOANMNG02010_VIEW_SEARCH_BRAND_ID" name="sbrandId" value="">
+		<input type="hidden" id="ITP_FORM_MLOANMNG02010_VIEW_SEARCH_STORE_ID" name="sstoreId" value="">
+		  <div class="content">
+			<div class="line">
+			  <label>수발주 선불(충전)을 위해 아래 항목을 입력을 한 후에 결제 버튼을 클릭하여<br> PG사 결제 절차에 따라 결재을 진행해 주시기 바랍니다.</label>
+			</div>
+			<div class="list_line">
+				<div class="list_label">
+					<label>주문번호</label>
+				</div>
+				<div class="list_info">
+					<div class="fnPayNo">Psfas67f6s7f66</div>
+				</div>
+			</div>
+		  </div>	
+	  </form>
+	</div>
 	<div id="ITP_MOBILE_JS"></div>
 	<div id="ITP_POP_MLOANMNG02010_STORE_AREA" class="popup2 mobile-pop-close" style="display: none;">
 		<div class="pop">

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

@@ -1,5 +1,5 @@
 <section id="ITP_MOBILE_MLOANMNG03010">
-	<div id="ITP_AJAX_MLOANMNG03010_LIST_CONTAINER" style="display: block;">
+	<div id="ITP_AJAX_MLOANMNG03010_LIST_CONTAINER" style="display: none;">
 		 <form id="ITP_FORM_MLOANMNG03010_LIST_SEARCH" class="form-horizontal" onsubmit="return false;">
 			 <input type="hidden" id="ITP_FORM_MLOANMNG03010_LIST_SEARCH_BRAND_ID" name="sbrandId" value="">
 			 <input type="hidden" id="ITP_FORM_MLOANMNG03010_LIST_SEARCH_STORE_ID" name="sstoreId" value="">
@@ -109,7 +109,7 @@
 		  </div>
 	  </form>
 	</div>
-	<div id="ITP_AJAX_MLOANMNG03010_VIEW_CONTAINER" style="display: none;">
+	<div id="ITP_AJAX_MLOANMNG03010_VIEW_CONTAINER" style="display: block;">
 		<form id="ITP_FORM_MLOANMNG03010_VIEW" class="form-horizontal" onsubmit="return false;">
 			<input type="hidden" id="ITP_FORM_MLOANMNG03010_VIEW__SEARCH_BRAND_ID" name="sbrandId" value="">
 			<input type="hidden" id="ITP_FORM_MLOANMNG03010_VIEW__SEARCH_STORE_ID" name="sstoreId" value="">
@@ -219,6 +219,10 @@
 				</li>
 			</div>
 		  </div>
+		 <div class="button_bar">
+				<button id="ITP_BTN_MLOANMNG03010_LIST_PAY" class="btn_col_6 btn-primary PAY">결제</button>
+				<button id="ITP_BTN_MLOANMNG03010_LIST_CANCEL" class="btn_col_3 btn-gray CLB">취소</button>
+			</div>
 	  </form>
 	</div>
 	<div id="ITP_MOBILE_JS"></div>

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

@@ -226,8 +226,10 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line div.date_to div.at {width: 3%;  font-size: 1rem; float: right; display: contents;}
 .content .line .search {width: 100%; height: 50px;}
 .content .line .search button {width: 50%; height: 35px; font-size: 1rem; padding: 0;}
-.content .line .search button.col_3 {width: 35%; margin-left:12px; float: left;}
-.content .line .search button.col_5 {width: 55%; margin-right: 10px; float: right;}
+.content .line .search button.col_3 {width: 25%; margin:0 12px;}
+.content .list_line {width:100%; float:left; height:70px;}
+.content .list_line .list_label {border:1px solid #000; height:70px; padding-top:22px;}
+.content .list_line .list_info {width:60%;height:70px; border:1px solid #000;}
 .content .table_header {margin: 0 auto; width: 100%; height: 50px; background-color: #92c7f6; position: fixed; z-index: 10; border-bottom: 1px solid #000; border-top: 1px solid #000;}
 .content .table_header h1 {margin-top: 12px; margin-left: 10px; font-size: 1.2rem; float: left; color: #fff; font-weight: 100;}
 .content .table_header button {float: right; width: 111px; font-size: 1rem; padding: 5px 20px; margin: 8px;}