Merge branch 'eskim' into develop

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

@@ -208,10 +208,10 @@
 										</div>
 									</div>
 									<div class="form_wrap">
-										<div class="form_field mb20" id="form_field_item_Up">
+										<div class="form_field mb10" id="form_field_item_Up">
 											<div class="select_custom deal_opt_item"> <!-- active -->
 												<div class="combo">
-													<div class="select">상품선택</div>
+													<div class="select">선택</div>
 													<ul class="list">
 														<!-- 선택처리 class="selected" / 선택불가 aria-disabled="true" / 품절표기 data-soldout="true" 추가  -->
 														<li th:each="goodsInfo, status : ${goodsDealComposeList}" 
@@ -224,7 +224,6 @@
 																		<div class="itemPic">
 																			<img alt="" class="vLHTC pd_img" th:src="${imgGoodsUrl+'/'+goodsInfo.sysImgNm+'?RS=44'}" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
 																		</div>
-																		<p class="itemBrand" th:text="${goodsInfo.brandGroupNm}">BRAND NAME1</p>
 																		<div class="itemName" ><span class="tit_option" th:text="${'[상품'+status.count+']'}">[상품1]</span><th:block th:text="${goodsInfo.goodsFullNm}"></th:block></div>
 																		<p class="itemPrice">
 																			<span class="itemPrice_original" th:if="${goodsInfo.listPrice > goodsInfo.currPrice}" th:text="${#numbers.formatInteger(goodsInfo.listPrice, 0,'COMMA')}">89,000</span>
@@ -243,7 +242,7 @@
 										<div class="form_field" id="form_field1_Up">
 											<div class="select_custom item_opt1" disabled>
 												<div class="combo">
-													<div class="select">옵션1선택</div>
+													<div class="select">선택</div>
 													<ul class="list" id="goodsDealOptUp1">
 														<!--  옵션 1 -->
 													</ul>
@@ -253,7 +252,7 @@
 										<div class="form_field"  id="form_field2_Up">
 											<div class="select_custom item_opt2" disabled>
 												<div class="combo">
-													<div class="select">옵션2선택</div>
+													<div class="select">선택</div>
 													<ul class="list" id="goodsDealOptUp2">
 														<!--  옵션 2 -->
 													</ul>
@@ -848,7 +847,7 @@
 	}
 	
 	//팝업 - 딜상세팝업 구매하기버튼 > 옵션셀렉트팝업	
-	var fnGoodsDealOptionOpen = function(goodsCd){
+	var fnGoodsDealSaleOpen = function(goodsCd){
 		$("#pdDescrpPop .close-modal ").click();
 		$('.container').addClass('btPop_open');
 		$(".Purchase_pop .pop_option_select").show();
@@ -865,6 +864,23 @@
         return false;
 	}	
 	
+	//팝업 - 딜상세정보 옵션선택 > 옵션셀렉트팝업
+	var fnGoodsDealOptionOpen = function(goodsCd){
+		$('.container').addClass('btPop_open');
+		$(".Purchase_pop .pop_option_select").show();
+		popOpenScroll();
+		let selIdx = 0;
+		$('.Purchase_pop .pop_option_select').find('#form_field_item_Up .list li').each(function() { 
+			if (goodsCd == $(this).find('.item_prod').attr('goodscd')){
+				return false;
+			}
+			selIdx ++;
+		});
+		
+		$('.Purchase_pop .pop_option_select').find('#form_field_item_Up .list li').eq(selIdx).trigger("click");
+        return false;
+	}	
+	
 	// pop open
 	function popOpenScroll(){
 		$('html, body').css({'overflow': 'hidden', 'height': '100%'}); 
@@ -1140,15 +1156,15 @@
 			 $(".Purchase_pop .pop_option_select").hide();
 			 return false;
 		 })
-			//팝업 - 딜상세정보 옵션선택 > 옵션셀렉트팝업
-		$(document).on('click','.pd_dealitem .item_prod .btn_default',function(e){
-				$('.container').addClass('btPop_open');
-				$(".Purchase_pop .pop_option_select").show();
-				popOpenScroll();
-			 return false;
-		 });
+//			//팝업 - 딜상세정보 옵션선택 > 옵션셀렉트팝업 ==> fnGoodsDealOptionOpen()대체
+//		$(document).on('click','.pd_dealitem .item_prod .btn_default',function(e){
+//				$('.container').addClass('btPop_open');
+//				$(".Purchase_pop .pop_option_select").show();
+//				popOpenScroll();
+//			 return false;
+//		 });
 
-		//팝업 - 딜상세팝업 구매하기버튼 > 옵션셀렉트팝업  ==> fnGoodsDealOptionOpen()대체
+		//팝업 - 딜상세팝업 구매하기버튼 > 옵션셀렉트팝업  ==> fnGoodsDealSaleOpen()대체
 //		$(document).on('click','#pdDescrpPop .modal-footer button',function(e){
 //			$("#pdDescrpPop .close-modal ").click();
 //			$('.container').addClass('btPop_open');

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

