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

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -150,7 +150,10 @@ public class TsfOrderService {
 				&& !TscConstants.OrderDetailStat.DEPOSIT_WAIT.value().equals(tmpOrder.getOrdDtlStat())
 				&& !TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value().equals(tmpOrder.getOrdDtlStat())
 				&& !TscConstants.OrderDetailStat.GOODS_PREPARE.value().equals(tmpOrder.getOrdDtlStat())) {
-				allCanYn = "N";
+				// 2021.06.28 취소수량 존재 시 전체취소 불가 처리
+				if (tmpOrder.getCnclRtnQty() > 0) {
+					allCanYn = "N";
+				}
 			}
 
 			// 전체 구매확정 가능 여부 설정

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

@@ -1864,7 +1864,7 @@
 		                 , G.REG_DT                                                 /*등록일시*/
 		            FROM   TB_CATE_4SRCH C4
 		                 , TB_CATE_GOODS CG
-		                 , TB_GOODS G
+		                 , TB_GOODS G USE INDEX (IX_GOODS_12)
 		                 , TB_GOODS_STOCK GS
 		                 , TB_BRAND B
 		                 , TB_BRAND_GROUP BG

src/main/webapp/WEB-INF/views/mob/app/NoticeFormMob.html

@@ -33,7 +33,7 @@
 				if (_osType === 'A') {
 					 window.style24.getPushList();
 				} else if (_osType === 'I') {
-
+					window.webkit.messageHandlers.getPushList.postMessage({"dummy":"dummy"});
 				}
 			} else {
 				$('#notice').addClass('nodata');

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

@@ -46,7 +46,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval1 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-1-'+${pollData.pollQsq}" th:value="${pollData.pollQval1}" class="etc"><label th:for="'rdi-1-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval1}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval2 != null && pollData.pollQval2 != ''}">
@@ -55,7 +55,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval2 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-2-'+${pollData.pollQsq}" th:value="${pollData.pollQval2}" class="etc"><label th:for="'rdi-2-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval2}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}"onkeyup="chkChar(this)" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval3 != null && pollData.pollQval3 != ''}">
@@ -64,7 +64,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval3 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-3-'+${pollData.pollQsq}" th:value="${pollData.pollQval3}" class="etc"><label th:for="'rdi-3-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval3}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval4 != null && pollData.pollQval4 != ''}">
@@ -73,7 +73,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval4 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-4-'+${pollData.pollQsq}" th:value="${pollData.pollQval4}" class="etc"><label th:for="'rdi-4-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval4}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" > </textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" id="" class="etc_input" > </textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval5 != null && pollData.pollQval5 != ''}">
@@ -82,7 +82,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval5 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-5-'+${pollData.pollQsq}" th:value="${pollData.pollQval5}" class="etc"><label th:for="'rdi-5-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval5}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval6 != null && pollData.pollQval6 != ''}">
@@ -91,7 +91,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval6 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-6-'+${pollData.pollQsq}" th:value="${pollData.pollQval6}" class="etc"><label th:for="'rdi-6-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval6}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval7 != null && pollData.pollQval7 != ''}">
@@ -100,7 +100,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval7 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-7-'+${pollData.pollQsq}" th:value="${pollData.pollQval7}" class="etc"><label th:for="'rdi-7-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval7}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval8 != null && pollData.pollQval8 != ''}">
@@ -109,7 +109,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval8 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-8-'+${pollData.pollQsq}" th:value="${pollData.pollQval8}" class="etc"><label th:for="'rdi-8-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval8}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval9 != null && pollData.pollQval9 != ''}">
@@ -118,7 +118,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval9 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-9-'+${pollData.pollQsq}" th:value="${pollData.pollQval9}"class="etc"><label th:for="'rdi-9-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval9}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 												<li th:if="${pollData.pollQval10 != null && pollData.pollQval10 != ''}">
@@ -127,7 +127,7 @@
 													</th:block>
 													<th:block th:unless="${pollData.pollQval10 != '기타'}">
 														<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-10-'+${pollData.pollQsq}" th:value="${pollData.pollQval10}" class="etc"><label th:for="'rdi-10-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval10}"></span></label>
-														<textarea th:name="'etc_input_'+${pollData.pollQsq}" id="" class="etc_input" ></textarea>
+														<textarea th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" id="" class="etc_input" ></textarea>
 													</th:block>
 												</li>
 											</ul>
