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

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

@@ -41,7 +41,7 @@
 		         , G.PARALLEL_IMPORT_YN                                      /*병행수입여부*/
 		         , G.ORDER_MADE_YN                                           /*주문제작여부*/
 		         , G.LIST_PRICE                                              /*정상가*/
-		         , FN_GET_BENEFIT_PRICE( 'P' /**P*/,G.GOODS_CD,SG.CURR_APRICE, 'G100_10' /**P*/)                     AS CURR_PRICE    /*현재판매가*/
+		         , SG.CURR_APRICE                          AS CURR_PRICE    /*현재판매가*/
 		         , SG.DC_ARATE                             AS DC_RATE        /*변경후할인율*/
 		         , SG.DISP_ORD                                               /*노출순서*/
 		         , G.GOODS_TYPE                                              /*상품유형*/

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

@@ -47,18 +47,18 @@
 					</div>
 				</th:block>
 
-<!--				<th:block th:if="${contentsLoc=='004'}">-->
-				<th:block th:if="${mainStat.index==1}" th:style="${'display:block'}" th:data="${mainStat.index}">
+				<th:block th:if="${contentsLoc=='004'}">
+<!--				<th:block th:if="${mainStat.index==1}" th:style="${'display:block'}" th:data="${mainStat.index}">-->
 					<div class="inner wide bg_gray">
 						<div class="dp_cate_list">
 						</div>
 					</div>
-				</th:block>
 <!--				</th:block>-->
+				</th:block>
 
 				<th:block th:if="${contentsLoc=='002'}">
 					<div class="inner wide" th:if="${mdPickGoodsList != null}">
-						<div class="md_item">
+						<div class="md_item inner">
 							<h2 class="dp_subtitle" th:text="${contentsTitle}">MD가 추천하는 아울렛 아이템</h2>
 							<div class="swiper-container item_list">
 								<div class="swiper-wrapper">

src/main/webapp/biz/goods.js

@@ -285,7 +285,8 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 				}
 			}
 			// tag += '		<img class=" vLHTC pd_img" src="' + item.sysImgNm + '" data-img="' + item.sysImgNm2 + '" onerror="noneImg(this)">';
-			tag += '		<img class=" vLHTC pd_img" src="' + goodsUrl + '/' + item.sysImgNm + '" data-img="' + goodsUrl + '/' + item.sysImgNm2 + '" onerror="noneImg(this)">';
+			var imgUrl = "//image.istyle24.com/Upload/ProductImage/";
+			tag += '		<img class=" vLHTC pd_img" src="' + goodsUrl + '/' + item.sysImgNm.replace(imgUrl,"") + '" data-img="' + goodsUrl + '/' + item.sysImgNm2.replace(imgUrl,"") + '" onerror="noneImg(this)">';
 			if (!gagajf.isNull(item.sizes) && item.selfGoodsYn == 'Y') {
 				var sizeArr = item.sizes.split(",");
 				var minSize;

src/main/webapp/biz/search.js

@@ -64,7 +64,8 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 					tag += '<iframe id="pdThumbVideo" class="pd_mov" src="'+_kollusMediaUrl+'/'+videoUrl+'?enable_initialize_focus=false&autoplay&mute&controls_activation=none" allow="fullscreen" allowFullScreen></iframe>';
 				}
 			}
-			tag += '		<img class=" vLHTC pd_img" src="'+item.sysImgNm+'" data-img="'+item.sysImgNm2+'" onerror="noneImg(this)">';
+			var imgUrl = "//image.istyle24.com/Upload/ProductImage/";
+			tag += '		<img class=" vLHTC pd_img" src="'+item.sysImgNm.replace(imgUrl,"")+'" data-img="'+item.sysImgNm2.replace(imgUrl,"")+'" onerror="noneImg(this)">';
 			if(!gagajf.isNull(item.sizes) && item.selfGoodsYn=='Y'){
 				var sizeArr = item.sizes.split(",");
 				var minSize;