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

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

@@ -355,13 +355,9 @@
 	   $(".pd_descrp .cont_body").find('img').each(function() {
 			let tmpImgSrc = $(this).attr('src');
 			if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
-				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local"));
+				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local").replace('/Upload/Local', "/Local"));
 			}
 			
-			if (tmpImgSrc.indexOf('/Upload/Local') > 0 ){  // /Upload
- 				$(this).attr('src' , tmpImgSrc.replace('/Upload/Local', "/Local"));
- 			} 
-			
 		});
 	   
 	 	//210526_ 추가 : 이미지 style 속성 제거

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

@@ -478,9 +478,34 @@
 				if (result != null) {
 					$("#goodsTogetherbArea").css("display", "block");
 					$("#goodsTogetherbArea").html(result);
+					
+					// 위시처리- 로그인 되어 있을시
+			  		if (cfCheckLogin()) {
+			  			//이상품과 함께본 상품
+						let targetT = $('#goodsTogetherbArea').find('.item_state').find('button');
+						//let targetTSize = targetT.length;
+						targetT.each(function(){
+							let goodsCd = $(this).attr('goodscd');
+							var $this = $(this);
+							let url = "/mypage/wish/list/check/"+goodsCd;
+							var result = '';
+							$.ajax({
+								type: 'get'
+								, async: false
+								, url: url
+								, success: function (data) {
+									//likeit active
+									if ("Y" == data){
+										$this.addClass('likeit').addClass('active');
+									}
+								}
+							});
+						});
+			  		}
 				}
 			}
 		});
+	
 	}
 	
 	//구성상품 조회

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

@@ -2888,18 +2888,6 @@
 			$('.modal.photo_comment_popup .pop_detail').toggleClass('active');
 		});
 		
-		 // 상품상세 asis html  이지미 경로 수정
-		$(".pd_descrp .cont_body").find('img').each(function() {
-			let tmpImgSrc = $(this).attr('src');
-			if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
-				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local"));
-			}
-			
-			if (tmpImgSrc.indexOf('/Upload/Local') > 0 ){  // /Upload
- 				$(this).attr('src' , tmpImgSrc.replace('/Upload/Local', "/Local"));
- 			} 
-			
-		});
 	});
 	
 
@@ -2941,8 +2929,20 @@
 	let vh = window.innerHeight * 0.01;
 	document.documentElement.style.setProperty('--vh', `${vh}px`);
 	
