Fenzhihebing

src/jfw/modules/app/src/web/staticres/jyapp/commonPay/js/common.js

@@ -328,8 +328,12 @@ var vTools = {
     // 解决 客户端2.9.5 replace失效问题
     locationReplace: function (url){
       if(history.replaceState){
-        history.replaceState(null, document.title, url);
-        history.go(0);
+    	try{
+        	history.replaceState(null, document.title, url);
+        	history.go(0);
+        }catch(e){
+        	window.location.href=url;
+        }
       }else{
         location.replace(url);
       }

src/jfw/modules/app/src/web/staticres/jyapp/js/searchindex.js

@@ -3702,11 +3702,17 @@ var Active_Default = function(nowTime){
 var Active_Vip_Invite = function(nowTime){
 	this.init = function(){
 		$(".pop-new").on("tap",function(){
-			if(ActiveTip.isLogin){
+			//外部链接打开
+			if (adv_within=="abroad"){
 				ActiveTip.close();
-				window.location.href = adv_url;
+				JyObj.openExternalLink(adv_url,"");
 			}else{
-				window.location.href = "/jyapp/free/login?url="+encodeURIComponent(adv_url);
+				if(ActiveTip.isLogin){
+					ActiveTip.close();
+					window.location.href = adv_url;
+				}else{
+					window.location.href = "/jyapp/free/login?url="+encodeURIComponent(adv_url);
+				}
 			}
 		});
 		//nowTime = new Date(formatDate(nowTime,true)+ " 00:00:00").getTime();

src/jfw/modules/app/src/web/templates/weixin/search/mainSearch.html

@@ -400,6 +400,7 @@
 <script type="text/javascript">
   var adv_url = "/datareport/page/introduce";
   var adv_img = "/jyapp/images/reportTip.png?v=51430"
+  var adv_within = "";//是否是外部链接打开
   {{$s:=(Ad "jyapp-wxsearch-index" -1)}}
   {{if $s}}
   var ADList={{$s}}
@@ -411,6 +412,9 @@
       if(AD.s_pic){
         adv_img = AD.s_pic+"?v="+ new Date().getTime()
       }
+      if (AD.o_extend != undefined) {
+        adv_within = AD.o_extend.linktype;
+      }
     }
   {{end}}
 	var userId = {{session "userId"}};

src/web/templates/weixin/search/mainSearch.html

@@ -1273,6 +1273,7 @@
     }, true)
 	}
   function gotoIntroducePage(e){
+    $("#homePageTap").modal("hide");
     var dataUrl = $(e).attr("dataUrl");
     window.location.href = dataUrl;
   }