Merge branch 'develop' into bin2107

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

@@ -145,15 +145,13 @@ public class TsfPlanningService {
 		}
 		
 		if (TsfSession.isLogin()) {
-			String grade = TsfSession.getInfo().getCustGrade();
 			// 신규회원접근가능여부 조회
-			if (grade.equals("G110_50")) {
-				plan.setCustNo(TsfSession.getInfo().getCustNo());
-				if ("N".equals(planningDao.getNewCustomerAccessibleYn(plan))) {
-					msg = "신규회원만 접근 가능합니다.";
-				}
+			plan.setCustNo(TsfSession.getInfo().getCustNo());
+			if ("N".equals(planningDao.getNewCustomerAccessibleYn(plan))) {
+				msg = "신규회원만 접근 가능합니다.";
 			}
 			
+			
 			// 고객구분접근가능여부 조회
 			plan.setCustGb(TsfSession.getCustGb());
 			if ("N".equals(planningDao.getCustomerGubunAccessibleYn(plan))) {
@@ -166,7 +164,11 @@ public class TsfPlanningService {
 			if ("N".equals(planningDao.getCustomerGradeAccessibleYn(plan))) {
 				Iterator<Plan> iter = planningDao.getCustomerGradeAccessibleList(plan).iterator();
 				while (iter.hasNext()) {
-					custGrade += iter.next().getCustGrade()+ " ";
+					custGrade += iter.next().getCustGrade();
+					
+					if (iter.hasNext()) {
+						custGrade += ", ";
+					}
 				}
 				msg = custGrade+ " 회원만 접근 가능합니다.";
 			}

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

@@ -996,11 +996,11 @@
 		/* TsfCoupon.getMypageCouponInfo*/
 		SELECT COUNT(*) AS ALL_COUPON_CNT
 		    ,(  SELECT COUNT(*) AS USE_COUPON
-		        FROM TB_CUST_COUPON 
+		        FROM TB_CUST_COUPON CC 
 		        WHERE 1=1
-		        AND CUST_NO = #{custNo}
-		        AND NOW() BETWEEN AVAIL_STDT AND AVAIL_EDDT 
-		        AND USED_DT IS NULL) AS USE_COUPON_CNT
+		        AND CC.CUST_NO = #{custNo}
+		        AND NOW() BETWEEN CC.AVAIL_STDT AND CC.AVAIL_EDDT 
+		        AND CC.USED_DT IS NULL ) AS USE_COUPON_CNT
 		    ,(  SELECT COUNT(*) AS USE_COUPON
 		        FROM TB_CUST_COUPON 
 		        WHERE 1=1
@@ -1008,11 +1008,13 @@
 		        AND NOW() BETWEEN AVAIL_STDT AND AVAIL_EDDT 
 		        AND NOW() BETWEEN DATE_ADD(AVAIL_EDDT , INTERVAL -7 DAY) AND AVAIL_EDDT 
 		        AND USED_DT IS NULL) AS EXPIRE_COUPON_CNT
-		FROM TB_CUST_COUPON 
+		FROM TB_CUST_COUPON CC INNER JOIN TB_COUPON C
+		ON CC.CPN_ID = C.CPN_ID 
 		WHERE 1=1
-		  AND CUST_NO = #{custNo}
-		  AND NOW() BETWEEN AVAIL_STDT AND AVAIL_EDDT
-		  AND USED_DT IS NULL
+		  AND CC.CUST_NO = #{custNo}
+		  AND NOW() BETWEEN CC.AVAIL_STDT AND CC.AVAIL_EDDT
+		  AND CC.USED_DT IS NULL
+		  AND C.CPN_STAT = 'G232_11'
 	</select>
 	
 	<select id="getCouponDetailInfo" resultType="Coupon" parameterType="Coupon">

src/main/webapp/WEB-INF/views/mob/callcenter/OneToOneQnaFormMob.html

@@ -136,7 +136,7 @@
 									<div class="form_field">
 										<div class="ui_col_12 form_full">
 											<div class="input_wrap">
-												<textarea class="doc_contactus" name="questContent" cols="30" rows="10" style="resize: none;" placeholder="내용을 입력해 주세요. (필수)" required="required" data-valid-name="내용"></textarea>
+												<textarea class="doc_contactus" id="questContent" name="questContent" cols="30" rows="10" style="resize: none;" placeholder="내용을 입력해 주세요. (필수)" required="required" data-valid-name="내용"></textarea>
 												<p class="txt_cnt">
 													<span id="contactus_cnt" class="contactus_cnt"><em class="c_primary">0</em>/500</span>
 												</p>
@@ -284,6 +284,10 @@
 		fnSetCallcenterGnb(2);
 		
 		$('#btnQnaMore').trigger('click');
+		
+		$('#questContent').bind('input paste', function() {
+			  $(this).trigger('keyup');
+		});
 	});
 	
 	// 더보기

src/main/webapp/WEB-INF/views/mob/error/InaccessMob.html

@@ -50,11 +50,12 @@
 		<div class="wrap notfind system inspect"><!--  페이지 특정 클래스 -->
 			<div class="contGrp">
 				<h2>접근 불가</h2>
-				<p th:text="${inaccessibleMsg}">모바일웹에서만 접근이 가능합니다.</p>
+				<p th:text="${inaccessibleMsg}"></p>
 			</div>
 			<div class="btn_group">
-				<button class="btn btn_default" onclick="fnGoToHome();"><span>홈으로 이동</span></button>
+				<button class="btn btn_default" th:if="${loginYn == 'Y'}" onclick="fnGoToHome();"><span>홈으로 이동</span></button>
 				<button class="btn btn_dark" onclick="javascript:history.back(-1);"><span>목록으로 이동</span></button>
+				<button class="btn btn_default" th:if="${loginYn == 'N'}" onclick="fnGoToLogin();"><span>로그인</span></button>
 			</div>
 		</div>
 	</div>
@@ -64,6 +65,9 @@
 	let fnGoToHome = function() {
 		document.location.href = '/';
 	}
+	let fnGoToLogin = function() {
+		document.location.href = '/signin';
+	}
 </script>
 
 </body>

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

@@ -597,6 +597,7 @@
 		}else {
 			if($("#goodsReviewForm input[name=pageNo]").val()==1){
 				$('#goodsReviewForm').find('.nodata').show();
+				$('#goodsReviewForm').find('.review_list').hide();
 			}
 			gagaInfiniteScroll.draw('not');
 		}
