fix: resolve git conflict markers in router/index.js and fix Layout.vue computed syntax

cfc-web/src/router/index.js

@@ -337,17 +337,13 @@ const routes = [
         path: 'activities',
         name: 'Activities',
         component: () => import('@/views/admin/Activities.vue'),
-<<<<<<< Updated upstream
-        meta: { title: '活动管理' }
-=======
         meta: { title: '活动列表', perm: 'activity:list' }
       },
       {
         path: 'activity-review',
         name: 'ActivityReview',
         component: () => import('@/views/admin/ActivityReview.vue'),
-        meta: { title: '活动审核', perm: 'activity:review' }
->>>>>>> Stashed changes
+        meta: { title: '活动审核', perm: 'activity:review' }
       }
     ]
   }

cfc-web/src/views/Layout.vue

@@ -285,7 +285,6 @@ export default {
       const rolesStr = localStorage.getItem('roles')
       const roles = rolesStr ? JSON.parse(rolesStr) : [this.currentRole]
       return roles.map(function(r) { return getRoleLabel(r) }).join(' / ')
-    }
     },
     displayUserLabel() {
       const adminName = localStorage.getItem('adminName')