From 28699034d5e83b8a62ab9c5bab5201138aad4d7f Mon Sep 17 00:00:00 2001
From: neverland <chenjiahan@buaa.edu.cn>
Date: Thu, 2 Aug 2018 16:01:34 +0800
Subject: [PATCH] [Doc] update mobile nav (#1578)

---
 docs/src/components/DemoList.vue  |  13 ++-
 docs/src/components/MobileNav.vue | 146 ++++++------------------------
 docs/src/mobile.js                |  12 +--
 3 files changed, 40 insertions(+), 131 deletions(-)

diff --git a/docs/src/components/DemoList.vue b/docs/src/components/DemoList.vue
index d493f10ca..c0bb3c819 100644
--- a/docs/src/components/DemoList.vue
+++ b/docs/src/components/DemoList.vue
@@ -9,11 +9,14 @@
       <span :class="{ active: $vantLang === 'zh-CN' }" @click="switchLang('zh-CN')">中文</span>
     </div>
     <h2 class="zanui-desc">{{ description }}</h2>
-    <div class="mobile-navs">
-      <div class="mobile-nav-item" v-for="(item, index) in navList" v-if="item.showInMobile" :key="index">
-        <mobile-nav v-for="(group, index) in item.groups" :group="group" :base="$vantLang" :nav-key="index" :key="index" />
-      </div>
-    </div>
+    <template v-for="item in navList" v-if="item.showInMobile">
+      <mobile-nav
+        v-for="(group, index) in item.groups"
+        :group="group"
+        :base="$vantLang"
+        :key="index"
+      />
+    </template>
   </div>
 </template>
 
diff --git a/docs/src/components/MobileNav.vue b/docs/src/components/MobileNav.vue
index 4d697ddd5..bcbd2060a 100644
--- a/docs/src/components/MobileNav.vue
+++ b/docs/src/components/MobileNav.vue
@@ -1,145 +1,51 @@
 <template>
-  <div class="mobile-nav-group">
-    <div
-      class="mobile-nav-group__title mobile-nav-group__basetitle"
-      :class="{
-        'mobile-nav-group__title--open': isOpen
-      }"
-      @click="handleNavTitleClick">
-      {{ group.groupName }}
-    </div>
-    <div class="mobile-nav-group__list-wrapper" :class="{ 'mobile-nav-group__list-wrapper--open': isOpen }">
-      <ul class="mobile-nav-group__list" :class="{ 'mobile-nav-group__list--open': isOpen }">
-        <template v-for="(navItem, index) in group.list">
-          <li
-            :key="index"
-            class="mobile-nav-group__title"
-            v-if="!navItem.disabled">
-            <router-link
-              active-class="active"
-              :to="'/' + base + navItem.path">
-              <p>
-                {{ navItem.title }}
-              </p>
-            </router-link>
-            <van-icon name="arrow" />
-          </li>
-        </template>
-      </ul>
-    </div>
-  </div>
+  <van-collapse v-model="active" class="mobile-nav">
+    <van-collapse-item :title="group.groupName" :name="group.groupName" class="mobile-nav__item">
+      <van-cell
+        v-if="!navItem.disabled"
+        v-for="(navItem, index) in group.list"
+        :key="index"
+        :to="'/' + base + navItem.path"
+        :title="navItem.title"
+        is-link
+      />
+    </van-collapse-item>
+  </van-collapse>
 </template>
 
 <script>
 export default {
   props: {
-    group: {
-      type: Object,
-      default: () => {
-        return [];
-      }
-    },
     base: String,
-    navKey: [String, Number]
+    group: Object
   },
 
   data() {
     return {
-      isOpen: false
+      active: []
     };
-  },
-
-  mounted() {
-    this.isOpen = JSON.parse(sessionStorage.getItem('mobile-nav-' + this.navKey));
-  },
-
-  methods: {
-    handleNavTitleClick() {
-      this.isOpen = !this.isOpen;
-      sessionStorage.setItem('mobile-nav-' + this.navKey, this.isOpen);
-    }
   }
 };
 </script>
 
 <style lang="postcss">
-.mobile-nav-group {
-  border-radius: 2px;
-  margin-bottom: 15px;
-  background-color: #fff;
-  box-shadow: 0 1px 1px 0 rgba(0,0,0,0.10);
-
-  &__basetitle {
-    padding-left: 20px;
+.mobile-nav {
+  &__item {
+    margin-bottom: 20px;
   }
 
-  &__title {
-    font-size: 16px;
-    color: #333;
-    line-height: 56px;
-    position: relative;
-    user-select: none;
-
-    &:active {
-      background-color: $active-color;
-    }
-
-    &--open {
-      color: #999;
-    }
-
-    a {
-      color: #333;
-      display: block;
-      user-select: none;
-      padding-left: 20px;
-      -webkit-tap-highlight-color: rgba(0, 0, 0, 0);
-
-      &:active {
-        background: #ECECEC;
-      }
-
-      > p {
-        margin: 0;
-        border-top: 1px solid #e5e5e5;
-      }
-    }
-
-    .van-icon-arrow {
-      position: absolute;
-      font-size: 12px;
-      line-height: 1;
-      top: 24px;
-      right: 20px;
-    }
+  &::after {
+    display: none;
   }
 
-  &__list-wrapper {
-    height: 0;
-    overflow: hidden;
-
-    &--open {
-      height: auto;
-    }
-  }
-
-  &__list {
-    transform: translateY(-50%);
-    transition: transform .2s ease-out;
-
-    &--open {
-      transform: translateY(0);
-    }
-  }
-
-  li {
-    list-style: none;
-  }
-
-  ul {
+  .van-collapse-item__content {
     padding: 0;
-    margin: 0;
-    overflow: hidden;
+  }
+
+  .van-collapse-item__title {
+    font-size: 16px;
+    line-height: 36px;
+    align-items: center;
   }
 }
 </style>
diff --git a/docs/src/mobile.js b/docs/src/mobile.js
index 166932aa2..55fd79f1d 100644
--- a/docs/src/mobile.js
+++ b/docs/src/mobile.js
@@ -1,15 +1,18 @@
+import '../../packages/vant-css/src/index.css';
+import './components/nprogress.css';
 import Vue from 'vue';
 import VueRouter from 'vue-router';
 import App from './WapApp';
 import routes from './router';
 import progress from 'nprogress';
-import '../../packages/vant-css/src/index.css';
 import 'vant-doc/src/helper/touch-simulator';
-import './components/nprogress.css';
 
 const router = new VueRouter({
   mode: 'hash',
-  routes: routes(true)
+  routes: routes(true),
+  scrollBehavior(to, from, savedPosition) {
+    return savedPosition || { x: 0, y: 0 };
+  }
 });
 
 router.beforeEach((route, redirect, next) => {
@@ -19,9 +22,6 @@ router.beforeEach((route, redirect, next) => {
 
 router.afterEach(() => {
   progress.done();
-  if (router.currentRoute.name) {
-    window.scrollTo(0, 0);
-  }
   if (!router.currentRoute.redirectedFrom) {
     Vue.nextTick(() => window.syncPath());
   }