Просмотр исходного кода

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

dwkim лет назад: 2
Родитель
Сommit
7c16884e26

+ 59 - 0
src/main/webapp/app/popup/biz/BIZPOP_VERSION.html

@@ -0,0 +1,59 @@
1
+<div id="ITP_BIZPOP_VERSION" class="modal itp_modal in" style="display: block;">
2
+	<div class="modal-dialog" style="width: 450px">
3
+		<div class="modal-content ui-draggable ui-draggable-handle">
4
+			<form id="ITP_FORM_BIZPOP_VERSION" enctype="multipart/form-data">
5
+				<input type="hidden" id="ITP_FORM_BIZPOP_VERSION_VIEW_CD" name="viewCd" value="C">
6
+				<input type="hidden" id="ITP_FORM_BIZPOP_VERSION_APP_NO" name="appNo" value="">
7
+				<input type="hidden" id="ITP_FORM_BIZPOP_VERSION_APP_VER" name="appVer" value="">
8
+				<input type="hidden" id="ITP_FORM_BIZPOP_VERSION_DEVI_TP_CD" name="deviTpCd" value="SA">
9
+				<input type="hidden" id="ITP_FORM_BIZPOP_VERSION_APP_DIV_CD" name="appDivCd" value="10">
10
+				
11
+				<div class="modal-header">
12
+					<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button>
13
+					<h5 class="modal-title">버전 등록</h5>
14
+				</div>
15
+				<div class="modal-body">
16
+					<div class="itp_form itp_type1 fix">
17
+						<div class="col-xs-12">
18
+							<div class="form-horizontal">
19
+								<div class="form-group">
20
+									<label class="col-xs-3 itp_lb"><b>단말 타입</b></label>
21
+									<div class="col-xs-7 itp_ip">
22
+										<strong style="font-size: 13px; display: block; padding-top: 4px">AOS</strong>
23
+									</div>
24
+								</div>
25
+								<div class="form-group">
26
+									<label class="col-xs-3 itp_lb">버전</label>
27
+									<div class="col-xs-1 itp_ip">
28
+										<input type="text" id="ITP_FORM_BIZPOP_VERSION_APP_VER_LEFT" value="" class="form-control itp_input text-center numberOnly">
29
+									</div>
30
+									<span class="col-xs-1 itp_msg" style="width: auto; padding: 10px 4px 0 4px">.</span>
31
+									<div class="col-xs-1 itp_ip">
32
+										<input type="text" id="ITP_FORM_BIZPOP_VERSION_APP_VER_MIDDLE" value="" class="form-control itp_input text-center numberOnly">
33
+									</div>
34
+									<span class="col-xs-1 itp_msg" style="width: auto; padding: 10px 4px 0 4px">.</span>
35
+									<div class="col-xs-1 itp_ip">
36
+										<input type="text" id="ITP_FORM_BIZPOP_VERSION_APP_VER_RIGHT" value="" class="form-control itp_input text-center numberOnly">
37
+									</div>
38
+									<span class="col-xs-4 itp_msg text-danger" style="width: auto; padding-left: 20px">major . major . minor</span>
39
+								</div>
40
+								<div class="form-group" style="margin-bottom: 0">
41
+									<label class="col-xs-3 itp_lb">버전 설명</label>
42
+									<div class="col-xs-8 itp_ip">
43
+										<textarea id="ITP_FORM_BIZPOP_VERSION_DES_VER" class="form-control" rows="3" name="desVer"></textarea>
44
+									</div>
45
+								</div>
46
+							</div>
47
+						</div>
48
+					</div>
49
+				</div>
50
+				<div class="modal-footer">
51
+					<button type="button" class="btn btn-default" data-dismiss="modal">취소/닫기</button>
52
+					<button type="button" class="btn btn-primary" id="ITP_BIZPOP_VERSION_BTN_SAVE">저장</button>
53
+				</div>
54
+			</form>
55
+		</div>
56
+	</div>
57
+
58
+	<script src="/js/app/popup/ITP_BIZPOP_VERSION.js"></script>
59
+</div>

