Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -1689,13 +1689,13 @@ public class TsfMypageController extends TsfBaseController {
 		
 		review.setReviewExpireDay(eventService.getGoodsReviewPointExpireDays(TscConstants.Site.STYLE24.value()));
 		result.set("alreadyReviewCount", reviewService.getAlreadyReviewList(review).size());
-		TscPageRequest pageable2 = new TscPageRequest((review.getPageNo2() > 0 ? review.getPageNo2() - 1 : 0), review.getPageSize2(), review.getPageUnit2());
+		TscPageRequest pageable = new TscPageRequest((review.getPageNo() > 0 ? review.getPageNo() - 1 : 0), review.getPageSize(), review.getPageUnit());
 		int totalCnt = reviewService.getAlreadyReviewList(review).size();
-		pageable2.setTotalCount(totalCnt);
-		review.setPageable2(pageable2);
+		pageable.setTotalCount(totalCnt);
+		review.setPageable(pageable);
 		result.set("paging2", review);
 		result.set("totalCnt", totalCnt);
-		result.set("endRow", pageable2.getEndRow());
+		result.set("endRow", pageable.getEndRow());
 		result.set("dataList2", reviewService.getAlreadyReviewList(review));
 
 		return result;

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

@@ -20,17 +20,19 @@
 		/* TsfRecentlyGoods.deleteRecentlyFirstGoods */
 		DELETE
 		FROM   TB_RECENTLY_GOODS
-		WHERE  RGOODS_SQ = (SELECT RGOODS_SQ
-		                    FROM   TB_RECENTLY_GOODS
-		                    WHERE  1 = 1
-		                    AND    (
-		                            JSESSION_ID = #{jsessionId}
-		                            OR
-		                            CUST_NO = #{custNo}
-		                           )
-		                    ORDER  BY RGOODS_SQ
-		                    LIMIT 1
-		                   )
+		WHERE  RGOODS_SQ IN (SELECT * 
+		                     FROM (SELECT RGOODS_SQ
+		                           FROM   TB_RECENTLY_GOODS
+		                           WHERE  1 = 1
+		                           AND    (
+		                                   JSESSION_ID = #{jsessionId}
+		                                   OR
+		                                   CUST_NO = #{custNo}
+		                                  )
+		                           ORDER  BY RGOODS_SQ
+		                           LIMIT 1
+		                           ) Z
+		                     )
 	</delete>
 	
 	<!-- 최근본상품 저장 -->

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

@@ -1157,7 +1157,7 @@
 		        , Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD, Z.SHOT_DELV_YN, Z.CHANGEABLE_YN, Z.SELF_GOODS_YN, Z.BRAND_NM, Z.BRAND_ENM, Z.ORD_DTL_STAT_NM
 		        , Z.ORD_REQ_CHG_QTY, Z.ORD_CAN_CHG_QTY, Z.REVIEW_SQ 
 		ORDER BY Z.ORD_NO DESC, Z.ORD_DTL_STAT, Z.SELF_GOODS_YN DESC, Z.SHOT_DELV_YN DESC, Z.SUPPLY_COMP_CD
-		<include refid="selectForPagingFooter2"/>
+		<include refid="selectForPagingFooter"/>
 		</select>
 	
 	<select id="getReviewAttach" parameterType="Review" resultType="Review">

src/main/webapp/WEB-INF/views/mob/common/fragments/GnbMob.html

@@ -48,20 +48,6 @@
 	<div id="gnb" class="gnb">
 		<div class="gnb-inner">
 			<ul id="ulGnbTab">
-				<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">홈</a></li>
-				<li class="on"><a href="javascript:void(0);">브랜드</a></li>
-				<li><a href="#none">여성</a></li>
-				<li><a href="#none">남성</a></li>
-				<li><a href="#none">유아동</a></li>
-				<li><a href="#none">골프</a></li>
-				<li><a href="#none">라이프</a></li>
-				<li><a href="#none">베스트</a></li>
-				<li><a href="#none">핫딜</a></li>
-				<li><a href="#none">기획전</a></li>
-				<li><a href="#none">총알배송</a></li>
-				<li><a href="#none">아울렛</a></li>
-				<li><a href="#none">룩북</a></li>
-				<li><a href="#none">이벤트</a></li>
 			</ul>
 		</div>
 		<button onclick="$('#gnb').toggleClass('expand');" class="btn-expand"></button>
@@ -70,7 +56,7 @@
 	<!-- 통합검색 팝업 -->
 	<div class="modal pop_full schPop sch" id="schPop" tabindex="-1" role="dialog" aria-labelledby="schPopLabel" aria-hidden="true">
 		<div class="modal-dialog" role="document">
-			<div class="modal-content">      
+			<div class="modal-content">
 			</div>
 		</div>
 		<a href="#close-modal" rel="modal:close" id="schAllPop_close" class="close-modal">Close</a>
@@ -89,7 +75,7 @@
 						
 						let tag = '';
 						tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">홈</a></li>\n';
-						tag += '<li class="on"><a href="javascript:void(0);">브랜드</a></li>\n';
+						tag += '<li class="on"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_ALL_BRAND);">브랜드</a></li>\n';
 						$.each(result, function(idx, item) {
 							if (item.contentsType == 'C') { // 컨텐츠유형: 카테고리
 								tag += '<li><a href="javascript:void(0);" onclick="cfnGoToCategoryMain(\'G032_101\',' + item.cate1No + ');">' + item.gtabNm + '</a></li>\n';

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

@@ -41,7 +41,7 @@
 							</div>
 							<div class="btn_group_flex">
 								<div>
-									<button type="button" class="btn btn_dark btn_coupon_down" id="btn_result_coupon" 
+									<button type="button" class="btn btn_dark" 
 											th:disabled="${goodsCoupon.custPubLimitQty > 0 and goodsCoupon.custPubLimitQty <= goodsCoupon.custCouponCnt}"
 											th:attr="cpnId=${goodsCoupon.cpnId}" th:id="${'coupon_'+goodsCoupon.cpnId}" onclick="fnGoodsCouponDown(this);">
 										<span>쿠폰받기</span>
@@ -103,12 +103,14 @@
 						if (Number(coupon.custPubLimitQty) <= Number(coupon.custCouponCnt)){
 							//$('#coupon_'+ coupon.cpnId).html('<span>받기완료</span>');
 							$('#coupon_'+ coupon.cpnId).attr('disabled', true);
+							$('#coupon_'+ coupon.cpnId).find('span::after').attr('content','');
 						}
 					}
 					if (Number(coupon.TotPubLimitQty) > 0){
 						if (Number(coupon.TotPubLimitQty) <= Number(coupon.CustCouponCnt)){
 							//$('#coupon_'+ coupon.cpnId).html('<span>받기완료</span>');
 							$('#coupon_'+ coupon.cpnId).attr('disabled', true);
+							$('#coupon_'+ coupon.cpnId).find('span::after').attr('content','');
 						}
 					}
 				}
@@ -119,11 +121,11 @@
 	
 	
 	// 쿠폰 전체 다운로드
-	var fnGoodsCouponDownAll = function(){debugger;
+	var fnGoodsCouponDownAll = function(){
 		//00개 쿠폰이 발급되었습니다.
 		let couponDownAbleYn = "N";
 		let arrCpnId = [];
-		$('.btn_coupon_down').each(function(){debugger;
+		$('.btn_group_flex .btn_dark').each(function(){
 			if (!$(this).attr('disabled')){
 				couponDownAbleYn = "Y";
 				arrCpnId.push($(this).attr('cpnId'));
@@ -146,7 +148,7 @@
 			let list = result.goodsCouponList;
 
 			list.forEach(function(coupon){
-				$('.btn_coupon_down').each(function(){
+				$('.btn_group_flex .btn_dark').each(function(){
 					if (!$(this).attr('disabled')){
 						let cpnId = $(this).attr('cpnId');
 						if (coupon.cpnId == cpnId){
@@ -173,14 +175,14 @@
 	
 	var jfCouponCheck = function(){
 		let couponDownAbleYn = "N";
-		$('.btn_coupon_down').each(function(){
+		$('.btn_group_flex .btn_dark').each(function(){
 			if (!$(this).attr('disabled')){
 				couponDownAbleYn = "Y";
 			}
 		});	
 		
 		if(couponDownAbleYn == "N"){
-			$('.btn_all_cpdown').attr('disabled', true);
+			$('#btn_all_coupon').attr('disabled', true);
 		}
 	}	
 	

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

@@ -20,7 +20,7 @@
 			<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: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">
@@ -94,7 +94,7 @@
 			<div class="pop_cont" th:if="${deliveryInfo != null and deliveryInfo.delvFeeCd != null and not #strings.isEmpty(deliveryInfo.note)}">
 				<h3>기타사항</h3>
 				<th:block th:each="note : ${#strings.arraySplit(#strings.replace(#strings.replace(#strings.escapeJava(deliveryInfo.note),'\r',''),'\n','|'),'|')}">
-				<p class="dot" th:text="${note}"></p>
+				<p class="dot" th:utext="${#strings.unescapeJava(note)}"></p>
 				</th:block>
 			</div>
 		</div>

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

@@ -635,7 +635,12 @@
 											<th:block th:if="${bestReview.reviewAttachList != null and !bestReview.reviewAttachList.empty}">
 											<div class="pic" >
 												<th:block th:each="reviewAttach, attachStatus : ${bestReview.reviewAttachList}" th:if="${attachStatus.first}">
-												<span class="thumb " th:classAppend="${(reviewAttach.fileGb == 'M') ? 'mov' :''}"  th:style="${'background-image:url('+imgUrl+ reviewAttach.sysFileNm+');'}"></span><!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->
+													<th:block th:if="${reviewAttach.fileGb == 'M'}" >
+												<span class="thumb mov" th:style="${'background-image:url('+kollusMediaUrl+'/poster/'+reviewAttach.kmcKey+');'}"></span><!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->
+													</th:block>
+													<th:block th:unless="${reviewAttach.fileGb == 'M'}" >
+												<span class="thumb" th:style="${'background-image:url('+imgUrl+ reviewAttach.sysFileNm+');'}"></span>
+													</th:block>
 												</th:block>
 											</div>
 											</th:block>
@@ -824,15 +829,20 @@
 								</span>
 							</div>
 							<div class="form_field">
-							<th:block th:each="goodsOption2, status : ${goodsOption2List}"> <!--  품절사이즈 미노출 -->
-							<th:block th:if="${goodsOption2.soldoutYn == 'N' and goodsOption2.stockQty > 0}">
+							<th:block th:each="goodsOption2, status : ${goodsOption2List}">  
 								<div> 
-									<input type="radio" name="opt"  th:id="${goodsOption2.optCd}" 
+									<th:block th:if="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" >
+									<input type="radio" name="opt"  th:id="${goodsOption2.optCd}" th:disabled="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" 
+											th:attr="addPrice=${goodsOption2.addPrice}, optCd1=${goodsOption2.optCd1}, optCd2=${goodsOption2.optCd2}, optCd=${goodsOption2.optCd}"/>
+									<label th:for="${goodsOption2.optCd}" ><span th:text="${goodsOption2.optCd2}">90</span></label>
+									</th:block>
+									<th:block th:unless="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" >
+									<input type="radio" name="opt"  th:id="${goodsOption2.optCd}" th:disabled="${goodsOption2.soldoutYn == 'Y' or goodsOption2.stockQty <= 0}" 
 											th:attr="addPrice=${goodsOption2.addPrice}, optCd1=${goodsOption2.optCd1}, optCd2=${goodsOption2.optCd2}, optCd=${goodsOption2.optCd}"/>
 									<label th:for="${goodsOption2.optCd}" th:onclick="fnViewStock(this, [[${goodsInfo.goodsCd}]],[[${goodsOption2.optCd}]],[[${goodsOption2.optCd1}]],[[${goodsOption2.optCd2}]],[[${goodsInfo.minOrdQty}]], [[${goodsInfo.maxOrdQty}]] )" ><span th:text="${goodsOption2.optCd2}">90</span></label>
+									</th:block>
 								</div>
 							</th:block>
-							</th:block>
 						</div>
 						</div>
 						<!-- 해당상품 품절시 노출 -->
@@ -844,8 +854,7 @@
 							</div>
 							<div class="number_count">
 								<span class="minus min_val" onclick="fnAdjustOrderEa(this);" adjust="-"><em class="sr-only">감소</em></a></span>
-								<input type="text" name="cea" maxlength="3" style="ime-mode:disabled" th:value="${goodsInfo.minOrdQty}" onblur="fnChangeOrderEa(this)"
-									th:attr="minOrdQty=${goodsInfo.minOrdQty}, maxOrdQty=${goodsInfo.maxOrdQty}" data-valid-type="numeric">
+								<input type="text" name="cea" maxlength="3" style="ime-mode:disabled" th:value="${goodsInfo.minOrdQty}" readonly>
 								<input type="hidden" name="coption" value=""   th:attr="price=${goodsInfo.currPrice}">
 								<span class="plus" onclick="fnAdjustOrderEa(this);" adjust="+"><em class="sr-only">추가</em></span>
 							</div>
@@ -1963,13 +1972,12 @@
 		$(document).on('click','.pd_descrp .btn_more_box button',function(e){
 			$('.pd_descrp .cont_body').toggleClass('on'); 
 			$(this).toggleClass('active');
-			$(this).parent('.btn_more_box').toggleClass('covered');
+			$(this).parents('.btn_more_box').toggleClass('covered');
 			var descrpToggle = $(this).find('span');
 			$(descrpToggle).text($(descrpToggle).text() == '상세정보 더보기' ? '상세정보 접기' : '상세정보 더보기');
 			return false;
 		}); 
 		
-
 		
 		//슬라이드 - 함께하면 할인되는 다다익선 상품
 		var togetherItemSwiper = new Swiper('.pd .pd_together .area_slider .swiper-container', {

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

@@ -83,7 +83,7 @@
 						<dt>작음</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreSize1+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreSize1+'%'}" th:styleappend="${scoreSize1} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreSize1}"></th:block>%</span>
 						</dd>
@@ -92,7 +92,7 @@
 						<dt>딱맞음</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreSize2+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreSize2+'%;' }" th:styleappend="${scoreSize2} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreSize2}"></th:block>%</span>
 						</dd>
@@ -101,7 +101,7 @@
 						<dt>큼</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreSize3+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreSize3+'%;' }" th:styleappend="${scoreSize3} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreSize3}"></th:block>%</span>
 						</dd>
@@ -134,7 +134,7 @@
 						<dt>밝음</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreColor1+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreColor1+'%;' }" th:styleappend="${scoreColor1} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreColor1}"></th:block>%</span>
 						</dd>
@@ -143,7 +143,7 @@
 						<dt>똑같음</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreColor2+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreColor2+'%;' }" th:styleappend="${scoreColor2} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreColor2}"></th:block>%</span>
 						</dd>
@@ -152,7 +152,7 @@
 						<dt>어두움</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreColor3+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreColor3+'%;' }" th:styleappend="${scoreColor3} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreColor3}"></th:block>%</span>
 						</dd>
@@ -186,7 +186,7 @@
 						<dt>슬림</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreFit1+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreFit1+'%;' }" th:styleappend="${scoreFit1} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreFit1}"></th:block>%</span>
 						</dd>
@@ -195,7 +195,7 @@
 						<dt>레귤러</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreFit2+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreFit2+'%;' }" th:styleappend="${scoreFit2} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreFit2}"></th:block>%</span>
 						</dd>
@@ -204,7 +204,7 @@
 						<dt>오버</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreFit3+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreFit3+'%;' }" th:styleappend="${scoreFit3} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreFit3}"></th:block>%</span>
 						</dd>
@@ -237,7 +237,7 @@
 						<dt>얇음</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreThick1+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreThick1+'%;' }" th:styleappend="${scoreThick1} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreThick1}"></th:block>%</span>
 						</dd>
@@ -246,7 +246,7 @@
 						<dt>적당함</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreThick2+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreThick2+'%;' }" th:styleappend="${scoreThick2} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreThick2}"></th:block>%</span>
 						</dd>
