Merge branch 'develop_tsit' of https://dev.azure.com/style24/style24/_git/style24.front into develop_tsit

src/main/java/com/style24/front/biz/service/TsfDisplayService.java

@@ -810,7 +810,14 @@ public class TsfDisplayService {
 				tempBest.setGoodsFullNm(tempData.getProduct().getItemName());
 				tempBest.setListPrice((int) tempData.getProduct().getOriginalPrice());
 				tempBest.setCurrPrice((int) tempData.getProduct().getSalePrice());
-				tempBest.setSysImgNm(tempData.getProduct().getItemImage().replaceAll("//image.istyle24.com/Upload/ProductImage/",""));
+				
+				// 2021.08.30 검색엔진데이타 https: 붙여서 넘어옴 처리 
+				if (tempData.getProduct().getItemImage().indexOf("https:") > -1) {
+					tempBest.setSysImgNm(tempData.getProduct().getItemImage().replaceAll("https://image.istyle24.com/Upload/ProductImage/",""));
+				} else {
+					tempBest.setSysImgNm(tempData.getProduct().getItemImage().replaceAll("//image.istyle24.com/Upload/ProductImage/",""));
+				}
+				
 				tempBest.setItemUrl(tempData.getProduct().getItemUrl());
 				goodsList.add(tempBest);
 			}

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

