feat: PC首页改版

src/web/staticres/pccss/index_pc.css

@@ -54,6 +54,7 @@
 .main-module.mt6 {
     margin-top: 6px;
 }
+
 .main-module.mt8 {
     margin-top: 8px;
 }
@@ -324,7 +325,6 @@
 /* user-info-module */
 /* no-login */
 .user-info-card {
-    margin-bottom: 40px;
     min-height: 328px;
     border-radius: 4px;
 }
@@ -616,8 +616,8 @@
 }
 .search-type-item {
     position: relative;
-    padding: 4px 12px;
-    font-size: 16px;
+    padding: 3px 12px;
+    font-size: 14px;
     line-height: 22px;
     background-color: transparent;
     color: #2ABED1;
@@ -765,7 +765,7 @@
     left: 0;
     top: 0;
     width: 100%;
-    height: 36px;
+    height: 32px;
     background: linear-gradient(90deg, #2ABED1 0%, rgba(27, 143, 250, 0.96) 99.98%);
     z-index: 1;
 }
@@ -783,7 +783,7 @@
     display: flex;
     align-items: center;
     justify-content: center;
-    height: 36px;
+    height: 32px;
     font-size: 16px;
     font-weight: 700;
     line-height: 24px;
@@ -795,7 +795,7 @@
 }
 .zb-module-nav .search-type-children {
     position: relative;
-    padding: 16px 12px;
+    padding: 10px 14px;
     flex: 1;
     float: none;
 }
@@ -819,22 +819,22 @@
 }
 
 .zb-module-nav .search-type-section:nth-of-type(1) {
-    min-width: 220px;
+    min-width: 225px;
 }
 .zb-module-nav .search-type-section:nth-of-type(2) {
-    min-width: 248px;
+    min-width: 253px;
 }
 .zb-module-nav .search-type-section:nth-of-type(3) {
-    min-width: 160px;
+    min-width: 157px;
 }
 .zb-module-nav .search-type-section:nth-of-type(4) {
-    min-width: 160px;
+    min-width: 157px;
 }
 .zb-module-nav .search-type-section:nth-of-type(5) {
-    min-width: 228px;
+    min-width: 253px;
 }
 .zb-module-nav .search-type-section:nth-of-type(6) {
-    min-width: 164px;
+    min-width: 156px;
 }
 
 /* message-module */
@@ -1224,12 +1224,20 @@
     line-height: 22px;
 }
 
+.data-service-module-content {
+  display: flex;
+  flex-direction: column;
+}
+
 /* ent-service-module */
 .service-module-content {
     display: flex;
     justify-content: space-between;
     padding-top: 20px;
 }
+.data-service-module .service-module-content-right {
+  margin-left: 0;
+}
 .service-module-content-right {
     margin-left: 20px;
     flex: 1;
@@ -1282,6 +1290,9 @@
     color: #686868;
     text-align: justify;
 }
