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

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

@@ -29,7 +29,7 @@
 	<header>
 		<div class="header_wrap">
 			<div class="menu_logo">
-				<button id="ITP_MOBILE_BTN_MENU"><img src="../img/menu.png" alt=""></button>
+				<button id="ITP_MOBILE_BTN_MENU" style="margin-left:20px;"><img src="../img/menu.png" alt=""></button>
 				<button id="ITP_MOBILE_BTN_HOME"><img src="../img/home.png" alt=""></button>
 			</div>
 			<div class="name_info">

src/main/webapp/mobile/app/mrtnmng/MRTNMNG01010.html

@@ -10,7 +10,7 @@
 				<div class="line header">
 					<div class="itp_search_header"><img src="../img/right_arrow_pink.png" alt="">반품요청</div>
 		      	</div>
-				<div class="line">
+				<div class="line mt5">
 					<label>반품요청일</label>
 					<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_DLV_REQ_DT" name="colReqDt" class="itp_input date" data-check-required="empty" readonly>
 				</div>
@@ -21,7 +21,7 @@
 					</div>
 				</div>
 				<div class="line">
-					<label>빈품장소</label>
+					<label>반품장소</label>
 					<div class="float_left">
 						<input type="text" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_NM" class="" name="rtnWhsNm" data-check-required="empty" data-alert-required="ONLYCHK" data-alert-msg="빈품장소" placeholder="" readonly />
 						<input type="hidden" id="ITP_FORM_MRTNMNG01010_DETAIL_WHS_ID" class="form-control itp_input" name="rtnWhsId" value="" />
@@ -35,7 +35,7 @@
 					</div>
 				</div>
 				<div class="table_header">
-					<h1><빈품 품목></h1>
+					<h1><반품 품목></h1>
 					<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_DELROW" class="btn-primary btn-sm ADB">품목삭제</button>
 					<button type="button" id="ITP_BTN_MRTNMNG01010_DETAIL_ADDROW" class="btn-primary btn-sm ADB" data-call-popup="ITP_POP_MRTNMNG01010_ITEM_AREA">품목추가</button>
 				</div>

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

@@ -4,7 +4,7 @@
     font-weight: normal;
     font-style: normal;
 }
