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

src/main/java/com/style24/persistence/mybatis/shop/TsfGoods.xml

@@ -2257,8 +2257,8 @@
 		      , G.MAIN_COLOR_CD
 		      , G.LIST_PRICE
 		      , G.CURR_PRICE
-			  , (SELECT SYS_IMG_NM FROM TB_GOODS_IMG X WHERE X.GOODS_CD = G.GOODS_CD AND G.MAIN_COLOR_CD = X.COLOR_CD AND DEFAULT_IMG_YN = 'Y' LIMIT 1) AS SYS_IMG_NM
-			  , (SELECT SYS_IMG_NM FROM TB_GOODS_IMG X WHERE X.GOODS_CD = G.GOODS_CD AND G.MAIN_COLOR_CD = X.COLOR_CD AND MOUSEOVER_IMG_YN = 'Y' LIMIT 1) AS SYS_IMG_NM2
+			  , (SELECT SYS_IMG_NM FROM TB_GOODS_IMG X WHERE X.GOODS_CD = G.GOODS_CD AND IF(G.SELF_GOODS_YN= 'N', 'XX', G.MAIN_COLOR_CD) = X.COLOR_CD AND DEFAULT_IMG_YN = 'Y' LIMIT 1) AS SYS_IMG_NM
+			  , (SELECT SYS_IMG_NM FROM TB_GOODS_IMG X WHERE X.GOODS_CD = G.GOODS_CD AND IF(G.SELF_GOODS_YN= 'N', 'XX', G.MAIN_COLOR_CD) = X.COLOR_CD AND MOUSEOVER_IMG_YN = 'Y' LIMIT 1) AS SYS_IMG_NM2
 		      , (
 		      SELECT GROUP_CONCAT(CONCAT(VIDEO_GB,':',KMC_KEY) ORDER BY NUMB SEPARATOR ',')
 		      FROM   (

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

@@ -76,6 +76,10 @@
 				<ul class="fullCate" id="ulQuickMenuCate">
 				</ul>
 			</div>
+			<div class="inner">
+				<ul class="flow" id="ulQuickContents">
+				</ul>
+			</div>
 			<div class="inner">
 				<div class="btn_group btn_group_flex">
 					<div th:if="${sessionInfo == null}"><button type="button" class="btn" onclick="cfnGoToPage(_PAGE_LOGIN);"><span>로그인</span></button></div>
@@ -177,24 +181,20 @@
 				if (status == 'success') {
 					if (result.length > 0) {
 						$('#ulQuickMenuCate').html('');
-						
-						let tag = '';
-						tag += '<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_ALL_BRAND);"><span>브랜드</span></a></li>\n';
+						$('#ulQuickMenuCate').append('<li><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_ALL_BRAND);"><span>브랜드</span></a></li>\n');
 						
 						let allCate = [[${allCateList}]];
 						$.each(result, function(idx, item) {
 							if (item.contentsType == 'C' || item.contentsType == 'O') { // 컨텐츠유형: 카테고리, 아울렛
 								$.each(allCate, function(allCateIdx, allCateItem) {
 									if (item.cate1No == allCateItem.cate1No) {
-										tag += fnGetQuickMenuCategory(allCateItem);
+										$('#ulQuickMenuCate').append(fnGetQuickMenuCategory(allCateItem));
 									}
 								});
 							} else if (item.contentsType == 'L') { // 컨텐츠유형:링크
-								tag += '<li><a href="' + item.linkUrl + '"><span>' + item.gtabNm + '</span></a></li>';
+								$('#ulQuickContents').append('<li><a href="' + item.linkUrl + '"><span>' + item.gtabNm + '</span></a></li>\n');
 							}
 						});
-						
-						$('#ulQuickMenuCate').html(tag);
 					}
 				}
 			});

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

@@ -266,7 +266,7 @@
 															<div class="form_field">
 																<div class="imgUpload">
 																	<label for="fileAdd" class="fileAdd" id="fileAdd_reply">첫번째업로드</label>
-																	<input type="file" id="fileAdd" name="files" accept=".jpeg, .jpg, .png, video/mp4"> <!-- 210507_추가 : accept 속성 추가 -->
+																	<input type="file" id="fileAdd" name="files" accept=".jpeg, .jpg, .png, video/*"> <!-- 210507_추가 : accept 속성 추가 -->
 																</div>
 															</div>
 															<!-- //이미지첨부 -->

src/main/webapp/WEB-INF/views/mob/mypage/MypageReviewFormMob.html

@@ -345,7 +345,7 @@
 		$('#btnMore2').hide();
 		$('#btnMore').show();
 		$('#reviewList').html('');
-		
+		$("#searchForm1 input[name=pageNo]").val(1);
 		fnCompleteList();
 	})
 	
@@ -357,6 +357,7 @@
 		$('#btnMore').hide();
 		$('#btnMore2').show();
 		$('#reviewList').html('');
+		$("#searchForm2 input[name=pageNo]").val(1);
 		fnAlreadyList();
 		
 	});

src/main/webapp/WEB-INF/views/mob/planning/PlanningDetailFormMob.html

@@ -931,7 +931,10 @@ $(document).ready(function(){
 	ajaxReplyList();
 	
 	fnCompleteList();
-	$("#filter").text(planCornerList[0].cornerNm);
+	if (planCornerList.length>0 && planCornerList != null) {
+		$("#filter").text(planCornerList[0].cornerNm);
+	}
+	
 	
 	//Q3 글자 수 카운트
 	$('.doc_contactus').keyup(function (e){

src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb.html

@@ -272,7 +272,7 @@
 								</div>
 
 							</div>
-							<div class="last_page" id="endPage">
+							<div class="last_page" id="endPage" style="display:none;">
 								<span>마지막 페이지입니다.</span>
 							</div>
 						</div>