Merge branch 'eskim' into develop

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailDeliveryFormMob.html

@@ -20,8 +20,8 @@
 			<div class="pop_cont">
 				<h2>배송안내</h2>
 				<h3>구분</h3>
-				<th:block th:if="${goodsInfo.quikDelvYn = 'Y'}" ><p class="dot">일반배송/총알배송(오전 10시까지 주문 시)</p></th:block>
-				<th:block th:unless="${goodsInfo.quikDelvYn = 'Y'}" ><p class="dot">일반배송</p></th:block>
+				<th:block th:if="${goodsInfo.quikDelvYn == 'Y'}" ><p class="dot">일반배송/총알배송(오전 10시까지 주문 시)</p></th:block>
+				<th:block th:unless="${goodsInfo.quikDelvYn == 'Y'}" ><p class="dot">일반배송</p></th:block>
 			</div>
 			<div class="pop_cont">
 				<h3>배송비</h3>

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

@@ -690,7 +690,7 @@
 													<th:block th:if="${goodsInfo.minOrdAmt > 0}">(<th:block th:text="${#numbers.formatInteger(goodsInfo.minOrdAmt, 0,'COMMA')}" ></th:block>원 이상 무료배송)</th:block>
 							</span>
 							<span class="txt_shippingfee" th:if="${goodsInfo.delvFee <= 0}">무료배송</span>
-							<span class="txt_shippingfee" th:if="${goodsInfo.quikDelvYn = 'Y'}">총알배송(오전 10시까지 주문 시)</span>
+							<span class="txt_shippingfee" th:if="${goodsInfo.quikDelvYn == 'Y'}">총알배송(오전 10시까지 주문 시)</span>
 							<!-- //해당 배송정보 선택노출 -->
 						</div>
 					</li>
@@ -1145,7 +1145,7 @@
 				$("#cartForm  input[name=maxOrdQty]").val(maxCnt);
 				$("#cartForm  input[name=minOrdQty]").val(minOrdQty);
 				$("#cartForm  input[name=cea]").val(minOrdQty);
-				$("#cartForm  input[name=cea]").attr("readonly",false);
+				//$("#cartForm  input[name=cea]").attr("readonly",false);
 				$("#cartForm  input[name=stock]").val(itemCnt);
 
 				$('.price_box').show();
@@ -1227,7 +1227,7 @@
 			tag += '	</div>\n';
 			tag += '	<div class="number_count">\n';
 			tag += '		<span class="minus min_val" onclick="fnAdjustOrderEa(this);" adjust="-"><em class="sr-only">감소</em></span>\n';
-			tag += '		<input type="text" name="cea" optCd="'+optCd+'" maxlength="3" style="ime-mode:disabled" value="' +optQty+'" onblur="fnChangeOrderEa(this)" minOrdQty="'+minOrdQty+'" maxOrdQty="'+maxOrdQty+'" data-valid-type="numeric">\n';
+			tag += '		<input type="text" name="cea" optCd="'+optCd+'" maxlength="3" style="ime-mode:disabled" value="' +optQty+'" readonly>\n';
 			tag += '		<input type="hidden" name="coption" value="'+optCd+'"  goodsCd="'+goodsCd+'"  price="'+currPrice+'"  addPrice="'+addPrice+'">\n';
 			tag += '		<span class="plus" onclick="fnAdjustOrderEa(this);" adjust="+"><em class="sr-only">추가</em></span>\n';
 			tag += '	</div>\n';
@@ -1361,7 +1361,7 @@
 				tag += '	</div>\n';
 				tag += '	<div class="number_count">\n';
 				tag += '		<span class="minus min_val" onclick="fnAdjustOrderEa(this);" adjust="-"><em class="sr-only">감소</em></span>\n';
-				tag += '		<input type="text" name="cea" optCd="'+resultOptCd+'" maxlength="3" style="ime-mode:disabled" value="' +optQty+'" onblur="fnChangeOrderEa(this)" minOrdQty="'+minOrdQty+'" maxOrdQty="'+maxCnt+'" data-valid-type="numeric">\n';
+				tag += '		<input type="text" name="cea" optCd="'+resultOptCd+'" maxlength="3" style="ime-mode:disabled" value="' +optQty+'" readonly>\n';
 				tag += '		<input type="hidden" name="coption" value="'+resultOptCd+'"  goodsCd="'+goodsCd+'"  price="'+currPrice+'"  addPrice="'+addPrice+'">\n';
 				tag += '		<span class="plus" onclick="fnAdjustOrderEa(this);" adjust="+"><em class="sr-only">추가</em></span>\n';
 				tag += '	</div>\n';

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailReviewFormMob.html

