提交

src/jfw/front/classificationTag.go

@@ -12,6 +12,7 @@ import (
 	"github.com/gogf/gf/v2/util/gconv"
 	"jy/src/jfw/config"
 	"log"
+	"math/rand"
 	"strconv"
 	"strings"
 	"sync"
@@ -55,20 +56,21 @@ func RegionAndInformationAndTender() map[string]interface{} {
 	return data
 }
 
-func GetHotIndustry() []map[string][]map[string]interface{} {
+func GetHotIndustry() (rData, importData []map[string][]map[string]interface{}) {
 	if bytes, err := redis.GetBytes(RedisNameNew, "pcIndexHotIndustry"); err == nil && bytes != nil {
-		rData := []map[string][]map[string]interface{}{}
+		rData = []map[string][]map[string]interface{}{}
 		if err := json.Unmarshal(*bytes, &rData); err != nil {
 			log.Printf("[MANAGER-ERR]pcIndexHotIndustry  GetData Error %v \n", err)
-			return nil
+			return nil, nil
 		}
-		return rData
 	}
-	keysMap := getkeysMap() //热门行业
-	if bytes, err := json.Marshal(keysMap); err == nil && bytes != nil {
+	rData = getkeysMap() //热门行业
+	if bytes, err := json.Marshal(rData); err == nil && bytes != nil {
 		_ = redis.PutBytes(RedisNameNew, "pcIndexHotIndustry", &bytes, 2*60*60)
 	}
-	return keysMap
+	r := rand.Intn(11)
+	importData = append(importData, rData[r], rData[r+1])
+	return rData, importData
 }
 
 // 最新更新的200中标企业

src/jfw/front/index.go

@@ -70,8 +70,8 @@ func (nIndex *NewIndex) NewIndex() error {
 
 	//中标喜报
 	nIndex.T["winnerGlad"] = WinnerGladTidings()
-	//热门行业
-	nIndex.T["hotIndustry"] = GetHotIndustry()
+	//热门行业  ////重点招标
+	nIndex.T["hotIndustry"], nIndex.T["importBidding"] = GetHotIndustry()
 	//热门中标企业
 	nIndex.T["hotWinner"] = NewHotEnt(true)
 	//热门采购单位
@@ -82,6 +82,8 @@ func (nIndex *NewIndex) NewIndex() error {
 	nIndex.T["strategyList"] = GetStrategyList()
 	//剑鱼课堂
 	nIndex.T["jySchool"] = jyutil.Course(6, 3)
+	//地区导航
+	nIndex.T["areaNav"] = GetAreaNav()
 	//顶部菜单
 	nIndex.T["topMenu"] = g.Cfg("index").MustGet(context.Background(), "topMenu").Maps()
 	return nIndex.Render("/pc/newIndex.html", &nIndex.T)
@@ -130,6 +132,31 @@ func (nIndex *NewIndex) EntServerTransfer(code string) {
 	_ = nIndex.Redirect(toUrl)
 }
 
+type AreaStruct struct {
+	Name string `json:"name"`
+	Url  string `json:"url"`
+}
+
+func GetAreaNav() []map[string]interface{} {
+	areaData := []map[string]interface{}{}
+	areaNode := common.ObjArrToMapArr(config.Seoconfig["areaLocation"].([]interface{}))
+	for _, v := range areaNode {
+		childArr := []AreaStruct{}
+		singleArea := common.ObjToMap(v)
+		for _, val := range common.ObjArrToMapArr((*singleArea)["child"].([]interface{})) {
+			childArr = append(childArr, AreaStruct{
+				Name: common.ObjToString(val["name"]),
+				Url:  fmt.Sprintf(common.InterfaceToStr(config.Seoconfig["seoWebDomain"]), common.ObjToString(val["value"])),
+			})
+		}
+		areaData = append(areaData, map[string]interface{}{
+			"name":  (*singleArea)["name"],
+			"child": childArr,
+		})
+	}
+	return areaData
+}
+
 // 推荐标讯专区
 func GetRecommendBidZone(typ int, pageSize int) (list []map[string]interface{}) {
 	if typ == 0 {

src/seo.json

@@ -4800,5 +4800,167 @@
   "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"
-  }
+  },
+  "areaLocation": [
+    {
+      "name": "华北",
+      "child": [
+        {
+          "name":"北京",
+          "value":"beijing"
+        },
+        {
+          "name":"天津",
+          "value":"tianjin"
+        },
+        {
+          "name":"河北",
+          "value":"hebei"
+        },
+        {
+          "name":"山西",
+          "value":"shanxi"
+        },
+        {
+          "name":"内蒙古",
+          "value":"neimenggu"
+        }
+      ]
+    },
+    {
+      "name": "华中",
+      "child": [
+        {
+          "name":"河南",
+          "value":"henan"
+        },
+        {
+          "name":"湖北",
+          "value":"hubei"
+        },
+        {
+          "name":"湖南",
+          "value":"hunan"
+        }
+      ]
+    },
+    {
+      "name": "东北",
+      "child": [
+        {
+          "name":"辽宁",
+          "value":"liaoning"
+        },
+        {
+          "name":"吉林",
+          "value":"jilin"
+        },
+        {
+          "name":"黑龙江",
+          "value":"heilongjiang"
+        }
+      ]
+    },
+    {
+      "name": "华东",
+      "child": [
+        {
+          "name":"上海",
+          "value":"shanghai"
+        },
+        {
+          "name":"江苏",
+          "value":"jiangsu"
+        },
+        {
+          "name":"浙江",
+          "value":"zhejiang"
+        },
+        {
+          "name":"安徽",
+          "value":"anhui"
+        },
+        {
+          "name":"福建",
+          "value":"fujian"
+        },
+        {
+          "name":"江西",
+          "value":"jiangxi"
+        },
+        {
+          "name":"山东",
+          "value":"shandong"
+        }
+      ]
+    },
+    {
+      "name": "华南",
+      "child": [
+        {
+          "name":"广东",
+          "value":"guangdong"
+        },
+        {
+          "name":"广西",
+          "value":"guangxi"
+        },
+        {
+          "name":"海南",
+          "value":"hainan"
+        }
+      ]
+    },
+    {
+      "name": "西南",
+      "child": [
+        {
+          "name":"重庆",
+          "value":"chongqing"
+        },
+        {
+          "name":"四川",
+          "value":"sichuan"
+        },
+        {
+          "name":"贵州",
+          "value":"guizhou"
+        },
+        {
+          "name":"云南",
+          "value":"yunnan"
+        },
+        {
+          "name":"西藏",
+          "value":"xizang"
+        }
+      ]
+    },
+    {
+      "name": "西北",
+      "child": [
+        {
+          "name":"陕西",
+          "value":"shaanxi"
+        },
+        {
+          "name":"甘肃",
+          "value":"gansu"
+        },
+        {
+          "name":"青海",
+          "value":"qinghai"
+        },
+        {
+          "name":"宁夏",
+          "value":"ningxia"
+        },
+        {
+          "name":"新疆",
+          "value":"xinjiang"
+        }
+      ]
+    }
+  ],
+  "seoWebDomain": "http://%s.myjy.cn"
 }

src/web/templates/pc/newIndex.html

@@ -285,10 +285,11 @@
       </div>
       <div class="border" style="height: 200px">
         19会员中标喜报
-        {{.T.winnerGlad}}
         <ul>
           {{range $k,$v := .T.winnerGlad}}
-          <li>{{$v}}</li>
+          {{range $kk,$vv := $v}}
+          <li><a href="/nologin/content/{{$vv}}">{{$kk}}</a></li>
+          {{end}}
           {{end}}
         </ul>
       </div>
@@ -368,6 +369,26 @@
     </div>
     {{end}}
   </div>
+  <div style="height: 260px;">
+    31地区导航
+    {{range $v := .T.areaNav}}
+    <div>
+      {{$v.name}}
+      {{range $vv := $v.child}}
+      <a href="{{$vv.Url}}">{{$vv.Name}}</a>
+      {{end}}
+    </div>
+    {{end}}
+  </div>
+  <div style="height: 400px;">
+    <div style="height: 200px;">
+      重点招标
+    </div>
+    <div style="height: 200px;">
+      政府招标
+    </div>
+
+  </div>