Merge branch 'master' into feature/v4.8.69

src/jfw/modules/app/src/web/staticres/jyapp/big-member/js/unit_portrayal.js

@@ -774,6 +774,7 @@ var vNode = {
         timeout: 10000,
         success: function (res) {
           if (res.error_code == 0) {
+            that.reqCount++
             if (res.data && Object.keys(res.data).length > 0) {
               that.chartLoading = false;
               // 免费用户是否浏览过当前画像 true：浏览过 不返该字段：没浏览过
@@ -1692,7 +1693,8 @@ var vNode = {
         userInfo: this.userInfo,
         usageInfo: this.usageInfo,
         bigStatus: this.bigStatus,
-        scrollTop: this.scrollTop + scrollTopOffset
+        scrollTop: this.scrollTop + scrollTopOffset,
+        reqCount: this.reqCount
       }
       sessionStorage.setItem(this.sessKey, JSON.stringify(data))
     },
@@ -1714,6 +1716,7 @@ var vNode = {
         Object.assign(this.portraitInfo, $data.portraitInfo || {})
         Object.assign(this.dt, $data.dt || {})
         this.encryptId = $data.encryptId
+        this.reqCount = $data.reqCount
         Object.assign(this.power, $data.power || [])
         Object.assign(this.userInfo, $data.userInfo || {})
         Object.assign(this.usageInfo, $data.usageInfo || {})

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

@@ -560,20 +560,29 @@ function infoListCss(){
 			icp: ''
 		}
 		var copyRightMap = [
-			{
-				rule: 'jianyu360.com',
-				icp: '京ICP备2021020018号-4'
-			},
-			{
-				rule: 'jianyu360.cn',
-				icp: '京ICP备2021020018号-1'
-			}
+      {
+        rule: 'jianyu360.cn',
+        icp: '京ICP备2021020018号-1'
+      },
+      {
+        rule: 'jianyu360.com.cn',
+        icp: '京ICP备2021020018号-2'
+      },
+      {
+        rule: 'jianyubiaoxun.cn',
+        icp: '京ICP备2021020018号-3'
+      },
+      {
+        rule: 'jianyu360.com',
+        icp: '京ICP备2021020018号-4'
+      }
 		]
-		copyRightMap.forEach(function (v) {
-			if (host.indexOf(v.rule) !== -1) {
-				nowCopyRightInfo = v
-			}
-		})
+    for(let i=0;i<copyRightMap.length;i++){
+      if (host.indexOf(copyRightMap[i].rule) !== -1) {
+        nowCopyRightInfo = copyRightMap[i]
+        break
+      }
+    }
 		var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank" rel="nofollow">' + nowCopyRightInfo.icp + '</a>'
 		$('.copyright').html(copyright)
 	}

src/jfw/modules/subscribepay/src/timetask/timetask.go

@@ -595,7 +595,7 @@ func bigMemberExpireRemind() {
 			}
 			_id := qutil.ObjToString(m["_id"])
 			i_member_endtime := qutil.Int64All(m["i_member_endtime"])
-			if i_member_endtime-now_unix > threeday && i_member_endtime == 1 {
+			if i_member_endtime-now_unix > threeday { //&& i_member_expire_tip == 1
 				log.Println("大会员即将到期提醒，结束时间大于三天，过滤掉", _id, i_member_endtime)
 				return
 			}

src/jfw/modules/subscribepay/src/util/dataExportExcel.go

@@ -2,12 +2,12 @@ package util
 
 //数据导出excel
 import (
-	"jy/src/jfw/modules/subscribepay/src/config"
+	qutil "app.yhyue.com/moapp/jybase/common"
 	"errors"
 	"fmt"
 	"io"
+	"jy/src/jfw/modules/subscribepay/src/config"
 	"os"
-	qutil "app.yhyue.com/moapp/jybase/common"
 	"strings"
 	"time"
 
@@ -32,14 +32,14 @@ var (
 	}
 )
 
-//获取
+// 获取
 func GetExcelFilePath(orderCode string) string {
 	now := time.Now()
 	filename := fmt.Sprintf("%s.xlsx", fmt.Sprintf("%s_%s_%s", now.Format("20060102150405"), orderCode, qutil.GetLetterRandom(5)))
 	return fmt.Sprintf("/dataexport/%s/%s/%s", now.Format("2006"), now.Format("01"), filename)
 }
 
-//获取excel导出数据长度
+// 获取excel导出数据长度
 func GetDataExportFileDataLen(path string) (int, error) {
 	xFile, err := xlsx.OpenFile(path)
 	if err != nil {
@@ -55,7 +55,7 @@ func GetDataExportFileDataLen(path string) (int, error) {
 	return sheet1.Rows[len(sheet1.Rows)-1].Cells[0].Int()
 }
 
-//生成数据导出excel
+// 生成数据导出excel
 func CreateDataExportExcelFile(list *[]map[string]interface{}, isSenior bool, filePath string) error {
 	if list == nil || len(*list) == 0 {
 		return errors.New("未查询到数据")
@@ -147,6 +147,8 @@ func CreateDataExportExcelFile(list *[]map[string]interface{}, isSenior bool, fi
 
 			if v.Filed == "title" || v.Filed == "url" {
 				cell.SetFormula(fmt.Sprintf("=HYPERLINK(\"%s\",\"%s\")", data["url_jump"], data[v.Filed]))
+			} else if v.Filed == "href" {
+				cell.SetFormula(fmt.Sprintf("=HYPERLINK(\"%s\",\"%s\")", data["href"], data[v.Filed]))
 			} else {
 				cell.SetValue(data[v.Filed])
 			}
@@ -162,8 +164,8 @@ func CreateDataExportExcelFile(list *[]map[string]interface{}, isSenior bool, fi
 	return file.Save(filePath)
 }
 
-//校验文件夹是否存在；
-//若不存在则创建；
+// 校验文件夹是否存在；
+// 若不存在则创建；
 func FolderCheck(path string) error {
 	pathCheck := path[:strings.LastIndex(path, "/")]
 	//校验文件夹是否存在
@@ -175,7 +177,7 @@ func FolderCheck(path string) error {
 	return nil
 }
 
-//移动文件至指定目录
+// 移动文件至指定目录
 func MoveFile(src, dst string) (int64, error) {
 	srcFile, err := os.Open(src)
 	if err != nil {

src/web/staticres/big-member/js/unit_portrayal.js

@@ -1593,7 +1593,8 @@ var vNode = {
                 userInfo: this.userInfo,
                 usageInfo: this.usageInfo,
                 bigStatus: this.bigStatus,
-                scrollTop: this.scrollTop + scrollTopOffset
+                scrollTop: this.scrollTop + scrollTopOffset,
+                reqCount: this.reqCount
             }
             sessionStorage.setItem(this.sessKey, JSON.stringify(data))
         },
@@ -1620,6 +1621,7 @@ var vNode = {
                 Object.assign(this.usageInfo, $data.usageInfo || {})
                 this.scrollTop = $data.scrollTop
                 this.bigStatus = $data.bigStatus
+                this.reqCount = $data.reqCount
                 sessionStorage.removeItem(this.sessKey)
             }
             return !!$data

src/web/staticres/common-module/big-member/js/client_portrayal.js

@@ -721,6 +721,7 @@ var vNode = {
           timeout: 10000,
           success:function(res) {
               if(res.error_code == 0) {
+                that.reqCount++
                 if(res.data && Object.keys(res.data).length > 0) {
                     that.detailObj = res.data
                     that.chartLoading = false
@@ -1610,7 +1611,8 @@ var vNode = {
           userInfo: this.userInfo,
           usageInfo: this.usageInfo,
           bigStatus: this.bigStatus,
-          scrollTop: this.scrollTop + scrollTopOffset
+          scrollTop: this.scrollTop + scrollTopOffset,
+          reqCount: this.reqCount
         }
         sessionStorage.setItem(this.sessKey, JSON.stringify(data))
       },
@@ -1639,6 +1641,7 @@ var vNode = {
           Object.assign(this.usageInfo, $data.usageInfo || {})
           this.scrollTop = $data.scrollTop
           this.bigStatus = $data.bigStatus
+          this.reqCount = $data.reqCount
           sessionStorage.removeItem(this.sessKey)
         }
         return !!$data

src/web/staticres/css/dataSmt/dataMart_detail.css

@@ -255,4 +255,50 @@
   width: 100%;
   display: block;
 
-}
+}
+.weChat-dialog{
+  width: 400px;
+  height: 440px;
+  background: url(/serviceSystem/img/t_k.png) no-repeat center;
+  background-size: 100% 100%;
+  border-radius: 8px;
+}
+.weChat-dialog .ent-code-url{
+  width: 200px;
+  height: 200px;
+}
+.weChat-dialog .el-dialog__header{
+  display: none!important;
+}
+.weChat-dialog .el-dialog__body{
+  padding: 0;
+}
+.weChat-dialog .chat-header{
+  position: relative;
+  padding: 68px 0 36px;
+  text-align: center;
+}
+.weChat-dialog .chat-header .chat-title{
+  font-size: 20px;
+  font-weight: 700;
+  color: rgba(29, 29, 29, 1);
+}
+.weChat-dialog .chat-close{
+  position: absolute;
+  top: 16px;
+  right: 16px;
+  width: 20px;
+  height: 20px;
+  cursor: pointer;
+}
+.weChat-dialog .chat-main{
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+}
+.weChat-dialog .chat-text{
+  padding-top: 24px;
+  font-size: 14px;
+  line-height: 18px;
+  color: rgba(104, 104, 104, 1);
+}

src/web/staticres/public-pc/js/pc-bottom.js

@@ -284,20 +284,29 @@ $(function () {
       icp: ''
     }
     var copyRightMap = [
-      {
-        rule: 'jianyu360.com',
-        icp: '京ICP备2021020018号-4'
-      },
       {
         rule: 'jianyu360.cn',
         icp: '京ICP备2021020018号-1'
+      },
+      {
+        rule: 'jianyu360.com.cn',
+        icp: '京ICP备2021020018号-2'
+      },
+      {
+        rule: 'jianyubiaoxun.cn',
+        icp: '京ICP备2021020018号-3'
+      },
+      {
+        rule: 'jianyu360.com',
+        icp: '京ICP备2021020018号-4'
       }
     ]
-    copyRightMap.forEach(function (v) {
-      if (host.indexOf(v.rule) !== -1) {
-        nowCopyRightInfo = v
+    for(let i=0;i<copyRightMap.length;i++){
+      if (host.indexOf(copyRightMap[i].rule) !== -1) {
+        nowCopyRightInfo = copyRightMap[i]
+        break
       }
-    })
+    }
     var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank" rel="nofollow"">' + nowCopyRightInfo.icp + '</a>'
     $('.copyright').html(copyright)
   }

src/web/templates/_error.html

@@ -612,20 +612,29 @@ $(function(){
 			icp: ''
 		}
 		var copyRightMap = [
-			{
-				rule: 'jianyu360.com',
-				icp: '京ICP备2021020018号-4'
-			},
-			{
-				rule: 'jianyu360.cn',
-				icp: '京ICP备2021020018号-1'
-			}
+      {
+        rule: 'jianyu360.cn',
+        icp: '京ICP备2021020018号-1'
+      },
+      {
+        rule: 'jianyu360.com.cn',
+        icp: '京ICP备2021020018号-2'
+      },
+      {
+        rule: 'jianyubiaoxun.cn',
+        icp: '京ICP备2021020018号-3'
+      },
+      {
+        rule: 'jianyu360.com',
+        icp: '京ICP备2021020018号-4'
+      }
 		]
-		copyRightMap.forEach(function (v) {
-			if (host.indexOf(v.rule) !== -1) {
-				nowCopyRightInfo = v
-			}
-		})
+    for(let i=0;i<copyRightMap.length;i++){
+      if (host.indexOf(copyRightMap[i].rule) !== -1) {
+        nowCopyRightInfo = copyRightMap[i]
+        break
+      }
+    }
 		var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank" rel="nofollow">' + nowCopyRightInfo.icp + '</a>'
 		$('.copyright').html(copyright)
 	}

src/web/templates/active/index_bak.html

@@ -127,20 +127,29 @@ $(function(){
 			icp: ''
 		}
 		var copyRightMap = [
-			{
-				rule: 'jianyu360.com',
-				icp: '京ICP备2021020018号-4'
-			},
-			{
-				rule: 'jianyu360.cn',
-				icp: '京ICP备2021020018号-1'
-			},
+      {
+        rule: 'jianyu360.cn',
+        icp: '京ICP备2021020018号-1'
+      },
+      {
+        rule: 'jianyu360.com.cn',
+        icp: '京ICP备2021020018号-2'
+      },
+      {
+        rule: 'jianyubiaoxun.cn',
+        icp: '京ICP备2021020018号-3'
+      },
+      {
+        rule: 'jianyu360.com',
+        icp: '京ICP备2021020018号-4'
+      }
 		]
-		copyRightMap.forEach(function (v) {
-			if (host.indexOf(v.rule) !== -1) {
-				nowCopyRightInfo = v
-			}
-		})
+    for(let i=0;i<copyRightMap.length;i++){
+      if (host.indexOf(copyRightMap[i].rule) !== -1) {
+        nowCopyRightInfo = copyRightMap[i]
+        break
+      }
+    }
 		var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank" rel="nofollow">' + nowCopyRightInfo.icp + '</a>'
 		$('.copyright').html(copyright)
 	}

src/web/templates/common/mobilebottom.html

@@ -14,20 +14,29 @@ $(function () {
 			icp: ''
 		}
 		var copyRightMap = [
-			{
-				rule: 'jianyu360.com',
-				icp: '京ICP备2021020018号-4'
-			},
-			{
-				rule: 'jianyu360.cn',
-				icp: '京ICP备2021020018号-1'
-			}
+      {
+        rule: 'jianyu360.cn',
+        icp: '京ICP备2021020018号-1'
+      },
+      {
+        rule: 'jianyu360.com.cn',
+        icp: '京ICP备2021020018号-2'
+      },
+      {
+        rule: 'jianyubiaoxun.cn',
+        icp: '京ICP备2021020018号-3'
+      },
+      {
+        rule: 'jianyu360.com',
+        icp: '京ICP备2021020018号-4'
+      }
 		]
-		copyRightMap.forEach(function (v) {
-			if (host.indexOf(v.rule) !== -1) {
-				nowCopyRightInfo = v
-			}
-		})
+    for(let i=0;i<copyRightMap.length;i++){
+      if (host.indexOf(copyRightMap[i].rule) !== -1) {
+        nowCopyRightInfo = copyRightMap[i]
+        break
+      }
+    }
 		var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank" rel="nofollow">' + nowCopyRightInfo.icp + '</a>'
 		$('.copyright').html(copyright)
 	}

src/web/templates/frontRouter/pc/enterpriseCertificatio/free/index.html

@@ -542,13 +542,21 @@
     }
   })
   function cooperativePartner(source) { //成为合作商
-            checkLogin()
+            // checkLogin()
+            if (!loginflag) {
+              openLoginDig();
+              return
+            }
             vmPartner.isNeedSubmit(source, function () {
               vmPartner.showSuccess = true
             })
         }
   function understand (source){ //了解详情
-            checkLogin()
+            // checkLogin()
+            if (!loginflag) {
+              openLoginDig();
+              return
+            }
             bidLeaveInfo.isNeedSubmit({
               source: source
             })
@@ -564,6 +572,10 @@
         }
   function onlinekf () {
       // $('.help-slide-zx.open-customer').trigger('click')
+      if (!loginflag) {
+        openLoginDig();
+        return
+      }
       goCustomerUrl({ openNewWindow: true })
     }
 </script>

src/web/templates/frontRouter/pc/partner/free/index.html

@@ -127,7 +127,10 @@
     $(function () {
         haslogin({{.T.logid}});
         $('.come-partner, .joinIn').on('click', function() {
-            checkLogin()
+            if (!loginflag) {
+              openLoginDig();
+              return
+            }
             vmPartner.isNeedSubmit('partner_recruit_page', function () {
               vmPartner.showSuccess = true
             })

src/web/templates/frontRouter/pc/solution/free/index.html

@@ -236,7 +236,10 @@
     $(function () {
         haslogin({{.T.logid}});
         $('.answerBtn').on('click', function() {
-            checkLogin()
+            if (!loginflag) {
+              openLoginDig();
+              return
+            }
             vmSolution.isNeedSubmit('telecom_solution', function () {
               // vmSolution.showSuccess = true
             })

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

@@ -440,20 +440,29 @@ $(function () {
             icp: ''
         }
         var copyRightMap = [
-            {
-                rule: 'jianyu360.com',
-                icp: '京ICP备2021020018号-4'
-            },
-            {
-                rule: 'jianyu360.cn',
-                icp: '京ICP备2021020018号-1'
-            },
+          {
+            rule: 'jianyu360.cn',
+            icp: '京ICP备2021020018号-1'
+          },
+          {
+            rule: 'jianyu360.com.cn',
+            icp: '京ICP备2021020018号-2'
+          },
+          {
+            rule: 'jianyubiaoxun.cn',
+            icp: '京ICP备2021020018号-3'
+          },
+          {
+            rule: 'jianyu360.com',
+            icp: '京ICP备2021020018号-4'
+          }
         ]
-        copyRightMap.forEach(function (v) {
-            if (host.indexOf(v.rule) !== -1) {
-                nowCopyRightInfo = v
-            }
-        })
+      for(let i=0;i<copyRightMap.length;i++){
+        if (host.indexOf(copyRightMap[i].rule) !== -1) {
+          nowCopyRightInfo = copyRightMap[i]
+          break
+        }
+      }
         var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank" rel="nofollow">' + nowCopyRightInfo.icp + '</a>'
         $('.copyright').html(copyright)
     }

src/web/templates/pc/brand/index.html

@@ -375,20 +375,29 @@
         icp: ''
       }
       var copyRightMap = [
-        {
-          rule: 'jianyu360.com',
-          icp: '京ICP备2021020018号-4'
-        },
         {
           rule: 'jianyu360.cn',
           icp: '京ICP备2021020018号-1'
+        },
+        {
+          rule: 'jianyu360.com.cn',
+          icp: '京ICP备2021020018号-2'
+        },
+        {
+          rule: 'jianyubiaoxun.cn',
+          icp: '京ICP备2021020018号-3'
+        },
+        {
+          rule: 'jianyu360.com',
+          icp: '京ICP备2021020018号-4'
         }
       ]
-      copyRightMap.forEach(function (v) {
-        if (host.indexOf(v.rule) !== -1) {
-          nowCopyRightInfo = v
+      for(let i=0;i<copyRightMap.length;i++){
+        if (host.indexOf(copyRightMap[i].rule) !== -1) {
+          nowCopyRightInfo = copyRightMap[i]
+          break
         }
-      })
+      }
       var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank" rel="nofollow">' + nowCopyRightInfo.icp + '</a>'
       $('.copyright').html(copyright)
     },

src/web/templates/pc/dataSmt/detail.html

@@ -103,6 +103,23 @@
       <img class="advertising" src="{{Msg "seo" "cdn"}}/images/dataSmt/foot_bg.png?v={{Msg "seo" "version"}}" alt="底部广告">
     <!-- </a> -->
   </footer>
+  <div id="weChatDialog" v-cloak>
+    <el-dialog
+      custom-class="weChat-dialog"
+      :visible.sync="weChatDialog"
+      width="400px"
+      :show-close="false"
+      center>
+      <div class="chat-header">
+        <h2 class="chat-title">立即咨询</h2>
+        <img class="chat-close" src='{{Msg "seo" "cdn"}}/images/dataSmt/dialog-close.png?v={{Msg "seo" "version"}}' @click.stop="weChatDialog = false">
+      </div>
+      <div class="chat-main">
+        <img class="ent-code-url" :src="weChatUrl" alt="">
+        <p class="chat-text">打开微信扫一扫，立即联系数据经理</p>
+      </div>
+    </el-dialog>
+  </div>
 </div>
 <!-- 留资组件 -->
 <div id="vue-collect-user-info"></div>
@@ -116,6 +133,9 @@
 <script>
   setNavTheme(firstTheme = 'light')
   haslogin({{.T.logid}});
+  // 立即资讯销售-企业微信二维码（陈兆标）
+  {{$weChatCode:=(Ad "pc-supermarket-detail-entWechatCode" -1 .Host)}}
+  var entWeChatCode = ({{$weChatCode}})
   $(function(){
     $('.dataMart_detail .purchase').on('click',function(){ // 购买
       needSubmitHandle('pc_supermarket_details_buy', {{.T.data.name}}) // 此处第二个参数添加模板变量产品名称
@@ -128,12 +148,13 @@
        if (!loginflag) {
         return openLoginDig()
        }
-       goCustomerUrl({ openNewWindow: true })
+       customerDialog.weChatDialog = true
+      //  goCustomerUrl({ openNewWindow: true })
     })
     // 首页底部广告位
     {{$bottom:=(Ad "pc-datasmt-detail-bottom" -1 .Host)}}
-    console.log({{$bottom}})
     var bottom_img = ({{$bottom}})
+    
     $('.advertising').attr('src', bottom_img[0].s_pic)
     console.log(bottom_img[0].s_pic)
     bright_title()
@@ -183,7 +204,14 @@ function bright_title () {
         navbar:true
       });
     });
-
+    var customerDialog = new Vue({
+      delimiters: ['${', '}'],
+      el: '#weChatDialog',
+      data: {
+        weChatDialog: false,
+        weChatUrl: entWeChatCode[0].s_pic
+      }
+    })
 </script>
 <!--S-百度统计-->
 {{include "/common/pcbottom.html"}}

src/web/templates/pc/index.html

@@ -768,20 +768,29 @@
           icp: ''
         }
         var copyRightMap = [
-          {
-            rule: 'jianyu360.com',
-            icp: '京ICP备2021020018号-4'
-          },
           {
             rule: 'jianyu360.cn',
             icp: '京ICP备2021020018号-1'
+          },
+          {
+            rule: 'jianyu360.com.cn',
+            icp: '京ICP备2021020018号-2'
+          },
+          {
+            rule: 'jianyubiaoxun.cn',
+            icp: '京ICP备2021020018号-3'
+          },
+          {
+            rule: 'jianyu360.com',
+            icp: '京ICP备2021020018号-4'
           }
         ]
-        copyRightMap.forEach(function (v) {
-          if (host.indexOf(v.rule) !== -1) {
-            nowCopyRightInfo = v
+        for(let i=0;i<copyRightMap.length;i++){
+          if (host.indexOf(copyRightMap[i].rule) !== -1) {
+            nowCopyRightInfo = copyRightMap[i]
+            break
           }
-        })
+        }
         var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank" rel="nofollow">' + nowCopyRightInfo.icp + '</a>'
         $('.copyright').html(copyright)
       },

src/web/templates/pc/index_old.html

@@ -806,20 +806,29 @@ $(function () {
             icp: ''
         }
         var copyRightMap = [
-            {
-                rule: 'jianyu360.com',
-                icp: '京ICP备2021020018号-4'
-            },
-            {
-                rule: 'jianyu360.cn',
-                icp: '京ICP备2021020018号-1'
-            },
+          {
+            rule: 'jianyu360.cn',
+            icp: '京ICP备2021020018号-1'
+          },
+          {
+            rule: 'jianyu360.com.cn',
+            icp: '京ICP备2021020018号-2'
+          },
+          {
+            rule: 'jianyubiaoxun.cn',
+            icp: '京ICP备2021020018号-3'
+          },
+          {
+            rule: 'jianyu360.com',
+            icp: '京ICP备2021020018号-4'
+          }
         ]
-        copyRightMap.forEach(function (v) {
-            if (host.indexOf(v.rule) !== -1) {
-                nowCopyRightInfo = v
-            }
-        })
+      for(let i=0;i<copyRightMap.length;i++){
+        if (host.indexOf(copyRightMap[i].rule) !== -1) {
+          nowCopyRightInfo = copyRightMap[i]
+          break
+        }
+      }
         var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank" rel="nofollow">' + nowCopyRightInfo.icp + '</a>'
         $('.copyright').html(copyright)
     }

src/web/templates/pc/index_old_23_06_16.html

@@ -748,20 +748,29 @@
           icp: ''
         }
         var copyRightMap = [
-          {
-            rule: 'jianyu360.com',
-            icp: '京ICP备2021020018号-4'
-          },
           {
             rule: 'jianyu360.cn',
             icp: '京ICP备2021020018号-1'
+          },
+          {
+            rule: 'jianyu360.com.cn',
+            icp: '京ICP备2021020018号-2'
+          },
+          {
+            rule: 'jianyubiaoxun.cn',
+            icp: '京ICP备2021020018号-3'
+          },
+          {
+            rule: 'jianyu360.com',
+            icp: '京ICP备2021020018号-4'
           }
         ]
-        copyRightMap.forEach(function (v) {
-          if (host.indexOf(v.rule) !== -1) {
-            nowCopyRightInfo = v
+        for(let i=0;i<copyRightMap.length;i++){
+          if (host.indexOf(copyRightMap[i].rule) !== -1) {
+            nowCopyRightInfo = copyRightMap[i]
+            break
           }
-        })
+        }
         var copyright = '©2015-' + new Date().getFullYear() + ' ' +nowCopyRightInfo.rule+ ' 版权所有 | ' + '<a style="color: inherit; font-size: inherit;" href="https://beian.miit.gov.cn/" target="_blank" rel="nofollow">' + nowCopyRightInfo.icp + '</a>'
         $('.copyright').html(copyright)
       },