Merge remote-tracking branch 'origin/http_mock' into http_mock

package.json

@@ -40,6 +40,7 @@
     "path-to-regexp": "2.4.0",
     "qrcodejs2": "0.0.2",
     "simditor": "^2.3.26",
+    "swiper": "^5.3.6",
     "v-jsoneditor": "^1.2.2",
     "vue": "2.6.10",
     "vue-awesome-swiper": "^4.0.4",
@@ -80,7 +81,6 @@
     "stylus-loader": "^3.0.2",
     "svg-sprite-loader": "4.1.3",
     "svgo": "1.2.2",
-    "swiper": "^4.5.1",
     "vue-template-compiler": "2.6.10"
   },
   "engines": {

src/views/projectManage/version/list/timeLine.vue

@@ -14,12 +14,8 @@
       <!-- 左右箭头 -->
     </swiper>
     <div class="swiper-button">
-      <div class="swiper-button-prev">
-        <img style="width:100%;height:100%" :src="preImg">
-      </div>
-      <div class="swiper-button-next">
-        <img style="width:100%;height:100%" :src="nextImg">
-      </div>
+      <div class="swiper-button-prev" />
+      <div class="swiper-button-next" />
     </div>
   </div>
 </template>
@@ -27,10 +23,10 @@
 <script>
 import preImg from '@/icons/png/previous.png'
 import nextImg from '@/icons/png/next.png'
-import 'swiper/dist/css/swiper.css'
+// import 'swiper/dist/css/swiper.css'
 // import Swiper from 'swiper'
 import { Swiper, SwiperSlide, directive } from 'vue-awesome-swiper'
-// import 'swiper/css/swiper.css'
+import 'swiper/css/swiper.css'
 
 export default {
   components: {
@@ -147,14 +143,14 @@ export default {
   position: relative;
   top: -108px;
 }
-.swiper-button-prev,
-.swiper-button-next {
-  background-image: none !important;
-}
 </style>
 
 <style>
 .swiper-container .swiper-pagination-bullet-active {
   background-color: #409eff;
 }
+.swiper-container .swiper-button-prev,
+.swiper-container .swiper-button-next {
+  color: #409eff;
+}
 </style>