@@ -672,11 +672,16 @@
 			tag += '			<dl>\n';
 			tag += '				<div>\n';
 			tag += '					<dt>구매옵션</dt>\n';
+			tag += '					<dd>\n';
 			if (item.goodsOptionList != null && item.goodsOptionList.length > 0){
 				$.each(item.goodsOptionList, function(gIdx, goodsOption){
-			tag += '					<dd>'+ goodsOption.optCd1 +' / '+ goodsOption.optCd2 +'</dd>\n';		
+			tag += '					'+ goodsOption.optCd1Nm +' / '+ goodsOption.optCd2;
+				if (item.goodsOptionList.length != (gIdx+1)){
+			tag += '					,';
+				}
 				});
 			}
+			tag += '					</dd>\n';
 			tag += '				</div>\n';
 			tag += '				<div>\n';
 			tag += '					<dt>키/몸무게</dt>\n';

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

@@ -61,7 +61,7 @@
 								<span class="itemPercent" th:if="${goodsInfo.dcRate > 0}" th:text="|${#numbers.formatDecimal(goodsInfo.dcRate,0,0)}%|">10%</span>
 							</p>
 						</a>
-					<button type="button" class="btn btn_default">옵션 선택</button>
+						<button type="button" class="btn btn_default" th:onclick="fnGoodsDealOptionOpen([[${goodsInfo.compsGoodsCd}]])">옵션 선택</button>
 					</div>
 				</div>
 			</div>
@@ -444,10 +444,10 @@
 	//팝업 - 딜상세팝업 구매하기버튼
 	$(document).on('click','#btn_deal_purchase',function(e){
 		let selGoodsCd = $('#pdDescrpPop').find('input[name=selectGoods]').val();
-		fnGoodsDealOptionOpen(selGoodsCd);
+		fnGoodsDealSaleOpen(selGoodsCd);
 	});
 	
-	
+
 	$(document).ready( function() {
 		
 	});

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

@@ -33,10 +33,10 @@
 				<div class="form_field">
 					<div class="input_box">
 						<div class="input_wrap">
-							<textarea name="questContent" cols="30" rows="10"  maxlength="500" placeholder="문의내용 입력(500자 이내)" style="resize: none;"></textarea>
+							<textarea id="exchange2" name="questContent" maxlength="500" style="resize: none;" placeholder="내용을 입력해 주세요 (필수)"></textarea>
 							<p class="txt_cnt">
-								<span id="itemqna_cnt" class="itemqna_cnt" ><em class="c_primary">0</em>/500자</span>
-							</p>   
+								<span id="exchange2-counter" class="c_primary">12</span> / 500
+							</p>
 						</div>           
 						<div class="secret_box">
 							<input id="wr_secret" type="checkbox" name="secretYn" value="Y"><label for="wr_secret"><span>비밀글설정</span></label>
@@ -74,18 +74,18 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 
-	// 상품문의 작성 > 글자수 체크
-	$('.pd_qnawrite_pop .doc_itemqna').keyup(function (e){
-		let contentQna = $(this).val();
-		$('.itemqna_cnt').html("(<em class='c_primary'>"+contentQna.length+"</em>/500자)");
-		
-		if (contentQna.length > 500){
-			$(this).val(contentQna.substring(0, 500));
-			$('.itemqna_cnt').html("(<em class='c_primary'>500</em>/500자)");
-			//mcxDialog.alert("최대 500자까지 입력 가능합니다.");
-			return false;
-		}
+	$('#exchange2').keyup(function (e){
+		var content = $(this).val();
+		$('#exchange2-counter').html(content.length);
 	});
+	$('#exchange2').keyup();
+
+	$('#exchange2').focus(function(){
+		$(this).parent('.input_wrap').css('outline', '1px auto rgb(229, 151, 0)');
+	})
+	$('#exchange2').blur(function(){
+		$(this).parent('.input_wrap').css('outline', 'none');
+	})
 	
 	// 저장
 	var fnGoodsQnaSave = function() {

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

@@ -81,9 +81,12 @@
 													<dl>
 														<div th:if="${review.goodsOptionList != null and !review.goodsOptionList.empty}" >
 															<dt >구매옵션</dt>
+															<dd> 
 															<th:block th:each="reviewGoods, goodsStatus : ${review.goodsOptionList}">
-															<dd th:text="${reviewGoods.optCd1Nm +' / '+ reviewGoods.optCd2}">베이지 / 100</dd>
+															<th:block th:text="${reviewGoods.optCd1Nm +' / '+ reviewGoods.optCd2}">베이지 / 100</th:block>
+															<th:block th:if="${not goodsStatus.last}" th:text="${','}"></th:block>
 															</th:block>
+															</dd>
 														</div>
 														<div>
 															<dt>키/몸무게</dt>