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

src/main/webapp/app/popup/biz/BIZPOP_VERSION.html

@@ -0,0 +1,59 @@
+<div id="ITP_BIZPOP_VERSION" class="modal itp_modal in" style="display: block;">
+	<div class="modal-dialog" style="width: 450px">
+		<div class="modal-content ui-draggable ui-draggable-handle">
+			<form id="ITP_FORM_BIZPOP_VERSION" enctype="multipart/form-data">
+				<input type="hidden" id="ITP_FORM_BIZPOP_VERSION_VIEW_CD" name="viewCd" value="C">
+				<input type="hidden" id="ITP_FORM_BIZPOP_VERSION_APP_NO" name="appNo" value="">
+				<input type="hidden" id="ITP_FORM_BIZPOP_VERSION_APP_VER" name="appVer" value="">
+				<input type="hidden" id="ITP_FORM_BIZPOP_VERSION_DEVI_TP_CD" name="deviTpCd" value="SA">
+				<input type="hidden" id="ITP_FORM_BIZPOP_VERSION_APP_DIV_CD" name="appDivCd" value="10">
+				
+				<div class="modal-header">
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
+					<h5 class="modal-title">버전 등록</h5>
+				</div>
+				<div class="modal-body">
+					<div class="itp_form itp_type1 fix">
+						<div class="col-xs-12">
+							<div class="form-horizontal">
+								<div class="form-group">
+									<label class="col-xs-3 itp_lb"><b>단말 타입</b></label>
+									<div class="col-xs-7 itp_ip">
+										<strong style="font-size: 13px; display: block; padding-top: 4px">AOS</strong>
+									</div>
+								</div>
+								<div class="form-group">
+									<label class="col-xs-3 itp_lb">버전</label>
+									<div class="col-xs-1 itp_ip">
+										<input type="text" id="ITP_FORM_BIZPOP_VERSION_APP_VER_LEFT" value="" class="form-control itp_input text-center numberOnly">
+									</div>
+									<span class="col-xs-1 itp_msg" style="width: auto; padding: 10px 4px 0 4px">.</span>
+									<div class="col-xs-1 itp_ip">
+										<input type="text" id="ITP_FORM_BIZPOP_VERSION_APP_VER_MIDDLE" value="" class="form-control itp_input text-center numberOnly">
+									</div>
+									<span class="col-xs-1 itp_msg" style="width: auto; padding: 10px 4px 0 4px">.</span>
+									<div class="col-xs-1 itp_ip">
+										<input type="text" id="ITP_FORM_BIZPOP_VERSION_APP_VER_RIGHT" value="" class="form-control itp_input text-center numberOnly">
+									</div>
+									<span class="col-xs-4 itp_msg text-danger" style="width: auto; padding-left: 20px">major . major . minor</span>
+								</div>
+								<div class="form-group" style="margin-bottom: 0">
+									<label class="col-xs-3 itp_lb">버전 설명</label>
+									<div class="col-xs-8 itp_ip">
+										<textarea id="ITP_FORM_BIZPOP_VERSION_DES_VER" class="form-control" rows="3" name="desVer"></textarea>
+									</div>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="modal-footer">
+					<button type="button" class="btn btn-default" data-dismiss="modal">취소/닫기</button>
+					<button type="button" class="btn btn-primary" id="ITP_BIZPOP_VERSION_BTN_SAVE">저장</button>
+				</div>
+			</form>
+		</div>
+	</div>
+
+	<script src="/js/app/popup/ITP_BIZPOP_VERSION.js"></script>
+</div>

src/main/webapp/app/system/SYSTEM07010.html

