Pārlūkot izejas kodu

ajax 오류 팝업 수정

juney 2 gadi atpakaļ
vecāks
revīzija
d542e6d3ec

+ 2 - 1
src/main/webapp/js/app/config.js

@@ -1013,7 +1013,8 @@ function itp_fn_logined_check(user_nm_update, fn) {
1013 1013
         }
1014 1014
 	} else {
1015 1015
 		// 로그인 페이지로 이동
1016
-		$(location).attr('href', ITP_CONTEXTPATH + '/login.html');
1016
+		if($(location).attr('pathname').indexOf('login.html') < 0)
1017
+			$(location).attr('href', ITP_CONTEXTPATH + '/login.html');
1017 1018
 	}
1018 1019
 }
1019 1020
 

+ 4 - 3
src/main/webapp/js/app/login.js

@@ -13,13 +13,14 @@ require(['config'], function() {
13 13
 			var $th = $(this);
14 14
 	        $th.val($th.val().replace(/(<([^>]+)>)/ig, function() {return '';}));
15 15
 		});
16
-		
16
+
17 17
 		$('#login_btn').click(function() {
18 18
 			if(itp_fn_login_validate()) {
19 19
 				itp_fn_login_proc();
20
-			}	
20
+			}
21
+			return false;
21 22
 		});
