fix

src/router/index.js

@@ -1,16 +1,4 @@
-<<<<<<< HEAD
-/*
- * @Author: 李晓鸽 lixg@dongwu-inc.com
- * @Date: 2022-11-21 18:45:34
- * @LastEditors: 李晓鸽 lixg@dongwu-inc.com
- * @LastEditTime: 2022-11-21 18:47:43
- * @FilePath: \stu_h5\src\router\index.js
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
-import { createRouter, createWebHashHistory } from 'vue-router';
-=======
 import {createRouter, createWebHashHistory, createWebHistory} from 'vue-router';
->>>>>>> origin/develop
 import routesConfig from './config';
 import {getCookie} from "@/api/utils";
 // console.log('routesConfig', routesConfig)
@@ -25,10 +13,6 @@ const routes = [
 ]
 
 const router = createRouter({
-<<<<<<< HEAD
-	history: createWebHashHistory("/student-h5/"),
-	routes
-=======
     history: createWebHistory(import.meta.env.VITE_BASE),
     routes
 })
@@ -41,7 +25,6 @@ router.beforeEach((to, from, next) => {
         }
     }
     next()
->>>>>>> origin/develop
 })
 
 export default router