Merge branch 'release/v4.8.47_wky' of qmx/jy into release/v4.8.47

src/jfw/front/pcIndex.go

@@ -4,6 +4,7 @@ import (
 	"encoding/json"
 	"fmt"
 	"jy/src/jfw/config"
+	"jy/src/jfw/site/jySchool"
 	"jy/src/jfw/wx"
 	"log"
 	"math/rand"
@@ -125,6 +126,18 @@ func (m *PcIndex) NewSordfish(flag string) error {
 			m.T["recommendBeacon"] = RecommendationBeacon()
 			//热门采购单位
 			m.T["hotBuyers"] = HotBuyerList(entIsNew)
+			//招投标攻略
+			var strategyList []map[string]interface{}
+			for _, item := range jySchool.GuidelineColumn().SeedData {
+				if res := jySchool.Guideline(item.Code, 5); res != nil && len(*res) > 0 {
+					strategyList = append(strategyList, map[string]interface{}{
+						"name": item.Name,
+						"code": item.Code,
+						"list": res,
+					})
+				}
+			}
+			m.T["strategyList"] = strategyList
 			m.T["hasLogin"] = util.ObjToString(m.GetSession("userId")) != ""
 			m.T["includedInfo"] = GetIncludedInfo()
 			m.T["hotWinner"] = GetWinnerInfo()

src/jfw/jyutil/classroomiInfo.go

@@ -335,6 +335,7 @@ func GuidelineAndInformation(t, s string, num int) *[]map[string]interface{} {
 			//v["releasetime"] = util.TimeDiff(time.Unix(util.Int64All(tmpdate1), 0))
 			reltime := time.Unix(util.Int64All(tmpdate1), 0)
 			v["time"] = reltime.Format(Date_yyyyMMdd_Point) //首页展示
+			v["date"] = reltime                             //首页展示
 			v["_id"] = se.EncodeString(util.InterfaceToStr(v["_id"]))
 			v["s_pic"] = SPic(util.InterfaceToStr(v["s_pic"]))
 			v["s_pic1"] = SPic(util.InterfaceToStr(v["s_pic1"]))

src/web/staticres/css/pc/index.css

@@ -1630,7 +1630,7 @@ color: #999999;
   color: #2CB7CA;
 }
 
-.jy-index-recommend .recommend-context .item-one .more {
+.jy-index-recommend .recommend-context .item-one .more,.jy-index-strategy .strategy-content .strate_module .strate_more {
   background: url(/images/index/link-arrow.png) right center no-repeat;
   background-size: 20px 20px;
 }
@@ -1756,10 +1756,71 @@ letter-spacing: 0.1em;
 color: #686868;
 margin-top: 2px;
 text-align: center;
-
+}
+.jy-index-strategy{
+  margin-top: 60px;
+  text-decoration: none;
+}
+.jy-index-strategy .strategy-content{
+  display: flex;
+  flex-wrap: wrap;
 }
 
-/* 首页底部pc-bottom单独设置的样式 */
+.jy-index-strategy .strategy-content .strate_module{
+  flex-basis: calc(33.33% - 20px); /* 33.33% - margin */
+  margin: 10px;
+  width: 380px;
+}
+.jy-index-strategy .strategy-content .strate_title{
+  display: flex;
+  height: 38px;
+  flex-direction: row;
+  justify-content: space-between;
+  border-bottom: 1px solid #2ABED1;
+  padding-left: 20px;
+}
+.jy-index-strategy .strategy-content .strate_module .strate_title .strate_name{
+  font-size: 16px;
+  font-style: normal;
+  font-weight: 400;
+  line-height: 38px;
+}
+.jy-index-strategy .strategy-content .strate_title .strate_more{
+  padding-right: 23px;
+  color: #686868;
+  text-decoration: none;
+  line-height: 38px;
+  font-size: 14px;
+}
+.jy-index-strategy .strategy-content .strate_content{
+  display: flex;
+  flex-direction: column;
+  margin: 10px 10px 10px 20px;
+}
+.jy-index-strategy .strategy-content .strate_content .strate_c_list{
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+  margin-top: 10px;
+  height: 22px;
+}
+.jy-index-strategy .strategy-content .strate_content .strate_c_list a{
+  color: #686868;
+  text-decoration: none;
+}
+.jy-index-strategy .strategy-content .strate_content .strate_c_list a:hover{
+  color: #2CB7CA;
+}
+.jy-index-strategy .strategy-content .strate_content .strate_l_r_c_date{
+  color: #999999;
+  min-width: 50px;
+}
+.jy-index-strategy .strategy-content .strate_content .strate_c_list .title-div{
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+  /* 首页底部pc-bottom单独设置的样式 */
 .jy_classify{
   padding-top: 32px!important;
-}
+}

src/web/templates/pc/index.html

@@ -359,7 +359,7 @@
         </div>
       </div>
       <div class="jy-index-dataServices CfadeInUp">
-        <h3 class="module-title">专业的招投标大数据服务平台</h3>
+        <h3 class="module-title">数字化营销和开源情报服务平台</h3>
         <div class="dataServices-content">
           <div class="items">
             <img src="{{Msg "seo" "cdn"}}/images/index/new/serve-1.png?v={{Msg "seo" "version"}}" alt="">
@@ -393,6 +393,30 @@
           </div>
         </div>
       </div>
+      <div class="jy-index-strategy CfadeInUp">
+        <h3 class="module-title">招投标攻略</h3>
+        <div class="strategy-content w1200">
+          <!-- 攻略模块 -->
+          {{range $k,$v := .T.strategyList}}
+          <div class="strate_module">
+            <div class="strate_title">
+              <div class="strate_name">{{$v.name}}</div>
+              <a class="strate_more" href="/jySchool/{{$v.code}}/index.html">查看更多</a>
+            </div>
+            <div class="strate_content">
+              {{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">{{$n.s_title}}</a>
+                </div>
+                <div class="strate_l_r_c_date">{{FormatDate $n.date "01-02"}}</div>
+              </div>
+              {{end}}
+            </div>
+          </div>
+          {{end}}
+        </div>
+      </div>
       <!-- 多条广告如下脚本只需引入一次 -->
       <script type="text/javascript" src="//cpro.baidustatic.com/cpro/ui/cm.js" async="async" defer="defer" >
       </script>

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

@@ -60,9 +60,9 @@
             {{range $k,$v := .T.list}}
             <div class="art_list">
               <div class="art_l_left">
-                <div class="art_l_l_title ellipsis" onclick="window.location.href='/jySite/{{$v._id}}.html'">
+                <a class="art_l_l_title ellipsis" href="/jySite/{{$v._id}}.html">
                   {{$v.s_title}}
-                </div>
+                </a>
                 <div class="art_l_l_content">
                   {{$v.s_description}}
                 </div>
@@ -118,7 +118,7 @@
                   <img class="subscript" src='/site/page/jySchool/image/{{$v.docFileType}}@2x.png?v={{Msg "seo" "version"}}' alt="">
                 </div>
                 <div class="module_c_l_right">
-                  <div class="m_c_l_r_title ellipsis-2" onclick="window.location.href='/swordfish/docs/content/{{$v.docId}}'">{{$v.docName}}</div>
+                  <div class="m_c_l_r_title ellipsis-2"><a href="/swordfish/docs/content/{{$v.docId}}">{{$v.docName}}</a></div>
                   <div class="m_c_l_r_active">
                     <span>{{$v.downTimes}}次下载</span>
                     <span>共{{$v.docPageSize}}页</span>
@@ -136,9 +136,9 @@
             </div>
             <ul class="module_content">
               {{range $k,$v := .T.rightData.guideline}}
-              <li class="module_c_list" onclick="window.location.href='/jySite/{{$v._id}}.html'">
+              <li class="module_c_list">
                 <span></span>
-                <span>{{$v.s_title}}</span>
+                <span><a href="/jySite/{{$v._id}}.html">{{$v.s_title}}</a></span>
               </li>
               {{end}}
             </ul>