调整样式

view/src/App.vue

@@ -1,13 +1,11 @@
 <template>
-  <div id="app">
-    <div class="box">
-      <!-- <md-water-mark class="text-container" :content="markContent" spacing="10vw"> -->
-      <transition name="fademap">
-        <router-view/>
-      </transition>
-      <!-- </md-water-mark> -->
-    </div>
-    <btmNav></btmNav>
+  <div id="app" class="box">
+    <!-- <md-water-mark class="text-container" :content="markContent" spacing="10vw"> -->
+    <transition name="fademap">
+      <router-view />
+    </transition>
+    <!-- </md-water-mark> -->
+    <btmNav v-show="btmNavShow"></btmNav>
   </div>
 </template>
 <script>
@@ -18,7 +16,18 @@ export default {
   components: {
     btmNav: btmNav
   },
+  data () {
+    return {
+      showList: ['/trip', '/traffic', '/history', '/user']
+    }
+  },
+  computed: {
+    btmNavShow () {
+      return this.showList.indexOf(this.$route.path) !== -1
+    }
+  },
   mounted () {
+    console.log(this.$route)
     // 验证本地是否已经登录过
     let tmpUser = localStorage.getItem('user')
     if (tmpUser) {
@@ -43,9 +52,9 @@ export default {
 <style>
 @import "style/reset.css";
 .box {
-  width: 100%;
-  height: calc(100vh-100px);
-  overflow: auto;
+  width: 100vw;
+  height: calc(100vh);
+  overflow: hidden;
   position: relative;
   color: #555555;
   font-size: 24px;

view/src/views/bottom_nav/btmNav.vue

@@ -4,7 +4,7 @@
       <template slot="item" slot-scope="{ item }">
         <div class="custom-item">
           <div class="icon">
-            <md-icon :name="item.icon"/>
+            <md-icon :name="item.icon" />
           </div>
           <div class="text">
             <span v-text="item.label"></span>
@@ -59,6 +59,10 @@ export default {
 .btm-nav {
   width: 100%;
   height: 100px;
+  background-color: #fff;
+  z-index: 100;
+  position: absolute;
+  bottom: 0;
   // border:1px solid black;
 }
 .icon {

view/src/views/history/history.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="history">
-    <div v-if="$route.name === 'History'">
+  <div class="history-box">
+    <div class="history" v-if="$route.name === 'History'">
       <div class="history-title" style="z-index:200">
         <span>出行历史</span>
         <svg-icon class="title-svg" icon-class="history-list"/>
@@ -47,7 +47,12 @@ export default {
 </script>
 
 <style lang="scss" scoped>
-.history {
+.history{
+  width: 100%;
+  height: calc(100% - 100px);
+  overflow: auto;
+}
+.history-box {
   width: 100%;
   height: 100%;
   &-title {

view/src/views/traffic/traffic.vue

@@ -433,7 +433,7 @@ export default {
 <style lang="scss">
 .traffic {
   width: 100%;
-  height: 100%;
+  height: calc(100% - 100px);
   overflow: hidden;
   position: relative;
   .search {

view/src/views/trip/trip.vue

@@ -2,7 +2,7 @@
   <div class="trip">
     <!-- <MapLocation></MapLocation> -->
     <div v-show="$route.name !== 'Map'" class="trip-box">
-      <img class="trip-bg" src="../../assets/img/bg.png" alt>
+      <img class="trip-bg" src="../../assets/img/bg.jpg" alt>
       <div class="trip-con">
         <md-tabs v-model="TripWay">
           <md-tab-pane name="徒步" label="徒步"></md-tab-pane>
@@ -94,7 +94,7 @@ export default {
 <style lang="scss" scoped>
 .trip {
   width: 100%;
-  height: 100%;
+  height: calc(100% - 100px);
   position: relative;
   .trip-bg {
     width: 100%;

view/src/views/user/analysis1/dataAnalysis.vue

@@ -45,6 +45,7 @@ export default {
 .analysis {
   width: 100%;
   height: 100%;
+  overflow: auto;
   padding: 30px;
   box-sizing: border-box;
   &-title {

view/src/views/user/user.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="user">
-    <img class="user-bgimg" src="../../assets/img/user-bg.png">
+    <img class="user-bgimg" src="../../assets/img/user-bg.jpg">
     <div class="user-con">
       <div v-if="userData" class="user-title">
         <div class="user-title-top">
@@ -138,7 +138,7 @@ export default {
 <style lang="scss" scoped>
 .user {
   width: 100%;
-  height: 100%;
+  height: calc(100% - 100px);
   position: relative;
   color: #363030;
   &-bgimg {

view/src/views/user/userDetails.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="me">
-    <img class="me-bgimg" src="../../assets/img/user-bg.png">
+    <img class="me-bgimg" src="../../assets/img/user-bg.jpg">
     <div v-if="userData" class="me-top">
       <span @click="loginOutOnClick" class="me-top-outbtn">退出登录</span>
       <img class="me-top-heaimg" :src="userData.img" alt>