Merge branch 'develop' into bin2107

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

@@ -428,11 +428,11 @@ public class TsfPlanningController extends TsfBaseController {
 
 	
 	/**
-	 * 총알배송 메인 화면
+	 * 총알배송 / 일반배송 확인
 	 * 
 	 * @return
 	 * @author sowon
-	 * @since 2021. 3. 30
+	 * @since 2021. 4. 5
 	 */
 	@GetMapping("shot/delivery/confirm")
 	@ResponseBody

src/main/webapp/WEB-INF/views/web/planning/PlanningShotGuideFormWeb.html

@@ -22,7 +22,7 @@
 	<div id="container" class="container dp">
 		<div class="breadcrumb"> 
 			<ul>
-				<li class="bread_home"><a href="index.html">홈</a></li>
+				<li class="bread_home"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">홈</a></li>
 				<li class="bread_2depth">총알배송</li>
 			</ul> 
 		</div>
@@ -33,7 +33,7 @@
                         <h3>총알배송</h3>
                     </div>
 				</div>
-				<div class="cont_body" th:utext="${#strings.replace(#strings.replace(shotHtml.fsrcPc,'&amplt;','<'),'&ampgt;','>')}">
+				<div class="cont_body" th:utext="${#strings.replace(#strings.replace(shotHtml.fsrcPc,'<','<'),'>','>')}">
                      <div class="bulletship">
                         <div class="bulletship_head">
                             <img src="/images/pc/thumb/bullet_bg1.png" alt="10시까지 주문하면 당일도착">
@@ -221,7 +221,7 @@ $(document).ready(function() {
    
 });
  /*]]>*/
-</script> 
+</script>
 
 </th:block>
 

src/main/webapp/WEB-INF/views/web/social/SocialMainFormWeb.html

@@ -62,7 +62,7 @@
                                         </div>
                                          -->
                                         <div class="shopBagBtn">
-                                            <button class="btn btn_defalt">
+                                            <button class="btn btn_defalt" onclick="cfnAddCart()">
                                                 <span>쇼핑백 담기</span>
                                             </button>
                                         </div>