@@ -0,0 +1,52 @@
+<section id="ITP_TAB_SYSTEM07010" class="tab-pane active itp_sec">
+	<div class="itp_cont">
+		<div class="itp_detail">
+			<div class="itp_det_head fix">
+				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>버전</strong></h2>
+				<div class="pull-right itp_cicon">
+					<button type="button" id="ITP_BTN_SYSTEM07010_SRH" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-plus"></i>신규등록</button>
+				</div>
+			</div>
+			<div class="itp_det_in">
+				<div class="itp_tab_wrap" id="ITP_SRH_SYSTEM07010_TAB_WRAP">
+					<ul class="itp_srh_tabs" style="width:20%;">
+						<li id="ITP_SRH_SYSTEM07010_TAB_AOS" class="active"><a href="javascript:void(0);">AOS</a></li>
+						<li id="ITP_SRH_SYSTEM07010_TAB_IOS"><a href="javascript:void(0);">IOS</a></li>
+					</ul>
+				</div>
+				<div id="ITP_AJAX_SYSTEM07010_LIST_CONTAINER">
+					<div class="itp_boardData type1" style="padding: 0 15px 0 15px">
+						<table id="ITP_SYSTEM07010_jqGrid_wait_list" class="table table-striped table-bordered">
+							<colgroup>
+								<col style="width: 5%">
+								<col style="width: 9%">
+								<col style="width: *">
+								<col style="width: 12%">
+								<col style="width: 8%">
+							</colgroup>
+							<thead>
+								<tr>
+					                <th>NO</th>
+					                <th>버전</th>
+					                <th>버전 설명</th>
+					                <th>등록 일시</th>
+					                <th>삭제</th>
+					            </tr>
+							</thead>
+							<tbody id="ITP_SYSTEM07010_jqGrid_tbody">
+								<tr data-app-no="AN20070008">
+						            <td class="ac">1</td>
+						            <td class="ac"><span class="itp_link">1.0.0</span></td>
+						            <td class="al">AOS</td>
+						            <td class="ac">2020.04.08 00:00:00</td>
+						            <td class="ac"><span class="itp_del">삭제</span></td>
+					        	</tr>
+							</tbody>
+						</table>
+					</div>	
+				</div>
+			</div>
+		</div>
+	</div>
+	<div id="ITP_TAP_JS"></div>
+</section>

src/main/webapp/css/style.css

@@ -116,9 +116,9 @@ a, button {outline:none !important; text-decoration:none !important;}
 #ITP_LOGIN .itp_img{width:150px; height:150px; top:-50px; position: absolute; margin:0 33.3%;}
 #ITP_LOGIN .itp_login_input label {position:absolute; top:50%; left:27px; color:#adadad; transform:translateY(-50%); font-size: 12px; border: none; outline:none; transition: top .5s ease;}
 #ITP_LOGIN .itp_login_input {width:90%; margin:0 5%; position:relative;}
-#ITP_LOGIN .itp_login_input input {width:100%; padding:20px 10px 10px; outline:none; border-radius:7px; background:#eee;}
-#ITP_LOGIN .itp_login_input input:focus + label {top:15px; font-size:8px; color: #2691d9;}
-#ITP_LOGIN .itp_login_input input:valid + label {top:15px; font-size:8px; color: #2691d9;}
+#ITP_LOGIN .itp_login_input input {width:100%; padding:10px 10px 10px; outline:none; border-radius:7px; background:#eee; font-size: 16px;}
+#ITP_LOGIN .itp_login_input input:focus + label {top:15px; font-size:8px; color: #2691d9; display: none;}
+#ITP_LOGIN .itp_login_input input:valid + label {top:15px; font-size:8px; color: #2691d9; display: none;}
 #ITP_LOGIN .itp_login_input:not(:placeholder-shown) ~ label{top:0px; font-size:12px;}
 
 /* 메인화면 */

src/main/webapp/js/app/oper/ITP_OPER02010.js

