hz/student-h5
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/student-h5.git synced 2025-12-06 17:36:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pre-master' into 'master'

Browse Source 
Pre master

See merge request !27
This commit is contained in:
huangshengfa
2023-03-09 21:38:52 +08:00
parent f8079608a2 e03440d12e
commit e4e8989f26
15 changed files with 53 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.env
View File

@@ -31,4 +31,4 @@ VITE_FILE_PATH=/upload/
#h5的基本url
VITE_BOE_HOME=//u-pre.boe.com/mobile/pages/index/index
# 学习任务页
VITE_BOE_STUDY=https://u-pre.boe.com/mobile/pages/study/index
VITE_BOE_STUDY=//u-pre.boe.com/mobile/pages/study/index

3
.env.prod
View File

@@ -19,4 +19,5 @@ VITE_IMG=/manageApi
#h5的基本url
VITE_BOE_HOME=//u.boe.com/mobile/pages/index/index
VITE_BOE_STUDY=https://u.boe.com/mobile/pages/study/index
VITE_BOE_STUDY=//u.boe.com/mobile/pages/study/index
VITE_FILE_PATH=/upload/boe/file/

2
.env.release
View File

@@ -16,4 +16,4 @@ VITE_IMG=/manageApi-release
#h5的基本url
VITE_BOE_HOME=//u.boe.com/mobile-release/pages/index/index
VITE_BOE_STUDY=https://u.boe.com/mobile-release/pages/study/index
VITE_BOE_STUDY=//u.boe.com/mobile-release/pages/study/index

3
src/components/PathDetailImage.vue
View File