-	
-	
+
+	 // 상품상세 asis html  이지미 경로 수정
+	window.onload = function(){
+   	 $(".pd_descrp .cont_body").find('img').each(function() {
+			let tmpImgSrc = $(this).attr('src');
+			if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
+				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local").replace('/Upload/Local', "/Local"));
+			}
+			
+			
+		});
+		
+	};
+
    	let goodsVideoList = [[${goodsVideoList}]];
 	let videoFlag = false;
 	if (goodsVideoList != null){
@@ -2978,8 +2978,8 @@
 				$(window).scroll(function(){
 					var scrollTop= $(window).scrollTop();
 					var movHeight = $(".movbox").outerHeight()/2.5;
-					console.log(movHeight);
-					console.log(scrollTop);
+					//console.log(movHeight);
+					//console.log(scrollTop);
 					if (scrollTop > movHeight){
 						controller.pause();
 						return false;

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

@@ -312,13 +312,8 @@
    	 $(".pd_descrp_pop .cont_body").find('img').each(function() {
 			let tmpImgSrc = $(this).attr('src');
 			if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
-				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local"));
+				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local").replace('/Upload/Local', "/Local"));
 			}
-			
-			if (tmpImgSrc.indexOf('/Upload/Local') > 0 ){  // /Upload
- 				$(this).attr('src' , tmpImgSrc.replace('/Upload/Local', "/Local"));
- 			} 
-			
 		});
    //210526_ 추가 : 이미지 style 속성 제거
 	$(".mdhtml_box style").remove();$(".mdhtml_box img").removeAttr("style");

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

@@ -1440,39 +1440,65 @@
 		
 	});
 
-function buy_nc_req(cartSqArr) {
-	let data = {  cartSqArr : cartSqArr
-		, backUrl : location.href
-		, goodsUrl : _PAGE_GOODS_DETAIL
-	};
-	let jsonData = JSON.stringify(data);
-
-	$.ajax( {
-		type		: "POST",
-		url 		: "/pg/nPayReq",
-		dataType 	: 'json',
-		data		: jsonData,
-		beforeSend : function(xhr, settings) {
-			xhr.setRequestHeader("AJAX"			, "true");
-			xhr.setRequestHeader('Accept'		, 'application/json');
-			xhr.setRequestHeader('Content-Type'	, 'application/json');
-		},
-		error: function(xhr, status, error) {
-			mcxDialog.alert(status + '; ' + error);
-		},
-		success : function(result) {
-			if (result.state == "sucess") {
-				window.open('about:blank', 'popupView');
-				document.nPayForm.target = 'popupView';
-				document.nPayForm.action = result.npayOrderUrl + "/" + result.orderKey + "/" + result.resultNo;
-				document.nPayForm.submit();
-			} else {
-				mcxDialog.alert(result.message);
+	function buy_nc_req(cartSqArr) {
+		let data = {  cartSqArr : cartSqArr
+			, backUrl : location.href
+			, goodsUrl : _PAGE_GOODS_DETAIL
+		};
+		let jsonData = JSON.stringify(data);
+	
+		$.ajax( {
+			type		: "POST",
+			url 		: "/pg/nPayReq",
+			dataType 	: 'json',
+			data		: jsonData,
+			beforeSend : function(xhr, settings) {
+				xhr.setRequestHeader("AJAX"			, "true");
+				xhr.setRequestHeader('Accept'		, 'application/json');
+				xhr.setRequestHeader('Content-Type'	, 'application/json');
+			},
+			error: function(xhr, status, error) {
+				mcxDialog.alert(status + '; ' + error);
+			},
+			success : function(result) {
+				if (result.state == "sucess") {
+					window.open('about:blank', 'popupView');
+					document.nPayForm.target = 'popupView';
+					document.nPayForm.action = result.npayOrderUrl + "/" + result.orderKey + "/" + result.resultNo;
+					document.nPayForm.submit();
+				} else {
+					mcxDialog.alert(result.message);
+				}
 			}
-		}
-	});
+		});
+		
+	}
 	
-}
+	window.onload = function(){
+		// 위시처리- 로그인 되어 있을시
+  		if (cfCheckLogin()) {
+  			//이상품과 함께본 상품
+  			let targetT = $('#goodsTogetherbArea').find('.item_state').find('button');
+  			//let targetTSize = targetT.length;
+  			targetT.each(function(){
+  				let goodsCd = $(this).attr('goodscd');
+  				var $this = $(this);
+  				let url = "/mypage/wish/list/check/"+goodsCd;
+  				var result = '';
+  				$.ajax({
+  					type: 'get'
+  					, async: false
+  					, url: url
+  					, success: function (data) {
+  						//likeit active
+  						if ("Y" == data){
+  							$this.addClass('likeit').addClass('active');
+  						}
+  					}
+  				});
+  			});
+  		}
+	}
 	
 	// 광고 스크립트용
 	var goodsNavigation = [[${goodsNavigation}]];

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

@@ -2726,14 +2726,77 @@
     	 $(".pd_descrp .cont_body").find('img').each(function() {
  			let tmpImgSrc = $(this).attr('src');
  			if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
-				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local"));
+				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local").replace('/Upload/Local', "/Local"));
 			}
-			
-			if (tmpImgSrc.indexOf('/Upload/Local') > 0 ){  // /Upload
- 				$(this).attr('src' , tmpImgSrc.replace('/Upload/Local', "/Local"));
- 			} 
  			
  		});
+    	
+    	 
+     	// 위시처리- 로그인 되어 있을시
+  		if (cfCheckLogin()) {
+  			//이상품과 함께본 상품
+  			let targetT = $('#goodsTogetherbArea').find('.item_state').find('button');
+  			//let targetTSize = targetT.length;
+  			targetT.each(function(){
+  				let goodsCd = $(this).attr('goodscd');
+  				var $this = $(this);
+  				let url = "/mypage/wish/list/check/"+goodsCd;
+  				var result = '';
+  				$.ajax({
+  					type: 'get'
+  					, async: false
+  					, url: url
+  					, success: function (data) {
+  						//likeit active
+  						if ("Y" == data){
+  							$this.addClass('likeit').addClass('active');
+  						}
+  					}
+  				});
+  			});
+  			
+  			//브랜드 추천상품
+  			let targetR = $('#goodsRecommendbArea').find('.item_state').find('button');
+  			//let targetRSize = targetT.length;
+  			targetR.each(function(){
+  				let goodsCd = $(this).attr('goodscd');
+  				var $this = $(this);
+  				let url = "/mypage/wish/list/check/"+goodsCd;
+  				var result = '';
+  				$.ajax({
+  					type: 'get'
+  					, async: false
+  					, url: url
+  					, success: function (data) {
+  						//likeit active
+  						if ("Y" == data){
+  							$this.addClass('likeit').addClass('active');
+  						}
+  					}
+  				});
+  			});
+  			
+  			//비슷한 상품
+  			let targetL = $('#goodsLikebArea').find('.item_state').find('button');
+  			//let targetTSize = targetT.length;
+  			targetL.each(function(){
+  				let goodsCd = $(this).attr('goodscd');
+  				var $this = $(this);
+  				let url = "/mypage/wish/list/check/"+goodsCd;
+  				var reLult = '';
+  				$.ajax({
+  					type: 'get'
+  					, async: false
+  					, url: url
+  					, success: function (data) {
+  						//likeit active
+  						if ("Y" == data){
+  							$this.addClass('likeit').addClass('active');
+  						}
+  					}
+  				});
+  			});
+  		}
  	}
      
    