+.data-service-module-content .service-desc-button {
+  height: 56px;
+}
 .service-desc-button {
     display: flex;
     align-items: center;
@@ -1345,17 +1356,17 @@
 
 /* data-service-module */
 .data-service-module .service-desc-card {
-    width: 288px;
+    /*width: 288px;*/
 }
 .data-service-module .service-tags-main {
     position: relative;
     margin-top: 10px;
     padding-top: 2px;
     padding-bottom: 10px;
-    border-bottom: 1px solid #e0e0e0;
+    /*border-bottom: 1px solid #e0e0e0;*/
 }
 .data-service-module .service-tags-main-content {
-    max-height: 122px;
+    max-height: 52px;
     overflow: hidden;
 }
 .data-service-module .service-desc-footer {
@@ -1372,10 +1383,11 @@
 }
 .data-service-module .service-button-list {
     margin-top: 20px;
+    display: flex;
+    flex-direction: row;
 }
 .data-service-module .service-desc-button:not(:last-of-type) {
-    margin-bottom: 16px;
-    margin-bottom: 20px;
+    margin-right: 23px;
 }
 /* hot-chart */
 .data-service-module .hot-industry-year-chart {
@@ -1550,21 +1562,22 @@
     align-items: center;
 }
 
+
 .partners-project-item {
-    width: 184px;
-    height: 80px;
+    height: 60px;
     border-radius: 8px;
     overflow: hidden;
 }
 
 .partners-project-item:not(:last-of-type) {
-    margin-right: 19px;
+    margin-right: 23px;
 }
 
 .partners-project-item a,
 .partners-project-item img {
     display: block;
     width: 100%;
+    height: 100%;
 }
 
 /* area-nav 底部区域导航 */

src/web/staticres/public-pc/css/header-nav-mini.css

@@ -185,7 +185,7 @@ a.j-s-button:hover {
     display: flex;
     align-items: center;
     justify-content: space-between;
-    height: 52px;
+    height: 42px;
     font-size: 14px;
     line-height: 22px;
     color: #1d1d1d;
@@ -203,6 +203,7 @@ a.j-s-button:hover {
     margin-right: 4px;
 }
 .header-nav-content .nav-home a {
+    font-size: inherit;
     height: 100%;
     color: #444;
 }
@@ -386,6 +387,13 @@ body .menu-vip-button {
 }
 
 /* 各省分站 */
+.menu-item .j-s-button {
+  width: 100px;
+}
+.menu-item .j-s-button,
+.header-nav-content .home-site .j-s-button{
+  padding: 1px 15px;
+}
 .header-nav-content .home-site {
     position: relative;
     display: flex;
@@ -472,7 +480,7 @@ body .menu-vip-button {
     top: 76px;
     right: 12px;
 }
-  
+
 #downloadApp img {
     display: block;
     width: 100%;

src/web/templates/common/pc-header-nav-mini.html

@@ -30,7 +30,7 @@
             <div class="h-nav-c-right flex-row-center">
                 <ul class="menu-list flex-row-center">
                     <li class="menu-item">
-                        <a class="menu-vip-button" href="/product/index?serviceType=0" target="_blank"><i class="j-icon base-icon icon-img-vip-v-deep"></i>会员服务列表</a>
+                        <a class="menu-vip-button" href="/product/index?serviceType=0" target="_blank"><i class="j-icon base-icon icon-img-vip-v-deep"></i>服务列表</a>
                     </li>
                     {{$TopMenus :=JyTopMenu .Request.URL.Path}}
                     {{range $menu := $TopMenus.MenuList }}

src/web/templates/pc/newIndex.html

@@ -24,7 +24,7 @@
 </head>
 
 {{$global:=.T}}
-<body>
+<body class="new-theme">
   <section class="body-section bg-white">
     <header class="body-header">
       {{include "/common/pchead.html"}}
@@ -32,36 +32,20 @@
     <main class="body-main">
       <section class="w">
         <!-- 头部logo+搜索模块 -->
-        <section class="main-module mt10">
+        <section class="main-module mt0">
           {{include "/pc/template/index/search-module.html"}}
         </section>
         <!-- 招标采购模块 -->
-        <section class="main-module mt6">
+        <section class="main-module mt0">
           {{include "/pc/template/index/zb-nav-module.html"}}
         </section>
-        <!-- banner swiper -->
-        <section class="main-module swiper-module-12">
-          {{$ad_1:=(Ad "new-pc-index-top-ad" -1 .Host (cookie "SESSIONID"))}}
-          {{if $ad_1}}
-          <div class="banner-swiper swiper-container" id="new-pc-index-top-carousel">
-            <div class="swiper-wrapper">
-              {{range $ad := $ad_1}}
-              <a class="swiper-slide" data-exposure="PC首页 banner 轮播图-{{$ad.S_picalt}}" data-exposure-loop target="_blank" {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}}>
-                <img class="img-banner" src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
-              </a>
-              {{end}}
-            </div>
-            <div class="w1200 swiper-pagination custom-dot"></div>
-          </div>
-          {{end}}
-        </section>
         <!-- 13消息中心 -->
         <section class="main-module">
           {{include "/pc/template/index/banner-message.html"}}
         </section>
         <section class="main-module aside-layout-container">
           <main class="aside-layout--main">
-            <section class="aside-main-module flex-row-center mb20 zb-info-list">
+            <section class="aside-main-module flex-row-center zb-info-list">
               <!-- 中标公告 -->
               {{include "/pc/template/index/zb-aside-card.html"}}
               <div class="swiper-module-15">
@@ -81,22 +65,46 @@
                 {{end}}
               </div>
             </section>
+          </main>
+          <aside class="aside-layout--right">
+            <!-- 用户信息卡片 -->
+            <section class="aside-right-module">
+              {{include "/pc/template/index/user-info-card.html"}}
+            </section>
+          </aside>
+        </section>
+        <!-- banner swiper -->
+        <section class="main-module swiper-module-12">
+          {{$ad_1:=(Ad "new-pc-index-top-ad" -1 .Host (cookie "SESSIONID"))}}
+          {{if $ad_1}}
+          <div class="banner-swiper swiper-container" id="new-pc-index-top-carousel">
+            <div class="swiper-wrapper">
+              {{range $ad := $ad_1}}
+              <a class="swiper-slide" data-exposure="PC首页 banner 轮播图-{{$ad.S_picalt}}" data-exposure-loop target="_blank" {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}}>
+                <img class="img-banner" src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
+              </a>
+              {{end}}
+            </div>
+            <div class="w1200 swiper-pagination custom-dot"></div>
+          </div>
+          {{end}}
+        </section>
+
+        <section class="main-module aside-layout-container">
+          <main class="aside-layout--main">
             <!-- 招标动态 -->
             <section class="aside-main-module mb20">
               {{include "/pc/template/index/module-card-list-container.html"}}
             </section>
-            <!-- 项目专区 -->
-            <section class="aside-main-module mb20">
-              {{include "/pc/template/index/project-card-list-container.html"}}
-            </section>
-            <!-- 项目专区下广告位 -->
+
+            <!-- 推荐标讯专区下广告位 -->
             <section class="aside-main-module mb20 swiper-module-21">
               {{$ad_3:=(Ad "new-pc-index-middle-carousel" -1 .Host  (cookie "SESSIONID"))}}
               {{if $ad_3}}
               <div class="banner-swiper swiper-container" id="new-pc-index-middle-carousel">
                 <div class="swiper-wrapper">
                   {{range $ad := $ad_3}}
-                  <a class="swiper-slide banner-remark" data-exposure="PC项目专区下广告位-{{$ad.S_picalt}}" data-exposure-loop target="_blank" {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}}>
+                  <a class="swiper-slide banner-remark" data-exposure="PC推荐标讯专区下广告位-{{$ad.S_picalt}}" data-exposure-loop target="_blank" {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}}>
                     <img class="img-banner" src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
                   </a>
                   {{end}}
