Merge remote-tracking branch 'origin/develop' into xodud1202

src/main/java/com/style24/front/biz/web/TsfOrderController.java

@@ -1047,6 +1047,18 @@ public class TsfOrderController extends TsfBaseController {
 				orderInfo.setGoodsNm((String) resultMap.get("goodsNm"));
 				orderInfo.setGoodsCnt(String.valueOf(resultMap.get("goodsCnt")));
 				kakaotalkService.sendOrderComplete(orderInfo, userNo);
+				
+				OrderChange orderChange = new OrderChange();
+				
+				
+				// 2021.06.15
+				// 주문완료 안내 메일 보내기
+				GagaMap replaceInfo = coreOrderChangeService.getMailOrderCancelReplaceInfo(orderChange);
+
+				// 주문완료 안내 메일 보내기
+				if (StringUtils.isNotBlank(replaceInfo.getString("ordEmail"))) {
+					// mailService.sendOrderComplete(replaceInfo, userNo);
+				}
 			} catch (Exception e) {
 				// TODO Auto-generated catch block
 				e.printStackTrace();

src/main/java/com/style24/persistence/domain/Login.java

@@ -49,6 +49,10 @@ public class Login extends TscBaseDomain {
 	private String tempPasswdYn;	// 임시비밀번호여부
 	private int pwdChgDay;			// 비밀번호변경일자
 	private String ci;				// CI(본인인증여부)
+	private String appAgreeYn;		// 앱푸시수신동의여부
+	private String appAgreeDt;		// 앱푸시수신동의일시
+	private String mkAgreeYn;		// 마케팅푸시수신동의여부
+	private String mkAgreeDt;		// 마케팅푸시수신동의일시
 
 	// 암호화 대상 복호화 처리 =================================================
 	public String getCustNm() {

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

@@ -31,6 +31,10 @@
 		     , CI                                                        /*CI본인인증여부*/
 		     , BIRTH_YMD                                                 /*생년월일*/
 		     , SEX_GB                                                    /*성별*/
+		     , APP_AGREE_YN
+		     , DATE_FORMAT(APP_AGREE_DT, '%Y%m%d%H%i%S')  AS APP_AGREE_DT
+		     , MK_AGREE_YN
+		     , DATE_FORMAT(MK_AGREE_DT, '%Y%m%d%H%i%S')   AS MK_AGREE_DT
 		FROM   TB_CUSTOMER A
 		WHERE  1 = 1
 		<choose>

src/main/webapp/WEB-INF/views/mob/display/BrandMainFormMob.html

@@ -102,8 +102,8 @@
 														</div>
 														<p class="itemBrand" th:text="${goodsData.brandGroupNm}"></p>
 														<div class="itemName" th:text="${goodsData.goodsFullNm}"></div>
-														<p class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}"></p>
 														<div class="itemComment" th:text="${goodsData.goodsTnm}"></div>
+														<p class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}"></p>
 													</a>
 												</div>
 											</div>
@@ -169,12 +169,12 @@
 															</div>
 															<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 															<div class="itemName"th:text="${goodsData.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
+															<div class="itemComment" th:text="${goodsData.goodsTnm}">#가을 느낌 물씬!!</div>
 															<p class="itemPrice">
 																<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 																[[${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}]]
 																<span class="itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 															</p>
-															<div class="itemComment" th:text="${goodsData.goodsTnm}">#가을 느낌 물씬!!</div>
 														</a>
 													</div>
 												</div>
@@ -255,12 +255,12 @@
 															</div>
 															<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 															<div class="itemName" th:text="${goodsData.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
+															<div class="itemComment" th:text="${goodsData.goodsTnm}">#가을 느낌 물씬!!</div>
 															<p class="itemPrice">
 																<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 																[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 																<span class="itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 															</p>
-															<div class="itemComment" th:text="${goodsData.goodsTnm}">#가을 느낌 물씬!!</div>
 														</a>
 													</div>
 												</div>
@@ -350,6 +350,7 @@
 											</div>
 											<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 											<div class="itemName" th:text="${goodsData.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
+											<div class="itemComment" th:text="${goodsData.goodsTnm}">#주문 폭주 상품</div>
 											<p class="itemPrice">
 												<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 												[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
@@ -366,7 +367,6 @@
 													<span class="badge13" th:if="${idx.index<3}" th:value="${iconArray[0]}" th:text="${iconArray[1]}"></span>
 												</th:block>
 											</p>
-											<div class="itemComment" th:text="${goodsData.goodsTnm}">#주문 폭주 상품</div>
 										</a>
 									</div>
 								</div>

src/main/webapp/WEB-INF/views/mob/display/CategoryMainFormMob.html

@@ -80,8 +80,8 @@
 													</div>
 													<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 													<div class="itemName" th:text="${item.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
-													<p class="itemPrice" th:text="${#numbers.formatInteger(item.currPrice,3,'COMMA')}">80,100</p>
 													<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
+													<p class="itemPrice" th:text="${#numbers.formatInteger(item.currPrice,3,'COMMA')}">80,100</p>
 												</a>
 											</div>
 										</div>
@@ -112,6 +112,7 @@
 												</div>
 												<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 												<div class=" itemName" th:text="${item.goodsFullNm}">여성 체인 프린트 큐롯 스커트 프린트 큐롯 스커트</div>
+												<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 												<p class="itemPrice"><span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(item.currPrice,1,'COMMA')}]]
 													<span class=" itemPercent" th:if="${item.currPrice != item.listPrice}" th:text="${(item.listPrice == 0 ? 0 : #numbers.formatDecimal((item.listPrice - item.currPrice) / (item.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 												</p>
@@ -126,7 +127,6 @@
 														<span class="badge13" th:if="${idx.index<3}" th:value="${iconArray[0]}" th:text="${iconArray[1]}"></span>
 													</th:block>
 												</p>
