hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-09 10:56:46 +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
2023-03-22 16:12:33 +08:00
parent c6c3975a42 ab215223c7
commit 0cd50e115e
3 changed files with 20 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/drawers/router/RouterFaceStu.vue
View File

@@ -132,7 +132,7 @@
</template> </template>
<script setup> <script setup>
import {computed, defineEmits, nextTick, ref, watch} from "vue"; import {computed, defineEmits, ref, watch} from "vue";
import * as api from "@/api/index1"; import * as api from "@/api/index1";
import BaseTable from "@/components/common/BaseTable"; import BaseTable from "@/components/common/BaseTable";
import {message} from "ant-design-vue"; import {message} from "ant-design-vue";

17
src/views/learningpath/LevelAdd.vue
View File

@@ -2666,13 +2666,16 @@ export default {
// if (date1 < date2) return message.warning("当前面授课已结束"); // if (date1 < date2) return message.warning("当前面授课已结束");
// if (item.taskStatus == 1 || item.taskStatus == 2) // if (item.taskStatus == 1 || item.taskStatus == 2)
// return message.error("该任务无法学习，请联系管理员进行替换。"); // return message.error("该任务无法学习，请联系管理员进行替换。");
codeUrl =
window.location.protocol + // codeUrl =
process.env.VUE_APP_H5 + // window.location.protocol +
"/faceteach?type=2&courseId=" + // process.env.VUE_APP_H5 +
item.courseId + // "/faceteach?type=2&courseId=" +
"&id=" + // item.courseId +
item.id; // "&id=" +
// item.id;
codeUrl = window.location.protocol + process.env.VUE_APP_H5 + "/pathdetails?routerId=" + state.routerId;
} }
if (item.type == 3) return message.error("请在pc端完成"); if (item.type == 3) return message.error("请在pc端完成");

16
src/views/projectcenter/TaskPage.vue
View File

@@ -4614,13 +4614,15 @@ export default {
item.courseId; item.courseId;
} }
if (item.type == 2) { if (item.type == 2) {
codeUrl = // codeUrl =
window.location.protocol + // window.location.protocol +
process.env.VUE_APP_H5 + // process.env.VUE_APP_H5 +
"/faceteach?type=1&courseId=" + // "/faceteach?type=1&courseId=" +
item.courseId + // item.courseId +
"&id=" + // "&id=" +
item.id; // item.id;
codeUrl = window.location.protocol + process.env.VUE_APP_H5 + "/projectdetails?type=1&projectId=" + state.projectId;
} }
if (item.type == 3) return message.error("请在pc端完成"); if (item.type == 3) return message.error("请在pc端完成");
if (item.type == 4) { if (item.type == 4) {