wangshan 5 years ago
parent
commit
cebb6f8979

+ 2 - 1
src/web/staticres/css/wx/home.css

@@ -82,7 +82,7 @@
   width: 0.08rem;
   height: 0.08rem;
   background: #fff;
-  opacity: 0.4;
+  opacity: 0.6;
 }
 
 .home .top .home_banner .lunbo .custorm_dot .swiper-pagination-bullet-active {
@@ -129,6 +129,7 @@
   padding: .32rem .3rem 0.08rem;
   font-size: .4rem;
   color: #1D1D1D;
+font-weight: bold;
 }
 
 .home .home_data .data_list {

+ 3 - 3
src/web/staticres/css/wxsearch.css

@@ -386,12 +386,12 @@ form{
 }
 /**引导页**/
 .swiper-pagination{
-	top: 80px !important;
+/*	top: 80px !important;*/
 	transition: 0ms !important;
 	-webkit-transition: 0ms !important;
 }
 .swiper-pagination-bullet{
-	margin-bottom: 15px !important;
+	margin-bottom: 5px !important;
 }
 .swiper-slide{
 	text-align: center;
@@ -482,7 +482,7 @@ form{
 	height: 100%;
 }
 .swiper-pagination-bullet-active{
-	background-color: #35c5da !important;
+/*	background-color: #35c5da !important;*/
 }
 .swiper-pagination-bullet{
 	opacity: .1;

+ 3 - 0
src/web/staticres/js/wxSupersearch.js

@@ -1929,5 +1929,8 @@ var SuperSearch = {
 			$("#wrapper").css("margin-bottom","52px");
 			$("#supersearchPage .resbm").addClass("hidden");
 		}
+	},
+	getHomeList:function(){
+		
 	}
 };

+ 2 - 2
src/web/staticres/vipsubscribe/css/keyWord.css

@@ -566,7 +566,7 @@ bottom:0px;
     width: 1.7rem;
     text-align: center;
     color: #2CB7CA;
-    font-size: 0.2rem;
+    font-size: 0.26rem;
     padding: 0rem 0rem 0.1rem;
     float: right;
 }
@@ -592,7 +592,7 @@ bottom:0px;
 }
 .classify-fast-pop .weui-dialog .weui-dialog__bd p {
         color: #888;
-    font-size: .2rem;
+    font-size: .26rem;
     margin-top: .2rem;
     letter-spacing: 0.01rem;
 }

+ 18 - 1
src/web/staticres/wxswordfish/share.js

@@ -11,7 +11,7 @@ function initShare(signature,openid,isentry,activecode,nickname,avatar,id){
 	}
 	if(typeof(signature) != "undefined" && signature != null && signature.length == 4){
 		wx.config({
-		    debug: false, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
+		    debug: true, // 开启调试模式,调用的所有api的返回值会在客户端alert出来,若要查看传入的参数,可以在pc端打开,参数信息会通过log打出,仅在pc端时才会打印。
 		    appId: signature[0], // 必填,公众号的唯一标识
 		    timestamp:signature[1], // 必填,生成签名的时间戳
 		    nonceStr: signature[2], // 必填,生成签名的随机串
@@ -195,6 +195,23 @@ function initShare(signature,openid,isentry,activecode,nickname,avatar,id){
 					// 用户取消分享后执行的回调函数
 				}
 			});
+			wx.getLocation({
+			  	type: 'wgs84', // 默认为wgs84的gps坐标,如果要返回直接给openLocation用的火星坐标,可传入'gcj02'
+			  	success: function (res) {
+			    	var latitude = res.latitude; // 纬度,浮点数,范围为90 ~ -90
+			    	var longitude = res.longitude; // 经度,浮点数,范围为180 ~ -180。
+					//生成地理位置
+                    var fname = '';
+                    var point = new BMap.Point(longitude, latitude);
+                    var geoc = new BMap.Geocoder();
+                    geoc.getLocation(point, function(rs) {
+                        var addComp = rs.addressComponents;
+                        //alert(addComp.province + ", "+addComp.city + ", "+addComp.district + ", "+addComp.street + ", "+addComp.streetNumber);
+                        fname = addComp.district;
+                        alert('您现在所处位置:'+JSON.stringify(addComp));
+                    });
+			  }
+			});
 	    });
 		wx.error(function(res){
 		    // config信息验证失败会执行error函数,如签名过期导致验证失败,具体错误信息可以打开config的debug模式查看,也可以在返回的res参数中查看,对于SPA可以在这里更新签名。

+ 43 - 25
src/web/templates/weixin/search/mainSearch.html

@@ -19,10 +19,11 @@
 <script src="{{Msg "seo" "cdn"}}/js/rem.js?v={{Msg "seo" "version"}}"></script>
 <script src="{{Msg "seo" "cdn"}}/mobiscroll/mobiscroll.min.js"></script>
 {{include "/common/weixin.html"}}
-<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}"></script>
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=DD279b2a90afdf0ae7a3796787a0742e"></script>
+<script src="{{Msg "seo" "cdn"}}/wxswordfish/share.js?v={{Msg "seo" "version"}}1"></script>
 <script src="{{Msg "seo" "cdn"}}/js/dropload.js?v={{Msg "seo" "version"}}"></script>
 <script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxEntsesearch.js?v={{Msg "seo" "version"}}"></script>
-<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}1022"></script>
+<script type="text/javascript" src="{{Msg "seo" "cdn"}}/js/wxSupersearch.js?v={{Msg "seo" "version"}}112"></script>
 <!--2.8-->
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/css/base_myorder.css?v={{Msg "seo" "version"}}1">
 <link rel="stylesheet" href="{{Msg "seo" "cdn"}}/wx_dataExport/iconfont/iconfont.css?v={{Msg "seo" "version"}}">
