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

src/main/java/com/style24/front/biz/dao/TsfDeliveryDao.java

@@ -61,8 +61,6 @@ public interface TsfDeliveryDao {
 	void updateOrdChgSqStat(SweetTracker sweetTracker);		
 	
 
-	int saveTemp(SweetTracker sweetTracker);
-
 	/**
 	 * 스윗트래커 정보 조회
 	 * 

src/main/java/com/style24/front/biz/service/TsfDeliveryService.java

@@ -95,22 +95,6 @@ public class TsfDeliveryService {
 		sweetTracker.setDelvWhere(sweetTracker.getWhere());
 		deliveryDao.insertTbSweetTracker(sweetTracker);
 	}
-	
-	/**
-	 * 스윗트래커 배송상태 등록 및 주문상세상태 변경 
-	 * @param  SweetTracker
-	 * @return 
-	 * @author moon
-	 * @since  2021. 04. 13
-	 */
-	@Transactional("shopTxnManager")
-	public int saveTemp(String msg) {
-		int rtn=0;
-		SweetTracker tmp = new SweetTracker();
-		tmp.setMan(msg);
-		deliveryDao.saveTemp(tmp);
-		return rtn;
-	}
 
 	/**
 	 * 스윗트래커 정보 조회

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

@@ -51,7 +51,6 @@ public class TsfDeliveryController extends TsfBaseController {
 	@ResponseBody
 	public String sweetTrackerResponse(@RequestBody SweetTracker  sweetTracker) throws Exception {
 
-		deliveryService.saveTemp(sweetTracker.toString());
 		
 		JsonObject rtn = new JsonObject();
 		

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

@@ -85,20 +85,6 @@
 	</update>	
 
 	
-	<!-- 주문상세 상태값 변경    -->
-	<insert id="saveTemp" parameterType="SweetTracker" keyProperty="tmp_sq">
-		/*TssDelivery.saveTemp*/
-		insert into tb_sw_temp 
-		(
-			  msg
-			, reg_dt 
-		)values
-		(
-			#{man}
-			, now()
-		)
-	</insert>	
-	
 	<!-- 스윗트래커 정보 조회 -->
 	<select id="getSweetTrackerDeliveryInfo" parameterType="SweetTracker" resultType="SweetTracker">
 		/*TsfDelivery.getSweetTrackerDeliveryInfo*/

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

@@ -103,50 +103,50 @@
 						<div class="filter_body">
 							<!-- 필터메뉴 -->
 							<ul>
-								<li class="categori">
-									<a href="javascript:void(0)" class="daps1">카테고리<span class="pic">셔츠/블라우스</span></a>
-									<ul class="daps2">
-										<li>
-											<a href="javascript:void(0)">여성</a>
-											<ul class="daps3">
-												<li>
-													<a href="javascript:void(0)">티셔츠/셔츠</a>
-													<ul class="daps4">
-														<li>
-															<a href="javascript:void(0)">셔츠/블라우스</a>
-															<ul class="daps5">
-																<li><a href="javascript:void(0)">셔츠</a></li>
-																<li><a href="javascript:void(0)">블라우스</a></li>
-															</ul>
-														</li>
-														<li>
-															<a href="javascript:void(0)">맨투맨/모자티</a>
-															<ul class="daps5">
-																<li><a href="javascript:void(0)">맨투맨</a></li>
-																<li><a href="javascript:void(0)">모자티</a></li>
-															</ul>
-														</li>
-													</ul>
-												</li>
-											</ul>
-										</li>
-										<li>
-											<a href="javascript:void(0)">남성</a>
-											<ul class="daps3">
-												<li>
-													<a href="javascript:void(0)">티셔츠/셔츠</a>
-													<ul class="daps4">
-														<li>
-															<a href="javascript:void(0)">셔츠/블라우스</a>
-															<ul class="daps5">
-																<li><a href="javascript:void(0)">셔츠</a></li>
-																<li><a href="javascript:void(0)">블라우스</a></li>
-															</ul>
-														</li>
-													</ul>
-												</li>
-											</ul>
-										</li>
+								<li class="categori" id="categoryFilterDiv">
+									<a href="javascript:void(0)" class="daps1">카테고리<!--<span class="pic">셔츠/블라우스</span>--></a>
+									<ul class="daps2" id="categoryArea">
+<!--										<li>-->
+<!--											<a href="javascript:void(0)">여성</a>-->
+<!--											<ul class="daps3">-->
+<!--												<li>-->
+<!--													<a href="javascript:void(0)">티셔츠/셔츠</a>-->
+<!--													<ul class="daps4">-->
+<!--														<li>-->
+<!--															<a href="javascript:void(0)">셔츠/블라우스</a>-->
+<!--															<ul class="daps5">-->
+<!--																<li><a href="javascript:void(0)">셔츠</a></li>-->
+<!--																<li><a href="javascript:void(0)">블라우스</a></li>-->
+<!--															</ul>-->
+<!--														</li>-->
+<!--														<li>-->
+<!--															<a href="javascript:void(0)">맨투맨/모자티</a>-->
+<!--															<ul class="daps5">-->
+<!--																<li><a href="javascript:void(0)">맨투맨</a></li>-->
+<!--																<li><a href="javascript:void(0)">모자티</a></li>-->
+<!--															</ul>-->
+<!--														</li>-->
+<!--													</ul>-->
+<!--												</li>-->
+<!--											</ul>-->
+<!--										</li>-->
+<!--										<li>-->
+<!--											<a href="javascript:void(0)">남성</a>-->
+<!--											<ul class="daps3">-->
+<!--												<li>-->
+<!--													<a href="javascript:void(0)">티셔츠/셔츠</a>-->
+<!--													<ul class="daps4">-->
+<!--														<li>-->
+<!--															<a href="javascript:void(0)">셔츠/블라우스</a>-->
+<!--															<ul class="daps5">-->
+<!--																<li><a href="javascript:void(0)">셔츠</a></li>-->
+<!--																<li><a href="javascript:void(0)">블라우스</a></li>-->
+<!--															</ul>-->
+<!--														</li>-->
+<!--													</ul>-->
+<!--												</li>-->
+<!--											</ul>-->
+<!--										</li>-->
 									</ul>
 								</li>
 								<li class="brand" th:if="${filterBrandList != null and !filterBrandList.empty}" id="brandGroupFilterDiv">
@@ -469,7 +469,6 @@
 		var filterPriceList = [[${filterPriceList}]];
 
 		$(document).ready(function(){
-			console.log('filterPriceList len:::'+filterPriceList.length);
 			if(filterPriceList.length > 0){
 				$("#priceArea").html('');
 				var priceHtml = '';

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

@@ -143,7 +143,7 @@
 
 				<!-- 4. 잇 아이템 -->
 				<th:block th:if="${contentsLoc=='004'}">
-					<div class="content main_it">
+					<div class="content main_it" th:if="${mainLayoutData.BestItemList != null}">
 						<div class="cont_head">
 							<p class="displayH" id="id004">
 								<input type="hidden" name="title" th:value="${mainLayoutData.contentsTitle}">
@@ -197,7 +197,7 @@
 
 				<!-- 5. 프로모션배너 -->
 				<th:block th:if="${contentsLoc=='005'}">
-					<div class="content main_2stage">
+					<div class="content main_2stage" th:if="${mainLayoutData.ContentsList != null}">
 						<div class="cont_head dpnone">
 							<p class="t_c">프로모션배너</p>
 						</div>