diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsDtlR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsDtlR.jsp index d6b40613..7a5bede9 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsDtlR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/goods/GoodsDtlR.jsp @@ -19,6 +19,7 @@ + @@ -586,7 +587,7 @@ var $number = $counter.find(".product-count__amount-number"); var $price = $counter.find(".product-count__priceNum"); $number.text(productArr[$index][1]); - $price.text(addComma(productArr[$index][3]) + "원"); + $price.text(addComma(productArr[$index][3]) + '${curUnit}'); }); updateTotalPrice(); // 총 상품금액 업데이트 } @@ -646,7 +647,8 @@ type: "post", url: "/sopmal/goods/selectRvwBnefInfo", success: function (data) { - fn_set_rvw_bnef_cn(data); + const jsonString = JSON.stringify(data.resBody.result); + fn_set_rvw_bnef_cn(jsonString); openModal("reviewBenefitPop"); } }); @@ -664,50 +666,51 @@ /*리뷰 혜택 내용 set*/ const fn_set_rvw_bnef_cn = (data) => { - const rvwBnefInfo = JSON.parse(data.resBody.result); + // const rvwBnefInfo = JSON.parse(data.resBody.result); + const rvwBnefInfo = JSON.parse(JSON.parse(data)); /*일반리뷰 정보*/ - let gnrlRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.gnrlRvwMlgAccmlmnyAmt); - let photoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.photoRvwMlgAccmlmnyAmt); - console.log(gnrlRvwMlgAccmlmnyAmt); - console.log(photoRvwMlgAccmlmnyAmt); - let writngChrCnt = rvwBnefInfo.writngChrCnt; + let gnrlRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.gnrlRvwMlgAccmlmnyAmt) != undefined ? rvwBnefInfo.gnrlRvwMlgAccmlmnyAmt : null; + let photoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.photoRvwMlgAccmlmnyAmt != undefined ? rvwBnefInfo.photoRvwMlgAccmlmnyAmt : null); + // console.log(gnrlRvwMlgAccmlmnyAmt) != undefined ? rvwBnefInfo.gnrlRvwMlgAccmlmnyAmt : null; + // console.log(photoRvwMlgAccmlmnyAmt != undefined ? rvwBnefInfo.photoRvwMlgAccmlmnyAmt : null); + let writngChrCnt = rvwBnefInfo.writngChrCnt != undefined ? rvwBnefInfo.writngChrCnt : null; /*한달리뷰 정보*/ - let monthBbsExpsrAt = rvwBnefInfo.monthBbsExpsrAt; - let monthPhotoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthPhotoRvwMlgAccmlmnyAmt); + let monthBbsExpsrAt = rvwBnefInfo.monthBbsExpsrAt != undefined ? rvwBnefInfo.monthBbsExpsrAt : null; + let monthPhotoRvwMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthPhotoRvwMlgAccmlmnyAmt != undefined ? rvwBnefInfo.monthPhotoRvwMlgAccmlmnyAmt : null); /*일반리뷰,포토리뷰 추가 마일리지 정보*/ - let aditMlgPymntBgnDe = rvwBnefInfo.aditMlgPymntBgnDe; - let aditMlgPymntEndDe = rvwBnefInfo.aditMlgPymntEndDe; - let aditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.aditPymntMlgAccmlmnyAmt); + let aditMlgPymntBgnDe = rvwBnefInfo.aditMlgPymntBgnDe != undefined ? rvwBnefInfo.aditMlgPymntBgnDe : null; + let aditMlgPymntEndDe = rvwBnefInfo.aditMlgPymntEndDe != undefined ? rvwBnefInfo.aditMlgPymntEndDe : null; + let aditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.aditPymntMlgAccmlmnyAmt != undefined ? rvwBnefInfo.aditPymntMlgAccmlmnyAmt : null); /*한달리뷰,포토리뷰 추가 마일리지 정보*/ - let monthAditMlgPymntBgnDe = rvwBnefInfo.monthAditMlgPymntBgnDe; - let monthAditMlgPymntEndDe = rvwBnefInfo.monthAditMlgPymntEndDe; - let monthAditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthAditPymntMlgAccmlmnyAmt); + let monthAditMlgPymntBgnDe = rvwBnefInfo.monthAditMlgPymntBgnDe != undefined ? rvwBnefInfo.monthAditMlgPymntBgnDe : null; + let monthAditMlgPymntEndDe = rvwBnefInfo.monthAditMlgPymntEndDe != undefined ? rvwBnefInfo.monthAditMlgPymntEndDe : null; + let monthAditPymntMlgAccmlmnyAmt = fn_applc_mil_amt(rvwBnefInfo.monthAditPymntMlgAccmlmnyAmt != undefined ? rvwBnefInfo.monthAditPymntMlgAccmlmnyAmt : null); /*포토리뷰 금액 존재 여부에 따른 html 구성*/ let photoMilCn = photoRvwMlgAccmlmnyAmt !== '0' ? `
2.포토리뷰
-
마일리지 \${photoRvwMlgAccmlmnyAmt}\원 적립
+
마일리지 \${photoRvwMlgAccmlmnyAmt}\점 적립
` : ''; /*일반리뷰, 포토리뷰 추가마일리지 여부에 따른 html 구성*/ let aditMlgCn = aditPymntMlgAccmlmnyAmt !== '0' ? `
4. 일반리뷰 ,포토 리뷰 추가 마일리지(\${monthAditMlgPymntBgnDe}\ ~ \${monthAditMlgPymntEndDe}\ )
-
마일리지 \${aditPymntMlgAccmlmnyAmt}\원 적립
+
마일리지 \${aditPymntMlgAccmlmnyAmt}\점 적립
` : ''; /*한딜리뷰 사용 여부에 따른 html 구성*/ let monthMilCn = monthBbsExpsrAt === 'Y' ? `
3. 한달리뷰
-
마일리지 \${monthPhotoRvwMlgAccmlmnyAmt}\원 적립
+
마일리지 \${monthPhotoRvwMlgAccmlmnyAmt}\점 적립
` : ''; /* 한달 리뷰 추가마일리지 여부에 따른 html 구성*/ let monthAditMlgCn = monthAditPymntMlgAccmlmnyAmt !== '0' ? `
5. 한달리뷰 추가 마일리지(\${monthAditMlgPymntBgnDe}\ ~ \${monthAditMlgPymntEndDe}\)
-
마일리지 \${monthAditPymntMlgAccmlmnyAmt}\원 적립
+
마일리지 \${monthAditPymntMlgAccmlmnyAmt}\점 적립
` : ''; /*한달리뷰 사용 여부에 따른 분기 처리(상품 설정에 따른)*/ const MtRvwWritngPosblAt = $("#MtRvwWritngPosblAt").val(); @@ -718,7 +721,7 @@ /* 분기처리후 최종 html*/ let rvwBnefInfoCn = `
1. 일반리뷰
-
마일리지 \${gnrlRvwMlgAccmlmnyAmt}\원 적립
+
마일리지 \${gnrlRvwMlgAccmlmnyAmt}\점 적립
\${photoMilCn} \${aditMlgCn} @@ -2216,6 +2219,8 @@ // 묶음배송 개수 const bundleDlvyCndAmt = `${resultMap.goodsDtl.bundleDlvyCndAmt}`; + let curUnit = `${curUnit}`; + /*배송비 정보 세팅 */ /*기본 배송비 세팅 */ @@ -2229,24 +2234,24 @@ 기본배송비 - \${dftDlvyAmt}\원 + \${dftDlvyAmt}${curUnit}\ `; //금액 구간이 있을 경우 let amtCndUseCn = amtCndUseAt === 'Y' ? ` - \${amtCndAditAmt}\원 이상 ~ - 0원 + \${amtCndAditAmt}${curUnit}\ 이상 ~ + 0\${curUnit}\ ` : ""; //개수조건 있을 경우 let cntCndUseCn = cntCndUseAt === 'Y' ? ` \${cntCndAditAmt}\개 이상 ~ - 0원 + 0\${curUnit}\ ` : ""; // 묶음배송 있을 경우 let bundleDlvyUseCn = bundleDlvyUseAt === 'Y' ? ` - \${bundleDlvyCndAmt}\원 이상 ~ - 0원(묶음 배송) + \${bundleDlvyCndAmt}${curUnit}\ 이상 ~ + 0\${curUnit}\(묶음 배송) ` : ""; let dftDlvyAmtCnEnd = ` @@ -2266,15 +2271,15 @@ 도서산간 - \${areaAditDlvyAmt}\원 + \${areaAditDlvyAmt}${curUnit}\ 제주지역 - \${areaAditDlvyAmt}\원 + \${areaAditDlvyAmt}${curUnit}\ 제주도서산간 - \${areaAditDlvyAmt}\원 + \${areaAditDlvyAmt}${curUnit}\ @@ -3740,11 +3745,11 @@ const fn_move_goodsDtl_login = () => {
- 원 + ${curUnit} "/> - 원 + ${curUnit}
@@ -3797,7 +3802,7 @@ const fn_move_goodsDtl_login = () => {
최대혜택가 원 + class="priceUnit">${curUnit} ${resultMap.goodsDtl.dcPercent}%  
- 원 + ${curUnit} ${goodsOpt01.optnInfo}
@@ -4160,7 +4165,7 @@ const fn_move_goodsDtl_login = () => { 총 상품금액 0원 + class="won">${curUnit}
@@ -4281,10 +4286,10 @@ const fn_move_goodsDtl_login = () => { - 원 + ${curUnit} - 원 + ${curUnit}
@@ -4751,20 +4756,20 @@ const fn_move_goodsDtl_login = () => {
  • 상품가격 - 원 + ${curUnit}
  • 이벤트
    ${resultMap.goodsDtl.evtnm}     - - 원 + - ${curUnit}
  • 상품 쿠폰
    ${resultMap.goodsDtl.gdCouponSndngNm }     - - 원 + - ${curUnit}
    • @@ -4777,7 +4782,7 @@ const fn_move_goodsDtl_login = () => { - % - - 원 + - ${curUnit} @@ -4786,7 +4791,7 @@ const fn_move_goodsDtl_login = () => {
  • 최대혜택가 - 원 + ${curUnit}