Explorar o código

테스트 수정

eskim %!s(int64=5) %!d(string=hai) anos
pai
achega
8ff7926b69

+ 3 - 3
src/main/webapp/WEB-INF/views/mob/goods/GoodsDealDetailFormMob.html

@@ -226,8 +226,8 @@
 																		</div>
 																		<div class="itemName" ><span class="tit_option" th:text="${'[상품'+status.count+']'}">[상품1]</span><th:block th:text="${goodsInfo.goodsFullNm}"></th:block></div>
 																		<p class="itemPrice">
-																			<span class="itemPrice_original" th:if="${goodsInfo.listPrice > goodsInfo.currPrice}" th:text="${#numbers.formatInteger(goodsInfo.listPrice, 0,'COMMA')}">89,000</span>
 																			<th:block th:text="${#numbers.formatInteger(goodsInfo.currPrice, 0,'COMMA')}"> 134,100</th:block>
+																			<span class="itemPrice_original" th:if="${goodsInfo.listPrice > goodsInfo.currPrice}" th:text="${#numbers.formatInteger(goodsInfo.listPrice, 0,'COMMA')}">89,000</span>
 																			<span class="itemPercent" th:if="${goodsInfo.dcRate > 0}" th:text="|${#numbers.formatDecimal(goodsInfo.dcRate,0,0)}%|">10%</span>
 																		</p>
 																	</a>
@@ -375,10 +375,10 @@
 					tagUp += '				<p class="itemBrand">'+item.brandGroupNm+'</p>\n';
 					tagUp += '				<div class="itemName" ><span class="tit_option">[상품'+(idx+1)+']</span> '+ item.goodsFullNm +'</div>\n';
 					tagUp += '				<p class="itemPrice">\n';
+					tagUp += '					 '+item.currPrice.addComma()+'\n';
 					if (Number(item.listPrice) > Number(item.currPrice)){
 					tagUp += '					<span class="itemPrice_original">'+item.listPrice.addComma()+'</span>\n';	
 					}
-					tagUp += '					 '+item.currPrice.addComma()+'\n';
 					if (Number(item.dcRate) > 0){
 					tagUp += '					<span class="itemPercent">'+item.dcRate+'%</span>\n';	
 					}
@@ -519,7 +519,7 @@
 						//------
 						tag1 += '<div class="select_custom item_opt2">\n';	
 						tag1 += '<div class="combo">\n';
-						tag1 += '<div class="select">옵션2선택</div>\n';
+						tag1 += '<div class="select">선택</div>\n';
 						tag1 += '<ul class="list">\n';
 						//------
 						//tag1 += '<li class="selected" id="goodsOpt2">옵션2</li>\n';	

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

@@ -1042,7 +1042,7 @@
 														<th:block th:each="goodsOption, optionStatus : ${goodsCompose.goodsOption1List}" >
 														<!-- <li class="selected" th:id="|selfGoodsOpt1${goodsCompose.compsGoodsCd}|" th:if=${optionStatus.first}>선택</li> --> 
 														<li th:onclick="fnOption2([[${status.count}]], [[${goodsOption.goodsCd}]],[[${goodsOption.optCd1}]],[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]])"
-															th:attr="aria-disabled=${(goodsCompose.goodsStat != 'G008_90' or goodsCompose.stockQty <= 0)? 'true':''}, data-soldout=${(goodsCompose.stockQty <= 0)? 'true':''}"
+															th:attr="aria-disabled=${(goodsCompose.goodsStat != 'G008_90' or goodsOption.stockQty <= 0)? 'true':''}, data-soldout=${(goodsOption.stockQty <= 0)? 'true':''}"
 															><th:block th:text="${goodsOption.optCd1Nm}"></th:block>
 															<input type="hidden" name="opt" th:value="${goodsOption.goodsCd}" th:attr="optCd1=${goodsOption.optCd1},optCd1Nm=${goodsOption.optCd1Nm},optCd2=${goodsOption.optCd2},optCd=${goodsOption.optCd}"/>
 														</li>

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

@@ -71,10 +71,14 @@
 		
 		<!-- 관리자 에디터입력 내용 노출  상단 html -->
 		<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty }" >
+		<div style="height:100px"></div><!-- 여백용 html -->
 		<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block>
 		</th:block >
 		