@@ -250,25 +250,28 @@
 				console.log(result);
 				if(result.length > 0){
 					$.each(result, function (idx, item){
-						var imgUrl = '';
-
-						html += '<div class="swiper-slide">\n';
-						html += '	<div class="item_prod">\n';
-						html += '		<div class="item_state">\n';
-						html += '			<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.itemId+'\')">\n';
-						html += '				<div class="itemPic">\n';
-						html += '				<img alt="BLACK-a" class=" vLHTC pd_img" src="' + item.imageUrl + '">\n';
-						html += '				</div>\n';
-						html += '				<div class="itemName">'+item.itemName+'</div>\n';
-						if(item.count < 10){
-							html += '				<div class="viewCount">10명 미만</div>\n';
-						}else{
-							html += '				<div class="viewCount">'+item.count.addComma()+'명 보는중</div>\n';
+						// 2021.08.30 이미지 null 처리
+						if (item.itemName != null) {
+							var imgUrl = '';
+	
+							html += '<div class="swiper-slide">\n';
+							html += '	<div class="item_prod">\n';
+							html += '		<div class="item_state">\n';
+							html += '			<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.itemId+'\')">\n';
+							html += '				<div class="itemPic">\n';
+							html += '				<img alt="BLACK-a" class=" vLHTC pd_img" src="' + item.imageUrl + '">\n';
+							html += '				</div>\n';
+							html += '				<div class="itemName">'+item.itemName+'</div>\n';
+							if(item.count < 10){
+								html += '				<div class="viewCount">10명 미만</div>\n';
+							}else{
+								html += '				<div class="viewCount">'+item.count.addComma()+'명 보는중</div>\n';
+							}
+							html += '			</a>\n';
+							html += '		</div>\n';
+							html += '	</div>\n';
+							html += '</div>\n';
 						}
-						html += '			</a>\n';
-						html += '		</div>\n';
-						html += '	</div>\n';
-						html += '</div>\n';
 					});
 				}
 

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

@@ -184,7 +184,17 @@
 																			<iframe th:if="${videoArr[0]=='Y'}" id="pdThumbVideo" class="pd_mov" th:src="${'https://www.youtube.com/embed/'+videoArr[1]+'?autoplay=1&mute=1'}"></iframe>
 																			<iframe th:unless="${videoArr[0]=='Y'}" id="pdThumbVideo" class="pd_mov" th:src="${kollusMediaUrl+'/'+videoArr[1]+'?enable_initialize_focus=false&autoplay&mute&controls_activation=none'}" allow="fullscreen" allowFullScreen></iframe>
 																		</th:block>
-																		<img alt="" class=" pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + bestItemData.sysImgNm.replace('//image.istyle24.com/Upload/ProductImage/','')}" onerror="noneImg(this)">
+																		
+																		<!-- 2021.08.30 검색엔진데이타 https: 붙여서 넘어옴 처리 -->
+																		<th:block th:if="${#strings.indexOf(bestItemData.sysImgNm, 'https:')} == -1">
+																			<img alt="" class=" pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + bestItemData.sysImgNm.replace('//image.istyle24.com/Upload/ProductImage/','')}" onerror="noneImg(this)">
+																		</th:block>
+																		<th:block th:if="${#strings.indexOf(bestItemData.sysImgNm, 'https:')} == 0">
+																			<img alt="" class=" pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + bestItemData.sysImgNm.replace('https://image.istyle24.com/Upload/ProductImage/','')}" onerror="noneImg(this)">
+																		</th:block>
+																		<!-- //2021.08.30 검색엔진데이타 https: 붙여서 넘어옴 처리 -->
+																
+																		
 																	</div>
 																	<p class="itemBrand" th:text="${bestItemData.brandGroupNm}">TBJ</p>
 																	<div class="itemComment" th:if="${not #strings.isEmpty(bestItemData.goodsTnm)}" th:text="${bestItemData.goodsTnm}"># 가을 느낌 물씬!</div>

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

@@ -188,25 +188,28 @@
 			console.log(result);
 			if(result.length > 0){
 				$.each(result, function (idx, item){
-					var imgUrl = '';
-					html += '<div class="swiper-slide">\n';
-					html += '	<div class="item_prod">\n';
-					html += '		<div class="item_state">\n';
-					html += '		<button type="button" class="itemLike" onclick="cfnPutWishList(this)" goodsCd="'+item.itemId+'" goodsNm="'+ item.itemName+'" ithrCd="" contentsLoc="IN10_01" planDtlSq="">관심상품 추가</button>\n';
-					html += '		<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.itemId+'\',\'\',\'IN10_01\')">\n';
-					html += '				<div class="itemPic">\n';
-					html += '					<img alt="" class="vLHTC pd_img" src="' + item.imageUrl + '">\n';
-					html += '				</div>\n';
-					html += '				<div class="itemName">'+item.itemName+'</div>\n';
-					if(item.count < 10){
-						html += '<div class="viewCount"><span>10명</span> 미만</div>\n';
-					}else{
-						html += '				<div class="viewCount"><span>'+item.count.addComma()+'</span>명 보는중</div>\n';
+					// 2021.08.30 이미지 null 처리
+					if (item.itemName != null) {
+						var imgUrl = '';
+						html += '<div class="swiper-slide">\n';
+						html += '	<div class="item_prod">\n';
+						html += '		<div class="item_state">\n';
+						html += '		<button type="button" class="itemLike" onclick="cfnPutWishList(this)" goodsCd="'+item.itemId+'" goodsNm="'+ item.itemName+'" ithrCd="" contentsLoc="IN10_01" planDtlSq="">관심상품 추가</button>\n';
+						html += '		<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.itemId+'\',\'\',\'IN10_01\')">\n';
+						html += '				<div class="itemPic">\n';
+						html += '					<img alt="" class="vLHTC pd_img" src="' + item.imageUrl + '">\n';
+						html += '				</div>\n';
+						html += '				<div class="itemName">'+item.itemName+'</div>\n';
+						if(item.count < 10){
+							html += '<div class="viewCount"><span>10명</span> 미만</div>\n';
+						}else{
+							html += '				<div class="viewCount"><span>'+item.count.addComma()+'</span>명 보는중</div>\n';
+						}
+						html += '			</a>\n';
+						html += '		</div>\n';
+						html += '	</div>\n';
+						html += '</div>\n';
 					}
-					html += '			</a>\n';
-					html += '		</div>\n';
-					html += '	</div>\n';
-					html += '</div>\n';
 				});
 
 			}

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

@@ -36,7 +36,7 @@
 								<input type="hidden" name="brandGroupNo" th:value="${params.brandGroupNo}">
 								<fieldset>
 									<legend>결과 내 재검색</legend>
-									<input type="text" id="keyword" name="keyword" th:value="${params.keyword}" placeholder="" class="search_input" title="검색어 입력" maxlength="100" autocomplete="off">
+									<input type="text" id="keyword" name="keyword" th:value="${params.keyword}" placeholder="" class="form_control search_input" title="검색어 입력" maxlength="100" autocomplete="off">
 									<button type="button" class="sch_btn" onclick="fnSearchData();"><span>검색</span></button>
 								</fieldset>
 							</form>

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

@@ -185,7 +185,14 @@
 																	<iframe th:if="${videoArr[0]=='Y'}" id="pdThumbVideo" class="pd_mov" th:src="${'https://www.youtube.com/embed/'+videoArr[1]+'?autoplay=1&mute=1'}"></iframe>
 																	<iframe th:unless="${videoArr[0]=='Y'}" id="pdThumbVideo" class="pd_mov" th:src="${kollusMediaUrl+'/'+videoArr[1]+'?enable_initialize_focus=false&autoplay&mute&controls_activation=none'}" allow="fullscreen" allowFullScreen></iframe>
 																</th:block>
-																<img alt="BLACK-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + bestItemData.sysImgNm.replace('//image.istyle24.com/Upload/ProductImage/','')}" onerror="noneImg(this)">
+																<!-- 2021.08.30 검색엔진데이타 https: 붙여서 넘어옴 처리 -->
+																<th:block th:if="${#strings.indexOf(bestItemData.sysImgNm, 'https:')} == -1">
+																	<img alt="BLACK-a" class="vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + bestItemData.sysImgNm.replace('//image.istyle24.com/Upload/ProductImage/','')}" onerror="noneImg(this)">
+																</th:block>
+																<th:block th:if="${#strings.indexOf(bestItemData.sysImgNm, 'https:')} == 0">
+																	<img alt="BLACK-a" class="vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + bestItemData.sysImgNm.replace('https://image.istyle24.com/Upload/ProductImage/','')}" onerror="noneImg(this)">
+																</th:block>
+																<!-- //2021.08.30 검색엔진데이타 https: 붙여서 넘어옴 처리 -->
 															</div>
 															<p class=" itemBrand" th:text="${bestItemData.brandGroupNm}">BRAND NAME</p>
 															<div class="itemComment" th:unless="${bestItemData.goodsTnm == null or bestItemData.goodsTnm == ''}" th:text="${bestItemData.goodsTnm}">#데일리웨어로 매일입고싶은</div>