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

feat:修改跳转及按钮

Browse Source
This commit is contained in:
lixg
2023-03-10 17:03:41 +08:00
parent d555d87919
commit 90f1fdee9b
11 changed files with 64 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/App.vue
View File

@@ -27,7 +27,7 @@ import { GET_USER_INFO } from "@/api/ThirdApi";
import { getCookie } from "@/api/utils";
import { USER_INFO } from "@/api/api";
console.log("版本2.1.0------------");
console.log("版本1.4.6------------");
const store = useStore();
const router = useRouter();

8
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-09 18:35:30
* @LastEditTime: 2023-03-10 15:20:30
* @FilePath: /stu_h5/src/components/ReturnHead.vue
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
@@ -99,7 +99,11 @@ export default {
"_top"
);
} else {
router.back(-1);
if (window.history.length <= 1) {
window.open(import.meta.env.VITE_BOE_STUDY, "_top");
} else {
router.back(-1);
}
}
};
const publishClick = () => {

3
src/views/discuss/DiscussUpload.vue
View File

@@ -168,6 +168,9 @@ onBeforeUnmount(() => {
// 发表帖子发布操作
const postAdd = () => {
console.log("用户信息", userInfo.value);
if (titleName.value == "") {
return ElMessage.warning("评论标题为空");
}
let obj = {
collectionNum: 0,
commentNum: 0,

12
src/views/faceteach/FaceTeach.vue
View File

@@ -141,7 +141,14 @@
<div class="box" style="width: 80px; right: 0px"></div>
</div>
<div class="teachermain">
<img class="teacherAvatar" :src="teacherInfo.avatar" />
<img
class="teacherAvatar"
:src="
teacherInfo?.avatar?.includes('upload')
? teacherInfo?.avatar
: fielPath + teacherInfo?.avatar
"
/>
<div style="flex: 1; margin-left: 11px; margin-right: 13px">
<div class="teacherName">{{ data.planDto?.teacher }}</div>
<div class="teacherIntro">
@@ -384,7 +391,7 @@
<script setup>
import TitleHead from "@/components/TitleHead.vue";
import ReturnHead from "@/components/ReturnHead.vue";
import { computed, reactive, toRefs, watch, onUnmounted } from "vue";
import { computed, reactive, toRefs, watch, onUnmounted, ref } from "vue";
import FileTypeImg from "@/components/FileTypeImg.vue";
import { request, useRequest } from "@/api/request";
import {
@@ -398,6 +405,7 @@ import { useUserInfo } from "@/api/utils";
import { ElMessage, messageConfig } from "element-plus";
import dayjs from "dayjs";
import { changeTime } from "@/api/method";
const fielPath = ref(import.meta.env.VITE_FILE_PATH);
const router = useRouter();
const returnclick = () => {
router.back();

10
src/views/faceteach/FaceTeachNoCommon.vue
View File

@@ -50,7 +50,14 @@
<div class="box" style="width: 80px; right: 0px"></div>
</div>
<div class="teachermain">
<img class="teacherAvatar" :src="teacherInfo.avatar" />
<img
class="teacherAvatar"
:src="
teacherInfo?.avatar?.includes('upload')
? teacherInfo?.avatar
: fielPath + teacherInfo?.avatar
"
/>
<div style="flex: 1; margin-left: 11px; margin-right: 13px">
<div class="teacherName">{{ data.planDto?.teacher }}</div>
<div class="teacherIntro">
@@ -165,6 +172,7 @@ import { ElMessage, messageConfig, ElLoading } from "element-plus";
import dayjs from "dayjs";
import UploadPostImg from "@/components/img/UploadPostImg.vue";
import CommentReply from "@/components/CommentReply.vue";
const fielPath = ref(import.meta.env.VITE_FILE_PATH);
const router = useRouter();
const returnclick = () => {
router.back();

10
src/views/faceteach/FaceTeachNoCourse.vue
View File

@@ -55,7 +55,14 @@
<div class="box" style="width: 80px; right: 0px"></div>
</div>
<div class="teachermain">
<img class="teacherAvatar" :src="teacherInfo.avatar" />
<img
class="teacherAvatar"
:src="
teacherInfo?.avatar?.includes('upload')
? teacherInfo?.avatar
: fielPath + teacherInfo?.avatar
"
/>
<div style="flex: 1; margin-left: 11px; margin-right: 13px">
<div class="teacherName">{{ data.planDto?.teacher }}</div>
<div class="teacherIntro">
@@ -161,6 +168,7 @@ import { useRoute, useRouter } from "vue-router";
import { useUserInfo } from "@/api/utils";
import { ElMessage, messageConfig, ElLoading } from "element-plus";
import dayjs from "dayjs";
const fielPath = ref(import.meta.env.VITE_FILE_PATH);
const router = useRouter();
const returnclick = () => {
router.back();

10
src/views/faceteach/FaceTeachSignUp.vue
View File

@@ -82,7 +82,14 @@
<div class="box" style="width: 80px; right: 0px"></div>
</div>
<div class="teachermain">
<img class="teacherAvatar" :src="teacherInfo.avatar" />
<img
class="teacherAvatar"
:src="
teacherInfo?.avatar?.includes('upload')
? teacherInfo?.avatar
: fielPath + teacherInfo?.avatar
"
/>
<div style="flex: 1; margin-left: 11px; margin-right: 13px">
<div class="teacherName">{{ data.planDto?.teacher }}</div>
<div class="teacherIntro">
@@ -201,6 +208,7 @@ import { ElMessage, messageConfig, ElLoading } from "element-plus";
import CommentReply from "@/components/CommentReply.vue";
import dayjs from "dayjs";
import { changeTime } from "@/api/method";
const fielPath = ref(import.meta.env.VITE_FILE_PATH);
const router = useRouter();
const returnclick = () => {
router.back();

4
src/views/liveboradcast/LiveBoradcast.vue
View File

@@ -216,6 +216,7 @@ const {
sName,
projectStatus,
projectEndTime,
targetId,
},
} = useRoute();
const router = useRouter();
@@ -335,13 +336,14 @@ const commitClick = () => {
pName: "直播",
sName: data.value.liveName,
type: 4,
targetId: targetId,
});
router.push({
path: "/investigatpage",
query: {
courseId: data.value.assessmentId,
infoId: data.value.liveId,
infoId: liveId,
chapterOrStageId: 0,
pName: "直播",
sName: data.value.liveName,

11
src/views/pathmap/PathmapPage.vue
View File

@@ -182,6 +182,7 @@ import store from "@/store";
import { ROUTER, TASK_TYPES } from "@/api/CONST";
import ReturnHead from "@/components/ReturnHead.vue";
import { useStore } from "vuex";
import { changeTime } from "@/api/method";
const {
query: { routerId, routerName, chapterId, isStudy },
} = useRoute();
@@ -278,7 +279,7 @@ function judgeTaskIsEnd(type, endTimes, status) {
console.log("judgeTaskIsEnd", type, endTimes, status);
let isEnd = false;
let nowTime = new Date().getTime();
let endTime = new Date().getTime(endTimes);
let endTime = new Date().getTime(changeTime(endTimes));
switch (type) {
case 1:
status == -1
@@ -344,7 +345,7 @@ function toFinish(d) {
ElMessage.warning("该任务无法学习，请联系管理员进行替换！");
return;
}
let date1 = new Date(d.endTime).getTime();
let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前面授课已结束");
@@ -357,7 +358,7 @@ function toFinish(d) {
}
if (d.type == 4) {
let date1 = new Date(d.endTime).getTime();
let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前作业已结束");
@@ -398,7 +399,7 @@ function toFinish(d) {
}
// 直播结束时间
if (d.type == 6) {
let date1 = new Date(d.endTime).getTime();
let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前直播已结束");
@@ -407,7 +408,7 @@ function toFinish(d) {
}
// 其他活动 结束时间
if (d.type == 9) {
let date1 = new Date(d.endTime).getTime();
let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前活动已结束");

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

@@ -221,6 +221,7 @@ import ReturnHead from "@/components/ReturnHead.vue";
import { PROJECT, TASK_TYPES } from "@/api/CONST";
import dayjs from "dayjs";
import { useStore } from "vuex";
import { changeTime } from "@/api/method";
const {
query: { courseId, projectId, type },
} = useRoute();
@@ -371,7 +372,8 @@ function judgeTaskIsEnd(type, endTimes, status) {
console.log("judgeTaskIsEnd", type, endTimes, status);
let isEnd = false;
let nowTime = new Date().getTime();
let endTime = new Date().getTime(endTimes);
let endTime = new Date().getTime(changeTime(endTimes));
console.log("endTime---------", endTime);
switch (type) {
case 1:
status == -1
@@ -424,7 +426,7 @@ function toFinish(d, sName, chapterOrStageId) {
return;
}
if (d.type == 2) {
let date1 = new Date(d.endTime).getTime();
let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前面授课已结束");
@@ -434,7 +436,7 @@ function toFinish(d, sName, chapterOrStageId) {
}
// 作业过期判断
if (d.type == 4) {
let date1 = new Date(d.endTime).getTime();
let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前作业已结束");
@@ -443,7 +445,7 @@ function toFinish(d, sName, chapterOrStageId) {
}
// 直播结束时间
if (d.type == 6) {
let date1 = new Date(d.endTime).getTime();
let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前直播已结束");
@@ -492,7 +494,7 @@ function toFinish(d, sName, chapterOrStageId) {
}
// 其他活动 结束时间
if (d.type == 9) {
let date1 = new Date(d.endTime).getTime();
let date1 = new Date(changeTime(d.endTime)).getTime();
let date2 = new Date().getTime();
if (date1 < date2) {
ElMessage.warning("当前活动已结束");

2
vite.config.js
View File

@@ -2,7 +2,7 @@
* @Author: lixg lixg@dongwu-inc.com
* @Date: 2023-01-13 11:42:48
* @LastEditors: lixg lixg@dongwu-inc.com
* @LastEditTime: 2023-03-10 04:08:35
* @LastEditTime: 2023-03-10 11:42:51
* @FilePath: /stu_h5/vite.config.js
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/