Merge branch 'dev/v4.8.83_rjj' of qmx/jy into feature/v4.8.83

src/jfw/front/index.go

@@ -150,7 +150,7 @@ func (nIndex *NewIndex) NewIndex() error {
 	}
 	nIndex.T["projectZone"] = projectZone
 	//中标喜报
-	nIndex.T["winnerGlad"] = WinnerGladTidings()
+	nIndex.T["winnerGlad"] = WinnerGladTidings(10)
 	//热门行业  ////重点招标
 	nIndex.T["hotIndustry"] = GetHotIndustry()
 	//热门中标企业
@@ -313,7 +313,7 @@ func GetIndexProjectList(typ, pageSize int) (data []map[string]interface{}, type
 		return nil, types
 	}
 	for _, v := range res.List() {
-		v["bid_id"] = encrypt.EncodeArticleId2ByCheck(common.InterfaceToStr(v["bid_id"]))
+		v["_id"] = encrypt.EncodeArticleId2ByCheck(common.InterfaceToStr(v["bid_id"]))
 		v["publish_time"] = time.Unix(common.Int64All(v["publish_time"]), 0).Format("2006-01-02")
 		data = append(data, v)
 	}

src/web/templates/pc/template/index/bidding-good-news-card.html

@@ -8,7 +8,7 @@
       {{range $kk,$vv := $v}}
       <li class="notice-card-list-item">
         <i class="notice-item-prefix-icon j-icon base-icon icon-img-sahua"></i>
-        <p class="notice-card-list-item-content ellipsis">[恭贺]{{$kk}}</p>
+        <p class="notice-card-list-item-content ellipsis"><a href="/nologin/content/{{$vv}}.html">[恭贺]{{$kk}}</a></p>
       </li>
       {{end}}
       {{end}}

src/web/templates/pc/template/index/project-card-list-container.html

@@ -16,7 +16,7 @@
         <ul class="cms-card-list clearfix">
           {{range $vv := $v.listData}}
           <li class="cms-card-list-item">
-            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="" href="/nologin/content/{{$vv.bid_id}}.html" target="_blank">{{$vv.title}}</a>
+            <a class="cms-card-list-item-left cms-link ellipsis" target="_blank" title="" href="/nologin/content/{{$vv._id}}.html" target="_blank">{{$vv.title}}</a>
             <span class="cms-card-list-item-right">{{$vv.publish_time}}</span>
           </li>
           {{end}}