@@ -655,6 +656,8 @@
 		
 		$.each(result.dataList, function(idx, item) {
 			$('#goodsReviewForm').find('.nodata').hide();
+			$('#goodsReviewForm').find('.review_list').show();
+			
 			tag += '<li>\n';
 			tag += '<div class="review">\n';
 			tag += '	<div class="info_box">\n';

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

@@ -174,7 +174,7 @@
 						<!-- //표준 사이즈 카테고리별 구분일때 -->
 						<th:block th:if="${brandSizeInfoList != null and !brandSizeInfoList.empty}">
 						<!-- 표준 사이즈 브랜드별 구분일때 -->
-						<div class="size_head">
+						<!-- <div class="size_head">
 							<span class="tit_header" th:text="${goodsInfo.brandGroupNm}">페르지노몬티 FERGINO MONTI</span>
 						</div>
 						<div class="size_head">
@@ -183,7 +183,7 @@
 								<div class="lap">
 									<div class="category_close">카테고리닫기</div>
 									<div class="category_list">
-										<!-- 표준 사이즈 > 카테고리 선택 -->
+										표준 사이즈 > 카테고리 선택
 										<div class="sub_tab_nav">
 											<ul>
 												<li th:each="brandSizeInfo, status : ${brandSizeInfoList}"  th:class="${status.first}? 'active' : ''" >
@@ -191,11 +191,11 @@
 												</li>
 											</ul>
 										</div>
-										<!-- //표준 사이즈 > 카테고리 선택 -->
+										//표준 사이즈 > 카테고리 선택
 									</div>
 								</div>
 							</div>
-						</div>
+						</div> -->
 						<div class="size_cont">
 							<div class="sub_tab_cont_wrap">
 								<th:block th:each="brandSizeInfo, status : ${brandSizeInfoList}" th:utext="${#strings.unescapeJava(#strings.escapeJava(brandSizeInfo.sizeInfo))}"></th:block>

src/main/webapp/WEB-INF/views/mob/mypage/MypageCustModifyFormMob.html

@@ -169,7 +169,7 @@
 								<th>계좌번호</th>
 								<td>
 									<div class="input_wrap certi_wrap">
-										<input type="text" id="accountNo" name="accountNo" class="form_control" maxlength="20" data-valid-type="numeric"  placeholder="계좌번호를 입력해 주세요"/>
+										<input type="number" pattern="\d*" id="accountNo" name="accountNo" class="form_control" maxlength="20" data-valid-type="numeric"  placeholder="계좌번호를 입력해 주세요"/>
 										<button type="button" id="btnAccountCheck" class="btn btn_dark">
 											<span>계좌인증</span>
 										</button>

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

@@ -482,6 +482,7 @@
 		if (result.dataList != null && result.dataList.length > 0) {
 			
 			$('.area_rv_all').show();
+			$('#goodsReviewForm').find('.review_list').show();
 			$.each(result.dataList, function(idx, item) {
 				let tag = '<li>\n';
 				tag += '<div class="review">\n';
@@ -603,6 +604,7 @@
 				$('#goodsReviewForm').find('.nodata').show();	
 			}
 			$('#goodsReviewForm').find('.ui_row').hide();
+			$('#goodsReviewForm').find('.review_list').hide();
 		}
 
 		// Create pagination

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

@@ -163,14 +163,14 @@
 						</th:block>
 						<th:block th:if="${brandSizeInfoList != null and !brandSizeInfoList.empty}">
 						<!-- 표준 사이즈 브랜드별 구분일때 -->
-						<div class="size_head">
+						<!-- <div class="size_head">
 							<span class="tit_sub" th:text="${goodsInfo.brandGroupNm}">페르지노몬티 FERGINO MONTI</span>
 							<div class="sub_tab_nav">
 								<ul>
 									<li th:each="brandSizeInfo, status : ${brandSizeInfoList}"  th:class="${status.first}? 'active' : ''" ><a href="javascript:void(0)" th:text="${brandSizeInfo.sizeCate2Nm}">여성</a></li>
 								</ul>
 							</div>
-						</div>
+						</div> -->
 						<div class="size_cont">
 							<div class="sub_tab_cont_wrap">
 								<th:block th:each="brandSizeInfo, status : ${brandSizeInfoList}" th:utext="${#strings.unescapeJava(#strings.escapeJava(brandSizeInfo.sizeInfo))}"></th:block>

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

@@ -598,6 +598,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 
 /* ev_renew_1 */
 .dp .promotion_visual {margin-bottom: -1.2rem;}
+.dp .promotion_visual img {width: 100%;}
 .dp {background: #f5f5f5;}
 .dp .inner:last-child {padding-bottom: 0;}
 .dp .dp_btn_area .btn_wrap {padding:3rem 0; border-bottom: 0.1rem solid #ddd; text-align: center;}
@@ -706,12 +707,16 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .modal.photo_comment_popup .modal-body {padding: 0 0; margin:0; height: 100%;}
 .modal.photo_comment_popup .modal-body .pop_cont {max-height:none; height: 100vh; height: calc(var(--vh, 1vh) * 100); overflow:hidden; position: relative; padding-bottom: 13rem; padding-top: 5.2rem;}
 .modal.photo_comment_popup .modal-body .pop_cont .pop_slide {position: relative; height: 100%; overflow:hidden;}
+.modal.photo_comment_popup .modal-body .pop_cont .pop_slide {position: relative; overflow: hidden;transition: all 300ms ease;transform: scale(1);}
+.modal.photo_comment_popup .modal-body .pop_cont .pop_slide #prodMovBtn{background: rgb(246 55 55 / 0%);  position: absolute;top: 0;left: 0;width: 100%;height: 100%;border: none;color: transparent;font-size: 0.1rem;z-index: 2;}
+.modal.photo_comment_popup .modal-body .pop_cont .pop_slide iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;}
 .modal.photo_comment_popup .modal-body .pop_cont .pop_slide .swiper-container {height: 100%;}
 .modal.photo_comment_popup .modal-body .pop_cont .pop_slide .swiper-pagination-fraction {bottom:2.5rem; width:auto; left: 50%; transform:translateX(-50%); background: rgba(34,34,34,.5); color: #fff; font-weight: 300;padding:0.5rem 0.7rem; line-height: 1; font-size: 1.2rem; border-radius:2rem;}
 .swiper-pagination-current {font-weight: 600;}
 /* .swiper-pagination-current:before {content:'0';} */
 .modal.photo_comment_popup .pop_detail {position: fixed; left: 0; bottom: 0; width: 100%; z-index: 99; background: #fff;  box-shadow: 0 -1.4rem 1.78rem 0.22rem rgba(0, 0, 0, 0.04); font-size: 1.3rem;  transition: all 600ms cubic-bezier(0.86, 0, 0.07, 1); }
-.pop_slide .swiper-slide .img {}
+.pop_slide .swiper-slide .mov {position: relative; width: 100%; height: 100%;}
+.pop_slide .swiper-slide .img {position: relative; height: 100%;}
 .pop_slide .swiper-slide img {width: auto; height: auto; max-height: 100%; max-width: 100%; margin: auto 0; position: absolute; top: 50%; bottom: auto; left: 50%; right: 0; transform: translate(-50%, -50%); cursor: pointer;}
 .modal.photo_comment_popup .pop_detail .pop_open_btn {position: absolute; left: 0; top: 0; width: 100%; background: url('/images/mo/ico_pop_arrow.png') no-repeat center; display: block; width: 100%; height: 3rem; background-position:center; background-size:3rem;}
 .modal.photo_comment_popup .pop_detail .comment_wrap {max-height: 10rem; padding:0 2rem 2rem; margin-top: 3rem; transition: all 600ms cubic-bezier(0.86, 0, 0.07, 1); overflow-y:auto;}

src/main/webapp/ux/style24_link.js

@@ -1525,6 +1525,12 @@ function cfnSendToKakao(linkUrl, linkNm, linkImg) {
 }
 
 function cfnSendToKakaoMob(linkUrl, linkNm, linkImg) {
+	
+	if (_frontGb != "A") {
+		cfnSendToKakao(linkUrl, linkNm, linkImg);
+		return false;
+	}
+	
 	// Kakao Key
 	if ( kakaoInitCnt == 0 ) {
 		Kakao.init(kakaoDomainKey);