From 7427056dfd515a665ea5eb53674affdc20f995ec Mon Sep 17 00:00:00 2001 From: Linzm <1015157648@qq.com> Date: Fri, 23 Jan 2026 15:14:59 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E6=96=B0=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E6=9E=84=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 2 +- src/config/proxy.ts | 2 +- src/router/index.ts | 18 +++++++++--------- src/views/badge/index.vue | 25 ------------------------- 4 files changed, 11 insertions(+), 36 deletions(-) diff --git a/.env.development b/.env.development index e93299f..1afde8e 100644 --- a/.env.development +++ b/.env.development @@ -1,7 +1,7 @@ VITE_APP_PREVIEW=true # VITE_APP_API_BASE_URL=http://172.16.20.21:20001/api/web/ # VITE_APP_API_BASE_URL=http://172.16.0.40:20001/api/web/ -VITE_APP_API_BASE_URL=https://wechat-test.api.puabadge.com/web/ +VITE_APP_API_BASE_URL=https://shop.api.suwa3d.com/api/web/ # VITE_APP_API_BASE_URL=https://wechat-test.api.puabadge.com/web/ # VITE_APP_API_BASE_URL=https://wechat.api.puabadge.com/web/ # VITE_APP_API_WX_URL=https://wechat.api.puabadge.com/web/ diff --git a/src/config/proxy.ts b/src/config/proxy.ts index e75b7b1..5fcb54d 100644 --- a/src/config/proxy.ts +++ b/src/config/proxy.ts @@ -1,6 +1,6 @@ export const proxy = { "/api": { - target: "https://web.api.suwa3d.com/", + target: "https://shop.api.suwa3d.com/api/web/", // target: 'http://127.0.0.1:28499', // target: 'http://172.16.0.36:28499', changeOrigin: true, diff --git a/src/router/index.ts b/src/router/index.ts index 693c619..a97153d 100644 --- a/src/router/index.ts +++ b/src/router/index.ts @@ -3,10 +3,10 @@ import { createRouter, createWebHashHistory } from 'vue-router' import NProgress from 'nprogress' import 'nprogress/nprogress.css' // 导入路由组件 -import * as badgeRouter from './badge' -// import * as cartoonRouter from './cartoon' -import badge from '@/views/badge/index.vue' -// import cartoon from '@/views/cartoon/index.vue' +// import * as badgeRouter from './badge' +import * as cartoonRouter from './cartoon' +// import badge from '@/views/badge/index.vue' +import cartoon from '@/views/cartoon/index.vue' import {useStore} from '@/stores' import { config } from '@/config/config' import { localStorage } from '@/utils/local-storage' @@ -17,8 +17,8 @@ NProgress.configure({ showSpinner: true, parent: '#app' }) const routes = [ { path: '/', - name: 'badge', - component: badge, + name: 'cartoon', + component: cartoon, meta: { needGuard: true, title: '首页', @@ -26,8 +26,8 @@ const routes = [ }, ] -badgeRouter.mergeRoutes(routes) -// cartoonRouter.mergeRoutes(routes) +// badgeRouter.mergeRoutes(routes) +cartoonRouter.mergeRoutes(routes) // 创建路由实例并传递 `routes` 配置 const router = createRouter({ history: createWebHashHistory(process.env.VUE_APP_PUBLIC_PATH), @@ -56,7 +56,7 @@ router.beforeEach((_to, _from, next) => { if (code) { let url = store.redirectUrl() - if (_to.path !== '/badge') { + if (_to.path !== '/cartoon') { if (url) { store.setRedirect('') next(url) diff --git a/src/views/badge/index.vue b/src/views/badge/index.vue index 1753c99..eaefdb3 100644 --- a/src/views/badge/index.vue +++ b/src/views/badge/index.vue @@ -128,31 +128,6 @@
-
-
-
-