@@ -65,7 +66,7 @@
 	$(function(){
 		//dev2.8.5
         var swiper1 = new Swiper('#swiper1',{
-            autoplay: 5000,
+            autoplay: 3000,
             effect: 'fade',
             pagination: '.swiper-pagination',
             paginationClickable: true,
@@ -281,7 +282,7 @@
 	<div class="home">
         <div class="top">
             <div class="home_search">
-                <div class="home_search_left">
+                <div class="home_search_left inp-search">
                     <img class="icon_search" src="/images/search/home_search.png" alt="">
                     <span>示例:税务局 软件</span>
                 </div>
@@ -292,14 +293,31 @@
             <div class="home_banner">
                 <div class="swiper-container lunbo" id="swiper1">
                     <div class="swiper-wrapper">
-                        <div class="swiper-slide"><a href="#"><img src="/images/search/banner_1.png" alt=""></a></div>
-                        <div class="swiper-slide"><a href="#"><img src="/images/search/banner_2.png" alt=""></a></div>
-                        <div class="swiper-slide"><a href="#"><img src="/images/search/banner_3.png" alt=""></a></div>
+						<!--轮播广告-->
                     </div>
                     <div class="swiper-pagination custorm_dot"></div>
                 </div>
             </div>
         </div>
+		{{$s_top:=(Ad "jy-wxsearch-home-top" -1)}}
+		<script>
+			$(function(){
+				SuperSearch.getHomeList()
+			})
+			var ADTopList={{$s_top}}
+			if (ADTopList!=null){
+				var adhtml = '';
+				for(var i=0;i<ADTopList.length;i++){
+					adhtml+='<div class="swiper-slide">'
+						+'<a href="'+ADTopList[i]["s_link"]+'">'
+						+'<img src="'+ADTopList[i]["s_pic"]+'" alt="">'
+						+'</a></div>'
+				}
+				if(adhtml!=""){
+					$(".home_banner .swiper-wrapper").html(adhtml);
+				}
+			}
+		</script>
         <!-- 导航菜单 -->
         <div class="home_tab">
             <div class="tab_container">
@@ -365,20 +383,20 @@
 	<!--2.8.5  end-->
 	<!--<div onclick="window.location.href='/supportJy'" style="font-size:15px;background-color: #FFB900;line-height: 40px;z-index: 99;color: #fff;border-radius: 3px;bottom: 80px;right: 10px;left:10px;position: fixed;"><img src="/images/search/laba.png" style="width: 23px;margin:0px 10px;">好几天没有推送消息了,真相是......</div>-->
 	<!--头部-->
-		<div class="search-header">
+	<div class="search-header hide">
 		<!--搜索-->
-			<div class="search-tontrol">
-				<div>
-					<input class="inp-search" type="text" name="" value="" maxlength="50" placeholder="示例:税务局 软件" readonly/>
-				</div>
-				<!--点击关闭-->
-				<span id="seaClose" class="close"></span>
-				<a class="rightHref">
-				</a>
+		<div class="search-tontrol">
+			<div>
+				<input class="inp-search" type="text" name="" value="" maxlength="50" placeholder="示例:税务局 软件" readonly/>
 			</div>
+			<!--点击关闭-->
+			<span id="seaClose" class="close"></span>
+			<a class="rightHref">
+			</a>
 		</div>
+	</div>
 
-	<section class="content">
+	<section class="content hide">
 		<ul>
 			<li>
 				<a>
@@ -1089,23 +1107,23 @@
             SuperSearch.init(true,true,true);
         });
 		//点击帮助
-	    $(".rightHref").click(function(){
+	    $(".home_search_right").click(function(){
 	        window.open("http://mp.weixin.qq.com/mp/homepage?__biz=MzIyNTM1NDUyNw==&hid=2&sn=379fc869080a36d9d0798a3d4fb9a63a#wechat_redirect");
 			event.stopPropagation();
 	    });
 	    //数据导出页面
-	    $(".content ul li a:eq(1)").on('click', function () {
+	    $(".tab_container  a:eq(1)").on('click', function () {
 			window.location.href='/front/wx_dataExport/toSieve';
 	    });
+	    //剑鱼标讯
+	    $(".tab_container a:eq(2)").on('click', function () {
+			window.location.href='/swordfish/historypush';
+	    });
 	    //APP下载跳转到关于剑鱼标讯
-	    $(".content ul li a:eq(2)").on('click', function () {
+	    $(".tab_container a:eq(3)").on('click', function () {
 			// window.location.href='https://www.jianyu360.com/jyapp/free/download/normal?source=weixinAutoRpl';
 			window.location.href='/swordfish/about?flag=1&come=1';
 	    });
-		//拉新 2019-10-21 拉新活动结束 注释
-	    //$(".content ul li a:eq(3)").on('click', function () {
-		//	window.location.href='https://mp.weixin.qq.com/s/ACvQRxKeLYl_DuPuvvqIXQ';
-	    //});
 	//});
 	function checkIsOpen(){
 		$(".content ul li a:eq(0)").unbind("tap");
@@ -1115,7 +1133,7 @@
 	    $.post("/jylab/supsearch/getstatus?t="+new Date().getTime(),function(result){
 			onceFlag_tablepro=result.tablepro;
 			//中标企业搜索跳转
-		    $(".content ul li a:eq(0)").on("tap",function(){
+		    $(".tab_container a:eq(0)").on("tap",function(){
 				EntSearch.clearSessionStorage();
 				EntSearch.init(true,true,true);
 		    });	  

+ 2 - 2
src/web/templates/weixin/vipsubscribe/keyWord.html

@@ -138,7 +138,7 @@
                     <strong class="weui-dialog__title">快速导入</strong>
                 </div>
                 <div class="weui-dialog__bd">
-                    快速导入可将免费版招标订阅内所设置的关键词及其排除词一并导入至“未分类"关键词分类内,无需再次手动输入,简化您的订阅过程。
+                    快速导入可将免费版招标订阅内所设置的关键词及其排除词一并导入至“未分类"关键词分类内,无需再次手动输入,简化您的订阅过程。
 					<p style="color:#888;">注:地区与行业分类以VIP订阅设置内为准,不做导入。</p>
                 </div>
                 <div class="weui-dialog__ft">
@@ -722,7 +722,7 @@
 		    var agent = navigator.userAgent.toLowerCase();
 		    var dialog = $('.classify-fast-pop .weui-dialog')
 		    if( /iphone|ipod|ipad|ios/.test(agent) ){
-		        dialog.css({ 'top': '30%' })
+		        dialog.css({ 'top': '40%' })
 		    } else {
 		        dialog.css({ 'top': '50%' })
 		    }