feat: 移除微信合并检测

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

@@ -481,7 +481,6 @@
 <div class="hidden" id="advertscript"></div>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/vipsubscribe/js/weui.min.js?v={{Msg "seo" "version"}}'></script>
 <!-- 账号合并弹窗js -->
-<script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/merge-wx.js?v={{Msg "seo" "version"}}'></script>
 <script src='{{Cdns .Host "seo" "cdn"|SafeUrl}}/jyapp/js/searchindex.js?v={{Msg "seo" "mod_version"}}'></script>
 <!--S-当前页面的资源-->
 <script src=//cdn.jsdelivr.net/npm/vue@2.6.11/dist/vue.js></script>
@@ -640,21 +639,6 @@
                 $("div[data-open='win']").hide()
             }
 
-            // 查询是否需要(微信)账号合并
-            mergeAccountForWx.init({
-                _className: 'app-main-search',
-                // 请求完成，判断是否需要显示ActiveTip
-                queryComplete: function (info) {
-                    ActiveTip = new Active_Tip()
-                    if (info.tipMerge == 1) {
-                        // 强制不显示其他弹框
-                        $('#myModal-tap').addClass('imp-hide')
-                        $('.modal-backdrop').addClass('imp-hide')
-                        // 弹出合并窗口后，如果还需要弹出ActiveTip，则解开下面的注释
-                        // localStorage.removeItem('Active_Vip_Invite')
-                    }
-                }
-            })
 
             $("#searchIndex .inp-search").unbind("click").on("click",function () {
                 SuperSearch.init(true,true,true);

src/jfw/modules/followent/src/web/templates/weixin/list.html

@@ -43,13 +43,12 @@ if(sessionStorage){
 			</div>
 		</div>
   </div>
-  
+
 <script src="/jylab/followent/js/jquery.js"></script>
 <script src="/jylab/followent/js/fastclick.js"></script>
 <script type="text/javascript" src="https://res.wx.qq.com/open/js/jweixin-1.0.0.js"></script>
 <script src="/jylab/followent/js/common.js?v={{Msg "seo" "version"}}"></script>
 <script src="/jylab/followent/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-<script src="/jylab/followent/js/merge-wx.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript">
 initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avatar}});
     $(function () {
@@ -71,7 +70,7 @@ initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avat
         var lastarr = new Array();	//30天后
         data.sort(function(a,b){return a.l_lastpushtime<b.l_lastpushtime});
         var easyPopup = new EasyPopup("easypopup");
-        
+
         for (var i in data){
             var lastpushtime = data[i]["l_lastpushtime"];
             var rem = "";
@@ -116,7 +115,7 @@ initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avat
                 +tdf+"</li>";
             jyno = listno;
         }
-        
+
         //30天后
         for(var l in lastarr){
             var lastpushtime = lastarr[l]["l_lastpushtime"];
@@ -133,7 +132,7 @@ initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avat
             }else{
                 tdf=""
             }
-            
+
             var listno = parseInt(l)+parseInt(1)+jyno;
             lasthtml +="<li class='jyovertime' data-id='"+lastarr[l]["_id"]+"'>"
             +"<div class='jyfwlistno'>"+listno+".</div>"
@@ -142,7 +141,7 @@ initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avat
             +"<img src='/jylab/followent/images/wx/d.png' class='arrow-right'>"
             +"<div class='jytimest'>"
             +tdf+"</li>";
-        }	
+        }
             html = fronthtml + lasthtml;
         $(".listpage ul").append(html);
 
@@ -165,7 +164,7 @@ initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avat
             }
             window.location.href = "/jylab/followent/addEnt";
         });
-        
+
         $(".jylistbottom").click(function(){
             easyPopup.show("easypopup");
         });
@@ -178,7 +177,7 @@ initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avat
             $(".jyovertime").each(function(){
                 arrid +=","+$(this).attr("data-id");
             });
