Merge branch 'hotfix/v4.9.11.1' into feature/v4.9.14

src/index.yaml

@@ -62,7 +62,7 @@ topMenu:
   - title: 营销分析
     child:
       - name: 企业分析
-        href: /jylab/entSearch/index.html?searchvalue=&searchvalue=&selectType=title%2Ccontent
+        href: /jylab/entSearch/index.html
       - name: 市场分析
         href: /front/routerRelay/scfx
         class: red

src/jfw/front/dataServiceArea.go

@@ -6,6 +6,8 @@ import (
 	"app.yhyue.com/moapp/jypkg/public"
 	"encoding/json"
 	"fmt"
+	"strings"
+
 	//_ "github.com/gogf/gf/contrib/drivers/clickhouse/v2"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
@@ -41,11 +43,18 @@ type (
 		Name string
 		Url  string
 	}
+	keyBidding struct {
+		code     string
+		area     string
+		city     string
+		district string
+	}
 )
 
 var (
-	siteCodeMap map[string]*KeyWordSiteNode
-	specialArea = map[string]bool{"北京": true, "上海": true, "天津": true, "重庆": true}
+	siteCodeMap       map[string]*KeyWordSiteNode
+	specialArea       = map[string]bool{"北京": true, "上海": true, "天津": true, "重庆": true}
+	KeyBiddingAreaMap []keyBidding
 )
 
 func init() {
@@ -63,6 +72,18 @@ func init() {
 			siteCodeMap[node.Code] = node
 		}
 	}
+	KeyBiddingArea, _ := config.Sysconfig["keyBiddingArea"].(string)
+	resArr, err := g.DB().Query(gctx.New(), fmt.Sprintf(`SELECT area ,city,district,pcode  FROM jyseo_test.seo_area_code where  class = 4 and area in ('%s') %s`, strings.ReplaceAll(KeyBiddingArea, ",", `','`), `and (district LIKE '%县%' or district LIKE '%市%')`))
+	if err == nil && !resArr.IsEmpty() {
+		for _, m := range resArr.List() {
+			KeyBiddingAreaMap = append(KeyBiddingAreaMap, keyBidding{
+				area:     gconv.String(m["area"]),
+				city:     gconv.String(m["city"]),
+				district: gconv.String(m["district"]),
+				code:     gconv.String(m["pcode"]),
+			})
+		}
+	}
 }
 
 // 政府招标
@@ -136,6 +157,41 @@ func GovernmentTender(number int) []argument {
 	return data
 }
 
