Merge remote-tracking branch 'origin/develop' into card007

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

@@ -58,7 +58,9 @@ public class TsfDeliveryService {
 	public void saveDelvStat(SweetTracker sweetTracker) {
 		Integer userNo = 99999;
 		// 배송완료건 상태값 변경   
+		log.info("step1");
 		
+		log.info("sweetTracker.getLevel() : "+sweetTracker.getLevel());
 		if(6 == sweetTracker.getLevel()) {
 			// 주문상세번호 조회 
 			Collection<SweetTracker> list = deliveryDao.getOrdDtlNoList(sweetTracker);
@@ -119,11 +121,12 @@ public class TsfDeliveryService {
 				}
 			}
 		}
-		
+		log.info("step2");
 		// 	TB_SWEET_TRACKER 등록 
 		sweetTracker.setDelvLevel(sweetTracker.getLevel()+"");
 		sweetTracker.setDelvWhere(sweetTracker.getWhere());
 		deliveryDao.insertTbSweetTracker(sweetTracker);
+		log.info("step end");
 	}
 
 	/**

src/main/java/com/style24/front/biz/web/TsfDeliveryController.java

@@ -51,6 +51,8 @@ public class TsfDeliveryController extends TsfBaseController {
 	@ResponseBody
 	public String sweetTrackerResponse(@RequestBody SweetTracker  sweetTracker) throws Exception {
 
+		log.info("sweettracker call");
+		log.info("sweetTracker {}"+sweetTracker);
 		
 		JsonObject rtn = new JsonObject();
 		

src/main/webapp/WEB-INF/views/mob/common/fragments/FooterMob.html

@@ -39,7 +39,7 @@
 						<li class="fn">사업자등록번호 : 116-81-32499 </li>
 <!--						<li class="fn">개인정보관리책임자 : 이정득 </li>-->
 						<li class="fn">통신판매업신고번호 : 제 2020-서울영등포-1432</li>
-						<li class="fn">개인정보보호책임자 : 김명인</li>
+						<li class="fn">개인정보보호책임자 : 박중재</li>
 						<li class="fn">호스팅 서비스 : 아이스타일이십사㈜</li>
 					</ul>
 				</div>

src/main/webapp/WEB-INF/views/mob/common/fragments/HeadMob.html

@@ -183,6 +183,16 @@
 		};
 		var cosemRequest = new cosem_Request();
 		cosemRequest.tracking();
+		
+		function cosemConvert(rn, amt, pc, pa, pp, pg, etc) {
+			var cosemProtocol = ( location.protocol=="https:" )? "https:" :"http:";
+			var image = new Image();
+			var accountCode = "951";
+			var imageURL = cosemProtocol + "//" + "tracking.icomas.co.kr";
+			imageURL += "/Script/action3.php" + "?aid=" + accountCode + "&rn=" + encodeURI(rn) ;
+			imageURL += "&amt=" + amt + "&pc=" + encodeURI(pc) + "&pa=" + pa + "&pp=" + pp + "&pg=" + encodeURI(pg) + "&etc=" + encodeURI(etc);
+			image.src = imageURL;
+		}
 	</script>
 	<!--// Cosem Log Gathering Script V.2.0 -->
 </head>

src/main/webapp/WEB-INF/views/mob/customer/JoinCompleteFormMob.html

@@ -186,10 +186,15 @@ if (window.wcs) {
 </script>
 <!--// Facebook Pixel Event Code -->
 
+<!-- Cosem Log Gathering Script V.2.0 -->
 <script type="text/javascript">
-	// 구매번호, 전체금액(숫자), 상품코드(상품명), 상품수량(숫자), 상품단가(숫자), 카테고리, 기타
-	cosemConvert("0", "0", "회원가입", "0", "0", "", "");
+	setTimeout(function() { 
+		//cosemConvert( "구매번호", "전체금액(숫자)", "상품코드(상품명)", "상품수량(숫자)", "상품단가(숫자)", "카테고리", "기타" );
+		cosemConvert("0", "0", "회원가입", "0", "0", "", "");
+		}, 10);
 </script>
+<!--// Cosem Log Gathering Script V.2.0 -->
+
 </th:block>
 </body>
 </html>

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -44,7 +44,7 @@
 						<span class="time mb20">평일 <span data-font="lato"> 09:00 ~ 18:00</span> <br> (토/일공휴일 휴무)</span><br>
 						<span class="tel mb10" data-font="lato">1544-5336</span><br>
 						<span class="fax mb10" data-font="lato">F.02-780-0435</span><br>
-						<span class="mail mb30" data-font="lato">Email : help@istyle24.com</span>
+						<span class="mail mb30" data-font="lato">Email : help@style24.com</span>
 					</p>
 				</div>
 				<div class="sns_box clear">
@@ -70,7 +70,7 @@
 								<span>사업자등록번호: <em data-font="lato">116-81-32499</em></span>
 								<span>통신판매업 신고번호: 제<rm data-font="lato">2020</rm>-서울영등포-<rm data-font="lato">1432</rm></span>
 								<span><a class="clickable" href="http://www.ftc.go.kr/bizCommPop.do?wrkr_no=2298137000" target="_blank" title="새창 열림">사업자정보확인</a></span><br>
-								<span>개인정보보호책임자 : 김명인</span>
+								<span>개인정보보호책임자 : 박중재</span>
 								<span>호스팅 서비스사업자 : 아이스타일이십사(주)</span>
 							</p>
 						</div>

src/main/webapp/WEB-INF/views/web/common/fragments/HeadWeb.html

@@ -233,6 +233,16 @@
 		};
 		var cosemRequest = new cosem_Request();
 		cosemRequest.tracking();
+		
+		function cosemConvert(rn, amt, pc, pa, pp, pg, etc) {
+			var cosemProtocol = ( location.protocol=="https:" )? "https:" :"http:";
+			var image = new Image();
+			var accountCode = "951";
+			var imageURL = cosemProtocol + "//" + "tracking.icomas.co.kr";
+			imageURL += "/Script/action3.php" + "?aid=" + accountCode + "&rn=" + encodeURI(rn) ;
+			imageURL += "&amt=" + amt + "&pc=" + encodeURI(pc) + "&pa=" + pa + "&pp=" + pp + "&pg=" + encodeURI(pg) + "&etc=" + encodeURI(etc);
+			image.src = imageURL;
+		}
 	</script>
 	<!--// Cosem Log Gathering Script V.2.0 -->
 </head>

src/main/webapp/WEB-INF/views/web/customer/JoinCompleteFormWeb.html

@@ -128,10 +128,14 @@ if (window.wcs) {
 </script>
 <!--// Facebook Pixel Event Code -->
 
+<!-- Cosem Log Gathering Script V.2.0 -->
 <script type="text/javascript">
-	// 구매번호, 전체금액(숫자), 상품코드(상품명), 상품수량(숫자), 상품단가(숫자), 카테고리, 기타
-	cosemConvert("0", "0", "회원가입", "0", "0", "", "");
+	setTimeout(function() { 
+		//cosemConvert( "구매번호", "전체금액(숫자)", "상품코드(상품명)", "상품수량(숫자)", "상품단가(숫자)", "카테고리", "기타" );
+		cosemConvert("0", "0", "회원가입", "0", "0", "", "");
+		}, 10);
 </script>
+<!--// Cosem Log Gathering Script V.2.0 -->
 
 </th:block>
 </body>

src/main/webapp/WEB-INF/views/web/display/BrandSearchLayerWeb.html

@@ -54,20 +54,29 @@
 					<button type="button" onclick="fnRealtimeGoodsList();"><span><em class="time" th:text="${#calendars.format(#calendars.createNow(), 'HH:mm')}">17:30</em> 기준</span></button>
 				</div>
 				<div class="realtime_wrap">
-					<div class="itemsGrp" id="itemViewArea">
-						<th:block th:each="item, status : ${realtimeGoodsList}">
-							<div class="item_prod">
-								<div class="item_state">
-									<a th:href="${item.itemUrl}" class="itemLink">
-										<div class="itemPic">
-											<img alt="" class="vLHTC pd_img" th:src="${item.imageUrl}">
+				
+					<div class="swiper-container">
+	           			<div class="swiper-wrapper itemsGrp" id="itemViewArea">
+							<th:block th:each="item, status : ${realtimeGoodsList}">
+								<div class="swiper-slide">
+									<div class="item_prod">
+										<div class="item_state">
+											<a th:href="${item.itemUrl}" class="itemLink">
+												<div class="itemPic">
+													<img alt="" class="vLHTC pd_img" th:src="${item.imageUrl}">
+												</div>
+												<div class="itemName" th:text="${item.itemName}"></div>
+												<div class="viewCount"><span th:text="${item.count < 10 ? '10명 미만' : item.count + '명 보는중'}"></span></div>
+											</a>
 										</div>
-										<div class="itemName" th:text="${item.itemName}"></div>
-										<div class="viewCount"><span th:text="${item.count < 10 ? '10명 미만' : item.count + '명 보는중'}"></span></div>
-									</a>
+									</div>
 								</div>
-							</div>
-						</th:block>
+							</th:block>
+						</div>
+						<div class="swiper-controls">
+			                <div class="swiper-scrollbar"></div>
+			            </div>
+						
 					</div>
 				</div>
 			</div>
@@ -165,11 +174,27 @@
 		cfnGoToPage(actionUrl);
 	});
 
+	var submain_slide;
 	$(document).ready( function() {
 		$("#brand_layer_search").addClass('active');
 
 		//통합검색 - 검색어 입력 시
 		//
+		
+		// 지금 고객님들이 많이 보고 있어요
+		//210730_ 추가 : 지금 고객님들이 많이 보고 있어요 슬라이드 swiper 옵션 추가.
+		submain_slide = new Swiper('.realtime_wrap .swiper-container', {
+			slidesPerView: 5,
+			watchOverflow:true,
+			freeMode:true,
+			observer: true,
+			observeParents: true,
+			speed:1000,
+			scrollbar: {
+				el: '.realtime_wrap .swiper-scrollbar',
+				hide: false,
+			},
+		});
 	});
 
 	// 검색어 찾기
@@ -333,24 +358,41 @@
 		$.getJSON('/display/realtime/goods/list', function (result){
 			if(result.length > 0){
 				$.each(result, function (idx, item){
-					html += '<div class="item_prod">\n';
-					html += '	<div class="item_state">\n';
-					html += '		<a href="'+item.itemUrl+'" class="itemLink">\n';
-					html += '			<div class="itemPic">\n';
-					html += '				<img alt="" class="vLHTC pd_img" src="'+item.imageUrl+'">\n';
-					html += '			</div>\n';
-					html += '			<div class="itemName">'+item.itemName+'</div>\n';
+					html += '<div class="swiper-slide">\n';
+					html += '	<div class="item_prod">\n';
+					html += '		<div class="item_state">\n';
+					html += '			<a href="'+item.itemUrl+'" class="itemLink">\n';
+					html += '				<div class="itemPic">\n';
+					html += '					<img alt="" class="vLHTC pd_img" src="'+item.imageUrl+'">\n';
+					html += '				</div>\n';
+					html += '				<div class="itemName">'+item.itemName+'</div>\n';
 					if(item.count < 10){
 						html += '			<div class="viewCount"><span>10명</span> 미만</div>\n';
 					}else{
 						html += '			<div class="viewCount"><span>'+item.count.addComma()+'</span>명 보는중</div>\n';
 					}
-					html += '		</a>\n';
+					html += '			</a>\n';
+					html += '		</div>\n';
 					html += '	</div>\n';
 					html += '</div>\n';
-				});
+									
+				})
 			}
 			$("#itemViewArea").append(html);
+			
+			// 슬라이드 사이즈 때문에 재설정함
+			submain_slide = new Swiper('.realtime_wrap .swiper-container', {
+				slidesPerView: 5,
+				watchOverflow:true,
+				freeMode:true,
+				observer: true,
+				observeParents: true,
+				speed:1000,
+				scrollbar: {
+					el: '.realtime_wrap .swiper-scrollbar',
+					hide: false,
+				},
+			});
 		});
 	}
 

src/main/webapp/WEB-INF/views/web/display/MallMainForm3Web.html

@@ -7180,7 +7180,7 @@ $(document).ready(function() {
 						<span class="time mb20">평일 <span data-font="lato"> 09:00 ~ 18:00</span> <br> (토/일공휴일 휴무)</span><br>
 						<span class="tel mb10" data-font="lato">1544-5336</span><br>
 						<span class="fax mb10" data-font="lato">F.02-780-0435</span><br>
-						<span class="mail mb30" data-font="lato">Email : help@istyle24.com</span>
+						<span class="mail mb30" data-font="lato">Email : help@style24.com</span>
 					</p>
 				</div>
 				<div class="sns_box clear">
@@ -7206,7 +7206,7 @@ $(document).ready(function() {
 								<span>사업자등록번호: <em data-font="lato">116-81-32499</em></span>
 								<span>통신판매업 신고번호: 제<rm data-font="lato">2020</rm>-서울영등포-<rm data-font="lato">1432</rm></span>
 								<span><a class="clickable" href="http://www.ftc.go.kr/bizCommPop.do?wrkr_no=2298137000" target="_blank" title="새창 열림">사업자정보확인</a></span><br>
-								<span>개인정보보호책임자 : 김명인</span>
+								<span>개인정보보호책임자 : 박중재</span>
 								<span>호스팅 서비스사업자 : 아이스타일이십사(주)</span>
 							</p>
 						</div>

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

@@ -467,7 +467,8 @@
 .pd_detail > .inner.wide{padding-left:0!important; padding-right:0!important; padding-bottom:0;}
 .pd_detail .movbox {position: relative;height: 0;padding-top: 100%;padding-bottom:50.25%;overflow: hidden;transition: all 300ms ease;transform: scale(1);}
 .pd_detail .movbox #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;}
-.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;}
+/* .pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;} */
+.pd_detail .movbox iframe{position: absolute;right: 0;top: 0;bottom: 0;width: 300%;height: 100%;z-index: 1;left:-100%}
 .pd_detail .thumb_box{position: relative;}
 .pd_detail .thumb_box .thumb_list{position:relative;}
 .pd_detail .thumb_box .thumb_list .thumb{position:relative; width:100%; padding-bottom: 150%;; background-color:#f5f5f5; overflow: hidden;}

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

@@ -2516,7 +2516,8 @@ ul.maintabs li [class^='box_depth'] {display:none; position:absolute; left:100%;
 	.pd_detail .thumb img,
 	.pd_detail .thumb video {position:absolute; left:0; top:50%; width:100%; transform:translateY(-50%) ; z-index:2;}
 	.pd_detail .movbox {position: relative;height: 0;padding-top: 100%;padding-bottom:50.25%;overflow: hidden;transition: all 300ms ease;transform: scale(1);}
-	.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;pointer-events:none;left: -83.45%;width: 185%;}
+	/* .pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 100%;height: 100%;z-index: 1;pointer-events:none; left: -83.45%;width: 185%;} */
+	.pd_detail .movbox iframe{position: absolute;left: 0;right: 0;top: 0;bottom: 0;width: 300%;height: 100%;z-index: 1;pointer-events:none; left: -100%;}
 	.pd_detail .movbox iframe[src*="youtu"] {left:0; width: 100%;}
 	.pd_detail .btn_popup {display:inline-block; padding:0px; box-sizing:border-box;}
 	.pd_detail .btn_popup span {color:#888; font-size:12px; font-weight:200; border-bottom:1px solid #888;}