@@ -105,11 +113,28 @@
               </div>
               {{end}}
             </section>
-            <!-- 机构专区 -->
+
+            <!-- 企业服务专区 -->
+            <section class="aside-main-module">
+              {{include "/pc/template/index/ent-service-module.html"}}
+            </section>
+
+            <!-- 数据服务 -->
+            <section class="main-module">
+              {{include "/pc/template/index/data-service-module.html"}}
+            </section>
+
+            <!-- 客户合作案例 -->
+            <section class="main-module swiper-module-30">
+              {{include "/pc/template/index/partners-project-list.html"}}
+            </section>
+
+            <!-- 项目专区 -->
             <section class="aside-main-module mb20">
-              {{include "/pc/template/index/ent-list-module.html"}}
+              {{include "/pc/template/index/project-card-list-container.html"}}
             </section>
-            <!-- 机构专区下广告位 -->
+
+            <!-- 项目专区下广告位 -->
             <section class="aside-main-module mb20 swiper-module-23">
               <div class="swiper-module-23-children">
                 {{$ad_4:=(Ad "new-pc-index-twenty-three-left" -1 .Host  (cookie "SESSIONID"))}}
@@ -117,7 +142,7 @@
                 <div class="banner-swiper swiper-container" id="new-pc-index-twenty-three-left">
                   <div class="swiper-wrapper">
                     {{range $ad := $ad_4}}