+ 52 - 0
src/main/webapp/app/system/SYSTEM07010.html

@@ -0,0 +1,52 @@
1
+<section id="ITP_TAB_SYSTEM07010" class="tab-pane active itp_sec">
2
+	<div class="itp_cont">
3
+		<div class="itp_detail">
4
+			<div class="itp_det_head fix">
5
+				<h2 class="pull-left itp_det_tit"><i class="glyphicon glyphicon-chevron-right"></i> <strong>버전</strong></h2>
6
+				<div class="pull-right itp_cicon">
7
+					<button type="button" id="ITP_BTN_SYSTEM07010_SRH" class="btn btn-success btn-sm SEB"><i class="glyphicon glyphicon-plus"></i>신규등록</button>
8
+				</div>
9
+			</div>
10
+			<div class="itp_det_in">
11
+				<div class="itp_tab_wrap" id="ITP_SRH_SYSTEM07010_TAB_WRAP">
12
+					<ul class="itp_srh_tabs" style="width:20%;">
13
+						<li id="ITP_SRH_SYSTEM07010_TAB_AOS" class="active"><a href="javascript:void(0);">AOS</a></li>
14
+						<li id="ITP_SRH_SYSTEM07010_TAB_IOS"><a href="javascript:void(0);">IOS</a></li>
15
+					</ul>
16
+				</div>
17
+				<div id="ITP_AJAX_SYSTEM07010_LIST_CONTAINER">
18
+					<div class="itp_boardData type1" style="padding: 0 15px 0 15px">
19
+						<table id="ITP_SYSTEM07010_jqGrid_wait_list" class="table table-striped table-bordered">
20
+							<colgroup>
21
+								<col style="width: 5%">
22
+								<col style="width: 9%">
23
+								<col style="width: *">
24
+								<col style="width: 12%">
25
+								<col style="width: 8%">
26
+							</colgroup>
27
+							<thead>
28
+								<tr>
29
+					                <th>NO</th>
30
+					                <th>버전</th>
31
+					                <th>버전 설명</th>
32
+					                <th>등록 일시</th>
33
+					                <th>삭제</th>
34
+					            </tr>
35
+							</thead>
36
+							<tbody id="ITP_SYSTEM07010_jqGrid_tbody">
37
+								<tr data-app-no="AN20070008">
38
+						            <td class="ac">1</td>
39
+						            <td class="ac"><span class="itp_link">1.0.0</span></td>
40
+						            <td class="al">AOS</td>
41
+						            <td class="ac">2020.04.08 00:00:00</td>
42
+						            <td class="ac"><span class="itp_del">삭제</span></td>
43
+					        	</tr>
44
+							</tbody>
45
+						</table>
46
+					</div>	
47
+				</div>
48
+			</div>
49
+		</div>
50
+	</div>
51
+	<div id="ITP_TAP_JS"></div>
52
+</section>

+ 3 - 3
src/main/webapp/css/style.css

@@ -116,9 +116,9 @@ a, button {outline:none !important; text-decoration:none !important;}
116 116
 #ITP_LOGIN .itp_img{width:150px; height:150px; top:-50px; position: absolute; margin:0 33.3%;}
117 117
 #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;}
118 118
 #ITP_LOGIN .itp_login_input {width:90%; margin:0 5%; position:relative;}
119
-#ITP_LOGIN .itp_login_input input {width:100%; padding:20px 10px 10px; outline:none; border-radius:7px; background:#eee;}
120
-#ITP_LOGIN .itp_login_input input:focus + label {top:15px; font-size:8px; color: #2691d9;}
121
-#ITP_LOGIN .itp_login_input input:valid + label {top:15px; font-size:8px; color: #2691d9;}
119
+#ITP_LOGIN .itp_login_input input {width:100%; padding:10px 10px 10px; outline:none; border-radius:7px; background:#eee; font-size: 16px;}
120
+#ITP_LOGIN .itp_login_input input:focus + label {top:15px; font-size:8px; color: #2691d9; display: none;}
121
+#ITP_LOGIN .itp_login_input input:valid + label {top:15px; font-size:8px; color: #2691d9; display: none;}
122 122
 #ITP_LOGIN .itp_login_input:not(:placeholder-shown) ~ label{top:0px; font-size:12px;}