-												<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 											</a>
 										</div>
 									</div>

src/main/webapp/WEB-INF/views/mob/display/MallMainFormMob.html

@@ -121,8 +121,8 @@
 														</div>
 														<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 														<div class=" itemName" th:text="${goodsData.goodsFullNm}">가을 신상 남성 스탠다드핏 로고맨 블루 볼 캡 유니 경량다운 시보리넥 베스트</div>
-														<p class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}">488,000</p>
 														<div class="itemComment" th:text="${goodsData.goodsTnm}">#주문 폭주 상품</div>
+														<p class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}">488,000</p>
 													</a>
 												</div>
 											</div>
@@ -178,11 +178,11 @@
 																	</div>
 																	<p class="itemBrand" th:text="${bestItemData.brandGroupNm}">TBJ</p>
 																	<div class="itemName" th:text="${bestItemData.goodsFullNm}">11111 남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+																	<div class="itemComment" th:text="${bestItemData.goodsTnm}"># 가을 느낌 물씬!</div>
 																	<p class="itemPrice">
 																		<span class="itemPrice_original" th:if="${bestItemData.currPrice != bestItemData.listPrice}" th:text="${#numbers.formatInteger(bestItemData.listPrice,3,'COMMA')}">89,000</span>[[${#numbers.formatInteger(bestItemData.currPrice,0,'COMMA')}]]
 																		<span class=" itemPercent" th:if="${bestItemData.currPrice != bestItemData.listPrice}" th:text="${(bestItemData.listPrice == 0 ? 0 : #numbers.formatDecimal((bestItemData.listPrice - bestItemData.currPrice) / (bestItemData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 																	</p>
-																	<div class="itemComment" th:text="${bestItemData.goodsTnm}"># 가을 느낌 물씬!</div>
 																</a>
 															</div>
 														</div>
@@ -273,11 +273,11 @@
 																</div>
 																<p class="itemBrand" th:text="${goodsData.brandEnm}">TBJ</p>
 																<div class="itemName" th:text="${goodsData.goodsNm}">11111 남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+																<div class="itemComment" th:text="${goodsData.goodsTnm}"># 가을 느낌 물씬!</div>
 																<p class="itemPrice">
 																	<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,0,'COMMA')}">89,000</span>[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 																	<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatDecimal(goodsData.dcRate,1,0)} + '%'">10%</span>
 																</p>
-																<div class="itemComment" th:text="${goodsData.goodsTnm}"># 가을 느낌 물씬!</div>
 															</a>
 														</div>
 													</div>
@@ -437,11 +437,11 @@
 																		</div>
 																		<p class="itemBrand" th:text="${goodsData.brandGroupNm}">TBJ</p>
 																		<div class="itemName" th:text="${goodsData.goodsFullNm}">11111 남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+																		<div class="itemComment" th:text="${goodsData.goodsTnm}"># 가을 느낌 물씬!</div>
 																		<p class="itemPrice">
 																			<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 																			<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 																		</p>
-																		<div class="itemComment" th:text="${goodsData.goodsTnm}"># 가을 느낌 물씬!</div>
 																	</a>
 																</div>
 															</div>

src/main/webapp/WEB-INF/views/mob/display/SearchLayerMob.html

@@ -25,11 +25,14 @@
 			<form id="searchMainForm" name="searchMainForm">
 				<input type="hidden" name="brandGroupNo" th:value="${brandGroupNo}"/>
 				<div class="sch_title">
-					<input type="text" class="form_control" name="keyword" placeholder="검색어를 입력하세요.">
-					<!-- <button class="btn_x">X</button> -->
+					<input type="text" class="form_control" name="keyword" placeholder="검색어를 입력하세요." onkeyup="fnOnkeyupKeyword(this);">
+					<button type="button" class="btn_x" id="deleteKeyword" style="display:none;">X</button>
 					<button type="button" class="btn_sch" id="btnSearchKeyword"><img src="/images/mo/ico_btn_search.png" alt=""></button>
 				</div>
 			</form>
+		</div>
+
+		<div class="inner" id="defaultArea">
 			<div class="filter-list">
 				<div class="f_left">
 					<h3>최근 검색어</h3>
@@ -162,7 +165,7 @@
 <!--		</div>-->
 		<!-- //2.통합검색 default_최근검색어 있음 -->
 		<!-- 3.지금 많이 보고 있어요 상품. -->
-		<div class="inner">
+		<div class="inner" id="popularArea">
 			<div class="now_view">
 				<div class="store_product">
 					<div class="allresult-tit">
@@ -275,176 +278,124 @@
 		<!-- //3.지금 많이 보고 있어요 상품. -->
 
 		<!-- 4.검색어 타이핑 -->
-		<div class="inner">
-			<div class="sch_title">
-				<input type="text" class="form_control" value="티비제이 제기장 스웨터" placeholder="NBA 겨울 클리어런스+봄 프리뷰!">
-				<button class="btn_x"><span>검색어 지우기</span></button>
-				<button class="btn_sch"><img src="/images/mo/ico_btn_search.png" alt=""></button>
-			</div>
+		<div class="inner" id="keyupArea">
+<!--			<div class="sch_title">-->
+<!--				<input type="text" class="form_control" value="티비제이 제기장 스웨터" placeholder="NBA 겨울 클리어런스+봄 프리뷰!">-->
+<!--				<button class="btn_x"><span>검색어 지우기</span></button>-->
+<!--				<button class="btn_sch"><img src="/images/mo/ico_btn_search.png" alt=""></button>-->
+<!--			</div>-->
 			<div class="filter-list store-list">
-				<div class="f_left">
-					<h3>티비제이 공식 스토어</h3>
-				</div>
-				<div class="f_right">
-					<a href="#none">바로가기</a>
-				</div>
+<!--				<div class="f_left">-->
+<!--					<h3>티비제이 공식 스토어</h3>-->
+<!--				</div>-->
+<!--				<div class="f_right">-->
+<!--					<a href="#none">바로가기</a>-->
+<!--				</div>-->
 			</div>
 			<div class="relative-list">
-				<ul>
-					<li>
-						<a href="#">
-							<p><span>티비제이</span></p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p><span>티비제이</span> 기모청바지</p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p>TBJ 겨울 팬츠</p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p><span>제기장 스웨터</span></p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p><span>티비제이</span> 드라마 연예인 스웨터</p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p>가을겨울 긴팔 롱 <span>스웨터</span></p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p><span>스웨터</span></p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p>롱 <span>스웨터</span></p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p><span>티비제이</span> 여성 <span>스웨터</span></p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p>가을겨울 긴팔 롱 <span>스웨터</span></p>
-						</a>
-					</li>
-				</ul>
-				<p class="nodata_txt">&lsquo;<span>스웨터 제기장</span>&rsquo; 에 맞는 상품을 찾지 못했습니다.<br>검색어를 변경해 보세요.</p>
+<!--				<ul>-->
+<!--					<li>-->
+<!--						<a href="#">-->
+<!--							<p><span>티비제이</span></p>-->
+<!--						</a>-->
+<!--					</li>-->
+<!--					<li>-->
+<!--						<a href="#">-->
+<!--							<p><span>티비제이</span> 기모청바지</p>-->
+<!--						</a>-->
+<!--					</li>-->
+<!--					<li>-->
+<!--						<a href="#">-->
+<!--							<p>TBJ 겨울 팬츠</p>-->
+<!--						</a>-->
+<!--					</li>-->
+<!--					<li>-->
+<!--						<a href="#">-->
+<!--							<p><span>제기장 스웨터</span></p>-->
+<!--						</a>-->
+<!--					</li>-->
+<!--					<li>-->
+<!--						<a href="#">-->
+<!--							<p><span>티비제이</span> 드라마 연예인 스웨터</p>-->
+<!--						</a>-->
+<!--					</li>-->
+<!--					<li>-->
+<!--						<a href="#">-->
+<!--							<p>가을겨울 긴팔 롱 <span>스웨터</span></p>-->
+<!--						</a>-->
+<!--					</li>-->
+<!--					<li>-->
+<!--						<a href="#">-->
+<!--							<p><span>스웨터</span></p>-->
+<!--						</a>-->
+<!--					</li>-->
+<!--					<li>-->
+<!--						<a href="#">-->
+<!--							<p>롱 <span>스웨터</span></p>-->
+<!--						</a>-->
+<!--					</li>-->
+<!--					<li>-->
+<!--						<a href="#">-->
+<!--							<p><span>티비제이</span> 여성 <span>스웨터</span></p>-->
+<!--						</a>-->
+<!--					</li>-->
+<!--					<li>-->
+<!--						<a href="#">-->
+<!--							<p>가을겨울 긴팔 롱 <span>스웨터</span></p>-->
+<!--						</a>-->
+<!--					</li>-->
+<!--				</ul>-->
+<!--				<p class="nodata_txt">&lsquo;<span>스웨터 제기장</span>&rsquo; 에 맞는 상품을 찾지 못했습니다.<br>검색어를 변경해 보세요.</p>-->
 			</div>
 		</div>
-		<div class="inner">
+		<div class="inner" id="keyupCateArea">
 			<div class="sch_category">
-				<h3>카테고리</h3>
-				<ul>
-					<li>
-						<a href="">
-							<span>여성</span>
-							<span>티셔츠/셔츠</span>
-							<span><em>긴팔셔츠</em></span>
-							<span>스트라이프 퍼프 스트라이프 퍼프</span>
-						</a>
-					</li>
-					<li>
-						<a href="">
-							<span>여성</span>
-							<span><em>니트/가디건/베스트</em></span>
-							<span>가디건</span>
-							<span>롱가디건</span>
-						</a>
-					</li>
-					<li>
-						<a href="">
-							<span><em>여성</em></span>
-							<span>자켓/점퍼/코트</span>
-							<span>코트</span>
-							<span>롱코트</span>
-						</a>
-					</li>
+<!--				<h3>카테고리</h3>-->
+<!--				<ul>-->
+<!--					<li>-->
+<!--						<a href="">-->
+<!--							<span>여성</span>-->
+<!--							<span>티셔츠/셔츠</span>-->
+<!--							<span><em>긴팔셔츠</em></span>-->
+<!--							<span>스트라이프 퍼프 스트라이프 퍼프</span>-->
+<!--						</a>-->
+<!--					</li>-->
+<!--					<li>-->
+<!--						<a href="">-->
+<!--							<span>여성</span>-->
+<!--							<span><em>니트/가디건/베스트</em></span>-->
+<!--							<span>가디건</span>-->
+<!--							<span>롱가디건</span>-->
+<!--						</a>-->
+<!--					</li>-->
+<!--					<li>-->
+<!--						<a href="">-->
+<!--							<span><em>여성</em></span>-->
+<!--							<span>자켓/점퍼/코트</span>-->
+<!--							<span>코트</span>-->
+<!--							<span>롱코트</span>-->
+<!--						</a>-->
+<!--					</li>-->
 					<!-- <li>
                         <p>여성 > <span>니트/가디건/베스트</span> > 가디건 > 롱가디건</p>
                     </li>
                     <li>
                         <p><span>여성</span> > 자켓/점퍼/코트 > 코트 > 롱코트</p>
                     </li> -->
-				</ul>
+<!--				</ul>-->
 			</div>
 		</div>
 		<!-- //4.검색어 타이핑 -->
 
 		<!-- 3.검색결과 없을때 -->
-		<div class="inner">
-			<div class="sch_title">
-				<input type="text" class="form_control" placeholder="NBA 겨울 클리어런스+봄 프리뷰!">
-				<!-- <button class="btn_x">X</button> -->
-				<button class="btn_sch"><img src="/images/mo/ico_btn_search.png" alt=""></button>
-			</div>
+		<div class="inner" id="noDataArea">
+<!--			<div class="sch_title">-->
+<!--				<input type="text" class="form_control" placeholder="NBA 겨울 클리어런스+봄 프리뷰!">-->
+<!--				&lt;!&ndash; <button class="btn_x">X</button> &ndash;&gt;-->
+<!--				<button class="btn_sch"><img src="/images/mo/ico_btn_search.png" alt=""></button>-->
+<!--			</div>-->
 			<div class="relative-list nodata"> <!-- 검색결과 없을 시 nodata 클래스 추가 -->
-				<ul>
-					<li>
-						<a href="#">
-							<p><span>티비제이</span></p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p><span>티비제이</span> 기모청바지</p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p>TBJ 겨울 팬츠</p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p><span>제기장 스웨터</span></p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p><span>티비제이</span> 드라마 연예인 스웨터</p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p>가을겨울 긴팔 롱 <span>스웨터</span></p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p><span>스웨터</span></p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p>롱 <span>스웨터</span></p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p><span>티비제이</span> 여성 <span>스웨터</span></p>
-						</a>
-					</li>
-					<li>
-						<a href="#">
-							<p>가을겨울 긴팔 롱 <span>스웨터</span></p>
-						</a>
-					</li>
-				</ul>
-				<p class="nodata_txt">&lsquo;<span>스웨터 제기장</span>&rsquo; 에 맞는 상품을 찾지 못했습니다.<br>검색어를 변경해 보세요.</p>
+				<p class="nodata_txt">&lsquo;<span id="noDataKeyword"></span>&rsquo; 에 맞는 상품을 찾지 못했습니다.<br>검색어를 변경해 보세요.</p>
 			</div>
 			<h3 class="hot-key">STYLE24에서 검색되고 있어요</h3>
 			<div class="related_keyword">
@@ -467,7 +418,7 @@
 				</div>
 			</div>
 		</div>
-		<div class="inner">
+		<div class="inner" id="recommandArea">
 			<div class="recommand_product">
 				<div class="store_product">
 					<div class="swiper-container recommand_slide">
@@ -662,6 +613,127 @@
 		cfnGoToPage(actionUrl);
 	});
 