-            arrid = arrid.substring(1);	
+            arrid = arrid.substring(1);
             if (arrid.length>0){
                 $.ajax({
                     type:'post',
@@ -199,16 +198,9 @@ initShare({{.T.signature}},{{.T.openid}},2,"jy_extend",{{.T.nickname}},{{.T.avat
                 EasyAlert.show("暂无30天无更新的数据<br>可删除!");
             }
         });
-        
+
     });
-</script>
-<script>
-// 查询是否需要(微信)账号合并
-mergeAccountForWx.init({
-    _className: 'wx-follow-ent',
-    beforeShow: function () {}
-})
 </script>
 	{{include "/common/baiducc.html"}}
 </body>
-</html>
+</html>

src/web/templates/weixin/follow/list.html

@@ -23,7 +23,6 @@ if(sessionStorage){
 <script src="{{Msg "seo" "cdn"}}/js/common.js?v={{Msg "seo" "version"}}"></script>
 {{include "/common/weixin.html"}}
 <script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
-<script src="{{Msg "seo" "cdn"}}/js/merge-wx.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript">
 ;(function(w){
     if(/msie|applewebkit.+safari/i.test(w.navigator.userAgent)||window.__wxjs_is_wkwebview
@@ -52,9 +51,9 @@ if(sessionStorage){
     }
 })(window);
 $(function(){
-	sessionStorage.removeItem("remind"); 
+	sessionStorage.removeItem("remind");
     $(window).bind("pageshow", function(event){
-		sessionStorage.removeItem("remind"); 
+		sessionStorage.removeItem("remind");
 		if(event.originalEvent.persisted && sessionStorage.version == "1"){
 			hasReload = true;
 			sessionStorage.version="-1";
@@ -76,7 +75,7 @@ $(function(){
 		}
 		window.location.href = "/follow/add";
 	});
-	
+
 	{{if .T.datas}}
 	var data = {{.T.datas}};
 	var html = "";
@@ -133,7 +132,7 @@ $(function(){
 				addr ="<span class='addr'>"+frontarr[f]["s_area"]+"</span>";
 			}
 		}
-		
+
 		var listno = parseInt(f)+parseInt(1);
 		fronthtml +="<li data-id='"+frontarr[f]["_id"]+"' Sort='"+lastpushtime+"'>"
 		+"<div class='jyfwlistno'>"+listno+".</div>"
@@ -177,8 +176,8 @@ $(function(){
 				addr ="<span class='addr'>"+lastarr[l]["s_area"]+"</span>";
 			}
 		}
-		
-		
+
+
 		var listno = parseInt(l)+parseInt(1)+jyno;
 		lasthtml +="<li  class='jyovertime' data-id='"+lastarr[l]["_id"]+"'>"
 		+"<div class='jyfwlistno'>"+listno+".</div>"
@@ -189,9 +188,9 @@ $(function(){
 	}
 	html = fronthtml + lasthtml;
 	$(".listpage ul").append(html);
-	
+
 	{{end}}
-	
+
 	$(".listpage li").click(function(){
 		if(sessionStorage){
 			sessionStorage.version="0";
@@ -202,13 +201,13 @@ $(function(){
 	$(".jylistbottom").click(function(){
 		easyPopup.show("easypopup");
 	});
-	
+
 	$("#cancel").click(function(){
 		easyPopup.hide("easypopup");
 	});
 	$("#sure").click(function(){
 		easyPopup.hide("easypopup");
-		
+
 		var arrid = "";
 		$(".jyovertime").each(function(){
 			arrid +=","+$(this).attr("data-id");
@@ -234,7 +233,7 @@ $(function(){
 			EasyAlert.show("暂无30天无更新的数据<br>可删除!");
 		}
 	});
-	
+
 });
 
 </script>
@@ -264,12 +263,4 @@ $(function(){
 	</div>
 {{include "/common/baiducc.html"}}
 </body>
-
-<script>
-// 查询是否需要(微信)账号合并
-mergeAccountForWx.init({
-    _className: 'wx-follow-project',
-    beforeShow: function () {}
-})
-</script>
-</html>
+</html>

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

@@ -148,20 +148,6 @@
     }
 
 	$(function(){
-        // 查询是否需要(微信)账号合并
-        mergeAccountForWx.init({
-            _className: 'wx-main-search',
-            // 请求完成，判断是否需要显示ActiveTip
-            queryComplete: function (info) {
-                if (info.tipMerge == 1) {
-                    // 不显示弹窗
-                } else {
-                    // 如果不显示合并弹窗，则尝试显示活动Tip
-                    showActiveTip()
-                }
-            }
-        })
-
         // 搜索选择的显示隐藏
         $('.selected-export .options').on('tap', 'span',function(e){
             var index = $(this).attr('index')  // index可以表示当前点击的是哪个按钮
@@ -874,7 +860,6 @@
 <div id="advertscript" class="hidden">
 {{$s:=(Ad "jy-wxsearch-middle" -1)}}
 
-<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/merge-wx.js?v={{Msg "seo" "version"}}"></script>
 <script>
 	var ADList={{$s}}
 	var random=Math.floor(Math.random()*ADList.length);