Ver código fonte

更新路由

reghao 7 horas atrás
pai
commit
54527d2541
40 arquivos alterados com 165 adições e 174 exclusões
  1. 2 2
      src/api/admin.js
  2. 1 1
      src/components/card/AudioCard.vue
  3. 3 3
      src/components/card/HistoryVideoCard.vue
  4. 1 1
      src/components/card/HotSearch.vue
  5. 3 3
      src/components/card/ImageAlbumCard.vue
  6. 3 3
      src/components/card/SearchVideoCard.vue
  7. 3 3
      src/components/card/SideVideoCard.vue
  8. 2 2
      src/components/card/StatusCard.vue
  9. 1 1
      src/components/card/UserAvatarCard.vue
  10. 3 3
      src/components/card/VideoCard.vue
  11. 1 1
      src/components/comment/components/CommentItem.vue
  12. 1 1
      src/components/layout/LoginBar.vue
  13. 6 6
      src/components/layout/NavBar.vue
  14. 2 2
      src/components/layout/NavBarNoSearch.vue
  15. 92 6
      src/router/index.js
  16. 7 7
      src/router/user.js
  17. 0 95
      src/router/vod.js
  18. 1 1
      src/views/Index.vue
  19. 1 1
      src/views/admin/AdminAvatarList.vue
  20. 1 1
      src/views/admin/AdminUserList.vue
  21. 2 2
      src/views/admin/AdminVideoList.vue
  22. 1 1
      src/views/admin/Dashboard.vue
  23. 1 1
      src/views/admin/TopNav.vue
  24. 1 1
      src/views/devops/file/FileList.vue
  25. 1 1
      src/views/geo/GeoMap.vue
  26. 1 1
      src/views/home/Home.vue
  27. 1 1
      src/views/home/ImagePage.vue
  28. 1 1
      src/views/home/Index.vue
  29. 3 3
      src/views/home/PlaylistIndex.vue
  30. 2 2
      src/views/home/PlaylistView.vue
  31. 1 1
      src/views/home/ShareVideo.vue
  32. 1 1
      src/views/home/VideoList.vue
  33. 1 1
      src/views/home/VideoPage.vue
  34. 1 1
      src/views/map/PhotoMap.vue
  35. 3 3
      src/views/post/AlbumPost.vue
  36. 1 1
      src/views/post/ImagePost.vue
  37. 1 1
      src/views/post/VideoPost.vue
  38. 1 1
      src/views/user/AdminUserList.vue
  39. 5 5
      src/views/user/Home.vue
  40. 2 2
      src/views/user/UserRelation.vue

+ 2 - 2
src/api/admin.js

