Browse Source

feat:pc首页及导航栏、底部栏调整

yangfeng 2 years ago
parent
commit
eb6906c118

+ 186 - 35
src/web/staticres/css/pc/index.css

@@ -62,6 +62,7 @@
 .jy-index-banner .swiper-slide > img{
   width: 100%;
   height: 500px;
+  object-fit: cover;
 }
 .jy-index-banner .custom-dot {
   bottom: 48px;
@@ -70,7 +71,7 @@
   width: 40px;
   height: 4px;
   margin: 0 8px;
-  background: #D7DBE0;
+  background: rgba(0, 0, 0, 0.2);
   border-radius: 10px;
   cursor: pointer;
 }
@@ -86,7 +87,7 @@
   width: 1200px;
   margin: -20px auto 0;
   background: transparent;
-  z-index: 999;
+  z-index: 1;
 }
 .jy-index-search .form-search{
   position: relative;
@@ -96,7 +97,7 @@
   margin: 0 auto;
 }
 
-.search{
+.jy-index-search .search{
   width: 856px;
   position: relative;
   text-align: center;
@@ -123,6 +124,22 @@
   background-size: 20px 20px;
   cursor: pointer;
 }
+.jy-index-search .ser::-webkit-input-placeholder{
+  color: #999;
+  font-size: 14px;
+}
+.jy-index-search .ser::-moz-placeholder{
+  color: #999;
+  font-size: 14px;
+}
+.jy-index-search .ser:-ms-input-placeholder{
+  color: #999;
+  font-size: 14px;
+}
+.jy-index-search .ser::-ms-input-placeholder{
+  color: #999;
+  font-size: 14px;
+}
 .jy-index-search .ser::placeholder{
   color: #999;
   font-size: 14px;
@@ -168,7 +185,7 @@
 
 .jy-index-search .tips{
   display: inline-block;
-  width: 620px;
+  /* width: 620px; */
   margin-top: 8px;
   text-align: left;
   font-size: 14px;
@@ -242,7 +259,7 @@
 .jy-index-hot > .hot-container .hot-banner{
   flex: 1;
   max-width: 588px;
-  height: 140px;
+  height: 172px;
   overflow: hidden;
 }
 .jy-index-hot > .hot-container .hot-banner img{
@@ -266,19 +283,23 @@
   position: relative;
   width: 588px;
   height: 216px;
+  padding: 0 32px;
   background-repeat: no-repeat;
   background-position: center;
   background-size: 100% 100%;
   cursor: pointer;
+  overflow: hidden;
 }
 .jy-index-product .other-product-item{
   position: relative;
   width: 384px;
   height: 216px;
+  padding: 0 32px;
   background-repeat: no-repeat;
   background-position: center;
   background-size: 100% 100%;
   cursor: pointer;
+  overflow: hidden;
 }
 
 .jy-index-product .svip-product{
@@ -300,7 +321,8 @@
   position: absolute;
   top: 24px;
   display: none;
-  background: url(/images/index/link-arrow.png) 90px center no-repeat;
+  padding-right: 32px;
+  background: url(/images/index/link-arrow.png) 60px center no-repeat;
   background-size: 20px 20px;
   font-size: 14px;
   line-height: 22px;
@@ -308,34 +330,58 @@
 }
 
 .jy-index-product .p-name{
-  padding: 150px 32px 0 32px;
+  padding: 150px 0 0;
   font-size: 24px;
   line-height: 36px;
 }
 .jy-index-product .main-product-item .p-name{
   color: #fff;
+  transition: All 0.4s ease-in-out;
+  -webkit-transition: All 0.4s ease-in-out;
+  -moz-transition: All 0.4s ease-in-out;
+  -o-transition: All 0.4s ease-in-out;
 }
 .jy-index-product .other-product-item .p-name{
   color: #1D1D1D;
+  transition: All 0.4s ease-in-out;
+  -webkit-transition: All 0.4s ease-in-out;
+  -moz-transition: All 0.4s ease-in-out;
+  -o-transition: All 0.4s ease-in-out;
 }
 
 .jy-index-product .p-detail{
-  display: none;
-  margin-top: 8px;
+  /* display: none; */
+  margin-top: 100px;
+  transition: All 0.4s ease-in-out;
+  -webkit-transition: All 0.4s ease-in-out;
+  -moz-transition: All 0.4s ease-in-out;
+  -o-transition: All 0.4s ease-in-out;
+}
+.jy-index-product .other-product-item:hover{
+  position: relative;
+  display: inline-block;
+  margin: 0px;
+  max-width: 100%;
+  color: #fff;
+  overflow: hidden;
 }
-
 .jy-index-product .main-product-item:hover .p-link{
+  display: block;
   color: #fff;
-  padding: 0 32px;
-  background: url(/images/index/link-arrow-light.png) 90px center no-repeat;
+  padding-right: 32px;
+  background: url(/images/index/link-arrow-light.png) 60px center no-repeat;
   background-size: 20px 20px;
+  transition: All 0.8s ease-in-out;
+  -webkit-transition: All 0.8s ease-in-out;
+  -moz-transition: All 0.8s ease-in-out;
+  -o-transition: All 0.8s ease-in-out;
 }
 .jy-index-product .main-product-item:hover .p-name{
   padding-top: 96px;
 }
 .jy-index-product .main-product-item:hover .p-detail{
   display: block;
-  padding: 0 32px;
+  margin-top: 8px;
   font-size: 16px;
   color: #fff;
   line-height: 20px;
@@ -347,14 +393,17 @@
 }
 .jy-index-product .other-product-item:hover .p-link{
   display: block;
-  padding: 0 32px;
+  transition: All 0.8s ease-in-out;
+  -webkit-transition: All 0.8s ease-in-out;
+  -moz-transition: All 0.8s ease-in-out;
+  -o-transition: All 0.8s ease-in-out;
 }
 .jy-index-product .other-product-item:hover .p-name{
   padding-top: 116px;
 }
 .jy-index-product .other-product-item:hover .p-detail{
-  padding: 0 32px;
   line-height: 20px;
+  margin-top: 8px;
 }
 
 /* 行业解决方案 */
@@ -434,16 +483,45 @@
   background-size: 20px 20px;
 }
 
+.jy-index-plan .plan-item:hover::after{
+  position: absolute;
+  content: '';
+  top: 0;
+  left: 64px;
+  width: 76px;
+  height: 4px;
+  background: linear-gradient(90deg, #95CDFF 1.92%, #2CB7CA 100%);
+  -webkit-animation: borderTo 0.5s alternate 1 ease;
+  animation: borderTo 0.5s alternate 1 ease;
+}
 .jy-index-plan .plan-item:hover .item-header,
 .jy-index-plan .plan-item:hover .item-link
 {
   color: #2ABED1;
+  transition: all 0.5s;
 }
 .jy-index-plan .plan-item:hover .item-link{
   background: url(/images/index/link-arrow-active.png) right center no-repeat;
   background-size: 20px 20px;
 }
 
+@-webkit-keyframes borderTo {
+  from {
+    left: 0;
+  }
+  to {
+    left: 64px;
+  }
+}
+@keyframes borderTo {
+  from {
+    left: 0;
+  }
+  to {
+    left: 64px;
+  }
+}
+
 /* 专业的招投标大数据服务平台 */
 .jy-index-platform{
   padding: 70px 0;
@@ -451,20 +529,32 @@
 }
 .jy-index-platform .platform-container{
   display: flex;
-  align-items: center;
+  /* align-items: center; */
 }
 .jy-index-platform .platform-left{
   margin-right: 108px;
+  max-height: 580px;
+  overflow: hidden;
+}
+.jy-index-platform .tab-menu{
+  margin-bottom: 60px;
 }
-.jy-index-platform .platform-header{
+.jy-index-platform .tab-menu:last-child{
+  margin-bottom: 0;
+}
+.jy-index-platform .tab-header{
   position: relative;
   display: inline-block;
-  padding: 14px;
   font-size: 32px;
-  line-height: 32px;
+  line-height: 42px;
+  color: #1D1D1D;
+  cursor: pointer;
+}
+.jy-index-platform .tab-header.active{
   color: #2CB7CA;
+  padding: 14px;
 }
-.jy-index-platform .platform-header::before {
+.jy-index-platform .tab-header.active::before {
   position: absolute;
   content: '';
   top: 0;
@@ -474,7 +564,7 @@
   background: url(/images/index/top-badge.png) no-repeat center center;
   background-size: 24px;
 }
-.jy-index-platform .platform-header::after {
+.jy-index-platform .tab-header.active::after {
   position: absolute;
   content: '';
   bottom: 0;
@@ -507,12 +597,6 @@
   background-color: #999999;
 }
 
-.jy-index-platform .platform-bold{
-  margin-top: 60px;
-  font-size: 32px;
-  line-height: 42px;
-  color: #1D1D1D;
-}
 .jy-index-platform .platform-right{
   flex-shrink: 0;
   width: 512px;
@@ -595,19 +679,33 @@
   margin-right: 24px;
   box-shadow: 4px 4px 16px rgba(0, 0, 0, 0.1);
   cursor: pointer;
+  overflow: hidden;
 }
 .jy-index-news .card-img{
+  position: relative;
   width: 100%;
-  height: 252px;
+  height: 318px;
+  overflow: hidden;
+}
+.jy-index-news .card-img > img{
+  width: 100%;
+  height: 100%;
+  object-fit: cover;
+  transition: all 1s;
+}
+.jy-index-news .card-img > img:hover{
+  transform: scale(1.1);
 }
 .jy-index-news .card-main{
   padding: 28px;
 }
 .jy-index-news .card-title{
   margin-top: 20px;
+  height: 68px;
   font-size: 24px;
   line-height: 36px;
   color: #333333;
+  overflow: hidden;
 }
 .jy-index-news .card-summary{
   margin-top: 10px;
@@ -703,27 +801,46 @@
 .jy-index-dt .dt-container .dt-card{
   flex-shrink: 0;
   width: 380px;
-  max-height: 500px;
+  height: 500px;
   margin-right: 30px;
   background: #FFFFFF;
   box-shadow: 4px 4px 16px rgba(0, 0, 0, 0.1);
   cursor: pointer;
+  overflow: hidden;
+  /* transition-property: transform,top;
+  transition-duration: 1s,0.3s; */
 }
+/* .jy-index-dt .dt-container .dt-card:hover{
+  transform: scale(1.08);
+  top: 10px;
+} */
 .jy-index-dt .dt-container .dt-card:last-child{
   margin-right: 0;
 }
 .jy-index-dt .dt-card .card-img{
   width: 100%;
   height: 252px;
+  overflow: hidden;
+  
+}
+.jy-index-dt .dt-card .card-img > img{
+  width: 100%;
+  height: 100%;
+  transition: all 0.6s;
+}
+.jy-index-dt .dt-card .card-img > img:hover{
+  transform: scale(1.1);
 }
 .jy-index-dt .dt-card .card-main{
   padding: 28px;
 }
 .jy-index-dt .dt-card .card-title{
   margin-top: 20px;
+  height: 72px;
   font-size: 24px;
   line-height: 36px;
   color: #333333;
+  overflow: hidden;
 }
 .jy-index-dt .dt-card .card-summary{
   margin-top: 10px;
@@ -742,10 +859,16 @@
   padding: 70px 0;
   background: #FFF;
 }
+.jy-index-partners .swiper-wrapper{
+  -webkit-transition-timing-function: linear !important;
+  -moz-transition-timing-function: linear !important;
+  -ms-transition-timing-function: linear !important;
+  -o-transition-timing-function: linear !important;
+  transition-timing-function: linear !important;
+}
 .jy-index-partners .swiper-slide{
-  /* width: 504px!important; */
   width: auto!important;
-  padding: 4px 16px;
+  padding: 4px 8px;
   text-align: center;
 }
 .jy-index-partners img{
@@ -802,6 +925,7 @@
   color: #1D1D1D;
 }
 .jy-index-yuyue .app-btn{
+  position: relative;
   width: 180px;
   height: 46px;
   margin-top: 24px;
@@ -812,9 +936,32 @@
   font-size: 16px;
   line-height: 46px;
   cursor: pointer;
+  overflow: hidden; 
+}
+.jy-index-yuyue .app-btn::after{
+  content: '';
+  display: block;
+  position: absolute;
+  top: -120px;
+  left: -80px;
+  width: 36px;
+  height: 360px;
+  background: #fff;
+  opacity: 0.16;
+  transform: rotate(-45deg);
+  transition: all 800ms ease-out;
+}
+.jy-index-yuyue .app-btn:hover::after{
+  left: 200%;
 }
 
 /* 原页面弹框等样式 */
+@-webkit-keyframes myfirst
+{
+0% {top: -20px;}
+50% {top: -25px;}
+100% {top: -20px;}
+}
 @keyframes myfirst
 {
 0% {top: -20px;}
@@ -823,7 +970,8 @@
 }
 
 .tc_button{
-  animation: ttcc 0.8s alternate infinite ease;
+  -webkit-animation: ttcc 0.8s alternate infinite ease;
+          animation: ttcc 0.8s alternate infinite ease;
   position: absolute;
   bottom: 64px;
   left: 83px;
@@ -832,6 +980,12 @@
   background:url();
   background-size: cover;
 }
+@-webkit-keyframes ttcc {
+  to {
+    transform: scale(1.1);
+    transform-origin: 50% 50%;
+  }
+}
 @keyframes ttcc {
   to {
     transform: scale(1.1);
@@ -845,9 +999,6 @@
 	background: url();
 	background-size: cover;
 	border-radius: 8px;
-/* 	position: relative;
-	left: 450px;
-	top: 155px; */
 	cursor: pointer;
 	display: none;
 	-webkit-border-radius: 8px;

BIN
src/web/staticres/images/index/hot-banner-2.png


+ 0 - 0
src/web/staticres/images/index/mind.png → src/web/staticres/images/index/mindray.png


+ 0 - 0
src/web/staticres/images/index/soft.png → src/web/staticres/images/index/neusoft.png


+ 0 - 0
src/web/staticres/images/index/platform-img.png → src/web/staticres/images/index/platform-img-1.png


BIN
src/web/staticres/images/index/platform-img-2.png


BIN
src/web/staticres/images/index/platform-img-3.png


BIN
src/web/staticres/images/index/wanfu.png


+ 77 - 0
src/web/staticres/js/index/index.js

@@ -8,6 +8,83 @@ function changeHorse (timp) {
 function toThousands (num) {
   return (num || 0).toString().replace(/(\d)(?=(?:\d{3})+$)/g, '$1,');
 }
+// 获取图片颜色
+function getImageColor(img) {
+  var canvas = document.createElement('canvas')
+  canvas.width = img.width;
+  canvas.height = img.height;
+  var context = canvas.getContext("2d");
+  img.crossOrigin = "Anonymous"
+  context.drawImage(img, 0, 0, canvas.width, canvas.height);
+  // 获取像素数据
+  var data = context.getImageData(0, 0, img.width, img.height).data;
+  console.log(data)
+  var r = 1,
+    g = 1,
+    b = 1;
+  // 取所有像素的平均值
+  for (var row = 0; row < img.height; row++) {
+    for (var col = 0; col < img.width; col++) {
+      // console.log(data[((img.width * row) + col) * 4])
+      if (row == 0) {
+        r += data[((img.width * row) + col)];
+        g += data[((img.width * row) + col) + 1];
+        b += data[((img.width * row) + col) + 2];
+      } else {
+        r += data[((img.width * row) + col) * 4];
+        g += data[((img.width * row) + col) * 4 + 1];
+        b += data[((img.width * row) + col) * 4 + 2];
+      }
+    }
+  }
+  console.log(r, g, b)
+  // 求取平均值
+  r /= (img.width * img.height);
+  g /= (img.width * img.height);
+  b /= (img.width * img.height);
+
+  // 将最终的值取整
+  r = Math.round(r);
+  g = Math.round(g);
+  b = Math.round(b);
+  console.log(r, g, b)
+  return [r, g, b]
+}
+// 将rgb色转位hsl色并增强 s,l值
+function rgbToHsl(rgb) {
+  r = rgb[0] / 255;
+  g = rgb[1] / 255;
+  b = rgb[2] / 255;
+
+  var min = Math.min(r, g, b);
+  var max = Math.max(r, g, b);
+  var l = (min + max) / 2;
+  var difference = max - min;
+  var h, s, l;
+  if (max == min) {
+    h = 0;
+    s = 0;
+  } else {
+    s = l > 0.5 ? difference / (2.0 - max - min) : difference / (max + min);
+    switch (max) {
+      case r:
+        h = (g - b) / difference + (g < b ? 6 : 0);
+        break;
+      case g:
+        h = 2.0 + (b - r) / difference;
+        break;
+      case b:
+        h = 4.0 + (r - g) / difference;
+        break;
+    }
+    h = Math.round(h * 60);
+  }
+  s = Math.round(s * 100 * 1.5)+ '%'; //转换成百分比的形式
+  l = Math.round(l * 100 * 0.8)+ '%';
+  const str = "hsl(" + h + "," + s + "," + l + ")";
+  console.log('str', str)
+  return str
+}
 
 $(function () {
   // 搜索框类型选择

+ 175 - 0
src/web/staticres/js/index/jquery.adaptive-backgrounds.js

@@ -0,0 +1,175 @@
+/* jshint debug: true, expr: true */
+
+;
+(function ($) {
+  /* Constants & defaults. */
+  var DATA_COLOR = 'data-ab-color';
+  var DATA_PARENT = 'data-ab-parent';
+  var DATA_CSS_BG = 'data-ab-css-background';
+  var EVENT_CF = 'ab-color-found';
+  var BLEND = 'blend';
+
+  var DEFAULTS = {
+    selector: '[data-adaptive-background]',
+    parent: null,
+    exclude: ['rgb(0,0,0)', 'rgb(255,255,255)'],
+    shadeVariation: false,
+    shadePercentage: 0,
+    shadeColors: {
+      light: 'rgb(255,255,255)',
+      dark: 'rgb(0,0,0)' 
+    },
+    normalizeTextColor: false,
+    normalizedTextColors: {
+      light: "#fff",
+      dark: "#000"
+    },
+    lumaClasses: {
+      light: "ab-light",
+      dark: "ab-dark"
+    },
+    transparent: null
+  };
+
+  // Include RGBaster - https://github.com/briangonzalez/rgbaster.js
+  /* jshint ignore:start */
+  !function(n,t){"use strict";var e=function(n,t){var e=document.createElement("canvas");return e.setAttribute("width",n),e.setAttribute("height",t),e.getContext("2d")},r=function(n,t){var r=new Image,i=n.src||n;"data:"!==i.substring(0,5)&&(r.crossOrigin="Anonymous"),r.onload=function(){var n=e(r.width,r.height);n.drawImage(r,0,0);var i=n.getImageData(0,0,r.width,r.height);t&&t(i.data)},r.src=i},i=function(n){return["rgb(",n,")"].join("")},a=function(n){var t=[];for(var e in n)t.push(o(e,n[e]));return t.sort(function(n,t){return t.count-n.count}),t},u=function(n,t){if(n.length>t)return n.slice(0,t);for(var e=n.length-1;t-1>e;e++)n.push(o("0,0,0",0));return n},o=function(n,t){return{name:i(n),count:t}},c=10,s={};s.colors=function(n,e){e=e||{};var o=e.exclude||[],s=e.paletteSize||c;r(n,function(n){for(var r={},c="",f=[],d=0;d<n.length;d+=4)f[0]=n[d],f[1]=n[d+1],f[2]=n[d+2],c=f.join(","),-1===f.indexOf(t)&&0!==n[d+3]&&-1===o.indexOf(i(c))&&(r[c]=c in r?r[c]+1:1);if(e.success){var g=u(a(r),s+1);e.success({dominant:g[0].name,secondary:g[1].name,palette:g.map(function(n){return n.name}).slice(1)})}})},n.RGBaster=n.RGBaster||s}(window);
+
+  function shadeRGBColor(color, percent){var f=color.split(","),t=percent<0?0:255,p=percent<0?percent*-1:percent,R=parseInt(f[0].slice(4)),G=parseInt(f[1]),B=parseInt(f[2]);return "rgb("+(Math.round((t-R)*p)+R)+","+(Math.round((t-G)*p)+G)+","+(Math.round((t-B)*p)+B)+")";}
+
+  function blendRGBColors(c0, c1, p){var f=c0.split(","),t=c1.split(","),R=parseInt(f[0].slice(4)),G=parseInt(f[1]),B=parseInt(f[2]);return "rgb("+(Math.round((parseInt(t[0].slice(4))-R)*p)+R)+","+(Math.round((parseInt(t[1])-G)*p)+G)+","+(Math.round((parseInt(t[2])-B)*p)+B)+")";}
+  /* jshint ignore:end */
+
+  /*
+  Our main function declaration.
+  */
+  $.adaptiveBackground = {
+    run: function (options) {
+      var opts = $.extend({}, DEFAULTS, options);
+
+      /* Loop over each element, waiting for it to load
+      then finding its color, and triggering the
+      color found event when color has been found.
+      */
+      $(opts.selector).each(function (index, el) {
+        var $this = $(this);
+
+        /*  Small helper functions which applies
+            colors, attrs, triggers events, etc.
+        */
+        var handleColors = function () {
+          if ($this[0].tagName == 'PICTURE') {
+            var images = $this[0].children;
+            for (var image in images) {
+              if (images[image].tagName == 'IMG') {
+                var img = images[image];
+                break;
+              }
+            };
+            if (img.currentSrc) {
+              img = img.currentSrc;
+            };
+          } else {
+            var img = useCSSBackground() ? getCSSBackground() : $this[0];
+          }
+
+          RGBaster.colors(img, {
+            paletteSize: 20,
+            exclude: opts.exclude,
+            success: function (colors) {
+              $this.attr(DATA_COLOR, colors.dominant);
+              $this.trigger(EVENT_CF, {
+                color: colors.dominant,
+                palette: colors.palette
+              });
+            }
+          });
+
+        };
+
+        // Helper function to calculate yiq - http://en.wikipedia.org/wiki/YIQ
+        var getYIQ = function (color) {
+          var rgb = color.match(/\d+/g);
+          return ((rgb[0] * 299) + (rgb[1] * 587) + (rgb[2] * 114)) / 1000;
+        };
+
+        var useCSSBackground = function () {
+          var attr = $this.attr(DATA_CSS_BG);
+          return (typeof attr !== typeof undefined && attr !== false);
+        };
+
+        var getCSSBackground = function () {
+          var str = $this.css('background-image');
+          var regex = /\(([^)]+)\)/;
+          var match = regex.exec(str)[1].replace(/"/g, '')
+          return match;
+        };
+
+        var getShadeAdjustment = function (color) {
+          if (opts.shadeVariation == true) {
+            return getYIQ(color) <= 128 ? shadeRGBColor(color, opts.shadePercentage) : shadeRGBColor(color, -(opts.shadePercentage), opts.shadePercentage);
+          } else if (opts.shadeVariation == BLEND) {
+            return getYIQ(color) >= 128 ? blendRGBColors(color, opts.shadeColors.dark, opts.shadePercentage) : blendRGBColors(color, opts.shadeColors.light, opts.shadePercentage);
+          }
+        };
+
+        /* Subscribe to our color-found event. */
+        $this.on(EVENT_CF, function (ev, data) {
+          // Try to find the parent.
+          var $parent;
+          if (opts.parent && $this.parents(opts.parent).length) {
+            $parent = $this.parents(opts.parent);
+          } else if ($this.attr(DATA_PARENT) && $this.parents($this.attr(DATA_PARENT)).length) {
+            $parent = $this.parents($this.attr(DATA_PARENT));
+          } else if (useCSSBackground()) {
+            $parent = $this;
+          } else if (opts.parent) {
+            $parent = $this.parents(opts.parent);
+          } else {
+            $parent = $this.parent();
+          }
+
+          if (!!opts.shadeVariation)
+            data.color = getShadeAdjustment(data.color);
+
+          if ($.isNumeric(opts.transparent) && opts.transparent != null && opts.transparent >= 0.01 && opts.transparent <= 0.99) {
+            var dominantColor = data.color;
+            var rgbToRgba = dominantColor.replace("rgb", "rgba");
+            var transparentColor = rgbToRgba.replace(")", ", " + opts.transparent + ")");
+            $parent.css({
+              backgroundColor: transparentColor
+            });
+          } else {
+            $parent.css({
+              backgroundColor: data.color
+            });
+          }
+
+          var getNormalizedTextColor = function (color) {
+            return getYIQ(color) >= 128 ? opts.normalizedTextColors.dark : opts.normalizedTextColors.light;
+          };
+
+          var getLumaClass = function (color) {
+            return getYIQ(color) <= 128 ? opts.lumaClasses.dark : opts.lumaClasses.light;
+          };
+
+          // Normalize the text color based on luminance.
+          if (opts.normalizeTextColor)
+            $parent.css({
+              color: getNormalizedTextColor(data.color)
+            });
+
+          // Add a class based on luminance.
+          $parent.addClass(getLumaClass(data.color))
+            .attr('data-ab-yaq', getYIQ(data.color));
+
+          opts.success && opts.success($this, data);
+        });
+
+        /* Handle the colors. */
+        handleColors();
+
+      });
+    }
+  };
+})(jQuery);

+ 8 - 2
src/web/staticres/js/pc-collect-user-info.js

@@ -401,7 +401,7 @@ var vm = new Vue({
         'activity_free_plan': '请完善信息,免费获取200剑鱼币',
         super_membership_day: '请留下联系方式,我们会尽快联系您体验大会员全部功能!',
         peugeot_supplier_regist:'请完善您的个人信息,抢先对接采购单位',
-        peugeot_view_infor: '请留下联系方式,我们会尽快联系您体验大会员全部功能!',
+        peugeot_view_infor: '请留下联系方式,我们会尽快联系您体验大会员全部功能!'
       },
       isRefresh: false // 留完资是否需要刷新页面
     }
@@ -458,6 +458,9 @@ var vm = new Vue({
         if (this.source === 'peugeot_supplier_regist') {
           return '我们会尽快联系您完成供应商报名,请耐心等待。'
         }
+        if (this.source === 'pc_index_bid_data') {
+          return '我们会尽快联系您并根据您的需求,提供最适合的产品演示服务!,请耐心等待。'
+        }
         return '我们会尽快联系您并预约演示时间,请耐心等待~<br>您将获得免费体验大会员全部功能!'
       }
     }
@@ -684,7 +687,10 @@ var vm = new Vue({
     },
     // 表单提交请求
     formAjax: function(source, info) {
-      var infoid = window.location.pathname.split("/")[3].split(".html")[0]
+      try {
+        // 谁写的split,这不报错?加个try catch
+        var infoid = window.location.pathname.split("/")[3].split(".html")[0]
+      } catch (error) {}
       var isProDetail = window.location.pathname.indexOf('/article/content')
       var params = {
         source: source,

+ 2 - 0
src/web/staticres/public-pc/js/header-nav.js

@@ -90,6 +90,8 @@ function trySelectNav (name) {
           "height":"auto",
           "overflow":"hidden"
         })
+      } else if (window.location.pathname == '/') {
+        setNavTheme('dark')
       }
       var naParams = window.location.search
       if(naParams.indexOf('?name=bbx_')>-1){

+ 32 - 21
src/web/templates/common/pcbottom.html

@@ -27,34 +27,45 @@
                         <!-- <dd><a href="">商机管理</a></dd> -->
                     </dl>
                     <dl>
-                        <dt>数据</dt>
-                        <dd><a href="/front/dataExport/toSieve">自助导出</a></dd>
-                        <dd><a href="/front/structed/pc_index.html">定制服务</a></dd>
-                        <dd><a href="/front/dataPack/createOrder">数据流量包</a></dd>
+                      <dt>百宝箱</dt>
+                      <dd><a href="javascript:;" data-type="work-bench" data-href="/swordfish/page_web_pc/issued/info">信息发布</a></dd>
+                      <dd><a href="/jyxspc">中标必听课</a></dd>
+                      <dd><a href="/swordfish/docs">剑鱼文库</a></dd>
+                      <dd><a href="/big/page/zb">中标预测</a></dd>
+                      <dd><a href="/big/page/yw">潜在客户挖掘</a></dd>
+                      <dd><a href="/big/page/yw">潜在合作伙伴挖掘</a></dd>
+                      <dd><a href="/big/page/tb">投标决策分析</a></dd>
+                      <dd><a href="/big/page/qy">竞争对手分析</a></dd>
+                      <dd><a href="/big/page/sc">市场分析</a></dd>
+                      <dd><a href="/big/page/cg">客户分析</a></dd>
                     </dl>
                     <dl>
-                        <dt>解决方案</dt>
-                        <dd><a href="/swordfish/frontPage/solution/free/index">电信</a></dd>
+                        <dt>数据市场</dt>
+                        <dd><a href="javascript:;">数据超市</a></dd>
+                        <dd><a href="/front/dataExport/toSieve">自助导出</a></dd>
+                        <!-- <dd><a href="/front/structed/pc_index.html">定制服务</a></dd> -->
+                        <!-- <dd><a href="/front/dataPack/createOrder">数据流量包</a></dd> -->
+                        <dd><a href="javascript:;">数据定制导出</a></dd>
+                        <dd><a href="javascript:;">API接口</a></dd>
                     </dl>
                     <dl>
-                        <dt>百宝箱</dt>
-                        <dd><a href="javascript:;" data-type="work-bench" data-href="/swordfish/page_web_pc/issued/info">信息发布</a></dd>
-                        <dd><a href="/jyxspc">中标必听课</a></dd>
-                        <dd><a href="/swordfish/docs">剑鱼文库</a></dd>
-                        <dd><a href="/big/page/zb">中标预测</a></dd>
-                        <dd><a href="/big/page/yw">潜在客户挖掘</a></dd>
-                        <dd><a href="/big/page/yw">潜在合作伙伴挖掘</a></dd>
-                        <dd><a href="/big/page/tb">投标决策分析</a></dd>
-                        <dd><a href="/big/page/qy">竞争对手分析</a></dd>
-                        <dd><a href="/big/page/sc">市场分析</a></dd>
-                        <dd><a href="/big/page/cg">客户分析</a></dd>
+                        <dt>解决方案</dt>
+                        <dd><a href="/swordfish/frontPage/solution/free/index">电信运营商</a></dd>
+                        <dd><a href="javascript:;">医疗器械</a></dd>
+                        <dd><a href="javascript:;">银行</a></dd>
                     </dl>
+                    
                     <dl>
-                        <dt>联系我们</dt>
-                        <dd><a href="/front/aboutus.html">了解剑鱼标讯</a></dd>
+                        <dt>品牌</dt>
+                        <dd><a href="/swordfish/frontPage/brand/free/index">公司介绍</a></dd>
+                        <dd><a href="/swordfish/frontPage/brand/free/index?seat=history">发展历程</a></dd>
+                        <dd><a href="/swordfish/frontPage/brand/free/index?seat=Company_Dynamic">公司动态</a></dd>
+                        <dd><a href="/swordfish/frontPage/brand/free/index?seat=join_us">加入我们</a></dd>
+                        <dd><a href="/swordfish/frontPage/brand/free/index?seat=contact_us">联系我们</a></dd>
+                        <!-- <dd><a href="/front/aboutus.html">了解剑鱼标讯</a></dd>
                         <dd><a href="/jyblog/index.html">剑鱼标讯博客</a></dd>
                         <dd><a href="/front/busicooperation.html">商务合作</a></dd>
-                        <dd><a href="/front/advservices.html">广告服务</a></dd>
+                        <dd><a href="/front/advservices.html">广告服务</a></dd> -->
 <!--                        <dd>
                             <a href="javascript:;">剑鱼标讯社区</a>
                             <div class="jy_community">
@@ -62,7 +73,7 @@
                                 <p>扫码关注</p>
                             </div>
                         </dd>-->
-                        <dd><a href="/swordfish/frontPage/partner/free/index">产品销售合作</a></dd>
+                        <!-- <dd><a href="/swordfish/frontPage/partner/free/index">产品销售合作</a></dd> -->
                     </dl>
                 </div>
                 <div class="jy_classify_r">

+ 19 - 5
src/web/templates/common/pchead.html

@@ -29,10 +29,18 @@
                     </div> -->
                 </li>
                 <li name="服务">
-                  <a href="#">服务</a>
+                  <a class="nav-text" href="javascript:;">
+                    服务
+                    <span class="dot-red"></span>
+                  </a>
+                  <div class="jynav-list jy-rember" style="width:173px;">
+                      <span name="信息发布"><a style="display: flex;align-items: center;" href="javascript:;" data-type="work-bench" data-href="/swordfish/page_web_pc/issued/info">信息发布<div class="time-free">限免</div></a></span>
+                      <span name="广告服务"><a href="/front/advservices.html">广告服务</a></span>
+                      <span name="标书制作"><a href="/swordfish/frontPage/bidedoc/free/index">标书制作</a></span>
+                  </div>
                 </li>
                 <li name="数据市场">
-                    <a class="nav-text" href="/front/dataExport/toSieve">
+                    <a class="nav-text" href="javascript:;">
                       数据市场
                       <span class="dot-red"></span>
                     </a>
@@ -40,7 +48,8 @@
                         <span name="数据导出"><a href="/front/dataExport/toSieve">自助导出</a></span>
                         <span name="数据服务"><a href="/front/structed/pc_index.html">定制服务</a></span>
                         <span name="数据流量包"><a style="display: flex;justify-content: space-between; align-items: center" href="/front/dataPack/createOrder">数据流量包 <div class="tag">特惠</div></a></span>
-                    </div>
+                        <!-- <span name="数据定制化导出"><a href="javascript:;">数据定制化导出</a></span> -->
+                      </div>
                 </li>
                 <li name="解决方案">
                     <a href="/swordfish/frontPage/solution/free/index">解决方案</a>
@@ -73,10 +82,15 @@
                 <li name="品牌">
                     <a href="/front/busicooperation.html">品牌</a>
                     <div class="jynav-list jy-rember">
-                        <span name="商务合作"><a href="/front/busicooperation.html">商务合作</a></span>
+                        <!-- <span name="商务合作"><a href="/front/busicooperation.html">商务合作</a></span>
                         <span name="广告服务"><a href="/front/advservices.html">广告服务</a></span>
                         <span name="关于我们"><a href="/front/aboutus.html">关于我们</a></span>
-                        <span name="产品销售合作" class="recruit"><a href="/swordfish/frontPage/partner/free/index">产品销售合作</a></span>
+                        <span name="产品销售合作" class="recruit"><a href="/swordfish/frontPage/partner/free/index">产品销售合作</a></span> -->
+                        <span name="公司介绍"><a href="/swordfish/frontPage/brand/free/index">公司介绍</a></span>
+                        <span name="发展历程"><a href="/swordfish/frontPage/brand/free/index?seat=history">发展历程</a></span>
+                        <span name="公司动态"><a href="/swordfish/frontPage/brand/free/index?seat=Company_Dynamic">公司动态</a></span>
+                        <span name="加入我们"><a href="/swordfish/frontPage/brand/free/index?seat=join_us">加入我们</a></span>
+                        <span name="联系我们"><a href="/swordfish/frontPage/brand/free/index?seat=contact_us">联系我们</a></span>
                     </div>
                 </li>
                 <li name="消息" id="noticed" style="display: none;">

+ 260 - 171
src/web/templates/pc/index.html

@@ -7,7 +7,7 @@
   <meta name="Description" content='{{Msg "seo" "qfw.swordfish.description"}}'/>
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
   <meta name="format-detection" content="tephone=no" />
-  <meta content="首页" theme="light" name="enable-header"/>
+  <meta content="首页" theme="dark" name="enable-header"/>
   <meta http-equiv="X-UA-Compatible" content="ie=edge" />
   <script>
     if(window !== window.parent){
@@ -23,11 +23,6 @@
   <link href="//cdn-common.jianyu360.com/cdn/lib/element-ui/2.15.7/lib/theme-chalk/index.css" rel="stylesheet" />
   <link href='{{Msg "seo" "cdn"}}/css/collect-user-info.css?v={{Msg "seo" "version"}}' rel="stylesheet">
   </head>
-  <style>
-    #public-nav[data-theme="light"] {
-      background-color: rgba(255, 255, 255, 0.08)!important;
-    }
-  </style>
 	<body>
 		{{include "/common/pchead.html"}}
 		<section class="jy-index" id="jy-index">
@@ -49,7 +44,7 @@
         <div class="jy-index-search">
           <div class="search">
             <form method="post" action="/jylab/supsearch/index.html" class="form-search" id="zbIndex" name="zbIndex">
-              <input class="ser" autocomplete="off"  type="text" name="keywords" placeholder="请输入您想要查询的招标信息,多个关键词用空格隔开" id="keywords" value="" />
+              <input class="ser" onkeydown="onkeydownSearch()" autocomplete="off"  type="text" name="keywords" placeholder="请输入您想要查询的招标信息,多个关键词用空格隔开" id="keywords" value="" />
               <input type="hidden" name="searchvalue">
               <input type="hidden">
               <input class="btn" type="button" onclick="zbIndexSearch()" />
@@ -84,32 +79,32 @@
           <h3 class="module-title">核心产品</h3>
           <div class="w1200 product-container">
             <div class="main-product">
-              <div class="main-product-item svip-product">
+              <div class="product-item main-product-item svip-product" data-href="/front/subscribe.html">
                 <div class="p-link">了解详情</div>
                 <div class="p-name">超级订阅</div>
-                <div class="p-detail">招投标大数据帮你推荐超前项目、分析业主、企业画像,针对目标市场数据导出、分析。</div>
+                <div class="p-detail">按需订阅,实时推送,高效获取最新招标信息。</div>
               </div>
-              <div class="main-product-item bigmember-product">
+              <div class="product-item main-product-item bigmember-product"  data-href="/big/page/index">
                 <div class="p-link">了解详情</div>
                 <div class="p-name">大会员</div>
                 <div class="p-detail">招投标大数据帮你推荐超前项目、分析业主、企业画像,针对目标市场数据导出、分析。</div>
               </div>
             </div>
             <div class="other-product">
-              <div class="other-product-item buyer-product">
+              <div class="product-item other-product-item buyer-product" data-href="/swordfish/frontPage/serviceSystem/free/index?serviceType=1">
                 <div class="p-link">了解详情</div>
                 <div class="p-name">采购单位服务</div>
-                <div class="p-detail">招投标大数据帮你推荐超前项目、分析业主、企业画像,针对目标市场数据导出、分析。</div>
+                <div class="p-detail">提供信息发布、供应商招募、供应商推荐,精准对接海量供需资源。</div>
               </div>
-              <div class="other-product-item agency-product">
+              <div class="product-item other-product-item agency-product" data-href="/swordfish/frontPage/serviceSystem/free/index?serviceType=2">
                 <div class="p-link">了解详情</div>
                 <div class="p-name">招标代理机构服务</div>
-                <div class="p-detail">招投标大数据帮你推荐超前项目、分析业主、企业画像,针对目标市场数据导出、分析。</div>
+                <div class="p-detail">帮招标代理机构推荐可信赖的供应商、采购单位,拓宽采购的渠道!</div>
               </div>
-              <div class="other-product-item data-market-product">
+              <div class="product-item other-product-item data-market-product" data-href="/front/structed/pc_index.html">
                 <div class="p-link">了解详情</div>
                 <div class="p-name">数据市场</div>
-                <div class="p-detail">招投标大数据帮你推荐超前项目、分析业主、企业画像,针对目标市场数据导出、分析。</div>
+                <div class="p-detail">1.8亿+ 条招标数据开放交易,根据企业自身需求自行构建各类数据应用!</div>
               </div>
             </div>
           </div>
@@ -144,22 +139,38 @@
         <h3 class="module-title">专业的招投标大数据服务平台</h3>
         <div class="w1200 platform-container">
           <div class="platform-left">
-            <span class="platform-header">亿万级数据库,不漏掉一个标讯</span>
-            <div class="platform-content">剑鱼标讯可第一时间采集全国权威机构公开的招标采购信息,实现招投标数据的结构化的自动流水线处理。目前剑鱼标讯已拥有亿万级数据库,数据覆盖建筑工程、信息技术等12个领域。标讯数据可实现分秒级更新,确保全面性、及时性。</div>
-            <div class="platform-footer">
-              <span>6600万+项目库</span>
-              <em class="text-line"></em>
-              <span>5465万+企业库</span>
-              <em class="text-line"></em>
-              <span>260万+采购单位库</span>
-              <em class="text-line"></em>
-              <span>10W+日更新数据</span>
+            <div class="tab-menu">
+              <div data-index="1" class="tab-header active">亿万级数据库,不漏掉一个标讯</div>
+              <div class="tab-content">
+                <div class="platform-content">剑鱼标讯可第一时间采集全国权威机构公开的招标采购信息,实现招投标数据的结构化的自动流水线处理。目前剑鱼标讯已拥有亿万级数据库,数据覆盖建筑工程、信息技术等12个领域。标讯数据可实现分秒级更新,确保全面性、及时性。</div>
+                <div class="platform-footer">
+                  <span>6600万+项目库</span>
+                  <em class="text-line"></em>
+                  <span>5465万+企业库</span>
+                  <em class="text-line"></em>
+                  <span>260万+采购单位库</span>
+                  <em class="text-line"></em>
+                  <span>10W+日更新数据</span>
+                </div>
+              </div>
+            </div>
+            <div class="tab-menu">
+              <div data-index="2" class="tab-header platform-header">挖掘标讯数据潜力,快速达成销售目标</div>
+              <div class="tab-content" style="display: none;">
+                <div class="platform-content">目前产品体系覆盖标讯实时搜索、订阅推送、结构化数据、商机管理、行业解决方案等板块,成熟的产品体系企业商机获取能力提升100%。基于标讯的深度数据整理分析,可降低企业获取利用标讯数据的成本,更好洞察市场提升销售额。</div>
+              </div>
+            </div>
+            <div class="tab-menu">
+              <div data-index="3" class="tab-header platform-header">一站式服务,辅助企业数据变现</div>
+              <div class="tab-content" style="display: none;">
+                <div class="platform-content">拥有专业的开发、产品、运营、售前、售后团队,可提供全方位的产品使用指导和问题解决方案。2小时内快速响应、提供全方位的产品使用指导和问题解决方案,确保所有服务真正为企业所用。</div>
+              </div>
             </div>
-            <h3 class="platform-bold">挖掘标讯数据潜力,快速达成销售目标</h3>
-            <h3 class="platform-bold">一站式服务,辅助企业数据变现</h3>
           </div>
           <div class="platform-right">
-            <img src='{{Msg "seo" "cdn"}}/images/index/platform-img.png?v={{Msg "seo" "version"}}' alt="">
+            <img  data-index="1" src='{{Msg "seo" "cdn"}}/images/index/platform-img-1.png?v={{Msg "seo" "version"}}' alt="">
+            <img  data-index="2" src='{{Msg "seo" "cdn"}}/images/index/platform-img-2.png?v={{Msg "seo" "version"}}' alt="" style="display: none;">
+            <img  data-index="3" src='{{Msg "seo" "cdn"}}/images/index/platform-img-3.png?v={{Msg "seo" "version"}}' alt="" style="display: none;">
           </div>
         </div>
       </div>
@@ -196,12 +207,14 @@
         <div class="w1200 news-container">
         {{range $i, $v := JyCms "jybk" 12}}
           {{if eq $i 0}}
-          <div class="news-card" onclick="window.location.href='/jyblog/{{$v._id}}.html'">
-            <img class="card-img" src="{{$v.s_pic}}" alt="{{$v.s_title}}">
+          <div class="news-card" onclick="window.open('/jyblog/{{$v._id}}.html')">
+            <div class="card-img">
+              <img src="{{$v.s_pic}}" alt="{{$v.s_title}}">
+            </div>
             <div class="card-main">
               <div class="card-time">{{$v.time}}</div>
               <div class="card-title">{{$v.s_title}}</div>
-              <div class="card-summary">{{$v.s_description}}</div>
+              <div class="ellipsis-3 card-summary">{{$v.s_description}}</div>
             </div>
           </div>
           {{end}}
@@ -210,9 +223,9 @@
         <div class="news-list">
           {{range $i, $v := JyCms "jybk" 12}}
             {{if gt $i 0}}
-              <a class="news-item" href="/jyblog/{{$v._id}}.html">
+              <a class="news-item" href="/jyblog/{{$v._id}}.html" target="_blank">
                 <span class="news-item-text">{{$v.s_title}}</span>
-                <span class="news-item-date" data-format-time="1663672363">{{$v.time}}</span>
+                <span class="news-item-date">{{$v.time}}</span>
               </a>
             {{end}}
           {{end}}
@@ -224,16 +237,18 @@
       <div class="jy-index-dt">
         <h3 class="module-title">公司动态</h3>
         <p class="w1200 more">
-          <a href="/jyCms/gsdt/index.html" class="item-link">查看更多</a>
+          <a href="/jyCms/gsdt/index.html" class="item-link" target="_blank">查看更多</a>
         </p>
         <div class="w1200 dt-container">
           {{range $i, $v := JyCms "gsdt" 3}}
             <div class="dt-card">
-              <img class="card-img" src="{{$v.s_pic1}}" alt="{{$v.s_title}}">
-              <div class="card-main" onclick="window.location.href='/jyblog/{{$v._id}}.html'">
+              <div class="card-img">
+                <img src="{{$v.s_pic1}}" alt="{{$v.s_title}}">
+              </div>
+              <div class="card-main" onclick="window.open('/jyblog/{{$v._id}}.html')">
                 <div class="card-time">{{$v.time}}</div>
                 <div class="card-title">{{$v.s_title}}</div>
-                <div class="card-summary">{{$v.s_description}}</div>
+                <div class="ellipsis-3 card-summary">{{$v.s_description}}</div>
               </div>
             </div>
           {{end}}
@@ -243,75 +258,137 @@
       <div class="jy-index-partners CfadeInUp">
           <h3 class="module-title">合作伙伴</h3>
           <div class="partners-container swiper-container">
-            <div class="c-wrapper">
-              <div class="swiper-wrapper" style="transition-timing-function: linear;">
-                <div class="swiper-slide">
-                  <div>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/huawei.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/xinyu.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/duopuduo.png?v={{Msg "seo" "version"}}'>
-                  </div>
-                  <div>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/baidu.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/ruijie.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/haikang.png?v={{Msg "seo" "version"}}'>
-                  </div>
-                  <div>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/taipingyang.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/yitu.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/hanhe.png?v={{Msg "seo" "version"}}'>
-                  </div>
-                </div>
-                <div class="swiper-slide">
-                  <div>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/guangda.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/dekey.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/jida.png?v={{Msg "seo" "version"}}'>
-                  </div>
-                  <div>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/ali.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/zhonghui.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/lianruan.png?v={{Msg "seo" "version"}}'>
-                  </div>
-                  <div>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/minsheng.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/lehe.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/meinian.png?v={{Msg "seo" "version"}}'>
-                  </div>
-                </div>
-                <div class="swiper-slide">
-                  <div>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/dianxin.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/jingyi.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/siem.png?v={{Msg "seo" "version"}}'>
-                  </div>
-                  <div>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/shenxin.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/bot.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/yidong.png?v={{Msg "seo" "version"}}'>
-                  </div>
-                  <div>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/zhongtongfu.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/aite.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/yushi.png?v={{Msg "seo" "version"}}'>
-                  </div>
-                </div>
-                <div class="swiper-slide">
-                  <div>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/braun.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/mind.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/ruiwode.png?v={{Msg "seo" "version"}}'>
-                  </div>
-                  <div>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/stryker.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/drager.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/soft.png?v={{Msg "seo" "version"}}'>
-                  </div>
-                  <div>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/wandong.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/huawei.png?v={{Msg "seo" "version"}}'>
-                    <img src='{{Msg "seo" "cdn"}}/images/index/baidu.png?v={{Msg "seo" "version"}}'>
-                  </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>
@@ -344,7 +421,7 @@
     <div class="live_preheat">
       <div>
         <img src="/qr?url=%2factive%2flivePage%2findex" class="live_preheat_qr"/>
-        <img src="{{Msg "seo" "cdn"}}/images/pc/live_preheat_close.png" class="live_preheat_close"/>
+        <img src='{{Msg "seo" "cdn"}}/images/pc/live_preheat_close.png' class="live_preheat_close"/>
       </div>
     </div>
     <!-- 用户留资 -->
@@ -373,7 +450,7 @@
         this.getBuyerSearchPower() // 采购单位搜索权限
         this.lunBoFn() // banner轮播
         this.getOnlineDataFn() // 在线数据
-        this.partnerFn() // 合作伙伴
+        // this.partnerFn() // 合作伙伴
         this.setCopyRightForBottom() // 设置copyright
         this.onClickEvent()
       },
@@ -408,69 +485,36 @@
           autoplay: $('#bannerSwiper').find('.swiper-slide').length > 1 ? true : false, // imageList.length > 1 ? true : false
           paginationClickable: true,
           loop: $('#bannerSwiper').find('.swiper-slide').length > 1 ? true : false, // imageList.length > 1 ? true : false
-        });
-        bannerSwiper.init();
-      },
-      // 合作伙伴走马灯
-      partnerFn: function () {
-        var oBanner = $(".partners-container");
-        var oWrapper = $(".partners-container .swiper-wrapper");
-        var cWrapper = $(".partners-container .c-wrapper");
-        // cWrapper.append(cWrapper.html())
-        oWrapper = $(".partners-container .swiper-wrapper");
-        oWrapper.each(function(){
-          var aSlide = $(this).find(".swiper-slide");
-          var wW = $(window).width();
-          var oLength = 0;
-          if(aSlide.length % 3 == 1){
-              oLength = (aSlide.length+2) / 3;
-          } else if (aSlide.length % 3 == 2) {
-              oLength = (aSlide.length+1) / 3;
-          } else {
-              oLength = aSlide.length / 3;
-          }
-          var num1 = 1;
-          var num2 = oLength + 1;
-          var num3 = oLength * 2 + 1;
-          aSlide.each(function(){
-              if(($(this).index()+1) % 3 == 1){
-                  $(this).css("order",num1);
-                  num1+=1;
-              }else if(($(this).index()+1)%3 == 2){
-                  $(this).css("order",num2);
-                  num2 += 1;
-              }else{
-                  $(this).css("order",num3);
-                  num3 += 1;
-              }
-          })
-          function fn1(){
-            if(wW > 0 ){
-              oWrapper.width(oBanner.width()/3*oLength+2);
-              aSlide.outerWidth(oBanner.width()/3);
-            }
-            if(wW > 991 ){
-              oWrapper.width(oBanner.width()/6*oLength+2);
-              aSlide.outerWidth(oBanner.width()/6);
-            }
-            if(wW > 1580 ){
-              oWrapper.width(oBanner.width()/8*oLength+2);
-              aSlide.outerWidth(oBanner.width()/8);
+          on: {
+            slideChangeTransitionEnd: function() {
+              // var slide = document.querySelectorAll('#bannerSwiper .swiper-slide')
+              // console.log(document.getElementsByClassName('img-banner')[slide.length - 1]);
+              // var img = document.getElementsByClassName('img-banner')[slide.length - 1]
+              // img.onload = function () {
+              //   const rgb = getImageColor(img)
+              //   console.log(rgb, 'rgb');
+              // }
+              // console.log(this.activeIndex, 'ssss');
             }
           }
-          fn1()
         });
-        cWrapper = $(".partners-container .c-wrapper");
-        var num01 = cWrapper.width() / 2;
-        var num02 = 0;
-        setInterval(function (){
-          if(num02 > num01){
-            num02 = 0;
-          }else{
-            num02 += 1;
+        bannerSwiper.init();
+        // 合作伙伴走马灯
+        var partners = new Swiper('.partners-container', {
+          slidesPerView: "auto",
+          centeredSlides: true,
+          speed: 4000,
+          // autoplay: true,
+          freeMode: true,
+          loop: true,
+          slidesPerGroup: 1,
+          autoplay: {
+            delay: 1, //自动切换的时间间隔
+            disableOnInteraction: false,
+            pauseOnMouseEnter: true, //鼠标置于swiper时暂停自动切换,鼠标离开时恢复自动切换。
           }
-          cWrapper.css("transform","translateX("+(num02 * -1)+"px)");
-        }, 10)
+        });
+        partners.init()
       },
       // 在线数据
       getOnlineDataFn: function () {
@@ -569,8 +613,20 @@
             window.location.href = dataUrl;
           }
         })
+        // 产品跳转
+        $('.product-item').on('click', function() {
+          window.location.href = $(this).attr('data-href')
+        })
+        // 留资按钮-弹框
         $('#app-btn').on('click', function(){
-          vm.showForm = true
+          vm.dialogTitle = '请填写信息,我们会根据您的需求,提供最适合的产品演示服务!'
+          vm.isNeedSubmit('pc_index_bid_data')
+        })
+        // 鼠标悬浮切换数据服务平台
+        $('.jy-index-platform .tab-header').hover(function() {
+          $(this).stop().addClass('active').siblings('.tab-content').stop().slideDown()
+          $(this).parent('.tab-menu').siblings().children('.tab-header').stop().removeClass('active').siblings('.tab-content').stop().slideUp()
+          $($('.platform-right img[data-index="' + $(this).attr('data-index') +'"]')).stop().fadeIn('fast').siblings().stop().fadeOut('fast')
         })
         // 处理时间格式化
         $("strong[data-format-time]").each(function () {
@@ -590,6 +646,7 @@
           adBottomFn()
         }, 500)
         function adBottomFn () {
+          console.log(window.memberStatus, 'dahuiyuan');
           // 是大会员则不显示底部广告位
           if (window.memberStatus > 0) {
             // 首页底部广告位隐藏
@@ -600,14 +657,14 @@
             var timer = null; // 定时器
             $(document).scroll(function(){
               clearTimeout(timer)
-              timer = setTimeout(isScrollEnd, 800);
+              timer = setTimeout(isScrollEnd, 1000);
               top1 = document.documentElement.scrollTop || document.body.scrollTop;
               // console.log("滚动中")
               $('.pc-index-bottom').fadeOut()
             })
             function isScrollEnd() {
               top2 = document.documentElement.scrollTop || document.body.scrollTop;
-              if(top1 == top2){
+              if(top1 == top2 && window.memberStatus <= 0){
                 // console.log('滚动结束了')
                 $('.pc-index-bottom').fadeIn()
               }
@@ -628,6 +685,33 @@
     $("#share-weixinF").mouseout(function(){
       $("#share-weixin").addClass("hidden");
     });
+    console.log($('#public-nav').attr('data-theme'), 'rrr');
+    var themeTimer = setInterval(function() {
+      if($('#public-nav').attr('data-theme') === 'dark') {
+        $('.logo > img[data-theme="light"]').css({
+          'opacity': '1'
+        })
+        $('#public-nav .iner .jynav li a').css({
+          'color': '#1d1d1d'
+        })
+        $('#noticed img[data-theme="dark"]').css({
+          'opacity': '0'
+        })
+        $('#noticed img[data-theme="light"]').css({
+          'opacity': '1'
+        })
+        clearInterval(themeTimer)
+      } else {
+        clearInterval(themeTimer)
+      }
+    }, 500)
+    
+    var img = document.getElementsByClassName('swiper-slide-active')[0].children[0];
+    // img.onload = function() {
+    //   var rgb = getImageColor(img)
+    //   var hsl = rgbToHsl(rgb)
+    //   console.log(hsl, '666');
+    // }
   })
   // 弹窗(优化一下?)
   var times = new Date().getTime();
@@ -771,6 +855,11 @@
   /**
    * 前往工作台打开对应搜索
    */
+  function onkeydownSearch () {
+    if (window.event.keyCode == 13) {//window.可以省略不写
+			zbIndexSearch()
+		}
+  }
   function zbIndexSearch () {
     var activeTab = $('.tips span.active').attr('data-id')
     if (activeTab === 'zb') {