테스트 수정

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

@@ -432,6 +432,24 @@
 			<button type="button" class="buying btPop_auto" id="btn_purchase">구매하기</button>
 			<button type="button" class="cantbuying" >SOLD OUT</button>
 		</div>
+		<!-- (공통) 공유팝업 -->
+		<div class="modal fade" id="tglShare" tabindex="-1" role="dialog" aria-labelledby="aModalLabel" aria-hidden="true">
+			<div class="modal-dialog" role="document">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h5 class="modal-title" id="aModalLabel">공유하기</h5>
+					</div>
+					<th:block th:include="~{mob/goods/GoodsIncludeFormMob :: goodsSnsForm}"></th:block>
+				</div>
+			</div>
+		</div>
+		<script>
+			// 공유팝업
+			$('.product_floormenu .share').click(function(e){
+				e.preventDefault();
+				$('#tglShare').modal("show");
+			});
+		</script>
 	</div>
 	<!-- //바닥메뉴 -->
 </main>
@@ -493,7 +511,7 @@
 						//------
 						tag1 += '<div class="select_custom deal_opt_item">\n';	
 						tag1 += '<div class="combo">\n';
-						tag1 += '<div class="select">상품선택</div>\n';
+						tag1 += '<div class="select">선택</div>\n';
 						tag1 += '<ul class="list">\n';
 						//------
 					}
@@ -508,7 +526,6 @@
 					tagUp += '				<div class="itemPic">\n';
 					tagUp += '					<img alt="" class="vLHTC pd_img" src="'+_uploadGoodsUrl+'/'+item.sysImgNm+'?RS=44" onerror="' + _uximgUrl + '/images/pc/thumb/bg_item_none.png" >\n';
 					tagUp += '				</div>\n';
-					tagUp += '				<p class="itemBrand">'+item.brandGroupNm+'</p>\n';
 					tagUp += '				<div class="itemName" ><span class="tit_option">[상품'+(idx+1)+']</span> '+ item.goodsFullNm +'</div>\n';
 					tagUp += '				<p class="itemPrice">\n';
 					tagUp += '					 '+item.currPrice.addComma()+'\n';

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

