分支合并

src/jfw/front/dataMarket.go

@@ -24,6 +24,7 @@ func init() {
 func (this *DataMarket) Index() {
 	data := config.Middleground.Publicservice.List("", "", 1, 8)
 	this.T["list"] = data["list"]
+	this.T["includedInfo"] = GetIncludedInfo()
 	this.Render("/dataMarket/index.html")
 }
 

src/web/staticres/dataSmt/css/index.css

@@ -237,7 +237,7 @@ a:focus{
   font-size: 16px;
   line-height: 24px;
   overflow: hidden;
-  max-width: 210px;
+  max-width: 290px;
   white-space: nowrap;
   text-overflow: ellipsis;
 }
@@ -276,13 +276,14 @@ a:focus{
 
 .data-export .export-case{
   width: 100%;
-  height: 480px;
+  padding: 42px 0 58px;
+  /* height: 480px; */
   background: #fff;
   border-radius: 16px;
   box-shadow: 0 4px 24px 0px rgba(2, 52, 128, 0.1); 
 }
 .data-export .export-case .case-title{
-  padding: 28px 0 32px;
+  padding: 0 0 32px;
   color: #1D1D1D;
   font-size: 20px;
   line-height: 32px;
@@ -292,26 +293,30 @@ a:focus{
   display: flex;
   flex-wrap: wrap;
   align-items: center;
+  padding-left: 14px;
 }
 .data-export .case-container .case-item{
-  /* flex: 1; */
-  width: 300px;
-  display: flex;
-  padding: 32px 32px 28px;
-  flex-direction: column;
-  align-items: center;
-  border-right: 1px solid #ECECEC;
-  border-bottom: 1px solid #ECECEC;
+  flex-shrink: 0;
+  width: 130px;
+  height: 100px;
+  margin-right: 14px;
+  overflow: hidden;
 }
-.data-export .case-container .case-item:nth-child(n+5) {
+.data-export .case-container .case-item:hover{
+  background: #FFFFFF;
+  box-shadow: 0px 0px 24px rgba(0, 0, 0, 0.16);
+  border-radius: 8px;
+  z-index: 2;
+}
+/* .data-export .case-container .case-item:nth-child(n+5) {
   border-bottom: 0;
 }
 .data-export .case-container .case-item:nth-child(4n) {
   border-right: 0;
-}
+} */
 .data-export .case-item > img{
-  width: 180px;
-  height: 50px;
+  width: 100%;
+  height: 100%;
 }
 .data-export .case-item > p{
   margin-top: 8px;
@@ -319,10 +324,24 @@ a:focus{
   line-height: 24px;
   color: #1D1D1D;
 }
+.data-export .case-detail-btn{
+  display: block;
+  width: 240px;
+  height: 46px;
+  margin: 48px auto 0;
+  background: linear-gradient(to right,#2ABED1, #3687FF);
+  border-radius: 6px;
+  font-size: 16px;
+  color: #ffffff;
+  cursor: pointer;
+  line-height: 46px;
+  text-align: center;
+}
 
 .page--datamarket-index .data-scene{
   width: 100%;
   height: 554px;
+  margin-top: 58px;
   background: url(/dataSmt/images/data-application-bg.png) no-repeat center center;
   background-size: cover;
 }

src/web/templates/dataMarket/index.html

@@ -84,7 +84,7 @@
       </ul>
       <ul class="download-info-container">
         <li class="item-info">
-          <h3><strong>1.5亿+</strong> 招标数据</h3>
+          <h3><strong>{{.T.includedInfo.bid}}{{.T.includedInfo.bidUnit}}+</strong> 招标数据</h3>
           <p>寻找可跟进项目</p>
         </li>
         <li class="item-info">
@@ -184,9 +184,26 @@
         </p>
       </div>
       <div class="export-case CfadeInUp">
-        <div class="case-title">500+企业数据定制案例</div>
+        <div class="case-title">剑鱼标讯，已服务多家行业领军企业</div>
         <ul class="case-container">
-          <li class="case-item">
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/197-2.png' alt="华为"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/205.png' alt="科大讯飞"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/212.png' alt="中通服"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/203-2.png' alt="深信服"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/dataSmt/images/dell.png' alt="戴尔"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/dataSmt/images/lianxiang.png' alt="联想"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/202-1.png' alt="移动"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/dataSmt/images/liantong.png' alt="联通"></li>
+
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/204-2.png' alt="电信"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/dataSmt/images/zgdz.png' alt="中国电子"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/197.png' alt="海康威视"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/204.png' alt="瀚和软件"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/202.png' alt="浙大新宇"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/200-2.png' alt="光大银行"></li>
+          <li class="case-item"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/202-2.png' alt="民生银行"></li>
+          <li class="case-item boundary"><img src='{{Msg "seo" "cdn"}}/big-member/image/new_index/logo/212-1.png' alt=""></li>
+          <!-- <li class="case-item">
             <img src='{{Msg "seo" "cdn"}}/dataSmt/images/case-langchao.png' alt="浪潮软件科技">
             <p>浪潮软件科技</p>
             <div id="consult-lc" class="btn-light" onClick="needSubmitHandle('pc_data_custom_data', '浪潮软件科技')">立即咨询
@@ -231,8 +248,9 @@
             <p>中国联通</p>
             <div id="consult-zglt" class="btn-light" onClick="needSubmitHandle('pc_data_custom_data', '中国联通')">立即咨询
             </div>
-          </li>
+          </li> -->
         </ul>
+        <div id="case-detail-btn" class="btn-light case-detail-btn" onClick="needSubmitHandle('pc_data_custom_data')">了解详情</div>
       </div>
     </div>
   </div>