@@ -324,9 +324,6 @@ function toDetail(item, i) {
function close() {
visiable.value = false;
}
function toIndex() {
window.location.href = import.meta.env.VITE_BOE_API_URL;
}
</script>
<style lang="scss">
.pathDetailback {

7
src/components/ReturnHead.vue
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-01-16 17:26:39
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-03-08 18:01:49
* @LastEditTime: 2023-03-09 18:35:30
* @FilePath: /stu_h5/src/components/ReturnHead.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -94,7 +94,10 @@ export default {
const returnclick = () => {
console.log("props.gohome", props.gohome, import.meta.env.VITE_BOE_STUDY);
if (props.gohome) {
window.open(import.meta.env.VITE_BOE_STUDY, "_top");
window.open(
window.location.protocol + import.meta.env.VITE_BOE_STUDY,
"_top"
);
} else {
router.back(-1);
}

32
src/views/ballotpage/BallotPage.vue
View File

@@ -218,21 +218,23 @@ let hour = ref(0);
let minute = ref(0);
let seconds = ref(0);
let timer = setInterval(() => {
let endTime = parseInt(new Date(data.value.voteEndTime).getTime() / 1000);
let nowTime = parseInt(new Date().getTime() / 1000);
if (endTime > nowTime) {
hour.value = parseInt(
dayjs(data.value.voteEndTime).diff(dayjs(), "minute") / 60
);
minute.value = parseInt(
dayjs(data.value.voteEndTime).diff(dayjs(), "minute") % 60
);
seconds.value = parseInt(
dayjs(data.value.voteEndTime).diff(dayjs(), "seconds") -
(hour.value * 60 + minute.value) * 60
);
} else {
clearInterval(timer);
if (data && data.value && data.value.voteEndTime) {
let endTime = parseInt(new Date(data.value.voteEndTime).getTime() / 1000);
let nowTime = parseInt(new Date().getTime() / 1000);
if (endTime > nowTime) {
hour.value = parseInt(
dayjs(data.value.voteEndTime).diff(dayjs(), "minute") / 60
);
minute.value = parseInt(
dayjs(data.value.voteEndTime).diff(dayjs(), "minute") % 60
);
seconds.value = parseInt(
dayjs(data.value.voteEndTime).diff(dayjs(), "seconds") -
(hour.value * 60 + minute.value) * 60
);
} else {
clearInterval(timer);
}
}
}, 1000);

4
src/views/homeworkpage/HomeworkPage.vue
View File

@@ -175,8 +175,8 @@ const state = reactive({
const { hour, minute, seconds } = toRefs(state);
let timer = setInterval(() => {
console.log("endTime", data.value.submitEndTime);
if (data && data.value.submitEndTime) {
// console.log("endTime", data.value.submitEndTime);
if (data && data.value && data.value.submitEndTime) {
let endTime = parseInt(new Date(data.value.submitEndTime).getTime() / 1000);
let nowTime = parseInt(new Date().getTime() / 1000);
console.log("endTime222", endTime, nowTime);

5
src/views/nottask/NotPath.vue
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-03-01 20:41:06
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-03-05 19:39:54
* @LastEditTime: 2023-03-09 18:32:25
* @FilePath: /stu_h5/src/views/nottask/NotTask.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -19,6 +19,7 @@
</template>
<script setup>
function toIndex() {
window.location.href = import.meta.env.VITE_BOE_HOME;
window.location.href =
window.location.protocol + import.meta.env.VITE_BOE_HOME;
}
</script>

5
src/views/nottask/NotProject.vue
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-03-01 20:41:06
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-03-01 20:43:40
* @LastEditTime: 2023-03-09 18:33:51
* @FilePath: /stu_h5/src/views/nottask/NotTask.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -15,6 +15,7 @@
</template>
<script setup>
function toIndex() {
window.location.href = import.meta.env.VITE_BOE_API_URL;
window.location.href =
window.location.protocol + import.meta.env.VITE_BOE_HOME;
}
</script>

6
src/views/pathmap/PathDetails.vue
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-01-19 14:59:34
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-03-08 17:52:46
* @LastEditTime: 2023-03-09 18:32:57
* @FilePath: /stu_h5/src/views/pathmap/LevelList.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -57,10 +57,6 @@ const {
query: { routerId },
} = useRoute();
const { data } = useRequest(ROUTER_PROCESS, { routerId: routerId });
function toIndex() {
window.location.href = import.meta.env.VITE_BOE_API_URL;
}
</script>
<style lang="scss">

3
src/views/projectdetails/projectDetails.vue
View File

@@ -593,9 +593,6 @@ const queryAllStatus = (data) => {
}
return true;
};
function toIndex() {
window.location.href = import.meta.env.VITE_BOE_API_URL;
}
</script>
<style lang="scss">

3
src/views/sign/signErrorResult.vue
View File

@@ -7,6 +7,7 @@
</template>
<script setup>
function toIndex() {
window.location.href = import.meta.env.VITE_BOE_API_URL;
window.location.href =
window.location.protocol + import.meta.env.VITE_BOE_HOME;
}
</script>

5
src/views/sign/signResult.vue
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-01-17 19:47:07
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-02-19 10:45:22
* @LastEditTime: 2023-03-09 18:33:58
* @FilePath: /stu_h5/src/views/sign/signResult.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -15,6 +15,7 @@
</template>
<script setup>
function toIndex() {
window.location.href = import.meta.env.VITE_BOE_API_URL;
window.location.href =
window.location.protocol + import.meta.env.VITE_BOE_HOME;
}
</script>

11
src/views/sign/signStuNotInProjectResult.vue
View File

@@ -1,3 +1,11 @@
<!--
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-03-09 17:56:39
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-03-09 18:34:02
* @FilePath: /stu_h5/src/views/sign/signStuNotInProjectResult.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<template>
<el-result icon="success" title="签到异常" sub-title="您不在此课程中">
<template #extra>
@@ -7,6 +15,7 @@
</template>
<script setup>
function toIndex() {
window.location.href = import.meta.env.VITE_BOE_API_URL;
window.location.href =
window.location.protocol + import.meta.env.VITE_BOE_HOME;
}
</script>

5
src/views/sign/signSuccessResult.vue
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-01-17 19:47:07
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-02-19 10:45:30
* @LastEditTime: 2023-03-09 18:34:06
* @FilePath: /stu_h5/src/views/sign/signSuccessResult.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -15,6 +15,7 @@
</template>
<script setup>
function toIndex() {
window.location.href = import.meta.env.VITE_BOE_API_URL;
window.location.href =
window.location.protocol + import.meta.env.VITE_BOE_HOME;
}
</script>