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

src/main/webapp/WEB-INF/views/mob/display/CategoryGoodsListFormMob.html

@@ -992,20 +992,24 @@
 			if(thisId == 'unisex'){
 				if(stat=='on'){
 					$(obj).attr('onclick','fnFilterOption(this,\'off\');');
+					$(obj).attr('checked', true);
 					tag += '<input type="hidden" name="unisex" value="G007_Z"/>\n';
 					$("#searchGoodsForm").append(tag);
 				}else{
 					$(obj).attr('onclick','fnFilterOption(this,\'on\');');
+					$(obj).attr('checked', false);
 					$("#searchGoodsForm input:hidden[name=unisex]").remove();
 				}
 			}else{
 				if(stat=='on'){
 					$(obj).attr('onclick','fnFilterOption(this,\'off\');');
-					// tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+					$(obj).attr('checked', true);
+					tag += '<input type="hidden" name="newGoods" value="40"/>\n';
 					// tag += '<input type="hidden" name="benefitArr" value="40:신상"/>\n';
 					$("#searchGoodsForm").append(tag);
 				}else{
 					$(obj).attr('onclick','fnFilterOption(this,\'on\');');
+					$(obj).attr('checked', false);
 					$("#searchGoodsForm input:hidden[name=newGoods]").remove();
 					$("#searchGoodsForm input:hidden[name=benefitArr]").each(function(){
 						if($(this).val() == "40:신상"){
@@ -1014,6 +1018,7 @@
 					});
 				}
 			}
+			fnSetFilterHtml();
 			fnCategoryGoodsInfiniteScrollInit();
 			fnGoodsListSearch();
 		}