@@ -188,7 +188,7 @@ let pageObj = {
 		},
 		afflInfo: {
 			init: function() {
-				this.authTpCd 		= fn_make_user_info.get('authTpCd');
+				this.authTpCd = fn_make_user_info.get('authTpCd');
 				if(this.authTpCd === '30' || this.authTpCd === '40' || this.authTpCd === '50') {
 					this.afflShopId 	= fn_make_user_info.get('afflShopId');
 					this.afflShopNm 	= fn_make_user_info.get('afflShopNm');
@@ -196,6 +196,13 @@ let pageObj = {
 					this.brandNm 		= fn_make_user_info.get('brandNm');
 					this.setAffl();
 				}
+				if (this.authTpCd === '40' || this.authTpCd === '50') {
+					$('#ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_BTN').attr('disabled', true);
+					$('#ITP_FORM_OPER02010_DELETE_AFFL_SHOP_BTN').attr('disabled', true);
+				}
+				if (this.authTpCd === '50') {
+					$('#ITP_BTN_OPER02010_NEWREG').hide();					
+				}
 			},
 			setAffl: function() {
 				var _this = this;

src/main/webapp/mobile/app/login.html

@@ -20,6 +20,11 @@
       <form id="ITP_FORM_MOBILE_LOGIN" class="form-horizontal" action="" method="post" onsubmit="return false;">
         <input id="userId" name="userId" type="hidden" value="" />
         <input id="password" name="password" type="hidden" value="" />
+        <input id="appReg" name="appReg" type="hidden" value="" />
+        <input id="appVer" name="appVer" type="hidden" value="" />
+        <input id="deviId" name="deviId" type="hidden" value="" />
+        <input id="deviOsVer" name="deviOsVer" type="hidden" value="" />
+        <input id="deviTpCd" name="deviTpCd" type="hidden" value="" />
       <div class="login_popup">
         <div class="login_info">
 			<img src="../img/oqpologo.png" alt="로고" class=" ">

src/main/webapp/mobile/app/mpomng/MPOMNG01010.html

@@ -7,10 +7,12 @@
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOAN_DVSN" name="loanDvsn" value="">
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_DVSN" name="pchReqDvsn" value="">
-      <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_UNQ_NO" name="pchReqUnqNo" value="">
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_MALL_ID" name="mallId" value="">
       <div class="content">
+      	<div class="line header">
+			<div class="itp_search_header fnMenuNm">구매요청생성</div>
+      	</div>
         <div class="line">
           <label>납기요청일</label>
           <input id="ITP_FORM_MPOMNG01010_DETAIL_DLV_REQ_DT" name="dlvReqDt" class="date" data-check-required="empty" type="date" placeholder="">
@@ -29,43 +31,55 @@
         </div>
         <div class="line">
           <label>납품장소</label>
-          <div class="search_nm">
             <div class="float_left">
                 <input type="text" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_NM" class="" name="whsNm" data-check-required="empty" placeholder="매장명" readonly />
                 <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
                 <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
+             	<button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button>
             </div>
-            <div class="float_left_btn">
-              <button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button>
+            <div class="float_right_btn">
+              <!-- <button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button> -->
               <button id="ITP_BTN_MPOMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
             </div>
-          </div>
         </div>
-        <div class="line">
+        <div class="header line">
           <div class="table_header">
-            <h1>>구매 품목</h1>
+            <h1><구매품목></h1>
             <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
             <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MPOMNG01010_ITEM_AREA">품목추가</button>
           </div>
         </div>
       </div>
-      <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-1-1">
-        <ul id="ITP_LIST_MPOMNG01010_DETAIL_ROWS" class="panel-group"></ul>
+      <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-3">
+        <ul id="ITP_LIST_MPOMNG01010_DETAIL_ROWS" class="mb_0"></ul>
         <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: block;">
+      <!--   검색된 데이터가 없습니다  -->
+      	<div class="itp_non_data" style="display:none;">
+      		<div>검색된 데이터가 없습니다.</div>
+      	</div>
           <li class="list-row">
             <div class="left_info">
-              <div class="check_box"><!-- class 변경 -->
-                <div><input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
+              <div class="check_box">
+                <div style="display:none;"><input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
               </div>
               <div class="thick">
-                <div class="fnItemNm">품목명</div>
-                <div>-</div>
-                <div class="fnUnit">EA</div>
+                <div class="itp_item fnItemNm">품목명</div>
+                <div class="itp_item fnUnit">EA</div>
               </div>
               <div class="thick">
-                <label class="space0">구매가 :</label>
-                <div class="fnUnitAmt">1,120,000</div>
+                <div class="itp_gram fnUnitAmt">700g</div>
               </div>
+              <div class="thick">
+                <div class="itp_amt fnUnitAmt">1,120,000원</div>
+              </div>
+            </div>
+            <div class="md_info">
+            	<div class="thick">
+            		<div>2022.12.15</div>
+            	</div>
+            	<div class="thick">
+            		<div>브랜드 창고A</div>
+            	</div>
             </div>
             <div class="right">
               <button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS">-</button>
@@ -73,6 +87,7 @@
               <button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS">+</button>
             </div>
           </li>
+          
         </div>
       </div>
       <div class="button_bar">
@@ -105,7 +120,7 @@
             </div>
         </div>
     </div>
-    <div id="ITP_POP_MPOMNG01010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
+    <div id="ITP_POP_MPOMNG01010_WHS_AREA" class="popup2 mobile-pop-close" style="display: block;">
         <div class="pop">
             <div class="header">
                 <div class="header_left">

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

@@ -1,7 +1,12 @@
-@font-face { font-family: 'NanumBarunGothic';src: url('../fonts/NanumBarunGothic.eot');src: url('../fonts/NanumBarunGothic.eot') format('embedded-opentype'),url('../fonts/NanumBarunGothic.woff') format('woff');}
-* {margin: 0; padding: 0; box-sizing: border-box; text-align: center; font-family: 'NanumBarunGothic', 'serif'; list-style: none;}
+@font-face {
+    font-family: 'GmarketSansMedium';
+    src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff');
+    font-weight: normal;
+    font-style: normal;
+}
+* {margin: 0; padding: 0; box-sizing: border-box; text-align: center; font-family: 'GmarketSansMedium', 'serif'; list-style: none;}
 section {}
-body{background: #fff; position: relative; width: 100%; height: auto; font-family: 'NanumBarunGothic';}
+body{background: #fff; position: relative; width: 100%; height: auto; font-family: 'GmarketSansMedium';}
 .color-gray {color:#aaa;}
 /* 팝업 */
 section .popup { position: fixed; width: 100%; height: 100%; background: transparent; z-index: 11;}
@@ -25,7 +30,7 @@ section .popup2 .barcode h1{text-align: left; width: 85%; font-size: 1.1rem; mar
 section .popup2 .btn_barcode {margin-top: 20%;}
 section .popup2 .btn_barcode button {width: 35%; height: 50px; font-size: 1rem;}
 section .popup2 .pop { position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 95%; height: 85%; background: #fff; border: 2px solid #000;}
-section .popup2 .pop .header {position: relative; height: 50px; background: rgb(204, 225, 240); border-bottom: 1px solid #000;}
+section .popup2 .pop .header {position: relative; height: 50px; background: #f0831e; color:#eee; border-bottom: 1px solid #000;}
 section .popup2 .pop .header .header_left {float: left; padding-top: 5px; padding-left: 15px;}
 section .popup2 .pop .header .header_left label {font-size: 1.4rem;} 
 section .popup2 .pop .header .header_right {float: right; padding-right: 10px;}
@@ -50,6 +55,7 @@ section .popup2 .pop table tbody input{width:15px;}
 section .popup2 .pop .popup_scroll {position: relative; width: 100%;height: 720px; overflow: auto;}
 section .popup2 .pop .popup_scroll li {list-style: none; width: 99%; height: 50px; border: 1px solid #000; margin: 0 auto;}
 section .popup2 .pop .popup_scroll li.row_2 {height: 80px;}
+
 section .popup2 .pop .popup_scroll li .left {position: relative; float: left;}
 section .popup2 .pop .popup_scroll li .left .check_box {width:30px; float:left; height:80px; padding-left:5px; padding-top:20px;}
 section .popup2 .pop .popup_scroll li .left div {display: inline-block;}
@@ -100,7 +106,7 @@ section .popup3 .pop .header .header_right button {border: none; background: tra
 section .popup3 .pop .header .header_right button img {width:30px; height:30px;}
 /* 버튼 */
 button {background-color: #fff; padding: 10px;}
-button.btn-primary  {color: #fff; background-color: #337ab7; border: 1px solid #000;font-weight: 700;}
+button.btn-primary  {color: #fff; background-color: #8f9fc4; border: 1px solid #000;font-weight: 700;}
 button.btn-yellow   {color: #fff; background-color: rgb(255, 183, 0); border: 1px solid #000;font-weight: 700;}
 button.btn-gray     {color: #fff; background-color: gray; border: 1px solid #000;font-weight: 700;}
 button.btn-danger   {color: #fff; background-color: rgb(247, 76, 76); border: 1px solid #000;font-weight: 700;}
@@ -176,7 +182,9 @@ body.eee {height: 700px; background: #eee;}
 .main .wicon .icon_left {float: left;}
 
 
-input {margin-top: 3px; border: 1px solid #aaa; border-radius:5px; margin-top: -2px; height: 36px; font-size: 0.8rem; text-align: left; padding:0 15px;}
+input {margin-top: 3px; border: 1px solid #aaa; border-radius:5px; height: 36px; font-size: 0.8rem; text-align: left; padding:0 15px;}
+input[type="date"]::-webkit-calendar-picker-indicator {display:none;}
+
 select {border: 1px solid #000; height: 35px; font-size: 1rem; text-align: left; padding:0 15px;}
 input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
@@ -226,9 +234,11 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 #ITP_SIDEBAR .itp_nav .panel-title a .glyphicon {font-size:12px;}
 #ITP_SIDEBAR .itp_nav .panel-default {margin-bottom:0; border:none;}
 #ITP_SIDEBAR .itp_nav * {border-radius:0; border-width:1px 0 1px 0;}
+
 #ITP_SIDEBAR .itp_nav .itp_svgs_body {padding:0; border-top:0; border-bottom:1px solid #ddd;}
 #ITP_SIDEBAR .itp_nav .itp_svgs {display:flex; align-content:flex-start; flex-direction:column; flex-wrap:wrap; overflow:auto;}
 #ITP_SIDEBAR .itp_nav .itp_svgs .itp_svg_in {position:relative;}
+#ITP_SIDEBAR .itp_nav .itp_svgs li {width:100%; height:47px;}
 #ITP_SIDEBAR .itp_nav .itp_svgs li a {display:block; width:100%; color:#333; padding:5px 10px 5px 17px;}
 #ITP_SIDEBAR .itp_nav .itp_svgs li:first-child a {padding-top:10px;}
 #ITP_SIDEBAR .itp_nav .itp_svgs li:last-child a {padding-bottom:10px;}
@@ -250,22 +260,25 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
   padding-top: 50px;
   font-size: 2rem;
 }
-.content {z-index: 10; margin-top:5px; width:100%; background: #f4f5f4;}
-.content .line {position: relative; display: inline-block; width: 90%; height: 45px; margin-bottom: 0px;}
+.content {position:fixed; z-index: 10; padding-top: 10px; width:100%; background: #f4f5f4; border-bottom:1px solid #E0B8AB;}
+.content .header {width:100% !important; height:55px !important; margin:0 !important;}
+.content .line {position: relative; display: inline-block; width: 90%; height: 45px; margin:auto 5%; margin-bottom: -10px;}
 .content .line div {font-weight: 700;}
-.content .line label {min-width:110px; color:#555; font-size: 18px; margin-left: 10px; float: left; text-align: left; margin-top: 12px;}
+.content .line div.itp_search_header {font-weight:100; background:#fff; margin:5px 10px; padding:9px 10px 4px 9px; text-align: left; color:#b88278;border: 1px solid #aaa; border-radius: 5px;}
+.content .line label {min-width:110px; color:#666; font-size: 18px; margin-left: 10px; float: left; text-align: left; margin-top: 10px; font-weight:100;}
 .content .line label.pay_label {margin:38px 1%; width:98%;}
 .content .line select.label {border: 1px solid #000; font-size: 0.9rem;margin:9px 0 0 5px; float: left; width: 120px; height: 30px; text-align: left;}
-.content .line .search_nm {float: left; margin-right: 2%;}
 .content .line .search_wrap {float:right; margin-right:10px;}
-.content .line .float_left {float: left; margin-top:2px;}
-.content .line .float_left button {float: left;	border:none;}
+.content .line .float_left {float: left; margin-top:2px; width:200px;}
+.content .line .float_left button {top:5px; left:280px; position:absolute; background:transparent; border:none; width:36px; height:36px; padding:0;} 
+.content .line .float_left button img {width:22px;}
+.content .line .float_left input {width:200px;}
 .content .line .float_left.note {width: 100%; padding: 10px;}
 .content .line .float_left.note textarea {width: 100%; height: 100px; border: 1px solid #000; text-align: left;}
 .content .line .float_left div {font-size: 1rem; margin-top: 8px;}
-.content .line .float_left_btn {float: left; margin-top: 0px; margin-left: 5px;}
-.content .line .float_left_btn button {padding:0; width:36px; height:36px; border-radius:5px;}
-.content .line .float_left_btn button img {width:20px; height:20px;}
+.content .line .float_right_btn {float: left; margin-top: 5px; margin-left: 5px;}
+.content .line .float_right_btn button {padding:0; width:36px; height:36px; border-radius:5px; border:1px solid #aaa;}
+.content .line .float_right_btn button img {width:20px; height:20px;}
 .content .line .float_left select {float: left; width: 150px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem;}
 .content .line .line_right {font-size: 2rem; float: right; margin-right: 0%;}
 .content .line .line_right div {float: right; font-size: 18px;; margin-top: 12px; margin-right: 30px; color:#555;}
@@ -276,7 +289,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .line_right select.m9 {margin-right:83px;}
 .content .line .line_right input.date{width:140px; margin-right:132px; height:35px;} 
 .content .line .line_right select {float: right; width: 180px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem; margin-right:93px;}
-.content .line input.date {width: 40%; margin: 10px; height: 35px; float: left;}
+.content .line input.date {width: 200px; margin: 5px 0; height: 35px; float: left; text-align:center; font-size:14px;background: url(../img/calender.png)no-repeat 95% 50%/20px auto #fff;}
 .content .line input.date2 {width: 140px; height: 30px; margin-right:133px;}
 .content .line div.date_to {float: right; margin-right:10px;}
 .content .line div.date_to input.year {width: 120px; height: 30px;}
@@ -292,9 +305,9 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .list_line .mail input {width:30%;}
 .content .list_line .mail select {width:30%;}
 .content .list_line .list_info .pay_info {text-align:left; padding-left:17px;}
-.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;}
+.content .table_header {margin-top: 10px; width: 100%; height: 45px;}
+.content .table_header h1 {margin-left: 12px; font-size: 16px; float: left; color: #000; font-weight: 700;}
+.content .table_header button {float: right; width: 80px; height:30px; font-size: 12px; font-weight: 100; padding:0px; margin: 8px; border-radius:15px;}
 
 .detail_content {top: 0px; position: fixed; z-index: 10; width:100%; background: #fff;}
 .detail_content .detail_header {width: 100%; height: 80px; padding-top:65px}
@@ -342,7 +355,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .row-1-1{top:288px;}
 .row-2{top: 282px;}
 
-.row-3{top: 333px;}
+.row-3{top: 363px;}
 .row-4{top: 377px;}
 .row-5{top: 418px;}
 .row-6{top: 468px;}
@@ -351,14 +364,22 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .col-4{width:40% !important;}
 .col-6{width:60% !important;}
 
-
-.scroll_area li {margin: 5px 3px; list-style: none; width: 99%; height: 85px; border: 1px solid #000; background-color: #fff;}
-.scroll_area li .left_info {width:50%; float:left; font-size:1rem;}
+.scroll_area ul.mb_0 {margin-bottom:0;}
+.scroll_area .itp_non_data {margin:35% auto;}
+.scroll_area li {margin:0; list-style: none; width: 100%; height: 85px; border: 1px solid #ccc; background-color: #fff;}
+.scroll_area li.list-row {height:110px;}
+.scroll_area li .left_info {width:35%; float:left; font-size:1rem;}
 .scroll_area li .left_info div {display: inline-block;}
 .scroll_area li .left_info label{font-size: 1.1rem; font-weight:100; margin-left:10px;}
-.scroll_area li .left_info .thick {float:left;  margin: 8px 0 0 10px; font-size: 1rem; text-align: left; width: 90%; font-weight: 600;}
+.scroll_area li .left_info .thick {float:left;  margin: 2px 0 0 20px; font-size: 18px; text-align: left; width: 90%; font-weight: 100;}
+.scroll_area li .left_info .thick .itp_item {color:gray;}
+.scroll_area li .left_info .thick .itp_gram {color:#aaa; font-size:16px;}
+.scroll_area li .left_info .thick .itp_amt {color:#b88278; margin-top: 4px;}
 .scroll_area li .left_info .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
 .scroll_area li .left_info .history input{width: 150px;}
+.scroll_area li .md_info{width:35%; float:left; font-size:1rem; margin-top:25px;}
+.scroll_area li .md_info .thick {float:left;  margin: 2px 0 0 20px; font-size: 18px; text-align: left; width: 90%; font-weight: 100;}
+.scroll_area li .md_info .thick div{color:gray;}
 .scroll_area li.history_list {height: 140px; padding-top:8px;}
 .scroll_area li.history_list .btn_check {height:158px; margin-top:-5px; width:90%; float:right; padding-top:7px; }
 .scroll_area li.history_list .scroll_btn {width:10%; height:130px; margin-top:-5px; display:inline-flex;}
@@ -417,9 +438,9 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .scroll_area li .left .nomal div{min-width:90px; display: inline-flex; font-weight: 700; font-size: 1.1rem;}
 .scroll_area li .left .nomal .col_5{min-width:50px;}
 
-.scroll_area li .right {margin: 30px 20px 0 0; position: relative; display: flex; font-size: 1.4rem; font-weight: 700; float: right;}
-.scroll_area li .right .num {margin: 0 25px; width: auto;}
-.scroll_area li .right button {margin: -6px; padding:0px 7px; font-size: 1.5rem; border-radius: 0px;}
+.scroll_area li .right {margin: 42px 10px 0 0; position: relative; display: flex; height:35px; font-size: 1.4rem; font-weight: 700; float: right;}
+.scroll_area li .right .num {padding:8px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
+.scroll_area li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 1.5rem; border-radius: 0px;}
 
 /* ITP_FOOTER */
 #ITP_FOOTER .itp_modal {z-index:10000;}

src/main/webapp/mobile/js/app/login.js

@@ -20,7 +20,8 @@ require(['config'], function() {
 
 		$('#login_btn').click(function() {
 			if(itp_fn_login_validate()) {
-				itp_fn_login_proc();
+				itp_fn_login_info();
+				// itp_fn_login_proc();
 			}
 		});
 	});
@@ -83,6 +84,10 @@ function itp_fn_login_validate() {
 	return true;
 }
 
+function itp_fn_login_info() {
+	$(location).attr('href', 'app:loginInfo');
+}
+
 function itp_fn_login_proc() {
 	var callbackFn = function(result) {
 		var hashed = fnHashed(result.hashed);
@@ -96,8 +101,19 @@ function itp_fn_login_proc() {
 	    	$(location).attr('href', MOBILE_CONTEXTPATH + '/app/main.html');
 		};
 		var params = $('#ITP_FORM_MOBILE_LOGIN').serializeObject();
-		// console.log(JSON.stringify(params));
-		fn_ajax_call('/api/member/sign-in', JSON.stringify(params), loginFn, 'POST'); //암호화 해서 보내는 경우 먼저 해시키를 가져와서 암호화해서 보낸다
+		console.log('/api/member/sign-in-app');
+		console.log(JSON.stringify(params));
+		fn_ajax_call('/api/member/sign-in-app', JSON.stringify(params), loginFn, 'POST'); //암호화 해서 보내는 경우 먼저 해시키를 가져와서 암호화해서 보낸다
 	};
 	fn_ajax_call('/api/session/hashed', null, callbackFn, 'GET'); //Crypto 암호화를 위한 해쉬키.. 로그인 후에는 Jwt 포함인 /api/session/hashedKey 이걸로 호출해서 사용한다.
 }
+
+function appCallFnLoginInfo(strInfo) {
+	let appInfo = JSON.parse(strInfo);
+	$('#appReg').val(appInfo.appReg);
+	$('#appVer').val(appInfo.appVer);
+	$('#deviId').val(appInfo.deviId);
+	$('#deviOsVer').val(appInfo.deviOsVer);
+	$('#deviTpCd').val(appInfo.deviTpCd);
+	itp_fn_login_proc();
+}

src/main/webapp/mobile/js/properties.js

@@ -1,6 +1,6 @@
 
-const DOMAIN = 'http://106.246.249.162:38050';
-//const DOMAIN = 'http://192.168.0.13:8050';
+// const DOMAIN = 'http://106.246.249.162:38050';
+const DOMAIN = 'http://192.168.0.13:8050';
 const ITP_CONTEXTPATH = '/oqpo-view';
 const MOBILE_CONTEXTPATH = ITP_CONTEXTPATH + '/mobile';
 const ITP_LANGUAGE = 'ko';