Merge branch '07/06musicArchives' of http://git.dayaedu.com/yonge/dy-admin-manager into 07/06musicArchives

src/router/index.js

@@ -58,22 +58,22 @@ export const constantRoutes = [
       }
     }]
   },
-  {
-    path: '/photo-detail', // 相册详情
-    component: Layout,
-    hidden: true,
-    children: [
-    {
-      name: '相册详情',
-      path: ':id',
-      component: () => import('@/views/photo-detail'),
-      hidden: true,
-      meta: {
-        noCache: '1',
-        title: '相册详情'
-      }
-    }]
-  },
+  // {
+  //   path: '/photo-detail', // 相册详情
+  //   component: Layout,
+  //   hidden: true,
+  //   children: [
+  //   {
+  //     name: '相册详情',
+  //     path: ':id',
+  //     component: () => import('@/views/photo-detail'),
+  //     hidden: true,
+  //     meta: {
+  //       noCache: '1',
+  //       title: '相册详情'
+  //     }
+  //   }]
+  // },
   {
     path: '/setSilder', // 侧边栏
     component: Layout,

src/store/modules/permission.js

@@ -294,6 +294,20 @@ function setDetailRoute(accessedRoutes) {
           }
         },
         {
+          name: '相册详情',
+          path: 'photo-detail',
+          component: () => import('@/views/photo-detail'),
+          hidden: true,
+          meta: {
+            noCache: '1',
+            title: '相册详情',
+            belongTopMenu: "/business",
+            activeMenu: '/teamList',
+            id:'xxx28'
+          }
+        },
+        // 相册详情
+        {
           name: '新建vip',
           path: 'buildVip',
           component: () => import('@/views/buildVip/index'),

src/views/photo-detail/index.vue

@@ -113,6 +113,7 @@ export default {
     }
   },
   mounted() {
+    console.log(this.$route)
     this.FetchList()
   },
   methods: {

src/views/resetTeaming/components/training-photos/index.vue

@@ -111,7 +111,7 @@ export default {
     },
     toDetail(item) {
       this.$router.push({
-        path: '/photo-detail/' + item.id,
+        path: '/business/photo-detail/' + item.id,
         query: {
           pid: item.id,
           returnUrl: this.$route.fullPath,