Browse Source

Merge branch 'sowon' into develop

sowon4187 5 years ago
parent
commit
8e1f4470dc

+ 20 - 0
src/main/java/com/style24/front/biz/web/TsfPlanningController.java

@@ -39,6 +39,7 @@ import com.style24.persistence.domain.Coupon;
 import com.style24.persistence.domain.CustCoupon;
 import com.style24.persistence.domain.CustDeliveryAddr;
 import com.style24.persistence.domain.Customer;
+import com.style24.persistence.domain.Goods;
 import com.style24.persistence.domain.Plan;
 import com.style24.persistence.domain.Point;
 import com.style24.persistence.domain.Poll;
@@ -314,6 +315,25 @@ public class TsfPlanningController extends TsfBaseController {
 		return mav;
 	}
 	
+	/**
+	 * 댓글이미지상세 -  댓글 상세 레이어
+	 * @return
+	 * @author sowon
+	 * @since 2021. 5. 15
+	 */
+	@PostMapping("/reply/detail/layer")
+	public ModelAndView planReplyDetailForm(Plan plan) {
+		ModelAndView mav = new ModelAndView();
+
+		// 상품 기본정보
+		mav.addObject("plan",plan);
+
+		mav.addObject("replyAttachList",planningService.getEntryReplyAttachList(plan));
+		mav.addObject("replyList",planningService.getReplyList(plan));
+		mav.setViewName(super.getDeviceViewName("planning/PlanningReplyPhotoForm"));
+		return mav;
+	}
+	
 	/**
 	 * 기획전/이벤트 댓글 리스트
 	 *

+ 1 - 0
src/main/java/com/style24/persistence/domain/Plan.java

@@ -272,6 +272,7 @@ public class Plan extends TscBaseDomain {
 	private String entryVal7;			//참여값7
 	private String entryVal8;			//참여값8
 	private Integer planEntrySq;		//참여일련번호
+	private Integer planEntryAtSq;
 	private String orgFileNm;
 	private String sysFileNm;
 	private String entryAllYn;

+ 7 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsfPlanning.xml

@@ -1540,6 +1540,9 @@
 			FROM TB_PLAN_ENTRY PE
 			WHERE 1=1
 		    AND PE.PLAN_SQ = #{planSq}
+		    <if test="planEntrySq != null and planEntrySq != ''">
+		    AND PE.PLAN_ENTRY_SQ = #{planEntrySq}
+		    </if>
 		    ORDER BY REG_DT DESC
 		)Z
 		<include refid="selectForPagingFooter"/>
@@ -1622,12 +1625,16 @@
 	<select id="getEntryReplyAttachList" resultType="Plan" parameterType="Plan">
 		/* TsfPlanning.getEntryReplyAttach */	
 		SELECT PEA.PLAN_ENTRY_SQ
+		      ,PEA.PLAN_ENTRY_AT_SQ
 		      ,PEA.ORG_FILE_NM 
 		      ,PEA.SYS_FILE_NM 
 		FROM TB_PLAN_ENTRY PE INNER JOIN TB_PLAN_ENTRY_ATTACH PEA 
 		                                    ON PE.PLAN_ENTRY_SQ = PEA.PLAN_ENTRY_SQ 
 		WHERE 1=1
 		   AND PE.PLAN_SQ = #{planSq}
+		   <if test="planEntrySq != null and planEntrySq != ''">
+		   AND PE.PLAN_ENTRY_SQ = #{planEntrySq}
+		   </if>
 	</select>
 	
 	<delete id="deleteEntryReplyAttach" parameterType="Plan">

+ 3 - 3
src/main/webapp/WEB-INF/views/mob/goods/GoodsReviewPhotoFormMob.html

@@ -3,15 +3,15 @@
 	xmlns:th="http://www.thymeleaf.org">
 <!--
  *******************************************************************************
- * @source  : GoodsReviewPhotoFormMob.html
- * @desc	: 상품평 - 포토/영상 리스트 팝업
+ * @source  : PlanningReplyPhotoFormMob.html
+ * @desc	: 댓글 이미지 팝업
  *============================================================================
  * STYLE24
  * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE		 AUTHOR	  DESCRIPTION
  * ===  ===========  ==========  =============================================
- * 1.0  2021.04.008   eskim		최초 작성
+ * 1.0  2021.05.15   sowon		최초 작성
  *******************************************************************************
  -->
 <div class="modal-dialog" role="document">