@@ -177,14 +177,14 @@
 								<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>
+										<textarea class="doc_ans" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" onkeyup="chkChar(this)" 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 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>
+										<textarea class="q4_ans" name=""  onkeyup="chkChar(this)" id="" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="${pollData.pollQsq+'_'+(pollStat.index+1)}"></textarea>
 									</div>
 							
 								</div>
@@ -334,6 +334,14 @@ var fnSubmitPoll = function () {
 	})
 }
 
+	function chkChar(obj){
+	    var RegExp = /[\{\}\[\]\/?.,;:|\)*~`!^\-_+┼<>@\#$%&\'\"\\\(\=]/gi;	//정규식 구문
+	    if (RegExp.test(obj.value)) {
+	      // 특수문자 모두 제거    
+	      obj.value = obj.value.replace(RegExp , '');
+	    }
+	}
+	
 $(document).ready(function(){
 	//Q3 글자 수 카운트
 	$('.doc_ans').keyup(function (e){

src/main/webapp/WEB-INF/views/web/planning/PlanningEventPollFormWeb.html

@@ -68,7 +68,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval1 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-1-'+${pollData.pollQsq}" th:value="${pollData.pollQval1}" class="etc_radio"><label th:for="'rdi-1-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval1}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval2 != null && pollData.pollQval2 != ''}">
@@ -77,7 +77,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval2 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-2-'+${pollData.pollQsq}" th:value="${pollData.pollQval2}" class="etc_radio"><label th:for="'rdi-2-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval2}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval3 != null && pollData.pollQval3 != ''}">
@@ -86,7 +86,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval3 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-3-'+${pollData.pollQsq}" th:value="${pollData.pollQval3}" class="etc_radio"><label th:for="'rdi-3-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval3}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}"onkeyup="chkChar(this)"  class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval4 != null && pollData.pollQval4 != ''}">
@@ -95,7 +95,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval4 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-4-'+${pollData.pollQsq}" th:value="${pollData.pollQval4}" class="etc_radio"><label th:for="'rdi-4-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval4}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval5 != null && pollData.pollQval5 != ''}">
@@ -104,7 +104,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval5 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-5-'+${pollData.pollQsq}" th:value="${pollData.pollQval5}" class="etc_radio"><label th:for="'rdi-5-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval5}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval6 != null && pollData.pollQval6 != ''}">
@@ -113,7 +113,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval6 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-6-'+${pollData.pollQsq}" th:value="${pollData.pollQval6}" class="etc_radio"><label th:for="'rdi-6-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval6}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval7 != null && pollData.pollQval7 != ''}">
@@ -122,7 +122,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval7 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-7-'+${pollData.pollQsq}" th:value="${pollData.pollQval7}" class="etc_radio"><label th:for="'rdi-7-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval7}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval8 != null && pollData.pollQval8 != ''}">
@@ -131,7 +131,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval8 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-8-'+${pollData.pollQsq}" th:value="${pollData.pollQval8}" class="etc_radio"><label th:for="'rdi-8-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval8}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input"/>
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" class="form_control etc_input"/>
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval9 != null && pollData.pollQval9 != ''}">
@@ -140,7 +140,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval9 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-9-'+${pollData.pollQsq}" th:value="${pollData.pollQval9}"class="etc_radio"><label th:for="'rdi-9-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval9}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" class="form_control etc_input" />
 															</th:block>
 														</li>
 														<li th:if="${pollData.pollQval10 != null && pollData.pollQval10 != ''}">
@@ -149,7 +149,7 @@
 															</th:block>
 															<th:block th:unless="${pollData.pollQval10 != '기타'}">
 																<input type="radio" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="'rdi-10-'+${pollData.pollQsq}" th:value="${pollData.pollQval10}" class="etc_radio"><label th:for="'rdi-10-'+${pollData.pollQsq}"><span th:text="${pollData.pollQval10}"></span></label>
-																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" class="form_control etc_input" />
+																<input type="text" th:name="'etc_input_'+${pollData.pollQsq}" onkeyup="chkChar(this)" class="form_control etc_input" />
 															</th:block>
 														</li>
 													</ul>
@@ -190,12 +190,12 @@
 												</th:block>
 												<th:block th:if="${pollData.pollQtype == '30'}">
 													<div class="input_wrap">
-														<input type="text" class="form_control" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="${pollData.pollQsq+'_'+(pollStat.index+1)}" />
+														<input type="text" class="form_control" onkeyup="chkChar(this)" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" th:id="${pollData.pollQsq+'_'+(pollStat.index+1)}" />
 													</div>
 												</th:block>
 												<th:block th:if="${pollData.pollQtype == '40'}">
 													<div class="input_wrap">
-														<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>
+														<textarea class="doc_ans" th:name="${pollData.pollQsq+'_'+(pollStat.index+1)}" onkeyup="chkChar(this)" th:id="${pollData.pollQsq+'_'+(pollStat.index+1)}" placeholder="1,000자 이내로 입력해 주세요." style="resize: none;"></textarea>
 														<p class="txt_cnt">
 															<span id="ans_cnt" class="ans_cnt">(<em class="c_primary">0</em>/1000자)</span>
 														</p>
@@ -310,10 +310,17 @@ var fnSubmitPoll = function () {
 			});
 		}
 	})
-	
+}
 
-	
+function chkChar(obj){
+    var RegExp = /[\{\}\[\]\/?.,;:|\)*~`!^\-_+┼<>@\#$%&\'\"\\\(\=]/gi;	//정규식 구문
+    if (RegExp.test(obj.value)) {
+      // 특수문자 모두 제거    
+      obj.value = obj.value.replace(RegExp , '');
+    }
 }
