Merge branch 'dev2.8' of http://192.168.3.207:10080/qmx/jy into dev2.8

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

@@ -1001,18 +1001,15 @@
 		            window.location.href='/jylab/laboratory/zbqy?v=entSearch_back';
 		        }
 		    });
-<<<<<<< HEAD
 		    //数据导出页面
-		    $(".content ul li a:eq(2)").on('click', function () {
+		    $(".content ul li a:eq(2)").on('tap', function () {
 				window.location.href='/front/wx_dataExport/toSieve';
 		    });
 		    //APP下载跳转到关于剑鱼标讯
-		    $(".content ul li a:eq(3)").on('click', function () {
+		    $(".content ul li a:eq(3)").on('tap', function () {
 				// window.location.href='https://www.jianyu360.com/jyapp/free/download/normal?source=weixinAutoRpl';
 				window.location.href='/swordfish/about?flag=1&come=1';
 		    });
-=======
->>>>>>> release
 	    });
 	}
 	function backThisPage(){