+// 重点招标区域
+func DistrictsTender(number int) []argument {
+	redisKey := "districtsTender"
+	redisData := redis.Get(RedisNameNew, redisKey)
+	if redisData != nil {
+		if d, err := json.Marshal(redisData); err == nil {
+			var signature []argument
+			json.Unmarshal(d, &signature)
+			return signature
+		}
+	}
+
+	var (
+		data       []argument
+		upperLimit int
+	)
+	areaMap := make(map[string]int)
+	for _, acronym := range KeyBiddingAreaMap {
+		if areaMap[acronym.area] > 2 {
+			continue
+		}
+		areaMap[acronym.area]++
+		upperLimit++
+		if upperLimit > number {
+			break
+		}
+		data = append(data, argument{
+			fmt.Sprintf("%s%s", acronym.city, acronym.district),
+			fmt.Sprintf("/list/area/%s.html", acronym.code),
+		})
+	}
+	redis.Put(RedisNameNew, redisKey, data, RedisTimeout)
+	return data
+}
+
 /*
 const (
 	PSearch_DecMust = `"bidstatus": ["中标","成交","合同","单一"]`

src/jfw/front/index.go

@@ -264,8 +264,10 @@ func (nIndex *NewIndex) NewIndex() error {
 	nIndex.T["strategyList"] = GetStrategyList()
 	//剑鱼课堂
 	nIndex.T["jySchool"] = jyutil.Course(6, 3)
-	//政府招标
+	// 政府招标
 	nIndex.T["governmentBidding"] = GovernmentTender(15)
+	//区县招标
+	nIndex.T["districtsBidding"] = DistrictsTender(15)
 	nIndex.T["importBidding"] = GetImportBidding()
 	//nIndex.T["biddingTrend"] = HomeBiddingTrends()
 	nIndex.T["hotBuyerData"] = PurchasingData()

src/jfw/front/pcIndex.go

@@ -733,7 +733,9 @@ func getkeysMap() []map[string][]map[string]interface{} {
 	sortArr := util.ObjArrToStringArr(config.Seoconfig["hotlabkeywordsSort"].([]interface{}))
 	keymap, _ := config.Seoconfig["keywordsArr"].([]interface{})
 	//
+	var limit int = 28
 	industrymp, _ := config.Seoconfig["industry"].(map[string]interface{})
+	keyLenMap := map[string]int{}
 	if len(keymap) > 0 {
 		for _, v := range keymap {
 			keys := v.(map[string]interface{})
@@ -750,6 +752,12 @@ func getkeysMap() []map[string][]map[string]interface{} {
 						}
 					}
 				}
+				tl := len([]rune(keysname))
+				if keyLenMap[industry]+tl > limit {
+					continue
+				}
+				keyLenMap[industry] = keyLenMap[industry] + tl
+				//限制返回字数量
 				m[industry] = append(m[industry], map[string]interface{}{
 					"key": keysname,
 					"url": fmt.Sprintf("/list/keywords/%s.html", kk),
@@ -830,11 +838,13 @@ func GetIndexHotKey() (loginEd []string) {
 	for _, v := range pcIndexHotKey {
 		m[v] = true
 	}
+	var keywordLen int = 0
 	for key, _ := range m {
-		loginEd = append(loginEd, key)
-		if len(loginEd) == int(pcIndexHotKeyLimit) {
+		keywordLen = keywordLen + len([]rune(key))
+		if keywordLen > int(pcIndexHotKeyLimit) {
 			break
 		}
+		loginEd = append(loginEd, key)
 	}
 	return
 }
@@ -852,11 +862,16 @@ var getIndexHotKeyNoLoginFunc = func() func() []*hotKeyWord {
 		if limit > rLen {
 			return rData
 		}
-
+		var keywordLen int = 0
 		repeat := map[string]bool{}
-		for len(final) < limit {
+		for {
 			rand.Seed(time.Now().UnixNano())
 			if val := rData[rand.Intn(rLen)]; !repeat[val.Name] {
+				l := len([]rune(val.Name))
+				keywordLen = keywordLen + l
+				if keywordLen > limit {
+					return final
+				}
 				final = append(final, val)
 				repeat[val.Name] = true
 			}

src/jfw/modules/app/src/app/front/tags.go

@@ -50,7 +50,7 @@ type Tags struct {
 	isLogin       xweb.Mapper `xweb:"/jyapp/free/isLogin"`
 	strategyIndex xweb.Mapper `xweb:"/jySchool/strategy"`
 	class         xweb.Mapper `xweb:"/jySchool/(.*)/index([^.]*).html"`
-	details       xweb.Mapper `xweb:"/jySite/([^.]*).html"`
+	details       xweb.Mapper `xweb:"/(jySite|jyblog)/([^.]*).html"`
 }
 
 func init() {
@@ -450,7 +450,7 @@ func (tg *Tags) Class(thisCode string, pageNumStr string) {
 }
 
 // 详情
-func (tg *Tags) Details(id string) {
+func (tg *Tags) Details(urlMod, id string) {
 	var (
 		platform = "PC"
 	)
@@ -460,6 +460,10 @@ func (tg *Tags) Details(id string) {
 	}
 	sid := se.DecodeString(id)
 	sCode, tCode := jyutil.GetSiteInfo(sid)
+	if sCode == "ztbgl" && strings.Contains(urlMod, "jySite") {
+		tg.Redirect(fmt.Sprintf("/jyblog/%s.html", id), 301)
+		return
+	}
 	// 文章栏目名
 	tg.T["pCode"] = sCode
 	// 文章内容

src/jfw/modules/app/src/app/jyutil/strategy.go

@@ -81,7 +81,7 @@ func GetNewStrategy(t string, num int) (res []*InfoList) {
 			s_title := util.InterfaceToStr(v["s_title"])
 			res = append(res, &InfoList{
 				Title: s_title,
-				Url:   fmt.Sprintf("/jySite/%s.html", se.EncodeString(util.InterfaceToStr(v["_id"]))),
+				Url:   fmt.Sprintf("/jyblog/%s.html", se.EncodeString(util.InterfaceToStr(v["_id"]))),
 			})
 			v["_id"] = se.EncodeString(util.InterfaceToStr(v["_id"]))
 		}

src/jfw/modules/app/src/web/templates/tags/details.html

@@ -29,8 +29,8 @@
           {{end}}
         </div>
         <div class="turn-page-container">
-          {{if .T.lastId}}<a href="/jySite/{{.T.lastId}}.html" class="page-button last-page active"><i class="j-icon base-icon icon-arrow-right-gray"></i>上一篇</a>{{end}}
-          {{if .T.nextId}}<a href="/jySite/{{.T.nextId}}.html" class="page-button next-page">下一篇<i class="j-icon base-icon icon-arrow-right-gray"></i></a>{{end}}
+          {{if .T.lastId}}<a href="/jyblog/{{.T.lastId}}.html" class="page-button last-page active"><i class="j-icon base-icon icon-arrow-right-gray"></i>上一篇</a>{{end}}
+          {{if .T.nextId}}<a href="/jyblog/{{.T.nextId}}.html" class="page-button next-page">下一篇<i class="j-icon base-icon icon-arrow-right-gray"></i></a>{{end}}
         </div>
        </div>
        {{include "/tags/template/tag-card-strategy-recommend.html"}}

src/jfw/modules/app/src/web/templates/tags/template/tag-card-strategy-recommend.html

@@ -7,7 +7,7 @@
     <ul class="tag-card-list">
       {{range $k,$v:= .T.bottomInfo}}
       <li class="tag-card-item tag-card-strategy-item">
-        <a href="/jySite/{{$v._id}}.html">
+        <a href="/jyblog/{{$v._id}}.html">
           <div class="card-item-left">
             <img src="{{$v.s_pic1}}" alt="{{$v.s_title}}" onerror="">
           </div>

src/jfw/modules/app/src/web/templates/tags/template/tag-card-strategy-title.html

@@ -11,7 +11,7 @@
       <ul class="tag-card-list">
       {{range $article := $column.list}}
         <li class="tag-card-item tag-card-strategy-item">
-          <a href="/jySite/{{$article._id}}.html">
+          <a href="/jyblog/{{$article._id}}.html">
             <div class="card-item-left">
               <img src="{{$article.s_pic1}}" alt="{{$article.s_title}}" onerror="">
             </div>

src/jfw/modules/app/src/web/templates/tags/template/tag-card-strategy.html

@@ -3,7 +3,7 @@
     <ul class="tag-card-list">
       {{range $v := .T.list}}
       <li class="tag-card-item tag-card-strategy-item">
-        <a href="/jySite/{{$v._id}}.html">
+        <a href="/jyblog/{{$v._id}}.html">
           <div class="card-item-left">
             <img src="{{$v.s_pic1}}" alt="{{$v.s_title}}" onerror="">
           </div>

src/jfw/site/jyblog/service.go

@@ -75,6 +75,9 @@ func (f *JyBlog) Jybdetail(_id string) error {
 func (f *JyBlog) JyBlogDetailNew(id string) error {
 	sid := se.DecodeString(id)
 	sCode, tCode := jyutil.GetSiteInfo(sid)
+	if sCode == "ztbgl" {
+		return f.Redirect(fmt.Sprintf("/jyblog/%s.html", id), 301)
+	}
 	// 文章栏目名
 	f.T["pCode"] = sCode
 	// 文章内容

src/web/staticres/css/pc.css

@@ -2546,6 +2546,26 @@ form{
     color: #252627;
 	line-height:28px;
 }
+.jyb_ddetail h2{
+  margin: 20px 0;
+  font-size: 22px;
+}
+.jyb_ddetail h3{
+	margin: 20px 0;
+	font-size:20px;
+}
+.jyb_ddetail h4{
+	margin: 20px 0;
+	font-size: 18px;
+}
+.jyb_ddetail p{
+	font-size: 14px;
+	text-align:justify;
+}
+.jyb_ddetail img{
+  width: 100%;
+	margin: 20px 0;
+}
 .b-pcshare-content {
     position: absolute;
     right: -22px;

src/web/staticres/js/index/index_2023.12.js

@@ -312,14 +312,16 @@ var _page = {
     var _this = this
     $('.hot-industry .industry-aside-item-content.max-line-2').each(function () {
       // 获取第二行最后一个元素
-      var $s = _page.getLine2LastDom($(this), $(this).find('li'))
+      var $s = _page.getLine2LastDom($(this), $(this).find('li:not(.more)'))
       $s.attr('data-simple-hidden', '')
       if ($s.find('a').text().length < 2) {
         $s.prev().attr('data-simple-hidden', '')
       }
       $s.nextAll(':not(.more)').attr('data-simple-hidden', '')
-      $('.hot-industry [data-simple-hidden]').addClass('hidden')
+      // seo需求 不让display:none隐藏元素
+      $('.hot-industry [data-simple-hidden]').remove()
     })
+    $('.hot-industry .industry-aside-item-content.max-line-2 li:not(.more):gt(9)').attr('data-simple-hidden')
 
     // $('.hot-industry .more').on('click', function () {
     //   $(this).parents('.industry-aside-item-content').find('[data-simple-hidden]').removeClass('hidden')

src/web/staticres/pccss/index_pc.css

@@ -878,7 +878,7 @@
     line-height: 22px;
 }
 .industry-aside-list ul li {
-    margin-right: 8px;
+    margin-right: 7px;
     margin-bottom: 4px;
 }
 .industry-aside-list {
@@ -917,6 +917,9 @@
     flex: 1;
 }
 .ent-list-module-content-right .hot-buyer-card-header {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
     margin-bottom: 2px;
 }
 .ent-list-module-content .cms-card-list {
@@ -1029,6 +1032,39 @@
     display: block;
     width: 584px;
     height: 314px;
+    background: url(/images/index/service-module-bg.png) no-repeat center center;
+    background-size: cover;
+}
+.service-flow-chart-ul{
+    display: flex;
+    flex-wrap: wrap;
+    padding: 27px 16px;
+}
+.service-flow-chart-li{
+    width: 48%;
+    color: #1D1D1D;
+    padding-left: 26px;
+    background: url(/images/index/new-index-triangle.png) no-repeat left 4px;
+    background-size: 14px 14px;
+}
+.service-flow-chart-li:nth-child(odd) {
+    margin-right: 20px;
+}
+.chart-li-header{
+    position: relative;
+    padding-bottom: 4px;
+    color: #1D1D1D;
+    font-size: 14px;
+    line-height: 24px;
+    border-bottom: 1px solid #2ABED1;
+}
+
+.chart-li-content{
+    padding: 4px 4px 14px 0;
+    font-size: 12px;
+    line-height: 20px;
+    color: #686868;
+    text-align: justify;
 }
 .service-desc-button {
     display: flex;

src/web/staticres/tags/css/no-login-detail.css

@@ -470,3 +470,6 @@
 .need-login{
     cursor: pointer;
 }
+.no-login-detail ul li{
+  float: unset!important;
+}

src/web/templates/common/pc-login-dialog.html

@@ -181,7 +181,7 @@
               <span data-name="register_get_sms" class="l-get-sms is-stop">获取验证码</span>
             </div>
           </div>
-          <div class="login-dig-input-box" data-error="公司名称最少4个字">
+          <!-- <div class="login-dig-input-box" data-error="公司名称最少4个字">
             <i class="login-dig-icon-ent"></i>
             <input maxlength="30" autocomplete="off" name="verify_entname" type="text" placeholder="输入公司名称" />
             <div class="autocomplete-box">
@@ -193,7 +193,7 @@
           <div class="login-dig-input-box" data-error="邮箱输入错误">
             <i class="login-dig-icon-email"></i>
             <input autocomplete="off" class="register_email" type="text" placeholder="输入电子邮箱" />
-          </div>
+          </div> -->
           <!-- <div class="login-dig-input-box" data-error="邮箱输入错误">
             <i class="login-dig-icon-email"></i>
             <input autocomplete="off" name="register_email" type="text" placeholder="输入电子邮箱">

src/web/templates/pc/index.html

@@ -438,7 +438,7 @@
               {{range $m,$n := $v.list}}
               <div class="strate_c_list">
                 <div class="title-div">
-                  <a class="strate_l_r_title" href="/jySite/{{$n._id}}.html" target="_blank" title="{{$n.s_title}}">{{$n.s_title}}</a>
+                  <a class="strate_l_r_title" href="/jyblog/{{$n._id}}.html" target="_blank" title="{{$n.s_title}}">{{$n.s_title}}</a>
                 </div>
                 <div class="strate_l_r_c_date">{{FormatDate $n.date "01-02"}}</div>
               </div>

src/web/templates/pc/index_old_23_06_16.html

@@ -339,7 +339,7 @@
         <div class="w1200 news-container">
         {{range $i, $v := JyCms "hyzx" 12}}
           {{if eq $i 0}}
-          <div class="news-card" onclick="window.open('/jySite/{{$v._id}}.html')">
+          <div class="news-card" onclick="window.open('/jyblog/{{$v._id}}.html')">
             <div class="card-img">
               <img src="{{$v.s_pic1}}" alt="{{$v.s_title}}">
             </div>
@@ -355,7 +355,7 @@
         <div class="news-list">
           {{range $i, $v := JyCms "hyzx" 12}}
             {{if gt $i 0}}
-              <a class="news-item" href="/jySite/{{$v._id}}.html" target="_blank">
+              <a class="news-item" href="/jyblog/{{$v._id}}.html" target="_blank">
                 <span class="news-item-text">{{$v.s_title}}</span>
                 <span class="news-item-date">{{$v.time}}</span>
               </a>

src/web/templates/pc/jyblogdetail_new.html

@@ -84,8 +84,8 @@
 <!--          </p>-->
           <div class="jyb_ddetail">{{.T.data.s_content}}</div>
           <div class="btn_next">
-            <button {{if .T.lastId}} onclick="window.location.href='/jySite/{{.T.lastId}}.html'" {{else}} disabled="disabled" {{end}}>上一篇</button>
-            <button {{if .T.nextId}} onclick="window.location.href='/jySite/{{.T.nextId}}.html'"  {{else}} disabled="disabled" {{end}}>下一篇</button>
+            <button {{if .T.lastId}} onclick="window.location.href='/jyblog/{{.T.lastId}}.html'" {{else}} disabled="disabled" {{end}}>上一篇</button>
+            <button {{if .T.nextId}} onclick="window.location.href='/jyblog/{{.T.nextId}}.html'"  {{else}} disabled="disabled" {{end}}>下一篇</button>
           </div>
         </div>
         {{range $k,$v:= .T.bottomInfo}}
@@ -118,7 +118,7 @@
           {{range $k,$v := .T.rightInfo.latestPush}}
             <li class="module_c_list">
               <span></span>
-              <span href="/jySite/{{$v._id}}.html">{{$v.s_title}}</span>
+              <span href="/jyblog/{{$v._id}}.html">{{$v.s_title}}</span>
             </li>
           {{end}}
           </ul>
@@ -133,7 +133,7 @@
             {{range $k,$v := .T.rightInfo.randomExtraction}}
             <li class="module_c_list">
               <span></span>
-              <span href="/jySite/{{$v._id}}.html">{{$v.s_title}}</span>
+              <span href="/jyblog/{{$v._id}}.html">{{$v.s_title}}</span>
             </li>
             {{end}}
           </ul>

src/web/templates/pc/tags/template/aside-news-cards.html

@@ -21,7 +21,7 @@
     <section class="tags-card news-card industry-news">
         <header class="tags-card-header">
             <span class="left-line"></span>
-            <span class="h-title">行业资讯</span>
+            <span class="h-title">招投标攻略</span>
         </header>
         <main class="tags-card-main">
             <div class="tags-card-list">

src/web/templates/pc/template/index/bidding-desc-module.html

@@ -17,7 +17,7 @@
         <ul class="bidding-desc-card-column clearfix">
           {{range $kk,$vv := $v.list}}
           <li class="cms-card-list-item">
-            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" href="/jySite/{{$vv._id}}.html" title="{{$vv.s_title}}">{{$vv.s_title}}</a>
+            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" href="/jyblog/{{$vv._id}}.html" title="{{$vv.s_title}}">{{$vv.s_title}}</a>
             <span class="cms-card-list-item-right">{{FormatDate $vv.date "2006-01-02"}}</span>
           </li>
           {{end}}

src/web/templates/pc/template/index/ent-list-module.html

@@ -8,6 +8,9 @@
       <section class="cms-card header-deep-theme zb-aside-card">
         <header class="cms-card-header">
           <h3 class="cms-card-title">热门中标企业</h3>
+          <div class="cms-card-header-right">
+            <a class="pointer cms-link" href="/qy/" target="_blank">查看更多 ></a>
+          </div>
         </header>
         <main class="cms-card-content border-ec">
           <ul class="cms-card-list clearfix">

src/web/templates/pc/template/index/ent-service-module.html

@@ -29,16 +29,28 @@
       </section>
     </div>
     <div class="service-module-content-right">
-      {{$ad_ent_service:=(Ad "new-pc-index-ent-service" 1 .Host)}}
-      {{if $ad_5}}
       <div class="service-flow-chart">
-        {{range $ad := $ad_ent_service}}
-        <a class="service-flow-chart-link" {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}} target="_blank">
-          <img src="{{$ad.S_pic}}" alt="{{$ad.S_picalt}}">
-        </a>
-        {{end}}
+        <div class="service-flow-chart-link">
+          <ul class="service-flow-chart-ul">
+            <li class="service-flow-chart-li">
+              <h5 class="chart-li-header">01 数字驱动为销售赋能</h5>
+              <p class="chart-li-content">以数字为驱动，业情一体，将销售业务与商业情报相结合，通过线索跟踪与转化、销售流程管理、数据分析等能力，促进销售转化，全面洞察营销效果，帮助企业做出市场决策。</p>
+            </li>
+            <li class="service-flow-chart-li">
+              <h5 class="chart-li-header">02 实现商机和用户的全量管理</h5>
+              <p class="chart-li-content">结合自身的招标、中标等资讯优势，高效地整合全量的商业情报与目标用户信息等销售业务相结合，做到应知尽知，应跟尽跟，挖掘潜在商机，不断拓展业务。</p>
+            </li>
+            <li class="service-flow-chart-li">
+              <h5 class="chart-li-header">03 销售全流程数字化管理</h5>
+              <p class="chart-li-content">从线索的分发、销售机会跟踪和管理到机会复盘，全流程数字化管理，推动业务有序流转，帮助团队把握销售时机，更快地达成销售任务。</p>
+            </li>
+            <li class="service-flow-chart-li">
+              <h5 class="chart-li-header">04 企业销售团队高效协同</h5>
+              <p class="chart-li-content">通过标讯类资讯共享、团队内群聊等便捷的沟通交流，帮助销售团队之间协作和共享信息，更好地跟进销售机会，提高工作效率。</p>
+            </li>
+          </ul>
+        </div>
       </div>
-      {{end}}
     </div>
   </main>
 </section>

src/web/templates/pc/template/index/hot-buyer-card.html

@@ -1,6 +1,9 @@
 <section class="hot-buyer-card">
   <header class="hot-buyer-card-header">
     <h3 class="hot-buyer-card-title title-left-line">热门采购单位</h3>
+    <div class="cms-card-header-right">
+      <a class="pointer cms-link" href="/dw/" target="_blank">查看更多 ></a>
+    </div>
   </header>
   <main class="hot-buyer-card-content">
     <ul class="hot-buyer-list clearfix">

src/web/templates/pc/template/index/important-gov-bidding.html

@@ -2,13 +2,19 @@
 <section class="module-card-container important-gov-card">
   <header class="module-card-header">
     <span class="i-g-card-header-tab" data-name="重点招标">重点招标</span>
+    <span class="i-g-card-header-tab" data-name="地区招标">地区招标</span>
     <span class="i-g-card-header-tab" data-name="政府招标">政府招标</span>
   </header>
   <main class="module-card-content ent-list-module-content">
     <ul class="i-g-card-list clearfix">
       <li class="i-g-card-list-item" data-value="重点招标" style="display: none;">
         {{range $v := .T.importBidding}}
-        <a class="cms-link" href="{{$v.Url}}" title="{{$v.Name}}" target="_blank">{{$v.Name}}</a>
+        <a class="cms-link" href="{{$v.Url}}" title="{{$v.Name}}招标采购" target="_blank">{{$v.Name}}</a>
+        {{end}}
+      </li>
+      <li class="i-g-card-list-item" data-value="地区招标" style="display: none;">
+        {{range $n := .T.districtsBidding}}
+        <a class="cms-link" href="{{$n.Url}}" title="{{$n.Name}}" target="_blank">{{$n.Name}}</a>
         {{end}}
       </li>
       <li class="i-g-card-list-item" data-value="政府招标" style="display: none;">

src/web/templates/site/page/industryInfo/class.html

@@ -60,7 +60,7 @@
             {{range $k,$v := .T.list}}
             <div class="art_list">
               <div class="art_l_left">
-                <a class="art_l_l_title ellipsis" href="/jySite/{{$v._id}}.html">
+                <a class="art_l_l_title ellipsis" href="/jyblog/{{$v._id}}.html">
                   {{$v.s_title}}
                 </a>
                 <div class="art_l_l_content">
@@ -138,7 +138,7 @@
               {{range $k,$v := .T.rightData.guideline}}
               <li class="module_c_list">
                 <span></span>
-                <span><a href="/jySite/{{$v._id}}.html">{{$v.s_title}}</a></span>
+                <span><a href="/jyblog/{{$v._id}}.html">{{$v.s_title}}</a></span>
               </li>
               {{end}}
             </ul>

src/web/templates/site/page/jySchool/class.html

@@ -78,7 +78,7 @@
                 {{range $k,$v := .T.list}}
                 <div class="art_list">
                   <div class="art_l_left">
-                    <a class="art_l_l_title ellipsis" href="/jySite/{{$v._id}}.html" title="{{$v.s_title}}">
+                    <a class="art_l_l_title ellipsis" href="/jyblog/{{$v._id}}.html" title="{{$v.s_title}}">
                       {{$v.s_title}}
                     </a>
                     <div class="art_l_l_content">
@@ -109,7 +109,7 @@
                   {{range $i,$v := .T.rightData.hotspot}}
                   <li class="module_c_list">
                       <span></span>
-                      <span><a href="/jySite/{{$v._id}}.html">{{$v.s_title}}</a></span>
+                      <span><a href="/jyblog/{{$v._id}}.html">{{$v.s_title}}</a></span>
                   </li>
                   {{end}}
                 </ul>
@@ -123,7 +123,7 @@
                   {{range $i,$v := .T.rightData.important}}
                     <li class="module_c_list">
                       <span></span>
-                      <span><a href="/jySite/{{$v._id}}.html">{{$v.s_title}}</a></span>
+                      <span><a href="/jyblog/{{$v._id}}.html">{{$v.s_title}}</a></span>
                     </li>
                   {{end}}
                 </ul>

src/web/templates/site/page/jySchool/index.html

@@ -143,7 +143,7 @@
                 <div class="str-title">{{$v.name}}</div>
                 <div class="str-body">
                   {{range $m,$n := $v.list}}
-                  <div class="s-b-item" onclick="window.location.href='/jySite/{{$n._id}}.html'">
+                  <div class="s-b-item" onclick="window.location.href='/jyblog/{{$n._id}}.html'">
                     <img class="s-b-item-bg" src='{{$n.s_pic1}}?v={{Msg "seo" "version"}}' alt="{{$n.s_title}}">
                     <div class="s-b-item-bar">
                       <p class="ellipsis-2">{{$n.s_title}}</p>

src/web/templates/site/page/jySchool/search.html

@@ -59,7 +59,7 @@
             {{range $k,$v := .T.list}}
             <div class="art_list">
               <div class="art_l_left">
-                <div class="art_l_l_title ellipsis" title="{{$v.s_title}}" onclick="window.location.href='/jySite/{{$v._id}}.html'">
+                <div class="art_l_l_title ellipsis" title="{{$v.s_title}}" onclick="window.location.href='/jyblog/{{$v._id}}.html'">
                   {{$v.s_title}}
                 </div>
                 <div class="art_l_l_content">
@@ -91,7 +91,7 @@
                 {{range $k,$v := .T.other.latestPush}}
                 <li class="module_c_list">
                   <span></span>
-                  <span onclick="window.location.href='/jySite/{{$v._id}}.html'">{{$v.s_title}}</span>
+                  <span onclick="window.location.href='/jyblog/{{$v._id}}.html'">{{$v.s_title}}</span>
                 </li>
                 {{end}}
               </ul>
@@ -105,7 +105,7 @@
                 {{range $k,$v := .T.other.randomExtraction}}
                 <li class="module_c_list">
                   <span></span>
-                  <span onclick="window.location.href='/jySite/{{$v._id}}.html'">{{$v.s_title}}</span>
+                  <span onclick="window.location.href='/jyblog/{{$v._id}}.html'">{{$v.s_title}}</span>
                 </li>
                 {{end}}
               </ul>
@@ -134,7 +134,7 @@
                   </div>
                   {{end}}
                   <div class="strate_l_right">
-                    <div class="strate_l_r_title" onclick="window.location.href='/jySite/{{$v._id}}.html'">{{$v.s_title}}</div>
+                    <div class="strate_l_r_title" onclick="window.location.href='/jyblog/{{$v._id}}.html'">{{$v.s_title}}</div>
                     <div class="strate_l_r_content">
                       <div class="strate_l_r_c_text">{{$v.s_description}}</div>
                       <div class="strate_l_r_c_date">{{$v.time}}</div>
@@ -161,7 +161,7 @@
                   </div>
                   {{end}}
                   <div class="strate_l_right">
-                    <div class="strate_l_r_title" onclick="window.location.href='/jySite/{{$v._id}}.html'">{{$v.s_title}}</div>
+                    <div class="strate_l_r_title" onclick="window.location.href='/jyblog/{{$v._id}}.html'">{{$v.s_title}}</div>
                     <div class="strate_l_r_content">
                       <div class="strate_l_r_c_text">{{$v.s_description}}</div>
                       <div class="strate_l_r_c_date">{{$v.time}}</div>

src/web/templates/site/page/jySchool/strategy.html

@@ -50,7 +50,7 @@
                   <img src="{{$n.s_pic1}}" alt="">
                 </div>
                 <div class="strate_l_right">
-                  <a class="strate_l_r_title" href="/jySite/{{$n._id}}.html">{{$n.s_title}}</a>
+                  <a class="strate_l_r_title" href="/jyblog/{{$n._id}}.html">{{$n.s_title}}</a>
                   <div class="strate_l_r_content">
                     <div class="strate_l_r_c_text">{{$n.s_description}}</div>
                     <div class="strate_l_r_c_date">{{$n.time}}</div>

src/web/templates/site/page/jyblogdetail.html

@@ -98,8 +98,8 @@
             <div class="jyb_ddetail jyb_content">{{.T.data.s_content}}</div>
           </div>
           <div class="btn_next">
-            {{if .T.lastId}}<a href="/jySite/{{.T.lastId}}.html"><button class="before_btn">上一篇</button></a>{{end}}
-            {{if .T.nextId}}<a href="/jySite/{{.T.nextId}}.html"><button class="next_btn">下一篇</button></a>{{end}}
+            {{if .T.lastId}}<a href="/jyblog/{{.T.lastId}}.html"><button class="before_btn">上一篇</button></a>{{end}}
+            {{if .T.nextId}}<a href="/jyblog/{{.T.nextId}}.html"><button class="next_btn">下一篇</button></a>{{end}}
           </div>
         </div>
         <div class="recommend_title">
@@ -108,7 +108,7 @@
         {{range $k,$v:= .T.bottomInfo}}
         <div class="art_list">
           <div class="art_l_left">
-              <a class="art_l_l_title ellipsis" href="/jySite/{{$v._id}}.html">
+              <a class="art_l_l_title ellipsis" href="/jyblog/{{$v._id}}.html">
               {{$v.s_title}}
               </a>
             <div class="art_l_l_content">
@@ -142,7 +142,7 @@
           {{range $k,$v := .T.rightInfo.latestPush}}
             <li class="module_c_list">
               <span></span>
-              <a href="/jySite/{{$v._id}}.html">
+              <a href="/jyblog/{{$v._id}}.html">
                 <span>{{$v.s_title}}</span>
               </a>
             </li>
@@ -168,7 +168,7 @@
             {{range $k,$v := .T.rightInfo.randomExtraction}}
             <li class="module_c_list">
               <span></span>
-              <a href="/jySite/{{$v._id}}.html">
+              <a href="/jyblog/{{$v._id}}.html">
                 <span>{{$v.s_title}}</span>
               </a>
             </li>