@@ -452,7 +452,7 @@
 		<h6>포토/영상 리뷰</h6>
 		<div class="photo_list">
 			<ul>
-				<li  th:each="photoReview, status : ${photoReviewList}" th:if="${status.count<=7}">
+				<li  th:each="photoReview, status : ${photoReviewList}" th:if="${status.count<=8}">
 					<th:block th:if="${photoReview.reviewAttachList != null and !photoReview.reviewAttachList.empty}">
 					<th:block th:each="reviewAttach, attachStatus : ${photoReview.reviewAttachList}" th:if="${attachStatus.first}">
 					<a href="javascript:void(0);" th:onclick="cfGoodsReviewDetail([[${goodsInfo.goodsCd}]], '', 'Y', [[${photoReview.reviewSq}]])">
@@ -469,8 +469,8 @@
 					</th:block>
 				</li>
 			</ul>
-			<!-- 포토영상 게시글 최대 7개 & 버튼노출 -->
-			<div th:if="${#lists.size(photoReviewList) >= 8}">
+			<!-- 포토영상 게시글 최대 8개 & 버튼노출 -->
+			<div th:if="${#lists.size(photoReviewList) >= 9}">
 				<div>
 					<button type="button" id="btn_more_photoreview" th:onclick="cfGoodsReviewPhoto([[${goodsInfo.goodsCd}]])"><span>더 보기</span></button>
 				</div>	
@@ -478,7 +478,7 @@
 			<!-- //포토영상 게시글 최대 7개 & 버튼노출 -->
 		</div>
 	</div>
-	<div class="area_rv_all">
+	<div class="area_rv_all" style="display:block;">
 	<form id="goodsReviewForm" name="goodsReviewForm" action="#" th:action="@{'/goods/review/list'}">
 	<input type="hidden" name="pageNo" value ="1"/>
 	<input type="hidden" name="pageSize" value ="20"/>