@@ -255,7 +255,7 @@
 						<dt>도톰함</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreThick3+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreThick3+'%;' }" th:styleappend="${scoreThick3} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreThick3}"></th:block>%</span>
 						</dd>
@@ -290,7 +290,7 @@
 						<dt>가벼움</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreWeight1+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreWeight1+'%;' }" th:styleappend="${scoreWeight1} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreWeight1}"></th:block>%</span>
 						</dd>
@@ -299,7 +299,7 @@
 						<dt>적당함</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreWeight2+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreWeight2+'%;' }" th:styleappend="${scoreWeight2} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreWeight2"></th:block>%</span>
 						</dd>
@@ -308,7 +308,7 @@
 						<dt>무거움</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreWeight3+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreWeight3+'%;' }" th:styleappend="${scoreWeight3} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreWeight3}"></th:block>%</span>
 						</dd>
@@ -341,7 +341,7 @@
 						<dt>작음</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreBall1+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreBall1+'%;' }" th:styleappend="${scoreBall1} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreBall1}"></th:block>%</span>
 						</dd>
@@ -350,7 +350,7 @@
 						<dt>딱맞음</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreBall2+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreBall2+'%;' }" th:styleappend="${scoreBall2} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreBall2"></th:block>%</span>
 						</dd>
@@ -359,7 +359,7 @@
 						<dt>큼</dt>
 						<dd>
 							<span class="ratio">