+
+
 $(document).ready( function() {
 	
 	//SNS 공유 버튼 토글 

src/main/webapp/biz/mypage.js

@@ -412,7 +412,7 @@ var fnReceipt = function(param) {
 		// 팝업 크기 설정
 		option = 'width=455, height=815';
 	}
-console.log(receiptWin);
+
 	// 팝업 생성
 	window.open(receiptWin, "", option);
 }
@@ -436,16 +436,16 @@ var fnGetTextLength = function(obj, maxLen) {
 // 리뷰작성 페이지 이동
 var fnReviewCreate = function(obj1,obj2,obj3) {
 	let ordNo = obj1;
-		let ordDtlNo = obj2;
-		let goodsCd = obj3;
-		let reviewStat = 'c';
-		
-		$('#createReview input[name=ordNo]').val(ordNo);
-		$('#createReview input[name=ordDtlNo]').val(ordDtlNo);
-		$('#createReview input[name=goodsCd]').val(goodsCd);
-		$('#createReview input[name=reviewStat]').val(reviewStat);
-		
-		document.createReview.submit();
+	let ordDtlNo = obj2;
+	let goodsCd = obj3;
+	let reviewStat = 'c';
+	
+	$('#createReview input[name=ordNo]').val(ordNo);
+	$('#createReview input[name=ordDtlNo]').val(ordDtlNo);
+	$('#createReview input[name=goodsCd]').val(goodsCd);
+	$('#createReview input[name=reviewStat]').val(reviewStat);
+	
+	document.createReview.submit();
 }
 
 // 취반교 신청 취소 버튼 클릭 이벤트

src/main/webapp/ux/mo/css/common_m.css

@@ -1960,7 +1960,7 @@ button.alertCls {-webkit-appearance: none;padding: 0;cursor: pointer;background:
 
 
 /* Notch  */
-@media only screen and (min-width: 375px) and (max-width: 415px) and (min-height: 722px) and (max-height: 897px){/* footer{padding-bottom: 8rem;}  *//* footer .f1 {padding: 0 0 8.5rem;}  *//* footer .btn_top {bottom: 20.5%;} */.my .my_delivery .inner > .btn_group,.adrsAdd_pop .modal-footer .btn,.shopping_bag .od_calc_wrap{padding-bottom: 8.8rem; background-color: #f5f5f5; background-color: #aa2020;}.cs_contactUs_my_footer,.product_floormenu,.product_floormenu.fixed{/*height: calc(env(safe-area-inset-bottom) + 8.8rem);height: calc(constant(safe-area-inset-bottom) + 8.8rem);*/	background: #38c056; padding-bottom: 8.8rem;}}footer,footer .f1 {padding-bottom: calc(env(safe-area-inset-bottom) + 3.5rem);padding-bottom: clac(constant(safe-area-inset-bottom) + 3.5rem);}footer .btn_top {bottom: calc(env(safe-area-inset-bottom) + 6.5rem);bottom: clac(constant(safe-area-inset-bottom) + 6.5rem);}.modal.pd_pop.pd_review_pop .pd_review .area_rv_empty .btn_group_flex{bottom: calc(env(safe-area-inset-bottom) + 6.5rem);bottom: clac(constant(safe-area-inset-bottom) + 6.5rem);}.my .my_delivery .inner > .btn_group,.adrsAdd_pop .modal-footer .btn,.cs_contactUs_my_footer,.shopping_bag .od_calc_wrap,.modal.pd_pop.pd_review_pop .pd_review .area_rv_empty .btn_group_flex,.product_floormenu,.product_floormenu.fixed{/* background: #f5f5f5; height: 5.8rem; height: calc() + 5.8rem); height: calc() + 5.8rem); */ 	padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); background: #f5f5f5; background: #000000;}
+@media only screen and (min-width: 375px) and (max-width: 415px) and (min-height: 722px) and (max-height: 897px){/* footer{padding-bottom: 8rem;}  *//* footer .f1 {padding: 0 0 8.5rem;}  *//* footer .btn_top {bottom: 20.5%;} */.my .my_delivery .inner > .btn_group,.adrsAdd_pop .modal-footer .btn,.shopping_bag .od_calc_wrap{padding-bottom: 8.8rem; background-color: #f5f5f5; background-color: #aa2020;}.cs_contactUs_my_footer,.product_floormenu,.product_floormenu.fixed{/*height: calc(env(safe-area-inset-bottom) + 8.8rem);height: calc(constant(safe-area-inset-bottom) + 8.8rem);*/	background: #38c056; padding-bottom: 8.8rem;}}footer,footer .f1 {padding-bottom: calc(env(safe-area-inset-bottom) + 3.5rem);padding-bottom: clac(constant(safe-area-inset-bottom) + 3.5rem);}footer .btn_top {bottom: calc(env(safe-area-inset-bottom) + 6.5rem);bottom: clac(constant(safe-area-inset-bottom) + 6.5rem);}.my .my_delivery .inner > .btn_group,.adrsAdd_pop .modal-footer .btn,.cs_contactUs_my_footer,.shopping_bag .od_calc_wrap,.product_floormenu,.product_floormenu.fixed{/* background: #f5f5f5; height: 5.8rem; height: calc() + 5.8rem); height: calc() + 5.8rem); */ 	padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); background: #f5f5f5; background: #000000;}
 
 
 /* APP ONLY */

src/main/webapp/ux/mo/css/layout_m.css

@@ -1227,15 +1227,17 @@
 .pd_delivery .change .pop_table tr th {width: 10rem; padding: 0 0 0 1.2rem; color:#222; font-weight:500; background: #f5f5f5; text-align:left; word-break: break-all;}
 
 /* pd_pop > 상품리뷰 페이지 */
+
 .modal.pd_pop.pd_review_pop {overflow-x: hidden;overflow-y: auto;}
 .modal.pd_pop.pd_review_pop .modal-header{border-bottom:0.1rem solid #eee !important;}
 .modal.pd_pop.pd_review_pop .modal-body{margin-top:9.3rem; padding:0}
 .modal.pd_pop.pd_review_pop .modal-header{height:auto;}
 .modal.pd_pop.pd_review_pop .pd_detail{overflow: hidden;}
 .modal.pd_pop.pd_review_pop .riview_box .area_slider{margin-bottom:0;}
-.modal.pd_pop.pd_review_pop .btn_group_flex > div > .btn{height:5.3rem;}
 /* .modal.pd_pop.pd_review_pop .pd_review .area_rv_empty .btn_group_flex{position:fixed; width: 100%; bottom: 0; left:0; margin-top: 0; z-index:98;-webkit-transform: translateZ(0);} */
 /* .modal.pd_pop.pd_review_pop .pd_review .area_rv_empty .btn_group_flex{padding-bottom: env(safe-area-inset-bottom);-webkit-backface-visibility:hidden;-webkit-transform:translateZ(0); -webkit-transform:translate3d(0, 0, 0);} */
+/* .pd_review_pop .btn_group_flex > div > .btn, */
+.pd_review .btn_group_flex > div > .btn{height:5.3rem;}
 .pd_review{background:#f5f5f5;overflow-x: hidden;}
 .pd_review.best,
 .pd_review.photo{background:#fff; position:relative; bottom:0; z-index:999; max-height:35rem;}

src/main/webapp/ux/pc/css/layout.css

@@ -1173,6 +1173,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 .goods_info .order_desc .goods_box .gd_item .name {float:none; display:block; display:-webkit-box; width:100%; height:auto; max-height:40px; margin-top:15px; color:#222; font-size:16px; font-weight:300; line-height:20px; overflow:hidden; text-overflow:ellipsis; -webkit-line-clamp:2; -webkit-box-orient:vertical;}
 .goods_info .order_desc .goods_box .gd_item .brand {float:left; display:inline-block; margin-right:10px; color:#888; font-size:14px; font-weight:200;}
 .goods_info .order_desc .goods_box .gd_item .tag {float:left; margin-right:6px; margin-top:-5px;}
+.goods_info .order_desc .goods_box .gd_item.soldout .thumb:before {content:'SOLD OUT'; position: absolute; top: 50%; left: 50%; font-size: 14px; font-weight: 500; color:#fff; background: rgba(0,0,0,.7); width: 100%; height: 100%; transform:translate(-50%, -50%); line-height: 142px; z-index: 20; text-align: center;}
 .goods_info .order_desc .goods_box .gd_opt {margin-top:15px;}
 .goods_info .order_desc .goods_box .gd_opt .option_wrap {margin-top:15px}
 .goods_info .order_desc .goods_box .gd_opt .option_wrap:first-child {margin-top:0;}
@@ -1821,7 +1822,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.dp_Exhibition .exhi_list .exhi_item .exhi_item_img .exhi_detail * {display: -webkit-box; text-overflow: ellipsis; -webkit-line-clamp: 2; -webkit-box-orient: vertical; overflow: hidden; color: #fff; font-weight: 300; letter-spacing: 0;}
 	.dp_Exhibition .exhi_list .exhi_item .exhi_item_img .exhi_detail .brand {font-size: 14px;}
 	.dp_Exhibition .exhi_list .exhi_item .exhi_item_img .exhi_detail .tit {margin:20px 0 15px; padding-bottom: 0; max-height:66px; font-size:24px; line-height:1.4; word-break:keep-all; text-align:left;}
-	.dp_Exhibition .exhi_list .exhi_item .exhi_item_img .exhi_detail .sale {font-size: 14px;}
+	.dp_Exhibition .exhi_list .exhi_item .exhi_item_img .exhi_detail .sale {font-size: 14px; -webkit-line-clamp: 1; height: 13px;}
 	.dp_Exhibition .exhi_list .exhi_item_pr {background: #fff; padding: 20px; position: relative; z-index: 9; width: 88.4%; margin:-70px auto 0; min-height:356px;}
 	.dp_Exhibition .exhi_list .exhi_item_pr li {height: 150px; margin-bottom: 16px;}
 	.dp_Exhibition .exhi_list .exhi_item_pr li:last-child {margin-bottom: 0;}
@@ -2222,6 +2223,7 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.od .od_side .area_order .od_item_box .part_dlvr .gd_list .item_gd .price {margin-top:5px}
 	.od .od_side .area_order .od_item_box .part_dlvr .gd_list .item_gd .info_reserv {margin-top:10px; color:#fd4802; font-size:14px; font-weight:200;}
 	.od .od_side .area_order .od_item_box .part_dlvr .gd_list .item_gd .info_reserv span {margin-left:10px; font-weight:300;}
+	.od .od_side .area_order .od_item_box .part_dlvr .gd_list .item_gd.soldout .thumb:before {content:'SOLD OUT'; position: absolute; top: 50%; left: 50%; font-size: 14px; font-weight: 500; color:#fff; background: rgba(0,0,0,.7); width: 100%; height: 100%; transform:translate(-50%, -50%); line-height: 150px; z-index: 20; text-align: center;}
 	.od .od_side .area_order .od_amount_box {padding:30px; color:#888; font-size:14px; font-weight:200;}
 	.od .od_side .area_order .od_amount_box dl div {margin-top:20px;}
 	.od .od_side .area_order .od_amount_box dl div:first-child {margin-top:0px}