ソースを参照

Merge branch 'feature/v4.8.49' into dev/v4.8.49_zsy

zhangsiya 2 年 前
コミット
7a192f16df

+ 75 - 7
src/jfw/front/pcIndex.go

@@ -120,6 +120,7 @@ func (m *PcIndex) NewSordfish(flag string) error {
 			m.T["hotSubject"] = HotSubjectMatter()
 			//实用内容推荐
 			m.T["recommend"] = ContentRecommendation()
+			m.T["jycmsLink"] = GetJycmsAreaLink()
 			//推荐标讯专区
 			m.T["recommendBeacon"] = RecommendationBeacon()
 			//热门采购单位
@@ -134,6 +135,44 @@ func (m *PcIndex) NewSordfish(flag string) error {
 	}
 }
 
+// GetJycmsAreaLink 获取资讯站地区首页地址
+func GetJycmsAreaLink() []map[string]interface{} {
+	redisKey := "IndexJycmsAreaLink"
+	if cache, err := redis.GetBytes("limitation", redisKey); err == nil && cache != nil && len(*cache) > 0 {
+		var rData []map[string]interface{}
+		_ = json.Unmarshal(*cache, &rData)
+		if len(rData) > 0 {
+			return rData
+		}
+	}
+
+	res := public.BaseMysql.Query("SELECT area,alias FROM global_common_data.code_area WHERE `code` LIKE '%%0000' AND alias IS NOT NULL")
+	if res == nil || len(*res) == 0 {
+		return nil
+	}
+	rData := make([]map[string]interface{}, 0, len(*res))
+	//TODO:因需求需要把内蒙古和河南位置对换
+	var ha, nmg int
+	for i, m := range *res {
+		alias, name := util.ObjToString(m["alias"]), util.ObjToString(m["area"])
+		tmp := map[string]interface{}{
+			"url":  fmt.Sprintf("/jycms/a_%s.html", alias),
+			"name": fmt.Sprintf("%s招标网", name),
+		}
+		if alias == "ha" {
+			ha = i
+		} else if alias == "nmg" {
+			nmg = i
+		}
+		rData = append(rData, tmp)
+	}
+	rData[nmg], rData[ha] = rData[ha], rData[nmg]
+	if len(rData) > 0 {
+		redis.Put("limitation", redisKey, rData, 60*60*24)
+	}
+	return rData
+}
+
 // 剑鱼标讯pc首页-统计
 func (m *PcIndex) NewSordfishC() error {
 	var shareid = m.GetString("id")
@@ -316,6 +355,7 @@ func (f *PcIndex) SearchResult(at, name string) error {
 		shareid = "10" //fmt.Sprintf("%s%d", config.Seoconfig["jybqy"].(string)+fmt.Sprintf("%d", time.Now().UnixNano())[8:14], rand.Intn(9))
 	}
 	f.T["logid"] = config.Seoconfig["jybqy"].(string)
+	f.T["seo_title"], f.T["seo_keywords"], f.T["seo_description"] = "", "", ""
 	if at == "area" {
 		areamp, _ := config.Seoconfig["area"].(map[string]interface{})
 		if areamp != nil {
@@ -327,6 +367,9 @@ func (f *PcIndex) SearchResult(at, name string) error {
 				seodescription = areamp1["DESCRIPTION"].(string)
 			}
 		}
+		f.T["seo_title"] = fmt.Sprintf("%s免费招标信息_%s采购服务平台_%s中标公告-剑鱼标讯", area, area, area)
+		f.T["seo_keywords"] = fmt.Sprintf("%s免费招标信息,%s招标公告,%s中标公告,%s招标采购,%s招标网", area, area, area, area, area)
+		f.T["seo_description"] = fmt.Sprintf("剑鱼标讯%s专栏,提供%s免费招标信息、%s招标公告、%s中标公告和%s招标采购等内容,以及%s招标信息搜索查询、订阅推送和数据定制化服务,每天实时更新%s的招标信息,随时随地免费查看。", area, area, area, area, area, area, area)
 	} else if at == "stype" {
 		stypemp, _ := config.Seoconfig["stype"].(map[string]interface{})
 		if stypemp != nil {
@@ -360,6 +403,9 @@ func (f *PcIndex) SearchResult(at, name string) error {
 				seodescription = citymp1["DESCRIPTION"].(string)
 			}
 		}
+		f.T["seo_title"] = fmt.Sprintf("%s免费招标信息_%s采购服务平台_%s中标公告-剑鱼标讯", city, city, city)
+		f.T["seo_keywords"] = fmt.Sprintf("%s免费招标信息,%s招标公告,%s中标公告,%s招标采购,%s招标网", city, city, city, city, city)
+		f.T["seo_description"] = fmt.Sprintf("剑鱼标讯%s专栏,提供%s免费招标信息、%s招标公告、%s中标公告和%s招标采购等内容,以及%s招标信息搜索查询、订阅推送和数据定制化服务,每天实时更新%s的招标信息,随时随地免费查看。", city, city, city, city, city, city, city)
 	} else if at == "keywords" {
 		keywordsArr, _ := config.Seoconfig["keywordsArr"].([]interface{})
 		if len(keywordsArr) > 0 {
@@ -383,15 +429,37 @@ func (f *PcIndex) SearchResult(at, name string) error {
 				}
 			}
 		}
+		f.T["seo_title"] = fmt.Sprintf("%s免费招标信息网__%s采购服务平台_%s中标公告-剑鱼标讯", keywords, keywords, keywords)
+		f.T["seo_keywords"] = fmt.Sprintf("%s免费招标信息,%s招标公告,%s中标公告,%s招标采购,%s招标网", keywords, keywords, keywords, keywords, keywords)
+		f.T["seo_description"] = fmt.Sprintf("剑鱼标讯%s专栏,提供%s免费招标信息、%s招标公告、%s中标公告和%s招标采购等内容,以及%s招标信息搜索查询、订阅推送和数据定制化服务,每天实时更新%s的招标信息,随时随地免费查看。", keywords, keywords, keywords, keywords, keywords, keywords, keywords)
+	}
+
+	if f.T["seo_title"] == "" {
+		f.T["seo_title"] = util.If(stype == "", fmt.Sprintf("剑鱼标讯官网_%s招标信息", seotitle), fmt.Sprintf("剑鱼标讯官网_%s", seotitle))
+	}
+	if f.T["seo_keywords"] == "" {
+		if area == "" {
+			if f.T["industry"] == "" {
+				f.T["seo_keywords"] = seokeywords
+			} else {
+				f.T["seo_keywords"] = fmt.Sprintf("%s", f.T["industry"])
+			}
+		} else {
+			f.T["seo_keywords"] = fmt.Sprintf("%s招标信息,%s招标公告,%s中标公告,%s招标采购,%s招标网", seokeywords, seokeywords, seokeywords, seokeywords, seokeywords)
+		}
+	}
+	if f.T["seo_description"] == "" {
+		if area == "" {
+			if f.T["industry"] == "" {
+				f.T["seo_description"] = seodescription
+			} else {
+				f.T["seo_description"] = fmt.Sprintf("剑鱼标讯提供%s全行业招标信息搜索查询、订阅推送和数据定制化服务,每天实时更新%s相关的招标信息,随时随地免费查看。", f.T["industry"], f.T["industry"])
+			}
+		} else {
+			f.T["seo_description"] = fmt.Sprintf("剑鱼标讯%s专栏,提供全行业最新的%s招标信息、%s招标公告、%s中标公告和%s招标采购等内容,强大的搜索查询功能,支持多条件筛选,让招投标更轻松。", seodescription, seodescription, seodescription, seodescription, seodescription)
+		}
 	}
 