-								<em class="progbar" th:style="${'width:'+scoreBall3+'%;' }"></em>
+								<em class="progbar" th:style="${'width:'+scoreBall3+'%;' }" th:styleappend="${scoreBall3} <= 0 ? '; margin-left:-8px': ''"></em>
 							</span>
 							<span class="percent"><th:block th:text="${scoreBall3}"></th:block>%</span>
 						</dd>

src/main/webapp/WEB-INF/views/mob/planning/PlanningEventPollFormMob.html

@@ -35,7 +35,7 @@
 							<form action="">
 							<th:block th:each="pollData, pollStat : ${pollList}">
 								<div class="survey_row q1" th:if="${pollData.pollQtype == '10'}">
-									<h4 th:text=${pollData.pollQtitle}></h4>
+									<h4><span class="question" th:text="'Q'+${pollStat.index+1}+'.'"></span>[[${pollData.pollQtitle}]]</h4>
 									<div class="answer">
 										<div class="form_field">
 											<ul class="clear" th:id="${pollData.pollQsq+'_'+(pollStat.index+1)}">
@@ -134,7 +134,7 @@
 									</div>
 								</div>
 								<div class="survey_row q2" th:if="${pollData.pollQtype == '20'}">
-									<h4 th:text=${pollData.pollQtitle}></h4>
+									<h4><span class="question" th:text="'Q'+${pollStat.index+1}+'.'"></span>[[${pollData.pollQtitle}]]</h4>
 									<div class="answer">
 										<div class="form_field">
 											<ul class="clear" th:id="${pollData.pollQsq+'_'+(pollStat.index+1)}">
