分支合并

src/jfw/modules/entsesearch/src/web/staticres/jylab/entsesearch/js/login.js

@@ -80,6 +80,7 @@ var getNewShareId = function(num){
 			redisUserInfo(pageshareid,kopshareid);
 			$(".jyhead_qr img").attr("src","/front/share/"+pageshareid);
 			$("#bottomimg").attr("src","/front/share/"+pageshareid);
+      $("*[data-share-img]").attr("src","/front/share/"+pageshareid);
 			$("#layerImg-login").attr("src","/front/share/"+pageshareid);
 			$("#layerImg-zbsq").attr("src","/front/share/"+pageshareid);
 			switch(num){
@@ -155,7 +156,7 @@ var logic = function(shareid,num){
 			if(data.result=="ok"){
 				//$(".QRLogin").hide();
 				$("#bidLogin").modal("hide")
-				$("#bidcommunity").modal("hide")				
+				$("#bidcommunity").modal("hide")
 				clearInterval(loginfg);
 				processpage(shareid,num);
 				loginflag = true;
@@ -183,12 +184,12 @@ var logic = function(shareid,num){
 								+"</div>"
 								+"<div class='exitDiv' onclick='signout()'>"
 									+"<img id='outImg' src='/images/userexit.png'/>"
-									+"<span>退出</span>"	
+									+"<span>退出</span>"
 								+"</div>"
 							+"</div>"
-						+"</div>"	
+						+"</div>"
 				$("#login").html(hhtml);
-				infoListCss();	
+				infoListCss();
 				commonMouseEvent();
 			}
 		})
@@ -318,10 +319,10 @@ $.post("/front/hasSign",function(data, location){
 					+"</div>"
 					+"<div class='exitDiv' onclick='signout()'>"
 						+"<img id='outImg' src='/images/userexit.png'/>"
-						+"<span>退出</span>"	
+						+"<span>退出</span>"
 					+"</div>"
 				+"</div>"
-			+"</div>"	
+			+"</div>"
 		$("#login").html(hhtml);
 		infoListCss();
 		commonMouseEvent();
@@ -336,4 +337,4 @@ $.post("/front/hasSign",function(data, location){
 		kzyflag = true;//未登录进入快照页面
 		}
 	})
-}
+}

src/jfw/modules/portrait/src/web/staticres/portrait/login.js

@@ -1,7 +1,7 @@
 /**统一登录js文件**/
 var loginfg='';//websocket请求标识
 var bIE9=false;
-if(navigator.appName == "Microsoft Internet Explorer" && navigator.appVersion.match(/[6789]./i)) { 
+if(navigator.appName == "Microsoft Internet Explorer" && navigator.appVersion.match(/[6789]./i)) {
 	bIE9=true
 }
 var wsUrl = "ws"+(!bIE9&&"https:"==document.location.protocol?"s":"")+"://"+window.location.host+"/ws";
@@ -28,7 +28,7 @@ var entjumpflag = false;
 //页面是否被切换走
 var isPageHidden = false;
 try{
-	if(window.addEventListener) {    
+	if(window.addEventListener) {
 		document.addEventListener('visibilitychange',function () {
 		    if(document.hidden){
 				isPageHidden = true;
@@ -36,7 +36,7 @@ try{
 				isPageHidden = false;
 		    }
 		});
-	} 
+	}
 }catch(e){}
 //心跳检测
 var WebSocketHeartCheck = function(scoketType){
@@ -240,6 +240,7 @@ var getNewShareId = function(num){
 			//redisUserInfo(pageshareid,kopshareid);
 			$(".jyhead_qr img").attr("src","/front/share/"+pageshareid);
 			$("#bottomimg").attr("src","/front/share/"+pageshareid);
+      $("*[data-share-img]").attr("src","/front/share/"+pageshareid);
 			$("#layerImg-login").attr("src","/front/share/"+pageshareid);
 			$("#layerImg-zbsq").attr("src","/front/share/"+pageshareid);
 			switch(num){
@@ -303,7 +304,7 @@ var getNewShareId = function(num){
 					}
 					break;
 				case "20"://商务合作
-					
+
 					break;
 			}
 			if(num=="13"&&!kzyflag){
@@ -336,7 +337,7 @@ var logic = function(data,num){
 	if(data.result=="ok"){
 		//$(".QRLogin").hide();
 		$("#bidLogin").modal("hide")
-		$("#bidcommunity").modal("hide")				
+		$("#bidcommunity").modal("hide")
 		clearInterval(loginfg);
 		loginflag = true;
 		processpage(data.shareid,num);
@@ -369,10 +370,10 @@ var logic = function(data,num){
 						+"</div>"
 						+"<div class='exitDiv' onclick='signout()'>"
 							+"<img id='outImg' src='/images/userexit.png'/>"
-							+"<span>退出</span>"	
+							+"<span>退出</span>"
 						+"</div>"
 					+"</div>"
-				+"</div>"	
+				+"</div>"
 		$("#login").html(hhtml);
 		try{
 			infoListCss();
@@ -434,7 +435,7 @@ var processpage = function(shareid,num){
 			if(ful=="true"){
 				break;
 			}
-			
+
 			$("#myModal").modal("hide");
 			$("#labModal").modal("hide");
 			if(dataId!=""){
@@ -623,10 +624,10 @@ var haslogin = function(num,kyorpn,url){
 						+"</div>"
 						+"<div class='exitDiv' onclick='signout()'>"
 							+"<img id='outImg' src='/images/userexit.png'/>"
-							+"<span>退出</span>"	
+							+"<span>退出</span>"
 						+"</div>"
 					+"</div>"
-				+"</div>"	
+				+"</div>"
 			$("#login").html(hhtml);
 			try{
 				infoListCss();
@@ -671,7 +672,7 @@ function getlabstatus(){
         type:'post',
         url:'/jylab/supsearch/getstatus',
         async:false,
-        dataType:'json', 
+        dataType:'json',
         success:function(r){
 				if(r&&r.supstatus){
 					$(".superSearch").hide();
@@ -720,4 +721,4 @@ function changeEntAndSupStatus(w){
 	}
 	$.post("/jylab/changeEntAndSupStatus",{"data":data},function(){})
 
-}
+}

src/web/staticres/js/index_content.js

@@ -3,9 +3,6 @@ if(location.origin.indexOf('jianyu360.com') > 0 ){
   req_base = location.origin + '/';
 }
 
-console.log("---------最新资讯---------")
-
-
 
 
 function changeHorse(timp) {
@@ -22,7 +19,7 @@ $(function () {
 $("#index .search .tips span").on("click",function(){
   let i = $(this).index();
   $(this).parent().find('i').animate({
-    left: 14+(90*i) +'px'
+    left: 14+(95*i) +'px'
   },200)
   $("#index .search .tips span").removeClass('active')
   $(this).addClass('active')
@@ -30,9 +27,11 @@ $("#index .search .tips span").on("click",function(){
     $("#zbIndex").attr("action", '/jylab/supsearch/index.html');
     $("#zbIndex .ser").attr("name",'keywords')
     $("#index .search .index_search_thikn").hide()
+    $("#zbIndex input").attr('placeholder', '请输入您想要查询的招标信息')
   }else{
     $("#zbIndex").attr("action", '/jylab/bidsearchforent/index.html');
     $("#zbIndex .ser").attr("name",'searchvalue')
+    $("#zbIndex input").attr('placeholder', '请输入中标企业名称')
   }
 })
 
@@ -54,7 +53,7 @@ function thinkList(){
           }else{
             $("#index .search .index_search_thikn").hide()
           }
-          
+
         },
   })
 }
@@ -62,10 +61,8 @@ function thinkList(){
 function debounce(fn,delay) {
   var timeout = null; // 创建一个标记用来存放定时器的返回值
   return function (e) {
-    console.log('----"dcs"----',"dcs");
-    
       // 每当用户输入的时候把前一个 setTimeout clear 掉
-      clearTimeout(timeout); 
+      clearTimeout(timeout);
       // 然后又创建一个新的 setTimeout, 这样就能保证interval 间隔内如果时间持续触发，就不会执行 fn 函数
       timeout = setTimeout(() => {
           fn.apply(this, arguments);
@@ -78,9 +75,9 @@ $("#index .ser").bind("input propertychange",function(){
     debounce(thinkList(),500)
   }
 })
-  
 
 
 
 
-});
+
+});

src/web/staticres/js/login.js

@@ -200,6 +200,7 @@ var getNewShareId = function(num,isFirst){
 			//redisUserInfo(pageshareid,kopshareid);
 			$(".jyhead_qr img").attr("src","/front/share/"+pageshareid);
 			$("#bottomimg").attr("src","/front/share/"+pageshareid);
+			$("*[data-share-img]").attr("src","/front/share/"+pageshareid);
 			$("#layerImg-login").attr("src","/front/share/"+pageshareid);
 			$("#layerImg-zbsq").attr("src","/front/share/"+pageshareid);
 			switch(num){
@@ -235,6 +236,7 @@ var getNewShareId = function(num,isFirst){
 					break;
 				case "14"://标签页面
 					$("#bottomimg").attr("src","/front/share/"+pageshareid);
+          $("*[data-share-img]").attr("src","/front/share/"+pageshareid);
 					$("#layerImg").attr("src","/front/share/"+pageshareid);
 					$("#keyImg").attr("src","/front/share/"+pageshareid);
 					break;

src/web/templates/big-member/pc/page_index.html

@@ -963,6 +963,18 @@
     $(".tab-nav-box--slider").each(function() {
         computeSliderStyle.bind(this)()
     })
+    function recoverNameMark () {
+      var name = getParam('name')
+      if (name) {
+        name = name.split('_')
+      }
+      try {
+        $('#'+name[0]+' .tab-nav-item').eq(name[1]).trigger('click')
+      } catch (e) {
+        console.warn('recover name mark error !')
+      }
+    }
+    recoverNameMark()
 </script>
 <script>
     var pageUserInfo = {
@@ -1034,7 +1046,7 @@
                 openLoginDig()
                 return
             }
-            
+
               var buy_ontrial_href ='/big/pc/page/custom';
               if(source!=null&&source!=undefined){
                 buy_ontrial_href+="?source="+source;//baidusem
@@ -1058,7 +1070,7 @@
             } catch (e) {
               console.log('未初始化百度统计')
             }
-            /* 
+            /*
               // 原功能演示代码
               var scaleRote = document.documentElement.clientHeight / 700
               $("#iphoneX-box").css('transform', 'scale('+(scaleRote > 1 ? 1 : scaleRote)+')')

src/web/templates/common/pcbottom.html

@@ -65,22 +65,22 @@
                             <li class="active">
                                 <span></span>
                                 <div>
-                                    <img src='{{Msg "seo" "cdn"}}/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
+                                    <img src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
                                     <p>扫码下载</p>
                                 </div>
                             </li>
                             <li>
-                                <span><a href="https://cdn-ali2.jianyu360.com/jyinstallpkg/pc/JianYu_for_Windows.exe?source=pc_index"></a></span>
+                                <span><a href='{{Msg "seo" "pcHelper.downloadUrl_win"}}?source=pc_index'></a></span>
 
                             </li>
                             <li>
-                                <span><a href="https://cdn-ali2.jianyu360.com/jyinstallpkg/pc/JianYu_for_Mac.dmg?source=pc_index"></a></span>
+                                <span><a href='{{Msg "seo" "pcHelper.downloadUrl_mac"}}?source=pc_index'></a></span>
 
                             </li>
                             <li>
                                 <span></span>
                                 <div>
-                                    <img src="/front/share/NQw2JDBFBAIAAEJeRVhSQwoDBwZNOCo/" alt="">
+                                    <img data-share-img src="/front/share/10" alt="">
                                     <p>扫码关注</p>
                                 </div>
                             </li>
@@ -530,7 +530,7 @@ new pcShare()
         <span class=" text-customer"><img src='{{Msg "seo" "cdn"}}/images/pc/slide_wx_grey.png?v={{Msg "seo" "version"}}' alt=""></span>
         <span class="text-customer text-customer-hover"><img src='{{Msg "seo" "cdn"}}/images/pc/slide_wx.png?v={{Msg "seo" "version"}}' alt=""></span>
         <div class="slidePop">
-            <img src='{{Msg "seo" "cdn"}}/images/pc/wxshare.png?v={{Msg "seo" "version"}}' alt="">
+            <img data-share-img src="/front/share/10" alt="">
             <p>微信扫码关注</p>
         </div>
     </div>

src/web/templates/common/pchead.html

@@ -147,6 +147,12 @@
     </div>
 </div>
 <script>
+     var jyTempLog = window.console.log
+     if (window.localStorage.getItem('log') === '1') {
+        window.console.log = jyTempLog
+     } else {
+        window.console.log = () => null
+     }
     function getCookieValue(name) {
         var result = document.cookie.match("(^|[^;]+)\\s*" + name + "\\s*=\\s*([^;]+)")
         return result ? result.pop() : ""
@@ -376,10 +382,10 @@
         background-size: 20px;
     }
     #public-nav[data-theme="light"] .iner .fl .jynav-search::placeholder{
-        color: #ccc;  
-        font-style: 14px; 
+        color: #ccc;
+        font-style: 14px;
     }
-    
+
 
     #public-nav .iner .jynav{
         position: relative;
@@ -421,12 +427,12 @@
         width: 186px;
         position: absolute;
         left: 50%;
-        transform: translate(-50%, 0%); 
+        transform: translate(-50%, 0%);
         line-height: 34px;
         padding: 24px;
         background: #fff;
         border-radius: 0px 0px 4px 4px;
-        box-shadow: 0px 6px 8px 0px rgba(0,0,0,0.08); 
+        box-shadow: 0px 6px 8px 0px rgba(0,0,0,0.08);
         font-size: 14px;
         display: none;
         text-align: left;
@@ -660,12 +666,12 @@
                 <form method="post" action="/jylab/supsearch/index.html" id="public_header">
                     <input class="jynav-search" autocomplete="off" placeholder="请输入您想要查询的招标信息" value="" type="text" name="keywords" />
                     <input type="hidden" name="searchvalue">
-                    <button class="public-nav-search" type="submit" onclick="zbSeatch('public_header')" ></button><i>|</i> 
+                    <button class="public-nav-search" type="submit" onclick="zbSeatch('public_header')" ></button><i>|</i>
                     <span class="public-nav-close search-close"></span>
                 </form>
             </div>
            <span class="jy_nav_searchBtn">
-                
+
             </span>
         </div>
 		<div class="fr">
@@ -701,13 +707,13 @@
                         <span name="中标必听课"><a href="/jyxspc">中标必听课</a></span>
                         <span class="discount" name="招标文件解读"><a href="/bid/pc/page/bidfile_landpage">招标文件解读</a></span>
                         <span name="剑鱼文库"><a href="/swordfish/docs">剑鱼文库</a></span>
-                        <span name="bbx_0"><a href="/big/page/index?name=0#zb">中标预测</a></span>
-                        <span name="bbx_1"><a href="/big/page/index?name=bbx_1#qz">潜在客户挖掘</a></span>
-                        <span name="bbx_2"><a href="/big/page/index?name=bbx_2#qz">潜在合作伙伴挖掘</a></span>
-                        <span name="bbx_3"><a href="/big/page/index?name=bbx_3#jc">投标决策分析</a></span>
-                        <span name="bbx_4"><a href="/big/page/index?name=bbx_4#jc">竞争对手分析</a></span>
-                        <span name="bbx_5"><a href="/big/page/index?name=bbx_5#fx">市场分析</a></span>
-                        <span name="bbx_6"><a href="/big/page/index?name=bbx_6#fx">客户分析</a></span>
+                        <span name="bbx_0"><a href="/big/page/index#jc">中标预测</a></span>
+                        <span name="bbx_1"><a href="/big/page/index#qz">潜在客户挖掘</a></span>
+                        <span name="bbx_2"><a href="/big/page/index?name=qz_1#qz">潜在合作伙伴挖掘</a></span>
+                        <span name="bbx_3"><a href="/big/page/index#jc">投标决策分析</a></span>
+                        <span name="bbx_4"><a href="/big/page/index#fx">竞争对手分析</a></span>
+                        <span name="bbx_5"><a href="/big/page/index#fx">市场分析</a></span>
+                        <span name="bbx_6"><a href="/big/page/index?name=fx_2#fx">客户分析</a></span>
                     </div>
 				</li>
                 <li  name="联系我们">
@@ -835,14 +841,14 @@
                 el.style.background = 'rgba(255,255,255,'+ opa +')'
             }else{
                 el.style.background = 'rgba(255,255,255,'+ baseOpa +')'
-            } 
+            }
             if(firstPage){
                 firstPage = false;
                 firstTheme = el.getAttribute('data-theme')
             }
         }
-       
-        
+
+
     }
     function trySelectNav (name) {
         try {
@@ -868,15 +874,13 @@
                 var isLightTheme = lightThemeRegs.some(function (v) {
                     return $href.indexOf(v) !== -1
                 })
-                
+
                 if (isLightTheme || isEnableCheck.getAttribute('theme') === 'light') {
                     console.log(1234)
                     setNavTheme('light',1)
                 } else {
                     setNavTheme('dark')
                 }
-                console.log('----$href----',window.location.pathname);
-                
                 if(window.location.pathname == ('/swordfish/integral/index')){
                     setNavTheme('dark')
                     $("body").css({
@@ -902,7 +906,7 @@
             if(isEnableCheck.content != '首页'){
                 $("#public-nav .iner .jy_nav_searchBtn").hide();
                 $("#public-nav .iner .search-box").fadeIn()
-                
+
             }
 
             // 导航栏是否固定
@@ -916,7 +920,7 @@
             }
         }
         navInit()
-        
+
     })();
     function docScroll(e){
         var $href = window.location.href;
@@ -938,11 +942,11 @@
                 $(".loginBtn").attr("onmouseout","this.style.borderColor='#fff'; this.style.color='#fff';");
             }
         }
-        
+
     }
     window.addEventListener('scroll', docScroll, true)
-    
-    
+
+
 
 $(function(){
 

src/web/templates/pc/index.html

@@ -465,7 +465,7 @@
               <img src='{{Msg "seo" "cdn"}}/images/pc/yitu.png?v={{Msg "seo" "version"}}" alt="' />
             </li>
             <li>
-              <img src='{{Msg "seo" "cdn"}}/images/pc/zhongtong.png?v={{Msg "seo" "version"}}" alt="' />
+              <img src='{{Msg "seo" "cdn"}}/images/pc/dekey.png?v={{Msg "seo" "version"}}" alt="' />
             </li>
             <li>
               <img src='{{Msg "seo" "cdn"}}/images/pc/zhonghui.png?v={{Msg "seo" "version"}}" alt="' />
@@ -524,7 +524,6 @@
     <script type="text/javascript" src='{{Msg "seo" "cdn"}}/js/index_content.js?v={{Msg "seo" "version"}}'></script>
     <script>
       var onlineData_arr = [{{.T.infoNum.i_push}},{{.T.infoNum.i_bidmonth}},{{.T.infoNum.i_bidtoday}}]
-      console.log(onlineData_arr)
       var onlineData_arr1 = []
       onlineData_arr.forEach(function(v,i){
         v = Number(v.replace(/,/g,''))
@@ -775,8 +774,6 @@ var str_left_img = "",str_left_ = "",left_img_index = -1;
     }
   }
 {{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_)