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

src/main/webapp/WEB-INF/views/display/MainContentsPopupForm.html

@@ -590,9 +590,11 @@
 			if(contentsLoc=='SMM001' || contentsLoc=='SOM001' || contentsLoc=='SBM004'){
 				html += '<button type="button" style="display: none;" class="btn btn-base btn-lg" id="addMobImg'+dataIdx+'" onclick="fnAddMobImgPopRow(this);">모바일이미지추가</button>';
 			}
+			html += '<button type="button" class="btn btn-base btn-lg"';
 			if(contentsLoc!='SMM001' && contentsLoc!='SOM001' && contentsLoc!='SBM004'){
-				html += '<button type="button" class="btn btn-base btn-lg" id="addLink'+dataIdx+'" onclick="fnAddLinkPopRow(this);">링크추가</button>';
+				html += ' style="display:none;" ';
 			}
+			html += ' id="addLink'+dataIdx+'" onclick="fnAddLinkPopRow(this);">링크추가</button>';
 		}
 		html += '<button type="button" class="btn btn-danger btn-lg" onclick="fnDeleteContentsRow(this);">삭제</button></td>';
 		html += '</tr>';
@@ -821,9 +823,9 @@
 		$("#mcTable"+tableDataId).find("tr[name=titlePopRow]").find("input[name=title]").val(result[0].planNm);
 		$("#mcTable"+tableDataId).find("tr[name=subTextPopRow]").find("input[name=subText]").val(result[0].dtlTitle1);
 		$("#mcTable"+tableDataId).find("tr[name=linkPopRow]").find("input[name=link]").val('/planning/detail/form?planSq='+result[0].planSq);
-		$("#mcTable"+tableDataId).find("tr[name=imgPopRow]").find("input[name=imgPath]").val(result[0].mainPimg);
-		$("#mcTable"+tableDataId).find("#bannerPreViewUrlPop_"+tableDataId).attr('src',$("#uploadDefaultUrlPop").val().replace('/contents/', '')+result[0].mainPimg);
-		$("#mcTable"+tableDataId).find("#imgViewPop_"+tableDataId).removeClass("off").addClass("on");
+		$("#mcTable"+tableDataId).find("tr[id=mobImgPop]").find("input[name=imgPath]").val(result[0].mainPimg);
+		$("#mcTable"+tableDataId).find('.mobImg').find("#bannerPreViewUrlPop_0").attr('src',$("#uploadDefaultUrlPop").val().replace('/contents/', '')+result[0].mainPimg);
+		$("#mcTable"+tableDataId).find('.mobImg').find("#imgViewPop_0").removeClass("off").addClass("on");
 
 		let stdt = result[0].dispStdt.split(" ");
 		let eddt = result[0].dispEddt.split(" ");
@@ -1252,7 +1254,7 @@
 			src = $("#uploadDefaultUrlPop").val().replace('/contents/', '')+param;
 			imgPath = param;
 		}
-		var html = '<tr name="imgPopRow">';
+		var html = '<tr class="mobImg" name="imgPopRow" id="mobImgPop">';
 		html += '<th>모바일용 이미지';
 		html += '</th>';
 		html += '<td><div class="uFile w300">';

src/main/webapp/WEB-INF/views/marketing/PlanDetailPopupForm.html

@@ -1048,10 +1048,10 @@
 			return;
 		}
 
-		if (Number(stDate2) < Number(toDate) && mode == 'N') {
+		/* if (Number(stDate2) < Number(toDate) && mode == 'N') {
 			mcxDialog.alert('신규회원 시작일자는 오늘포함 이후로 등록해주세요.');
 			return;
-		}
+		} */
 
 		if (Number(edDate2) < Number(toDate) && mode == 'N') {
 			mcxDialog.alert('신규회원 종료일자는 오늘포함 이후로 등록해주세요.');