From b9b9cad25a728eca22cc2bcef546c42ed21f3f8e Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 18 Jan 2023 09:43:46 +0800 Subject: [PATCH 1/5] fix --- src/router/index.js | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 31f9581..2728bca 100644 --- a/src/router/index.js +++ b/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 \ No newline at end of file From d5144abc2189daf103d3883d5d05de5a0ce63401 Mon Sep 17 00:00:00 2001 From: lixg Date: Wed, 18 Jan 2023 10:01:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/router/index.js | 27 +++++---------------------- 1 file changed, 5 insertions(+), 22 deletions(-) diff --git a/src/router/index.js b/src/router/index.js index 31f9581..7884067 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1,18 +1,6 @@ -<<<<<<< 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 { createRouter, createWebHashHistory, createWebHistory } from 'vue-router'; import routesConfig from './config'; -import {getCookie} from "@/api/utils"; +import { getCookie } from "@/api/utils"; // console.log('routesConfig', routesConfig) const routes = [ @@ -25,23 +13,18 @@ const routes = [ ] const router = createRouter({ -<<<<<<< HEAD - history: createWebHashHistory("/student-h5/"), - routes -======= history: createWebHistory(import.meta.env.VITE_BASE), routes }) router.beforeEach((to, from, next) => { if (!getCookie('token')) { if (import.meta.env.MODE === "development" || import.meta.env.MODE === "test") { - to.path.includes('/login') ? next() : next({path: '/login', query: {returnUrl: to.fullPath}}) - }else { - window.location.href = import.meta.env.VITE_BASE_LOGIN_URL + import.meta.env.VITE_BASE+to.fullPath + to.path.includes('/login') ? next() : next({ path: '/login', query: { returnUrl: to.fullPath } }) + } else { + window.location.href = import.meta.env.VITE_BASE_LOGIN_URL + import.meta.env.VITE_BASE + to.fullPath } } next() ->>>>>>> origin/develop }) export default router \ No newline at end of file From 3a3701f5d9f534c1d1d845c8bb92acd13581de53 Mon Sep 17 00:00:00 2001 From: wyx Date: Wed, 18 Jan 2023 10:41:54 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=89=93=E5=8C=85?= =?UTF-8?q?=E8=B7=AF=E5=BE=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue.config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue.config.js b/vue.config.js index c50d341..9928dd0 100644 --- a/vue.config.js +++ b/vue.config.js @@ -8,6 +8,6 @@ */ const { defineConfig } = require('@vue/cli-service') module.exports = defineConfig({ - publicPath: "/student-h5", + ppublicPath: process.env.VITE_BASE, transpileDependencies: true }) From b8adfe3a0a37a8c10f74f2e4159f2e05fb8e296f Mon Sep 17 00:00:00 2001 From: lixg Date: Wed, 18 Jan 2023 14:31:57 +0800 Subject: [PATCH 4/5] =?UTF-8?q?feat:=E5=90=88=E5=B9=B6=E5=86=B2=E7=AA=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- vue.config.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/vue.config.js b/vue.config.js index 4e48566..c7d1902 100644 --- a/vue.config.js +++ b/vue.config.js @@ -1,17 +1,13 @@ /* * @Author: 李晓鸽 lixg@dongwu-inc.com * @Date: 2022-11-21 18:45:34 - * @LastEditors: 李晓鸽 lixg@dongwu-inc.com - * @LastEditTime: 2022-11-21 18:47:18 + * @LastEditors: lixg lixg@dongwu-inc.com + * @LastEditTime: 2023-01-18 14:31:17 * @FilePath: \stu_h5\vue.config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ const { defineConfig } = require('@vue/cli-service') module.exports = defineConfig({ -<<<<<<< HEAD - publicPath: process.env.VITE_BASE, -======= ppublicPath: process.env.VITE_BASE, ->>>>>>> 3a3701f5d9f534c1d1d845c8bb92acd13581de53 transpileDependencies: true }) From eaec628657f1ebd6fde9c3c68a346581365247af Mon Sep 17 00:00:00 2001 From: wyx Date: Thu, 2 Mar 2023 09:19:52 +0800 Subject: [PATCH 5/5] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/App.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/App.vue b/src/App.vue index 562ec06..97a3d26 100644 --- a/src/App.vue +++ b/src/App.vue @@ -27,7 +27,7 @@ import { GET_USER_INFO } from "@/api/ThirdApi"; import { getCookie } from "@/api/utils"; import { USER_INFO } from "@/api/api"; -console.log("版本1.3.1------------"); +console.log("版本1.3.5------------"); const store = useStore(); const router = useRouter();