@@ -173,15 +173,15 @@
 									</div>
 								</div>
 
-								<div class="survey_row q4" th:if="${pollData.pollQtype == '40'}">
-									<h4 th:text=${pollData.pollQtitle}></h4> <!-- 210414_수정 : br태그 삭제 -->
+								<div class="survey_row q3" th:if="${pollData.pollQtype == '40'}">
+									<h4><span class="question" th:text="'Q'+${pollStat.index+1}+'.'"></span>[[${pollData.pollQtitle}]]</h4>
 									<div class="answer">
 										<textarea class="doc_ans" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="${pollData.pollQsq+'_'+(pollStat.index+1)}" placeholder="1,000자 이내로 입력해 주세요." style="resize: none;"></textarea>
 										<p class="txt_cnt"><span id="ans_cnt" class="c_primary">0</span>/1,000</p>
 									</div>
 								</div>
-								<div class="survey_row q3" th:if="${pollData.pollQtype == '30'}">
-								<h4 th:text=${pollData.pollQtitle}></h4> <!-- 210414_수정 : br태그 삭제 -->
+								<div class="survey_row q4" th:if="${pollData.pollQtype == '30'}">
+								<h4><span class="question" th:text="'Q'+${pollStat.index+1}+'.'"></span>[[${pollData.pollQtitle}]]</h4>
 									<div class="answer">
 										<textarea class="q4_ans" name="" id="" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="${pollData.pollQsq+'_'+(pollStat.index+1)}"></textarea>
 									</div>

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