+	// 검색어 찾기
+	var fnGetAutoSearch = function (){
+		gagajf.ajaxFormSubmit("/display/search/auto/complete", document.searchMainForm, fnAutoCompleteList);
+	}
+
+	// 검색어 찾기 결과
+	var fnAutoCompleteList = function (result){
+		if(result.autoKeywords.length==0 && result.brand == null && result.cateList == null && result.goodsList ==null){
+			$("#keyupArea").hide();
+			$("#keyupCateArea").hide();
+			// $('.empty_box .nodata').find('#noDataKeyword').text("'"+$("#searchMainForm").find('input[name=keyword]').val()+"'");
+			$("#noDataArea").find('#noDataKeyword').text($("#searchMainForm").find('input[name=keyword]').val());
+			$("#noDataArea").show();
+			$("#recommandArea").show();
+		}else{
+			// 자동완성 키워드
+			if(result.autoKeywords != null && result.autoKeywords.length > 0){
+				$("#keyupArea").find(".relative-list").html('');
+				let tag = '';
+				tag += '<ul>\n';
+				$.each(result.autoKeywords, function (idx,item){
+					tag += '<li>\n';
+					tag += '	<a href="javascript:void(0);">\n';
+					tag += '		<p><span>'+result.autoKeywords[idx]+'</span></p>\n';
+					tag += '	</a>\n';
+					tag += '</li>\n';
+				});
+				tag += '</ul>\n';
+				$("#keyupArea").find(".relative-list").append(tag);
+			}
+
+			// 브랜드
+			if(result.brand != null){
+				$("#keyupArea").find(".store-list").html('');
+				let tag = '';
+				tag += '<div class="f_left">\n';
+				tag += '	<h3>'+result.brand.brandGroupNm+' 공식 스토어</h3>\n';
+				tag += '</div>\n';
+				tag += '<div class="f_right">\n';
+				tag += '	<a href="javascript:void(0);" onclick="cfnGoToBrandMain('+result.brand.brandGroupNo+');">바로가기</a>\n';
+				tag += '</div>\n';
+				$("#keyupArea").find(".store-list").append(tag);
+			}
+
+			if(result.cateList != null && result.cateList.length > 0){
+				$("#keyupCateArea").find(".sch_category").html('');
+				let tag = '';
+				tag += '<h3>카테고리</h3>\n';
+				tag += '<ul>\n';
+				$.each(result.cateList, function (idx, item){
+					tag +='<li>\n';
+					tag +='	<a href="javascript:void(0);" onclick="cfnGoToGoodsList(0,\'G032_101\' ';
+					if(item.cate1No != null){
+						tag += ', '+item.cate1No;
+					}
+					if(item.cate2No != null){
+						tag += ', '+item.cate2No;
+					}
+					if(item.cate3No != null){
+						tag += ', '+item.cate3No;
+					}
+					if(item.cate4No != null){
+						tag += ', '+item.cate4No;
+					}
+					if(item.cate5No != null){
+						tag += ', '+item.cate5No;
+					}
+					tag += ');">\n';
+					if(item.cate1Nm != null){
+						tag += '		<span>'+item.cate1Nm+'</span>\n';
+					}
+					if(item.cate2Nm != null){
+						tag += '		<span>'+item.cate2Nm+'</span>\n';
+					}
+					if(item.cate3Nm != null){
+						tag += '		<span>'+item.cate3Nm+'</span>\n';
+					}
+					if(item.cate4Nm != null){
+						tag += '		<span>'+item.cate4Nm+'</span>\n';
+					}
+					if(item.cate5Nm != null){
+						tag += '		<span>'+item.cate5Nm+'</span>\n';
+					}
+					tag +='	</a>\n';
+					tag +='</li>\n';
+				});
+				tag += '</ul>\n';
+
+				$("#keyupCateArea").find(".sch_category").append(tag);
+			}
+		}
+	}
+
+	// 검색어 입력
+	var fnOnkeyupKeyword = function (obj){
+		var searchValue = $(obj).val();
+		if(searchValue.length > 0){
+			$("#defaultArea").hide();
+			$("#popularArea").hide();
+			$("#keyupArea").show();
+			$("#keyupCateArea").show();
+			$("#deleteKeyword").show();
+			$("#noDataArea").hide();
+			$("#recommandArea").hide();
+			fnGetAutoSearch();
+		}else{
+			$("#defaultArea").show();
+			$("#popularArea").show();
+			$("#keyupArea").hide();
+			$("#keyupCateArea").hide();
+			$("#deleteKeyword").hide();
+			$("#noDataArea").hide();
+			$("#recommandArea").hide();
+		}
+	}
+
+	document.getElementById("deleteKeyword").onclick = function (){
+		$("#searchMainForm").find("input[name=keyword]").val('');
+		fnOnkeyupKeyword($("#searchMainForm").find("input[name=keyword]"));
+	}
+
 	$(document).ready( function() {
 		if (trendKeywordList.length > 0) {
 			$("#popularKeyArea").html('');
@@ -674,7 +746,14 @@
 				$("#popularKeyArea").append(tag);
 			});
 		}
