diff --git a/src/api/utils.js b/src/api/utils.js
index 08fce68..5b42385 100644
--- a/src/api/utils.js
+++ b/src/api/utils.js
@@ -1,5 +1,5 @@
import {watch, ref} from "vue";
-import {boeRequest} from "@/api/request";
+import {boeRequest,request} from "@/api/request";
import {BASE, GET_USER_LIST} from "@/api/ThirdApi";
export function useImage(src) {
@@ -23,8 +23,8 @@ export function delCookie(name){
export function useUserInfo(id) {
const userInfo = ref({})
watch(id, () => {
- id.value && boeRequest(GET_USER_LIST, {id: id.value}).then(res => {
- userInfo.value = res.result.userInfoList[0]
+ id.value && request(GET_USER_LIST, {id: id.value}).then(res => {
+ userInfo.value = res.data
userInfo.value.avatar = userInfo.value.avatar?userInfo.value.avatar.includes('upload')?userInfo.value.avatar:'/upload'+userInfo.value.avatar:'/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'
})
})
diff --git a/src/hooks/useOrgName.js b/src/hooks/useOrgName.js
index 78d73cf..8793564 100644
--- a/src/hooks/useOrgName.js
+++ b/src/hooks/useOrgName.js
@@ -2,7 +2,7 @@
const useOrgName = (namePath) => {
let newName = namePath;
if (newName) {
- let names = newName.split(',');
+ let names = newName.split('/');
let len = names.length;
//使用最后两们
if (len > 1) {
diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue
index 52dfbc6..c38728d 100644
--- a/src/views/faceteach/FaceTeach.vue
+++ b/src/views/faceteach/FaceTeach.vue
@@ -289,7 +289,7 @@
{{ data.planDto?.teacher }}
-
{{ cutOrgNamePath }}
+ {{useOrgName(teacherInfo.orgNamePath)}}
@@ -324,11 +324,6 @@ const { data } = useRequest(STU_OFFCOURSE_DETAIL, {
courseId,
usePermission: true,
});
-// 获取组织名称
-const cutOrgNamePath = computed(() => {
- let newName = data.value?.offcourseDto?.organizationNames;
- return useOrgName(newName);
-})
const teacherInfo = useUserInfo(computed(() => data.value?.planDto?.teacherId));
const isAllowSign = computed(() => dayjs().isBetween(dayjs(data.value.planDto?.beginTime).subtract(data.value.planDto?.beforeStart || 0, "minute"), dayjs(data.value.planDto?.afterStart ? data.value.planDto?.beginTime : data.value.planDto?.endTime).add(data.value.planDto?.afterStart || 0, "minute")));
diff --git a/src/views/faceteach/FaceTeachNoCommon.vue b/src/views/faceteach/FaceTeachNoCommon.vue
index 4917219..175672d 100644
--- a/src/views/faceteach/FaceTeachNoCommon.vue
+++ b/src/views/faceteach/FaceTeachNoCommon.vue
@@ -101,7 +101,7 @@
{{ data.planDto?.teacher }}
- {{ cutOrgNamePath }}
+ {{useOrgName(teacherInfo.orgNamePath)}}
@@ -134,12 +134,6 @@ const {
} = useRoute();
const {data} = useRequest(STU_OFFCOURSE_DETAIL, {courseId});
-// 获取组织名称
-const cutOrgNamePath = computed(() => {
- let newName = data.value?.offcourseDto?.organizationNames;
- return useOrgName(newName);
-})
-
const teacherInfo = useUserInfo(
computed(() => data.value?.planDto?.teacherId)
);
diff --git a/src/views/faceteach/FaceTeachNoCourse.vue b/src/views/faceteach/FaceTeachNoCourse.vue
index eb451ab..0adeab8 100644
--- a/src/views/faceteach/FaceTeachNoCourse.vue
+++ b/src/views/faceteach/FaceTeachNoCourse.vue
@@ -99,7 +99,7 @@
{{ data.planDto?.teacher }}
- {{ cutOrgNamePath }}
+ {{useOrgName(teacherInfo.orgNamePath)}}
@@ -131,11 +131,6 @@ const {
} = useRoute();
const {data} = useRequest(STU_OFFCOURSE_DETAIL, {courseId});
-// 获取组织名称
-const cutOrgNamePath = computed(() => {
- let newName = data.value?.offcourseDto?.organizationNames;
- return useOrgName(newName);
-})
const teacherInfo = useUserInfo(computed(() => data.value?.planDto?.teacherId));
const activeName = ref("first");
diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue
index 88b8fd5..84d9171 100644
--- a/src/views/faceteach/FaceTeachSignUp.vue
+++ b/src/views/faceteach/FaceTeachSignUp.vue
@@ -308,7 +308,7 @@
{{ data.planDto?.teacher }}
- {{cutOrgNamePath}}
+ {{useOrgName(teacherInfo.orgNamePath)}}
@@ -345,11 +345,6 @@ const returnclick = () => {
const { query: {courseId} } = useRoute();
const {data = {}} = useRequest(STU_OFFCOURSE_DETAIL, {courseId});
console.log(data.value);
-// 获取组织名称
-const cutOrgNamePath = computed(() => {
- let newName = data.value?.offcourseDto?.organizationNames;
- return useOrgName(newName);
-})
const teacherInfo = useUserInfo( computed(() => data.value?.planDto?.teacherId));
const activeName = ref("first");
diff --git a/src/views/faceteach/FaceTeachStuSign.vue b/src/views/faceteach/FaceTeachStuSign.vue
index 178e1b4..f0e7551 100644
--- a/src/views/faceteach/FaceTeachStuSign.vue
+++ b/src/views/faceteach/FaceTeachStuSign.vue
@@ -139,7 +139,7 @@
{{ data.planDto?.teacher }}
- {{ cutOrgNamePath }}
+ {{useOrgName(teacherInfo.orgNamePath)}}
@@ -168,11 +168,6 @@ const returnclick = () => router.back();
const { query: { courseId }} = useRoute();
const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId, usePermission: true, });
-// 获取组织名称
-const cutOrgNamePath = computed(() => {
- let newName = data.value?.offcourseDto?.organizationNames;
- return useOrgName(newName);
-})
const teacherInfo = useUserInfo(computed(() => data.value?.planDto?.teacherId));
const isAllowSign = computed(() => dayjs().isBetween(dayjs(data.value?.planDto?.beginTime).subtract(data.value?.planDto?.beforeStart || 0, "minute"), dayjs(data.value?.planDto?.afterStart ? data.value?.planDto?.beginTime : data.value?.planDto?.endTime).add(data.value?.planDto?.afterStart || 0, "minute")));