1

src/router/routes.js

@@ -651,7 +651,6 @@ const routes = [{
       import("pages/sale/visitorRegistrat.vue")
   },
   {
-<<<<<<< HEAD
     path: "/activity/activeType", //活动 活动类型
     component: () =>
       import("pages/activity/activeType.vue")
@@ -675,7 +674,8 @@ const routes = [{
     path: "/activity/materialMan", //活动 活动图片与视频
     component: () =>
       import("pages/activity/materialMan.vue")
-=======
+  },
+  {
     path: "/sale/appointManagement", //销售 约课管理
     component: () =>
       import("pages/sale/appointManagement.vue")
@@ -684,7 +684,6 @@ const routes = [{
     path: "/sale/reserveClass", //销售 约课班级管理
     component: () =>
       import("pages/sale/reserveClass.vue")
->>>>>>> 17aa2574ae5325e01bd1752d815f8d667cb683e2
   },
   {
     path: "/course/teacherHours", //教学奖励 教师课时统计