Merge branch 'brandDraw' of git.yoho.cn:yoho30/yohobuy-activity into brandDraw

Conflicts:
	web/src/main/webapp/brand/index.html

@@ -14,16 +14,7 @@
     <script type="text/javascript" src="js/autoSize.js"></script>
     <script type="text/javascript" src="js/autoSize.js"></script>
     <script type="text/javascript" src="js/style.js"></script>
     <script type="text/javascript" src="js/style.js"></script>
     <script>
     <script>
-   
-    
     	$(function() {
     	$(function() {
-   		 /* 	  var thisURL = window.location.href;
-   		    if(thisURL.indexOf("openby") == -1){
-   		    	var shareURL = thisURL+'?openby:yohobuy={"action":"go.h5","params":{"param":{"share_id":"956","title":"YOHOOD 2016"},"andfinish":"1","share":"/operations/api/v5/webshare/getShare","shareparam":{"share_id":"956"},"title":"YOHOOD 2016","url":"'+thisURL+'"}}';
-   		    debugger;
-   		    	window.location.href = shareURL;  
-   		    }  */
-   		     
     		var uid = null;
     		var uid = null;
     		var clickBoxArr = {};
     		var clickBoxArr = {};
     		//判定登录
     		//判定登录
@@ -33,11 +24,16 @@
                     if (json.code === 200) {
                     if (json.code === 200) {
                         uid=json.data;
                         uid=json.data;
                     } else {
                     } else {
-                    	var thisURL = window.location.href;
                         var url ='http://m.yohobuy.com/signin.html?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":'
                         var url ='http://m.yohobuy.com/signin.html?openby:yohobuy={"action":"go.weblogin","params":{"jumpurl":{"url":'
-                                + thisURL +'","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"Y"}}';
-                        window.location.href=url;
-                    }  
+                                +'/activity/brand/index.html'+'","param":{"from":"app"}},"requesturl":{"url":"","param":{}},"priority":"Y"}}';
+                        //window.location.href=url;
+                        if ($("#collocation-link").length <= 0) {
+                            $("body").append('<a href=\'' + url + '\' style="display:none;" id="collocation-link">' +
+                                                '<span class="collocation-link"></span>' +
+                                            '</a>');
+                        }
+                        $(".collocation-link").click();
+                    }
                 }
                 }
             );
             );