feat:合并

src/router/index.js

@@ -1,20 +1,15 @@
-<<<<<<< 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
+ * @Author: lixg lixg@dongwu-inc.com
+ * @Date: 2023-01-18 09:59:12
+ * @LastEditors: lixg lixg@dongwu-inc.com
+ * @LastEditTime: 2023-01-18 10:00:36
+ * @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)
-
 const routes = [
     {
         path: '/',
@@ -23,12 +18,7 @@ const routes = [
     },
     ...routesConfig
 ]
-
 const router = createRouter({
-<<<<<<< HEAD
-	history: createWebHashHistory("/student-h5/"),
-	routes
-=======
     history: createWebHistory(import.meta.env.VITE_BASE),
     routes
 })
@@ -41,7 +31,5 @@ router.beforeEach((to, from, next) => {
         }
     }
     next()
->>>>>>> origin/develop
 })
-
 export default router