File diff suppressed because it is too large
+ 165 - 150
src/main/webapp/WEB-INF/views/mob/planning/PlanningDetailFormMob.html


+ 155 - 0
src/main/webapp/WEB-INF/views/mob/planning/PlanningReplyPhotoFormMob.html

@@ -0,0 +1,155 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org">
+<!--
+ *******************************************************************************
+ * @source  : GoodsReviewPhotoFormMob.html
+ * @desc	: 상품평 - 포토/영상 리스트 팝업
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE		 AUTHOR	  DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.04.008   eskim		최초 작성
+ *******************************************************************************
+ -->
+<div class="modal-dialog" role="document">
+	<div class="modal-content">
+		<div class="modal-header">
+			<h5 class="modal-title" id="comment_popup">포토 댓글</h5>
+		</div>
+		<div class="modal-body">
+			<div class="pop_cont">
+				<div class="pop_slide">
+					<div class="swiper-container">
+						<div class="swiper-wrapper">
+							<div class="swiper-slide">
+								<div class="img">
+									<img src="/images/mo/cs_pop_people2.png" alt="">
+								</div>
+							</div>
+						</div>
+					</div>
+					<!-- Add Pagination -->
+					<div class="swiper-pagination"></div>
+				</div>
+				<div class="pop_detail">
+					<button class="pop_open_btn">
+						<span class="sr-only"></span>
+					</button>
+					<!-- 210414_추가 : comment_wrap 태그 추가. -->
+					<div class="comment_wrap">
+						<div class="review_p">애용하는 회원으로서 스타일24의 리뉴얼은 저의 일처럼 기쁘네요 ^^
+							깔끔하고 세련된 느낌으로 단장해서 사이트 들어왔을 때 기분이 좋답니다! 사이트 리뉴얼 겸 겨울옷을 사려고 한창
+							둘러보았어요. 따뜻한 느낌 풀풀 내는 아이템들로 찜꽁 해놓았답니다! 이왕 이벤트도 당첨되어서 포인트도 얻고, 또
+							구매도 하고 싶네요ㅋㅋㅋ 리뉴얼 하신거 축하드려요!!! 당첨되길 바랍니다.^^리뉴얼 진심으로 축하드립니다~~다가오는
+							봄처럼 산뜻한 디자인이 보기 좋네요~ 앞으로도 예쁜제품들로 많은 사람들에게 사랑받는 스타일24로 번창하시길
+							응원합니다~~아자아자 화이팅~!! 회원들을 위한 이런 이벤트를 한다는 것도너무좋네요 ♡♡ 앞으로도 계속해서 이용할
+							예정이구요 이런 적당한 가격에 이쁘고 서비스좋은 곳은..매일찾아올거같습니다!!!!</div>
+						<div class="comment_writer">
+							<span class="writer">DI2****</span> <span class="date">2020.12.30</span>
+						</div>
+					</div>
+					<!-- //210414_추가 : comment_wrap 태그 추가. -->
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<a href="javascript:void(0);" rel="modal:close"
+	onclick="cfCloseLayer('layer_review_photo')" class="close-modal">Close</a>
+<script th:inline="javascript">
+/*<![CDATA[*/
+	
+	
+	
+	$(document).ready( function() {
+		
+		
+		/* 210414_추가 : swiper fraction 숫자 1자리수 일때 앞에 0 스크립트 추가 */
+		var swiper = new Swiper('.pop_slide .swiper-container', {
+			observer: true,
+			observeParents: true,
+			pagination: {
+				el: '.pop_slide .swiper-pagination',
+				type: 'fraction',
+				formatFractionCurrent: function (number) {
+					switch(number)
+					{
+						case 1:
+						myNum='01'
+						break;
+						case 2:
+						myNum='02'
+						break;
+						case 3:
+						myNum='03'
+						break;
+						case 4:
+						myNum='04'
+						break;
+						case 5:
+						myNum='05'
+						break;
+						case 6:
+						myNum='06'
+						break;
+						case 7:
+						myNum='07'
+						break;
+						case 8:
+						myNum='08'
+						break;
+						case 9:
+						myNum='09'
+						break;
+						default:myNum= number
+						}
+					return myNum; 
+				},
+				formatFractionTotal: function (number) {
+					switch(number)
+					{
+						case 1:
+						myNum='01'
+						break;
+						case 2:
+						myNum='02'
+						break;
+						case 3:
+						myNum='03'
+						break;
+						case 4:
+						myNum='04'
+						break;
+						case 5:
+						myNum='05'
+						break;
+						case 6:
+						myNum='06'
+						break;
+						case 7:
+						myNum='07'
+						break;
+						case 8:
+						myNum='08'
+						break;
+						case 9:
+						myNum='09'
+						break;
+						default:myNum= number
+						}
+					return myNum; 
+				},
+			},
+		});
+		
+		
+	});
+	
+	
+	
+/*]]>*/
+</script>
+</html>

