Merge branch 'feature/v4.8.76'

src/jfw/front/pcIndex.go

@@ -227,6 +227,17 @@ func (m *PcIndex) NewSordfish(flag string) error {
 	}
 }
 
+var secSeoWebConfig *SecSeoWebdomainConfig
+
+func init() {
+	gconv.Struct(config.Seoconfig["secSeoWebConfig"], &secSeoWebConfig)
+}
+
+type SecSeoWebdomainConfig struct {
+	AreaCodeMap    map[string]string `json:"areaCodeMap"`
+	AreaHrefFormat string            `json:"area_href_format"`
+}
+
 // GetJycmsAreaLink 获取资讯站地区首页地址
 func GetJycmsAreaLink() []map[string]interface{} {
 	redisKey := "IndexJycmsAreaLink"
@@ -247,8 +258,9 @@ func GetJycmsAreaLink() []map[string]interface{} {
 	var ha, nmg int
 	for i, m := range *res {
 		alias, name := util.ObjToString(m["alias"]), util.ObjToString(m["area"])
+		//config.Sysconfig["webdomain"].(string)
 		tmp := map[string]interface{}{
-			"url":  fmt.Sprintf("/jycms/a_%s.html", alias),
+			"url":  fmt.Sprintf(secSeoWebConfig.AreaHrefFormat, secSeoWebConfig.AreaCodeMap[name]),
 			"name": fmt.Sprintf("%s招标网", name),
 		}
 		if alias == "ha" {

src/jfw/modules/app/src/web/templates/weixin/wxinfocontent.html

@@ -3642,12 +3642,18 @@
     $(function(){
       areaNavModule.init()
       backToTop.init()
-      // 未登录状态下距顶部距离为顶部搜索框高度
-      var headerTop = document.querySelector('.jy-app-header ').clientHeight
-      $('.app-layout-content-b').css('top', headerTop)
-      $('.h5-tabfix').css('top', headerTop)
-      $('.wx-tabfix').css('top', headerTop)
-      $('.childNav').css('top', headerTop)
+      var timer = setInterval(function () {
+        // 判断页面所有资源已加载完毕
+        if (document.readyState === "complete") {
+          // 未登录状态下距顶部距离为顶部搜索框高度
+          var headerTop = document.querySelector('.jy-app-header ').clientHeight
+          $('.app-layout-content-b').css('top', headerTop)
+          $('.h5-tabfix').css('top', headerTop)
+          $('.wx-tabfix').css('top', headerTop)
+          $('.childNav').css('top', headerTop)
+          window.clearInterval(timer);
+        }
+      }, 800)
       $('.tag-breadcrumb-navigation').css('background', '#EDEFF2')
       $('.search-container').on('click', function (e) {
         e.preventDefault()

src/seo.json

@@ -4782,19 +4782,23 @@
   "appNewUserTime":1668155814,
   "tagsLimitCount":300,
   "hotWinner": {
-    "cacheKey": "hotWinnerCache",
+    "cacheKey": "hotWinnerCache2",
     "cacheTimeout": 86400,
-    "limit": 200
+    "limit": 80
   },
   "hotBuyer": {
-    "cacheKey": "hotBuyerCache",
+    "cacheKey": "hotBuyerCache2",
     "cacheTimeout": 86400,
-    "limit": 200
+    "limit": 80
   },
   "infoTypeToLetter": {
     "招标预告":   "ZBYG",
     "招标公告":   "ZBGG",
     "招标结果":   "ZBJG",
     "招标信用信息": "ZBXYXX"
+  },
+  "secSeoWebConfig": {
+    "areaCodeMap": {"上海": "shanghai", "云南": "yunnan", "内蒙古": "neimenggu", "北京": "beijing", "吉林": "jilin", "四川": "sichuan", "天津": "tianjin", "宁夏": "ningxia", "安徽": "anhui", "山东": "shandong", "山西": "shanxi", "广东": "guangdong", "广西": "guangxi", "新疆": "xinjiang", "江苏": "jiangsu", "江西": "jiangxi", "河北": "hebei", "河南": "henan", "浙江": "zhejiang", "海南": "hainan", "湖北": "hubei", "湖南": "hunan", "甘肃": "gansu", "福建": "fujian", "西藏": "xizang", "贵州": "guizhou", "辽宁": "liaoning", "重庆": "chongqing", "陕西": "shaanxi", "青海": "qinghai", "黑龙江": "heilongjiang"},
+    "area_href_format": "https://%s.jianyu360.cn"
   }
 }