feat:增加活动页面数据

This commit is contained in:
lixg
2023-01-13 18:41:55 +08:00
parent bdb0fb1759
commit cd70db77a4
12 changed files with 3682 additions and 1357 deletions

6
.env
View File

@@ -1,8 +1,8 @@
VITE_BASE=/student-h5
VITE_BASE_API=/manageAPi
VITE_BASE=/fe-student-h5
VITE_BASE_API=/
VITE_OUTPUT_DIR=./dist
VITE_BASE_LOGIN_URL=https://u-pre.boe.com/web?returnUrl=
VITE_PROXY_URL=http://111.231.196.214:30001
VITE_PROXY_URL=http://111.231.196.214/manageApi
VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=

View File

@@ -1,4 +1,4 @@
VITE_BASE=/student-h5
VITE_BASE=/fe-student-h5
VITE_BASE_API=/manageApi
VITE_BOE_ONLINE_CLASS_URL=https://u-pre.boe.com/pc/course/studyindex?id=

View File

@@ -1,4 +1,4 @@
VITE_BASE=/student-h5
VITE_BASE=/fe-student-h5
VITE_BASE_API=/manageApi
VITE_BASE_LOGIN_URL=https://u.boe.com/web?returnUrl=

View File

@@ -1,4 +1,4 @@
VITE_BASE=/student-h5-release
VITE_BASE=/fe-student-h5-release
VITE_BASE_API=/manageApi-release
VITE_BASE_LOGIN_URL=https://u.boe.com/web?returnUrl=

View File

@@ -1,4 +1,4 @@
VITE_BASE=/student-h5
VITE_BASE=/fe-student-h5
VITE_BASE_API=/manageApi
VITE_OUTPUT_DIR=./docker/dist

4474
package-lock.json generated

File diff suppressed because it is too large Load Diff

View File

@@ -1,54 +1,55 @@
<template>
<div id="container">
<!-- <div id="nav">-->
<!-- <router-link-->
<!-- v-for="item in routes"-->
<!-- :key="item.path"-->
<!-- :to="item.path"-->
<!-- :class="{-->
<!-- link: true,-->
<!-- active: name === item.name,-->
<!-- }"-->
<!-- >-->
<!-- {{ item.name }}-->
<!-- </router-link>-->
<!-- </div>-->
<!-- <div id="nav">
<router-link
v-for="item in routes"
:key="item.path"
:to="item.path"
:class="{
link: true,
active: name === item.name,
}"
>
{{ item.name }}
</router-link>
</div> -->
<main>
<router-view/>
<router-view />
</main>
</div>
</template>
<script setup>
import {computed, onMounted} from "vue";
import {useRouter, useRoute} from "vue-router";
import {useStore} from "vuex";
import {boeRequest} from "@/api/request";
import {GET_USER_INFO} from "@/api/ThirdApi";
import {getCookie} from "@/api/utils";
import { computed, onMounted } from "vue";
import { useRouter, useRoute } from "vue-router";
import { useStore } from "vuex";
import { boeRequest } from "@/api/request";
import { GET_USER_INFO } from "@/api/ThirdApi";
import { getCookie } from "@/api/utils";
const store = useStore();
const router = useRouter();
onMounted(() => {
window.location.href.includes('/login') || getUserInfo();
window.location.href.includes("/login") || getUserInfo();
});
function getUserInfo() {
boeRequest(GET_USER_INFO).then((res) => {
console.log(222222222)
console.log(res)
res.result.avatar = res.result.avatar ? res.result.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'
console.log(222222222);
console.log(res);
res.result.avatar = res.result.avatar
? res.result.avatar
: "/800e23f7-b58c-4192-820d-0c6a2b7544cc.png";
store.commit("SET_USER", res.result);
});
}
</script>
<style lang="scss">
#app {
// font-family: MicrosoftYaHei, Microsoft YaHei, Avenir, Helvetica, Arial,
// sans-serif;
font-family: Helvetica Neue, Helvetica, PingFang SC, Hiragino Sans GB,
Microsoft YaHei, Arial, sans-serif;
Microsoft YaHei, Arial, sans-serif;
-webkit-font-smoothing: antialiased;
-moz-osx-font-smoothing: grayscale;
color: #2c3e50;