@@ -590,6 +590,7 @@
 	
 	var fnDrawInfiniteScrollData = function(result, pageNum){
 		if (result.dataList != null && result.dataList.length > 0) {
+			$('.area_rv_all').show();
 			var htm = fnCreateGoodsReviewList(result);
 			gagaInfiniteScroll.draw(htm);
 		}else {
@@ -650,6 +651,7 @@
 	var fnCreateGoodsReviewList = function(result) {
 
 		let tag = '';
+		
 		$.each(result.dataList, function(idx, item) {
 			$('#goodsReviewForm').find('.nodata').hide();
 			tag += '<li>\n';
@@ -785,19 +787,23 @@
 	}
 	
 	// 상품평 초기화
-	var fnReviewSearchInit = function(){
+	var fnReviewSearchInit = function(){debugger;
 		
-		$('#goodsReviewForm').find('.select_custom.sort_opt1').find('.list li').eq(0).trigger('click')
-		$('#goodsReviewForm').find('.select_custom.sort_opt2').find('.list li').eq(0).trigger('click')
-		$('#goodsReviewForm').find('.select_custom.sort_opt3').find('.list li').eq(0).trigger('click')
-		$('#goodsReviewForm').find('.select_custom.sort_opt4').find('.list li').eq(0).trigger('click')
+		$('#goodsReviewForm').find('#grade').find('ul li').eq(0).trigger('click');
+		$('#goodsReviewForm').find('#size').find('ul li').eq(0).trigger('click');
+		$('#goodsReviewForm').find('#height').find('ul li').eq(0).trigger('click');
+		$('#goodsReviewForm').find('#weight').find('ul li').eq(0).trigger('click');
 		
 		$('#goodsReviewForm input[name=reviewScore]').val('');
 		$('#goodsReviewForm input[name=reviewOption]').val('');
 		$('#goodsReviewForm input[name=reviewHeight]').val('');
 		$('#goodsReviewForm input[name=reviewWeight]').val('');
 		
-		fnGetList();
+		//fnGetList();
+		
+		fnReviewCateClose();
+		fnGoodsReviewInfiniteScrollInit();
+		fnGoodsReviewListSearch();
 	}
 	
 	var fnReviewCateClose = function(){

src/main/webapp/WEB-INF/views/mob/goods/GoodsReviewPhotoFormMob.html

@@ -65,8 +65,8 @@
 				if (item.reviewAttachList != null && item.reviewAttachList.length > 0){
 					var fileGbClass = '';
 					$.each(item.reviewAttachList, function(aIdx, reviewAttach){
-						fileGbClass = '';
-						if (reviewAttach == "M") fileGbClass = "mov";
+					//	fileGbClass = '';
+					//	if (reviewAttach == "M") fileGbClass = "mov";
 				tag += '				<li>\n';
 				tag += '					<a href="javascript:void();" onclick="fnGoodsReviewDetail(\''+item.reviewSq+'\');">\n';
 				tag += '						<div class="pic">\n';
@@ -78,6 +78,7 @@
 				tag += '						</div>\n';
 				tag += '					</a>\n';
 				tag += '				</li>\n';		
+				return false;
 					});	
 				}
 				

src/main/webapp/WEB-INF/views/web/goods/GoodsDealDetailFormWeb.html

@@ -610,7 +610,7 @@
 			tag += '	</div>\n';
 			tag += '	<div class="number_count">\n';
 			tag += '		<span class="minus min_val" onclick="fnAdjustOrderEa(this);" adjust="-"><em class="sr-only">감소</em></span>\n';
-			tag += '		<input type="text" name="cea" optCd="'+optCd+'" maxlength="3" style="ime-mode:disabled" value="' +optQty+'" onblur="fnChangeOrderEa(this)" minOrdQty="'+minOrdQty+'" maxOrdQty="'+maxOrdQty+'" data-valid-type="numeric">\n';
+			tag += '		<input type="text" name="cea" optCd="'+optCd+'" maxlength="3" style="ime-mode:disabled" value="' +optQty+'" readonly>\n';
 			tag += '		<input type="hidden" name="coption" value="'+optCd+'"  goodsCd="'+goodsCd+'"  price="'+currPrice+'"  addPrice="'+addPrice+'">\n';
 			tag += '		<span class="plus" onclick="fnAdjustOrderEa(this);" adjust="+"><em class="sr-only">추가</em></span>\n';
 			tag += '	</div>\n';

src/main/webapp/WEB-INF/views/web/goods/GoodsDetailDeliveryFormWeb.html

@@ -29,8 +29,8 @@
 							구분
 						</th>
 						<td>
-							<th:block th:if="${goodsInfo.quikDelvYn = 'Y'}" >일반배송/총알배송(오전 10시까지 주문 시)</th:block>
-							<th:block th:unless="${goodsInfo.quikDelvYn = 'Y'}" >일반배송</th:block>
+							<th:block th:if="${goodsInfo.quikDelvYn == 'Y'}" >일반배송/총알배송(오전 10시까지 주문 시)</th:block>
+							<th:block th:unless="${goodsInfo.quikDelvYn == 'Y'}" >일반배송</th:block>
 						</td>
 					</tr>
 					<tr>

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

@@ -609,7 +609,7 @@
 																		<th:block th:if="${goodsInfo.minOrdAmt > 0}">(<th:block th:text="${#numbers.formatInteger(goodsInfo.minOrdAmt, 0,'COMMA')}" ></th:block>원 이상 무료배송)</th:block>
 												</span>
 												<span class="txt_shippingfee" th:if="${goodsInfo.delvFee <= 0}">무료배송</span>
-												<span class="txt_shippingfee" th:if="${goodsInfo.quikDelvYn = 'Y'}">총알배송(오전 10시까지 주문 시)</span>
+												<span class="txt_shippingfee" th:if="${goodsInfo.quikDelvYn == 'Y'}">총알배송(오전 10시까지 주문 시)</span>
 												<!-- //해당 배송정보 선택노출 -->
 											</a>
 										</div>
@@ -1160,7 +1160,7 @@
 				$("#cartForm  input[name=maxOrdQty]").val(maxCnt);
 				$("#cartForm  input[name=minOrdQty]").val(minOrdQty);
 				$("#cartForm  input[name=cea]").val(minOrdQty);
-				$("#cartForm  input[name=cea]").attr("readonly",false);
+				//$("#cartForm  input[name=cea]").attr("readonly",false);
 				$("#cartForm  input[name=stock]").val(itemCnt);
 
 				$('.price_box').show();
@@ -1241,7 +1241,7 @@
 				$("#cartForm  input[name=maxOrdQty]").val(maxCnt);
 				$("#cartForm  input[name=minOrdQty]").val(minOrdQty);
 				$("#cartForm  input[name=cea]").val(minOrdQty);
-				$("#cartForm  input[name=cea]").attr("readonly",false);
+				//$("#cartForm  input[name=cea]").attr("readonly",false);
 				$("#cartForm  input[name=stock]").val(itemCnt);