From 47a24f9be114a1e210f78cf5bab0be9a108bfa4b Mon Sep 17 00:00:00 2001 From: lixg Date: Mon, 12 Dec 2022 18:13:47 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E6=95=B0=E6=8D=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/api.js | 4 +- src/views/moreActive/MoreActive.vue | 112 ++++++++++++++------ vite.config.js | 152 ++++++++++++++-------------- 3 files changed, 160 insertions(+), 108 deletions(-) diff --git a/src/api/api.js b/src/api/api.js index 07538cd..0eb13dd 100644 --- a/src/api/api.js +++ b/src/api/api.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-12-11 16:57:58 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-12-12 13:42:24 + * @LastEditTime: 2022-12-12 17:05:42 * @FilePath: /fe-stu/src/api/api.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -47,3 +47,5 @@ export const COMMENT_COLLECTION = '/comment/collection post' export const ASSESSMENT_QUERY = assessmentId => `/assessment/queryAssessmentDetailById?assessmentId=${assessmentId} post` export const ASSESSMENT_SUBMIT = '/assessmentSubmit/submitAssessmentDetail' + +export const ACTIVITY = '/activity' \ No newline at end of file diff --git a/src/views/moreActive/MoreActive.vue b/src/views/moreActive/MoreActive.vue index 968cc95..911b56a 100644 --- a/src/views/moreActive/MoreActive.vue +++ b/src/views/moreActive/MoreActive.vue @@ -23,14 +23,18 @@
{{ data?.activityName }}
- -
{{ data?.createTime }}
+ +
+ {{ data?.activityStartTime + "-" + data?.activityEndTime }} +
{{ data?.activityAddress }}
@@ -46,15 +50,58 @@
-
课程详情
+
活动详情
-
-
+
+
+
活动时长：
+
+ {{ + data?.activityDuration + ? data?.activityDuration + "分钟" + : "-" + }} +
+
+
+
活动地点：
+
+ {{ data?.activityAddress ? data?.activityAddress : "-" }} +
+
+
+
活动考勤：
+
+ {{ + data?.beforeSignIn + ? "开始前" + data?.beforeSignIn + "分钟开始签到" + : "-" + }} +
+
+ {{ + data?.afterSignIn + ? "开始后" + data?.afterSignIn + "分钟结束签到" + : "-" + }} +
+
+
+
活动完成标准：
+
+ {{ data?.standardSettings ? "仅签到" : "-" }} +
+
+
+
活动说明：
+
+ {{ data?.activityExplain ? data?.activityExplain : "-" }} +
+
@@ -62,8 +109,8 @@
活动公告
@@ -79,16 +126,18 @@ @@ -216,14 +265,15 @@ const signClick = (tab, event) => { left: 23px; top: 53px; } - - .content { - margin-left: 8px; - font-size: 14px; - color: rgba(51, 51, 48, 1); - font-weight: 500; - line-height: 35px; + .activedetail { margin-top: 30px; + font-size: 14px; + font-weight: 500; + color: #333330; + line-height: 36px; + .content { + color: #677d86; + } } } @@ -358,9 +408,9 @@ const signClick = (tab, event) => { background-color: rgba(255, 255, 255, 1); border-radius: 8px; background: linear-gradient( - 180deg, - rgba(36, 120, 255, 0.15) 0%, - rgba(255, 255, 255) 50% + 180deg, + rgba(36, 120, 255, 0.15) 0%, + rgba(255, 255, 255) 50% ); .title { diff --git a/vite.config.js b/vite.config.js index 3b5955b..226f713 100644 --- a/vite.config.js +++ b/vite.config.js @@ -2,89 +2,89 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-21 17:28:10 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2022-11-22 12:45:57 + * @LastEditTime: 2022-12-12 16:49:27 * @FilePath: /fe-stu/vite.config.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ -import {defineConfig} from 'vite' +import { defineConfig } from 'vite' import vue from '@vitejs/plugin-vue' import legacy from '@vitejs/plugin-legacy' -import {viteMockServe} from 'vite-plugin-mock' +import { viteMockServe } from 'vite-plugin-mock' import topLevelAwait from "vite-plugin-top-level-await"; const path = require('path') - -export default defineConfig(({command}) => - ({ - base: '/fe-student', - plugins: [ - vue(), - // legacy({ - // targets: ['chrome 64', 'defaults', 'not IE 11'] - // }), - topLevelAwait({ - promiseExportName: '__tla', - promiseImportName: i => `__tla_${i}` - }), - // viteMockServe({ - // mockPath: './src/mock/mocks', - // }) - ], - resolve: { - alias: [ - {find: '@', replacement: path.resolve(__dirname, 'src')} - ] - }, server: { - proxy: { - '/file/upload': { - target: 'http://111.231.196.214:30001', - changeOrigin: true, - }, - '/stu': { - target: 'http://localhost:30001', - changeOrigin: true, - }, - '/queryVoteSubmitDetailById': { - target: 'http://localhost:30001', - changeOrigin: true, - }, - '/work': { - target: 'http://localhost:30001', - changeOrigin: true, - }, - '/discuss': { - target: 'http://localhost:30001', - changeOrigin: true, - }, - '/discussSubmit': { - target: 'http://localhost:30001', - changeOrigin: true, - }, - '/comment': { - target: 'http://localhost:30001', - changeOrigin: true, - }, - '/vote': { - target: 'http://localhost:30001', - changeOrigin: true, - }, - '/admin': { - target: 'http://localhost:30001', - changeOrigin: true, - },'/activity': { - target: 'http://localhost:30001', - changeOrigin: true, - },'/liveBroadcast': { - target: 'http://localhost:30001', - changeOrigin: true, - },'/examination': { - target: 'http://localhost:30001', - changeOrigin: true, - },'/assessment': { - target: 'http://localhost:30001', - changeOrigin: true, - }, - } +const url = 'http://111.231.196.214:30001' +export default defineConfig(({ command }) => +({ + base: '/fe-student', + plugins: [ + vue(), + // legacy({ + // targets: ['chrome 64', 'defaults', 'not IE 11'] + // }), + topLevelAwait({ + promiseExportName: '__tla', + promiseImportName: i => `__tla_${i}` + }), + // viteMockServe({ + // mockPath: './src/mock/mocks', + // }) + ], + resolve: { + alias: [ + { find: '@', replacement: path.resolve(__dirname, 'src') } + ] + }, server: { + proxy: { + '/file/upload': { + target: 'http://111.231.196.214:30001', + changeOrigin: true, + }, + '/stu': { + target: url, + changeOrigin: true, + }, + '/queryVoteSubmitDetailById': { + target: url, + changeOrigin: true, + }, + '/work': { + target: url, + changeOrigin: true, + }, + '/discuss': { + target: url, + changeOrigin: true, + }, + '/discussSubmit': { + target: url, + changeOrigin: true, + }, + '/comment': { + target: url, + changeOrigin: true, + }, + '/vote': { + target: url, + changeOrigin: true, + }, + '/admin': { + target: url, + changeOrigin: true, + }, '/activity': { + target: url, + changeOrigin: true, + }, '/liveBroadcast': { + target: url, + changeOrigin: true, + }, '/examination': { + target: url, + changeOrigin: true, + }, '/assessment': { + target: url, + changeOrigin: true, + }, } - }) + } +}) )