Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

# Conflicts:
#	src/main/webapp/ux/style24_link.js

src/main/java/com/style24/persistence/mybatis/shop/TsfDelivery.xml

@@ -42,7 +42,15 @@
 			, NOW()
 		) ON DUPLICATE KEY
 		  UPDATE
-		  REG_DT = NOW()
+		    REG_DT = NOW()
+		  , TIME_TRANS = #{time_trans}
+		  , TIME_SWEET = #{time_sweet}
+		  , DELV_WHERE = #{delvWhere}
+		  , TELNO_OFFICE = #{telno_office}
+		  , TELNO_MAN = #{telno_man}
+		  , DETAILS = #{details}
+		  , MAN = #{man}
+		  , ESTMATE = #{estmate}
 	</insert>
 
 	<!-- 주문상세번호 조회 -->	

src/main/webapp/WEB-INF/views/mob/common/fragments/ScriptsMob.html

@@ -16,7 +16,7 @@
  -->
 <th:block th:fragment="scripts">
 <script th:src="@{'/ux/mo/js/common_m.js'}" src="/ux/mo/js/common_m.js"></script>
-<script th:src="@{'/ux/style24_link.js'}" src="/ux/style24_link.js"></script>
+<script th:src="@{'/ux/style24_link.js?20220221'}" src="/ux/style24_link.js"></script>
 <script type="text/javascript" th:src="@{'/ux/plugins/gaga/gaga.common.js'}" src="/ux/plugins/gaga/gaga.common.js"></script>
 <script type="text/javascript" th:src="@{'/ux/plugins/gaga/gaga.validation.js?20211111'}" src="/ux/plugins/gaga/gaga.validation.js"></script>
 <script type="text/javascript" th:src="@{'/ux/plugins/vg-controller-client.latest.min.js'}" src="/ux/plugins/vg-controller-client.latest.min.js"></script>

src/main/webapp/WEB-INF/views/web/common/fragments/ScriptsWeb.html

@@ -16,7 +16,7 @@
  -->
 <th:block th:fragment="scripts">
 <script th:src="@{'/ux/pc/js/common-ui.js'}" src="/ux/pc/js/common-ui.js"></script>
-<script th:src="@{'/ux/style24_link.js'}" src="/ux/style24_link.js"></script>
+<script th:src="@{'/ux/style24_link.js?20220221'}" src="/ux/style24_link.js"></script>
 <script type="text/javascript" th:src="@{'/ux/plugins/gaga/gaga.common.js'}" src="/ux/plugins/gaga/gaga.common.js"></script>
 <script type="text/javascript" th:src="@{'/ux/plugins/gaga/gaga.validation.js?20211111'}" src="/ux/plugins/gaga/gaga.validation.js"></script>
 <script type="text/javascript" th:src="@{'/ux/plugins/vg-controller-client.latest.min.js'}" src="/ux/plugins/vg-controller-client.latest.min.js"></script>

src/main/webapp/ux/pc/css/layout.css

@@ -2629,7 +2629,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.pd_detail .area_desc .desc_wrap .benefit_box dl div dd .btn_popup {position:absolute; right:0; top:0; z-index:2;}
 
 	/* pd_deal_상품옵션선택 영역 */
-	.pd .option_box {margin-top:30px;overflow-y: auto;height: calc(100% - 35%);} /* 0126 */
+	.pd .option_box {margin-top:30px;overflow-y: auto;} /* 0126 */
 	.option_box > [class^="opt_"] {padding-top:40px;}
 	.option_box > [class^="opt_"]:first-of-type {padding-top:0;}
 	.option_box > [class^="opt_"] .opt_header {position: relative; margin-bottom:20px;}
@@ -2940,7 +2940,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap {width:500px; padding-left:60px; padding-top:30px;}
 	/* 0126 */
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop {position:fixed; right: auto; left: 50%; margin-left: 380px; bottom:80px; width:500px;height: calc(100% - 11%);}
-	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop .option_box {overflow-y: auto; height: calc(100% - 25%);}
+	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixtop .option_box {overflow-y: auto;}
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap.absbottom {position:absolute; top:auto; bottom:0px; right:70px;height: calc(100% - 21%);}
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixbottom {position: absolute;top: auto;bottom: 0;right: auto;left: 50%;margin-left: 380px;}
 	.pd_desc_wrap .item_descrp .area_option .opt_wrap.fixbottom .option_box {overflow-y: auto; }

src/main/webapp/ux/style24_link.js

@@ -1895,17 +1895,13 @@ function noneImg(noneSrc) {
  * @author : sshong
  */
 function cfnCheckMobileDevice() {
-	var mobileKeyWords = new Array('Android', 'iPhone', 'iPod', 'BlackBerry', 'Windows CE', 'SAMSUNG', 'LG', 'MOT', 'SonyEricsson');
-	var device = "P";
-	for (var info in mobileKeyWords) {
-		if (navigator.userAgent.match(mobileKeyWords[info])) {
-			if (navigator.userAgent.match('istyle24')) {
-				device = "A";
-			} else {
-				device = "M";
-			}
+    var mobileKeyWords = new Array('Android', 'iPhone', 'iPod', 'BlackBerry', 'Windows CE', 'SAMSUNG', 'LG', 'MOT', 'SonyEricsson');
+    var device = "P"; 
+    for (var info in mobileKeyWords) {  
+        if (navigator.userAgent.match(mobileKeyWords[info])) {
+        	device = "M"; 
 			return device;
-		}
-	}
-	return device;
-}
+        }  
+    }
+	return device; 
+}