Merge branch 'develop/3.1.0' into test

src/router/index.js

@@ -433,7 +433,7 @@ export const dynamicRoutes = [{
     name: 'recommendDetail',
     meta: {
       title: '推荐详情',
-      activeMenu: '/operation/operationRecommend'
+      activeMenu: '/operation/homePage/operationRecommend'
     }
   }]
 },
@@ -505,6 +505,38 @@ export const dynamicRoutes = [{
     }
   }]
 },
+{
+  path: '/operation',
+  component: Layout,
+  hidden: true,
+  permissions: ['operation:agreement:list'],
+  name: 'agreement',
+  children: [{
+    path: 'agreement/detail',
+    component: () => import('@/views/operation/agreement/detail'),
+    name: 'agreementDetail',
+    meta: {
+      title: '协议详情',
+      activeMenu: '/operation/agreement'
+    }
+  }]
+},
+{
+  path: '/operation',
+  component: Layout,
+  hidden: true,
+  permissions: ['operation:activity:list'],
+  name: 'activity',
+  children: [{
+    path: 'activity/detail',
+    component: () => import('@/views/operation/activity/detail'),
+    name: 'activityDetail',
+    meta: {
+      title: '活动详情',
+      activeMenu: '/operation/activity'
+    }
+  }]
+},
 // 商品管理
 // 商品推荐
 {

src/views/operation/recommend/detail.vue

@@ -559,7 +559,7 @@ export default {
 
     // 返回
     cancel() {
-      this.$tab.closeOpenPage("/operation/operationRecommend");
+      this.$tab.closeOpenPage("/operation/homePage/operationRecommend");
     },
 
     // 字典翻译