还原冲突

TEAMModelOS.SmartClass/ClientApp/components/smart-class/headers.vue

@@ -5,7 +5,7 @@
       <ul>
         <li :class="activeIndex == 0 ? 'li-active':''" @click="handleMenuClick(0,'index')">首页</li>
         <li :class="activeIndex == 1 ? 'li-active':''" @click="handleMenuClick(1,'notice')">通知公告</li>
-        <li :class="activeIndex == 2 ? 'li-active':''" @click="handleMenuClick(2,'index')">评审活动</li> 
+        <li :class="activeIndex == 2 ? 'li-active':''" @click="handleMenuClick(2,'reviewActivity')">评审活动</li> 
         <li :class="activeIndex == 3 ? 'li-active':''" @click="handleMenuClick(3,'PastReview')">往届回顾</li>
         <li :class="activeIndex == 4 ? 'li-active':''" @click="handleMenuClick(4,'LiveBroadcast')">天天直播</li>
         <li :class="activeIndex == 5 ? 'li-active':''" @click="handleMenuClick(5,'Lessons')">优课汇聚</li>

TEAMModelOS.SmartClass/ClientApp/router/routes.js

@@ -17,7 +17,12 @@ export const routes = [
       {
         name: 'notice',
         path: '/notice',
-        component: resolve => require(['@/view/smart-class/Notice'], resolve), //路由懒加载
+        component: resolve => require(['@/view/smart-class/notice'], resolve), //路由懒加载
+      },
+      {
+        name: 'reviewActivity',
+        path: '/reviewActivity',
+        component: resolve => require(['@/view/smart-class/ReviewActivity'], resolve), //路由懒加载
       },
       {
         name: 'PastReview',