From 2a0fcf671373f9ef4704543bcffab7d2f3a9e01d Mon Sep 17 00:00:00 2001 From: JayChou <2064936853@qq.com> Date: Wed, 25 Sep 2024 17:27:32 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=94=A8=E6=88=B7?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=AF=E7=94=B1=E6=8B=A6=E6=88=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 2 +- pnpm-lock.yaml | 8 +- src/Layout/tabbar/index.vue | 8 +- src/api/race.ts | 23 ++++ src/permissions.ts | 24 +++- src/views/home/index.vue | 7 + src/views/raceInfo/index.vue | 13 +- src/views/userInfo/index.vue | 245 ++++++++++++++++++++++++++++++----- 8 files changed, 276 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 9d8fc1d..f4d4f28 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@element-plus/icons-vue": "^2.3.1", "axios": "^1.6.8", "echarts": "5.3.2", - "element-plus": "^2.6.2", + "element-plus": "^2.8.3", "pinia": "^2.1.7", "postcss-plugin-px2rem": "^0.8.1", "px2rem-loader": "^0.1.9", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9046d11..557beaa 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -11,8 +11,8 @@ dependencies: specifier: 5.3.2 version: 5.3.2 element-plus: - specifier: ^2.6.2 - version: 2.6.2(vue@3.4.21) + specifier: ^2.8.3 + version: 2.8.3(vue@3.4.21) pinia: specifier: ^2.1.7 version: 2.1.7(typescript@5.2.2)(vue@3.4.21) @@ -1984,8 +1984,8 @@ packages: resolution: {integrity: sha512-kMb204zvK3PsSlgvvwzI3wBIcAw15tRkYk+NQdsjdDtcQWTp2RABbMQ9rUBy8KNEOM+/E6ep+XC3AykiWZld4g==} dev: true - /element-plus@2.6.2(vue@3.4.21): - resolution: {integrity: sha512-WFMv1v83l437Xu+GeeM+ytxd9VUQpR4418BowvTVIPYItsoj6yK0ITIuSv19iCesF405FbAOaCIHXhJch0ilFA==} + /element-plus@2.8.3(vue@3.4.21): + resolution: {integrity: sha512-BXQOyDf0s7JHyNEV8iaO+iaOzTZPsBXVKMzMI967vLCodUBDLrtiY5vglAn1YEebQcUOEUMhGcttTpIvEkcBjQ==} peerDependencies: vue: ^3.2.0 dependencies: diff --git a/src/Layout/tabbar/index.vue b/src/Layout/tabbar/index.vue index 11167c9..978f492 100644 --- a/src/Layout/tabbar/index.vue +++ b/src/Layout/tabbar/index.vue @@ -28,7 +28,7 @@
- +
@@ -71,6 +71,9 @@ onMounted(() => { const layout = async () => { useUserStore.layOut() } +const setImageUrl = (url: string) => { + return import.meta.env.VITE_APP_BASE_API + "/sys/common/static/" + url +} From 9623f0e03a64f7afcf13e33e750ee9854bc282aa Mon Sep 17 00:00:00 2001 From: JayChou <2064936853@qq.com> Date: Wed, 25 Sep 2024 17:42:37 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=93=8D=E5=BA=94?= =?UTF-8?q?=E6=8B=A6=E6=88=AA=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/person.ts | 5 ----- src/permissions.ts | 23 ++++++++++++----------- 2 files changed, 12 insertions(+), 16 deletions(-) diff --git a/src/api/person.ts b/src/api/person.ts index 9abd9e8..a38c13b 100644 --- a/src/api/person.ts +++ b/src/api/person.ts @@ -1,10 +1,5 @@ import request from '@/utils/requset' -request.interceptors.response.use(response => { - // @ts-ignore - if (response.code >= 200 && response.code < 300) return response; - else return Promise.reject(response); -}) enum api { liststu = '/abilityEvaluation/personalAbilityEvaluationCollect/liststu', // 个人能力评价列表 diff --git a/src/permissions.ts b/src/permissions.ts index b3281c2..08812e3 100644 --- a/src/permissions.ts +++ b/src/permissions.ts @@ -2,7 +2,11 @@ import router from '@/router/index' import userStore from './store/module/user' // 定义要求登录访问的名单 -const asyncRouterName = ['UserInfo','RegistrationPersonage','RegistrationGroup'] +const asyncRouterName = [ + 'UserInfo', + 'RegistrationPersonage', + 'RegistrationGroup', +] const asyncRouter = (path: string) => { return asyncRouterName.includes(path) @@ -10,23 +14,20 @@ const asyncRouter = (path: string) => { router.beforeEach(async (to, form, next) => { const useuserStore = userStore() - - if (useuserStore.token) { if (to.path === '/login') { next({ path: '/' }) } else { - useuserStore.getUserInfo() - next() - } - } else { - if (!Object.keys(useuserStore.userInfo).length) { - if (asyncRouter(to.name as string)) { - next('/login') + if (!Object.keys(useuserStore.userInfo).length) { + useuserStore.getUserInfo() + next() } else { - next() } + } + } else { + if (asyncRouter(to.name as string)) { + next('/login') } else { next() } From f502a34dffd62f35efda20d18f7ba2e638342275 Mon Sep 17 00:00:00 2001 From: fwb Date: Thu, 26 Sep 2024 08:58:55 +0800 Subject: [PATCH 3/3] =?UTF-8?q?'=E6=96=B0=E9=97=BB=E6=9B=B4=E6=96=B0'?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/news.ts | 15 ++ src/views/news/components/newsDetail.vue | 40 ++-- src/views/news/components/newsList.vue | 250 +++++++++-------------- 3 files changed, 136 insertions(+), 169 deletions(-) create mode 100644 src/api/news.ts diff --git a/src/api/news.ts b/src/api/news.ts new file mode 100644 index 0000000..fd5c10f --- /dev/null +++ b/src/api/news.ts @@ -0,0 +1,15 @@ +import request from '@/utils/requset' +//获取新闻栏目 +export const getColumnListApi = () => { + return request({ + url:'/cms/front/getColumnList' + }) +} +//根据栏目id获取新闻列表 +export function queryEssayListApi(columnId) { + return request.get(`/cms/front/getArticleListByColumn?columnId=${columnId}`); +} +//根据点击的新闻id获取新闻详细信息 +export function queryEssayApi(id) { + return request.get(`/cms/front/getByArticleTitle?id=${id}`); +} \ No newline at end of file diff --git a/src/views/news/components/newsDetail.vue b/src/views/news/components/newsDetail.vue index 215d30e..beb973a 100644 --- a/src/views/news/components/newsDetail.vue +++ b/src/views/news/components/newsDetail.vue @@ -3,22 +3,37 @@ 返回

{{ data.title }}

-

{{ data.summary }}

+

- News Image + News Image
-

{{ data.date }}

+

{{ data.publishTime }}

\ No newline at end of file diff --git a/src/views/news/components/newsList.vue b/src/views/news/components/newsList.vue index 6a75778..3932ccb 100644 --- a/src/views/news/components/newsList.vue +++ b/src/views/news/components/newsList.vue @@ -1,172 +1,108 @@