页面修改

src/router/routes.js

@@ -457,11 +457,9 @@ const routes = [{
           import("pages/sale/myOrder.vue")
       },
       {
-<<<<<<< HEAD
         path: "/sale/studyOrder", //销售 我的留学就业订单
         component: () =>
           import("pages/sale/studyOrder.vue")
-=======
         path: "/sale/contractManage",  //销售 合同管理
         component: () =>
           import("pages/sale/contractManage.vue")
@@ -475,7 +473,6 @@ const routes = [{
         path: "/sale/contractAudit", //销售 合同审核
         component: () =>
         import("pages/sale/contractAudit.vue")
->>>>>>> ed4e9272bbd3d685bfc30c6e93bd00405022241d
       },
       {
         path: "/sale/studentList", //销售 学生名单