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

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

@@ -1271,6 +1271,12 @@
 	<!-- 브랜드 전체 조회 -->
 	<select id="getAllBrandList" parameterType="BrandGroup" resultType="BrandGroup">
 		/* TsfDisplay.getAllBrandList */
+		WITH EXIST_BRAND AS (
+            SELECT DISTINCT BRAND_CD 
+            FROM   TB_GOODS G
+            WHERE  1=1
+            AND    G.GOODS_STAT = 'G008_90'		
+		)
 		SELECT	DISTINCT Z.BRAND_GROUP_NO
 		      , FN_GET_BRAND_INITIAL(Z.BRAND_GROUP_NM) AS BRAND_INITIAL
 		      , Z.BRAND_GROUP_NM
@@ -1287,6 +1293,7 @@
 		            , BG.LOGO_FILE_NM
 		      FROM  TB_BRAND B
 		      INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
+		      INNER JOIN EXIST_BRAND EB ON B.BRAND_CD = EB.BRAND_CD
 		      WHERE	1=1
 		      AND	B.USE_YN = 'Y'
 		      AND	BG.USE_YN = 'Y'
@@ -1300,12 +1307,6 @@
 		      <if test="brandGroupNm != null and brandGroupNm != ''">
 		      AND	(BG.BRAND_GROUP_ENM LIKE CONCAT('%',#{brandGroupNm},'%') OR BG.BRAND_GROUP_KNM LIKE CONCAT('%',#{brandGroupNm},'%'))
 		      </if>
-		      AND   EXISTS (
-		                SELECT 1
-		                FROM   TB_GOODS G
-		                WHERE  G.BRAND_CD = B.BRAND_CD
-		                AND    G.GOODS_STAT = 'G008_90'
-		            )
 		      GROUP BY BG.BRAND_GROUP_NO, B.BRAND_ENM, B.BRAND_KNM
 		) Z
 		WHERE	1=1

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

@@ -20,6 +20,7 @@
 <script type="text/javascript" th:src="@{'/ux/plugins/gaga/gaga.common.js'}" src="/ux/plugins/gaga/gaga.common.js"></script>
 <script type="text/javascript" th:src="@{'/ux/plugins/gaga/gaga.validation.js'}" src="/ux/plugins/gaga/gaga.validation.js"></script>
 <script type="text/javascript" th:src="@{'/ux/plugins/vg-controller-client.latest.min.js'}" src="/ux/plugins/vg-controller-client.latest.min.js"></script>
+<script type="text/javascript" th:src="@{'/ux/plugins/kakao.min.js'}" src="/ux/plugins/kakao.min.js"></script>
 <script type="text/javascript" th:src="@{'/biz/comLib.js'}" src="/biz/comLib.js"></script>
 </th:block>
 </html>

src/main/webapp/ux/style24_link.js

@@ -1575,8 +1575,9 @@ function sendSns(sns, url, txt, media, description)
 	var _media = encodeURIComponent(media);
 	var _description = encodeURIComponent(description);
 	
-	_url = location.protocol + encodeURIComponent(url);
-	_url = _url.replaceAll('#enp_mbris','') +'&share=Y'
+	_url = location.protocol + _url.replaceAll('#enp_mbris','') + '&share=Y'
+//	_url = location.protocol + encodeURIComponent(url);
+	
 	switch(sns)
 	{
 		case 'facebook':
@@ -1593,9 +1594,8 @@ function sendSns(sns, url, txt, media, description)
 
 var kakaoInitCnt = 0; //카카오 초기화 카운트, 재실행 방지를 위해 사용함
 function cfnSendToKakao(linkUrl, linkNm, linkImg) {
-	linkUrl = location.protocol + encodeURIComponent(linkUrl);
-	linkUrl = linkUrl.replaceAll('#enp_mbris','') +'&share=Y';
-
+	linkUrl = location.protocol + linkUrl.replaceAll('#enp_mbris','') + '&share=Y';
+	
 	// Kakao Key
 	if ( kakaoInitCnt == 0 ) {
 		Kakao.init(_kakaoDomainKey);
@@ -1628,8 +1628,8 @@ function cfnSendToKakao(linkUrl, linkNm, linkImg) {
 }
 
 function cfnSendToKakaoMob(linkUrl, linkNm, linkImg) {
-	linkUrl = location.protocol + encodeURIComponent(linkUrl);
-	linkUrl = linkUrl.replaceAll('#enp_mbris','') +'&share=Y';
+	linkUrl = location.protocol + linkUrl.replaceAll('#enp_mbris','') + '&share=Y';
+	
 	// Kakao Key
 	if ( kakaoInitCnt == 0 ) {
 		Kakao.init(_kakaoDomainKey);