-		<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+		<th:block th:if="${goodsInfo.tobeFormYn == 'N' and goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
+		<div style="height:100px"></div><!-- 여백용 html -->
+		<th:block th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+		</th:block>
 	</div>	
 			
 	<th:block th:if="${goodsInfo.tobeFormYn == 'Y'}">

+ 1 - 1
src/main/webapp/WEB-INF/views/web/goods/GoodsDealListFormWeb.html

@@ -42,7 +42,7 @@
 						</div>
 					</div>
 					<ul class="list" th:if="${goodsDealComposeList  != null and !goodsDealComposeList.empty}">
-						<li class="selected" th:each="goodsInfo, status : ${goodsDealComposeList}" th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'true':''}, data-soldout=${(goodsInfo.stockQty <= 0)? 'true':''}">
+						<li class="selected" th:each="goodsInfo, status : ${goodsDealComposeList}" >
 							<div class="item_prod">
 								<div class="item_state">
 									<a href="javascript:void(0);" class="itemLink" th:onclick="fnGoodsDealDesc([[${goodsInfo.compsGoodsCd}]])">

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

@@ -265,7 +265,7 @@
 												<ul class="list">
 													<th:block th:each="goodsOption, optionStatus : ${goodsCompose.goodsOption1List}" >
 													<li th:onclick="fnOption2([[${status.count}]], [[${goodsOption.goodsCd}]],[[${goodsOption.optCd1}]],[[${goodsCompose.qty}]],[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]])"
-														th:attr="aria-disabled=${(goodsCompose.goodsStat != 'G008_90' or goodsCompose.stockQty <= 0)? 'true':''}, data-soldout=${(goodsCompose.stockQty <= 0)? 'true':''}"
+														th:attr="aria-disabled=${(goodsCompose.goodsStat != 'G008_90' or goodsOption.stockQty <= 0)? 'true':''}, data-soldout=${(goodsOption.stockQty <= 0)? 'true':''}"
 														>
 														<div th:text="${goodsOption.optCd1Nm}">상품옵션</div>
 														<div th:if="${goodsOption.addPrice > 0}" th:text="|+${#numbers.formatInteger(goodsOption.addPrice, 0,'COMMA')}원|">0원</div>
@@ -665,10 +665,10 @@
 					<div class="movblock">
 					 	<div style="height:100px"></div><!-- 여백용 html -->
 						<th:block th:if="${goodsVideo.videoGb == 'Y'}">
-						<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+						<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0&mute=1'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
 						</th:block>
 						<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
-						<iframe width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey +'?player_version=html5'}" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe>
+						<iframe width="100%" height="100%" th:src="${kollusMediaUrl+'/'+goodsVideo.kmcKey +'?player_version=html5&mute'}" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe>
 						</th:block>
 					</div>
 					</th:block>

+ 3 - 3
src/main/webapp/WEB-INF/views/web/goods/GoodsIncludeFormWeb.html

@@ -285,7 +285,7 @@
 											<ul class="list" th:if="${goodsDealComposeList  != null and !goodsDealComposeList.empty}">
 												<th:block th:each="goodsInfo, status : ${goodsDealComposeList}" th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'true':''}, data-soldout=${(goodsInfo.stockQty <= 0)? 'true':''}">
 												<li  th:onclick="fnOption1('Down', [[${goodsInfo.compsGoodsCd}]], [[${goodsInfo.currPrice}]] , [[${goodsInfo.selfGoodsYn}]]);"
-														th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90')? 'true':''}, data-soldout=${(goodsInfo.goodsStat != 'G008_90')? 'true':''}">
+														th:attr="aria-disabled=${(goodsInfo.goodsStat != 'G008_90' or goodsInfo.stockQty <= 0)? 'true':''}, data-soldout=${(goodsInfo.stockQty <= 0)? 'true':''}">
 													<div class="item_prod">
 														<div class="item_state">
 															<a href="javascript:void(0);" class="itemLink">
@@ -584,10 +584,10 @@
 		params.goodsCd = goodsCd;
 		params.adminYn = "Y";
 		fnGoodsDealDetail2(params);  // ajax html
-		if (soldout == "N"){
+		//if (soldout == "N"){
 			// 옵션1 처리
 			fnOption1("layer", goodsCd, currPrice, selfGoodsYn);
-		}
+		//}
 		
 	}