쿠폰관련 작업

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,6 +103,7 @@
 						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){

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/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

@@ -861,7 +861,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>
@@ -1085,6 +1085,7 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 	
+
 	var cateNm = "";
 	// 다다익선 상품
 	var fnGoodsTmtbSearch = function(params) {
@@ -1812,6 +1813,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/ux/mo/css/common_m.css

@@ -313,7 +313,7 @@ input[type="file"] {
   display: inline !important;float: left;margin: 0 10px 0 0;width: 7.2rem;height:7.2rem;
   border: 1px solid #dddddd;box-sizing: border-box;position: relative; overflow: hidden;
 }
-.pics.mov::after {content:''; position:absolute; left:0; top:0; width:100%; height:100%; background:rgba(0,0,0,0.3) url('/images/mo/ico_play.png') no-repeat 50% 50%; z-index:2;}
+.pics.mov::after {content:''; position:absolute; left:0; top:0; width:100%; height:100%; background:rgba(0,0,0,0.3) url('/images/mo/ico_play.png') no-repeat 50% 50%; z-index:0;}
 .picsThumbs {
   width: auto;height: auto;max-height: 7.1rem;max-width:7.1rem;margin: auto 0;
   position: absolute;top: 50%;bottom: auto;left: 50%;right: 0;
@@ -321,7 +321,7 @@ input[type="file"] {
 }
 .removes {
   display: block;width:2rem;height:2rem;font-size: 0;text-align: center;cursor: pointer;background-color: #666666;
-  position: absolute;top: 0;bottom: auto;left: auto;right: 0; z-index: 3;
+  position: absolute;top: 0;bottom: auto;left: auto;right: 0; z-index: 1;
 }
 .removes::after {
   content: '';display: inline-block;width: 2rem;height: 2rem;