@@ -14,8 +14,8 @@ const adminApi = {
   getNotifyConfigApi: '/api/admin/message/notify/webhook',
   getAlbumsApi: '/api/admin/content/video/all',
   getArticlesApi: '/api/admin/content/video/all',
-  getVideosApi: '/api/admin/content/vod/list',
-  getSiteNoticeApi: '/api/admin/content/vod/site_notice'
+  getVideosApi: '/api/admin/content/list',
+  getSiteNoticeApi: '/api/admin/content/site_notice'
 }
 
 export function getAccountRegistry() {

+ 1 - 1
src/components/card/AudioCard.vue

@@ -25,7 +25,7 @@
         </div>
         <div v-if="audio.user !== undefined && audio.user !== null" style="padding: 14px">
           <span style="left: 0;margin-bottom: 0px;color: black;">
-            <router-link target="_blank" :to="`/vod/user/${audio.user.userId}`"><i class="el-icon-user"> {{ audio.user.screenName }} </i></router-link> · {{ convertTimestamp(audio.pubDate) }}
+            <router-link target="_blank" :to="`/user/${audio.user.userId}`"><i class="el-icon-user"> {{ audio.user.screenName }} </i></router-link> · {{ convertTimestamp(audio.pubDate) }}
           </span>
         </div>
       </el-card>

+ 3 - 3
src/components/card/HistoryVideoCard.vue

@@ -2,7 +2,7 @@
   <el-col style="padding-right: 7px; padding-left: 7px">
     <div style="cursor: pointer" :title="video.title">
       <el-card :body-style="{ padding: '0px' }" class="card">
-        <router-link target="_blank" :to="`/vod/video/${video.videoId}`">
+        <router-link target="_blank" :to="`/video/${video.videoId}`">
           <div class="imgs">
             <el-image
               lazy
@@ -25,13 +25,13 @@
         </router-link>
         <el-progress :percentage="setItemProgress(video)" />
         <div style="padding: 14px">
-          <router-link target="_blank" :to="`/vod/video/${video.videoId}`">
+          <router-link target="_blank" :to="`/video/${video.videoId}`">
             <span style="left: 0;margin-bottom: 0px;color: black;">{{ video.title | ellipsis }}</span>
           </router-link>
         </div>
         <div style="padding: 14px">
           <span style="left: 0;margin-bottom: 0px;color: black;">
-            <router-link target="_blank" :to="`/vod/user/${video.user.userId}`">
+            <router-link target="_blank" :to="`/user/${video.user.userId}`">
               <i class="el-icon-user"> {{ video.user.screenName | ellipsisUsername }} </i></router-link> • {{ video.publishAt }}
           </span>
         </div>

+ 1 - 1
src/components/card/HotSearch.vue

@@ -25,7 +25,7 @@
         class="item"
       >
         <div :class="rank(index + 1)">{{ index + 1 }}</div>
-        <router-link target="_blank" :to="`/vod/video/${video.videoId}`">
+        <router-link target="_blank" :to="`/video/${video.videoId}`">
           <span style="left: 0;margin-bottom: 0px;color: blue;">{{ video.title | ellipsis }}</span>
         </router-link>
       </div>

+ 3 - 3
src/components/card/ImageAlbumCard.vue

@@ -2,7 +2,7 @@
   <el-col style="padding-right: 7px; padding-left: 7px">
     <div style="cursor: pointer">
       <el-card :body-style="{ padding: '0px' }" class="card">
-        <router-link target="_blank" :to="`/vod/image/${imageAlbum.albumId}`">
+        <router-link target="_blank" :to="`/image/${imageAlbum.albumId}`">
           <div class="imgs">
             <el-image
               lazy
@@ -16,13 +16,13 @@
           </div>
         </router-link>
         <div style="padding: 14px">
-          <router-link target="_blank" :to="`/vod/image/${imageAlbum.albumId}`">
+          <router-link target="_blank" :to="`/image/${imageAlbum.albumId}`">
             <span style="left: 0;margin-bottom: 0px;color: black;">{{ imageAlbum.albumName | ellipsis }}</span>
           </router-link>
         </div>
 <!--        <div style="padding: 14px">
           <span style="left: 0;margin-bottom: 0px;color: black;">
-            <router-link target="_blank" :to="`/vod/user/${imageAlbum.userId}`"><i class="el-icon-user"> {{ imageAlbum.username }} </i></router-link> · {{ imageAlbum.pubDate }}
+            <router-link target="_blank" :to="`/user/${imageAlbum.userId}`"><i class="el-icon-user"> {{ imageAlbum.username }} </i></router-link> · {{ imageAlbum.pubDate }}
           </span>
         </div>-->
       </el-card>

+ 3 - 3
src/components/card/SearchVideoCard.vue

@@ -2,7 +2,7 @@
   <el-col style="padding-right: 7px; padding-left: 7px">
     <div style="cursor: pointer" :title="video.title">
       <el-card :body-style="{ padding: '0px' }" class="card">
-        <router-link target="_blank" :to="`/vod/video/${video.videoId}`">
+        <router-link target="_blank" :to="`/video/${video.videoId}`">
           <div class="imgs">
             <el-image
               lazy
@@ -27,7 +27,7 @@
           </div>
         </router-link>
         <div style="padding: 14px">
-          <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/video/${video.videoId}`">
+          <router-link style="text-decoration-line: none" target="_blank" :to="`/video/${video.videoId}`">
             <span style="left: 0;margin-bottom: 0px;color: black;" v-html="video.title">
 <!--              {{ video.title | ellipsis }}-->
             </span>
@@ -35,7 +35,7 @@
         </div>
         <div v-if="video.user !== undefined && video.user !== null" style="padding: 14px">
           <span style="left: 0;margin-bottom: 0px;color: black;">
-            <router-link target="_blank" :to="`/vod/user/${video.user.userId}`">
+            <router-link target="_blank" :to="`/user/${video.user.userId}`">
               <i class="el-icon-user"> {{ video.user.screenName | ellipsisUsername }} </i></router-link> • {{ video.pubDateStr }}
           </span>
         </div>

+ 3 - 3
src/components/card/SideVideoCard.vue

@@ -3,7 +3,7 @@
     <div style="cursor: pointer" :title="video.title">
       <el-card :body-style="{ padding: '0px' }" class="card">
         <el-col :md="8" :sm="8" :xs="8">
-          <router-link target="_blank" :to="`/vod/video/${video.videoId}`">
+          <router-link target="_blank" :to="`/video/${video.videoId}`">
             <div class="imgs">
               <el-image
                 lazy
@@ -21,13 +21,13 @@
         </el-col>
         <el-col :md="16" :sm="16" :xs="16">
           <div style="padding: 4px">
-            <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/video/${video.videoId}`">
+            <router-link style="text-decoration-line: none" target="_blank" :to="`/video/${video.videoId}`">
               <span style="left: 0;margin-bottom: 0px;color: black;">{{ video.title | ellipsis }}</span>
             </router-link>
           </div>
           <div style="padding: 4px">
             <span style="left: 0;margin-bottom: 0px;color: black;">
-              <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/user/${video.user.userId}`">
+              <router-link style="text-decoration-line: none" target="_blank" :to="`/user/${video.user.userId}`">
                 <i class="el-icon-user"> {{ video.user.screenName | ellipsisUsername }} </i></router-link>
             </span>
           </div>

+ 2 - 2
src/components/card/StatusCard.vue

@@ -2,7 +2,7 @@
   <el-card :body-style="{ padding: '0px' }" class="card">
     <el-row>
       <el-col :md="3">
-        <router-link target="_blank" :to="`/vod/user/` + status.user.userId">
+        <router-link target="_blank" :to="`/user/` + status.user.userId">
           <el-avatar>
             <el-image :src="status.user.avatarUrl" />
           </el-avatar>
@@ -10,7 +10,7 @@
       </el-col>
       <el-col :md="12">
         <el-row>
-          <router-link target="_blank" :to="`/vod/user/` + status.user.userId">
+          <router-link target="_blank" :to="`/user/` + status.user.userId">
             <span>{{ status.user.screenName }}</span>
           </router-link>
         </el-row>

+ 1 - 1
src/components/card/UserAvatarCard.vue

@@ -4,7 +4,7 @@
       <div slot="header" class="clearfix">
         <el-row>
           <el-col :md="4">
-            <router-link target="_blank" :to="`/vod/user/` + userAvatar.userId">
+            <router-link target="_blank" :to="`/user/` + userAvatar.userId">
               <el-avatar>
                 <el-image :src="userAvatar.avatarUrl" />
               </el-avatar>

+ 3 - 3
src/components/card/VideoCard.vue

@@ -2,7 +2,7 @@
   <el-col style="padding-right: 7px; padding-left: 7px">
     <div style="cursor: pointer" :title="video.title">
       <el-card :body-style="{ padding: '0px' }" class="card">
-        <router-link target="_blank" :to="`/vod/video/${video.videoId}`">
+        <router-link target="_blank" :to="`/video/${video.videoId}`">
           <div class="imgs">
             <el-image
               lazy
@@ -27,7 +27,7 @@
           </div>
         </router-link>
         <div style="padding: 14px">
-          <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/video/${video.videoId}`">
+          <router-link style="text-decoration-line: none" target="_blank" :to="`/video/${video.videoId}`">
             <span style="left: 0;margin-bottom: 0px;color: black;">
               {{ video.title | ellipsis }}
             </span>
@@ -35,7 +35,7 @@
         </div>
         <div v-if="video.user !== undefined && video.user !== null" style="padding: 14px">
           <span style="left: 0;margin-bottom: 0px;color: black;">
-            <router-link target="_blank" :to="`/vod/user/${video.user.userId}`">
+            <router-link target="_blank" :to="`/user/${video.user.userId}`">
               <i class="el-icon-user"> {{ video.user.screenName | ellipsisUsername }} </i></router-link> • {{ video.pubDateStr }}
           </span>
         </div>

+ 1 - 1
src/components/comment/components/CommentItem.vue

@@ -12,7 +12,7 @@
         <div class="meta-box">
           <slot name="userMeta">
             <div class="user-popover-box">
-              <router-link target="_blank" :to="`/vod/user/` + comment.user.userId">
+              <router-link target="_blank" :to="`/user/` + comment.user.userId">
                 <span v-if="comment.user">{{
                   comment.user.name +
                     (comment.user.author === true ? '(作者)' : '')

+ 1 - 1
src/components/layout/LoginBar.vue

@@ -15,7 +15,7 @@
         mode="horizontal"
       >
         <el-menu-item index="1">
-          <a href="/vod" style="text-decoration-line: none">
+          <a href="/" style="text-decoration-line: none">
             <span style="color: #007bff">VOD</span>
           </a>
         </el-menu-item>

+ 6 - 6
src/components/layout/NavBar.vue

@@ -3,7 +3,7 @@
     <el-col :md="2">
       <ul role="menubar" class="el-menu--horizontal el-menu">
         <li role="menuitem" class="el-menu-item">
-          <a href="/vod" style="color: #007bff;text-decoration-line: none">
+          <a href="/" style="color: #007bff;text-decoration-line: none">
             <img src="@/assets/img/logo.png" class="logo" alt="img">
             tnbapp
           </a>
@@ -15,17 +15,17 @@
         mode="horizontal"
       >
         <el-menu-item index="1">
-          <a href="/vod/video" style="text-decoration-line: none">
+          <a href="/video" style="text-decoration-line: none">
             <span style="color: #007bff">分区</span>
           </a>
         </el-menu-item>
         <el-menu-item index="2">
-          <a href="/vod/shortvideo" style="text-decoration-line: none">
+          <a href="/shortvideo" style="text-decoration-line: none">
             <span style="color: #007bff">短视频</span>
           </a>
         </el-menu-item>
         <el-menu-item index="3">
-          <a href="/vod/playlist" style="text-decoration-line: none">
+          <a href="/playlist" style="text-decoration-line: none">
             <span style="color: #007bff">播放列表</span>
           </a>
         </el-menu-item>
@@ -271,7 +271,7 @@ export default {
     },
     // ****************************************************************************************************************
     goToUserHome() {
-      const path = '/vod/user/' + this.user.userIdStr
+      const path = '/user/' + this.user.userIdStr
       if (this.$route.path === path) {
         this.$router.go(0)
         return
@@ -303,7 +303,7 @@ export default {
       this.$router.push(path)
     },
     goToTimeline() {
-      const path = '/vod/timeline'
+      const path = '/timeline'
       if (this.$route.path === path) {
         this.$router.go(0)
         return

+ 2 - 2
src/components/layout/NavBarNoSearch.vue

@@ -115,7 +115,7 @@ export default {
     },
     // ****************************************************************************************************************
     goToUserHome() {
-      const path = '/vod/user/' + this.user.userIdStr
+      const path = '/user/' + this.user.userIdStr
       if (this.$route.path === path) {
         this.$router.go(0)
         return
@@ -147,7 +147,7 @@ export default {
       this.$router.push(path)
     },
     goToTimeline() {
-      const path = '/vod/timeline'
+      const path = '/timeline'
       if (this.$route.path === path) {
         this.$router.go(0)
         return

+ 92 - 6
src/router/index.js

@@ -5,7 +5,6 @@ import DiskRouter from './disk'
 import UserRouter from './user'
 import SearchRouter from './search'
 import BlogRouter from './blog'
-import VodRouter from './vod'
 import BackgroundDevopsRouter from './background_devops'
 import BackgroundAccountRouter from './background_account'
 import BackgroundMyRouter from './background_my'
@@ -18,10 +17,25 @@ import BackgroundBlogRouter from './background_blog'
 
 // 懒加载引入页面组件,es6语法
 // ********************************************************************************************************************
+const Index = () => import('views/vod/Index')
+const ShareVideo = () => import('views/home/ShareVideo')
+
+const Home = () => import('views/home/Home')
+const TimelineIndex = () => import('views/home/Timeline')
+const VideoIndex = () => import('views/home/Video')
+const VideoTag = () => import('views/home/VideoTag')
+const ShortVideoIndex = () => import('views/home/ShortVideo')
+const VideoPage = () => import('views/home/VideoPage')
+const AudioIndex = () => import('views/home/Audio')
+const AudioPage = () => import('views/home/AudioPage')
+const ImagePage = () => import('views/home/ImagePage')
+const PlaylistIndex = () => import('views/home/PlaylistIndex')
+const PlaylistView = () => import('views/home/PlaylistView')
+
 const Login = () => import('views/Login')
 const Register = () => import('views/Register')
 const Forgot = () => import('views/Forgot')
-const Index = () => import('views/Index')
+const Index0 = () => import('views/Index')
 const Background = () => import('views/admin/Background')
 const Dashboard = () => import('views/admin/Dashboard')
 
@@ -33,13 +47,85 @@ export const constantRoutes = [
   UserRouter,
   SearchRouter,
   BlogRouter,
-  VodRouter,
   {
     path: '/',
-    redirect: '/bg',
-    name: 'Index',
+    name: 'Vod',
     component: Index,
-    meta: { needAuth: false }
+    meta: { needAuth: false },
+    children: [
+      {
+        path: '',
+        name: 'Home',
+        component: Home,
+        meta: { needAuth: false }
+      },
+      {
+        path: '/timeline',
+        name: 'TimelineIndex',
+        component: TimelineIndex,
+        meta: { needAuth: true }
+      },
+      {
+        path: '/shortvideo',
+        name: 'ShortVideoIndex',
+        component: ShortVideoIndex,
+        meta: { needAuth: false }
+      },
+      {
+        path: '/video',
+        name: 'VideoIndex',
+        component: VideoIndex,
+        meta: { needAuth: false }
+      },
+      {
+        path: '/video/:id',
+        name: 'VideoPage',
+        component: VideoPage,
+        meta: { needAuth: false }
+      },
+      {
+        path: '/video/tag/:tag',
+        name: 'VideoTag',
+        component: VideoTag,
+        meta: { needAuth: false }
+      },
+      {
+        path: '/audio',
+        name: 'AudioIndex',
+        component: AudioIndex,
+        meta: { needAuth: false }
+      },
+      {
+        path: '/audio/:audioId',
+        name: 'AudioPage',
+        component: AudioPage,
+        meta: { needAuth: false }
+      },
+      {
+        path: '/image/:albumId',
+        name: 'ImagePage',
+        component: ImagePage,
+        meta: { needAuth: false }
+      },
+      {
+        path: '/playlist',
+        name: 'PlaylistIndex',
+        component: PlaylistIndex,
+        meta: { needAuth: false }
+      },
+      {
+        path: '/playlist/:albumId',
+        name: 'PlaylistView',
+        component: PlaylistView,
+        meta: { needAuth: false }
+      },
+      {
+        path: '/s/:shareId',
+        name: 'ShareVideo',
+        component: ShareVideo,
+        meta: { needAuth: false }
+      }
+    ]
   },
   {
     path: '/bg',

+ 7 - 7
src/router/user.js

@@ -9,7 +9,7 @@ const UserAlbum = () => import('views/user/Home')
 const UserRelation = () => import('views/user/UserRelation')
 
 export default {
-  path: '/vod/user',
+  path: '/user',
   name: 'Index',
   component: Index,
   meta: { needAuth: false },
@@ -21,37 +21,37 @@ export default {
       meta: { needAuth: false }
     },
     {
-      path: '/vod/user/:id',
+      path: '/user/:id',
       name: 'UserHome',
       component: UserHome,
       meta: { needAuth: false }
     },
     {
-      path: '/vod/user/:id/video',
+      path: '/user/:id/video',
       name: 'UserVideo',
       component: UserVideo,
       meta: { needAuth: false }
     },
     {
-      path: '/vod/user/:id/image',
+      path: '/user/:id/image',
       name: 'UserImage',
       component: UserImage,
       meta: { needAuth: false }
     },
     {
-      path: '/vod/user/:id/album',
+      path: '/user/:id/album',
       name: 'UserAlbum',
       component: UserAlbum,
       meta: { needAuth: false }
     },
     {
-      path: '/vod/user/:id/following',
+      path: '/user/:id/following',
       name: 'UserFollowing',
       component: UserRelation,
       meta: { needAuth: false }
     },
     {
-      path: '/vod/user/:id/follower',
+      path: '/user/:id/follower',
       name: 'UserFollower',
       component: UserRelation,
       meta: { needAuth: false }

+ 0 - 95
src/router/vod.js

@@ -1,95 +0,0 @@
-const Index = () => import('views/vod/Index')
-const ShareVideo = () => import('views/home/ShareVideo')
-
-const Home = () => import('views/home/Home')
-const TimelineIndex = () => import('views/home/Timeline')
-const VideoIndex = () => import('views/home/Video')
-const VideoTag = () => import('views/home/VideoTag')
-const ShortVideoIndex = () => import('views/home/ShortVideo')
-const VideoPage = () => import('views/home/VideoPage')
-const AudioIndex = () => import('views/home/Audio')
-const AudioPage = () => import('views/home/AudioPage')
-const ImagePage = () => import('views/home/ImagePage')
-const PlaylistIndex = () => import('views/home/PlaylistIndex')
-const PlaylistView = () => import('views/home/PlaylistView')
-
-export default {
-  path: '/vod',
-  name: 'Vod',
-  component: Index,
-  meta: { needAuth: false },
-  children: [
-    {
-      path: '',
-      name: 'Home',
-      component: Home,
-      meta: { needAuth: false }
-    },
-    {
-      path: '/vod/timeline',
-      name: 'TimelineIndex',
-      component: TimelineIndex,
-      meta: { needAuth: true }
-    },
-    {
-      path: '/vod/shortvideo',
-      name: 'ShortVideoIndex',
-      component: ShortVideoIndex,
-      meta: { needAuth: false }
-    },
-    {
-      path: '/vod/video',
-      name: 'VideoIndex',
-      component: VideoIndex,
-      meta: { needAuth: false }
-    },
-    {
-      path: '/vod/video/:id',
-      name: 'VideoPage',
-      component: VideoPage,
-      meta: { needAuth: false }
-    },
-    {
-      path: '/vod/video/tag/:tag',
-      name: 'VideoTag',
-      component: VideoTag,
-      meta: { needAuth: false }
-    },
-    {
-      path: '/vod/audio',
-      name: 'AudioIndex',
-      component: AudioIndex,
-      meta: { needAuth: false }
-    },
-    {
-      path: '/vod/audio/:audioId',
-      name: 'AudioPage',
-      component: AudioPage,
-      meta: { needAuth: false }
-    },
-    {
-      path: '/vod/image/:albumId',
-      name: 'ImagePage',
-      component: ImagePage,
-      meta: { needAuth: false }
-    },
-    {
-      path: '/vod/playlist',
-      name: 'PlaylistIndex',
-      component: PlaylistIndex,
-      meta: { needAuth: false }
-    },
-    {
-      path: '/vod/playlist/:albumId',
-      name: 'PlaylistView',
-      component: PlaylistView,
-      meta: { needAuth: false }
-    },
-    {
-      path: '/vod/s/:shareId',
-      name: 'ShareVideo',
-      component: ShareVideo,
-      meta: { needAuth: false }
-    }
-  ]
-}

+ 1 - 1
src/views/Index.vue

@@ -59,7 +59,7 @@ export default {
         {
           title: 'vod',
           desc: 'VOD',
-          link: '/vod',
+          link: '/',
           coverUrl: ''
         },
         {

+ 1 - 1
src/views/admin/AdminAvatarList.vue

@@ -1,7 +1,7 @@
 <template>
   <el-row id="movie-list">
     <el-col v-for="(user, index) in userList" :key="index" :md="1" :sm="3" :xs="3">
-      <router-link target="_blank" :to="`/vod/user/` + user.userIdStr">
+      <router-link target="_blank" :to="`/user/` + user.userIdStr">
         <el-avatar>
           <el-image :src="user.avatarUrl" />
         </el-avatar>

+ 1 - 1
src/views/admin/AdminUserList.vue

@@ -47,7 +47,7 @@
           label="显示名"
         >
           <template slot-scope="scope">
-            <router-link target="_blank" :to="`/vod/user/${scope.row.userId}`">
+            <router-link target="_blank" :to="`/user/${scope.row.userId}`">
               <span>{{ scope.row.screenName }}</span>
             </router-link>
           </template>

+ 2 - 2
src/views/admin/AdminVideoList.vue

@@ -44,7 +44,7 @@
           width="120"
         >
           <template slot-scope="scope">
-            <router-link target="_blank" :to="`/vod/video/${scope.row.videoId}`">
+            <router-link target="_blank" :to="`/video/${scope.row.videoId}`">
               <span>{{ scope.row.videoId }}</span>
             </router-link>
           </template>
@@ -155,7 +155,7 @@
           width="120"
         >
           <template slot-scope="scope">
-            <router-link target="_blank" :to="`/vod/video/${scope.row.videoId}`">
+            <router-link target="_blank" :to="`/video/${scope.row.videoId}`">
               <span>{{ scope.row.videoId }}</span>
             </router-link>
           </template>

+ 1 - 1
src/views/admin/Dashboard.vue

@@ -189,7 +189,7 @@ export default {
       this.$router.push(path)
     },
     goToVod() {
-      const path = '/vod'
+      const path = '/'
       if (this.$route.path === path) {
         this.$router.go(0)
         return

+ 1 - 1
src/views/admin/TopNav.vue

@@ -50,7 +50,7 @@ export default {
       this.$root.Bus.$emit('HandleSideMenu', this.collapsed)
     },
     backToHome() {
-      const path = '/vod'
+      const path = '/'
       if (this.$route.path === path) {
         this.$router.go(0)
         return

+ 1 - 1
src/views/devops/file/FileList.vue

@@ -26,7 +26,7 @@
           width="120"
         >
           <template slot-scope="scope">
-            <router-link target="_blank" :to="`/vod/video/${scope.row.videoId}`">
+            <router-link target="_blank" :to="`/video/${scope.row.videoId}`">
               <span>{{ scope.row.videoId }}</span>
             </router-link>
           </template>

+ 1 - 1
src/views/geo/GeoMap.vue

@@ -58,7 +58,7 @@
             <el-row>
               <el-row>
                 ID
-                <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/image/${markerInfo.itemId}`">
+                <router-link style="text-decoration-line: none" target="_blank" :to="`/image/${markerInfo.itemId}`">
                   <span style="color: blue">{{ markerInfo.itemId }}</span>
                 </router-link>
               </el-row>

+ 1 - 1
src/views/home/Home.vue

@@ -10,7 +10,7 @@
         <el-row style="padding-right: 5px; padding-left: 5px; padding-bottom: 5px">
           <el-carousel :interval="3000" height="300px">
             <el-carousel-item v-for="(item, index) in carouselList" :key="index">
-              <router-link target="_blank" :to="`/vod/video/${item.videoId}`">
+              <router-link target="_blank" :to="`/video/${item.videoId}`">
                 <img class="carousel_image_type" :src="item.coverUrl" alt="img">
               </router-link>
             </el-carousel-item>

+ 1 - 1
src/views/home/ImagePage.vue

@@ -11,7 +11,7 @@
                 </el-avatar>
               </el-col>
               <el-col :md="23">
-                <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/user/${user.userId}/image`">
+                <router-link style="text-decoration-line: none" target="_blank" :to="`/user/${user.userId}/image`">
                   <span>{{ user.screenName }}的相册</span>
                 </router-link>
                 <span v-html="'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'" />

+ 1 - 1
src/views/home/Index.vue

@@ -8,7 +8,7 @@
         <el-row style="padding-right: 5px; padding-left: 5px; padding-bottom: 5px">
           <el-carousel :interval="3000" height="300px">
             <el-carousel-item v-for="(item, index) in carouselList" :key="index">
-              <router-link target="_blank" :to="`/vod/video/${item.videoId}`">
+              <router-link target="_blank" :to="`/video/${item.videoId}`">
                 <img class="carousel_image_type" :src="item.coverUrl" alt="img">
               </router-link>
             </el-carousel-item>

+ 3 - 3
src/views/home/PlaylistIndex.vue

@@ -16,7 +16,7 @@
         >
           <el-card :body-style="{ padding: '0px' }" class="card">
             <div class="imgs" style="cursor: pointer" :title="item.albumName">
-              <router-link target="_blank" :to="`/vod/playlist/${item.albumId}`">
+              <router-link target="_blank" :to="`/playlist/${item.albumId}`">
                 <el-image
                   lazy
                   fit="cover"
@@ -37,13 +37,13 @@
               </router-link>
             </div>
             <div style="padding: 14px">
-              <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/playlist/${item.albumId}`">
+              <router-link style="text-decoration-line: none" target="_blank" :to="`/playlist/${item.albumId}`">
                 <span style="left: 0;margin-bottom: 0px;color: black;">{{ item.albumName | ellipsis }}</span>
               </router-link>
             </div>
             <!--              <div style="padding: 14px">
                             <span style="left: 0;margin-bottom: 0px;color: black;">
-                              <router-link target="_blank" :to="`/vod/user/${item.user.userId}`">
+                              <router-link target="_blank" :to="`/user/${item.user.userId}`">
                                 <i class="el-icon-user"> {{ item.user.screenName | ellipsisUsername }} </i></router-link> • {{ item.pubDateStr }}
                             </span>
                           </div>-->

+ 2 - 2
src/views/home/PlaylistView.vue

@@ -5,7 +5,7 @@
         <el-card class="box-card">
           <div slot="header" class="clearfix">
             <el-row>
-              <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/video/${video.videoId}`">
+              <router-link style="text-decoration-line: none" target="_blank" :to="`/video/${video.videoId}`">
                 <el-button style="float: right; padding: 3px 0" type="text">
                   原视频
                 </el-button>
@@ -63,7 +63,7 @@
                 size="medium"
                 effect="plain"
               >
-                <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/video/tag/` + tag">
+                <router-link style="text-decoration-line: none" target="_blank" :to="`/video/tag/` + tag">
                   {{ tag }}
                 </router-link>
               </el-tag>

+ 1 - 1
src/views/home/ShareVideo.vue

@@ -44,7 +44,7 @@
                   size="medium"
                   effect="plain"
                 >
-                  <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/video/tag/` + tag">
+                  <router-link style="text-decoration-line: none" target="_blank" :to="`/video/tag/` + tag">
                     {{ tag }}
                   </router-link>
                 </el-tag>

+ 1 - 1
src/views/home/VideoList.vue

@@ -19,7 +19,7 @@
               />
               <span style="position: absolute; top: 0; left: 60%; color:red"> {{ video.duration }} </span>
               <div style="padding: 14px">
-                <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/video/${video.videoId}`">
+                <router-link style="text-decoration-line: none" target="_blank" :to="`/video/${video.videoId}`">
                   <span style="left: 0;margin-bottom: 0px;color: black;">
                     {{ video.title | ellipsis }}
                   </span>

+ 1 - 1
src/views/home/VideoPage.vue

@@ -125,7 +125,7 @@
                   size="medium"
                   effect="plain"
                 >
-                  <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/video/tag/` + tag">
+                  <router-link style="text-decoration-line: none" target="_blank" :to="`/video/tag/` + tag">
                     {{ tag }}
                   </router-link>
                 </el-tag>

+ 1 - 1
src/views/map/PhotoMap.vue

@@ -94,7 +94,7 @@
             <el-row>
               <el-row>
                 ID
-                <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/image/${markerInfo.itemId}`">
+                <router-link style="text-decoration-line: none" target="_blank" :to="`/image/${markerInfo.itemId}`">
                   <span style="color: blue">{{ markerInfo.itemId }}</span>
                 </router-link>
               </el-row>

+ 3 - 3
src/views/post/AlbumPost.vue

@@ -53,7 +53,7 @@
             >
               <el-card :body-style="{ padding: '0px' }" class="card">
                 <div class="imgs" style="cursor: pointer" :title="item.title">
-                  <router-link target="_blank" :to="`/vod/video/${item.videoId}`">
+                  <router-link target="_blank" :to="`/video/${item.videoId}`">
                     <el-image
                       lazy
                       fit="cover"
@@ -68,13 +68,13 @@
                   </router-link>
                 </div>
                 <div style="padding: 14px">
-                  <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/video/${item.videoId}`">
+                  <router-link style="text-decoration-line: none" target="_blank" :to="`/video/${item.videoId}`">
                     <span style="left: 0;margin-bottom: 0px;color: black;">{{ item.title | ellipsis }}</span>
                   </router-link>
                 </div>
                 <div style="padding: 14px">
                   <span style="left: 0;margin-bottom: 0px;color: black;">
-                    <router-link target="_blank" :to="`/vod/user/${item.user.userId}`">
+                    <router-link target="_blank" :to="`/user/${item.user.userId}`">
                       <i class="el-icon-user"> {{ item.user.screenName | ellipsisUsername }} </i></router-link> • {{ item.pubDateStr }}
                   </span>
                 </div>

+ 1 - 1
src/views/post/ImagePost.vue

@@ -42,7 +42,7 @@
           width="180"
         >
           <template slot-scope="scope">
-            <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/image/${scope.row.albumId}`">
+            <router-link style="text-decoration-line: none" target="_blank" :to="`/image/${scope.row.albumId}`">
               <span>{{ scope.row.albumName }}</span>
             </router-link>
           </template>

+ 1 - 1
src/views/post/VideoPost.vue

@@ -43,7 +43,7 @@
           width="120"
         >
           <template slot-scope="scope">
-            <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/video/${scope.row.videoId}`">
+            <router-link style="text-decoration-line: none" target="_blank" :to="`/video/${scope.row.videoId}`">
               <span>{{ scope.row.videoId }}</span>
             </router-link>
           </template>

+ 1 - 1
src/views/user/AdminUserList.vue

@@ -45,7 +45,7 @@
           label="显示名"
         >
           <template slot-scope="scope">
-            <router-link target="_blank" :to="`/vod/user/${scope.row.userIdStr}`">
+            <router-link target="_blank" :to="`/user/${scope.row.userIdStr}`">
               <span>{{ scope.row.userId }}</span>
             </router-link>
           </template>

+ 5 - 5
src/views/user/Home.vue

@@ -50,11 +50,11 @@
             </el-row>
             <el-row>
               <br>
-              <router-link target="_blank" :to="`/vod/user/${user.userId}/following`">
+              <router-link target="_blank" :to="`/user/${user.userId}/following`">
                 <span class="el-icon-user">关注数: {{ user.following }}</span>
               </router-link>
               <span v-html="'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'" />
-              <router-link target="_blank" :to="`/vod/user/${user.userId}/follower`">
+              <router-link target="_blank" :to="`/user/${user.userId}/follower`">
                 <span class="el-icon-user">粉丝数: {{ user.follower }}</span>
               </router-link>
             </el-row>
@@ -100,7 +100,7 @@
               >
                 <el-card :body-style="{ padding: '0px' }" class="card">
                   <div class="imgs" style="cursor: pointer" :title="item.albumName">
-                    <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/playlist/${item.albumId}`">
+                    <router-link style="text-decoration-line: none" target="_blank" :to="`/playlist/${item.albumId}`">
                       <el-image
                         lazy
                         fit="cover"
@@ -113,7 +113,7 @@
                     </router-link>
                   </div>
                   <div style="padding: 14px">
-                    <router-link style="text-decoration-line: none" target="_blank" :to="`/vod/playlist/${item.albumId}`">
+                    <router-link style="text-decoration-line: none" target="_blank" :to="`/playlist/${item.albumId}`">
                       <span style="left: 0;margin-bottom: 0px;color: black;">{{ item.albumName | ellipsis }}</span>
                     </router-link>
                   </div>
@@ -285,7 +285,7 @@ export default {
       this.goToTab(this.activeName)
     },
     goToTab(activeName) {
-      const path = '/vod/user/' + this.userId + '/' + activeName
+      const path = '/user/' + this.userId + '/' + activeName
       if (this.$route.path === path) {
         this.$router.go(0)
         return

+ 2 - 2
src/views/user/UserRelation.vue

@@ -11,7 +11,7 @@
                 </el-avatar>
               </el-col>
               <el-col :md="23">
-                <router-link target="_blank" :to="`/vod/user/${user.userId}`">
+                <router-link target="_blank" :to="`/user/${user.userId}`">
                   <span>{{ user.screenName }}</span>
                 </router-link>
                 <span v-html="'&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;'" />
@@ -179,7 +179,7 @@ export default {
       this.goToTab(this.activeName)
     },
     goToTab(activeName) {
-      const path = '/vod/user/' + this.userId + '/' + activeName
+      const path = '/user/' + this.userId + '/' + activeName
       if (this.$route.path === path) {
         this.$router.go(0)
         return