-                    <a class="swiper-slide banner-remark" data-exposure="PC首页机构专区下广告位-{{$ad.S_picalt}}" data-exposure-loop target="_blank" {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}}>
+                    <a class="swiper-slide banner-remark" data-exposure="PC首页项目专区下广告位-{{$ad.S_picalt}}" data-exposure-loop target="_blank" {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}}>
                       <img class="img-banner" src='{{$ad.S_pic}}' alt="{{$ad.S_picalt}}">
                     </a>
                     {{end}}
@@ -142,38 +167,36 @@
                 {{end}}
               </div>
             </section>
-            <!-- 企业服务专区 -->
-            <section class="aside-main-module">
-              {{include "/pc/template/index/ent-service-module.html"}}
-            </section>
+
           </main>
           <aside class="aside-layout--right">
-            <!-- 用户信息卡片 -->
-            <section class="aside-right-module mb20">
-              {{include "/pc/template/index/user-info-card.html"}}
+            <!-- 热门行业 -->
+            <section class="aside-right-module mb24">
+              {{include "/pc/template/index/hot-industry-card.html"}}
             </section>
+
             <!-- 中标喜报 -->
             <section class="aside-right-module mb20">
               {{include "/pc/template/index/bidding-good-news-card.html"}}
             </section>
-            <!-- 热门行业 -->
-            <section class="aside-right-module mb24">
-              {{include "/pc/template/index/hot-industry-card.html"}}
-            </section>
+
             <!-- 优秀供应商 -->
             <section class="aside-right-module mb20">
               {{include "/pc/template/index/notice-card.html"}}
             </section>
           </aside>
         </section>
-        <!-- 数据服务 -->
-        <section class="main-module">
-          {{include "/pc/template/index/data-service-module.html"}}
+
+        <!-- 机构专区 -->
+        <section class="aside-main-module mb20">
+          {{include "/pc/template/index/ent-list-module.html"}}
         </section>
-        <!-- 数据服务下轮播图 -->
+
+        <!-- 机构专区下轮播图 -->
         <section class="main-module swiper-module-27">
           {{include "/pc/template/index/banner-module-27.html"}}
         </section>
+
         <!-- 剑鱼文库 -->
         <section class="main-module aside-layout-container">
           <main class="aside-layout--main">
@@ -189,10 +212,9 @@
             {{include "/pc/template/index/cms-card-deep.html"}}
           </aside>
         </section>
-        <!-- 客户合作案例 -->
-        <section class="main-module swiper-module-30">
-          {{include "/pc/template/index/partners-project-list.html"}}
-        </section>
+
+
+
         <!-- 地区导航 -->
         <section class="main-module">
           {{include "/pc/template/index/area-nav-module.html"}}

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

@@ -3,35 +3,23 @@
   <header class="module-card-header">
     <h3 class="module-card-title">数据服务专区</h3>
   </header>