@@ -75,62 +75,63 @@
 	var fnGetListCallback = function(result) {
 
 		if (result.dataList != null && result.dataList.length > 0) {
-		if (result.paging.pageable.pageNo == 1){
-			$('#ulGoodsQna').html('');
-		}	
-		
-		$.each(result.dataList, function(idx, item) {
-			$('#goodsQnaForm').find('.nodata').hide();
-			let tag = '';
-			tag += '<li class="';  // <!-- 내가 쓴 글에 클래스 my_qna 추가 -->
-			if (item.selfGb == 1){
-				tag += ' my_qna';	
-			}else if (item.secretYn == "Y"){
-				tag += ' secret_qna';
-			}
-			tag += ' ">\n';  // <!-- 내가 쓴 글에 클래스 my_qna 추가 -->
-			tag += '	<div class="fold_head">\n';
-			tag += '		<a href="javascript:void(0)">\n';
-			tag += '			<div>\n';
-			tag += '				<div class="fold_tit">\n';
-			tag += '					<div class="lap1">\n';
-			tag += '						<span class="fold_state ' + (item.ansStat == "G060_10" ? "doing" : "done") + '">' + item.ansStatNm + '</span>\n'; //답변완료 : done / 처리중 : doing
-			tag += '						<span class="prod">\n';
-			if (item.selfGb == 1){
-			tag += '						<i class="ico ico_myqna"></i>';	//내가 쓴 글에 추가되는 아이콘
-			}
-			if (item.secretYn == "Y"){
-			tag += '						<i class="ico ico_secret"></i>';	//비밀글에 추가되는 아이콘
-			}
-			tag += '						</span>\n';
-			tag += '					</div>\n';
-			tag += '					<div class="lap2"><span>' + item.questContent.escapeHtml() + '</span></div>\n';
-			tag += '					<span class="id">'+ item.maskingCustId+'</span><span class="data">' + item.questDt + '</span>\n';
-			tag += '				</div>\n';
-			tag += '			</div>\n';
-			tag += '		</a>\n';
-			tag += '	</div>\n';
-			tag += '	<div class="fold_cont">\n';
-			tag += '		<div class="fold_detail">\n'; //문의 내용
-			tag += '			<div>\n';
-			tag += '				<p>' + item.questContent.escapeHtml() + '</p>\n';
-			tag += '			</div>\n';
-			tag += '		</div>\n';
+			if (result.paging.pageable.pageNo == 1){
+				$('#ulGoodsQna').html('');
+			}	
 			
-			if (item.ansStat == 'G060_20') { // 답변완료 상태일 때
-				tag += '	<div class="fold_answer">\n'; //문의 답변
-				tag += '		<div>\n';
-				tag += '			<div class="answer_body">' + item.ansContent + '</div>\n';
-				tag += '			<div class="answer_foot"><span class="data">' + item.ansDt + '</span>\n';
+			$.each(result.dataList, function(idx, item) {
+				$('#goodsQnaForm').find('.nodata').hide();
+				let tag = '';
+				tag += '<li class="';  // <!-- 내가 쓴 글에 클래스 my_qna 추가 -->
+				if (item.selfGb == 1){
+					tag += ' my_qna';	
+				}else if (item.secretYn == "Y"){
+					tag += ' secret_qna';
+				}
+				tag += ' ">\n';  // <!-- 내가 쓴 글에 클래스 my_qna 추가 -->
+				tag += '	<div class="fold_head">\n';
+				tag += '		<a href="javascript:void(0)">\n';
+				tag += '			<div>\n';
+				tag += '				<div class="fold_tit">\n';
+				tag += '					<div class="lap1">\n';
+				tag += '						<span class="fold_state ' + (item.ansStat == "G060_10" ? "doing" : "done") + '">' + item.ansStatNm + '</span>\n'; //답변완료 : done / 처리중 : doing
+				tag += '						<span class="prod">\n';
+				if (item.selfGb == 1){
+				tag += '						<i class="ico ico_myqna"></i>';	//내가 쓴 글에 추가되는 아이콘
+				}
+				if (item.secretYn == "Y"){
+				tag += '						<i class="ico ico_secret"></i>';	//비밀글에 추가되는 아이콘
+				}
+				tag += '						</span>\n';
+				tag += '					</div>\n';
+				tag += '					<div class="lap2"><span>' + item.questContent.escapeHtml() + '</span></div>\n';
+				tag += '					<span class="id">'+ item.maskingCustId+'</span><span class="data">' + item.questDt + '</span>\n';
+				tag += '				</div>\n';
+				tag += '			</div>\n';
+				tag += '		</a>\n';
+				tag += '	</div>\n';
+				tag += '	<div class="fold_cont">\n';
+				tag += '		<div class="fold_detail">\n'; //문의 내용
+				tag += '			<div>\n';
+				tag += '				<p>' + item.questContent.escapeHtml() + '</p>\n';
 				tag += '			</div>\n';
 				tag += '		</div>\n';
+				
+				if (item.ansStat == 'G060_20') { // 답변완료 상태일 때
+					tag += '	<div class="fold_answer">\n'; //문의 답변
+					tag += '		<div>\n';
+					tag += '			<div class="answer_body">' + item.ansContent + '</div>\n';
+					tag += '			<div class="answer_foot"><span class="data">' + item.ansDt + '</span>\n';
+					tag += '			</div>\n';
+					tag += '		</div>\n';
+					tag += '	</div>\n';
+				}
 				tag += '	</div>\n';
-			}
-			tag += '	</div>\n';
-			tag += '</li>\n';
+				tag += '</li>\n';
+				
+				$('#ulGoodsQna').append(tag);
+			});
 			
-			$('#ulGoodsQna').append(tag);
-		});
 			if (result.paging.pageable.totalPage > result.paging.pageable.pageNo) {
 				$('#btnMore').parent().show();
 				$('#goodsQnaForm input[name=pageNo]').val(result.paging.pageable.pageNo + 1);
@@ -140,6 +141,7 @@
 		
 		}else{
 			$('.nodata').show();
+			$('#ulGoodsQna').html('');
 			$('#btnMore').parent().hide();
 			$('.form_field.check_secret').hide();
 		}

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

@@ -78,7 +78,7 @@
 									<th>
 										<th:block th:text="${#numbers.formatInteger(freeGoods.sectionVal, 0,'COMMA')}"></th:block><th:block th:text="${(freeGoods.sectionGb == 'G810_10')? '개':'원'}"></th:block> 이상 구매 시
 										<th:block th:each="goodsNm : ${#strings.arraySplit(freeGoods.freeGoods,',')}" th:with="goodsArray=${#strings.arraySplit(goodsNm,'@:')}">
-										<p><th:block th:text="${goodsArray[0]}"></th:block> <th:block th:text="${#numbers.formatInteger(goodsArray[1], 0,'COMMA')}"></th:block>개 증정 <th:block th:if="${freeGoods.allYn == 'N'}" th:text="${'외 택1'}"></th:block></p>
+										<p><th:block th:text="${goodsArray[0]}"></th:block> <th:block th:text="${goodsArray[1]}"></th:block>개 증정 <th:block th:if="${freeGoods.allYn == 'N'}" th:text="${'외 택1'}"></th:block></p>
 										</th:block>
 									</th>
 								</tr>

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

@@ -422,8 +422,6 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 	
-	
-	
 	let socialSq = [[${goodsInfo.socialSq}]];	
 	let socialEddt = [[${goodsInfo.socialEddt}]];
 	
@@ -1115,6 +1113,11 @@
 	     },
 	 });   
 	
+	// 상품평 상세 레이어 호출후 콜백에서 호출하므로 여기에 있어야함
+	var fnReviewDetailLayerCollBack = function(){
+		
+	}
+	
 	$(document).ready( function() {
 		
 		//상품 대표설명 > 우측 상품정보 

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

@@ -78,7 +78,7 @@
 									<td>
 										<div class="th"><th:block th:text="${#numbers.formatInteger(freeGoods.sectionVal, 0,'COMMA')}"></th:block><th:block th:text="${(freeGoods.sectionGb == 'G810_10')? '개':'원'}"></th:block> 이상 구매 시</div>
 										<th:block th:each="goodsNm : ${#strings.arraySplit(freeGoods.freeGoods,',')}" th:with="goodsArray=${#strings.arraySplit(goodsNm,'@:')}">
-										<div class="td"><th:block th:text="${goodsArray[0]}"></th:block> <th:block th:text="${#numbers.formatInteger(goodsArray[1], 0,'COMMA')}"></th:block>개 증정 
+										<div class="td"><th:block th:text="${goodsArray[0]}"></th:block> <th:block th:text="${goodsArray[1]}"></th:block>개 증정 
 										<th:block th:if="${freeGoods.allYn == 'N'}" th:text="${'외 택1'}"></th:block></div>
 										</th:block>
 									</td>