22
-		
23
+
23 24
 		var callbackFn = function(result) {
24 25
 			POP_LIST = result.popList;
25 26
 			fn_proc_popup_view('L');

+ 2 - 2
src/main/webapp/login.html

@@ -35,7 +35,7 @@
35 35
 					</div>
36 36
 					<div class="panel panel-default itp_box">
37 37
 						<div class="panel-body itp_body">
38
-							<form id="command" class="form-horizontal" action="" method="post" onsubmit="return false;">
38
+							<form id="command" class="form-horizontal" method="post" onsubmit="return false;">
39 39
 								<input id="userId" name="userId" type="hidden" value="" />
40 40
 	        					<input id="password" name="password" type="hidden" value="" />
41 41
 								<div class="row" style="margin-top:100px;">
@@ -68,7 +68,7 @@
68 68
 										</div>
69 69
 									</div>
70 70
 									<div class="col-xs-12 itp_btn_bar">
71
-										<button type="submit" id="login_btn" class="btn btn-orange btn-lg itp_btn">로그인</button>
71
+										<button type="button" id="login_btn" class="btn btn-orange btn-lg itp_btn">로그인</button>
72 72
 									</div>
73 73
 									<div class="col-xs-12 itp_login_input">
74 74
 										<div class="form-group">

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

@@ -20,11 +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
+        <input id="appReg" name="appReg" type="hidden" value="e-Bnui5gTQK2TaijkhFCS_:APA91bHGRgcE_Ioav_LSg6kKGAjIu52c_4B3W20vC2IqhxNBGy3wt62Dy-T7rQQTHuYdd9gUtyeJCOLKPVv2UUr7sXPE8jZQpQrHEJOj33gttY4-zzP3c00IZTg7MTY2jxNIpIrBAMU9" />
24
+        <input id="appVer" name="appVer" type="hidden" value="1.0.0" />
25
+        <input id="deviId" name="deviId" type="hidden" value="99b811f8db76fc0a" />
26
+        <input id="deviOsVer" name="deviOsVer" type="hidden" value="31" />
27
+        <input id="deviTpCd" name="deviTpCd" type="hidden" value="SA" />
28 28
       <div class="login_popup">
29 29
         <div class="login_info">
30 30
 			<img src="../img/oqpologo.png" alt="로고" class=" ">

+ 14 - 41
src/main/webapp/mobile/app/mpomng/MPOMNG01010.html

@@ -52,7 +52,7 @@
52 52
       </div>
53 53
       <div id="ITP_LIST_MPOMNG01010_ITEM_AREA" class="scroll_area row-3">
54 54
         <ul id="ITP_LIST_MPOMNG01010_DETAIL_ROWS" class="mb_0"></ul>
55
-        <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: block;">
55
+        <div id="ITP_LIST_MPOMNG01010_DETAIL_ROWCOPY" style="display: none;">
56 56
       <!--   검색된 데이터가 없습니다  -->
57 57
       	<div class="itp_non_data" style="display:none;">
58 58
       		<div>검색된 데이터가 없습니다.</div>
@@ -64,21 +64,21 @@
64 64
               </div>
65 65
               <div class="thick">
66 66
                 <div class="itp_item fnItemNm">품목명</div>
67
-                <div class="itp_item fnUnit">EA</div>
67
+                <div class="itp_item fnUnit"></div>
68 68
               </div>
69 69
               <div class="thick">
70
-                <div class="itp_gram fnUnitAmt">700g</div>
70
+                <div class="itp_gram fnUnitAmt"></div>
71 71
               </div>
72 72
               <div class="thick">
73
-                <div class="itp_amt fnUnitAmt">1,120,000원</div>
73
+                <div class="itp_amt fnUnitAmt"></div>
74 74
               </div>
75 75
             </div>
76 76
             <div class="md_info">
77 77
             	<div class="thick">
78
-            		<div>2022.12.15</div>
78
+            		<div></div>
79 79
             	</div>
80 80
             	<div class="thick">
81
-            		<div>브랜드 창고A</div>
81
+            		<div></div>
82 82
             	</div>
83 83
             </div>
84 84
             <div class="right">
@@ -106,11 +106,11 @@
106 106
             </div>
107 107
             <div class="pop_line">
108 108
                 <label>품목수&nbsp;&nbsp; :</label>
109
-                <div class="fnItemQty"></div>
109
+                <div class="fnItemQty"></div>
110 110
             </div>
111 111
             <div class="pop_line">
112 112
                 <label>구매금액 &nbsp;&nbsp;:</label>
113
-                <div class="fnOrdAmt"></div>
113
+                <div class="fnOrdAmt"></div>
114 114
             </div>
115 115
             <!--<label class="pop_label msg_save">구매요청 하시겠습니까?</label>-->
116 116
             <div class="pop_msg">구매요청 하시겠습니까?</div>
@@ -154,16 +154,6 @@
154 154
                             <button id="ITP_BTN_MPOMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
155 155
                         </div>
156 156
                     </li>
157
-                     <li class="row_2">
158
-                        <div class="scroll_left">
159
-                            <div class="fnWhsNm">브랜드 창고 명A</div>
160
-                            <div class="sub fnLocationNm">서울특별시 동대문구 서울 시립대로 12길</div>
161
-                            <div class="sub fnLocationNm">누리자 B/D</div>
162
-                        </div>
163
-                        <div class="scroll_right">
164
-                            <button id="ITP_BTN_MPOMNG01010_POP_WHS_CHOICE" class="fnWhsId" data-whs-id="">선택</button>
165
-                        </div>
166
-                    </li>
167 157
                 </div>
168 158
             </div>
169 159
         </div>
@@ -191,38 +181,21 @@
191 181
             </form>
192 182
             <div id="ITP_LIST_MPOMNG01010_POP_ITEM_AREA" class="popup_scroll">
193 183
                 <ul id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWS" class="mb_0"></ul>
194
-                <div id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY" style="display: block;">
195
-                     <li class="row_2">
196
-                        <div class="scroll_left">
197
-                            <div class="fnItemNm">품목명 001</div>
198
-                            <div class="sub fnKg">700g</div>
199
-                            <div class="amt fnItemAmt">30,500원</div>
200
-                        </div>
201
-                        <div class="scroll_right">
202
-                            <button id="ITP_BTN_MPOMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
203
-                        </div>
204
-                      	<div class="itp_num_set">
205
-		                      <div class="right">
206
-				              <button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS">-</button>
207
-				              <div class="num fnPchReqQty">1</div>
208
-				              <button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS">+</button>
209
-				            </div>
210
-			            </div>
211
-                    </li>
184
+                <div id="ITP_LIST_MPOMNG01010_POP_ITEM_ROWCOPY" style="display: none;">
212 185
                      <li class="row_2">
213 186
                         <div class="scroll_left">
214
-                            <div class="fnItemNm">품목명 001</div>
215
-                            <div class="sub fnKg">700g</div>
216
-                            <div class="amt fnItemAmt">30,500원</div>
187
+                            <div class="fnItemNm"></div>
188
+                            <div class="sub fnKg"></div>
189
+                            <div class="amt fnUnitAmt"></div>
217 190
                         </div>
218 191
                         <div class="scroll_right">
219 192
                             <button id="ITP_BTN_MPOMNG01010_POP_ITEM_ADD" class="POP_ITEM_ADD">추가</button>
220 193
                         </div>
221 194
                       	<div class="itp_num_set">
222 195
 		                      <div class="right">
223
-				              <button id="ITP_BTN_MPOMNG01010_DETAIL_MINUS">-</button>
196
+				              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_MINUS">-</button>
224 197
 				              <div class="num fnPchReqQty">1</div>
225
-				              <button id="ITP_BTN_MPOMNG01010_DETAIL_PLUS">+</button>
198
+				              <button id="ITP_BTN_MPOMNG01010_POP_ITEM_PLUS">+</button>
226 199
 				            </div>
227 200
 			            </div>
228 201
                     </li>

+ 0 - 2
src/main/webapp/mobile/js/app/login.js

@@ -101,8 +101,6 @@ function itp_fn_login_proc() {
101 101
 	    	$(location).attr('href', MOBILE_CONTEXTPATH + '/app/main.html');
102 102
 		};
103 103
 		var params = $('#ITP_FORM_MOBILE_LOGIN').serializeObject();
104
-		console.log('/api/member/sign-in-app');
105
-		console.log(JSON.stringify(params));
106 104
 		fn_ajax_call('/api/member/sign-in-app', JSON.stringify(params), loginFn, 'POST'); //암호화 해서 보내는 경우 먼저 해시키를 가져와서 암호화해서 보낸다
107 105
 	};
108 106
 	fn_ajax_call('/api/session/hashed', null, callbackFn, 'GET'); //Crypto 암호화를 위한 해쉬키.. 로그인 후에는 Jwt 포함인 /api/session/hashedKey 이걸로 호출해서 사용한다.

+ 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';