123 123
 
124 124
 /* 메인화면 */

+ 8 - 1
src/main/webapp/js/app/oper/ITP_OPER02010.js

@@ -188,7 +188,7 @@ let pageObj = {
188 188
 		},
189 189
 		afflInfo: {
190 190
 			init: function() {
191
-				this.authTpCd 		= fn_make_user_info.get('authTpCd');
191
+				this.authTpCd = fn_make_user_info.get('authTpCd');
192 192
 				if(this.authTpCd === '30' || this.authTpCd === '40' || this.authTpCd === '50') {
193 193
 					this.afflShopId 	= fn_make_user_info.get('afflShopId');
194 194
 					this.afflShopNm 	= fn_make_user_info.get('afflShopNm');
@@ -196,6 +196,13 @@ let pageObj = {
196 196
 					this.brandNm 		= fn_make_user_info.get('brandNm');
197 197
 					this.setAffl();
198 198
 				}
199
+				if (this.authTpCd === '40' || this.authTpCd === '50') {
200
+					$('#ITP_FORM_OPER02010_SEARCH_AFFL_SHOP_BTN').attr('disabled', true);
201
+					$('#ITP_FORM_OPER02010_DELETE_AFFL_SHOP_BTN').attr('disabled', true);
202
+				}
203
+				if (this.authTpCd === '50') {
204
+					$('#ITP_BTN_OPER02010_NEWREG').hide();					
205
+				}
199 206
 			},
200 207
 			setAffl: function() {
201 208
 				var _this = this;

+ 5 - 0
src/main/webapp/mobile/app/login.html

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

+ 32 - 17
src/main/webapp/mobile/app/mpomng/MPOMNG01010.html

@@ -7,10 +7,12 @@
7 7
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOAN_DVSN" name="loanDvsn" value="">
8 8
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOAN_MGNT_UNQ_NO" name="loanMgntUnqNo" value="">
9 9
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_DVSN" name="pchReqDvsn" value="">
10
-      <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_UNQ_NO" name="pchReqUnqNo" value="">
11 10
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_PCH_REQ_ST_CD" name="pchReqStCd" value="">
12 11
       <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_MALL_ID" name="mallId" value="">
13 12
       <div class="content">
13
+      	<div class="line header">
14
+			<div class="itp_search_header fnMenuNm">구매요청생성</div>
15
+      	</div>
14 16
         <div class="line">
15 17
           <label>납기요청일</label>
16 18
           <input id="ITP_FORM_MPOMNG01010_DETAIL_DLV_REQ_DT" name="dlvReqDt" class="date" data-check-required="empty" type="date" placeholder="">
@@ -29,43 +31,55 @@
29 31
         </div>
30 32
         <div class="line">
31 33
           <label>납품장소</label>
32
-          <div class="search_nm">
33 34
             <div class="float_left">
34 35
                 <input type="text" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_NM" class="" name="whsNm" data-check-required="empty" placeholder="매장명" readonly />
35 36
                 <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="whsId" value="" />
36 37
                 <input type="hidden" id="ITP_FORM_MPOMNG01010_DETAIL_LOCATION" class="form-control itp_input" name="location" value="" />
38
+             	<button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button>
37 39
             </div>
38
-            <div class="float_left_btn">
39
-              <button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button>
40
+            <div class="float_right_btn">
41
+              <!-- <button id="ITP_BTN_MPOMNG01010_DETAIL_SEARCH_WHS_NM" data-call-popup="ITP_POP_MPOMNG01010_WHS_AREA"><img src="../img/search.png" alt=""></button> -->
40 42
               <button id="ITP_BTN_MPOMNG01010_DETAIL_DELETE_WHS_NM"><img src="../img/delete.png" alt=""></button>
41 43
             </div>
42
-          </div>
43 44
         </div>
44
-        <div class="line">
45
+        <div class="header line">
45 46
           <div class="table_header">
46
-            <h1>>구매 품목</h1>
47
+            <h1><구매품목></h1>
47 48
             <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
48 49
             <button type="button" id="ITP_BTN_MPOMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MPOMNG01010_ITEM_AREA">품목추가</button>
49 50
           </div>
50 51
         </div>
51 52
       </div>
52
-      <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-1-1">
53
-        <ul id="ITP_LIST_MPOMNG01010_DETAIL_ROWS" class="panel-group"></ul>
53
+      <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-3">
54
+        <ul id="ITP_LIST_MPOMNG01010_DETAIL_ROWS" class="mb_0"></ul>
54 55
         <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: block;">
56
+      <!--   검색된 데이터가 없습니다  -->
57
+      	<div class="itp_non_data" style="display:none;">
58
+      		<div>검색된 데이터가 없습니다.</div>
59
+      	</div>
55 60
           <li class="list-row">
56 61
             <div class="left_info">
57
-              <div class="check_box"><!-- class 변경 -->
58
-                <div><input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
62
+              <div class="check_box">
63
+                <div style="display:none;"><input type="checkbox" name="brandUnitUnqNo" class="fnBrandUnitUnqNo" /></div>
59 64
               </div>
60 65
               <div class="thick">
61
-                <div class="fnItemNm">품목명</div>
62
-                <div>-</div>
63
-                <div class="fnUnit">EA</div>
66
+                <div class="itp_item fnItemNm">품목명</div>
67
+                <div class="itp_item fnUnit">EA</div>
64 68
               </div>
65 69
               <div class="thick">
66
-                <label class="space0">구매가 :</label>
67
-                <div class="fnUnitAmt">1,120,000</div>
70
+                <div class="itp_gram fnUnitAmt">700g</div>
68 71
               </div>
72
+              <div class="thick">
73
+                <div class="itp_amt fnUnitAmt">1,120,000원</div>
74
+              </div>
75
+            </div>
76
+            <div class="md_info">
77
+            	<div class="thick">
78
+            		<div>2022.12.15</div>
79
+            	</div>
80
+            	<div class="thick">
81
+            		<div>브랜드 창고A</div>
82
+            	</div>
69 83
             </div>
70 84
             <div class="right">
71 85
               <button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS">-</button>
@@ -73,6 +87,7 @@
73 87
               <button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS">+</button>
74 88
             </div>
75 89
           </li>
90
+          
76 91
         </div>
77 92
       </div>
78 93
       <div class="button_bar">
@@ -105,7 +120,7 @@
105 120
             </div>
106 121
         </div>
107 122
     </div>
108
-    <div id="ITP_POP_MPOMNG01010_WHS_AREA" class="popup2 mobile-pop-close" style="display: none;">
123
+    <div id="ITP_POP_MPOMNG01010_WHS_AREA" class="popup2 mobile-pop-close" style="display: block;">
109 124
         <div class="pop">
110 125
             <div class="header">
111 126
                 <div class="header_left">

+ 48 - 27
src/main/webapp/mobile/css/style.css

@@ -1,7 +1,12 @@
1
-@font-face { font-family: 'NanumBarunGothic';src: url('../fonts/NanumBarunGothic.eot');src: url('../fonts/NanumBarunGothic.eot') format('embedded-opentype'),url('../fonts/NanumBarunGothic.woff') format('woff');}
2
-* {margin: 0; padding: 0; box-sizing: border-box; text-align: center; font-family: 'NanumBarunGothic', 'serif'; list-style: none;}
1
+@font-face {
2
+    font-family: 'GmarketSansMedium';
3
+    src: url('https://cdn.jsdelivr.net/gh/projectnoonnu/noonfonts_2001@1.1/GmarketSansMedium.woff') format('woff');
4
+    font-weight: normal;
5
+    font-style: normal;
6
+}
7
+* {margin: 0; padding: 0; box-sizing: border-box; text-align: center; font-family: 'GmarketSansMedium', 'serif'; list-style: none;}
3 8
 section {}
4
-body{background: #fff; position: relative; width: 100%; height: auto; font-family: 'NanumBarunGothic';}
9
+body{background: #fff; position: relative; width: 100%; height: auto; font-family: 'GmarketSansMedium';}
5 10
 .color-gray {color:#aaa;}
6 11
 /* 팝업 */
7 12
 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
25 30
 section .popup2 .btn_barcode {margin-top: 20%;}
26 31
 section .popup2 .btn_barcode button {width: 35%; height: 50px; font-size: 1rem;}
27 32
 section .popup2 .pop { position: absolute; top: 45%; left: 50%; transform: translate(-50%,-50%); width: 95%; height: 85%; background: #fff; border: 2px solid #000;}
28
-section .popup2 .pop .header {position: relative; height: 50px; background: rgb(204, 225, 240); border-bottom: 1px solid #000;}
33
+section .popup2 .pop .header {position: relative; height: 50px; background: #f0831e; color:#eee; border-bottom: 1px solid #000;}
29 34
 section .popup2 .pop .header .header_left {float: left; padding-top: 5px; padding-left: 15px;}
30 35
 section .popup2 .pop .header .header_left label {font-size: 1.4rem;} 
31 36
 section .popup2 .pop .header .header_right {float: right; padding-right: 10px;}
@@ -50,6 +55,7 @@ section .popup2 .pop table tbody input{width:15px;}
50 55
 section .popup2 .pop .popup_scroll {position: relative; width: 100%;height: 720px; overflow: auto;}
51 56
 section .popup2 .pop .popup_scroll li {list-style: none; width: 99%; height: 50px; border: 1px solid #000; margin: 0 auto;}
52 57
 section .popup2 .pop .popup_scroll li.row_2 {height: 80px;}
58
+
53 59
 section .popup2 .pop .popup_scroll li .left {position: relative; float: left;}
54 60
 section .popup2 .pop .popup_scroll li .left .check_box {width:30px; float:left; height:80px; padding-left:5px; padding-top:20px;}
55 61
 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
100 106
 section .popup3 .pop .header .header_right button img {width:30px; height:30px;}
101 107
 /* 버튼 */
102 108
 button {background-color: #fff; padding: 10px;}
103
-button.btn-primary  {color: #fff; background-color: #337ab7; border: 1px solid #000;font-weight: 700;}
109
+button.btn-primary  {color: #fff; background-color: #8f9fc4; border: 1px solid #000;font-weight: 700;}
104 110
 button.btn-yellow   {color: #fff; background-color: rgb(255, 183, 0); border: 1px solid #000;font-weight: 700;}
105 111
 button.btn-gray     {color: #fff; background-color: gray; border: 1px solid #000;font-weight: 700;}
106 112
 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;}
176 182
 .main .wicon .icon_left {float: left;}
177 183
 
178 184
 
179
-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;}
185
+input {margin-top: 3px; border: 1px solid #aaa; border-radius:5px; height: 36px; font-size: 0.8rem; text-align: left; padding:0 15px;}
186
+input[type="date"]::-webkit-calendar-picker-indicator {display:none;}
187
+
180 188
 select {border: 1px solid #000; height: 35px; font-size: 1rem; text-align: left; padding:0 15px;}
181 189
 input .day {margin: 18%; width: 45%; height: 80px; float: right;}
182 190
 
@@ -226,9 +234,11 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
226 234
 #ITP_SIDEBAR .itp_nav .panel-title a .glyphicon {font-size:12px;}
227 235
 #ITP_SIDEBAR .itp_nav .panel-default {margin-bottom:0; border:none;}
228 236
 #ITP_SIDEBAR .itp_nav * {border-radius:0; border-width:1px 0 1px 0;}
237
+
229 238
 #ITP_SIDEBAR .itp_nav .itp_svgs_body {padding:0; border-top:0; border-bottom:1px solid #ddd;}
230 239
 #ITP_SIDEBAR .itp_nav .itp_svgs {display:flex; align-content:flex-start; flex-direction:column; flex-wrap:wrap; overflow:auto;}
231 240
 #ITP_SIDEBAR .itp_nav .itp_svgs .itp_svg_in {position:relative;}
241
+#ITP_SIDEBAR .itp_nav .itp_svgs li {width:100%; height:47px;}
232 242
 #ITP_SIDEBAR .itp_nav .itp_svgs li a {display:block; width:100%; color:#333; padding:5px 10px 5px 17px;}
233 243
 #ITP_SIDEBAR .itp_nav .itp_svgs li:first-child a {padding-top:10px;}
234 244
 #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;}
250 260
   padding-top: 50px;
251 261
   font-size: 2rem;
252 262
 }
253
-.content {z-index: 10; margin-top:5px; width:100%; background: #f4f5f4;}
254
-.content .line {position: relative; display: inline-block; width: 90%; height: 45px; margin-bottom: 0px;}
263
+.content {position:fixed; z-index: 10; padding-top: 10px; width:100%; background: #f4f5f4; border-bottom:1px solid #E0B8AB;}
264
+.content .header {width:100% !important; height:55px !important; margin:0 !important;}
265
+.content .line {position: relative; display: inline-block; width: 90%; height: 45px; margin:auto 5%; margin-bottom: -10px;}
255 266
 .content .line div {font-weight: 700;}
256
-.content .line label {min-width:110px; color:#555; font-size: 18px; margin-left: 10px; float: left; text-align: left; margin-top: 12px;}
267
+.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;}
268
+.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;}
257 269
 .content .line label.pay_label {margin:38px 1%; width:98%;}
258 270
 .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;}
259
-.content .line .search_nm {float: left; margin-right: 2%;}
260 271
 .content .line .search_wrap {float:right; margin-right:10px;}
261
-.content .line .float_left {float: left; margin-top:2px;}
262
-.content .line .float_left button {float: left;	border:none;}
272
+.content .line .float_left {float: left; margin-top:2px; width:200px;}
273
+.content .line .float_left button {top:5px; left:280px; position:absolute; background:transparent; border:none; width:36px; height:36px; padding:0;} 
274
+.content .line .float_left button img {width:22px;}
275
+.content .line .float_left input {width:200px;}
263 276
 .content .line .float_left.note {width: 100%; padding: 10px;}
264 277
 .content .line .float_left.note textarea {width: 100%; height: 100px; border: 1px solid #000; text-align: left;}
265 278
 .content .line .float_left div {font-size: 1rem; margin-top: 8px;}
266
-.content .line .float_left_btn {float: left; margin-top: 0px; margin-left: 5px;}
267
-.content .line .float_left_btn button {padding:0; width:36px; height:36px; border-radius:5px;}
268
-.content .line .float_left_btn button img {width:20px; height:20px;}
279
+.content .line .float_right_btn {float: left; margin-top: 5px; margin-left: 5px;}
280
+.content .line .float_right_btn button {padding:0; width:36px; height:36px; border-radius:5px; border:1px solid #aaa;}
281
+.content .line .float_right_btn button img {width:20px; height:20px;}
269 282
 .content .line .float_left select {float: left; width: 150px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem;}
270 283
 .content .line .line_right {font-size: 2rem; float: right; margin-right: 0%;}
271 284
 .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;}
276 289
 .content .line .line_right select.m9 {margin-right:83px;}
277 290
 .content .line .line_right input.date{width:140px; margin-right:132px; height:35px;} 
278 291
 .content .line .line_right select {float: right; width: 180px; height: 30px; margin-top: 7px; border: 1px solid #000; font-size: 1rem; margin-right:93px;}
279
-.content .line input.date {width: 40%; margin: 10px; height: 35px; float: left;}
292
+.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;}
280 293
 .content .line input.date2 {width: 140px; height: 30px; margin-right:133px;}
281 294
 .content .line div.date_to {float: right; margin-right:10px;}
282 295
 .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;}
292 305
 .content .list_line .mail input {width:30%;}
293 306
 .content .list_line .mail select {width:30%;}
294 307
 .content .list_line .list_info .pay_info {text-align:left; padding-left:17px;}
295
-.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;}
296
-.content .table_header h1 {margin-top: 12px; margin-left: 10px; font-size: 1.2rem; float: left; color: #fff; font-weight: 100;}
297
-.content .table_header button {float: right; width: 111px; font-size: 1rem; padding: 5px 20px; margin: 8px;}
308
+.content .table_header {margin-top: 10px; width: 100%; height: 45px;}
309
+.content .table_header h1 {margin-left: 12px; font-size: 16px; float: left; color: #000; font-weight: 700;}
310
+.content .table_header button {float: right; width: 80px; height:30px; font-size: 12px; font-weight: 100; padding:0px; margin: 8px; border-radius:15px;}
298 311
 
299 312
 .detail_content {top: 0px; position: fixed; z-index: 10; width:100%; background: #fff;}
300 313
 .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;}
342 355
 .row-1-1{top:288px;}
343 356
 .row-2{top: 282px;}
344 357
 
345
-.row-3{top: 333px;}
358
+.row-3{top: 363px;}
346 359
 .row-4{top: 377px;}
347 360
 .row-5{top: 418px;}
348 361
 .row-6{top: 468px;}
@@ -351,14 +364,22 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
351 364
 .col-4{width:40% !important;}
352 365
 .col-6{width:60% !important;}
353 366
 
354
-
355
-.scroll_area li {margin: 5px 3px; list-style: none; width: 99%; height: 85px; border: 1px solid #000; background-color: #fff;}
356
-.scroll_area li .left_info {width:50%; float:left; font-size:1rem;}
367
+.scroll_area ul.mb_0 {margin-bottom:0;}
368
+.scroll_area .itp_non_data {margin:35% auto;}
369
+.scroll_area li {margin:0; list-style: none; width: 100%; height: 85px; border: 1px solid #ccc; background-color: #fff;}
370
+.scroll_area li.list-row {height:110px;}
371
+.scroll_area li .left_info {width:35%; float:left; font-size:1rem;}
357 372
 .scroll_area li .left_info div {display: inline-block;}
358 373
 .scroll_area li .left_info label{font-size: 1.1rem; font-weight:100; margin-left:10px;}
359
-.scroll_area li .left_info .thick {float:left;  margin: 8px 0 0 10px; font-size: 1rem; text-align: left; width: 90%; font-weight: 600;}
374
+.scroll_area li .left_info .thick {float:left;  margin: 2px 0 0 20px; font-size: 18px; text-align: left; width: 90%; font-weight: 100;}
375
+.scroll_area li .left_info .thick .itp_item {color:gray;}
376
+.scroll_area li .left_info .thick .itp_gram {color:#aaa; font-size:16px;}
377
+.scroll_area li .left_info .thick .itp_amt {color:#b88278; margin-top: 4px;}
360 378
 .scroll_area li .left_info .history {font-weight: 700; font-size: 1.1rem; margin-top:-2px;}
361 379
 .scroll_area li .left_info .history input{width: 150px;}
380
+.scroll_area li .md_info{width:35%; float:left; font-size:1rem; margin-top:25px;}
381
+.scroll_area li .md_info .thick {float:left;  margin: 2px 0 0 20px; font-size: 18px; text-align: left; width: 90%; font-weight: 100;}
382
+.scroll_area li .md_info .thick div{color:gray;}
362 383
 .scroll_area li.history_list {height: 140px; padding-top:8px;}
363 384
 .scroll_area li.history_list .btn_check {height:158px; margin-top:-5px; width:90%; float:right; padding-top:7px; }
364 385
 .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;}
417 438
 .scroll_area li .left .nomal div{min-width:90px; display: inline-flex; font-weight: 700; font-size: 1.1rem;}
418 439
 .scroll_area li .left .nomal .col_5{min-width:50px;}
419 440
 
420
-.scroll_area li .right {margin: 30px 20px 0 0; position: relative; display: flex; font-size: 1.4rem; font-weight: 700; float: right;}
421
-.scroll_area li .right .num {margin: 0 25px; width: auto;}
422
-.scroll_area li .right button {margin: -6px; padding:0px 7px; font-size: 1.5rem; border-radius: 0px;}
441
+.scroll_area li .right {margin: 42px 10px 0 0; position: relative; display: flex; height:35px; font-size: 1.4rem; font-weight: 700; float: right;}
442
+.scroll_area li .right .num {padding:8px 22px; width: auto; border-top:1px solid #E0B8AB; border-bottom:1px solid #E0B8AB;}
443
+.scroll_area li .right button {background:#e1cac1; color:#fff; border:1px solid #E0B8AB; padding:0px 7px; font-size: 1.5rem; border-radius: 0px;}
423 444
 
424 445
 /* ITP_FOOTER */
425 446
 #ITP_FOOTER .itp_modal {z-index:10000;}

+ 19 - 3
src/main/webapp/mobile/js/app/login.js

@@ -20,7 +20,8 @@ require(['config'], function() {
20 20
 
21 21
 		$('#login_btn').click(function() {
22 22
 			if(itp_fn_login_validate()) {
23
-				itp_fn_login_proc();
23
+				itp_fn_login_info();
24
+				// itp_fn_login_proc();
24 25
 			}
25 26
 		});
26 27
 	});
@@ -83,6 +84,10 @@ function itp_fn_login_validate() {
83 84
 	return true;
84 85
 }
85 86
 
87
+function itp_fn_login_info() {
88
+	$(location).attr('href', 'app:loginInfo');
89
+}
90
+
86 91
 function itp_fn_login_proc() {
87 92
 	var callbackFn = function(result) {
88 93
 		var hashed = fnHashed(result.hashed);
@@ -96,8 +101,19 @@ function itp_fn_login_proc() {
96 101
 	    	$(location).attr('href', MOBILE_CONTEXTPATH + '/app/main.html');
97 102
 		};
98 103
 		var params = $('#ITP_FORM_MOBILE_LOGIN').serializeObject();
99
-		// console.log(JSON.stringify(params));
100
-		fn_ajax_call('/api/member/sign-in', JSON.stringify(params), loginFn, 'POST'); //암호화 해서 보내는 경우 먼저 해시키를 가져와서 암호화해서 보낸다
104
+		console.log('/api/member/sign-in-app');
105
+		console.log(JSON.stringify(params));
106
+		fn_ajax_call('/api/member/sign-in-app', JSON.stringify(params), loginFn, 'POST'); //암호화 해서 보내는 경우 먼저 해시키를 가져와서 암호화해서 보낸다
101 107
 	};
102 108
 	fn_ajax_call('/api/session/hashed', null, callbackFn, 'GET'); //Crypto 암호화를 위한 해쉬키.. 로그인 후에는 Jwt 포함인 /api/session/hashedKey 이걸로 호출해서 사용한다.
103 109
 }
110
+
111
+function appCallFnLoginInfo(strInfo) {
112
+	let appInfo = JSON.parse(strInfo);
113
+	$('#appReg').val(appInfo.appReg);
114
+	$('#appVer').val(appInfo.appVer);
115
+	$('#deviId').val(appInfo.deviId);
116
+	$('#deviOsVer').val(appInfo.deviOsVer);
117
+	$('#deviTpCd').val(appInfo.deviTpCd);
118
+	itp_fn_login_proc();
119
+}

+ 2 - 2
src/main/webapp/mobile/js/properties.js

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