Merge branches 'master' and 'master' of http://git.cc-lotus.info/smart-jobs/web-center

src/components/index.vue

@@ -37,7 +37,7 @@
             </el-col>
           </el-col>
           <el-col :span="24" class="main_3">
-            <weilai></weilai>
+            <weilai :pic="info.advert"></weilai>
           </el-col>
           <el-col :span="24" class="main_4">
             <el-col :span="11" class="service">

src/layout/index/weilai.vue

@@ -2,7 +2,7 @@
   <div id="weilai">
     <el-row>
       <el-col :span="24" class="image">
-        <el-image style="width:100%;height:200px;" :src="url"></el-image>
+        <el-image style="width:100%;height:200px;" :src="pic ? pic : url"></el-image>
       </el-col>
     </el-row>
   </div>
@@ -11,7 +11,9 @@
 <script>
 export default {
   name: 'weilai',
-  props: {},
+  props: {
+    pic: null,
+  },
   components: {},
   data: () => ({
     url: require('@/assets/weilai.jpg'),

src/router/index.js

@@ -3,7 +3,7 @@ import Router from 'vue-router';
 
 Vue.use(Router);
 
-export default new Router({
+const router = new Router({
   mode: 'history',
   base: process.env.NODE_ENV === 'development' ? '' : process.env.VUE_APP_ROUTER,
   routes: [
@@ -89,3 +89,9 @@ export default new Router({
     },
   ],
 });
+
+router.afterEach((to, from, next) => {
+  window.scrollTo(0, 0);
+});
+
+export default router;