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

src/main/java/com/style24/front/biz/thirdparty/SearchEngineDiquest.java

@@ -189,7 +189,7 @@ public class SearchEngineDiquest {
 
 			if (jsonObj.get("returnCode").toString().equals("1")) { // 성공
 				result = response.getResponse();
-//				log.info("///[getFilterList] result: {}", result);
+				log.info("///[getFilterList] result: {}", result);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
@@ -222,7 +222,7 @@ public class SearchEngineDiquest {
 			if (jsonObj.get("returnCode").toString().equals("1")) { // 성공
 				Gson gson = new Gson();
 				result = gson.fromJson(jsonObj.toJSONString(), GoodsListResponse.class);
-//				log.info("///[getGoodsList] result: {}", result);
+				log.info("///[getGoodsList] result: {}", result);
 			}
 		} catch (Exception e) {
 			e.printStackTrace();

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

@@ -479,7 +479,7 @@
 						}
 						tag += item.currPrice.addComma();
 						if (item.listPrice != item.currPrice) {
-							tag += '				<span class="itemPercent">' + (item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100 + '%</span>\n';
+							tag += '				<span class="itemPercent">' + Math.round((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100) + '%</span>\n';
 						}
 						tag += '			</p>\n';
 						tag += '		</a>\n';

src/main/webapp/biz/goods.js

@@ -209,7 +209,7 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 		// 	categoryGoodsList.push(item.goodsCd);
 		// }
 		if(!gagajf.isNull(item.goodsCd)) {
-			tag += '<div class="item_prod" id="' + item.goodsCd + item.mainColorCd + '">';
+			tag += '<div class="item_prod" id="' + item.goodsCd + item.colorCd + '">';
 			tag += '	<div class="item_state';
 			if (!gagajf.isNull(item.sizes)) {
 				var sizeArr = item.sizes.split(",");
@@ -237,7 +237,7 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 			} else {
 				tag += ' onClick="cfnPutWishList(this);" goodsCd=\'' + item.goodsCd + '\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
 			}
-			tag += '<a href="javascript:void(0);" class="itemLink" onclick="fnClickGoodsCd(\'' + item.goodsCd + '\',\'' + item.mainColorCd + '\');">';
+			tag += '<a href="javascript:void(0);" class="itemLink" onclick="fnClickGoodsCd(\'' + item.goodsCd + '\',\'' + item.colorCd + '\');">';
 			tag += '			<div class="itemPic">';
 			if (!gagajf.isNull(item.videos)) {
 				var videoArr = item.videos.split(",");
@@ -765,6 +765,7 @@ var fnDeleteFilterSlider = function (obj, gubun, minVal, maxVal){
 
 // 정렬 순서
 var fnSortingChange = function (obj, sortingType, stat, appGb){
+	console.log('here sort');
 	fnCategoryGoodsInfiniteScrollInit();
 	if(stat != 'back'){
 		if($("#searchGoodsForm input[name=sortingType]").val()==sortingType){
@@ -796,6 +797,7 @@ var fnSortingChange = function (obj, sortingType, stat, appGb){
 
 	$('#endPage').hide();
 	$('#noFilterData').hide();
+	console.log('here sort2');
 	fnGoodsListSearch();
 }
 

src/main/webapp/biz/search.js

@@ -46,7 +46,7 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 			}else{
 				tag += ' onClick="cfnPutWishList(this);" goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
 			}
-			tag += '<a href="javascript:void(0);" class="itemLink" onclick="fnClickGoodsCd(\''+item.goodsCd+'\',\'\');">';
+			tag += '<a href="javascript:void(0);" class="itemLink" onclick="fnClickGoodsCd(\''+item.goodsCd+'\',\'' + item.colorCd + '\');">';
 			tag += '			<div class="itemPic">';
 			if(!gagajf.isNull(item.videos)){
 				var videoArr = item.videos.split(",");