+ 1 - 3
src/main/webapp/WEB-INF/views/web/planning/PlanningDetailFormWeb.html

@@ -118,8 +118,7 @@
 					</div>
 					<div class="cont_body">
 						<div class="btn_wrap">
-							<a href="javascript:void(0);" class="btn btn_primary go_next"
-								onclick="javascript:fnJoinConfirm()"> <span>설문조사 참여하기</span></a>
+							<a href="javascript:void(0);" class="btn btn_primary go_next" onclick="javascript:fnJoinConfirm()"> <span>설문조사 참여하기</span></a>
 						</div>
 					</div>
 				</div>
@@ -1152,7 +1151,6 @@ $(document).ready( function() {
 		var content = $(this).val();
 		$('#cmt_cnt').html(content.length);
 		if (content.length > 500){
-			mcxDialog.alert("최대 500자까지 입력 가능합니다.");
 			$(this).val(content.substring(0, 500));
 			$('#cmt_cnt').html("500");
 		}

+ 26 - 3
src/main/webapp/ux/style24_link.js

@@ -88,9 +88,10 @@ const _PAGE_NOMEMBER_CRE_LIST = _frontUrl + "/noMember/cre/list/form";				// 비
 //== 검색 ==/
 
 //== 기획전 ==/
-const _PAGE_PLANNING_MAIN = _frontUrl + "/planning/main/form"; 					// 기획전 메인
-const _PAGE_PLANNING_DETAIL = _frontUrl + "/planning/detail/form";				// 기획전 상세
-const _PAGE_PLANNING_CPN_DOWNLOAD = "/planning/coupon/download";			    // 상품쿠폰다운로드
+const _PAGE_PLANNING_MAIN = _frontUrl + "/planning/main/form"; 					      // 기획전 메인
+const _PAGE_PLANNING_DETAIL = _frontUrl + "/planning/detail/form";				      // 기획전 상세
+const _PAGE_PLANNING_CPN_DOWNLOAD = "/planning/coupon/download";			          // 상품쿠폰다운로드
+const _PAGE_PLANNING_REPLY_DETAIL_LAYER = _frontUrl + "/planning/reply/detail/layer"; // 상품평- 상세(포토)
 
 //== 핫딜==/
 const _PAGE_SOCIAL_MAIN = _frontUrl + "/social/main/form";						// 소설(핫딜) 메인
@@ -663,6 +664,28 @@ function cfGoodsReviewDetail(goodsCd, bestYn, photoYn, reviewSq, attachSq) {
 	cfnOpenLayer(_PAGE_GOODS_REVIEW_DETAIL_LAYER+params, 'layer_review_best');
 }
 
+/**
+* @type   : function
+* @access : public
+* @desc   : 댓글 이미지 팝업
+* <pre>
+*		cfPlanReplyDetail(planSq, planEntrySq, planEntryAtSq);
+* </pre>
+*/
+function cfPlanReplyDetail(planSq, planEntrySq, planEntryAtSq) {
+	var str = '<div class="modal pop_full photo_comment_popup" id="photo_full_popup" tabindex="-1" role="dialog" aria-labelledby="comment_popup" aria-hidden="true">';
+
+	if ($('#layer_review_best').length == 0) {
+		$('body').append(str);
+	}
+	
+	var params = '?planSq=' + planSq;
+	params += '&planEntrySq=' + planEntrySq;
+	if (typeof (planEntryAtSq) != 'undefined') params += "&planEntryAtSq=" + planEntryAtSq;
+	
+	cfnOpenLayer(_PAGE_PLANNING_REPLY_DETAIL_LAYER+params, 'photo_full_popup');
+}
+
 /**
 * @type   : function
 * @access : public

Some files were not shown because too many files changed in this diff