@@ -1047,6 +1052,8 @@
 			});
 			if ( (event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2)) {
 				// if( history.scrollRestoration ) window.history.scrollRestoration = 'manual';
+				$("#searchGoodsForm input:hidden[name=unisex]").remove();
+				$("#searchGoodsForm input:hidden[name=newGoods]").remove();
 				var historyData = sessionStorage.getItem(document.location.href);
 				if(historyData!=null){
 					historyData = JSON.parse(historyData);
@@ -1065,6 +1072,21 @@
 				if(typeof historyData.totalCount!='undefined' && historyData.totalCount!=''){
 					$("#totCntId").text(historyData.totalCount);
 				}
+				if(gagajf.isNull($("#searchGoodsForm").find("input[name=unisex]").val())){
+					$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
+					$("#unisex").attr('checked', false);
+				}else{
+					$("#unisex").attr('onclick','fnFilterOption(this,\'off\');');
+					$("#unisex").attr('checked', true);
+				}
+
+				if(gagajf.isNull($("#searchGoodsForm").find("input[name=newGoods]").val())){
+					$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
+					$("#newGoods").attr('checked', false);
+				}else{
+					$("#newGoods").attr('onclick','fnFilterOption(this,\'off\');');
+					$("#newGoods").attr('checked', true);
+				}
 				/*if(filterPriceList.length > 0){
 					let min = 0;
 					let max = 0;

src/main/webapp/WEB-INF/views/mob/display/SearchGoodsListFormMob.html

@@ -625,6 +625,8 @@
 			$(this).attr('checked', true);
 		});
 		if ( (event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2)) {
+			$("#searchGoodsForm input:hidden[name=unisex]").remove();
+			$("#searchGoodsForm input:hidden[name=newGoods]").remove();
 			var historyData = sessionStorage.getItem(document.location.href);
 			// console.log(historyData);
 			if(historyData!=null){
@@ -633,6 +635,21 @@
 			}else{
 				historyData = {};
 			}
+			if(gagajf.isNull($("#searchGoodsForm").find("input[name=unisex]").val())){
+				$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
+				$("#unisex").attr('checked', false);
+			}else{
+				$("#unisex").attr('onclick','fnFilterOption(this,\'off\');');
+				$("#unisex").attr('checked', true);
+			}
+
+			if(gagajf.isNull($("#searchGoodsForm").find("input[name=newGoods]").val())){
+				$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
+				$("#newGoods").attr('checked', false);
+			}else{
+				$("#newGoods").attr('onclick','fnFilterOption(this,\'off\');');
+				$("#newGoods").attr('checked', true);
+			}
 			// if(typeof historyData.filterHtml!='undefined' && historyData.filterHtml!=''){
 			// 	//console.log('historyData.filterHtml>>>'+historyData.filterHtml);
 			// 	$("#searchGoodsForm").append(historyData.filterHtml);

src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDescFormMob.html

@@ -51,7 +51,7 @@
 				</th:block>
 				<th:block th:unless="${goodsVideo.goodsContentsVideoGubun == 'Y'}">
 				<div style="height:4rem"></div><!-- 여백용 html -->
-				<iframe th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey }" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+				<iframe th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey+'?player_version=html5' }" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe>
 				</th:block>
 			</div>
 			</th:block>

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -316,7 +316,7 @@
 						</th:block>
 						<th:block th:unless="${goodsVideo.goodsContentsVideoGubun == 'Y'}">
 						<div style="height:4rem"></div><!-- 여백용 html -->
-						<iframe th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey }" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+						<iframe th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey+'?player_version=html5' }" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe>
 						</th:block>
 					</div>
 					</th:block>

src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb.html

@@ -304,7 +304,6 @@
 	<script th:src="@{'/biz/goods.js?v=' + ${#calendars.format(#calendars.createNow(), 'yyyyMMddHHmmss')}}" src="/biz/goods.js"></script>
 	<script th:inline="javascript">
 		/*<![CDATA[*/
-		console.log([[${cateInfo.formalGb}]]);
 		var filterPriceList = [[${filterPriceList}]];
 		var custom_values = [];
 		var custom_values02  = [];
@@ -1375,7 +1374,7 @@ console.log(allCateList);
 				if( history.scrollRestoration ) window.history.scrollRestoration = 'manual';
 				var historyData = sessionStorage.getItem(document.location.href);
 				if(historyData!=null){
-					console.log('historyData>>'+historyData);
+					// console.log('historyData>>'+historyData);
 					historyData = JSON.parse(historyData);
 				}else{
 					historyData = {};

src/main/webapp/WEB-INF/views/web/display/SearchGoodsListFormWeb.html

@@ -717,6 +717,8 @@
 			});
 
 			if ( (event.originalEvent && event.originalEvent.persisted) || (window.performance && window.performance.navigation.type == 2)) {
+				$("#searchGoodsForm input:hidden[name=unisex]").remove();
+				$("#searchGoodsForm input:hidden[name=newGoods]").remove();
 				var historyData = sessionStorage.getItem(document.location.href);
 				// console.log('historyData>>'+historyData);
 				if(historyData!=null){
@@ -740,6 +742,21 @@
 				if(typeof historyData.totalCount!='undefined' && historyData.totalCount!=''){
 					$("#totCntId").text(historyData.totalCount);
 				}
+				if(gagajf.isNull($("#searchGoodsForm").find("input[name=unisex]").val())){
+					$("#unisex").attr('onclick','fnFilterOption(this,\'on\');');
+					$("#unisex").attr('checked', false);
+				}else{
+					$("#unisex").attr('onclick','fnFilterOption(this,\'off\');');
+					$("#unisex").attr('checked', true);
+				}
+
+				if(gagajf.isNull($("#searchGoodsForm").find("input[name=newGoods]").val())){
+					$("#newGoods").attr('onclick','fnFilterOption(this,\'on\');');
+					$("#newGoods").attr('checked', false);
+				}else{
+					$("#newGoods").attr('onclick','fnFilterOption(this,\'off\');');
+					$("#newGoods").attr('checked', true);
+				}
 				if(!gagajf.isNull($("#searchGoodsForm").find('input[name=priceArr]').val())){
 					let tempPrice = $("#searchGoodsForm").find('input[name=priceArr]').val();
 					let temp  = tempPrice.split(",");

src/main/webapp/WEB-INF/views/web/goods/GoodsDealDescFormWeb.html

@@ -50,6 +50,7 @@
 			</th:block>
 			<th:block th:unless="${goodsVideo.goodsContentsVideoGubun == 'Y'}">
 			<iframe th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+			<iframe width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey+'?player_version=html5'}" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe>
 			</th:block>
 		</div>
 		</th:block>	

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailFormWeb.html

@@ -699,7 +699,7 @@
 						<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 						</th:block>
 						<th:block th:unless="${goodsVideo.goodsContentsVideoGubun == 'Y'}">
-						<iframe th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+						<iframe width="840" height="472" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey+'?player_version=html5'}" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe>
 						</th:block>
 					</div>
 					</th:block>	

src/main/webapp/biz/search.js

@@ -208,20 +208,24 @@ var fnFilterOption = function (obj, stat){
 	if(thisId == 'unisex'){
 		if(stat=='on'){
 			$(obj).attr('onclick','fnFilterOption(this,\'off\');');
+			$(obj).attr('checked', true);
 			tag += '<input type="hidden" name="unisex" value="G007_Z"/>\n';
 			$("#searchGoodsForm").append(tag);
 		}else{
 			$(obj).attr('onclick','fnFilterOption(this,\'on\');');
+			$(obj).attr('checked', false);
 			$("#searchGoodsForm input:hidden[name=unisex]").remove();
 		}
 	}else{
 		if(stat=='on'){
 			$(obj).attr('onclick','fnFilterOption(this,\'off\');');
-			// tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+			$(obj).attr('checked', true);
+			tag += '<input type="hidden" name="newGoods" value="40"/>\n';
 			// tag += '<input type="hidden" name="benefitArr" value="40:신상"/>\n';
 			$("#searchGoodsForm").append(tag);
 		}else{
 			$(obj).attr('onclick','fnFilterOption(this,\'on\');');
+			$(obj).attr('checked', false);
 			$("#searchGoodsForm input:hidden[name=newGoods]").remove();
 			$("#searchGoodsForm input:hidden[name=benefitArr]").each(function(){
 				if($(this).val() == "40:신상"){
@@ -230,6 +234,7 @@ var fnFilterOption = function (obj, stat){
 			});
 		}
 	}
+	fnSetFilterHtml();
 	fnCategoryGoodsInfiniteScrollInit();
 	fnSearchGoodsListSearch();
 }
@@ -413,6 +418,12 @@ var fnSetFilterHtml = function (gubun, staus, mobGb){
 	if(!gagajf.isNull($("#searchGoodsForm").find('input[name=cate5No]').val())){
 		filterHtml += '<input type="hidden" name="cate1No" value="'+$("#searchGoodsForm").find('input[name=cate5No]').val()+'"/>\n';
 	}
+	if($('#filterForm').find("input:checkbox[id='unisex']").is(":checked") == true){
+		filterHtml += '<input type="hidden" name="unisex" value="G007_Z"/>\n';
+	}
+	if($('#filterForm').find("input:checkbox[id='newGoods']").is(":checked") == true){
+		filterHtml += '<input type="hidden" name="newGoods" value="40"/>\n';
+	}
 
 	gagaInfiniteScroll.pageStatus.filterHtml = filterHtml;
 }