Przeglądaj źródła

Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

jsshin 4 lat temu
rodzic
commit
9563b93bed

+ 15 - 1
src/main/java/com/style24/front/biz/service/TsfDisplayService.java

@@ -544,6 +544,7 @@ public class TsfDisplayService {
 	 */
 	public Collection<Contents> getContentsForGoods(Contents contents) {
 		Collection<Contents> contentsList = displayDao.getContentsList(contents);
+		Collection<Goods> goodsList = new ArrayList<>();
 		Cate4Srch tempContents = new Cate4Srch();
 		for (Contents data : contentsList) {
 			tempContents.setContentsLoc(data.getContentsLoc());
@@ -554,7 +555,20 @@ public class TsfDisplayService {
 				data.setFrontGb(TsfSession.getFrontGb());
 				data.setBannerList(displayDao.getContentsBannerList(data));
 			}
-			data.setGoodsList(goodsDao.getContentsCategoryGoodsList(tempContents));
+			goodsList = (goodsDao.getContentsCategoryGoodsList(tempContents));
+			if("SMM007".equals(data.getContentsLoc())){
+				int maxrow = 3;
+				if(goodsList == null || goodsList.size() < 3){
+					Cate4Srch cate = new Cate4Srch();
+					cate.setSiteCd(TscConstants.Site.STYLE24.value());
+					cate.setCateGb(TsfConstants.CateGb.BYITEM.value());
+					cate.setFrontGb(data.getFrontGb());
+					cate.setBrandGroupNo(Integer.parseInt(data.getBrandGroupNo()));
+					cate.setMaxRow(maxrow-goodsList.size());
+					goodsList.addAll(goodsDao.getContentsCategoryNewGoodsList(cate));
+				}
+			}
+			data.setGoodsList(goodsList);
 		}
 
 		log.info("getContentsForGoods contentsList.size()::{}", contentsList.size());

+ 1 - 4
src/main/java/com/style24/front/biz/service/TsfPlanningService.java

@@ -393,8 +393,8 @@ public class TsfPlanningService {
 	public void savePollCustAnswer(Poll poll) {
 		poll.setCustNo(TsfSession.getInfo().getCustNo());
 		// 단수형
+		int ansIndex = planningDao.getPollCustAnswerIndex();
 		if(poll.getPollQsq_10()!=null && poll.getPollQsq_10()!="") {
-			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_10 =poll.getPollQsq_10().split("/");
 			for (int i = 0; i < pollQsq_10.length; i++) {
 				String[] temp = pollQsq_10[i].split("-");
@@ -412,7 +412,6 @@ public class TsfPlanningService {
 		
 		//복수형
 		if(poll.getPollQsq_20()!=null && poll.getPollQsq_20()!="") {
-			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_20 =poll.getPollQsq_20().split("/");
 			for (int i = 0; i < pollQsq_20.length; i++) {
 				String[] temp = pollQsq_20[i].split("-");
@@ -431,7 +430,6 @@ public class TsfPlanningService {
 		
 		//단답형
 		if(poll.getPollQsq_30()!=null && poll.getPollQsq_30()!="") {
-			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_30 =poll.getPollQsq_30().split("/");
 			for (int i = 0; i < pollQsq_30.length; i++) {
 				String[] temp = pollQsq_30[i].split("-");
@@ -449,7 +447,6 @@ public class TsfPlanningService {
 		
 		//서룰형
 		if(poll.getPollQsq_40()!=null && poll.getPollQsq_40()!="") {
-			int ansIndex = planningDao.getPollCustAnswerIndex();
 			String[] pollQsq_40 =poll.getPollQsq_40().split("/");
 			for (int i = 0; i < pollQsq_40.length; i++) {
 				String[] temp = pollQsq_40[i].split("-");

+ 1 - 0
src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -1436,6 +1436,7 @@ public class TsfOrderController extends TsfBaseController {
 		// 3. 화면전송변수설정
 		mav.addObject("orderAddPayGoodsList"	, orderAddPayGoodsList);					// 주문목록정보
 		mav.addObject("ordNo"					, resultMap.get("ordNo"));					// 주문번호
+		mav.addObject("ordNm"					, resultMap.get("ordNm"));					// 주문자명
 		mav.addObject("refundAmt"				, resultMap.get("refundAmt"));				// 상품환불금액
 		mav.addObject("addPayCost"				, resultMap.get("addPayCost"));				// 추가결제금액
 		mav.addObject("ordChgSq"				, resultMap.get("ordChgSq"));				// 주문취소신청번호

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

@@ -38,7 +38,7 @@
 						<li class="fn">주소 : 서울시 영등포구 은행로 11, 8층(여의도동, 일신빌딩)</li>
 						<li class="fn">사업자등록번호 : 116-81-32499 </li>
 <!--						<li class="fn">개인정보관리책임자 : 이정득 </li>-->
-						<li class="fn">통신판매업신고번호 : 제 2020-서울영등포1432</li>
+						<li class="fn">통신판매업신고번호 : 제 2020-서울영등포-1432</li>
 						<li class="fn">개인정보보호책임자 : 김명인</li>
 						<li class="fn">호스팅 서비스 : 아이스타일이십사㈜</li>
 					</ul>

+ 1 - 0
src/main/webapp/WEB-INF/views/mob/display/AllBrandFormMob.html

@@ -146,6 +146,7 @@
 
 	var swiperBrand = new Swiper('.swiper-container.brand_si', {
 		slidesPerView: 3,
+		slidesPerGroup: 6,
 		slidesPerColumn: 2,
 		spaceBetween: 0,
 		pagination: {

+ 20 - 16
src/main/webapp/WEB-INF/views/mob/display/BrandMainFormMob.html

@@ -125,23 +125,27 @@
 				<th:block th:if="${contentsLoc=='006' || contentsLoc=='014'||contentsLoc=='015'||contentsLoc=='016'}">
 					<!-- 배너 슬라이드 -->
 					<div class="inner wide" th:if="${brandMainLayoutData.ContentsList!=null and !brandMainLayoutData.ContentsList.empty}">
-						<div class="swiper-container br_second_slide">
-							<div class="swiper-wrapper">
-								<th:block th:each="ContentsData, ContentsStat : ${brandMainLayoutData.ContentsList}">
-									<div class="swiper-slide">
-										<a th:href="${ContentsData.strVar1}" target="_blank" title="새 창으로 열기">
-											<img th:src="${@environment.getProperty('domain.image')+ContentsData.imgPath1}" alt="">
-											<div class="s-text" id="bannerS">
-												<p class="bText">
-													<input type="hidden" name="bannerDesc" th:value="${ContentsData.strTitle1}">
-												</p>
-											</div>
-										</a>
-									</div>
-								</th:block>
+						<div class="main_1stage">
+							<div class="swiper-container post-bnnWide">
+								<div class="swiper-wrapper">
+									<th:block th:each="ContentsData, ContentsStat : ${brandMainLayoutData.ContentsList}">
+										<div class="swiper-slide">
+											<a th:href="${ContentsData.strVar1}" target="_blank" title="새 창으로 열기">
+												<div class="bnnbox"> <!-- 210528_ 삭제 : 인라인 style css 제거 -->
+													<div class="txtWrap" id="bannerS">
+														<p class="bText">
+															<input type="hidden" name="bannerDesc" th:value="${ContentsData.strTitle1}">
+														</p> <!-- 210614_ 수정 : 줄내림 방식 교체 -->
+													</div>
+													<img alt="BLUE-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('domain.image')+ContentsData.imgPath1}">
+												</div>
+											</a>
+										</div>
+									</th:block>
+									<!-- Add Pagination -->
+									<div class="swiper-pagination"></div>
+								</div>
 							</div>
-							<!-- Add Pagination -->
-							<div class="swiper-pagination"></div>
 						</div>
 					</div>
 				</th:block>

+ 2 - 2
src/main/webapp/WEB-INF/views/mob/display/CategoryMainFormMob.html

@@ -69,6 +69,7 @@
 									<div class="swiper-slide" th:each="item, status : ${newGoodsList}">
 										<div class="item_prod" th:if="${status.count<21}">
 											<div class="item_state">
+												<button type="button" class="itemLike" th:classappend="${item.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${item.goodsCd}, ithrCd='', contentsLoc='SCM001', planDtlSq=''">관심상품 추가</button>
 												<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${item.goodsCd}]], '', '', 'SCM001');">
 													<div class="itemPic">
 														<th:block th:each="option,idx:${item.videos}" th:with="videoArr=${#strings.arraySplit(idx.current,':')}">
@@ -76,7 +77,6 @@
 															<iframe th:unless="${videoArr[0]=='Y'}" id="pdThumbVideo" class="pd_mov" th:src="${kollusMediaUrl+'/'+videoArr[1]+'?enable_initialize_focus=false&autoplay&mute&controls_activation=none'}" allow="fullscreen" allowFullScreen></iframe>
 														</th:block>
 														<img alt="BLACK-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + item.sysImgNm}" onerror="noneImg(this)">
-														<button type="button" class="itemLike" th:classappend="${item.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${item.goodsCd}, ithrCd='', contentsLoc='SCM001', planDtlSq=''">관심상품 추가</button>
 													</div>
 													<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 													<div class="itemName" th:text="${item.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
@@ -100,6 +100,7 @@
 								<div class="itemsGrp">
 									<div class=" item_prod" th:each="item, status : ${bestGoodsList}">
 										<div class="item_state">
+											<button type="button" class="itemLike" th:classappend="${item.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${item.goodsCd}, ithrCd='', contentsLoc='SCM002', planDtlSq=''">관심상품 추가</button>
 											<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${item.goodsCd}]], '', '', 'SCM002');">
 												<div class="shape" th:classappend="${status.count==1}?'ranker'"><span th:text="${status.index+1}"></span></div>
 												<div class=" itemPic">
@@ -108,7 +109,6 @@
 														<iframe th:unless="${videoArr[0]=='Y'}" id="pdThumbVideo" class="pd_mov" th:src="${kollusMediaUrl+'/'+videoArr[1]+'?enable_initialize_focus=false&autoplay&mute&controls_activation=none'}" allow="fullscreen" allowFullScreen></iframe>
 													</th:block>
 													<img alt="BLUE-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + item.sysImgNm}" onerror="noneImg(this)">
-													<button type="button" class="itemLike" th:classappend="${item.likeIt == 'likeit'}? 'likeit' : ''"  onclick="cfnPutWishList(this);" th:attr="goodsCd=${item.goodsCd}, ithrCd='', contentsLoc='SCM002', planDtlSq=''">관심상품 추가</button>
 												</div>
 												<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 												<div class=" itemName" th:text="${item.goodsFullNm}">여성 체인 프린트 큐롯 스커트 프린트 큐롯 스커트</div>

+ 1 - 1
src/main/webapp/WEB-INF/views/mob/display/MallMainFormMob.html

@@ -271,7 +271,7 @@
 																<div class="itemPic">
 																	<img alt="" class=" pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + goodsData.sysImgNm}" onerror="noneImg(this)">
 																</div>
-																<p class="itemBrand" th:text="${goodsData.brandEnm}">TBJ</p>
+																<p class="itemBrand" th:text="${goodsData.brandGroupNm}">TBJ</p>
 																<div class="itemName" th:text="${goodsData.goodsNm}">11111 남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
 																<div class="itemComment" th:text="${goodsData.goodsTnm}"># 가을 느낌 물씬!</div>
 																<p class="itemPrice">

+ 1 - 0
src/main/webapp/WEB-INF/views/mob/display/SearchGoodsListFormMob.html

@@ -1039,6 +1039,7 @@
 
 	<!-- //2021.06.18 검색화면 로그스크립트 삽입 -->
 	<script type="text/javascript">
+		var searchKeyword = '[[${params.keyword}]]';
 		window._eglqueue = window._eglqueue || [];
 		_eglqueue.push(['setVar', 'cuid', eglqueueCuid]);
 		_eglqueue.push(['setVar', 'searchTerm', [[${params.keyword}]]]);

+ 2 - 1
src/main/webapp/WEB-INF/views/mob/mypage/MypageReviewCreateFormMob.html

@@ -655,8 +655,9 @@ var fnChooseFile = function(obj) {
 					                reader.onload = function (e) { $(".pics").find("img").last().attr("src", e.target.result); }
 
 					                reader.readAsDataURL(rotateFile);
+
 					            }, fileType)
-					        }, { orientation: true });
+					        }, { orientation: 1});
 						}
 				); 
 		}

+ 2 - 2
src/main/webapp/WEB-INF/views/web/display/BrandLookbookMainFormWeb.html

@@ -79,8 +79,8 @@
 									</p>
 								</div>
 								<div class="btn_box">
-									<button class="btn btn_default" th:unless="${lbInfo.lookbookGb=='BL'}" onclick="cfnGoToPage(_PAGE_MAIN);"><span>메인으로 가기</span></button>
-									<button class="btn btn_default" th:if="${lbInfo.lookbookGb=='BL'}" th:onclick="cfnGoToBrandMain([[${lbInfo.brandCd}]]);"><span th:text="${brandGroupInfo.brandGroupNm+' 홈으로 가기'}"><em>TBJ</em>&nbsp;메인으로 가기 </span></button>
+									<button class="btn btn_default" th:unless="${lbInfo.lookbookGb=='BL'}" onclick="cfnGoToPage(_PAGE_MAIN);"><span>으로 가기</span></button>
+									<button class="btn btn_default" th:if="${lbInfo.lookbookGb=='BL'}" th:onclick="cfnGoToBrandMain([[${lbInfo.brandCd}]]);"><span th:text="${brandGroupInfo.brandGroupNm+' 홈으로 가기'}"><em>TBJ</em>&nbsp;으로 가기 </span></button>
 								</div>
 							</div>
 						</div>

+ 3 - 1
src/main/webapp/WEB-INF/views/web/display/LookbookDetailFormWeb.html

@@ -222,7 +222,9 @@
 		tag += '							<p class="itemBrand">'+obj2+'</p>\n';
 		tag += '							<div class="itemName">'+obj3+'</div>\n';
 		tag += '							<span class="itemPrice_original">'+obj4.addComma()+'</span>\n';
-		tag += '							<p class="itemPrice">'+obj5.addComma()+'\n';
+		if(obj4 != obj5){
+			tag += '							<p class="itemPrice">'+obj5.addComma()+'\n';
+		}
 		if(obj6>0){
 			tag += '								<span class="itemPercent">'+obj6+'%</span>\n';
 		}

+ 2 - 2
src/main/webapp/WEB-INF/views/web/display/LookbookMainFormWeb.html

@@ -79,8 +79,8 @@
 									</p>
 								</div>
 								<div class="btn_box">
-									<button class="btn btn_default" th:unless="${lbInfo.lookbookGb=='BL'}" onclick="cfnGoToPage(_PAGE_MAIN);"><span>메인으로 가기</span></button>
-									<button class="btn btn_default" th:if="${lbInfo.lookbookGb=='BL'}" th:onclick="cfnGoToBrandMain([[${lbInfo.brandCd}]]);"><span th:text="${brandGroupInfo.brandGroupNm+' 홈으로 가기'}"><em>TBJ</em>&nbsp;메인으로 가기 </span></button>
+									<button class="btn btn_default" th:unless="${lbInfo.lookbookGb=='BL'}" onclick="cfnGoToPage(_PAGE_MAIN);"><span>으로 가기</span></button>
+									<button class="btn btn_default" th:if="${lbInfo.lookbookGb=='BL'}" th:onclick="cfnGoToBrandMain([[${lbInfo.brandCd}]]);"><span th:text="${brandGroupInfo.brandGroupNm+' 홈으로 가기'}"><em>TBJ</em>&nbsp;으로 가기 </span></button>
 								</div>
 							</div>
 						</div>

+ 2 - 1
src/main/webapp/WEB-INF/views/web/display/SearchGoodsListFormWeb.html

@@ -1102,9 +1102,10 @@
 
 	<!-- //2021.06.18 검색화면 로그스크립트 삽입 -->
 	<script type="text/javascript">
+		var searchKeyword = '[[${params.keyword}]]';
 		window._eglqueue = window._eglqueue || [];
 		_eglqueue.push(['setVar', 'cuid', eglqueueCuid]);
-		_eglqueue.push(['setVar', 'searchTerm', [[${params.keyword}]]]);
+		_eglqueue.push(['setVar', 'searchTerm', searchKeyword]);
 		_eglqueue.push(['setVar', 'userId', hCustId]); // optional
 		_eglqueue.push(['track', 'search']);
 		(function (s, x) {

+ 0 - 11
src/main/webapp/WEB-INF/views/web/mypage/MypageReviewCreateFormWeb.html

@@ -377,7 +377,6 @@
 				</div>
 			</div>
 <script type="text/javascript" src="/ux/plugins/gaga/gaga.kollus.js"></script>
-<script type="text/javascript" src="/ux/plugins/load-image.all.min.js"></script>
 <!-- <script type="text/javascript" src="https://cdn.jsdelivr.net/npm/exif-js"></script> -->
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
@@ -595,16 +594,6 @@ var fnChooseFile = function(obj) {
 							// 업로드한 파일명 설정
 							$(".pics").children().eq(0).append("<input type='hidden' name='orgFileNmArr' id='orgFileNm"+(picLength+1)+"' value='"+result.oldFileName+"'>");
 							$(".pics").children().eq(0).append("<input type='hidden' name='sysFileNmArr' id='sysFileNm"+(picLength+1)+"' value='"+result.newFileName+"'>");
-							
-							var limg = loadImage(file, function (img, data) {
-					            img.toBlob(function (blob) {
-					                var rotateFile = new File([blob], file.name, { type: fileType });
-					                var reader = new FileReader();
-					                reader.onload = function (e) { $(".pics").find("img").eq(0).attr("src", e.target.result); }
-
-					                reader.readAsDataURL(rotateFile);
-					            }, fileType)
-					        }, { orientation: true });
 						}
 				); 
 		}else{

+ 2 - 0
src/main/webapp/WEB-INF/views/web/order/OrderAddPaymentFormWeb.html

@@ -27,6 +27,7 @@
 <form class="form_wrap" name="addPayForm" id="addPayForm">
 	<input type="hidden" name="refundAmt" th:value="${refundAmt}">
 	<input type="hidden" name="ordNo" th:value="${ordNo}">
+	<input type="hidden" name="ordNm" th:value="${ordNm}">
 	<input type="hidden" name="addPayCost" th:value="${addPayCost}">
 	<input type="hidden" name="ordChgSq" th:value="${ordChgSq}">
 	
@@ -237,6 +238,7 @@ $("#btn_payment").on("click", function(){
 		"pgGb"					: pgGb
 		,"payMeans"				: payMeans // 네이버페이, 카카오페이
 		,"ordNo"				: $("#addPayForm input[name=ordNo]").val()
+		,"ordNm"				: $("#addPayForm input[name=ordNm]").val()
 		,"addPayCost"			: $("#addPayForm input[name=addPayCost]").val()
 		,"ordChgSq"				: $("#addPayForm input[name=ordChgSq]").val()
 		,"chgGb"				: $("#addPayForm input[name=chgGb]").val()

+ 1 - 1
src/main/webapp/ux/mo/css/common_m.css

@@ -1945,7 +1945,7 @@ button.alertCls {-webkit-appearance: none;padding: 0;cursor: pointer;background:
 
 
 /* Notch  */
-@media only screen and (min-width: 375px) and (max-width: 415px) and (min-height: 722px) and (max-height: 897px){/* footer{padding-bottom: 8rem;}  *//* footer .f1 {padding: 0 0 8.5rem;}  *//* footer .btn_top {bottom: 20.5%;} */.my .my_delivery .inner > .btn_group,.adrsAdd_pop .modal-footer .btn,.shopping_bag .od_calc_wrap{padding-bottom: 8.8rem; background-color: #f5f5f5; background-color: #aa2020;}.cs_contactUs_my_footer,.product_floormenu,.product_floormenu.fixed{/*height: calc(env(safe-area-inset-bottom) + 8.8rem);height: calc(constant(safe-area-inset-bottom) + 8.8rem);*/background: #38c056; padding-bottom: 8.8rem;}}footer, footer .f1 {padding-bottom: calc(env(safe-area-inset-bottom) + 3.5rem);padding-bottom: clac(constant(safe-area-inset-bottom) + 3.5rem);}footer .btn_top {bottom: calc(env(safe-area-inset-bottom) + 6.5rem);bottom: clac(constant(safe-area-inset-bottom) + 6.5rem);}.my .my_delivery .inner > .btn_group,.adrsAdd_pop .modal-footer .btn,.cs_contactUs_my_footer,.shopping_bag .od_calc_wrap,.product_floormenu,.product_floormenu.fixed{	/* background: #f5f5f5; height: 5.8rem; height: calc() + 5.8rem); height: calc() + 5.8rem); */ 	padding-bottom: constant(safe-area-inset-bottom); 	padding-bottom: env(safe-area-inset-bottom); background: #f5f5f5; background: #000000;}
+@media only screen and (min-width: 375px) and (max-width: 415px) and (min-height: 722px) and (max-height: 897px){/* footer{padding-bottom: 8rem;}  *//* footer .f1 {padding: 0 0 8.5rem;}  *//* footer .btn_top {bottom: 20.5%;} */.my .my_delivery .inner > .btn_group,.adrsAdd_pop .modal-footer .btn,.shopping_bag .od_calc_wrap{padding-bottom: 8.8rem; background-color: #f5f5f5; background-color: #aa2020;}.cs_contactUs_my_footer,.product_floormenu,.product_floormenu.fixed{/*height: calc(env(safe-area-inset-bottom) + 8.8rem);height: calc(constant(safe-area-inset-bottom) + 8.8rem);*/	background: #38c056; padding-bottom: 8.8rem;}}footer, footer .f1 {padding-bottom: calc(env(safe-area-inset-bottom) + 3.5rem);padding-bottom: clac(constant(safe-area-inset-bottom) + 3.5rem);}footer .btn_top {bottom: calc(env(safe-area-inset-bottom) + 6.5rem);bottom: clac(constant(safe-area-inset-bottom) + 6.5rem);}.modal.pd_pop.pd_review_pop .pd_review .area_rv_empty .btn_group_flex{bottom: calc(env(safe-area-inset-bottom) + 6.5rem);bottom: clac(constant(safe-area-inset-bottom) + 6.5rem);}.my .my_delivery .inner > .btn_group,.adrsAdd_pop .modal-footer .btn,.cs_contactUs_my_footer,.shopping_bag .od_calc_wrap,.modal.pd_pop.pd_review_pop .pd_review .area_rv_empty .btn_group_flex,.product_floormenu,.product_floormenu.fixed{/* background: #f5f5f5; height: 5.8rem; height: calc() + 5.8rem); height: calc() + 5.8rem); */ 	padding-bottom: constant(safe-area-inset-bottom); padding-bottom: env(safe-area-inset-bottom); background: #f5f5f5; background: #000000;}
 
 
 /* APP ONLY */

+ 1 - 1
src/main/webapp/ux/mo/css/layout_m.css

@@ -415,7 +415,7 @@
 .itemLike.likeit::before {opacity: 1;}
 .item_prod .itemLink {position: relative;text-decoration: none;color: rgb(102, 102, 102);cursor: pointer;display: block;}
 .item_prod .itemPic {position: relative;width: 100%;margin-bottom: 1.5rem;padding-top: 150%;font-size: 0;overflow: hidden; background: #fff;}
-.item_prod .itemPic::after {content: "";display: block;position: absolute;top: 0;left: 0;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);}
+.item_prod .itemPic::after {content: "";display: block;position: absolute;top: 0;left: 0;width: 100%;height: 100%;opacity: 0.03;background-color: rgb(0, 0, 0);z-index: 2;}
 .item_prod .itemPic .pd_img {position: absolute;width: 100%;height: auto;top: 50%;left: 0;transform: translateY(-50%);}
 .item_prod .itemPic .pd_mov {position: absolute;width: 100%;height: 100%;top: 50%;left: 0;transform: translateY(-50%);z-index: 2;}
 .item_prod .itemBrand {display: inline-block; margin: 0 0.5rem 0.3rem; font-size: 1rem;font-weight: 300;color: rgb(137, 137, 137); text-overflow:ellipsis;white-space:nowrap;word-wrap:normal;width:10rem;overflow:hidden;}

Plik diff jest za duży
+ 197 - 197
src/main/webapp/ux/mo/css/style24_m.css


+ 15 - 12
src/main/webapp/ux/pc/js/common-ui.js

@@ -709,18 +709,21 @@ $(document).ready( function() {
 		}
 	});
 
-	// 상품상세 > 사이즈 테이블 - 스크롤 휠 제어
-	$(".tbl.scroll_tbl .body_t").on('mousewheel',function(e){
-		var wheelDelta = e.originalEvent.wheelDelta;
-		if(wheelDelta > 0){
-			$(this).scrollLeft(-wheelDelta + $(this).scrollLeft());
-		}else{
-			$(this).scrollLeft(-wheelDelta + $(this).scrollLeft());
-		}
-	});
-
-
-	
+	// 상품상세 > 사이즈 테이블 - 드래그스크롤 제어
+	var scrTbl,scrTblLeft,scrTblDown;
+	$(".tbl.scroll_tbl .body_t").mousedown(function(e){
+	  e.preventDefault();
+	  scrTblDown = true;
+	  scrTbl = e.pageX;
+	  scrTblLeft = $(this).scrollLeft();
+	});	
+	$("body").mousemove(function(e){
+	  if(scrTblDown){
+		var newX = e.pageX;
+		$(".tbl.scroll_tbl .body_t").scrollLeft(scrTblLeft - newX + scrTbl);
+	  }
+	});	
+	$("body").mouseup(function(e){scrTblDown = false;});
 
 
 });

Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików