diff --git a/src/App.vue b/src/App.vue
index 8c87b77..3b6d8bd 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -1,10 +1,36 @@
 <template>
-  <router-view></router-view>
+  <router-view v-slot="{ Component }">
+    <transition :name="transitionName">
+      <component :is="Component"/>
+    </transition>
+  </router-view>
 </template>
 
 <script>
 export default {
   name: 'App',
+  data() {
+    return {
+      transitionName: 'go'
+    }
+  },
+  // watch $route 决定使用哪种过渡
+  watch: {
+    '$route'(to, from) {
+      let noAnimation = ['/', '/home', '/me', '/attention', '/message']
+      if (noAnimation.indexOf(from.path) !== -1 && noAnimation.indexOf(to.path) !== -1) {
+        return this.transitionName = ''
+      }
+      const routeDeep = ['/message', '/attention', '/home', '/me',
+        '/editUserInfo',
+        '/editUserInfoItem',
+        '/VideoDetail',
+      ];
+      const toDepth = routeDeep.indexOf(to.path)
+      const fromDepth = routeDeep.indexOf(from.path)
+      this.transitionName = toDepth > fromDepth ? 'go' : 'back'
+    }
+  },
 }
 </script>
 <style lang="scss">
@@ -18,51 +44,35 @@ export default {
 #app {
   height: 100%;
   width: 100%;
+  position: relative;
 }
 
