eskim 5 роки тому
батько
коміт
bfd17100f4

+ 1 - 1
src/main/resources/config/application-tsit.yml

@@ -35,7 +35,7 @@ upload:
         target.path: /TSIT/servers/files/data/style24/Upload/ProductImage
         max.size: 10
         allow.extension: jpg|gif|jpeg|png
-        view: //image.istyle24.com/Upload/ProductImage
+        view: //tdimage.style24.com/Upload/ProductImage
     image:
         target.path: /TSIT/servers/files/data/style24
         max.size: 10

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

@@ -183,8 +183,9 @@
 					<i class="ico ico_kcl"></i>
 				</div>
 				<div>
-					<p class="tit normal"  th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">
-					</p>
+					<th:block th:if="${not #strings.contains(goodsSafeNo.certNum, '해당')}" >
+					<p class="tit normal"  th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}"></p>
+					</th:block>
 					<p class="normal">
 						<th:block th:if="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
 						해당 없음 

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

@@ -377,7 +377,9 @@
 							<i class="ico ico_kcl"></i>
 						</div>
 						<div>
+							<th:block th:if="${not #strings.contains(goodsSafeNo.certNum, '해당')}" >
 							<p class="tit normal"  th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">
+							</
 							</p>
 								<p class="normal" >
 								<th:block th:if="${#strings.contains(goodsSafeNo.certNum, '해당')}" >

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

@@ -191,9 +191,11 @@
 		</div>
 		<div class="area_kcl" th:if="${goodsSafeNo != null}">
 			<i class="ico ico_kcl"></i>
+			<th:block th:if="${not #strings.contains(goodsSafeNo.certNum, '해당')}" >
 			<p class="tit normal"  th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">
 				어린이제품 안전인증 / 한국건설생활시험연구원(KCL)
 			</p>
+			</th:block>
 			<p class="normal" >
 				<th:block th:if="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
 				해당 없음 

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

@@ -123,7 +123,6 @@
 								<p>
 									<span class="tit">남은시간</span>
 									<span class="timer">
-										<em id="d-days" style="display:none;">0</em>
 										<em id="d-hours">0</em>
 										<em id="d-minutes">0</em>
 										<em id="d-seconds">0</em>
@@ -498,8 +497,6 @@
 				</div>
 				</th:block>
 				
-				
-				
 				<!-- 관리자 에디터입력 내용 노출  상단 html -->
 				<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
 				</div>	
@@ -626,9 +623,11 @@
 					</div>
 					<div class="area_kcl" th:if="${goodsSafeNo != null}">
 						<i class="ico ico_kcl"></i>
+						<th:block th:if="${not #strings.contains(goodsSafeNo.certNum, '해당')}" >
 						<p class="tit normal" th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">
 							어린이제품 안전인증 / 한국건설생활시험연구원(KCL)
 						</p>
+						</th:block>
 						<p class="normal" >
 							<th:block th:if="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
 							해당 없음 
@@ -1529,15 +1528,7 @@
 					if (hours < '10') { hours = '0' + hours; }
 					if (minutes < '10') { minutes = '0' + minutes; }
 					if (seconds < '10') { seconds = '0' + seconds; }
-	
-					console.log('days :' + days);
-					if (Number(days) > 0 ){
-						hours = Number(hours) + (Number(days) * 24);
-						$('#d-days').remove();
-					}else{
-						//$('#d-days').css('display','none');
-						$('#d-days').remove();
-					}
+					
 					$('#d-hours').html(hours);
 					$('#d-minutes').html(minutes);
 					$('#d-seconds').html(seconds);