feat:首页关联页面修改

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",

src/web/staticres/css/pc.css

@@ -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;
+	right: -78px;
 	top: 4px;
 	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;

src/web/staticres/js/index_content.js

@@ -29,7 +29,7 @@ $("#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')
@@ -38,7 +38,7 @@ $("#index .search .tips span").on("click",function(){
 
 $("#index .ser").bind("input propertychange",function(){
   if($("#zbIndex").attr("action") == '/jylab/bidsearchforent/index.html'){
-    debounce(thinkList($(this).val()),1000)
+    debounce(thinkList($(this).val()),500)
   }
 })
   
@@ -48,12 +48,18 @@ function thinkList(entName){
         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="/article/indexcontent/${v._id}.html">${v.name}</a></li>`
+            })
+            $("#index .search .index_search_thikn ul").html(str)
+          }else{
+            $("#index .search .index_search_thikn").hide()
+          }
+          
+        },
   })
 }
 
@@ -69,30 +75,6 @@ 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'
-       }
- }
-  
+
+
 });

src/web/staticres/pccss/index.css

@@ -57,6 +57,7 @@
 
 
 #index .search .index_search_thikn{
+  display: none;
   position: absolute;
   left: 50%;
   top: 134px;
@@ -193,6 +194,14 @@ font-size: 14px;
 }
 .jy-banner-l .carousel-indicators li{
  margin: 0 5px !important;
+ background-color: rgb(184, 182, 182);
+ border: 1px solid rgb(184, 182, 182);
+}
+.jy-banner-l .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;

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>
@@ -128,6 +122,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" >

src/web/templates/common/pchead.html

@@ -862,10 +862,11 @@
                 var isLightTheme = lightThemeRegs.some(function (v) {
                     return $href.indexOf(v) !== -1
                 })
-                console.log('----1----',isLightTheme);
+                console.log('----1----',isLightTheme,isEnableCheck.getAttribute('theme') === 'light');
                 console.log('sdcsd')
                 
                 if (isLightTheme || isEnableCheck.getAttribute('theme') === 'light') {
+                    console.log(1234)
                     setNavTheme('light',1)
                 } else {
                     setNavTheme('dark')
@@ -896,8 +897,6 @@
             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)

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>

src/web/templates/pc/index.html

@@ -135,7 +135,7 @@
           <i></i>
         </div>
 			</div>
-      
+
       <div class="projectList">
         <ul>
           <li>
@@ -236,14 +236,17 @@
           <div class="tab-content-area">
             <ul>
               {{range $i, $v := .T.labUrl_3}}
+              <script>
+                console.log({{$v}})
+              </script>
                <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 +277,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 +293,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 +308,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 +323,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,6 +719,27 @@ 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)}}
@@ -731,8 +755,31 @@ var str_left_img = "",str_left_ = "",left_img_index = -1;
     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>
+  // var nowTime = new Date().getTime();
+  // 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]
+  //     var stTime = new Date(stStr).getTime();
+  //     //未开始
+  //     if (stTime>nowTime){
+  //       continue
+  //     }
+  //   }
+  // }
+  // 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]
+  //     var etTime = new Date(etStr).getTime();
+  //     //已结束
+  //     if (etTime<nowTime){
+  //       continue
+  //     }
+  //   }
+  // }
+  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>
@@ -754,8 +801,8 @@ var str_right_img = "",right_img_index = -1,str_right_ = '';
     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>
@@ -766,25 +813,6 @@ var str_right_img = "",right_img_index = -1,str_right_ = '';
 $(".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");
-  	}
-  }
-}
-
 
 
 //广告轮播