@@ -40,7 +40,7 @@
 								</p>
 							</div>
 							<th:block th:if="${goodsCoupon.custPubLimitQty > 0 and goodsCoupon.custPubLimitQty <= goodsCoupon.custCouponCnt}">
-							<button type="button" class="btn btn_dark btn_block btn_coupon_down"   disabled="disabled"><span>받기완료</span></button>
+							<button type="button" class="btn btn_dark btn_block btn_coupon_down"  disabled="disabled"><span>받기완료</span></button>
 							</th:block>
 							<th:block th:unless="${goodsCoupon.custPubLimitQty > 0 and goodsCoupon.custPubLimitQty <= goodsCoupon.custCouponCnt}">
 							<button type="button" class="btn btn_dark btn_block btn_coupon_down" th:attr="cpnId=${goodsCoupon.cpnId}" th:id="${'coupon_'+goodsCoupon.cpnId}" onclick="fnGoodsCouponDown(this);"><span>쿠폰받기</span></button>
@@ -50,9 +50,9 @@
 				</ul>
 			</div>
 		</form>	
-		</div>
+		</div> 
 		<div class="modal-footer">
-			<button type="button" class="btn btn_primary btn_all_cpdown" onclick="fnGoodsCouponDownAll();"><span>쿠폰 모두 받기</span></button>
+			<button type="button"  id="btn_all_coupon" class="btn btn_primary btn_all_cpdown" onclick="fnGoodsCouponDownAll();"><span>쿠폰 모두 받기</span></button>
 		</div>
 	</div>
 </div>
