hz/fe-student
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-student.git synced 2025-12-13 04:46:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
yuping
2022-12-12 18:32:02 +08:00
parent 28d603817a ed3487a2d5
commit fd6f11acde
3 changed files with 160 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/api.js
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-12-11 16:57:58 * @Date: 2022-12-11 16:57:58
* @LastEditors: lixg lixg@dongwu-inc.com * @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 * @FilePath: /fe-stu/src/api/api.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @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_QUERY = assessmentId => `/assessment/queryAssessmentDetailById?assessmentId=${assessmentId} post`
export const ASSESSMENT_SUBMIT = '/assessmentSubmit/submitAssessmentDetail' export const ASSESSMENT_SUBMIT = '/assessmentSubmit/submitAssessmentDetail'
export const ACTIVITY = '/activity'

112
src/views/moreActive/MoreActive.vue
View File

@@ -23,14 +23,18 @@
<!-- <div class="title">【其他活动】管理者进阶腾飞班 - 专属线下活动</div>--> <!-- <div class="title">【其他活动】管理者进阶腾飞班 - 专属线下活动</div>-->
<div class="title">{{ data?.activityName }}</div> <div class="title">{{ data?.activityName }}</div>
<div class="time" style="margin-top: 26px"> <div class="time" style="margin-top: 26px">
<img width="15px" height="17px" src="../../assets/image/time.png"/> <img
<div style="margin-left: 8px">{{ data?.createTime }}</div> style="width: 15px; height: 17px"
src="../../assets/image/time.png"
/>
<div style="margin-left: 8px">
{{ data?.activityStartTime + "-" + data?.activityEndTime }}
</div>
</div> </div>
<div class="time" style="margin-top: 23px"> <div class="time" style="margin-top: 23px">
<img <img
width="16px" style="width: 16px; height: 18px"
height="18px" src="../../assets/image/position.png"
src="../../assets/image/position.png"
/> />
<div style="margin-left: 8px">{{ data?.activityAddress }}</div> <div style="margin-left: 8px">{{ data?.activityAddress }}</div>
</div> </div>
@@ -46,15 +50,58 @@
<div style="margin-left: 48px; margin-right: 48px"> <div style="margin-left: 48px; margin-right: 48px">
<div class="title"> <div class="title">
<img <img
width="20px" style="width: 20px; height: 20px"
height="20px" src="../../assets/image/book.png"
src="../../assets/image/book.png"
/> />
<div class="text">课程详情</div> <div class="text">活动详情</div>
<div class="box"></div> <div class="box"></div>
</div> </div>
<div style="display: flex; align-items: center"> <div class="activedetail">
<div class="content" v-html="data?.activityExplain"></div> <div>
<div>活动时长：</div>
<div class="content">
{{
data?.activityDuration
? data?.activityDuration + "分钟"
: "-"
}}
</div>
</div>
<div>
<div>活动地点：</div>
<div class="content">
{{ data?.activityAddress ? data?.activityAddress : "-" }}
</div>
</div>
<div>
<div>活动考勤：</div>
<div class="content">
{{
data?.beforeSignIn
? "开始前" + data?.beforeSignIn + "分钟开始签到"
: "-"
}}
</div>
<div class="content">
{{
data?.afterSignIn
? "开始后" + data?.afterSignIn + "分钟结束签到"
: "-"
}}
</div>
</div>
<div>
<div>活动完成标准：</div>
<div class="content">
{{ data?.standardSettings ? "仅签到" : "-" }}
</div>
</div>
<div>
<div>活动说明：</div>
<div class="content">
{{ data?.activityExplain ? data?.activityExplain : "-" }}
</div>
</div>
</div> </div>
</div> </div>
</div> </div>
@@ -62,8 +109,8 @@
<div class="teacher"> <div class="teacher">
<div class="title"> <div class="title">
<img <img
style="width: 24px; height: 20px" style="width: 24px; height: 20px"
src="../../assets/image/call.png" src="../../assets/image/call.png"
/> />
<div class="text">活动公告</div> <div class="text">活动公告</div>
<div class="box"></div> <div class="box"></div>
@@ -79,16 +126,18 @@
</template> </template>
<script setup> <script setup>
import { TAS_ACTIVITY_DETAIL, TASK_ACTIVITY_SIGN, ACTIVITY } from "@/api/api";
import { request, useRequest } from "@/api/request";
import {TAS_ACTIVITY_DETAIL, TASK_ACTIVITY_SIGN} from "@/api/api"; const { data } = useRequest(ACTIVITY, { activityId: 155 });
import {request, useRequest} from "@/api/request"; console.log("data", data);
const {data} = useRequest(TAS_ACTIVITY_DETAIL, {activityId: 22})
const signClick = (tab, event) => { const signClick = (tab, event) => {
request(TASK_ACTIVITY_SIGN, {activitySubmitId:data.activityId,signInStatus:1}).then(res => { request(TASK_ACTIVITY_SIGN, {
data.value.activityFlag = 1 activitySubmitId: data.activityId,
}) signInStatus: 1,
}).then((res) => {
data.value.activityFlag = 1;
});
}; };
</script> </script>
@@ -216,14 +265,15 @@ const signClick = (tab, event) => {
left: 23px; left: 23px;
top: 53px; top: 53px;
} }
.activedetail {
.content {
margin-left: 8px;
font-size: 14px;
color: rgba(51, 51, 48, 1);
font-weight: 500;
line-height: 35px;
margin-top: 30px; 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); background-color: rgba(255, 255, 255, 1);
border-radius: 8px; border-radius: 8px;
background: linear-gradient( background: linear-gradient(
180deg, 180deg,
rgba(36, 120, 255, 0.15) 0%, rgba(36, 120, 255, 0.15) 0%,
rgba(255, 255, 255) 50% rgba(255, 255, 255) 50%
); );
.title { .title {

152
vite.config.js
View File

@@ -2,89 +2,89 @@
* @Author: lixg lixg@dongwu-inc.com * @Author: lixg lixg@dongwu-inc.com
* @Date: 2022-11-21 17:28:10 * @Date: 2022-11-21 17:28:10
* @LastEditors: lixg lixg@dongwu-inc.com * @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 * @FilePath: /fe-stu/vite.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @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 vue from '@vitejs/plugin-vue'
import legacy from '@vitejs/plugin-legacy' 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"; import topLevelAwait from "vite-plugin-top-level-await";
const path = require('path') const path = require('path')
const url = 'http://111.231.196.214:30001'
export default defineConfig(({command}) => export default defineConfig(({ command }) =>
({ ({
base: '/fe-student', base: '/fe-student',
plugins: [ plugins: [
vue(), vue(),
// legacy({ // legacy({
// targets: ['chrome 64', 'defaults', 'not IE 11'] // targets: ['chrome 64', 'defaults', 'not IE 11']
// }), // }),
topLevelAwait({ topLevelAwait({
promiseExportName: '__tla', promiseExportName: '__tla',
promiseImportName: i => `__tla_${i}` promiseImportName: i => `__tla_${i}`
}), }),
// viteMockServe({ // viteMockServe({
// mockPath: './src/mock/mocks', // mockPath: './src/mock/mocks',
// }) // })
], ],
resolve: { resolve: {
alias: [ alias: [
{find: '@', replacement: path.resolve(__dirname, 'src')} { find: '@', replacement: path.resolve(__dirname, 'src') }
] ]
}, server: { }, server: {
proxy: { proxy: {
'/file/upload': { '/file/upload': {
target: 'http://111.231.196.214:30001', target: 'http://111.231.196.214:30001',
changeOrigin: true, changeOrigin: true,
}, },
'/stu': { '/stu': {
target: 'http://localhost:30001', target: url,
changeOrigin: true, changeOrigin: true,
}, },
'/queryVoteSubmitDetailById': { '/queryVoteSubmitDetailById': {
target: 'http://localhost:30001', target: url,
changeOrigin: true, changeOrigin: true,
}, },
'/work': { '/work': {
target: 'http://localhost:30001', target: url,
changeOrigin: true, changeOrigin: true,
}, },
'/discuss': { '/discuss': {
target: 'http://localhost:30001', target: url,
changeOrigin: true, changeOrigin: true,
}, },
'/discussSubmit': { '/discussSubmit': {
target: 'http://localhost:30001', target: url,
changeOrigin: true, changeOrigin: true,
}, },
'/comment': { '/comment': {
target: 'http://localhost:30001', target: url,
changeOrigin: true, changeOrigin: true,
}, },
'/vote': { '/vote': {
target: 'http://localhost:30001', target: url,
changeOrigin: true, changeOrigin: true,
}, },
'/admin': { '/admin': {
target: 'http://localhost:30001', target: url,
changeOrigin: true, changeOrigin: true,
},'/activity': { }, '/activity': {
target: 'http://localhost:30001', target: url,
changeOrigin: true, changeOrigin: true,
},'/liveBroadcast': { }, '/liveBroadcast': {
target: 'http://localhost:30001', target: url,
changeOrigin: true, changeOrigin: true,
},'/examination': { }, '/examination': {
target: 'http://localhost:30001', target: url,
changeOrigin: true, changeOrigin: true,
},'/assessment': { }, '/assessment': {
target: 'http://localhost:30001', target: url,
changeOrigin: true, changeOrigin: true,
}, },
}
} }
}) }
})
) )