Merge branch 'XK_carB20190624' into Development

src/assets/css/rank/ranking.less

@@ -12,7 +12,7 @@
       height:280px;
       margin:0 auto;
       position: relative;
-      top:180px;
+      top:172px;
       p{
         height:25px;
         line-height: 25px;

src/assets/css/rank/ranking.min.css

-.ranking-content{background:#885bfe}.ranking-content *{padding:0px;margin:0px}.ranking-content .cp1{background:url("../../images/rank/p1.jpg") no-repeat;height:380px;width:100%;background-size:100% 100%}.ranking-content .cp2{background:url("../../images/rank/p2.jpg") no-repeat;height:662px;width:100%;background-size:100% 100%}.ranking-content .cp3{background:url("../../images/rank/p3.jpg") no-repeat;height:799px;width:100%;background-size:100% 100%}.ranking-content .cp4{background:url("../../images/rank/p4.jpg") no-repeat;height:471px;width:100%;background-size:100% 100%}.ranking-content .cp4 .content{width:93%;height:280px;margin:0 auto;position:relative;top:180px}.ranking-content .cp4 .content p{height:25px;line-height:25px;text-align:center;color:#fff;font-size:14px}.ranking-content .cp4 .content p span{overflow-x:hidden;text-overflow:ellipsis;width:33.33%}.ranking-content .cp4 .content p span.l-z font{position:relative;left:4%}.ranking-content .cp4 .content p span.r-z font{position:relative;left:-8%}.ranking-content .cpbtn{width:196px;height:53px;text-align:center;margin:20px auto;display:block;cursor:pointer;background:url("../../images/rank/lijichong.png") no-repeat;background-size:100% 100%}.ranking-content .cp5{background:url("../../images/rank/p5.jpg") no-repeat;height:576px;width:100%;background-size:100% 100%}
\ No newline at end of file
+.ranking-content{background:#885bfe}.ranking-content *{padding:0px;margin:0px}.ranking-content .cp1{background:url("../../images/rank/p1.jpg") no-repeat;height:380px;width:100%;background-size:100% 100%}.ranking-content .cp2{background:url("../../images/rank/p2.jpg") no-repeat;height:662px;width:100%;background-size:100% 100%}.ranking-content .cp3{background:url("../../images/rank/p3.jpg") no-repeat;height:799px;width:100%;background-size:100% 100%}.ranking-content .cp4{background:url("../../images/rank/p4.jpg") no-repeat;height:471px;width:100%;background-size:100% 100%}.ranking-content .cp4 .content{width:93%;height:280px;margin:0 auto;position:relative;top:172px}.ranking-content .cp4 .content p{height:25px;line-height:25px;text-align:center;color:#fff;font-size:14px}.ranking-content .cp4 .content p span{overflow-x:hidden;text-overflow:ellipsis;width:33.33%}.ranking-content .cp4 .content p span.l-z font{position:relative;left:4%}.ranking-content .cp4 .content p span.r-z font{position:relative;left:-8%}.ranking-content .cpbtn{width:196px;height:53px;text-align:center;margin:20px auto;display:block;cursor:pointer;background:url("../../images/rank/lijichong.png") no-repeat;background-size:100% 100%}.ranking-content .cp5{background:url("../../images/rank/p5.jpg") no-repeat;height:576px;width:100%;background-size:100% 100%}
\ No newline at end of file

src/views/aboutUs/index.vue

@@ -56,6 +56,10 @@
         </ul>
       </div>
     </div>
+    <div class="one-tips">
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;猎芯网是由深圳市猎芯科技有限公司开发运营的行业领先B2B全球元器件一站式采购商城，于2015年7月上线。目前已获得著名VC经纬中国、微光、五岳华诺、京东战投、海通证券等多轮投资，是中国本土崛起最快速的电子元器件知名电商。<br/>
+      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;平台现有超过4000万型号，5000多个国内外知名品牌， 通过整合电子元器件上下游资源，猎芯网提供自营商城+联营现货代购+开放平台+PCB快板+SMT贴片+全球交付等业务服务，实现了整个交易环节全闭环一站式服务， 快速满足各类中小微企业广大工 程师及采购人员的中小批量样品及现货需求。
+    </div>
     <div class="section sec2 about-two">
       <img src="../../assets/images/aboutus/title_02.png">
       <img src="../../assets/images/aboutus/jg_02.png">
@@ -357,6 +361,13 @@ export default {
       }
     }
   }
+  .one-tips{
+    color:#333;
+    font-size: 16px;
+    line-height: 24px;
+    padding:20px;
+    margin-bottom: 20px;
+  }
   .about-two {
     padding-top: remFun(0.2rem);
     img {

view/13.js

@@ -42,7 +42,7 @@ eval("exports = module.exports = __webpack_require__(/*! ../../../node_modules/_
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-eval("var escape = __webpack_require__(/*! ../../../../node_modules/_css-loader@1.0.1@css-loader/lib/url/escape.js */ \"./node_modules/_css-loader@1.0.1@css-loader/lib/url/escape.js\");\nexports = module.exports = __webpack_require__(/*! ../../../../node_modules/_css-loader@1.0.1@css-loader/lib/css-base.js */ \"./node_modules/_css-loader@1.0.1@css-loader/lib/css-base.js\")(false);\n// imports\n\n\n// module\nexports.push([module.i, \".ranking-content{background:#885bfe}.ranking-content *{padding:0px;margin:0px}.ranking-content .cp1{background:url(\" + escape(__webpack_require__(/*! ../../images/rank/p1.jpg */ \"./src/assets/images/rank/p1.jpg\")) + \") no-repeat;height:380px;width:100%;background-size:100% 100%}.ranking-content .cp2{background:url(\" + escape(__webpack_require__(/*! ../../images/rank/p2.jpg */ \"./src/assets/images/rank/p2.jpg\")) + \") no-repeat;height:662px;width:100%;background-size:100% 100%}.ranking-content .cp3{background:url(\" + escape(__webpack_require__(/*! ../../images/rank/p3.jpg */ \"./src/assets/images/rank/p3.jpg\")) + \") no-repeat;height:799px;width:100%;background-size:100% 100%}.ranking-content .cp4{background:url(\" + escape(__webpack_require__(/*! ../../images/rank/p4.jpg */ \"./src/assets/images/rank/p4.jpg\")) + \") no-repeat;height:471px;width:100%;background-size:100% 100%}.ranking-content .cp4 .content{width:93%;height:280px;margin:0 auto;position:relative;top:180px}.ranking-content .cp4 .content p{height:25px;line-height:25px;text-align:center;color:#fff;font-size:14px}.ranking-content .cp4 .content p span{overflow-x:hidden;text-overflow:ellipsis;width:33.33%}.ranking-content .cp4 .content p span.l-z font{position:relative;left:4%}.ranking-content .cp4 .content p span.r-z font{position:relative;left:-8%}.ranking-content .cpbtn{width:196px;height:53px;text-align:center;margin:20px auto;display:block;cursor:pointer;background:url(\" + escape(__webpack_require__(/*! ../../images/rank/lijichong.png */ \"./src/assets/images/rank/lijichong.png\")) + \") no-repeat;background-size:100% 100%}.ranking-content .cp5{background:url(\" + escape(__webpack_require__(/*! ../../images/rank/p5.jpg */ \"./src/assets/images/rank/p5.jpg\")) + \") no-repeat;height:576px;width:100%;background-size:100% 100%}\", \"\"]);\n\n// exports\n\n\n//# sourceURL=webpack:///./src/assets/css/rank/ranking.min.css?./node_modules/_css-loader@1.0.1@css-loader??ref--6-oneOf-1-1!./node_modules/_vue-loader@15.7.0@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@3.0.0@postcss-loader/src??ref--6-oneOf-1-2");
+eval("var escape = __webpack_require__(/*! ../../../../node_modules/_css-loader@1.0.1@css-loader/lib/url/escape.js */ \"./node_modules/_css-loader@1.0.1@css-loader/lib/url/escape.js\");\nexports = module.exports = __webpack_require__(/*! ../../../../node_modules/_css-loader@1.0.1@css-loader/lib/css-base.js */ \"./node_modules/_css-loader@1.0.1@css-loader/lib/css-base.js\")(false);\n// imports\n\n\n// module\nexports.push([module.i, \".ranking-content{background:#885bfe}.ranking-content *{padding:0px;margin:0px}.ranking-content .cp1{background:url(\" + escape(__webpack_require__(/*! ../../images/rank/p1.jpg */ \"./src/assets/images/rank/p1.jpg\")) + \") no-repeat;height:380px;width:100%;background-size:100% 100%}.ranking-content .cp2{background:url(\" + escape(__webpack_require__(/*! ../../images/rank/p2.jpg */ \"./src/assets/images/rank/p2.jpg\")) + \") no-repeat;height:662px;width:100%;background-size:100% 100%}.ranking-content .cp3{background:url(\" + escape(__webpack_require__(/*! ../../images/rank/p3.jpg */ \"./src/assets/images/rank/p3.jpg\")) + \") no-repeat;height:799px;width:100%;background-size:100% 100%}.ranking-content .cp4{background:url(\" + escape(__webpack_require__(/*! ../../images/rank/p4.jpg */ \"./src/assets/images/rank/p4.jpg\")) + \") no-repeat;height:471px;width:100%;background-size:100% 100%}.ranking-content .cp4 .content{width:93%;height:280px;margin:0 auto;position:relative;top:172px}.ranking-content .cp4 .content p{height:25px;line-height:25px;text-align:center;color:#fff;font-size:14px}.ranking-content .cp4 .content p span{overflow-x:hidden;text-overflow:ellipsis;width:33.33%}.ranking-content .cp4 .content p span.l-z font{position:relative;left:4%}.ranking-content .cp4 .content p span.r-z font{position:relative;left:-8%}.ranking-content .cpbtn{width:196px;height:53px;text-align:center;margin:20px auto;display:block;cursor:pointer;background:url(\" + escape(__webpack_require__(/*! ../../images/rank/lijichong.png */ \"./src/assets/images/rank/lijichong.png\")) + \") no-repeat;background-size:100% 100%}.ranking-content .cp5{background:url(\" + escape(__webpack_require__(/*! ../../images/rank/p5.jpg */ \"./src/assets/images/rank/p5.jpg\")) + \") no-repeat;height:576px;width:100%;background-size:100% 100%}\", \"\"]);\n\n// exports\n\n\n//# sourceURL=webpack:///./src/assets/css/rank/ranking.min.css?./node_modules/_css-loader@1.0.1@css-loader??ref--6-oneOf-1-1!./node_modules/_vue-loader@15.7.0@vue-loader/lib/loaders/stylePostLoader.js!./node_modules/_postcss-loader@3.0.0@postcss-loader/src??ref--6-oneOf-1-2");
 
 /***/ }),
 
@@ -75,7 +75,7 @@ eval("module.exports = __webpack_require__.p + \"img/lijichong.de45e9b8.png\";\n
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-eval("module.exports = __webpack_require__.p + \"img/p1.f0501887.jpg\";\n\n//# sourceURL=webpack:///./src/assets/images/rank/p1.jpg?");
+eval("module.exports = __webpack_require__.p + \"img/p1.e830e572.jpg\";\n\n//# sourceURL=webpack:///./src/assets/images/rank/p1.jpg?");
 
 /***/ }),
 
@@ -86,7 +86,7 @@ eval("module.exports = __webpack_require__.p + \"img/p1.f0501887.jpg\";\n\n//# s
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-eval("module.exports = __webpack_require__.p + \"img/p2.42453714.jpg\";\n\n//# sourceURL=webpack:///./src/assets/images/rank/p2.jpg?");
+eval("module.exports = __webpack_require__.p + \"img/p2.0eb7e15f.jpg\";\n\n//# sourceURL=webpack:///./src/assets/images/rank/p2.jpg?");
 
 /***/ }),
 