-* {margin: 0; padding: 0; box-sizing: border-box; text-align: center; font-family: 'GmarketSansMedium', 'serif'; list-style: none;}
+* {margin: 0; padding: 0;letter-spacing: -1px; 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: 'GmarketSansMedium';
 	overflow:scroll-y; 
@@ -29,7 +29,7 @@ section .popup .pop .popup_btn button.ok { width: 64%; border-left: 2px solid #0
 section .popup .pop .popup_btn button.cancel {width: 36%;}
 
 
-section .popup2 {position: absolute; top:0; width: 100%; height: 100%; background: rgba(200, 200,200, 0.8); z-index: 11;}
+section .popup2 {position: absolute; top:0; width: 100%; height: 100vh; background: rgba(200, 200,200, 0.8); z-index: 11;}
 section .popup2 .content {position: fixed; z-index: 10; width:100%; background: #fff;}
 section .popup2 .barcode {width: 100%;}
 section .popup2 .barcode_area {width: 300px; height: 300px; margin: auto; background: #fff; border: 1px solid #000; margin-top: 10%;}
@@ -126,7 +126,7 @@ section .popup2 .content .line.mt_5 {margin-top:5px;}
 section .popup2 .content .line .search_wrap select {float:right; width:50%; height:27px; margin-right:10px;}
 
 
-section .popup3 {position: absolute; top:0;width: 100%; height: 100%; background: transparent; z-index: 11;}
+section .popup3 {position: absolute; top:0;width: 100%; height: 100vh; background: transparent; z-index: 11;}
 section .popup3 .content {position: fixed; z-index: 10; width:100%; height:596px; background: #fff;}
 section .popup3 .content label{width:120px; margin-top:7px;}
 section .popup3 .content div{font-weight:100;}
@@ -225,7 +225,7 @@ body.eee {height: 700px; background: #eee;}
 .main .wicon .icon_left {float: left;}
 
 
-input {font-size:14px; margin-top: 3px; border: 1px solid #aaa; border-radius:5px; height: 27px;text-align: left; padding:0 10px;}
+input {font-size:14px; margin-top: 3px; border: 1px solid #aaa; border-radius:4px; height: 34px;text-align: left; padding:0 10px;}
 input[type="date"]::-webkit-calendar-picker-indicator {display:none;}
 
 select {border: 1px solid #aaa; border-radius:5px; height: 35px; font-size: 12px; text-align: left; padding:0 15px;}
@@ -235,18 +235,18 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 
 #ITP_WRAPPER header {position: fixed;top: 0;width: 100%;height: 49px;background-color:#F7B014;align-items: center; z-index: 11;}
 #ITP_WRAPPER header .header_wrap {width: 100%; height: 49px; margin: 0 auto; display: inline-flex;}
-#ITP_WRAPPER header .header_wrap .menu_logo {width:85px; height:49px;}
-#ITP_WRAPPER header .header_wrap .menu_logo button {width: 40px; height: 40px; float: left; padding: 0; background: transparent; border: none; margin-top: 2px;}
-#ITP_WRAPPER header .header_wrap .menu_logo button img {width: 25px; height: 20px; margin: 0; border-radius: 0; border: none;}
+#ITP_WRAPPER header .header_wrap .menu_logo {width:80px; height:49px;}
+#ITP_WRAPPER header .header_wrap .menu_logo button {width: 22px; height: 18px; float: left; padding: 0; background: transparent; border: none; margin-left:10px; margin-top: 14px;}
+#ITP_WRAPPER header .header_wrap .menu_logo button img {width: 22px; height: 18px; margin: 0; border-radius: 0; border: none;}
 #ITP_WRAPPER header .header_wrap img.brand {float: right; height: 45px; margin: 5px; border-radius: 50%; border: 1px solid #666;}
 #ITP_WRAPPER header .header_wrap label{ margin-top: 15px; width: 50px; height: 25px; font-size: 1rem;float: left; color: #fff;}
-#ITP_WRAPPER header .header_wrap .name_info {width: calc(100% - 125px); height:49px; display:inline-flex;}
-#ITP_WRAPPER header .header_wrap .name_info .bn {text-align:right; width:110%; font-size:18px;}
-#ITP_WRAPPER header .header_wrap .name_info div {padding-left:3px; text-align:left; width: 90%; font-size: 15px; color:#fff; margin-top:14px;}
+#ITP_WRAPPER header .header_wrap .name_info {width: calc(100% - 120px); height:49px; display:inline-flex;}
+#ITP_WRAPPER header .header_wrap .name_info .bn {text-align:right; width:115%; font-size:18px;}
+#ITP_WRAPPER header .header_wrap .name_info div {padding-left:3px; text-align:left; width: 85%; font-size: 15px; color:#fff; margin-top:14px;}
 
-#ITP_WRAPPER header .header_wrap .logout {float: right; width: 49px;}
-#ITP_WRAPPER header .header_wrap .logout button {margin: -3px; width: 45px; height: 45px; border:none; font-size: 0.8rem;background: transparent;}
-#ITP_WRAPPER header .header_wrap .logout button img {width:22px;}
+#ITP_WRAPPER header .header_wrap .logout {float: right; width: 40px;}
+#ITP_WRAPPER header .header_wrap .logout button {margin-top: 15px; margin-right:20px; padding:0; width: 20px; height: 20px; border:none; font-size: 0.8rem;background: transparent;}
+#ITP_WRAPPER header .header_wrap .logout button img {width:17px; height:18px;}
 
 /* 메뉴바 */
 #ITP_MENU .menu_area {position: fixed; width: 100%; height: 100%; top: 0; left: -0%; background: #000; opacity: 0.7; z-index: 12; transition: all 0.5s;}
@@ -306,8 +306,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 }
 .content {position:relative; z-index: 10; width:100%; background: #f4f5f4; border-bottom:1px solid #E0B8AB;}
 .content .header {width:100% !important; margin:0 !important;}
-.content .line {position: relative; display: inline-block; width: 90%; margin:0 5%; height: 28px; margin-bottom: -10px;}
-.content .line.top3 {top:3px;}
+.content .line {position: relative; display: inline-block; width: 332px; margin:0 auto; height: 40px; margin-bottom: -10px;}
+.content .line.mt5 {margin-top:5px;}
 .content .line.top6 {top:6px;}
 .content .line.top9 {top:9px;}
 .content .line.top12 {top:12px;}
@@ -316,23 +316,23 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .pop_right div {float:right; margin-right:10px; padding-top:8px; text-align:right; font-size:16px;}
 .content .line .search_wrap input {float:right; width:50%; margin-right:10px;}
 .content .line .search_wrap select {float:right; width:50%; height:27px; margin-right:10px;}
-.content .line div.itp_search_header {font-weight:100;padding:5px 10px 0px 9px; text-align: left; color:#b88278;border-bottom: 1px solid #aaa;font-size:14px;}
+.content .line div.itp_search_header {height:40px; font-weight:100;padding:11px 10px 5px 10px; text-align: left; color:#b88278;border-bottom: 1px solid #aaa;font-size:14pt;}
 .content .line div.itp_search_header img{width:14px; top:-2px; position:relative;}
-.content .line label {min-width:92px; color:#898989; font-size: 14px; margin-left: 10px; float: left; text-align: left; margin-top: 7px; font-weight:100;}
+.content .line label {min-width:125px; color:#898989; font-size: 14pt; float: left; text-align: left; margin-top: 7px; font-weight:100;}
 .content .line label.pay_label {margin:20px 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 .itp_label_select {padding:0;width:98px; height:27px; color:#666; font-size: 14px; float: left;  margin:0 2.5px; font-weight:100; border:1px solid #aaa; border-radius:5px;}
-.content .line .float_left {float: left; margin-top:2px; width:55%;}
+.content .line .float_left {float: left; margin-top:2px; width:168px;;}
 .content .line .float_left.name {width:60%;}
-.content .line .float_left button {float:right; left:-5px; position:relative; background:transparent; border:none; width:27px; height:27px; padding:0;} 
+.content .line .float_left button {float:right; left:-2px; position:relative; background:transparent; border:none; width:34px; height:34px; padding:0;} 
 .content .line .float_left button img {width:18px;}
 .content .line .float_left input {width:100%; font-size:14px;}
 .content .line .float_left.note {width: 100%; padding: 10px;}
 .content .line .float_left.note textarea {width: 100%; height: 100px; border: 1px solid #aaa; text-align: left; font-size:14px;}
 .content .line .float_left div {font-size: 1rem; margin-top: 8px;}
-.content .line .float_left .itp_input_btn {top:5px; margin:0; position:absolute; width:55%;}
+.content .line .float_left .itp_input_btn {top:5px; margin:0; position:absolute; width:168px;}
 .content .line .float_right_btn {float: left; margin-top: 5px; margin-left: 5px;}
-.content .line .float_right_btn button {padding:0; width:27px; height:27px; border-radius:5px; border:1px solid #aaa;}
+.content .line .float_right_btn button {padding:0; width:34px; height:34px; border-radius:5px; border:1px solid #aaa;}
 .content .line .float_right_btn button img {width:18px; height:18px;}
 .content .line .float_left select {float: left; width: 100%; height: 27px; border: 1px solid #aaa; border-radius:5px; font-size: 14px;}
 .content .line .line_right {font-size: 2rem; float: left; margin-right: 0%; width:57%}
@@ -343,7 +343,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .content .line .line_right input.mg0 {margin-right:10px;}
 .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: 55%; height: 27px; float: left; text-align:center; font-size:14px;}
+.content .line input.date {width: 168px; height: 34px; float: left; text-align:center; font-size:14px; background: url(../img/calender.png) 95%/18px no-repeat white}
 .content .line input.full {width: 100%;}
 .content .line div.date_to {display:flex; width:60%; height:27px; float: left; margin-right:0px;}
 .content .line div.date_to input {font-weight:100; width:47%; height:27px; font-size:14px; margin:0;}
@@ -362,9 +362,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%; height:27px; 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:15px;}
-.content .table_header {margin-top: 10px; width: 100%; height: 36px;}
-.content .table_header h1 {margin: 10px; font-size: 14px; float: left; color: #000; font-weight: 100;}
-.content .table_header button {float: right; width: 72px; height:30px; font-size: 12px; font-weight: 100; padding:0px; margin: 5px 12px 5px 0; border-radius:15px;}
+.content .table_header {margin-top: 6px; width: 100%; height: 36px;}
+.content .table_header h1 {margin-left: 15px; margin-top:16px; font-size: 13px; float: left; color: #000; font-weight: 100;}
+.content .table_header button {float: right; width: 68px; height:26px; font-size: 12px; font-weight: 100; padding:0px; margin: 4px 12px 6px 0; 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}
@@ -396,8 +396,8 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
   font-size: 1.8rem;
 } */
 
-.button_bar {width: 100%; height: 40px; background: #ccc; position: fixed; bottom: 0px; z-index: 10;}
-.button_bar button.col_3{float: left; height: 40px; font-size: 14px; margin: 0; width: 33.3%; font-weight: 100; border: none;}
+.button_bar {width: 100%; height: 47px; background: #ccc; position: fixed; bottom: 0px; z-index: 10;}
+.button_bar button.col_3{float: left; height: 47px; font-size: 14px; margin: 0; width: 33.3%; font-weight: 100; border: none;}
 .button_bar button.btn-gray {border-radius: 0px; background-color: #858076; color: #eee;}
 .button_bar button.btn-w-gray{border-radius: 0px; background-color: #b6b8b8; color: #eee;}
 .button_bar button.btn {height: 120px;}
@@ -421,7 +421,7 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 .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 {display: inline-flex; height:60px;}
+.scroll_area li.list-row {display: inline-flex; height:76px;}
 .scroll_area li.list-row2 {height:130px; padding-top:8px;}
 
 .scroll_area li .left_info {width: calc(100% - 100px); float:left; margin-top:4px;}
@@ -536,20 +536,17 @@ input .day {margin: 18%; width: 45%; height: 80px; float: right;}
 #ITP_FOOTER .itp_modal .itp_form .itp_mip {padding: 8px 5px 4px 12px; height:42px; text-align: left; font-size: 16px; border:1px solid #ccc;}
 
 @media screen and (min-width: 550px) {
-	
-	.content .line input.date {width: 70%;}
-	.content .line input.full {width: 100%;}
-	
 	.content .line .line_right {width:80%}
-	.content .line .float_left .itp_input_btn {width:70%;}
-	.content .line .float_left {width:70%;}
-	.content .line div.date_to {width:70%;}
 	.content .line div.date_to input {width:47%}
 	.content .line .float_left.name {width:76%;}
 	.modal-dialog {margin:auto 20% !important;}
 	.scroll_area li .left_info .thick {width: 90%;}
 	.content .line .search_wrap input {width:78%;}
 	.content .line .search_wrap select {width:78%;}	
+	
+}
+@media screen and (min-width: 650px) {
+	.content .line {margin:-6px 140px; }
 }
 @media screen and (max-width: 380px) {
 	section .popup2 .barcode_area {width: 250px; height: 250px;}