Просмотр исходного кода

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

Conflicts:
src/main/webapp/WEB-INF/views/web/planning/PlanningMainFormWeb.html

gagamel 5 лет назад
Родитель
Сommit
017c9990b4

+ 6 - 6
src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -1117,14 +1117,14 @@ public class TsfMypageController extends TsfBaseController {
 	 * @since 2021. 03. 29
 	 */
 	@GetMapping("/wish/list")
-	public GagaMap mypageWishGoodsList(WishList wishList) {
-		GagaMap result = new GagaMap();
+	public ModelAndView mypageWishGoodsList(WishList wishList) {
+		ModelAndView mav = new ModelAndView();
 		// 위시리스트 달
-		result.set("wishMonth", wishListService.getWishListMonth(wishList));
+		mav.addObject("wishMonth", wishListService.getWishListMonth(wishList));
 		// 위시리스트 상품목록
-		result.set("wishGoods", wishListService.getWishListGoodsList(wishList));
-
-		return result;
+		mav.addObject("wishGoods", wishListService.getWishListGoodsList(wishList));
+		mav.setViewName(super.getDeviceViewName("mypage/MypageWishList"));
+		return mav;
 	}
 
 	/*신주승 시작*/

+ 0 - 1
src/main/webapp/WEB-INF/views/web/mypage/MypageCouponFormWeb.html

@@ -132,7 +132,6 @@
 
 let couponList = ([[${couponList}]]);	
 
-console.log(couponList);
 // 사용안내 모달
 var useInfoCoupon = function (id) {
 	 $.ajax( {

+ 17 - 3
src/main/webapp/WEB-INF/views/web/mypage/MypageWishListFormWeb.html

@@ -90,9 +90,12 @@
 <script th:inline="javascript">
 let wishMonth = [[${wishMonth}]];
 let wishGoods = [[${wishGoods}]];
+let _mall = [[${@environment.getProperty('domain.front')}]];
 // 위시리스트 
 var wishListForm = function() {
-	let html = '';
+
+	var html = '';
+	$("#wishList").append(html);
 	if(wishMonth.length>0){
 		for (var i = 0; i < wishMonth.length; i++) {
 			html += '<div class="monthly_wish_wrap">                                                                                         ';
@@ -104,7 +107,7 @@ var wishListForm = function() {
 				html += '		<div class="item_prod">                                                                                       ';
 				html += '			<div class="item_state">                                                                                  ';
 				html += '				<button type="button" class="itemLike active" goodsCd="'+item.goodsCd+'" planDtlSq="" onclick="wishlistDelete(this)">관심상품 추가</button>                                               ';
-				html += '				<a href="#none" class="itemLink">                                                                     ';
+				html += '				<a href="'+_mall+'/goods/detail/form?goodsCd='+item.goodsCd+'"  class="itemLink" >                                                                     ';
 				html += '					<div class="itemPic">                                                                             ';
 				html += '						<img alt="" class=" vLHTC pd_img" src="/images/pc/thumb/prod5.jpg">                           ';
 				html += '					</div>                                                                                            ';
@@ -153,8 +156,19 @@ var wishlistDelete = function(obj) {
 		cancelBtnText : "취소",
 		sureBtnText : "확인",
 		sureBtnClick : function() {
+			
 			cfnPutWishList(obj);
-		}
+			 $.ajax({
+					type		: "GET",
+					url 		: '/mypage/wish/list',
+					dataType 	: 'html',
+					success 	: function(result) {
+						if (result != null) {
+							$("#wishList").html(result);
+						}
+					}
+				});		
+			}
 	});
 
 }

+ 57 - 0
src/main/webapp/WEB-INF/views/web/mypage/MypageWishListWeb.html

@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org"
+	style="overflow-x: hidden !important;"
+>
+<!--
+ *******************************************************************************
+ * @source  : CouponDetailPopWeb.html
+ * @desc    : 쿠폰적용대상 리스트 Page
+ *============================================================================
+ * PastelMall
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.03.17   sowon     최초 작성
+ *******************************************************************************
+ -->
+<!-- 월별 관심상품 -->
+<th:block th:if="${wishMonth != null}" th:each="WishMonth, wishStat : ${wishMonth}">
+<div class="monthly_wish_wrap">
+	<div class="date">
+		<span th:text="${WishMonth.regDt}"></span>
+	</div>
+	<div class="itemsGrp">
+	   <th:block th:each="WishGoods, wishStat : ${wishGoods}">
+		<div class="item_prod">
+			<div class="item_state">
+				<button type="button" class="itemLike active" th:attr="goodsCd=${WishGoods.goodsCd}, ithrCd='', contentsLoc='', planDtlSq=''" onclick="wishlistDelete(this)">관심상품 추가</button>
+				<a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${WishGoods.goodsCd}]])">
+					<div class="itemPic">
+						<img alt="" class=" vLHTC pd_img" src="/images/pc/thumb/prod5.jpg">
+					</div>
+					<p class=" itemBrand" th:text="${WishGoods.brandKnm}"></p>
+					<div class=" itemName" th:text="${WishGoods.goodsNm}"></div>
+					<p class="itemPrice">[[${#numbers.formatInteger(WishGoods.currPrice,3,'POINT') + '원'}]]
+						<span class="itemPrice_original"  th:if="${WishGoods.currPrice != WishGoods.listPrice}" th:text="${#numbers.formatInteger(WishGoods.listPrice,3,'POINT') + '원'}"></span>
+						<span class=" itemPercent" th:if="${WishGoods.dcRate > 0}" th:text="|${#numbers.formatDecimal(WishGoods.dcRate,0,0)}%|"></span>
+					</p>
+					<div class="itemcolorchip">
+						<span class="chip_color35" value="ABM">BEIGE</span>
+						<span class="chip_color54" value="BDS">BLACK</span>
+						<span class="chip_color40" value="YBR">WHITE</span>
+					</div>
+					 <p class="itemBadge">
+						<span class="badge13">베스트 </span>
+					</p>
+					<div class="itemComment">★ [NEW] 20FW 빅웨이브 단독발매!</div>
+				</a>
+			</div>
+		</div>
+		</th:block>	
+	</div>
+</div>
+</th:block>
+<!-- //월별 관심상품 -->
+				

+ 1 - 1
src/main/webapp/WEB-INF/views/web/social/SocialMainFormWeb.html

@@ -42,7 +42,7 @@
                             <div class="item_prod" th:class="${SocialData.stockQtySum == 0 ? 'item_prod sold_out' : 'item_prod'}" > 
                                 <div class="item_state"> <!-- item_state AD soldout -->
                                     <button type="button" th:class="${SocialData.wishYn == 'Y'}? 'itemLike active' : 'itemLike'" onclick="cfnPutWishList(this);" th:attr="goodsCd=${SocialData.goodsCd}, ithrCd='', contentsLoc='', planDtlSq=''">관심상품 추가</button>
-                                    <a href="#none" class="itemLink">
+                                    <a href="#none" class="itemLink" th:onclick="cfnGoToGoodsDetail([[${SocialData.goodsCd}]])">
                                         <div class="itemPic">
                                             <img alt="BLUE-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + SocialData.sysImgNm}">
                                         </div>