-  <main class="module-card-content service-module-content">
-    <div class="service-module-content-left">
-      <section class="service-desc-card pd-lr20">
-        <header class="service-desc-header">
-          <h3 class="title-left-line">热门采购数据</h3>
-        </header>
-        <main class="service-tags-main">
-          <div class="service-tags-main-content">
-            <ul class="service-tags-list clearfix">
-              {{range $v := .T.hotBuyerData}}
-              <li class="service-tags-item">
-                <a class="cms-link" href="{{$v.url}}" target="_blank" title="{{$v.keyword}}">{{$v.keyword}}</a>
-              </li>
-              {{end}}
-            </ul>
-          </div>
-        </main>
-        <footer class="service-desc-footer">
-          <h3 class="title-left-line">数据服务</h3>
-        </footer>
-      </section>
-      <div class="service-button-list clearfix">
-        <a class="service-desc-button button-blink pointer s-plain" href="/front/dataExport/toSieve" target="_blank">数据导出</a>
-        <a class="service-desc-button button-blink pointer s-plain" href="/front/dataMarket/customExport" target="_blank">定制服务</a>
-        <a class="service-desc-button button-blink pointer s-plain" href="/front/dataMarket/dataInterface" target="_blank">对接服务</a>
-        <a class="service-desc-button button-blink pointer s-plain" href="/datasmt/qygssj_1" target="_blank">企业数据</a>
-        <a class="service-desc-button button-blink pointer s-plain" href="/datasmt/cgdwsj_1" target="_blank">业主数据</a>
-      </div>
-    </div>
+  <main class="module-card-content data-service-module-content">
+    <section class="service-desc-card pd-lr20">
+      <header class="service-desc-header">
+        <h3 class="title-left-line">热门采购数据</h3>
+      </header>
+      <main class="service-tags-main">
+        <div class="service-tags-main-content">
+          <ul class="service-tags-list clearfix">
+            {{range $v := .T.hotBuyerData}}
+            <li class="service-tags-item">
+              <a class="cms-link" href="{{$v.url}}" target="_blank" title="{{$v.keyword}}">{{$v.keyword}}</a>
+            </li>
+            {{end}}
+          </ul>
+        </div>
+      </main>
+    </section>
     <div class="service-module-content-right">
       <section class="hot-industry-year-chart">
         <header class="hot-industry-chart-header">
@@ -87,5 +75,12 @@
         </main>
       </section>
     </div>
+    <div class="service-button-list clearfix">
+      <a class="service-desc-button button-blink pointer s-plain" href="/front/dataExport/toSieve" target="_blank">数据导出</a>
+      <a class="service-desc-button button-blink pointer s-plain" href="/front/dataMarket/customExport" target="_blank">定制服务</a>
+      <a class="service-desc-button button-blink pointer s-plain" href="/front/dataMarket/dataInterface" target="_blank">对接服务</a>
+      <a class="service-desc-button button-blink pointer s-plain" href="/datasmt/qygssj_1" target="_blank">企业数据</a>
+      <a class="service-desc-button button-blink pointer s-plain" href="/datasmt/cgdwsj_1" target="_blank">业主数据</a>
+    </div>
   </main>
 </section>

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

@@ -1,15 +1,22 @@
 <!-- 客户合作案例 -->
-<section class="partners-project-container">
-  {{$ad_5:=(Ad "new-pc-index-bottom-ad" -1 .Host (cookie "SESSIONID"))}}
-  {{if $ad_5}}
-  <ul class="partners-project-list clearfix">
-    {{range $ad := $ad_5}}
-    <li class="partners-project-item">
-      <a {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}} target="_blank">
-        <img src="{{$ad.S_pic}}" alt="{{$ad.S_picalt}}">
-      </a>
-    </li>
-    {{end}}
-  </ul>
-  {{end}}
+<section class="module-card-container">
+  <header class="module-card-header">
+    <h3 class="module-card-title">典型案例</h3>
+  </header>
+  <main class="module-card-content">
+    <section class="partners-project-container">
+      {{$ad_5:=(Ad "new-pc-index-bottom-ad" -1 .Host (cookie "SESSIONID"))}}
+      {{if $ad_5}}
+      <ul class="partners-project-list clearfix">
+        {{range $ad := $ad_5}}
+        <li class="partners-project-item">
+          <a {{if $ad.S_link}}href="{{$ad.S_link}}"{{end}} target="_blank">
+            <img src="{{$ad.S_pic}}" alt="{{$ad.S_picalt}}">
+          </a>
+        </li>
+        {{end}}
+      </ul>
+      {{end}}
+    </section>
+  </main>
 </section>