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

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

@@ -1129,6 +1129,23 @@ cursor: pointer;
   z-index: 1;
 }
 
+.jy-index-partners .swiper-mask {
+  position: absolute;
+  top: 0;
+  height: 100%;
+  width: 280px;
+  z-index: 2;
+}
+.jy-index-partners .swiper-mask.mask-left {
+  left: 0;
+  background: linear-gradient(270deg, #FFF 0%, #FFF 52.13%, rgba(255, 255, 255, 0.00) 100%);
+  transform: rotate(180deg);
+}
+.jy-index-partners .swiper-mask.mask-right {
+  right: 0;
+  background: linear-gradient(270deg, #FFF 0%, #FFF 52.13%, rgba(255, 255, 255, 0.00) 100%);
+}
+
 /* 预约留资 */
 .jy-index-yuyue {
   width: 100%;

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

@@ -1,11 +1,13 @@
 var _page = {
   init: function () {
     this.initEvents()
+    this.changeBottomTheme()
     this.initHotBuyerShortName()
   },
   initEvents: function () {
     this.initSearchEvents()
     this.initBiddingDescTab()
+    this.initImportantGovTab()
   },
   initSearchEvents: function () {
     $('.search-type-list').on('click', '.search-type-item', function (e) {
@@ -29,6 +31,18 @@ var _page = {
         $(this).text(sort_text)
       }
     })
+  },
+  initImportantGovTab: function () {
+    var tabWrapper = $('.important-gov-card')
+    tabWrapper.find('.i-g-card-header-tab').on('click', function () {
+      var key = $(this).attr('data-name')
+      $(this).addClass('active').siblings().removeClass('active')
+      tabWrapper.find('.i-g-card-list-item[data-value='+ key +']').show().siblings().hide()
+    })
+    tabWrapper.find('.i-g-card-header-tab:eq(0)').trigger('click')
+  },
+  changeBottomTheme: function () {
+
   }
 }
 

src/web/staticres/js/index/index_swiper.js

@@ -16,6 +16,7 @@ var pageSwiper = {
     for (var i = 0; i < this.idList.length; i++) {
       this.swiperList.push(this.initSwiper(this.idList[i]))
     }
+    this.partnersInit()
   },
   initSwiper: function (id) {
     // banner广告位轮播
@@ -34,6 +35,24 @@ var pageSwiper = {
       paginationClickable: true,
       loop: $(id).find('.swiper-slide').length > 1 ? true : false
     })
+  },
+  partnersInit: function () {
+    var partners = new Swiper('.partners-container', {
+      slidesPerView: "auto",
+      centeredSlides: true,
+      speed: 4000,
+      
+      freeMode: true,
+      loop: true,
+      slidesPerGroup: 1,
+      autoplay: {
+        delay: 1, 
+        disableOnInteraction: false,
+        pauseOnMouseEnter: true, 
+      }
+    });
+    this.partners = partners
+    partners.init()
   }
 }
 pageSwiper.init()

src/web/staticres/pccss/index_pc.css

@@ -158,11 +158,72 @@
 
 
 /* user-info-module */
+/* no-login */
 .user-info-card {
     margin-bottom: 40px;
     height: 328px;
     border-radius: 4px;
-    border: 1px solid #E0E0E0;
+}
+.user-info-card img {
+    display: block;
+    width: 100%;
+}
+.user-info-card .user-info-main {
+    display: flex;
+    align-items: center;
+    flex-direction: column;
+    margin-top: 12px;
+}
+.user-info-card .user-info-desc-tip {
+    margin-top: 10px;
+    margin-bottom: 8px;
+    text-align: center;
+    color: #2ABED1;
+    font-size: 18px;
+    font-weight: 700;
+    line-height: 28px;
+}
+.user-info-card .user-info-main .to-get-paid-service {
+    margin: 12px 0;
+    height: 28px;
+    width: 100%;
+    border: none;
+}
+.user-info-card .user-info-footer {
+    margin-top: 12px;
+}
+.user-info-card .user-info-footer button {
+    width: 100%;
+    height: 40px;
+}
+.user-info-card .user-info-desc-4,
+.user-info-card .user-info-desc-8 {
+    margin: 0 auto;
+    width: 230px;
+}
+/* login */
+.user-info-card .user-info-title {
+    display: flex;
+    align-items: center;
+}
+.user-info-card .icon-img-sahua {
+    display: inline-block;
+    width: 24px;
+    height: 24px;
+}
+.user-info-card .user-info-title-text {
+    margin-left: 6px;
+    font-size: 18px;
+    line-height: 28px;
+}
+.user-info-card .user-info-header-line {
+    margin-top: 10px;
+    color: #1d1d1d;
+    font-size: 14px;
+    line-height: 22px;
+}
+.user-info-card .user-info-header-line .u-i-h-line-label {
+    color: #999;
 }
 
 /* search-module */
@@ -531,26 +592,25 @@
 .swiper-module-23-children:not(:first-of-type) {
     margin-left: 20px;
 }
-.swiper-module-27-row {
+
+.swiper-module-27 .banner-module-list-27 {
     display: flex;
+    flex-wrap: wrap;
 }
-.swiper-module-27-row:not(:last-of-type) {
-    margin-bottom: 20px;
-}
-.swiper-module-27-column {
-    flex: 1;
-    min-height: 80px;
+.swiper-module-27 .banner-module-item-27 {
+    width: 386px;
+    height: 80px;
+    border-radius: 4px;
+    overflow: hidden;
+    border: 1px solid red;
 }
-.swiper-module-27-column:not(:last-of-type) {
+.swiper-module-27 .banner-module-item-27 {
     margin-right: 20px;
+    margin-bottom: 20px;
 }
-
-
-
-/* user-info-card */
-.user-info-card {
-    height: 328px;
-    border: 1px solid #eee;
+/* 选择除了索引为3的倍数元素 */
+.swiper-module-27 .banner-module-item-27:nth-of-type(3n) {
+    margin-right: 0;
 }
 
 /* notice-header */
@@ -949,3 +1009,38 @@
     align-self: flex-start;
 }
 /* 底部地区导航 end */
+
+/* important-gov-card */
+.important-gov-card .module-card-header {
+    border-color: #EAF8FA;
+}
+.important-gov-card .module-card-content {
+    padding: 20px;
+}
+.important-gov-card .i-g-card-header-tab {
+    position: relative;
+    margin-right: 40px;
+    display: flex;
+    align-items: center;
+    height: 100%;
+    color: #686868;
+    font-size: 20px;
+    cursor: pointer;
+}
+.important-gov-card .i-g-card-header-tab.active {
+    color: #1D1D1D;
+    font-size: 24px;
+}
+.important-gov-card .i-g-card-header-tab.active::after {
+    content: '';
+    position: absolute;
+    left: 0;
+    bottom: -4px;
+    width: 100%;
+    height: 4px;
+    background-color: #2ABED1;
+}
+.i-g-card-list-item .cms-link {
+    margin-right: 20px;
+    margin-bottom: 10px;
+}

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

@@ -126,6 +126,9 @@ a {
 /* empty */
 
 
+#public-nav {
+    height: unset;
+}
 .header-nav-mini {
     background-color: #F2F2F4;
 }

src/web/templates/pc/newIndex.html

@@ -17,6 +17,7 @@
   <link rel="stylesheet" href="https://cdn-common.jianyu360.com/cdn/lib/swiper/5.4.2/swiper.min.css"/>
   <link rel="stylesheet" href="https://cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/theme-chalk/index.css" />
   <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/pccss/index_swiper.css?v={{Msg "seo" "version"}}' />
+  <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/css/pc/index.css?v={{Msg "seo" "version"}}' />
   <link rel="stylesheet" type="text/css" href='{{Msg "seo" "cdn"}}/pccss/index_pc.css?v={{Msg "seo" "version"}}' />
 </head>
 
@@ -170,28 +171,7 @@
         </section>
         <!-- 数据服务下轮播图 -->
         <section class="main-module swiper-module-27">
-          <div class="swiper-module-27-row">
-            <div class="swiper-module-27-column">
-              {{include "/pc/template/index/banner-swiper.html"}}
-            </div>
-            <div class="swiper-module-27-column">
-              {{include "/pc/template/index/banner-swiper.html"}}
-            </div>
-            <div class="swiper-module-27-column">
-              {{include "/pc/template/index/banner-swiper.html"}}
-            </div>
-          </div>
-          <div class="swiper-module-27-row">
-            <div class="swiper-module-27-column">
-              {{include "/pc/template/index/banner-swiper.html"}}
-            </div>
-            <div class="swiper-module-27-column">
-              {{include "/pc/template/index/banner-swiper.html"}}
-            </div>
-            <div class="swiper-module-27-column">
-              {{include "/pc/template/index/banner-swiper.html"}}
-            </div>
-          </div>
+          {{include "/pc/template/index/banner-module-27.html"}}
         </section>
         <!-- 招投标攻略 -->
         <section class="main-module aside-layout-container">
@@ -210,7 +190,14 @@
         <section class="main-module">
           {{include "/pc/template/index/area-nav-module.html"}}
         </section>
+        <!-- 重点招标 -->
+        <section class="main-module">
+          {{include "/pc/template/index/important-gov-bidding.html"}}
+        </section>
       </section>
+
+      <!-- 合作伙伴 -->
+      {{include "/pc/template/index/banner-partners.html"}}
     </main>
     <div class="body-footer">
       {{include "/common/friend-link.html"}}

src/web/templates/pc/template/index/banner-module-27.html

@@ -0,0 +1,35 @@
+<!-- module27 -->
+<section class="banner-module-container-27">
+  <ul class="banner-module-list-27">
+    <li class="banner-module-item-27">
+      <a href="">
+        <img src="" alt="">
+      </a>
+    </li>
+    <li class="banner-module-item-27">
+      <a href="">
+        <img src="" alt="">
+      </a>
+    </li>
+    <li class="banner-module-item-27">
+      <a href="">
+        <img src="" alt="">
+      </a>
+    </li>
+    <li class="banner-module-item-27">
+      <a href="">
+        <img src="" alt="">
+      </a>
+    </li>
+    <li class="banner-module-item-27">
+      <a href="">
+        <img src="" alt="">
+      </a>
+    </li>
+    <li class="banner-module-item-27">
+      <a href="">
+        <img src="" alt="">
+      </a>
+    </li>
+  </ul>
+</section>

src/web/templates/pc/template/index/banner-partners.html

@@ -0,0 +1,154 @@
+<!-- 合作伙伴 -->
+<style>
+.jy-index-partners {
+  padding: 0;
+}
+.jy-index-partners .module-title {
+  padding: 20px 0;
+  text-align: center;
+  color: #1D1D1D;
+  font-size: 28px;
+  line-height: 36px;
+}
+</style>
+<div class="jy-index-partners">
+  <h3 class="module-title">合作伙伴</h3>
+  <div class="partners-container swiper-container">
+    <div class="swiper-mask mask-left"></div>
+    <div class="swiper-mask mask-right"></div>
+    <div class="swiper-wrapper">
+      <div class="swiper-slide">
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/huawei.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/xinyu.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/duopuduo.png?v={{Msg "seo" "version"}}' />
+        </div>
+      </div>
+      <div class="swiper-slide">
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/baidu.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/ruijie.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/haikang.png?v={{Msg "seo" "version"}}' />
+        </div>
+      </div>
+      <div class="swiper-slide">
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/taipingyang.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/yitu.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/hanhe.png?v={{Msg "seo" "version"}}' />
+        </div>
+      </div>
+      <div class="swiper-slide">
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/guangda.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/dekey.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/jida.png?v={{Msg "seo" "version"}}' />
+        </div>
+      </div>
+      <div class="swiper-slide">
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/ali.png?v ={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/zhonghui.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/lianruan.png?v={{Msg "seo" "version"}}' />
+        </div>
+      </div>
+      <div class="swiper-slide">
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/minsheng.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/lehe.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/meinian.png?v={{Msg "seo" "version"}}' />
+        </div>
+      </div>
+      <div class="swiper-slide">
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/dianxin.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/jingyi.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/siem.png?v={{Msg "seo" "version"}}' />
+        </div>
+      </div>
+      <div class="swiper-slide">
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/shenxin.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/bot.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/yidong.png?v={{Msg "seo" "version"}}' />
+        </div>
+      </div>
+      <div class="swiper-slide">
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/wandong.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/aite.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/yushi.png?v={{Msg "seo" "version"}}' />
+        </div>
+      </div>
+      <div class="swiper-slide">
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/wanfu.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/lianying.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/ruiwode.png?v={{Msg "seo" "version"}}' />
+        </div>
+      </div>
+      <div class="swiper-slide">
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/drager.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/stryker.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/mindray.png?v={{Msg "seo" "version"}}' />
+        </div>
+      </div>
+      <div class="swiper-slide">
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/zhongtongfu.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/braun.png?v={{Msg "seo" "version"}}' />
+        </div>
+        <div class="img-box">
+          <img src='{{Msg "seo" "cdn"}}/images/index/neusoft.png?v={{Msg "seo" "version"}}' />
+        </div>
+      </div>
+    </div>
+  </div>
+</div>

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

@@ -11,7 +11,7 @@
         </header>
         <main class="service-desc-main">
           <p class="service-desc-text">实现用户在平台上完成资讯、销售线索、销售就会、客户的全线跟踪处理。</p>
-          <ul class="service-desc-list">
+          <ul class="service-desc-list clearfix">
             <li class="service-desc-button s-main">专属情报库</li>
             <li class="service-desc-button s-main">客户管理</li>
             <li class="service-desc-button s-main">数字看板</li>

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

@@ -0,0 +1,24 @@
+<!-- 重点招标 -->
+<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>
+  </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;">
+        <a class="cms-link" href="">重点xxx招标</a>
+        <a class="cms-link" href="">重点xxx招标</a>
+        <a class="cms-link" href="">重点xxx招标</a>
+        <a class="cms-link" href="">重点xxx招标</a>
+        <a class="cms-link" href="">重点xxx招标</a>
+      </li>
+      <li class="i-g-card-list-item" data-value="政府招标" style="display: none;">
+        <a class="cms-link" href="">政府xxx招标</a>
+        <a class="cms-link" href="">政府xxx招标</a>
+        <a class="cms-link" href="">政府xxx招标</a>
+        <a class="cms-link" href="">政府xxx招标</a>
+      </li>
+    </ul>
+  </main> 
+</section>

src/web/templates/pc/template/index/user-info-card.html

@@ -1,4 +1,65 @@
-<!-- 用户信息卡片 -->
-<section class="user-info-card">
-  user-info-card
+<!-- 用户信息卡片-未登录 -->
+<section class="user-info-card no-login-card">
+  <header class="user-info-header">
+    <button class="service-desc-button s-confirm">注册/登录</button>
+  </header>
+  <main class="user-info-main">
+    <p class="user-info-desc-tip">- 注册立享，8大免费权益 -</p>
+    <div class="user-info-desc-8">
+      <img src="/images/index/user-info-desc-8@2x.png" alt="">
+    </div>
+    <button class="user-info-desc-button j-s-button plain bg to-get-paid-service">付费享受更多热门服务</button>
+    <div class="user-info-desc-4">
+      <img src="/images/index/user-info-desc-4@2x.png" alt="">
+    </div>
+  </main>
+  <footer class="user-info-footer">
+    <button class="j-s-button plain to-learn-more">了解详情</button>
+  </footer>
+</section>
+
+<!-- 用户信息卡片-已登录 -->
+<section class="user-info-card login-card" style="display: none">
+  <header class="user-info-header">
+    <h4 class="user-info-title">
+      <span class="j-icon base-icon icon-img-sahua"></span>
+      <span class="user-info-title-text highlight-text">欢迎您！<i class="user-nickname">xxx</i></span>
+    </h4>
+    <p class="user-info-header-line">
+      <span class="u-i-h-line-label">会员等级：</span>
+      <span class="u-i-h-line-value">大会员</span>
+    </p>
+    <p class="user-info-header-line">
+      <span class="u-i-h-line-label">会员服务到期时间：</span>
+      <span class="u-i-h-line-value">2024-12-12</span>
+    </p>
+  </header>
+  <main class="user-info-main">
+    <ul class="user-power-list">
+      <li class="user-power-item">
+        <span class="user-power-item-icon j-icon base-icon">x</span>
+        <span class="user-power-item-name">工作台</span>
+      </li>
+      <li class="user-power-item">
+        <span class="user-power-item-icon j-icon base-icon">x</span>
+        <span class="user-power-item-name">招标订阅</span>
+      </li>
+      <li class="user-power-item">
+        <span class="user-power-item-icon j-icon base-icon">x</span>
+        <span class="user-power-item-name">超前项目</span>
+      </li>
+      <li class="user-power-item">
+        <span class="user-power-item-icon j-icon base-icon">x</span>
+        <span class="user-power-item-name">项目监控</span>
+      </li>
+      <li class="user-power-item">
+        <span class="user-power-item-icon j-icon base-icon">x</span>
+        <span class="user-power-item-name">企业监控</span>
+      </li>
+      <li class="user-power-item">
+        <span class="user-power-item-icon j-icon base-icon">x</span>
+        <span class="user-power-item-name">我的收藏</span>
+      </li>
+    </ul>
+  </main>
 </section>