src/main/webapp/biz/goods.js

@@ -18,20 +18,29 @@ var fnGoodsTogetherSearch = function(params) {
 				$("#goodsTogetherbArea").css("display", "block");
 				$("#goodsTogetherbArea").html(result);
 				
-				/*var otherItemSwiper1 = new Swiper('.pd .pd_clickother .area_slider .swiper-container', {
-				     slidesPerView: 5,
-				     slidesToScroll: 5,
-				     slidesPerGroup: 5,
-				     spaceBetween: 20,
-				     navigation: {
-				         nextEl: '.pd_clickother .swiper-button-next',
-				         prevEl: '.pd_clickother .swiper-button-prev',
-				     },
-				     pagination: {
-				         el: '.pd_clickother .swiper-pagination',
-				         clickable: true,
-				     },
-				 });   */
+				// 위시처리- 로그인 되어 있을시
+		  		if (cfCheckLogin()) {
+		  			//이상품과 함께본 상품
+					let targetT = $('#goodsTogetherbArea').find('.item_state').find('button');
+					//let targetTSize = targetT.length;
+					targetT.each(function(){
+						let goodsCd = $(this).attr('goodscd');
+						var $this = $(this);
+						let url = "/mypage/wish/list/check/"+goodsCd;
+						var result = '';
+						$.ajax({
+							type: 'get'
+							, async: false
+							, url: url
+							, success: function (data) {
+								//likeit active
+								if ("Y" == data){
+									$this.addClass('likeit').addClass('active');
+								}
+							}
+						});
+					});
+		  		}
 			}
 		}
 	});
@@ -55,19 +64,29 @@ var fnGoodsRecommendSearch = function(params) {
 			if (result != null) {
 				$("#goodsRecommendbArea").css("display", "block");
 				$("#goodsRecommendbArea").html(result);
-				/* var relateItemSwiper = new Swiper('.pd .pd_brand .area_slider .swiper-container', {
-		                slidesPerView: 5,
-		                spaceBetween: 20,
-		                slidesPerGroup: 5,
-		                navigation: {
-		                    nextEl: '.pd_brand .swiper-button-next',
-		                    prevEl: '.pd_brand .swiper-button-prev',
-		                },
-		                pagination: {
-		                    el: '.pd_brand .swiper-pagination',
-		                    clickable: true,
-		                },
-		            });  */
+				// 위시처리- 로그인 되어 있을시
+		  		if (cfCheckLogin()) {
+			  		//브랜드 추천상품
+		  			let targetR = $('#goodsRecommendbArea').find('.item_state').find('button');
+		  			//let targetRSize = targetT.length;
+		  			targetR.each(function(){
+		  				let goodsCd = $(this).attr('goodscd');
+		  				var $this = $(this);
+		  				let url = "/mypage/wish/list/check/"+goodsCd;
+		  				var result = '';
+		  				$.ajax({
+		  					type: 'get'
+		  					, async: false
+		  					, url: url
+		  					, success: function (data) {
+		  						//likeit active
+		  						if ("Y" == data){
+		  							$this.addClass('likeit').addClass('active');
+		  						}
+		  					}
+		  				});
+		  			});
+		  		}
 			}
 		}
 	});
@@ -91,19 +110,29 @@ var fnGoodsLikeSearch = function(params) {
 			if (result != null) {
 				$("#goodsLikebArea").css("display", "block");
 				$("#goodsLikebArea").html(result);
-				/*var relateItemSwiper = new Swiper('.pd .pd_relate .area_slider .swiper-container', {
-	                slidesPerView: 5,
-	                spaceBetween: 20,
-	                slidesPerGroup: 5,
-	                navigation: {
-	                    nextEl: '.pd_relate .swiper-button-next',
-	                    prevEl: '.pd_relate .swiper-button-prev',
-	                },
-	                pagination: {
-	                    el: '.pd_relate .swiper-pagination',
-	                    clickable: true,
-	                },
-	            });      */
+				// 위시처리- 로그인 되어 있을시
+		  		if (cfCheckLogin()) {
+		  			//비슷한 상품
+		  			let targetL = $('#goodsLikebArea').find('.item_state').find('button');
+		  			//let targetTSize = targetT.length;
+		  			targetL.each(function(){
+		  				let goodsCd = $(this).attr('goodscd');
+		  				var $this = $(this);
+		  				let url = "/mypage/wish/list/check/"+goodsCd;
+		  				var reLult = '';
+		  				$.ajax({
+		  					type: 'get'
+		  					, async: false
+		  					, url: url
+		  					, success: function (data) {
+		  						//likeit active
+		  						if ("Y" == data){
+		  							$this.addClass('likeit').addClass('active');
+		  						}
+		  					}
+		  				});
+		  			});
+		  		}
 			}
 		}
 	});