@@ -97,7 +97,7 @@ eval("module.exports = __webpack_require__.p + \"img/p2.42453714.jpg\";\n\n//# s
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-eval("module.exports = __webpack_require__.p + \"img/p3.f8962c41.jpg\";\n\n//# sourceURL=webpack:///./src/assets/images/rank/p3.jpg?");
+eval("module.exports = __webpack_require__.p + \"img/p3.ea912a3e.jpg\";\n\n//# sourceURL=webpack:///./src/assets/images/rank/p3.jpg?");
 
 /***/ }),
 
@@ -108,7 +108,7 @@ eval("module.exports = __webpack_require__.p + \"img/p3.f8962c41.jpg\";\n\n//# s
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-eval("module.exports = __webpack_require__.p + \"img/p4.c3f350cd.jpg\";\n\n//# sourceURL=webpack:///./src/assets/images/rank/p4.jpg?");
+eval("module.exports = __webpack_require__.p + \"img/p4.6444fe95.jpg\";\n\n//# sourceURL=webpack:///./src/assets/images/rank/p4.jpg?");
 
 /***/ }),
 
@@ -119,7 +119,7 @@ eval("module.exports = __webpack_require__.p + \"img/p4.c3f350cd.jpg\";\n\n//# s
 /*! no static exports found */
 /***/ (function(module, exports, __webpack_require__) {
 
-eval("module.exports = __webpack_require__.p + \"img/p5.cc0fdbdd.jpg\";\n\n//# sourceURL=webpack:///./src/assets/images/rank/p5.jpg?");
+eval("module.exports = __webpack_require__.p + \"img/p5.3f5f107e.jpg\";\n\n//# sourceURL=webpack:///./src/assets/images/rank/p5.jpg?");
 
 /***/ }),