-	f.T["seoarea"] = area
-	f.T["seostype"] = stype
-	f.T["seotitle"] = seotitle
-	f.T["seokeywords"] = seokeywords
-	f.T["seodption"] = seodescription
-	f.T["seocity"] = city
-	f.T["keywords"] = keywords
 	if area == "全国" {
 		return f.Redirect("/swordfish/searchinfolist.html")
 	}

+ 27 - 8
src/jfw/front/tags.go

@@ -258,7 +258,7 @@ func (this *Tags) Index(types, name string) {
 		"infoType": fmt.Sprintf(stypeHref, "all"),
 	}
 	//TDK
-	this.T["tdk"] = this.GetTDK(haveList, types, checkedKeywords, pageNum, checkedLetter, qu.ObjToString(this.T["area"])+checkedKeywords+infotypeStr, qu.ObjToString(this.T["area"])+checkedKeywords+infotypeStr, checkedKeywords)
+	this.T["tdk"] = this.GetTDK(haveList, types, checkedKeywords, pageNum, checkedLetter, qu.ObjToString(this.T["area"])+checkedKeywords, qu.ObjToString(this.T["area"])+checkedKeywords+infotypeStr, checkedKeywords, filterInfoType)
 	if haveList {
 		//信息类型
 		isLimit := false
@@ -795,7 +795,7 @@ func (this *Tags) GetLetterPaging(pageNum int, checkedLetter string) (letterList
 
 // itype 1:汇总页 2:标签页
 // stype area:地区  industy:行业 letter:字母类
-func (this *Tags) GetTDK(isDetails bool, stype string, keywords string, pagenum int, letter string, industryWord string, areaWord, letterWord string) map[string]interface{} {
+func (this *Tags) GetTDK(isDetails bool, stype string, keywords string, pagenum int, letter string, industryWord string, areaWord, letterWord, infoType string) map[string]interface{} {
 	title, keywordsContent, descriptionContent := "", "", ""
 	if !isDetails {
 		//汇总页
@@ -823,13 +823,32 @@ func (this *Tags) GetTDK(isDetails bool, stype string, keywords string, pagenum
 			keywordsContent = fmt.Sprintf("%s,%s招标,%s采购", areaWord, areaWord, areaWord)
 			descriptionContent = fmt.Sprintf("提供%s全部招标采购信息,登录后可以免费查看,涵盖%s拟建项目、采购意向、招标公告,中标结果等招投标信息。%s为您提供专业全面的招投标服务!", areaWord, areaWord, areaWord)
 		} else if stype == "industry" {
-			title = fmt.Sprintf("%s招标采购-%s招标信息-中标公告-剑鱼标讯", industryWord, industryWord)
-			keywordsContent = fmt.Sprintf("%s招标,%s采购,%s中标,%s招标采购信息", industryWord, industryWord, industryWord, industryWord)
-			descriptionContent = fmt.Sprintf("剑鱼标讯是%s招标采购的优质信息平台,免费提供全国%s招标采购信息、招标公告,中标结果等所有%s相关的招投标信息,选择优质%s招标信息网站,就用剑鱼标讯。", industryWord, industryWord, industryWord, industryWord)
+			if infoType == "招标预告" {
+				title = fmt.Sprintf("%s免费招标预告_%s采购信息预告-剑鱼标讯", industryWord, keywords)
+				keywordsContent = fmt.Sprintf("%s免费招标预告,%s招投标预告,%s采购预告", industryWord, industryWord, industryWord)
+				descriptionContent = fmt.Sprintf("剑鱼标讯%s招标信息预告专栏,免费提供%s招标采购预告信息,寻找优质免费%s招标预告信息网站,就用剑鱼标讯!", industryWord, industryWord, industryWord)
+			} else if infoType == "招标公告" {
+				title = fmt.Sprintf("%s免费招标公告_%s采购信息公告-剑鱼标讯", industryWord, keywords)
+				keywordsContent = fmt.Sprintf("%s免费招标公告,%s招投标公告,%s采购公告", industryWord, industryWord, industryWord)
+				descriptionContent = fmt.Sprintf("剑鱼标讯%s招标信息公告专栏,免费提供%s招标采购公告信息,寻找优质免费%s招标公告信息网站,就用剑鱼标讯!", industryWord, industryWord, industryWord)
+			} else if infoType == "招标结果" {
+				title = fmt.Sprintf("%s免费招标结果_%s采购信息结果-剑鱼标讯", industryWord, keywords)
+				keywordsContent = fmt.Sprintf("%s免费招标结果,%s招投标结果,%s采购结果", industryWord, industryWord, industryWord)
+				descriptionContent = fmt.Sprintf("剑鱼标讯%s招标结果专栏,免费提供%s招标采购结果内容,寻找优质免费%s招标结果信息网站,就用剑鱼标讯!", industryWord, industryWord, industryWord)
+			} else if infoType == "招标信用信息" {
+				title = fmt.Sprintf("%s招标采购信用信息查询网-剑鱼标讯", industryWord)
+				keywordsContent = fmt.Sprintf("%s招标信用,%s投标信用,%s采购信用查询", industryWord, industryWord, industryWord)
+				descriptionContent = fmt.Sprintf("剑鱼标讯%s招标信息查询专栏,免费提供%s招标信息查询内容,寻找优质免费%s招标信用查询网站,就用剑鱼标讯!", industryWord, industryWord, industryWord)
+			} else {
+				title = fmt.Sprintf("%s免费招标信息_%s采购服务平台-剑鱼标讯", industryWord, keywords)
+				keywordsContent = fmt.Sprintf("%s免费招标信息,%s招标公告,%s中标公告,%s招标采购,%s招标网", industryWord, industryWord, industryWord, industryWord, industryWord)
+				descriptionContent = fmt.Sprintf("剑鱼标讯%s专栏,是%s招标采购的免费信息平台,免费提供%s招标采购信息、招标公告,中标结果等所有%s相关的招投标信息,寻找优质免费%s招标信息网站,就用剑鱼标讯!", industryWord, industryWord, industryWord, industryWord, industryWord)
+			}
+
 		} else if stype == "letter" {
-			title = fmt.Sprintf("%s招标采购-%s招标信息-中标公告-剑鱼标讯", letterWord, letterWord)
-			keywordsContent = fmt.Sprintf("%s招标,%s采购,%s中标,%s招标采购信息", letterWord, letterWord, letterWord, letterWord)
-			descriptionContent = fmt.Sprintf("剑鱼标讯是%s招标采购的优质信息平台,免费提供全国%s招标采购信息、招标公告,中标结果等所有%s相关的招投标信息,选择优质%s招标信息网站,就用剑鱼标讯。", letterWord, letterWord, letterWord, letterWord)
+			title = fmt.Sprintf("%s免费招标信息_%s采购平台-剑鱼标讯", letterWord, letterWord)
+			keywordsContent = fmt.Sprintf("%s免费招标信息,%s招标公告,%s中标公告,%s招标采购,%s招标网", letterWord, letterWord, letterWord, letterWord, letterWord)
+			descriptionContent = fmt.Sprintf("剑鱼标讯%s专栏,是%s招标采购的免费信息平台,免费提供全国%s招标采购信息、招标公告、中标结果等所有%s相关的招投标信息,寻找优质免费%s招标信息网站,就用剑鱼标讯!", letterWord, letterWord, letterWord, letterWord, letterWord)
 		}
 	}
 	return map[string]interface{}{

+ 1 - 2
src/main.go

@@ -1,14 +1,13 @@
 package main
 
 import (
+	"app.yhyue.com/moapp/jylog"
 	_ "jy/src/jfw/active"
 	"jy/src/jfw/config"
 	. "jy/src/jfw/config"
 	_ "jy/src/jfw/site"
 
 	"app.yhyue.com/moapp/jybase/fsw"
-	"app.yhyue.com/moapp/jylog"
-
 	// _ "jy/src/jfw/modules/app/src/jfw/course"  线下课程 dev3.5.2 21年2.24 下线
 	_ "jy/src/jfw/filter"
 	"jy/src/jfw/front"

+ 5 - 8
src/seo.json

@@ -1,6 +1,11 @@
 {
     "cdn": "",
     "qfw": {
+      "index": {
+        "description": "剑鱼标讯是国内专业的招标大数据服务平台,专注于全国招标采购信息的搜索查询、订阅推送和数据定制化服务。提供涵盖拟在建项目、招标预告、招标公告、中标公告、政府采购、企业工商信息等多种信息类型,帮助企业全方位掌握市场动态变化。招投标大数据平台就用剑鱼标讯。",
+        "key": "招标网站,招标信息查询,剑鱼标讯,招标采购信息,招标大数据平台",
+        "title": "剑鱼标讯官网-招标信息查询_全国招标采购信息订阅推送_专业招标大数据服务平台"
+      },
       "swordfish": {
         "description": "行业资讯栏目提供全网最全的招投标新闻资讯、舆情信息、行业动态、采购案例,覆盖建筑工程、弱电安防、能源化工、医疗卫生、信息技术、办公文教、机械设备、水利水电、交通运输、市政设施等",
         "key": "招投标资讯,招投标新闻舆情,建筑工程资讯,招标采购动态,剑鱼标讯",
@@ -3583,14 +3588,6 @@
 				"DESCRIPTION": "心电图机",
 				"INDUSTRY": "YLWS"
 			}
-		}, {
-			"RUXIAN": {
-				"NAME": "乳腺",
-				"TITLE": "乳腺",
-				"KEYWORDS": "乳腺",
-				"DESCRIPTION": "乳腺",
-				"INDUSTRY": "YLWS"
-			}
 		}, {
 			"BCHAO": {
 				"NAME": "B超",

+ 3 - 2
src/web/staticres/css/pc.css

@@ -370,7 +370,8 @@ form{
 .j-bottom{
 	background-color: #2B2D30;
 	color: #fff;
-	padding: 40px 0px 25px 0px;
+	/* padding: 40px 0px 25px 0px; */
+	padding: 0px 0px 25px 0px;
 	text-align: center;
 	font-weight: normal;
 }
@@ -1963,7 +1964,7 @@ form{
 
 
 .jy_classify{
- padding: 32px 0 68px;
+ padding: 40px 0 68px;
  display: flex;
  justify-content: space-between;
 }

+ 5 - 0
src/web/staticres/css/pc/index.css

@@ -1758,3 +1758,8 @@ margin-top: 2px;
 text-align: center;
 
 }
+
+/* 首页底部pc-bottom单独设置的样式 */
+.jy_classify{
+  padding-top: 32px!important;
+}

+ 10 - 3
src/web/staticres/public-pc/css/pc-bottom.css

@@ -752,9 +752,16 @@
   display: none!important;
 }
 .jy_classify_r{
-  position: relative;
+  /* position: relative; */
+  display: inline-block;
+  padding-left: 64px;
+  padding-right: 20px;
+  border-left: 1px solid rgba(255, 255, 255, 0.12);
+}
+.jy_classify_r_box{
+  display: inline-block;
 }
-.jy_classify_r::after{
+/* .jy_classify_r::after{
   position: absolute;
   content: '';
   top: 0;
@@ -764,7 +771,7 @@
   background: rgba(255, 255, 255, 0.12);
   z-index: 9;
 
-}
+} */
 
 .right-side-box {
   display: none;

+ 31 - 0
src/web/templates/common/friend-link.html

@@ -0,0 +1,31 @@
+<style>
+  .friend-link-container{
+    background-color: #2B2D30;
+    color: #fff;
+    padding: 40px 0px 0 0px;
+    text-align: center;
+    font-weight: normal;
+  }
+  .jy_friendlink{
+    color: rgba(255,255,255,.8);
+    display: flex;
+    padding: 0px 0 32px;
+    border-bottom: 1px solid rgba(255,255,255,0.12);
+  }
+</style>
+<div class="friend-link-container">
+  <div class="w jy_friendlink">
+    <div class="jy_friendlink_title">友情链接</div>
+    <div class="jy_friendlink_content">
+      <ul>
+        {{range $i,$v := Ad "jy-pc-index-friendlink" -1 .Host}}
+          <li>
+            <a href="{{$v.S_link}}" target="_blank" style="font-weight: 400;font-size: 12px;line-height: 18px;color: rgba(255, 255, 255, 0.6);">
+              {{$v.S_remark}}
+            </a>
+          </li>
+        {{end}}
+      </ul>
+    </div>
+  </div>
+</div>

+ 46 - 58
src/web/templates/common/pcbottom.html

@@ -2,21 +2,7 @@
 <div class="j-bottom" style="display: none">
 	<div>
 		<div class="jy_proandcify">
-			<div class="jy_friendlink">
-				<div class="jy_friendlink_title">友情链接</div>
-				<div class="jy_friendlink_content">
-          <ul>
-            {{range $i,$v := Ad "jy-pc-index-friendlink" -1 .Host}}
-              <li>
-                <a href="{{$v.S_link}}" target="_blank" style="font-weight: 400;font-size: 12px;line-height: 18px;color: rgba(255, 255, 255, 0.6);">
-<!--                  <img src="{{$v.S_pic}}" alt="">-->
-                  {{$v.S_remark}}
-                </a>
-              </li>
-            {{end}}
-          </ul>
-				</div>
-			</div>
+      <!-- 友情链接已移到common文件friend-link.html -->
 			<div class="jy_classify">
 				<div class="jy_classify_l">
           {{$BottomLink :=JyBottomLink .Request.URL.Path}}
@@ -29,51 +15,53 @@
             </dl>
           {{end}}
         </div>
-                <div class="jy_classify_r">
-                    <div class="jy_classify_kefu">
-                        <img src='{{Msg "seo" "cdn"}}/images/pc/logo.png?v={{Msg "seo" "version"}}' alt="" />
-                        <span>400-108-6670</span>
-                    </div>
-                    <!-- <div class="jy_classify_list">
-                        <ul>
-                            <li class="active">
-                                <span></span>
-                                <div>
-                                    <img src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
-                                    <p>扫码下载</p>
-                                </div>
-                            </li>
-                            <li style="display:none;">
-                                <span><a href='{{Msg "seo" "pcHelper.downloadUrl_win"}}?source=pc_index'></a></span>
+        <div class="jy_classify_r">
+          <div class="jy_classify_r_box">
+            <div class="jy_classify_kefu">
+                <img src='{{Msg "seo" "cdn"}}/images/pc/logo.png?v={{Msg "seo" "version"}}' alt="" />
+                <span>400-108-6670</span>
+            </div>
+            <!-- <div class="jy_classify_list">
+                <ul>
+                    <li class="active">
+                        <span></span>
+                        <div>
+                            <img src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
+                            <p>扫码下载</p>
+                        </div>
+                    </li>
+                    <li style="display:none;">
+                        <span><a href='{{Msg "seo" "pcHelper.downloadUrl_win"}}?source=pc_index'></a></span>
 
-                            </li>
-                            <li>
-                                <span><a href='{{Msg "seo" "pcHelper.downloadUrl_mac"}}?source=pc_index'></a></span>
+                    </li>
+                    <li>
+                        <span><a href='{{Msg "seo" "pcHelper.downloadUrl_mac"}}?source=pc_index'></a></span>
 
-                            </li>
-                            <li>
-                                <span></span>
-                                <div>
-                                    <img data-share-img src="/front/share/10" alt="">
-                                    <p>扫码关注</p>
-                                </div>
-                            </li>
-                            <li>
-                                <span id="share-sqq" ></span>
-                            </li>
-                        </ul>
-                    </div> -->
-                    <div class="qr_box">
-                      <div>
-                        <img src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
-                        <p>扫码下载</p>
-                    </div>
-                    <div>
-                      <img data-share-img src="/front/share/10" alt="">
-                      <p>扫码关注</p>
-                    </div>
-                    </div>
-                </div>
+                    </li>
+                    <li>
+                        <span></span>
+                        <div>
+                            <img data-share-img src="/front/share/10" alt="">
+                            <p>扫码关注</p>
+                        </div>
+                    </li>
+                    <li>
+                        <span id="share-sqq" ></span>
+                    </li>
+                </ul>
+            </div> -->
+            <div class="qr_box">
+              <div>
+                <img src='/front/downloadJyApp/qr?page=pc_bottom&source=pc_scan' alt="">
+                <p>扫码下载</p>
+              </div>
+              <div>
+                <img data-share-img src="/front/share/10" alt="">
+                <p>扫码关注</p>
+              </div>
+            </div>
+          </div>
+        </div>
 			</div>
 		</div>
         <div class="jy_renzheng">

+ 9 - 9
src/web/templates/pc/classifylist.html

@@ -1,10 +1,10 @@
 <html>
 <head>
 <!--<title>剑鱼标讯官网_{{if eq .T.seoarea ""}}{{.T.seotitle}}招标信息_剑鱼标讯,专业招标大数据服务平台{{else}}{{.T.seotitle}}招标信息_剑鱼标讯,专业招标大数据服务平台{{end}}</title>-->
-<title>剑鱼标讯官网_{{if eq .T.seostype ""}}{{.T.seotitle}}招标信息{{else}}{{.T.seotitle}}{{end}}</title>
+<title>{{.T.seo_title}}</title>
 <meta http-equiv="X-UA-Compatible" content="IE=edge,Chrome=1" />
-<meta name="Keywords" content="{{if eq .T.seoarea ""}}{{if eq .T.industry ""}}{{.T.seokeywords}}{{else}}{{.T.industry}}{{end}}{{else}}{{.T.seokeywords}}招标信息,{{.T.seokeywords}}招标公告,{{.T.seokeywords}}中标公告,{{.T.seokeywords}}招标采购,{{.T.seokeywords}}招标网{{end}}"/>
-<meta name="Description" content="{{if eq .T.seoarea ""}}{{if eq .T.industry ""}}{{.T.seodption}}{{else}}剑鱼标讯提供{{.T.industry}}全行业招标信息搜索查询、订阅推送和数据定制化服务,每天实时更新{{.T.industry}}相关的招标信息,随时随地免费查看。{{end}}{{else}}剑鱼标讯{{.T.seodption}}专栏,提供全行业最新的{{.T.seodption}}招标信息、{{.T.seodption}}招标公告、{{.T.seodption}}中标公告和{{.T.seodption}}招标采购等内容,强大的搜索查询功能,支持多条件筛选,让招投标更轻松。{{end}}"/>
+<meta name="Keywords" content="{{.T.seo_keywords}}"/>
+<meta name="Description" content="{{.T.seo_description}}"/>
 <meta content="telephone=no" name="format-detection"/>
     <meta content="light" theme="light" name="enable-header"/>
 {{include "/common/pnc.html"}}
@@ -772,11 +772,11 @@ var dataId = "";
 $(function(){
   if(!loginflag){//未登录隐藏
     $('#go-customer-4').addClass('hide')//客服隐藏
-    $('.nologin-hide').addClass('hide')  //拟建隐藏 
+    $('.nologin-hide').addClass('hide')  //拟建隐藏
   }
   window.loginCallback = function () {//登录成功回调
     $('#go-customer-4').removeClass('hide')
-    $('.nologin-hide').removeClass('hide')  
+    $('.nologin-hide').removeClass('hide')
   }
 	$(".control-tabBtn>a").hover(function(){
 		$(".control-tabBtn>a").removeClass("on");
@@ -924,12 +924,12 @@ $(function(){
       location.href='/jylab/entSearch/index.html'
     }else{//去工作桌面打开链接
       var goHref = location.origin + '/jylab/entSearch/index.html'
-      window.location.href = '/page_workDesktop/work-bench/page?link=' + goHref  
+      window.location.href = '/page_workDesktop/work-bench/page?link=' + goHref
     }
-     
+
   }else{//拉登录
     $('#bidLogin').modal("show");
-  }   
+  }
 	})
 	////////////////////////////////////////////
 });
@@ -1138,7 +1138,7 @@ function noIn(p){
   }else{
     window.open("/article/indexcontent/"+thisId+".html");
   }
-	
+
 
 }
 

+ 12 - 3
src/web/templates/pc/index.html

@@ -2,9 +2,9 @@
 <html lang="zh">
   <head>
   <meta charset="UTF-8" />
-  <title>{{Msg "seo" "qfw.swordfish.title"}}</title>
-  <meta name="Keywords" content='{{Msg "seo" "qfw.swordfish.key"}}'/>
-  <meta name="Description" content='{{Msg "seo" "qfw.swordfish.description"}}'/>
+  <title>{{Msg "seo" "qfw.index.title"}}</title>
+  <meta name="Keywords" content='{{Msg "seo" "qfw.index.key"}}'/>
+  <meta name="Description" content='{{Msg "seo" "qfw.index.description"}}'/>
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <meta name="format-detection" content="tephone=no" />
   <meta content="首页" theme="dark" name="enable-header"/>
@@ -266,6 +266,14 @@
                   </div>
                 </li>
                 {{end}}
+                <li class="provice">
+                  <a class="tab-link tab-label" href="/jycms" target="_blank">资讯站群</a>
+                  <div class="childlist">
+                    {{range $n,$m:=.T.jycmsLink}}
+                    <span><a class="tab-link" href="{{$m.url}}" target="_blank">{{$m.name}}</a></span>
+                    {{end}}
+                  </div>
+                </li>
               </ul>
             </div>
             <div class="hot-buyer-content simple-show">
@@ -539,6 +547,7 @@
       <div class="pc-index-bottom">
         <img class="bottom-member-ad" adv_name="PC首页广告位-底部" src="" alt="底部广告位">
       </div>
+      {{include "/common/friend-link.html"}}
       {{include "/common/pcbottom.html"}}
 		</section>