Browse Source

Merge branch 'dev4.2' of http://192.168.3.207:10080/qmx/jy into dev4.2

zhangxinlei1996 4 years ago
parent
commit
1b8564ea7f

+ 1 - 1
src/config.json

@@ -8,7 +8,7 @@
     "weixinrpc": "127.0.0.1:8083",
     "cacheflag": false,
     "agreement": "http",
-    "webdomain": "http://web-zxl.jydev.jianyu360.com",
+    "webdomain": "http://web-dcs.jydev.jianyu360.com",
     "redirect": {
         "searchinfo": "/jylab/mainSearch",
         "rssset": "/swordfish/newhistorypush",

+ 12 - 7
src/web/staticres/css/pc.css

@@ -291,7 +291,7 @@ form{
 }
 /*******************底部************************/
 .j-bottom{
-	background-color: #525156;
+	background-color: #2B2D30;
 	color: #fff;
 	padding: 40px 0px 25px 0px;
 	text-align: center;
@@ -1878,7 +1878,6 @@ form{
 }
 .jy_friendlink_content ul li img{
 	width: 84px;
-	height: 28px;
 }
 
 
@@ -1891,12 +1890,13 @@ form{
 	display: flex;
 }
 .jy_classify_l dl{
-	width: 120px;
+	margin-right: 80px;
 }
 .jy_classify_l dl dt{
 	font-size: 14px;
 	color: rgba(255,255,255,.8);
 	line-height: 22px;
+	margin-bottom: 8px;
 }
 .jy_classify_l dl dd{
 	position: relative;
@@ -1908,6 +1908,7 @@ form{
 	line-height: 20px;
 }
 .jy_classify_l dl dd a:hover{
+	text-decoration: none;
 	color: #2cb7ca;
 }
 .jy_classify_l dl dd:hover .jy_community{
@@ -1916,11 +1917,11 @@ form{
 .jy_classify_l dl dd .jy_community{
 	display: none;
 	position: absolute;
-	right: -58px;
-	top: 4px;
+	right: -130px;
+	top: -50px;
 	background: #fff;
 	border-radius: 4px;
-	width: 100px;
+	width: 120px;
 	padding: 10px 10px 5px;
 }	
 .jy_classify_l dl dd .jy_community p{
@@ -1929,7 +1930,7 @@ form{
 	text-align: center;
 }
 .jy_classify_l dl dd .jy_community img{
-	width: 80px;
+	width: 100px;
 }
 .jy_classify_r .jy_classify_kefu{
 	display: flex;
@@ -1964,6 +1965,10 @@ form{
 	background: #fff;
 	cursor: pointer;
 }
+.jy_classify_list ul li span a{
+	display: block;
+	height: 40px;
+}
 .jy_classify_list ul li:nth-child(1) span{
 	background: url(/images/pc/phone_white.png) no-repeat left center;
 	background-size: 40px;

+ 4 - 4
src/web/staticres/js/common.js

@@ -337,7 +337,7 @@ var TableHeadFixed = function(className,isminus,flag,pageName){
 		var tableHeight = $("."+className).outerHeight();
 		if(tableHeight <= cHeight){
 				$("."+className+" .lucene-table").removeClass("tabfixed tababsolute");
-				$("."+className+" .lucene-table>table:first").css("top",0);
+				$("."+className+" .lucene-table>table:first").css("top",'64px');
 				thisFlag = false;
 			return;
 		}
@@ -349,7 +349,7 @@ var TableHeadFixed = function(className,isminus,flag,pageName){
 			oTop+=20;
 			ooTop-=20;
 		}
-		if(scrollTop >= oTop){
+		if(scrollTop >= (oTop-64)){
 			if(ooTop + tableHeight - scrollTop -20 <= cHeight){
 				if(!thisFlag){
 					$("."+className+" .lucene-table").addClass("tababsolute");
@@ -359,14 +359,14 @@ var TableHeadFixed = function(className,isminus,flag,pageName){
 			}else{
 				if(thisFlag){
 					$("."+className+" .lucene-table").removeClass("tababsolute");
-					$("."+className+" .lucene-table>table:first").css("top",0);
+					$("."+className+" .lucene-table>table:first").css("top",'64px');
 				}
 				thisFlag = false;
 			}
 			$("."+className+" .lucene-table").addClass("tabfixed");
 		}else{
 			$("."+className+" .lucene-table").removeClass("tabfixed tababsolute");
-			$("."+className+" .lucene-table>table:first").css("top",0);
+			$("."+className+" .lucene-table>table:first").css("top",'64px');
 			thisFlag = false;
 		}
 	});

+ 28 - 39
src/web/staticres/js/index_content.js

@@ -29,37 +29,41 @@ $("#index .search .tips span").on("click",function(){
   if(i == 0){
     $("#zbIndex").attr("action", '/jylab/supsearch/index.html');
     $("#zbIndex .ser").attr("name",'keywords')
-   
+    $("#index .search .index_search_thikn").hide()
   }else{
     $("#zbIndex").attr("action", '/jylab/bidsearchforent/index.html');
     $("#zbIndex .ser").attr("name",'searchvalue')
   }
 })
 
-$("#index .ser").bind("input propertychange",function(){
-  if($("#zbIndex").attr("action") == '/jylab/bidsearchforent/index.html'){
-    debounce(thinkList($(this).val()),1000)
-  }
-})
-  
-function thinkList(entName){
+
+function thinkList(){
+  var entName = $("#index .ser").val()
   $.ajax({
         type: "POST",
         url: req_base + 'jylab/bidsearchforent/recList',
         data: {entName},
         success: function (result) {
-          var str = ''
-          result.recList.forEach(function(v,i){
-            str += `<li><a href="/article/indexcontent/${v._id}.html">${v.name}</a></li>`
-          })
-          $("#index .search .index_search_thikn ul").html(str)
-        }
+          if(result.recList){
+            $("#index .search .index_search_thikn").show()
+            var str = ''
+            result.recList.forEach(function(v,i){
+              str += `<li><a href="/jylab/bidsearchforent/index.html?searchvalue=${v.name}">${v.name}</a></li>`
+            })
+            $("#index .search .index_search_thikn ul").html(str)
+          }else{
+            $("#index .search .index_search_thikn").hide()
+          }
+          
+        },
   })
 }
 
 function debounce(fn,delay) {
   var timeout = null; // 创建一个标记用来存放定时器的返回值
   return function (e) {
+    console.log('----"dcs"----',"dcs");
+    
       // 每当用户输入的时候把前一个 setTimeout clear 掉
       clearTimeout(timeout); 
       // 然后又创建一个新的 setTimeout, 这样就能保证interval 间隔内如果时间持续触发,就不会执行 fn 函数
@@ -69,30 +73,15 @@ function debounce(fn,delay) {
   };
 }
 
- 
-  
-function comptime(firstDate,lastDate) {
-     var beginTime = firstDate;
-      var endTime = lastDate;
-       var beginTimes = beginTime.substring(0, 10).split('-');
-       var endTimes = endTime.substring(0, 10).split('-');
-   
-       beginTime = beginTimes[1] + '-' + beginTimes[2] + '-' + beginTimes[0] + ' ' + beginTime.substring(10, 19);
-       endTime = endTimes[1] + '-' + endTimes[2] + '-' + endTimes[0] + ' ' + endTime.substring(10, 19);
-   
-      alert(beginTime + "aaa" + endTime);
-       alert(Date.parse(endTime));
-       alert(Date.parse(beginTime));
-       var a = (Date.parse(endTime) - Date.parse(beginTime)) / 3600 / 1000;
-       if (a < 0) {
-           alert("endTime小!");
-       } else if (a > 0) {
-           alert("endTime大!");
-       } else if (a == 0) {
-           alert("时间相等!");
-       } else {
-           return 'exception'
-       }
- }
+$("#index .ser").bind("input propertychange",function(){
+  if($("#zbIndex").attr("action") == '/jylab/bidsearchforent/index.html'){
+    console.log('----1----',1);
+    debounce(thinkList(),500)
+  }
+})
   
+
+
+
+
 });

+ 19 - 3
src/web/staticres/pccss/index.css

@@ -57,6 +57,7 @@
 
 
 #index .search .index_search_thikn{
+  display: none;
   position: absolute;
   left: 50%;
   top: 134px;
@@ -191,16 +192,31 @@ font-size: 14px;
   display: flex;
   justify-content: space-between;
 }
-.jy-banner-l .carousel-indicators li{
+.jy-banner-l .carousel-indicators li,.jy-banner-r .carousel-indicators li{
  margin: 0 5px !important;
+ background-color: rgb(184, 182, 182);
+ border: 1px solid rgb(184, 182, 182);
+}
+.center-block{
+  position: relative;
+}
+.jy-banner-l .carousel-indicators li.active,.jy-banner-r .carousel-indicators li.active{
+  width: 10px !important;
+  height: 10px !important;
+  background-color:#007aff;
+  border: 1px solid #007aff !important;
 }
 #index .jy-banner .jy-banner-l,#index .jy-banner .jy-banner-r{
  width: 584px;
 }
+#index .jy-banner .carousel-inner{
+  height: 216px;
+  overflow: hidden;
+  border-radius: 8px;
+}
 #index .jy-banner .carousel-inner .item img{
   width: 584px;
   height: 216px;
-  border-radius: 8px;
 }
 
 #index .jy-area{
@@ -669,6 +685,7 @@ font-size: 14px;
 
 .jy-partners{
   width: 1204px;
+  height: 450px;
   margin: 0 auto 70px;
 }
 .jy-partners h3{
@@ -678,7 +695,6 @@ font-size: 14px;
 }
 .jy-partners ul{
   margin: -2px;
-  overflow: hidden;
   padding: 20px 0;
 }
 .jy-partners ul li{

+ 2 - 1
src/web/staticres/pccss/public-nav-1200.css

@@ -8,11 +8,12 @@
   background-color: rgba(255, 255, 255, 0.08);
   border-bottom: 1px solid rgba(255, 255, 255, 0.2);
   z-index: 101;
+  transition: all 0.3;
 }
 
 .public-nav .iner {
   width: 1200px;
-  height: 62px;
+  height: 63px;
   line-height: 63px;
   margin: 0 auto;
   position: relative;

+ 26 - 14
src/web/templates/common/pcbottom.html

@@ -70,18 +70,12 @@
                                 </div>
                             </li>
                             <li>
-                                <span></span>
-                                <div>
-                                    <img src='{{Msg "seo" "cdn"}}/images/pc/wxshare.png?v={{Msg "seo" "version"}}' alt="">
-                                    <p>扫码下载</p>
-                                </div>
+                                <span><a href="https://cdn-ali2.jianyu360.com/jyinstallpkg/pc/JianYu_for_Windows.exe?source=pc_index"></a></span>
+                                
                             </li>
                             <li>
-                                <span></span>
-                                <div>
-                                    <img src='{{Msg "seo" "cdn"}}/images/pc/wxshare.png?v={{Msg "seo" "version"}}' alt="">
-                                    <p>扫码下载</p>
-                                </div>
+                                <span><a href="https://cdn-ali2.jianyu360.com/jyinstallpkg/pc/JianYu_for_Mac.dmg?source=pc_index"></a></span>
+                                
                             </li>
                             <li>
                                 <span></span>
@@ -91,11 +85,11 @@
                                 </div>
                             </li>
                             <li>
-                                <span></span>
-                                <div>
+                                <span id="share-sqq" ></span>
+                                <!-- <div>
                                     <img src='{{Msg "seo" "cdn"}}/images/pc/wxshare.png?v={{Msg "seo" "version"}}' alt="">
                                     <p>扫码下载</p>
-                                </div>
+                                </div> -->
                             </li>
                         </ul>
                     </div>
@@ -105,6 +99,9 @@
         <div class="jy_renzheng">
             <div class="copyright" id="cpinfo">©2015-2021 jianyu360.com 版权所有 | <a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">京ICP备14030217号-3</a></div>
         </div>
+        <div class="bdsharebuttonbox">
+			<a href="#" id="bds_sqq" data-cmd="sqq" title="分享QQ好友">QQ</a>
+		</div>
 		<!-- <div style="position:relative" class="jy_imgright">
 			<div class="jy_QRtext">微信扫一扫<br>随时随地掌握招标信息</div>
 				<img id=bc_bottoming src="{{Msg "seo" "cdn"}}/images/yj-background.png"/>
@@ -128,6 +125,20 @@
         $(this).addClass('active')
         $(this).find('div').show()
     })
+    // qq分享
+    function pcShare(){
+	this.flag = false;
+	var thisCla = this;
+		if(!thisCla.flag){
+			loadJS("/js/bdshare.js?v=89860593.js?cdnversion="+~(-new Date()/36e5),function(){
+			});
+			$("#share-sqq").click(function(e){
+				document.getElementById('bds_sqq').click();
+			});
+			thisCla.flag = true;
+		}
+}
+new pcShare()
 </script>
 
 <div class="modal fade bidcommunity j-modal-dialog" id="bidcommunity"  tabindex="-1" role="dialog" aria-labelledby="bidcommunity" aria-hidden="true" >
@@ -213,7 +224,7 @@
         border: none;
         box-sizing: border-box;
         position: fixed;
-        z-index: 666;
+        z-index: 99;
         min-width: 56px;
         bottom: 108px;
         right: initial;
@@ -270,6 +281,7 @@
      .right-side-box > .right-side-item .text-customer {
         font-size: 13px;
         line-height: 16px;
+        height: 56px;
         text-align: center;
         color: #1D1D1D;
          margin-left: 0;

+ 33 - 21
src/web/templates/common/pchead.html

@@ -287,7 +287,7 @@
         top: 0;
     }
     #public-nav .iner .fl{
-        margin-left: 210px;
+        margin-left: 300px;
         display: flex;
         width: 360px;
         height: 100%;
@@ -326,20 +326,21 @@
     }
     #public-nav .iner .fl .search-box .public-nav-search{
         border: none;
-        background: url(/images/pc/public-search-white.png) no-repeat center center;
+        background: url(/images/pc/public-search-white.png) no-repeat center 22px;
         background-size: 20px;
         width: 20px;
         height: 100%;
     }
     #public-nav .iner .fl .search-box .public-nav-close{
         border: none;
-        background: url(/images/pc/public-close-white.png) no-repeat center center;
+        background: url(/images/pc/public-close-white.png) no-repeat center 24px;
         background-size: 30px;
         width: 30px;
         height: 100%;
         cursor: pointer
     }
     #public-nav .iner .fl .jynav-search{
+        font-size: 14px;
         width: 290px;
         height: 64px;
         color: #fff;
@@ -360,13 +361,14 @@
     }
     #public-nav[data-theme="light"] .iner .fl .jynav-search{
         color: #2F2B39;
+        font-style: 14px;
     }
     #public-nav[data-theme="light"] .iner .fl .search-box .public-nav-search{