+
+		$("#keyupArea").hide();
+		$("#keyupCateArea").hide();
+		$("#deleteKeyword").hide();
+		$("#noDataArea").hide();
+		$("#recommandArea").hide();
 	});
+
 	/*]]>*/
 </script>
 

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

@@ -46,7 +46,7 @@
 										</div>
 										<div class="info_box">
 											<div class="od_name">
-												<div class="goods_date"><span class="date" th:text="${reviewInfo.regDt}"></span> 구매</div>
+												<div class="goods_date"><span class="date" th:text="${reviewInfo.ordDt}"></span> 구매</div>
 												<div class="brand">
 													<span th:text="${reviewInfo.brandNm}"></span>
 												</div>

src/main/webapp/WEB-INF/views/mob/order/OrderPaymentInfoMob.html

@@ -139,7 +139,7 @@ var paymentInfoDispYn = function(temp) {
 $(document).ready( function() {
 	
 	// 화면펼침
-	if (pgGb == null || pgGb == "") {
+	if (pgGb == null || pgGb == "" || payMeans == null || payMeans == "") {
 		paymentInfoDispYn("Y");
 	} else {
 		paymentInfoDispYn(dispYn);

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

@@ -70,8 +70,8 @@
 						
 						$.each(result, function(idx, item) {
 							let tag = '<div>\n';
-							tag += '	<div class="visual" onclick="cfnGoToPlanDetail(\'' + item.planSq + '\')">\n';
-							
+							tag += '	<div class="visual">\n';
+							tag += '   <a href="javascript:void(0);" onclick="cfnGoToPlanDetail(\'' + item.planSq + '\')">';
 							if (item.newYn == 'Y') {
 								tag += '		<div class="shape ranker"><span>NEW</span></div>\n';
 							}
@@ -83,6 +83,7 @@
 							tag += '			<p>' + item.planNm + '</p>\n';
 							tag += '			<p class="txt_xs">' + item.dtlTitle1 + '</p>\n';
 							tag += '		</div>\n';
+							tag += '      </a>';
 							tag += '	</div>\n';
 							if (item.planningGoodsList.length > 0) {
 								tag += '	<div class="itemsGrp n3">\n';

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

@@ -113,8 +113,8 @@
 														</div>
 														<p class="itemBrand" th:text="${goodsData.brandGroupNm}"></p>
 														<div class=" itemName" th:text="${goodsData.goodsFullNm}"></div>
-														<p class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')+'원'}"></p>
 														<div class="itemComment" th:text="${goodsData.goodsTnm}">#가을느낌 물씬!</div>
+														<p class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')+'원'}"></p>
 													</a>
 												</div>
 											</div>
@@ -188,12 +188,12 @@
 														</div>
 														<p class="itemBrand" th:text="${goodsData.brandGroupNm}"></p>
 														<div class="itemName" th:text="${goodsData.goodsFullNm}"></div>
+														<div class="itemComment" th:text="${goodsData.goodsTnm}">#가을느낌 물씬!!</div>
 														<p class="itemPrice">
 															[[${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')} + 원]]
 															<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}"></span>
 															<span class="itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 														</p>
-														<div class="itemComment" th:text="${goodsData.goodsTnm}">#가을느낌 물씬!!</div>
 													</a>
 												</div>
 											</div>
@@ -268,12 +268,12 @@
 													</div>
 													<p class=" itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 													<div class=" itemName" th:text="${goodsData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+													<div class="itemComment" th:text="${goodsData.goodsTnm}">#베이직 셔츠의 정수1</div>
 													<p class="itemPrice" >
 														[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')} + 원]]
 														<span class="itemPrice_original" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 														<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 													</p>
-													<div class="itemComment" th:text="${goodsData.goodsTnm}">#베이직 셔츠의 정수1</div>
 												</a>
 											</div>
 										</div>
@@ -372,6 +372,7 @@
 												</div>
 												<p class=" itemBrand" th:text="${goodsData.brandGroupNm}"></p>
 												<div class="itemName" th:text="${goodsData.goodsFullNm}"></div>
+												<div class="itemComment" th:text="${goodsData.goodsTnm}">#가을느낌 물씬!</div>
 												<p class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')} + 원]]
 													<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 													<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
@@ -387,7 +388,6 @@
 														<span class="badge13" th:if="${idx.index<3}" th:value="${iconArray[0]}" th:text="${iconArray[1]}"></span>
 													</th:block>
 												</p>
-												<div class="itemComment" th:text="${goodsData.goodsTnm}">#가을느낌 물씬!</div>
 											</a>
 										</div>
 									</div>

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

@@ -102,8 +102,8 @@
 												</div>
 												<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 												<div class="itemName" th:text="${item.goodsFullNm}">스타 착용 여성 퍼 아플리케 오버핏 투마일 웨어링 점퍼</div>
-												<p class="itemPrice" th:text="${#numbers.formatInteger(item.currPrice,3,'COMMA') + '원'}">488,000원</p>
 												<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#가을느낌 물씬!</div>
+												<p class="itemPrice" th:text="${#numbers.formatInteger(item.currPrice,3,'COMMA') + '원'}">488,000원</p>
 											</a>
 										</div>
 									</div>
@@ -141,6 +141,7 @@
 											</div>
 											<p class="itemBrand" th:text="${item.brandGroupNm}">BRAND NAME</p>
 											<div class="itemName" th:text="${item.goodsFullNm}">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
+											<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 											<p class="itemPrice">
 												<span th:text="${#numbers.formatInteger(item.currPrice,3,'COMMA') + '원'}">80,100</span>
 												<span class="itemPrice_original" th:if="${item.currPrice != item.listPrice}" th:text="${#numbers.formatInteger(item.listPrice,3,'COMMA') + '원'}">89,000</span>
@@ -157,7 +158,6 @@
 													<span class="badge13" th:if="${idx.index<3}" th:value="${iconArray[0]}" th:text="${iconArray[1]}"></span>
 												</th:block>
 											</p>
-											<div class="itemComment" th:if="${not #strings.isEmpty(item.goodsTnm)}" th:text="${item.goodsTnm}">#주문 폭주 상품</div>
 										</a>
 									</div>
 								</div>

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

@@ -129,8 +129,8 @@
 														</div>
 														<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 														<div class=" itemName" th:text="${goodsData.goodsFullNm}">스타 착용 여성 퍼 아플리케 오버핏 투마일 웨어링 점퍼</div>
-														<p class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}">488,000원</p>
 														<div class="itemComment" th:text="${goodsData.goodsTnm}">#가을느낌 물씬!</div>
+														<p class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}">488,000원</p>
 													</a>
 												</div>
 											</div>
@@ -183,11 +183,11 @@
 															</div>
 															<p class=" itemBrand" th:text="${bestItemData.brandGroupNm}">BRAND NAME</p>
 															<div class=" itemName" th:text="${bestItemData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+															<div class="itemComment" th:text="${bestItemData.goodsTnm}">#데일리웨어로 매일입고싶은</div>
 															<p class="itemPrice">[[${#numbers.formatInteger(bestItemData.currPrice,0,'COMMA')}]]
 																<span class="itemPrice_original" th:if="${bestItemData.currPrice != bestItemData.listPrice}" th:text="${#numbers.formatInteger(bestItemData.listPrice,3,'COMMA')}">89,000</span>
 																<span class=" itemPercent" th:if="${bestItemData.currPrice != bestItemData.listPrice}" th:text="${(bestItemData.listPrice == 0 ? 0 : #numbers.formatDecimal((bestItemData.listPrice - bestItemData.currPrice) / (bestItemData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 															</p>
-															<div class="itemComment" th:text="${bestItemData.goodsTnm}">#데일리웨어로 매일입고싶은</div>
 														</a>
 													</div>
 												</div>
@@ -341,13 +341,13 @@
 															</div>
 															<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 															<div class="itemName" th:text="${goodsData.goodsNm}">여성 체인 프린트 큐롯 스커트 프린트 큐롯 스커트</div>
+															<div class="itemComment" th:text="${goodsData.goodsTnm}">#데일리웨어로 매일입고싶은</div>
 															<p class="itemPrice">
 																[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 																<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,0,'COMMA')} + '원'"></span>
 																<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatDecimal(goodsData.dcRate,1,0)} + '%'"></span>
 																<!--<span class="itemPercent" th:if="${planningGoods.currPrice != planningGoods.listPrice}" th:text="${(planningGoods.listPrice == 0 ? 0 : #numbers.formatDecimal((planningGoods.listPrice - planningGoods.currPrice) / (planningGoods.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>-->
 															</p>
-															<div class="itemComment" th:text="${goodsData.goodsTnm}">#데일리웨어로 매일입고싶은</div>
 														</a>
 													</div>
 												</div>
@@ -424,11 +424,11 @@
 																	<img alt="BLACK-a" class=" vLHTC pd_img" th:src="${@environment.getProperty('upload.goods.view') + '/' + goodsData.sysImgNm}" onerror="noneImg(this)">
 																</div>
 																<div class=" itemName" th:text="${goodsData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+																<div class="itemComment" th:text="${goodsData.goodsTnm}">#데일리웨어로 매일입고싶은</div>
 																<p class="itemPrice" th:text="${#numbers.formatInteger(goodsData.currPrice,1,'COMMA')}">80,100
 																	<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 																	<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 																</p>
-																<div class="itemComment" th:text="${goodsData.goodsTnm}">#데일리웨어로 매일입고싶은</div>
 															</a>
 														</div>
 													</div>
@@ -518,11 +518,11 @@
 																		</div>
 																		<p class="itemBrand" th:text="${goodsData.brandGroupNm}">BRAND NAME</p>
 																		<div class=" itemName" th:text="${goodsData.goodsFullNm}">남성 로고 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건 자카드 방풍 패딩 스웨터 가디건</div>
+																		<div class="itemComment" th:text="${goodsData.goodsTnm}">#주문 폭주 상품</div>
 																		<p class="itemPrice">[[${#numbers.formatInteger(goodsData.currPrice,0,'COMMA')}]]
 																			<span class="itemPrice_original" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${#numbers.formatInteger(goodsData.listPrice,1,'COMMA')}">89,000</span>
 																			<span class=" itemPercent" th:if="${goodsData.currPrice != goodsData.listPrice}" th:text="${(goodsData.listPrice == 0 ? 0 : #numbers.formatDecimal((goodsData.listPrice - goodsData.currPrice) / (goodsData.listPrice * 1.0) * 100, 1, 0)) + '%'}">10%</span>
 																		</p>
-																		<div class="itemComment" th:text="${goodsData.goodsTnm}">#주문 폭주 상품</div>
 																	</a>
 																</div>
 															</div>
@@ -1086,7 +1086,7 @@ var main_deal_slide = new Swiper ('.main_deal .post-deal', {
 /* 브랜드 PICK 갯수체크 210430_수정 */
 var pickCont = $('.post-pick-nav .swiper-slide');
 var pickLength = pickCont.length;
-if (pickLength < 2) {
+if (pickLength < 7) { //210614_ 수정 : 슬라이드 갯수 7개 미만일시 롤링 기능 억제.
 	/* SLIDE - MAIN_PICK */
 	var main_pick_nav = new Swiper('.main_pick .post-pick-nav', { //top
 		initialSlide: 0,
@@ -1094,12 +1094,9 @@ if (pickLength < 2) {
 		// slidesPerGroup: 6,
 		loop: false,
 		watchOverflow : true,
-		loopeSlides: 6,
-		loopFillGroupWithBlank : true,
 		// slideToClickedSlide : true,
 		slideToClickedSlide : true,
 		loopAdditionalSlides : 1,
-		// centeredSlides : true,
 		watchSlidesVisibility: true,
 		watchSlidesProgress: true,
 		freeMode: false,
@@ -1107,24 +1104,17 @@ if (pickLength < 2) {
 			nextEl: '.main_pick .swiper-button-next',
 			prevEl: '.main_pick .swiper-button-prev',
 		},
-		// autoplay: {
-		// 	delay: 5000,
-		// 	disableOnInteraction: false,
-		// },
 	});
 } else {
 	/* SLIDE - MAIN_PICK */
 	var main_pick_nav = new Swiper('.main_pick .post-pick-nav', { //top
 		initialSlide: 0,
 		slidesPerView: 6,
-		// slidesPerGroup: 6,
-		loop: true,
-		loopeSlides: 6,
-		loopFillGroupWithBlank : true,
+		slidesPerGroup: 6,
+		loop: false,
 		// slideToClickedSlide : true,
 		slideToClickedSlide : true,
-		loopAdditionalSlides : 1,
-		// centeredSlides : true,
+		//loopAdditionalSlides : 1,
 		watchSlidesVisibility: true,
 		watchSlidesProgress: true,
 		freeMode: false,
@@ -1132,10 +1122,6 @@ if (pickLength < 2) {
 			nextEl: '.main_pick .swiper-button-next',
 			prevEl: '.main_pick .swiper-button-prev',
 		},
-		// autoplay: {
-		// 	delay: 5000,
-		// 	disableOnInteraction: false,
-		// },
 	});
 
 
@@ -1156,10 +1142,10 @@ if (pickForLength < 2) {
 		// loopFillGroupWithBlank : true,
 		loopAdditionalSlides: 1,
 		allowTouchMove: false,
-		navigation: {
-			nextEl: '.main_pick .swiper-button-next',
-			prevEl: '.main_pick .swiper-button-prev',
-		},
+		// navigation: {
+		// nextEl: '.main_pick .swiper-button-next',
+		// prevEl: '.main_pick .swiper-button-prev',
+		// },
 		thumbs: {
 			swiper: main_pick_nav
 		},
@@ -1179,10 +1165,10 @@ if (pickForLength < 2) {
 		// loopFillGroupWithBlank : true,
 		loopAdditionalSlides: 1,
 		allowTouchMove: false,
-		navigation: {
-			nextEl: '.main_pick .swiper-button-next',
-			prevEl: '.main_pick .swiper-button-prev',
-		},
+		// navigation: {
+		// nextEl: '.main_pick .swiper-button-next',
+		// prevEl: '.main_pick .swiper-button-prev',
+		// },
 		thumbs: {
 			swiper: main_pick_nav
 		},

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

@@ -22,7 +22,7 @@
 			
 			<fieldset>
 				<legend>통합검색</legend>
-				<input type="text" name="keyword" value="" placeholder="검색어를 입력하세요." class="search_input" title="검색어 입력" maxlength="100" required="required" data-valid-name="검색어" onkeyup="fntestKey(this);"/>
+				<input type="text" name="keyword" value="" placeholder="검색어를 입력하세요." class="search_input" title="검색어 입력" maxlength="100" required="required" data-valid-name="검색어" onkeyup="fnOnkeyupKeyword(this);"/>
 				<button type="button" class="sch_btn" id="btnSearchKeyword"><i class="ico ico_search"><em>검색</em></i></button>
 			</fieldset>
 		</form>
@@ -384,12 +384,13 @@
 		//
 	});
 
+	// 검색어 찾기
 	var fnGetAutoSearch = function (){
 		gagajf.ajaxFormSubmit("/display/search/auto/complete", document.searchMainForm, fnAutoCompleteList);
 	}
 
-	let fnAutoCompleteList = function (result){
-		console.log(result);
+	// 검색어 찾기 결과
+	var fnAutoCompleteList = function (result){
 		if(result.autoKeywords.length==0 && result.brand == null && result.cateList == null && result.goodsList ==null){
 			$('.common_search .area_result .searching_box').hide();
 			$('.empty_box .nodata').find('#noDataKeyword').text("'"+$("#searchMainForm").find('input[name=keyword]').val()+"'");
@@ -492,7 +493,7 @@
 		}
 	}
 
-	var fntestKey = function (obj){
+	var fnOnkeyupKeyword = function (obj){
 		var searchValue = $(obj).val();
 		if(searchValue.length > 0) {
 			$('.common_search .area_result .default_box').hide();

src/main/webapp/biz/goods.js

@@ -299,6 +299,9 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 
 		tag += '			<p class="itemBrand">'+item.brandGroupNm+'</p>';
 		tag += '			<div class="itemName">'+item.goodsFullNm+'</div>';
+		if(item.goodsTnm != null){
+			tag += '			<div class="itemComment">'+item.goodsTnm+'</div>';
+		}
 		if(appGb != 'Mob'){
 			tag += '			<p class="itemPrice">'+item.currPrice.addComma()
 			if(item.currPrice != item.listPrice){
@@ -362,9 +365,6 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 			tag += '	</p>';
 		}
 
-		if(item.goodsTnm != null){
-			tag += '			<div class="itemComment">'+item.goodsTnm+'</div>';
-		}
 		tag += '		</a>';
 		tag += '	</div>';
 		tag += '</div>';

src/main/webapp/biz/search.js

@@ -105,6 +105,9 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 
 		tag += '			<p class="itemBrand">'+item.brandGroupNm+'</p>';
 		tag += '			<div class="itemName">'+item.goodsFullNm+'</div>';
+		if(item.goodsTnm != null){
+			tag += '			<div class="itemComment">'+item.goodsTnm+'</div>';
+		}
 		if(appGb != 'Mob'){
 			tag += '			<p class="itemPrice">'+item.currPrice.addComma()
 			tag += '				<span class="itemPrice_original">'+item.listPrice.addComma()+'</span>';
@@ -166,9 +169,6 @@ var fnCreateGoodsList = function(result, ithrCd, contentLoc, goodsUrl, lastPage,
 			tag += '	</p>';
 		}
 
-		if(item.goodsTnm != null){
-			tag += '			<div class="itemComment">'+item.goodsTnm+'</div>';
-		}
 		tag += '		</a>';
 		tag += '	</div>';
 		tag += '</div>';

src/main/webapp/ux/mo/css/style24_m.css

@@ -965,7 +965,7 @@ main.container .inner h2[data-style~="unusual"] {font-size:2.0rem;top: 0;positio
 .my .lnb_list li a {display: block; padding: 2rem; background: url(/images/mo/ico_lnb_arrow.png) no-repeat right 2rem center; background-size:0.7rem 1.26rem;}
 
 .my .mem_rank {position: relative; padding:1.6rem 0; padding-left: 6rem;}
-.my .mem_rank .mem_name {dib font-size: 1.8rem; font-weight: 300;}
+.my .mem_rank .mem_name {display: inline-block; font-size: 1.8rem; font-weight: 300;}
 .my .mem_rank .mem_name strong {font-weight: 500;}
 .my .mem_rank .rank_txt {display: inline-block; font-size: 1.8rem; color: #666; font-weight: 500; padding-right: 1.7rem; background: url(/images/mo/ico_btn_detail03.png) no-repeat right top 5px; background-size:0.7rem 1.3rem;}
 .my .mem_rank .rank_txt02 button {display: inline-block; font-size: 14px; padding-right: 13px; margin-right: 20px; background: url(/images/pc/ico_mysm_arrow.png) no-repeat right top 6px;}
@@ -2596,7 +2596,7 @@ main.container .od_extra .inner:last-child {padding-bottom: 0;}
 #daumZipcodePop .modal-content {margin-top:5rem;}
 
 /* popup_메인공지 FULL */
-.popup_main_notice {position:fixed; left:0; top:0; right: 0; bottom: 0; z-index:90000; width: 100%; height: 100%; overflow-y:auto; background: #222; z-index: 100;}
+.popup_main_notice {position:fixed; left:0; top:0; right: 0; bottom: 0; z-index:9000; width: 100%; height: 100%; overflow-y:auto; background: #222;}
 .popup_main_notice .swiper-button-prev,
 .popup_main_notice .swiper-button-next {position:absolute; top:50%; transform:translateY(-50%); display:inline-block; width:6.0rem; height:6.0rem; background-image:url('/images/pc/btn_main_pop_arrow.png'); background-repeat:no-repeat; background-size:auto 100%; z-index:2;}
 .popup_main_notice .swiper-button-prev {left:0; background-position:0 50%;}

src/main/webapp/ux/pc/css/common.css

@@ -830,7 +830,7 @@ content: "〉";font-size: 12px;padding-left: 8px;
 .itemOpt ul li:first-child{margin-left: 0px;}
 .itemOpt .exc{font-size: 14px;line-height: 1.2;display: inline-block;margin-left: 10px;}
 .itemBrand {margin: 0px 5px 12px;line-height: 12px;font-size: 12px;font-weight: 300;color: rgb(137, 137, 137);height:12px;}
-.itemComment{margin:20px 5px 0px;line-height: 1; font-size: 14px;font-weight: 300;color: #fd4802;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
+.itemComment{margin:0px 5px 20px;line-height: 1; font-size: 14px;font-weight: 300;color: #fd4802;overflow: hidden;text-overflow: ellipsis;white-space: nowrap;}
 .itemName {	margin: 0px 5px 15px;line-height:20px;font-size: 14px;font-weight: 200;color:#222; height:40px;}
 .itemPrice * {margin-right: 7px;}
 .itemPrice {position: relative;line-height: 16px;font-size:16px;font-weight: 300;color: rgb(31, 31, 31);margin: 0px 5px;}