-
-.go-enter {
-  left: 100%;
-}
-
-.go-enter-to {
-  left: 0;
+.go-enter-from {
+  transform: translate3d(100%, 0, 0);
 }
 
-.go-leave {
-  left: 0;
+//最终状态
+.back-enter-to, .back-enter-from, .go-enter-to, .go-leave-from {
+  transform: translate3d(0, 0, 0);
 }
 
 .go-leave-to {
-  left: -100%;
+  transform: translate3d(-100%, 0, 0);
 }
 
-.go-enter-active, .go-leave-active {
+.go-enter-active, .go-leave-active, .back-enter-active, .back-leave-active {
   transition: all .3s;
 }
 
 
-.back-enter {
-  left: -100%;
-}
-
-.back-enter-to {
-  left: 0;
-}
-
-.back-leave {
-  left: 0;
+.back-enter-from {
+  transform: translate3d(-100%, 0, 0);
 }
 
 .back-leave-to {
-  left: 100%;
-}
-
-.back-enter-active, .back-leave-active {
-  transition: all .3s;
+  transform: translate3d(100%, 0, 0);
 }
 
-
 .fade-enter-active,
 .fade-leave-active {
   transition: opacity 0.3s ease;
diff --git a/src/assets/img/icon/add.png b/src/assets/img/icon/add.png
new file mode 100644
index 0000000..1b70ab6
Binary files /dev/null and b/src/assets/img/icon/add.png differ
diff --git a/src/assets/img/icon/back.png b/src/assets/img/icon/back.png
new file mode 100644
index 0000000..01fd53c
Binary files /dev/null and b/src/assets/img/icon/back.png differ
diff --git a/src/assets/img/icon/home/music1.png b/src/assets/img/icon/home/music1.png
new file mode 100644
index 0000000..7c6f895
Binary files /dev/null and b/src/assets/img/icon/home/music1.png differ
diff --git a/src/assets/img/icon/home/music2.png b/src/assets/img/icon/home/music2.png
new file mode 100644
index 0000000..250292c
Binary files /dev/null and b/src/assets/img/icon/home/music2.png differ
diff --git a/src/assets/img/icon/me/collection-black.png b/src/assets/img/icon/me/collection-black.png
new file mode 100644
index 0000000..a2c27a4
Binary files /dev/null and b/src/assets/img/icon/me/collection-black.png differ
diff --git a/src/assets/img/icon/ok-red.png b/src/assets/img/icon/ok-red.png
new file mode 100644
index 0000000..804d8e2
Binary files /dev/null and b/src/assets/img/icon/ok-red.png differ
diff --git a/src/assets/img/icon/ok-white.png b/src/assets/img/icon/ok-white.png
new file mode 100644
index 0000000..001ad62
Binary files /dev/null and b/src/assets/img/icon/ok-white.png differ
diff --git a/src/assets/img/poster/1.jpg b/src/assets/img/poster/1.jpg
new file mode 100644
index 0000000..1d6f186
Binary files /dev/null and b/src/assets/img/poster/1.jpg differ
diff --git a/src/assets/img/poster/10.jpg b/src/assets/img/poster/10.jpg
new file mode 100644
index 0000000..820d24d
Binary files /dev/null and b/src/assets/img/poster/10.jpg differ
diff --git a/src/assets/img/poster/11.jpg b/src/assets/img/poster/11.jpg
new file mode 100644
index 0000000..092c580
Binary files /dev/null and b/src/assets/img/poster/11.jpg differ
diff --git a/src/assets/img/poster/2.jpg b/src/assets/img/poster/2.jpg
new file mode 100644
index 0000000..c93ad68
Binary files /dev/null and b/src/assets/img/poster/2.jpg differ
diff --git a/src/assets/img/poster/3.jpg b/src/assets/img/poster/3.jpg
new file mode 100644
index 0000000..5db64d0
Binary files /dev/null and b/src/assets/img/poster/3.jpg differ
diff --git a/src/assets/img/poster/4.jpg b/src/assets/img/poster/4.jpg
new file mode 100644
index 0000000..ef37f67
Binary files /dev/null and b/src/assets/img/poster/4.jpg differ
diff --git a/src/assets/img/poster/5.jpg b/src/assets/img/poster/5.jpg
new file mode 100644
index 0000000..b51b2ca
Binary files /dev/null and b/src/assets/img/poster/5.jpg differ
diff --git a/src/assets/img/poster/6.jpg b/src/assets/img/poster/6.jpg
new file mode 100644
index 0000000..4f0c752
Binary files /dev/null and b/src/assets/img/poster/6.jpg differ
diff --git a/src/assets/img/poster/7.jpg b/src/assets/img/poster/7.jpg
new file mode 100644
index 0000000..7c4976c
Binary files /dev/null and b/src/assets/img/poster/7.jpg differ
diff --git a/src/assets/img/poster/8.jpg b/src/assets/img/poster/8.jpg
new file mode 100644
index 0000000..6e466cd
Binary files /dev/null and b/src/assets/img/poster/8.jpg differ
diff --git a/src/assets/img/poster/9.jpg b/src/assets/img/poster/9.jpg
new file mode 100644
index 0000000..80a685e
Binary files /dev/null and b/src/assets/img/poster/9.jpg differ
diff --git a/src/assets/video/0.mp4 b/src/assets/video/0.mp4
new file mode 100644
index 0000000..43af7a8
Binary files /dev/null and b/src/assets/video/0.mp4 differ
diff --git a/src/assets/video/1.mp4 b/src/assets/video/1.mp4
new file mode 100644
index 0000000..811afc5
Binary files /dev/null and b/src/assets/video/1.mp4 differ
diff --git a/src/assets/video/10.mp4 b/src/assets/video/10.mp4
new file mode 100644
index 0000000..4f3b5a7
Binary files /dev/null and b/src/assets/video/10.mp4 differ
diff --git a/src/assets/video/2.mp4 b/src/assets/video/2.mp4
new file mode 100644
index 0000000..6182d8b
Binary files /dev/null and b/src/assets/video/2.mp4 differ
diff --git a/src/assets/video/3.mp4 b/src/assets/video/3.mp4
new file mode 100644
index 0000000..8c905a0
Binary files /dev/null and b/src/assets/video/3.mp4 differ
diff --git a/src/assets/video/4.mp4 b/src/assets/video/4.mp4
new file mode 100644
index 0000000..99f8c70
Binary files /dev/null and b/src/assets/video/4.mp4 differ
diff --git a/src/assets/video/5.mp4 b/src/assets/video/5.mp4
new file mode 100644
index 0000000..8d449c1
Binary files /dev/null and b/src/assets/video/5.mp4 differ
diff --git a/src/assets/video/6.mp4 b/src/assets/video/6.mp4
new file mode 100644
index 0000000..ee0123d
Binary files /dev/null and b/src/assets/video/6.mp4 differ
diff --git a/src/assets/video/7.mp4 b/src/assets/video/7.mp4
new file mode 100644
index 0000000..baef935
Binary files /dev/null and b/src/assets/video/7.mp4 differ
diff --git a/src/assets/video/8.mp4 b/src/assets/video/8.mp4
new file mode 100644
index 0000000..43af7a8
Binary files /dev/null and b/src/assets/video/8.mp4 differ
diff --git a/src/assets/video/9.mp4 b/src/assets/video/9.mp4
new file mode 100644
index 0000000..9bc42fb
Binary files /dev/null and b/src/assets/video/9.mp4 differ
diff --git a/src/components/Video.vue b/src/components/Video.vue
index 4449253..4766f12 100644
--- a/src/components/Video.vue
+++ b/src/components/Video.vue
@@ -135,7 +135,7 @@ export default {
     isMy: {
       type: Boolean,
       default: () => {
-        return true
+        return false
       }
     }
   },
diff --git a/src/pages/home/Index2.vue b/src/pages/home/Index2.vue
index 31c64de..34ef7c6 100644
--- a/src/pages/home/Index2.vue
+++ b/src/pages/home/Index2.vue
@@ -495,6 +495,11 @@ export default {
       }
     }
   },
+  created() {
+    if (process.env.NODE_ENV !== 'development') {
+      this.videos = this.$clone(this.videos1)
+    }
+  },
   mounted() {
     this.height = document.body.clientHeight
     this.width = document.body.clientWidth
diff --git a/src/pages/me/EditUserInfo.vue b/src/pages/me/EditUserInfo.vue
index 9e81c0f..fcbbc81 100644
--- a/src/pages/me/EditUserInfo.vue
+++ b/src/pages/me/EditUserInfo.vue
@@ -45,13 +45,19 @@
         </div>
       </div>
       <div class="row">
+        <input type="date" style="opacity: 0;left: 0;
+    position: absolute;
+    right: 0;
+    width: 98%;
+    height: 50px;"/>
+
         <div class="left">生日</div>
         <div class="right">
           <span>B</span>
           <img src="../../assets/img/icon/back.png" alt="">
         </div>
       </div>
-      <div class="row">
+      <div class="row" @click="$nav('/editUserInfoItem')">
         <div class="left">所在地</div>
         <div class="right">
           <span>B</span>
@@ -104,6 +110,13 @@ export default {
 <style scoped lang="scss">
 @import "../../assets/scss/index";
 
+.edit{
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
+}
 .title {
   display: flex;
   flex-direction: column;
diff --git a/src/pages/me/EditUserInfoItem.vue b/src/pages/me/EditUserInfoItem.vue
index 83f52f1..214cda9 100644
--- a/src/pages/me/EditUserInfoItem.vue
+++ b/src/pages/me/EditUserInfoItem.vue
@@ -64,6 +64,11 @@ export default {
 @import "../../assets/scss/index";
 
 .edit-item {
+  position: fixed;
+  left: 0;
+  right: 0;
+  bottom: 0;
+  top: 0;
 
   .save-yes {
     color: $primary-btn-color;
diff --git a/src/pages/me/Me.vue b/src/pages/me/Me.vue
index 882c4ef..5e6513e 100644
--- a/src/pages/me/Me.vue
+++ b/src/pages/me/Me.vue
@@ -321,7 +321,6 @@ export default {
   height: 100%;
   width: 100%;
 
-
   .no-more {
     font-size: 1.4rem;
     padding: 10px;
diff --git a/src/pages/me/School.vue b/src/pages/me/School.vue
new file mode 100644
index 0000000..600acaf
--- /dev/null
+++ b/src/pages/me/School.vue
@@ -0,0 +1,13 @@
+<template>
+
+</template>
+
+<script>
+export default {
+  name: "School"
+}
+</script>
+
+<style scoped>
+
+</style>
\ No newline at end of file
diff --git a/src/pages/me/VideoDetail.vue b/src/pages/me/VideoDetail.vue
index d103f8c..482f103 100644
--- a/src/pages/me/VideoDetail.vue
+++ b/src/pages/me/VideoDetail.vue
@@ -1,9 +1,9 @@
 <template>
-  <div id="home-index">
+  <div id="video-detail">
     <SlideList key1="父" style="width: 100vw;" v-model:can-move="canMove">
       <SlideItem>
         <div class="search-ctn">
-          <img src="../../assets/img/icon/back.png" alt="" class="back">
+          <img src="../../assets/img/icon/back.png" alt="" class="back" @click="$back">
           <Search></Search>
         </div>
         <SlideList key1="子" direction="column" v-model:active-index="videoActiveIndex">
@@ -221,6 +221,118 @@ export default {
           duration: 99
         },
       ],
+      videos1: [
+        {
+          // videoUrl: mp40,
+          videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/0.mp4',
+          videoPoster: src1Bg,
+          isLoved: true,
+          loves: 1234,
+          comments: 666,
+          shared: 999,
+          duration: 99
+        },
+        {
+          // videoUrl: mp41,
+          videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/1.mp4',
+          videoPoster: src1Bg,
+          isLoved: true,
+          loves: 1234,
+          comments: 666,
+          shared: 999,
+          duration: 99
+        },
+        {
+          // videoUrl: mp42,
+          videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/2.mp4',
+          videoPoster: src1Bg,
+          isLoved: false,
+          loves: 1234,
+          comments: 666,
+          shared: 999,
+          duration: 99
+        },
+        {
+          // videoUrl: mp43,
+          videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/3.mp4',
+          videoPoster: src1Bg,
+          isLoved: false,
+          loves: 1234,
+          comments: 666,
+          shared: 999,
+          duration: 99
+        },
+        {
+          // videoUrl: mp44,
+          videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/4.mp4',
+          videoPoster: src1Bg,
+          isLoved: false,
+          loves: 1234,
+          comments: 666,
+          shared: 999,
+          duration: 99
+        },
+        {
+          // videoUrl: mp45,
+          videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/5.mp4',
+          videoPoster: src1Bg,
+          isLoved: false,
+          loves: 1234,
+          comments: 666,
+          shared: 999,
+          duration: 99
+        },
+        {
+          // videoUrl: mp46,
+          videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/6.mp4',
+          videoPoster: src1Bg,
+          isLoved: false,
+          loves: 1234,
+          comments: 666,
+          shared: 999,
+          duration: 99
+        },
+        {
+          // videoUrl: mp47,
+          videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/7.mp4',
+          videoPoster: src1Bg,
+          isLoved: false,
+          loves: 1234,
+          comments: 666,
+          shared: 999,
+          duration: 99
+        },
+        {
+          // videoUrl: mp48,
+          videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/8.mp4',
+          videoPoster: src1Bg,
+          isLoved: false,
+          loves: 1234,
+          comments: 666,
+          shared: 999,
+          duration: 99
+        },
+        {
+          // videoUrl: mp49,
+          videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/9.mp4',
+          videoPoster: src1Bg,
+          isLoved: false,
+          loves: 1234,
+          comments: 666,
+          shared: 999,
+          duration: 99
+        },
+        {
+          // videoUrl: mp410,
+          videoUrl: 'http://qvutp218u.hn-bkt.clouddn.com/10.mp4',
+          videoPoster: src1Bg,
+          isLoved: false,
+          loves: 1234,
+          comments: 666,
+          shared: 999,
+          duration: 99
+        },
+      ],
       addCount: 0,
       total: 10,
       baseActiveIndex: 0,
@@ -243,9 +355,10 @@ export default {
     // this.width = document.body.clientWidth
   },
   created() {
-
+    if (process.env.NODE_ENV !== 'development') {
+      this.videos = this.$clone(this.videos1)
+    }
   },
-
 }
 </script>
 
@@ -262,7 +375,12 @@ export default {
   transform: translate3d(0, 50vh, 0);
 }
 
-#home-index {
+#video-detail {
+  position: fixed;
+  top: 0;
+  bottom: 0;
+  left: 0;
+  right: 0;
   height: 100%;
   width: 100%;
 
diff --git a/src/utils/global-methods.js b/src/utils/global-methods.js
index 0c27729..a8de5c3 100644
--- a/src/utils/global-methods.js
+++ b/src/utils/global-methods.js
@@ -1,4 +1,7 @@
 export default {
+  $back(){
+    window.history.back()
+  },
   $stopPropagation(e) {
     e.stopImmediatePropagation()
     e.stopPropagation()