-        background: url(/images/pc/public-search-grey.png) no-repeat center center;
+        background: url(/images/pc/public-search-grey.png) no-repeat center 22px;
         background-size: 20px;
     }
     #public-nav[data-theme="light"] .iner .fl .search-box .public-nav-close{
-        background: url(/images/pc/public-close-grey.png) no-repeat center center;
+        background: url(/images/pc/public-close-grey.png) no-repeat center 24px;
         background-size: 30px;
     }
     #public-nav[data-theme="light"]  .iner .fl .jy_nav_searchBtn{
@@ -374,7 +376,8 @@
         background-size: 20px;
     }
     #public-nav[data-theme="light"] .iner .fl .jynav-search::placeholder{
-        color: #ccc;   
+        color: #ccc;  
+        font-style: 14px; 
     }
     
 
@@ -848,7 +851,6 @@
     }
     ;(function () {
         function navInit(){
-            
             var $href = window.location.href;
             // theme判断 light(黑字,主色Logo)/默认dark(白字,透明Logo)
             var isEnableCheck = document.getElementsByTagName('meta')['enable-header']
@@ -862,14 +864,20 @@
                 var isLightTheme = lightThemeRegs.some(function (v) {
                     return $href.indexOf(v) !== -1
                 })
-                console.log('----1----',isLightTheme);
-                console.log('sdcsd')
                 
                 if (isLightTheme || isEnableCheck.getAttribute('theme') === 'light') {
+                    console.log(1234)
                     setNavTheme('light',1)
                 } else {
                     setNavTheme('dark')
                 }
+                if($href.indexOf('swordfish/integral/index')>-1){
+                    setNavTheme('dark')
+                    $("body").css({
+                        "height":"auto",
+                        "overflow":"hidden"
+                    })
+                }
                 var naParams = window.location.search
                 if(naParams.indexOf('?name=bbx_')>-1){
                     var urlArr = naParams.split('=')
@@ -896,18 +904,16 @@
             var hasPage = noFixedArr.some(function (v) {
                 return $href.indexOf(v) !== -1
             })
-            console.log('----hasPage----',hasPage);
-            
             if(hasPage){
                 $("#public-nav").css("position","relative")
                 setNavTheme('light',1)
             }
-            
         }
         navInit()
         
     })();
     function docScroll(e){
+        var $href = window.location.href;
         var opa = $(document).scrollTop() / 150
         var curTheme =$("#public-nav").attr('data-theme')
         if(opa >= 1){
@@ -915,14 +921,18 @@
             $(".loginBtn").css({"border-color":"#e0e0e0","color":"rgb(37, 38, 39)"});
             $(".loginBtn").attr("onmouseover","this.style.borderColor='#2cb7ca'; this.style.color='#2cb7ca';");
             $(".loginBtn").attr("onmouseout","this.style.borderColor='#e0e0e0'; this.style.color='#252627';");
-        }else if(firstTheme === 'dark'){
-            setNavTheme('dark',opa)
-            $(".loginBtn").css('color','#fff')
-            $(".loginBtn").attr("onmouseover","this.style.borderColor='#2cb7ca'; this.style.color='#2cb7ca';");
-		    $(".loginBtn").attr("onmouseout","this.style.borderColor='#fff'; this.style.color='#fff';");
+        }else {
+            if($href.indexOf('swordfish/integral/index')>-1){
+                setNavTheme('dark')
+            }
+            if(firstTheme === 'dark'){
+                setNavTheme('dark',opa)
+                $(".loginBtn").css('color','#fff')
+                $(".loginBtn").attr("onmouseover","this.style.borderColor='#2cb7ca'; this.style.color='#2cb7ca';");
+                $(".loginBtn").attr("onmouseout","this.style.borderColor='#fff'; this.style.color='#fff';");
+            }
         }
         
-        
     }
     window.addEventListener('scroll', docScroll, true)
     
@@ -940,9 +950,10 @@ $(function(){
         $("#public-nav .iner .fl .jy_nav_searchBtn").show()
     })
 
-    // 导航栏展示/关闭
+
+        // 导航栏展示/关闭
     var curTheme = 'light'
-    $("#public-nav .iner .jynav li").mouseenter(function(){
+    $("#public-nav .iner .jynav li").bind("mouseenter",function(){
          let l = $(this).find('.jynav-list').length;
          if(l > 0){
             $(this).siblings().find('.jynav-list').hide()
@@ -952,7 +963,8 @@ $(function(){
             $(".loginBtn").css({"borderColor":"#e0e0e0","color":'#252627'})
          }
     })
-    $("#public-nav .iner .jynav li").mouseleave(function(){
+    $("#public-nav .iner .jynav li").bind("mouseleave",function(){
+        setNavTheme(curTheme,1)
         docScroll()
         $("#public-nav .iner .jynav li").find('.jynav-list').hide()
     })

+ 1 - 1
src/web/templates/frontRouter/pc/page_big_pc/sess/index.html

@@ -69,7 +69,7 @@
         }
         .page--docs--index .page-container {
             min-height: calc(100vh - 364px);
-            padding-top: 77px;
+            padding-top: 64px;
             box-sizing: border-box;
         }
     </style>

+ 1 - 1
src/web/templates/pc/biddetail_rec.html

@@ -262,7 +262,7 @@ function isWechat() {
     }
 }
 </script>
-<div class="j-content">
+<div class="j-content" style="padding-top: 0px;">
 <div class="main-content" style="width: 1200px; position: relative; margin: 0 auto">
 	<div class="biddetail-content" style="width:980px; margin-left:0px;">
 		<div class="com-title" id="com-title">

+ 89 - 53
src/web/templates/pc/index.html

@@ -135,7 +135,7 @@
           <i></i>
         </div>
 			</div>
-      
+
       <div class="projectList">
         <ul>
           <li>
@@ -188,11 +188,12 @@
               <li class="zxs">
                 {{range $i, $v := .T.labUrl_1}}
                     {{range $y, $x := $v}}
-                      {{if eq (len $x) 2}}
+                      {{if lt (len $x) 3}}
                         {{range $yi, $xi := $x}}
                           {{if eq $yi 0}}<a href="{{$xi.url}}" target="_blank">{{ $xi.city }}</a>{{end}}
                         {{end}}
                       {{end}}
+                      
                   {{end}}
                 {{end}}
               </li>
@@ -238,12 +239,9 @@
               {{range $i, $v := .T.labUrl_3}}
                <li class="provice industry">
                   {{range $y, $x := $v}}
+                  <a href="javascript:;" target="_blank">{{$y}}</a><div>
                      {{range $yi, $xi := $x}}
-                        {{if eq $yi 0}}<a href="{{$xi.url}}" target="_blank">{{$xi.key}}</a>
-                        <div>
-                        {{else}}
                         <span><a href="{{$xi.url}}" target="_blank">{{$xi.key}}</a></span>
-                        {{end}}
                      {{end}}
                   {{end}}
                 </div></li>
@@ -274,7 +272,7 @@
                     <span class="light">{{$v.subtype}}</span>
                     {{if $v.industry}}<span>{{$v.industry}}</span>{{end}}
                     {{if $v.area}}<span>{{$v.area}}</span>{{end}}
-                    {{if $v.butget}} <span>{{$v.butget}}</span>{{end}}
+                    {{if $v.budget}} <span>{{$v.budget}}</span>{{end}}
                     <strong >{{$v.publishtime}}</strong>
                   </div></a></li> 
                 {{end}} 
@@ -290,7 +288,7 @@
                     <span class="light">{{$v.subtype}}</span>
                     {{if $v.area}}<span>{{$v.area}}</span>{{end}}
                     {{if $v.industry}}<span>{{$v.industry}}</span>{{end}}
-                    {{if $v.butget}} <span>{{$v.butget}}</span>{{end}}
+                    {{if $v.budget}} <span>{{$v.budget}}</span>{{end}}
                     <strong >{{$v.publishtime}}</strong>
                   </div></a></li> 
                 {{end}} 
@@ -305,7 +303,7 @@
                     <span class="light">{{$v.subtype}}</span>
                     {{if $v.area}}<span>{{$v.area}}</span>{{end}}
                     {{if $v.industry}}<span>{{$v.industry}}</span>{{end}}
-                    {{if $v.butget}} <span>{{$v.butget}}</span>{{end}}
+                    {{if $v.budget}} <span>{{$v.budget}}</span>{{end}}
                     <strong >{{$v.publishtime}}</strong>
                   </div></a></li> 
                 {{end}} 
@@ -320,7 +318,7 @@
                     <span class="light">{{$v.subtype}}</span>
                     {{if $v.area}}<span>{{$v.area}}</span>{{end}}
                     {{if $v.industry}}<span>{{$v.industry}}</span>{{end}}
-                    {{if $v.butget}} <span>{{$v.butget}}</span>{{end}}
+                    {{if $v.budget}} <span>{{$v.budget}}</span>{{end}}
                     <strong >{{$v.publishtime}}</strong>
                   </div></a></li> 
                 {{end}} 
@@ -716,75 +714,115 @@ var timer=null,timer1 = null
               },1000/20)
         })
 
+
+
+var showDay = localStorage.tc;
+if(adv_img!=""){
+  if(localStorage.tc === undefined){
+  	$("#index_tc").css("display","block");
+  	$("#close2x").css("display","block");
+  	$(".tans").css("display","block");
+  }else{
+  	if(showDay != day){
+  		$("#index_tc").css("display","block");
+  		$("#close2x").css("display","block");
+  		$(".tans").css("display","block");
+  	}else{
+  		$("#index_tc").css("display","none");
+  		$("#close2x").css("display","none");
+  		$(".tans").css("display","none");
+  	}
+  }
+}
+
 // 广告轮播
 var str_left_img = "",str_left_ = "",left_img_index = -1;
 {{$s:=(Ad "jy-pc-index-leftad" -1)}}
 {{range $t,$v := $s}}
-  left_img_index += 1
   var left_img = {{$v}}
-  console.log('----left_img----',left_img);
-  
-  if(left_img_index == 0){
-    str_left_img  += `<div class="item active">`
-    str_left_ += `<li class="active" data-target="#slidershow" data-slide-to="${left_img_index}"></li>`
-  }else{
-    str_left_img  += `<div class="item">`
-    str_left_ += `<li  data-target="#slidershow" data-slide-to="${left_img_index}"></li>`
-  }  
-  if(left_img.s_picalt){
-    str_left_img += `<a href="${left_img.s_picalt}"><img src="${left_img.s_pic}" alt="..."></a>
-                </div>`
-  }else{
-    str_left_img += `<span><img src="${left_img.s_pic}" alt="..."></span>
-                </div>`
-  }       
+  var nowTime = new Date().getTime();
+  var stTime = nowTime -1000,etTime = nowTime + 1000
+  if (left_img.o_extend.startTime!=undefined){
+    var stArr = left_img.o_extend.startTime.split("-");
+    if (stArr.length==6){
+      var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
+       stTime = new Date(stStr).getTime();
+    }
+  }
+  if (left_img.o_extend.endTime!=undefined){
+    var etArr = left_img.o_extend.endTime.split("-");
+    if (etArr.length==6){
+      var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
+      etTime = new Date(etStr).getTime();
+      
+    }
+  }
+  if(nowTime>stTime && etTime>nowTime){
+    left_img_index += 1
+    if(left_img_index == 0){
+      str_left_img  += `<div class="item active">`
+      str_left_ += `<li class="active" data-target="#slidershow" data-slide-to="${left_img_index}"></li>`
+    }else{
+      str_left_img  += `<div class="item">`
+      str_left_ += `<li  data-target="#slidershow" data-slide-to="${left_img_index}"></li>`
+    }  
+    if(left_img.s_link){
+      str_left_img += `<a href="${left_img.s_link}"><img src="${left_img.s_pic}" alt="..."></a>
+                  </div>`
+    }else{
+      str_left_img += `<span><img src="${left_img.s_pic}" alt="..."></span>
+                  </div>`
+    } 
+  }      
 {{end}}
+console.log('----str_left_img----',str_left_img);
+
 $(".jy-banner-l .carousel-inner").html(str_left_img)
 $(".jy-banner-l  .carousel-indicators").html(str_left_)
 
 var str_right_img = "",right_img_index = -1,str_right_ = '';
 {{$s:=(Ad "jy-pc-index-rightad" -1)}}
 {{range $t,$v := $s}}
-  right_img_index += 1
-  var right_img = {{$v}}
-  if(right_img_index == 0){
+var right_img = {{$v}}
+var stTime = nowTime -1000,etTime = nowTime + 1000
+  if (right_img.o_extend.startTime!=undefined){
+    var stArr = right_img.o_extend.startTime.split("-");
+    if (stArr.length==6){
+      var stStr = stArr[0]+"-"+stArr[1]+"-"+stArr[2]+" "+stArr[3]+":"+stArr[4]+":"+stArr[5]
+       stTime = new Date(stStr).getTime();
+    }
+  }
+  if (right_img.o_extend.endTime!=undefined){
+    var etArr = right_img.o_extend.endTime.split("-");
+    if (etArr.length==6){
+      var etStr = etArr[0]+"-"+etArr[1]+"-"+etArr[2]+" "+etArr[3]+":"+etArr[4]+":"+etArr[5]
+      etTime = new Date(etStr).getTime();
+      
+    }
+  }
+  
+  if(nowTime>stTime && etTime>nowTime){
+    right_img_index += 1
+    if(right_img_index == 0){
     str_right_img  += `<div class="item active">`
       str_right_ += `<li class="active" data-target="#slidershow" data-slide-to="${left_img_index}"></li>`
   }else{
     str_right_img  += `<div class="item">`
       str_right_ += `<li  data-target="#slidershow" data-slide-to="${left_img_index}"></li>`
   }
-  if(right_img.s_picalt){
-    str_right_img += `<a href="${right_img.s_picalt}"><img src="${right_img.s_pic}" alt="..."></a>
+  if(right_img.s_link){
+    str_right_img += `<a href="${right_img.s_link}"><img src="${right_img.s_pic}" alt="..."></a>
                 </div>`
   }else{
     str_right_img += `<span><img src="${right_img.s_pic}" alt="..."></span>
                 </div>`
   }
+  }
   
 {{end}}
 $(".jy-banner-r .carousel-inner").html(str_right_img)
 $(".jy-banner-r  .carousel-indicators").html(str_right_)
 
-var showDay = localStorage.tc;
-if(adv_img!=""){
-  if(localStorage.tc === undefined){
-  	$("#index_tc").css("display","block");
-  	$("#close2x").css("display","block");
-  	$(".tans").css("display","block");
-  }else{
-  	if(showDay != day){
-  		$("#index_tc").css("display","block");
-  		$("#close2x").css("display","block");
-  		$(".tans").css("display","block");
-  	}else{
-  		$("#index_tc").css("display","none");
-  		$("#close2x").css("display","none");
-  		$(".tans").css("display","none");
-  	}
-  }
-}
-
 
 
 //广告轮播
@@ -820,7 +858,6 @@ $(".jy-area .tab-header span").on('click',function(){
 })
 
 // 最新咨询
-console.log($(".newLatest .newLatest-content ul li a .times").length)
 var newL = $(".newLatest .newLatest-content ul li a .times").length
 var newEl = $(".newLatest .newLatest-content ul li a .times");
 newEl.attr('dates')
@@ -829,7 +866,6 @@ for(let i= 0; i < newL; i++){
   newEl.eq(i).find('i').text(newDates[1])
   newEl.eq(i).find('span').text(newDates[2])
 }
-console.log('--------',newEl.attr('dates'));
 
 
 $("#close2x").click(function () {