Merge branch 'release' into dev4.6.1.1

src/jfw/modules/followent/src/web/templates/_error.html

@@ -518,7 +518,7 @@ function infoListCss(){
 			</div>
 			<div class="jy_renzheng">
 				<div class="jy_otherlink"><a href="/" target="_bank">剑鱼标讯</a>|<a href="/swordfish/searchinfolist.html">招标搜索</a>|<a  data-toggle="modal" data-target="#bidcommunity">招标社区</a>|<a href="/jyblog/index.html" target="_bank">剑鱼标讯博客</a>|<a href="/front/aboutus.html">关于我们</a>|<a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a></div>
-				<div style="color: #B9B9BB;" id="cpinfo">©2015-2016 jianyu360.com 版权所有 | 豫ICP备15016539号-2</div>
+				<div style="color: #B9B9BB;" id="cpinfo" class="copyright">©2015-2021 jianyu360.com 版权所有 | 豫ICP备15016539号-2</div>
 			</div>
 		</div>
 		<div style="position:relative" class="jy_imgright">
@@ -540,7 +540,7 @@ function infoListCss(){
 				</span>
 			</form>
 			<div><a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="/">剑鱼标讯</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a>|<a href="http://www.qmx.top/front/web_A_help.html" target="_bank">关于我们</a>|<a href="http://www.qmx.top/front/web_H_help.html" target="_bank">帮助中心</a></div>
-			<div>©2015-2016 jianyu360.com 版权所有 | 豫ICP备15016539号-2</div>
+			<div class="copyright">©2015-2021 jianyu360.com 版权所有 | 豫ICP备15016539号-2</div>
 		</div>
 		<div class="j-bottom-b">
 			<img src="/front/share/RV8=" alt="剑鱼标讯微信公众号"><br>
@@ -552,19 +552,36 @@ function infoListCss(){
 <img src="/images/pc_6.png" class="backTop" id="backTop">
 <script type="text/javascript">
 (function(){
-    var myhost = location.host;
-    var nowYear = new Date().getFullYear()
-    var copyrightMap = {
-        com: '京ICP备14030217号-3',
-        cn: '京ICP备2021020018号-1'
-    }
-	if(myhost.indexOf("jianyu360.com")>=0){
-		$("#cpinfo").html("©2015-" + nowYear + " jianyu360.com 版权所有 | " + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">'+ copyrightMap.com +'</a>')
-	}else if(myhost.indexOf("jianyu360.cn")>=0){
-		$("#cpinfo").html("©2015-" + nowYear + " jianyu360.cn 版权所有 | " + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">'+ copyrightMap.cn +'</a>')
-	}else{
-		$("#cpinfo").html("©2015-" + nowYear + " jianyu360.com 版权所有 | " + copyrightMap.com)
+	// 动态设置copyright
+	function setCopyRightForBottom (url) {
+		var host = url || location.host
+		var nowCopyRightInfo = {
+			rule: '',
+			icp: ''
+		}
+		var copyRightMap = [
+			{
+				rule: 'jianyu360.com',
+				icp: '京ICP备14030217号-3'
+			},
+			{
+				rule: 'jianyu360.cn',
+				icp: '京ICP备2021020018号-1'
+			},
+			{
+				rule: 'jianyubiaoxun.com',
+				icp: '京ICP备14030217号-8'
+			}
+		]
+		copyRightMap.forEach(function (v) {
+			if (host.indexOf(v.rule) !== -1) {
+				nowCopyRightInfo = v
+			}
+		})
+		var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + nowCopyRightInfo.icp + '</a>'
+		$('.copyright').html(copyright)
 	}
+	setCopyRightForBottom()
 
 	$(".j-bottom .jy_province font").click(function(){
 		var scope = $(this).text();

src/web/templates/_error.html

@@ -569,7 +569,7 @@ function infoListCss(){
 			</div>
 			<div class="jy_renzheng">
 				<div class="jy_otherlink"><a href="/" target="_bank">剑鱼标讯</a>|<a href="/front/subscribe.html">招标订阅</a>|<a href="/jylab/supsearch/index.html">招标搜索</a>|<a  data-toggle="modal" data-target="#bidcommunity">招标社区</a>|<a href="/jyblog/index.html" target="_bank">剑鱼标讯博客</a>|<a href="/front/busicooperation.html" target="_bank">商务合作</a>|<a href="/front/advservices.html" target="_bank">广告服务</a>|<a href="/front/aboutus.html">关于我们</a>|<a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a></div>
-				<div style="color: #B9B9BB;" class="copyright" id="cpinfo">©2015-2020 jianyu360.com 版权所有 |  <a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">京ICP备14030217号-3</a></div>
+				<div style="color: #B9B9BB;" 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>
 		<div style="position:relative" class="jy_imgright">
@@ -591,7 +591,7 @@ function infoListCss(){
 				</span>
 			</form>
 			<div class="jy_otherlink"><a href="/" target="_bank">剑鱼标讯</a>|<a href="/front/subscribe.html">招标订阅</a>|<a href="/jylab/supsearch/index.html">招标搜索</a>|<a  data-toggle="modal" data-target="#bidcommunity">招标社区</a>|<a href="/jyblog/index.html" target="_bank">剑鱼标讯博客</a>|<a href="/front/busicooperation.html" target="_bank">商务合作</a>|<a href="/front/advservices.html" target="_bank">广告服务</a>|<a href="/front/aboutus.html">关于我们</a>|<a href="http://www.qmx.top" target="_bank">企明星</a>|<a href="http://www.qmx.top/front/entCommunity.html" target="_bank">企业社区</a></div>
-			<div class="copyright">©2015-2020 jianyu360.com 版权所有 |  <a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">京ICP备14030217号-3</a></div>
+			<div class="copyright">©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="j-bottom-b">
 			<img src="/front/share/RV8=" alt="剑鱼标讯微信公众号"><br>
@@ -604,21 +604,36 @@ function infoListCss(){
 <script type="text/javascript">
 // ajax部分匿名函数自执行，防止泄露全局变量
 $(function(){
-    var host = location.host
-    var copyrightMap = {
-        com: '京ICP备14030217号-3',
-        cn: '京ICP备2021020018号-1'
-    }
-    // 动态设置copyright
-    var copyright = ''
-    if (host.indexOf('jianyu360.com') >= 0) {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
-    } else if (host.indexOf('jianyu360.cn') >= 0) {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.cn 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.cn + '</a>'
-    } else {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
-    }
-    $('.copyright').html(copyright)
+	// 动态设置copyright
+	function setCopyRightForBottom (url) {
+		var host = url || location.host
+		var nowCopyRightInfo = {
+			rule: '',
+			icp: ''
+		}
+		var copyRightMap = [
+			{
+				rule: 'jianyu360.com',
+				icp: '京ICP备14030217号-3'
+			},
+			{
+				rule: 'jianyu360.cn',
+				icp: '京ICP备2021020018号-1'
+			},
+			{
+				rule: 'jianyubiaoxun.com',
+				icp: '京ICP备14030217号-8'
+			}
+		]
+		copyRightMap.forEach(function (v) {
+			if (host.indexOf(v.rule) !== -1) {
+				nowCopyRightInfo = v
+			}
+		})
+		var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + nowCopyRightInfo.icp + '</a>'
+		$('.copyright').html(copyright)
+	}
+	setCopyRightForBottom()
 
   	$(".j-bottom .jy_province font").click(function(){
   		var scope = $(this).text();

src/web/templates/active/index_bak.html

@@ -120,21 +120,35 @@
 $(function(){
     haslogin({{.T.logid}});
     // 动态设置copyright
-    var host = location.host
-    var copyrightMap = {
-        com: '京ICP备14030217号-3',
-        cn: '京ICP备2021020018号-1'
-    }
-    // 动态设置copyright
-    var copyright = ''
-    if (host.indexOf('jianyu360.com') >= 0) {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
-    } else if (host.indexOf('jianyu360.cn') >= 0) {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.cn 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.cn + '</a>'
-    } else {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
-    }
-    $('.copyright').html(copyright)
+	function setCopyRightForBottom (url) {
+		var host = url || location.host
+		var nowCopyRightInfo = {
+			rule: '',
+			icp: ''
+		}
+		var copyRightMap = [
+			{
+				rule: 'jianyu360.com',
+				icp: '京ICP备14030217号-3'
+			},
+			{
+				rule: 'jianyu360.cn',
+				icp: '京ICP备2021020018号-1'
+			},
+			{
+				rule: 'jianyubiaoxun.com',
+				icp: '京ICP备14030217号-8'
+			}
+		]
+		copyRightMap.forEach(function (v) {
+			if (host.indexOf(v.rule) !== -1) {
+				nowCopyRightInfo = v
+			}
+		})
+		var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + nowCopyRightInfo.icp + '</a>'
+		$('.copyright').html(copyright)
+	}
+	setCopyRightForBottom()
 })
 //
 function zbSeatch(id){

src/web/templates/common/mobilebottom.html

@@ -1,27 +1,41 @@
 <div class="j-bottom">
 	<img src="{{Msg "seo" "cdn"}}/images/pc_6.png" class="backTop" id="backTop">
 	<div><span>手机版</span><span>|</span><span onclick="goToPcIndex()">电脑版</span></div>
-	<div id="cpinfo" class="copyright">©2015-2019 jianyu360.com 版权所有 |  <a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">京ICP备14030217号-3</a></div>
+	<div id="cpinfo" class="copyright">©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>
 
 <script type="text/javascript">
 $(function () {
-    // 动态设置copyright
-    var host = location.host
-    var copyrightMap = {
-        com: '京ICP备14030217号-3',
-        cn: '京ICP备2021020018号-1'
-    }
-    // 动态设置copyright
-    var copyright = ''
-    if (host.indexOf('jianyu360.com') >= 0) {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
-    } else if (host.indexOf('jianyu360.cn') >= 0) {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.cn 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.cn + '</a>'
-    } else {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
-    }
-    $('.copyright').html(copyright)
+	// 动态设置copyright
+	function setCopyRightForBottom (url) {
+		var host = url || location.host
+		var nowCopyRightInfo = {
+			rule: '',
+			icp: ''
+		}
+		var copyRightMap = [
+			{
+				rule: 'jianyu360.com',
+				icp: '京ICP备14030217号-3'
+			},
+			{
+				rule: 'jianyu360.cn',
+				icp: '京ICP备2021020018号-1'
+			},
+			{
+				rule: 'jianyubiaoxun.com',
+				icp: '京ICP备14030217号-8'
+			}
+		]
+		copyRightMap.forEach(function (v) {
+			if (host.indexOf(v.rule) !== -1) {
+				nowCopyRightInfo = v
+			}
+		})
+		var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + nowCopyRightInfo.icp + '</a>'
+		$('.copyright').html(copyright)
+	}
+	setCopyRightForBottom()
 })
 function zbSeatch(id){
 	var keywords = $("#"+id+" [name='keywords']").val();

src/web/templates/common/pcbottom.html

@@ -949,21 +949,36 @@ if (location.href.indexOf('jyblog') === -1) {
 <script type="text/javascript">
 (function(){
 	// 动态设置copyright
-    var host = location.host
-    var copyrightMap = {
-        com: '京ICP备14030217号-3',
-        cn: '京ICP备2021020018号-1'
-    }
-    // 动态设置copyright
-    var copyright = ''
-    if (host.indexOf('jianyu360.com') >= 0) {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
-    } else if (host.indexOf('jianyu360.cn') >= 0) {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.cn 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.cn + '</a>'
-    } else {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
-    }
-    $('.copyright').html(copyright)
+    function setCopyRightForBottom (url) {
+        var host = url || location.host
+        var nowCopyRightInfo = {
+            rule: '',
+            icp: ''
+        }
+        var copyRightMap = [
+            {
+                rule: 'jianyu360.com',
+                icp: '京ICP备14030217号-3'
+            },
+            {
+                rule: 'jianyu360.cn',
+                icp: '京ICP备2021020018号-1'
+            },
+            {
+                rule: 'jianyubiaoxun.com',
+                icp: '京ICP备14030217号-8'
+            }
+        ]
+        copyRightMap.forEach(function (v) {
+            if (host.indexOf(v.rule) !== -1) {
+                nowCopyRightInfo = v
+            }
+        })
+        var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + nowCopyRightInfo.icp + '</a>'
+        $('.copyright').html(copyright)
+    }
+    setCopyRightForBottom()
+
 
 	$(".j-bottom .jy_province font").click(function(){
 		var scope = $(this).text();

src/web/templates/frontRouter/pc/squeeze/sess/test.html

@@ -433,21 +433,35 @@ $(function () {
     // 处理低高度屏幕下无法显示下方文字
     $('#index').css('min-height', document.documentElement.clientHeight + 'px')
     // 动态设置copyright
-    var host = location.host
-    var copyrightMap = {
-        com: '京ICP备14030217号-3',
-        cn: '京ICP备2021020018号-1'
+    function setCopyRightForBottom (url) {
+        var host = url || location.host
+        var nowCopyRightInfo = {
+            rule: '',
+            icp: ''
+        }
+        var copyRightMap = [
+            {
+                rule: 'jianyu360.com',
+                icp: '京ICP备14030217号-3'
+            },
+            {
+                rule: 'jianyu360.cn',
+                icp: '京ICP备2021020018号-1'
+            },
+            {
+                rule: 'jianyubiaoxun.com',
+                icp: '京ICP备14030217号-8'
+            }
+        ]
+        copyRightMap.forEach(function (v) {
+            if (host.indexOf(v.rule) !== -1) {
+                nowCopyRightInfo = v
+            }
+        })
+        var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + nowCopyRightInfo.icp + '</a>'
+        $('.copyright').html(copyright)
     }
-    // 动态设置copyright
-    var copyright = ''
-    if (host.indexOf('jianyu360.com') >= 0) {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
-    } else if (host.indexOf('jianyu360.cn') >= 0) {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.cn 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.cn + '</a>'
-    } else {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
-    }
-    $('.copyright').html(copyright)
+    setCopyRightForBottom()
     //弹窗
     if (times<1604505600000&&times>1604246400000){
       console.log("4号前。。。")

src/web/templates/pc/index.html

@@ -715,21 +715,35 @@ $(function () {
     // 处理低高度屏幕下无法显示下方文字
     $('#index').css('min-height', document.documentElement.clientHeight + 'px')
     // 动态设置copyright
-    var host = location.host
-    var copyrightMap = {
-        com: '京ICP备14030217号-3',
-        cn: '京ICP备2021020018号-1'
-    }
-    // 动态设置copyright
-    var copyright = ''
-    if (host.indexOf('jianyu360.com') >= 0) {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
-    } else if (host.indexOf('jianyu360.cn') >= 0) {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.cn 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.cn + '</a>'
-    } else {
-        copyright = '©2015-' + new Date().getFullYear() + ' jianyu360.com 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + copyrightMap.com + '</a>'
+    function setCopyRightForBottom (url) {
+        var host = url || location.host
+        var nowCopyRightInfo = {
+            rule: '',
+            icp: ''
+        }
+        var copyRightMap = [
+            {
+                rule: 'jianyu360.com',
+                icp: '京ICP备14030217号-3'
+            },
+            {
+                rule: 'jianyu360.cn',
+                icp: '京ICP备2021020018号-1'
+            },
+            {
+                rule: 'jianyubiaoxun.com',
+                icp: '京ICP备14030217号-8'
+            }
+        ]
+        copyRightMap.forEach(function (v) {
+            if (host.indexOf(v.rule) !== -1) {
+                nowCopyRightInfo = v
+            }
+        })
+        var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank">' + nowCopyRightInfo.icp + '</a>'
+        $('.copyright').html(copyright)
     }
-    $('.copyright').html(copyright)
+    setCopyRightForBottom()
     //弹窗
     if (times<1604505600000&&times>1604246400000){
       console.log("4号前。。。")