Merge branch 'XK_carB20190624' into Development

src/assets/css/rank/ranking.less

 .ranking-content{
   background:#885bfe;
   *{padding:0px;margin:0px;}
-  .cp1{background: url("../../images/rank/p1.jpg")  no-repeat ;height:380px;width:100%;background-size: 100% 100%; }
+  .cp1{background: url("../../images/rank/p1.jpg")  no-repeat ;height:227px;width:100%;background-size: 100% 100%; }
   .cp2{background: url("../../images/rank/p2.jpg")  no-repeat ;height:662px;width:100%;background-size: 100% 100%; }
   .cp3{background: url("../../images/rank/p3.jpg")  no-repeat ;height:799px;width:100%;background-size: 100% 100%; }
   .cp4{

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: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
+.ranking-content{background:#885bfe}.ranking-content *{padding:0px;margin:0px}.ranking-content .cp1{background:url("../../images/rank/p1.jpg") no-repeat;height:227px;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

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: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");
+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:227px;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.e830e572.jpg\";\n\n//# sourceURL=webpack:///./src/assets/images/rank/p1.jpg?");
+eval("module.exports = __webpack_require__.p + \"img/p1.5fc6a840.jpg\";\n\n//# sourceURL=webpack:///./src/assets/images/rank/p1.jpg?");
 
 /***/ }),