@@ -143,12 +143,14 @@
 								if (Number(coupon.custPubLimitQty) <= Number(coupon.custCouponCnt)){
 									$('#coupon_'+ coupon.cpnId).html('<span>받기완료</span>');
 									$('#coupon_'+ coupon.cpnId).attr('disabled', true);
+									$('#coupon_'+ coupon.cpnId).find('span::after').attr('content','');
 								}
 							}
 							if (Number(coupon.TotPubLimitQty) > 0){
 								if (Number(coupon.TotPubLimitQty) <= Number(coupon.CustCouponCnt)){
 									$('#coupon_'+ coupon.cpnId).html('<span>받기완료</span>');
 									$('#coupon_'+ coupon.cpnId).attr('disabled', true);
+									$('#coupon_'+ coupon.cpnId).find('span::after').attr('content','');
 								}
 							}
 						}
@@ -162,16 +164,18 @@
 	
 	var jfCouponCheck = function(){
 		let couponDownAbleYn = "N";
-		$('.btn_coupon_down').each(function(){
+		$('#goodsCouponForm').find('.btn_coupon_down').each(function(){
 			if (!$(this).attr('disabled')){
 				couponDownAbleYn = "Y";
 			}
 		});	
 		
 		if(couponDownAbleYn == "N"){
-			$('.btn_all_cpdown').addClass('btn_coupon_done');
-			$('.btn_all_cpdown').attr('disabled', true);
-			$('.btn_all_cpdown').find('span').text('쿠폰 모두 받기 완료');
+			
+			$('#btn_all_coupon').removeClass('btn_primary');
+			$('#btn_all_coupon').addClass('btn_coupon_done');
+			$('#btn_all_coupon').attr('disabled', true);
+			$('#btn_all_coupon').find('span').text('쿠폰 모두 받기 완료');
 		}
 	}	
 	

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

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

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

@@ -884,7 +884,7 @@
 							<p class="tit normal" th:text="${goodsCompose.goodsSafeNo.certFormNm + ' '+ goodsCompose.goodsSafeNo.certTypeNm}"></p>
 							</th:block>
 							<p class="normal" >
-								<th:block th:if="${goodsCompose.goodsSafeNo.certNum}" th:text="${'인goodsCompose.증번호: ' + goodsSafeNo.certNum}"></th:block>
+								<th:block th:if="${goodsCompose.goodsSafeNo.certNum}" th:text="${'인증번호: ' + goodsCompose.goodsSafeNo.certNum}"></th:block>
 								<th:block th:if="${goodsCompose.goodsSafeNo.certFormGb != 'G084_4' and  goodsCompose.goodsSafeNo.certFormGb != 'G084_5' }">
 								<a th:href="@{http://www.safetykorea.kr/search/searchPop(certNum=${goodsCompose.goodsSafeNo.certNum})}" target="_blank" class="linktxt3">상세보기</a>
 								</th:block>
@@ -1108,6 +1108,7 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 	
+
 	var cateNm = "";
 	// 다다익선 상품
 	var fnGoodsTmtbSearch = function(params) {
@@ -1835,6 +1836,7 @@
 			return false;
 		});
 
+		
 		var opt_selecter01 = new sCombo('.opt_select .select_custom.item_opt1.item_opt1_1');
 		var opt_selecter01_1 = new sCombo('.opt_set_select .select_custom.item_opt1.item_opt1_1');
 		var opt_selecter01_2 = new sCombo('.opt_set_select .select_custom.item_opt1.item_opt1_2');

src/main/webapp/WEB-INF/views/web/mypage/MypageReviewFormWeb.html

@@ -103,8 +103,8 @@
 				<input type="hidden" name="pageSize" value="10" />
 			</form>
 			<form id="searchForm2" name="searchForm2" th:action="@{'/mypage/already/review/list'}" th:method="post">
-				<input type="hidden" name="pageNo2" value="1" />
-				<input type="hidden" name="pageSize2" value="10" />
+				<input type="hidden" name="pageNo" value="1" />
+				<input type="hidden" name="pageSize" value="10" />
 			</form>
 
 	<script src="/ux/plugins/gaga/gaga.paging.js"></script>
@@ -204,7 +204,6 @@
 		$('#nodata2').hide();
 		
 		$('#reviewList').html('');
-		
 		if (result.dataList2 != null && result.dataList2.length > 0) {
 			$.each(result.dataList2, function(idx, item) {
 				let html = '';
@@ -364,8 +363,7 @@
 			$('#nodata2').show();
 		}
 		// Create pagination
-		console.log(result.paging2.pageable2);
-		gagaPaging.createPagination(result.paging2.pageable2);
+		gagaPaging.createPagination(result.paging2.pageable);
 		
 	}