Merge remote-tracking branch 'origin/master'

src/layout/components/header.vue

@@ -36,7 +36,6 @@
 <script>
 import Cookies from 'js-cookie'
 import logo from '@/assets/image/logo.png'
-import axios from 'axios'
 import { headerWeather } from '@/api/baidu'
 
 export default {
@@ -83,9 +82,9 @@ export default {
       //   })
     },
     toHome() {
-      if (this.$route.path !== '/Home') {
+      if (this.$route.path !== '/homePage') {
         this.$router.replace({
-          name: 'Home',
+          name: 'HomePage',
           parmas: {
             batchRecordSingle: this.$route.name === 'BatchRecordDetail'
           }

src/router/routes.js

@@ -254,6 +254,18 @@ const USER_VISITOR_ROUTES = [
         },
         component: () => import('@/views/Home/index')
       },
+      {
+        path: '/homePage',
+        name: 'HomePage',
+        meta: {
+          showFooter: true,
+          title: '首页',
+          USER_LEVEL: USER_LEVEL.USER_VISITOR,
+          showHeader: true,
+          animation: false
+        },
+        component: () => import('@/views/homePage/index.vue')
+      },
       /* 客运服务界面*/
       {
         path: '/passengerTransport/index',
@@ -388,7 +400,7 @@ const USER_LOGIN_ROUTES = [
       {
         path: '/personalCenter/registration',
         name: 'resetPwd',
-        meta: { title: '立即注册', showFooter: true, showHeader: false },
+        meta: { title: '立即注册', showFooter: true, showHeader: true },
         component: () => import('@/views/personalCenter/registration')
       },
       {

src/styles/btn.scss

@@ -36,7 +36,7 @@
 .queryBtn{
   padding: 7px 13px 7px 11px;
   width: 124px;
-  height: 40px;
+  height: 38px;
   background: #419E83;
   border-radius: 4px 4px 4px 4px;
   border: 1px solid #419E83;

src/views/Home/components/NavList/index.vue

@@ -25,7 +25,7 @@ export default {
       type: Array,
       default() {
         return [
-          { menuName: '首页', path: '/', query: { isBlank: true }, imag: tabHome },
+          { menuName: '首页', path: '/homePage', query: { isBlank: true }, imag: tabHome },
           { menuName: '天气情况', path: '/weatherCondition/index', query: { isBlank: true }, imag: tabTianqi },
           { menuName: '出行服务', path: '/mobilityServices/index', query: { isBlank: true }, imag: tabTianqi },
           { menuName: '交通资讯', path: '/trafficInformation/index', query: { isBlank: true }, imag: tabChuxing },
@@ -40,7 +40,7 @@ export default {
     currentMenu: {
       type: String,
       default() {
-        return '/'
+        return '/homePage'
       }
     }
   },

src/views/Home/index.vue

 <template>
   <div class="home-content">
     <div style="position: fixed;z-index: 100;right: 0;left: 0;">
-      <nav-list current-menu="/" />
+      <nav-list current-menu="/Home" />
     </div>
     <div class="block" style="padding-top: 80px;position: relative">
       <div class="scroll">
@@ -309,7 +309,7 @@ export default {
       travelServicesForm: {
         start: '',
         endL: '',
-        type:'1'
+        type: '1'
       },
       onData: onData,
       // 导航Image
@@ -357,9 +357,9 @@ export default {
     }
   },
   created() {
+    this.getRoadConditionsList()
     this.getPublicService()
     this.getTrafficInformation()
-    this.getRoadConditionsList()
   },
   methods: {
     // 出行服务选择地点

src/views/myService/addComplaint.vue

@@ -217,7 +217,7 @@ export default {
       this.$router.push({ name: 'myServiceIndex' })
     },
     goHome() {
-      this.$router.push({ name: 'Home' })
+      this.$router.push({ name: 'HomePage' })
     },
     searchcomplete(arr) {
       this.restaurants = arr.Yr

src/views/myService/index.vue

@@ -107,7 +107,7 @@ export default {
   methods: {
     parseTime,
     goHome() {
-      this.$router.push({ name: 'Home' })
+      this.$router.push({ name: 'HomePage' })
     },
     // 查看详情
     goServiceDetais(item) {

src/views/myService/serviceDetials.vue

@@ -79,7 +79,7 @@ export default {
       this.$router.push({ name: 'myServiceIndex' })
     },
     goHome() {
-      this.$router.push({ name: 'Home' })
+      this.$router.push({ name: 'HomePage' })
     },
     // 服务类型
     serviceType(value) {

src/views/personalCenter/login.vue

 <template>
   <div class="p-login">
     <div style="position: fixed;z-index: 100;right: 0;left: 0;">
-      <nav-list current-menu="/" />
+      <nav-list />
     </div>
     <div class="header-banner-container" style="padding-top: 80px" />
     <div class="content-container">
@@ -135,7 +135,7 @@ export default {
     goBack() {
       // this.$router.go(-1)
       this.$router.push({
-        path: '/Home'
+        path: '/homePage'
       })
     },
 
@@ -162,7 +162,7 @@ export default {
               Cookies.set('information', this.loginPwdForm)
             }
             this.$store.dispatch('user/SetToken', loginRes.token)
-            this.routerReplace({ path: '/' })
+            this.routerReplace({ path: '/homePage' })
             this.loginLoading = false
           } else {
             this.loginLoading = false

src/views/personalCenter/registration.vue

 <template>
   <div class="resetPwdList">
-    <Header />
     <nav-list></nav-list>
 <!--    <com-layout-wrapper class="resetPwd">-->