View File

@@ -1,3 +1,11 @@
/*
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-01-13 11:42:48
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-01-13 18:09:17
* @FilePath: /stu_h5/src/api/api.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
export const BASE = 'http://localhost:3000'
export const LOGIN = '/admin/CheckUser/userLogin post'
export const FILE_UPLOAD = '/file/upload'
@@ -6,7 +14,7 @@ export const ROUTER_LIST = '/stu/router/list post'
export const ROUTER_PROCESS = '/stu/router/process'
export const ROUTER_UNCOMPLETE_LIST = '/stu/router/unCompleteTaskList'
export const TAS_ACTIVITY_DETAIL = '/stu/task/activity/detail'
export const TASK_ACTIVITY_SIGN = '/stu/task/activity/sign'
export const TASK_ACTIVITY_SIGN = '/stu/task/activity/sign post'
export const TASK_BROADCAST_COMMIT = '/stu/task/broadcast/commit'
export const TASK_BROADCAST_DETAIL = '/stu/task/broadcast/detail'
export const TASK_BROADCAST_SIGN = '/stu/task/broadcast/sign'
@@ -19,3 +27,4 @@ export const WORK_QUERYWORKDETAILBYID = '/work/queryWorkDetailById'
export const EXAMINATION_QUERYEXAMINATIONDETAILBYID = '/examination/queryExaminationDetailById'
export const DISCUSS_COLLECTION = '/discussSubmit/clickDiscussCollectionCountOr POST'
export const DISCUSS_LIKE = '/discussSubmit/clickDiscussLikeCountOr POST'
export const ACTIVITY = '/activity'

View File

@@ -1,54 +1,142 @@
<template>
<div class="activities">
<div class="main">
<div class="notice">
<span class="text"
>请各位选课的同学提前阅读本课程的教学大纲与计划请各位选课的同学提前阅读本课程的教学大纲与计划</span
>
<span class="close"></span>
<div class="notice" :style="{ display: closeBtn ? 'flex' : 'none' }">
<span class="text">{{ data?.activityNotice }}</span>
<span class="close" @click="isShowClose"></span>
</div>
<div class="title">
<div class="titlemain">
<div class="timeposition">
<div
calss="titlecontent"
style="
calss="titlecontent"
style="
font-size: 14px;
font-weight: bold;
line-height: 21.6px;
margin-bottom: 8px;
"
>
管理者进阶腾飞班 - 专属线下活动
{{ data?.activityName }}
</div>
<div class="time">
<img
style="width: 13px; height: 14.5px; margin-right: 5.5px"
src="../../assets/image/faceteach/time.png"
style="width: 13px; height: 14.5px; margin-right: 5.5px"
src="../../assets/image/faceteach/time.png"
/>
<div style="font-size: 12px; color: rgba(110, 123, 132, 1)">
2022-07-20 20:00-21:00
{{ data?.activityStartTime + "至" + data?.activityEndTime }}
</div>
</div>
<div class="time" style="margin-top: 9px">
<img
style="width: 13px; height: 15px; margin-right: 5.5px"
src="../../assets/image/faceteach/position.png"
style="width: 13px; height: 15px; margin-right: 5.5px"
src="../../assets/image/faceteach/position.png"
/>
<div style="font-size: 12px; color: rgba(110, 123, 132, 1)">
大族广场
{{ data?.activityAddress }}
</div>
</div>
</div>
<el-button class="titlebtn" @click="open">签到</el-button>
<div v-if="projectStatus && projectEndTime" class="sign">
<div
v-if="
projectStatus !== '3' &&
new Date(projectEndTime).getTime() > new Date().getTime()
"
class="sign"
>
<botton
v-if="isAllowSign"
class="btn"
:style="{
background: data.signFlag ? '#999' : 'rgb(57, 146, 249)',
}"
@click="signClick"
>{{ data.signFlag ? "已签到" : "签到" }}
</botton>
<botton
v-else
class="btn"
:style="{ background: '#999' }"
@click="signClick"
>{{ data.signFlag ? "已签到" : "签到" }}
</botton>
</div>
</div>
<div v-else class="sign">
<div class="sign">
<button
v-if="isAllowSign"
class="btn"
:style="{
background: data.signFlag ? '#999' : 'rgb(57, 146, 249)',
}"
@click="signClick"
>
{{ data.signFlag ? "已签到" : "签到" }}
</button>
<button
v-else
class="btn"
:style="{ background: '#999' }"
@click="signClick"
>
{{ data.signFlag ? "已签到" : "签到" }}
</button>
</div>
</div>
</div>
</div>
<div class="details">
<div class="details_title">活动详情</div>
<div class="details_content">
大族广场写字楼采用国际顶级硬件设施美国OTIS电梯麦克维尔中央空调高端安防系统等商务空间新标准匹配项目在亦庄地标综合体的形象写字楼空间设计由亚洲著名的室内空间设计大师之一梁景华设计写字楼群由六栋(T1T6)呈舰队排列的5A写字楼构成形成独特的舰队造型<br/>购物中心介绍<br/>大族广场Mall&More位于北京经济技术开发区核心商圈荣华路由荷兰鹿特丹缤纷市场设计师HANS
VAN DALEN
主持设计,秉持自然与未来和谐共生理念,倡导乐活有机绿色环保的生活方式,传递生活美学<br/>大族广场Mall&More汇集众多知名优质品牌,7FRESH生鲜超市CGV星聚汇影城中信书店源力悦体等,集购物餐饮娱乐文化于一体,丰富的业态品类为消费者提供城市生活的第三空间感受<br/>大族广场Mall&More以人为本,不断提升服务水平,升级消费购物体验,致力于营造更加舒适的购物环境与空间,打造有温度的品牌同时根据春夏秋冬四季策划丰富多样的大型主题活动为会员设置专属的沙龙活动打造专属会员日等
<div>
<span>活动时长:</span>
<div class="content">
{{
data?.activityDuration ? data?.activityDuration + "分钟" : "-"
}}
</div>
</div>
<div>
<span>活动地点:</span>
<div class="content">
{{ data?.activityAddress ? data?.activityAddress : "-" }}
</div>
</div>
<div>
<span>活动考勤:</span>
<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>
<span>活动说明:</span>
<div class="content">
{{ data?.activityExplain ? data?.activityExplain : "-" }}
</div>
</div>
</div>
</div>
</div>
@@ -56,7 +144,103 @@
</template>
<script setup>
console.log(333333333333333)
console.log(333333333333333);
import { TASK_ACTIVITY_SIGN, ACTIVITY } from "@/api/api";
import { request, useRequest } from "@/api/request";
import { useRouter } from "vue-router";
import { useRoute } from "vue-router/dist/vue-router";
import { ElMessage } from "element-plus";
import { reactive, onUnmounted, toRefs } from "vue";
const router = useRouter();
const returnclick = () => {
router.back();
};
const {
query: { courseId: activityId, id: taskId, type },
} = useRoute();
console.log("query", activityId, taskId, type);
const state = reactive({
isAllowSign: false,
closeBtn: true,
});
const { isAllowSign, closeBtn } = toRefs(state);
const { data } = useRequest(ACTIVITY, { activityId });
console.log("data", data);
const signClick = (tab, event) => {
if (data.value.signFlag) {
return;
}
if (!state.isAllowSign) {
// console.log("data.signFlag", data.value.signFlag, isAllowSign);
ElMessage.warning("未在允许签到时间范围内");
return;
}
data.value.signFlag = true;
ElMessage.warning("签到成功");
request(TASK_ACTIVITY_SIGN, {
courseId: activityId,
taskId,
type,
});
};
let timer = null;
//判断能否签到
function isSignClick() {
timer = setInterval(() => {
let beginTime = new Date(data.value.activityStartTime).getTime();
let endTime = !data.value.afterSignIn
? new Date(data.value.activityEndTime).getTime()
: new Date(data.value.activityStartTime).getTime();
let nowTime = new Date().getTime();
if (data.value.beforeSignIn && data.value.afterSignIn) {
//有开始前有开始后
beginTime = beginTime - data.value.beforeSignIn * 60 * 1000;
endTime = endTime + data.value.afterSignIn * 60 * 1000;
console.log("1111");
} else if (data.value.beforeSignIn && !data.value.afterSignIn) {
//只有开始前无开始后
beginTime = beginTime - data.value.beforeSignIn * 60 * 1000;
console.log("11112222");
} else if (!data.value.beforeSignIn && data.value.afterSignIn) {
//无开始前有开始后
endTime = endTime + data.value.afterSignIn * 60 * 1000;
console.log("1111333");
}
// console.log(nowTime, beginTime, endTime, data.value);
// console.log(nowTime < endTime, nowTime > beginTime);
// console.log(state.isAllowSign);
if (nowTime < endTime && nowTime > beginTime) {
state.isAllowSign = true;
} else {
state.isAllowSign = false;
}
// console.log(
// "isAllowSign",
// state.isAllowSign,
// nowTime,
// endTime,
// beginTime,
// nowTime < endTime,
// nowTime > beginTime
// );
}, 1000);
}
isSignClick();
onUnmounted(() => {
if (timer) {
clearInterval(timer);
}
});
//是否显示头部公告
const isShowClose = () => {
state.closeBtn = false;
};
</script>
<style lang="scss">
@@ -75,7 +259,7 @@ console.log(333333333333333)
width: 100%;
height: 25px;
display: flex;
justify-content: center;
// justify-content: center;
position: relative;
.text {
@@ -126,6 +310,8 @@ console.log(333333333333333)
display: flex;
align-items: center;
}
width: calc(100% - 93px);
// background-color: pink;
}
.titlebtn {
@@ -143,6 +329,20 @@ console.log(333333333333333)
line-height: 12px;
cursor: pointer;
}
.sign {
width: 93px;
height: 33px;
.btn {
width: 93px;
height: 33px;
border-radius: 6px;
border: 0;
font-size: 14px;
cursor: pointer;
flex-shrink: 0;
color: #fff;
}
}
}
}
@@ -167,12 +367,22 @@ console.log(333333333333333)
}
.details_content {
display: flex;
// display: flex;
width: 90%;
margin-top: 15px;
font-size: 13px;
color: rgba(110, 123, 132, 1);
line-height: 30.29px;
.content {
// margin: 25px 24px 49px 49px;
color: #677d86;
width: 361px;
// height: 304px;
// line-height: 24px;
// font-size: 16px;
font-weight: bold;
margin-left: 10px;
}
}
}
}

View File

@@ -152,7 +152,7 @@ export default {
display: flex;
justify-content: center;
// margin-top: -17.5px;
margin-top: 20px;
// margin-top: 20px;
.noticebox {
width: 100%;
background: #fff;

View File

@@ -1,6 +1,14 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-01-13 11:42:48
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-01-13 14:12:17
* @FilePath: /stu_h5/src/views/login/login.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<div
:style="{
:style="{
margin: 'auto',
background:
'url(http://img.gz2c.com/FoTcLY8ww-ISCFlwyCoYuLim1BMt) no-repeat',
@@ -11,7 +19,7 @@
}"
>
<div
:style="{
:style="{
width: '300px',
height: '300px',
margin: '10% auto',
@@ -24,30 +32,28 @@
>
<div :style="{ fontSize: '24px', paddingBottom: '30px' }">用户登录</div>
<div>
<input placeholder="用户名" v-model="form.account"/>
<input placeholder="用户名" v-model="form.account" />
<input
placeholder="密码"
v-model="form.password"
:style="{ marginTop: '30px' }"
type="password"
placeholder="密码"
v-model="form.password"
:style="{ marginTop: '30px' }"
type="password"
/>
<button :style="{ marginTop: '30px' }" @click="loginUser">
登录
</button>
<button :style="{ marginTop: '30px' }" @click="loginUser">登录</button>
</div>
</div>
</div>
</template>
<script setup>
import {useRoute, useRouter} from "vue-router";
import {ref} from "vue";
import {LOGIN} from "@/api/api";
import {setCookie} from "@/api/utils";
import {request} from "@/api/request";
import { useRoute, useRouter } from "vue-router";
import { ref } from "vue";
import { LOGIN } from "@/api/api";
import { setCookie } from "@/api/utils";
import { request } from "@/api/request";
const router = useRouter();
const {
query: {returnUrl},
query: { returnUrl },
} = useRoute();
const returnclick = () => {
@@ -60,10 +66,13 @@ const form = ref({
});
async function loginUser() {
const {data: token} = await request(LOGIN, form.value);
console.log(
"await request(LOGIN, form.value)",
await request(LOGIN, form.value)
);
const { data: token } = await request(LOGIN, form.value);
setCookie("token", token, 10);
returnUrl && (window.location.href = decodeURI(returnUrl));
// await router.push({path: returnUrl || "/learnpath"});
}
</script>

View File

@@ -1,99 +1,107 @@
import {defineConfig, loadEnv} from 'vite'
/*
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-01-13 11:42:48
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-01-13 18:18:01
* @FilePath: /stu_h5/vite.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
import { defineConfig, loadEnv } from 'vite'
import vue from '@vitejs/plugin-vue'
import legacy from '@vitejs/plugin-legacy'
import topLevelAwait from "vite-plugin-top-level-await";
import {viteMockServe} from 'vite-plugin-mock'
import { viteMockServe } from 'vite-plugin-mock'
const path = require('path')
export default defineConfig(({command,mode}) =>
({
base: loadEnv(mode, process.cwd()).VITE_BASE,
build:{
outDir: loadEnv(mode, process.cwd()).VITE_OUTPUT_DIR,
},
plugins: [
vue(),
legacy({
targets: ['chrome 52', 'defaults', 'not IE 11']
}),
// viteMockServe({
// mockPath: './src/mock/mocks',
// })
topLevelAwait({
promiseExportName: '__tla',
promiseImportName: i => `__tla_${i}`
}),
],
resolve: {
alias: [
{find: '@', replacement: path.resolve(__dirname, 'src')}
]
},
server: {
proxy: {
'/file/upload': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
// '/stu': {
// target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
// changeOrigin: true,
// },
'/queryVoteSubmitDetailById': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/work': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/discuss': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/discussSubmit': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/comment': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/vote': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/admin': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/activity': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/liveBroadcast': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/examination': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/assessment': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/workSubmit': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/userbasic': {
target: 'https://u-pre.boe.com',
changeOrigin: true,
}, '/link': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/onlineClasses/queryOnlineClassesStudyDetail': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
}
export default defineConfig(({ command, mode }) =>
({
base: loadEnv(mode, process.cwd()).VITE_BASE,
build: {
outDir: loadEnv(mode, process.cwd()).VITE_OUTPUT_DIR,
},
plugins: [
vue(),
legacy({
targets: ['chrome 52', 'defaults', 'not IE 11']
}),
// viteMockServe({
// mockPath: './src/mock/mocks',
// })
topLevelAwait({
promiseExportName: '__tla',
promiseImportName: i => `__tla_${i}`
}),
],
resolve: {
alias: [
{ find: '@', replacement: path.resolve(__dirname, 'src') }
]
},
server: {
proxy: {
'/file/upload': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/stu': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/queryVoteSubmitDetailById': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/work': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/discuss': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/discussSubmit': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/comment': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/vote': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
'/admin': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/activity': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/liveBroadcast': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/examination': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/assessment': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/workSubmit': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/userbasic': {
target: 'https://u-pre.boe.com',
changeOrigin: true,
}, '/link': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
}, '/onlineClasses/queryOnlineClassesStudyDetail': {
target: loadEnv(mode, process.cwd()).VITE_PROXY_URL,
changeOrigin: true,
},
}
})
}
})
)