diff --git a/.env b/.env index eb42ec7..8aaa1a9 100644 --- a/.env +++ b/.env @@ -13,5 +13,4 @@ VITE_BOE_PATH_DETAIL_URL=https://u-pre.boe.com/pc/forward?to=/fe-student VITE_BOE_API_URL=https://u-pre.boe.com -VITE_TASK_WHITE_TYPE=-8-,-12-,-13- -# VITE_TASK_WHITE_TYPE=-8-,-12- \ No newline at end of file +VITE_TASK_WHITE_TYPE=-8-,-12-,-13- \ No newline at end of file diff --git a/.env.prod b/.env.prod index 78afff3..c67c8a4 100644 --- a/.env.prod +++ b/.env.prod @@ -6,5 +6,3 @@ VITE_BOE_CASS_DETAIL_URL=https://u.boe.com/pc/case/detail?id= VITE_BOE_TEST_DETAIL_URL=https://u.boe.com/web/quizsummary?detailId= VITE_BOE_TEST_OUT_DETAIL_URL=https://u.boe.com/api/b1/tale/do-quiz?quizKid= VITE_BOE_EXAM_DETAIL_URL=https://u.boe.com/pc/exam/test?id= - -VITE_BOE_API_URL=https://u.boe.com \ No newline at end of file diff --git a/src/App.vue b/src/App.vue index 56ab90c..1ca2192 100644 --- a/src/App.vue +++ b/src/App.vue @@ -44,7 +44,7 @@ onMounted(() => { function getUserInfo() { boeRequest(GET_USER_INFO).then((res) => { - res.result.avatar = import.meta.env.VITE_BOE_API_URL + '/upload' + (res.result.avatar ? res.result.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png') + res.result.avatar = res.result.avatar ? res.result.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png' store.commit("SET_USER", res.result); }); } diff --git a/src/api/utils.js b/src/api/utils.js index c99a53a..a0938ce 100644 --- a/src/api/utils.js +++ b/src/api/utils.js @@ -21,7 +21,7 @@ export function useUserInfo(id) { watch(id, () => { id.value && boeRequest(GET_USER_LIST, {id: id.value}).then(res => { userInfo.value = res.result.userInfoList[0] - userInfo.value.avatar = `${import.meta.env.VITE_BOE_API_URL}/upload${userInfo.value.avatar?userInfo.value.avatar:'/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'}` + userInfo.value.avatar = userInfo.value.avatar?userInfo.value.avatar:'/800e23f7-b58c-4192-820d-0c6a2b7544cc.png' }) }) return userInfo diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 4f5a35f..9f9fe15 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -40,12 +40,12 @@ background: isAllowSign? data.signFlag ? '#999' : 'rgb(57, 146, 249)':'#999', }" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }} - + + {{ data.isSurvery ? "已评估" : "评估" }} +}" class="btn" @click="toSurvery">{{ data.isSurvery ? "已评估" : "评估" }} @@ -124,7 +124,7 @@
- {{ data.examinationDto?.examinationTestName }} + {{ data.examinationDto?.examinationName }}
diff --git a/src/views/liveBroadcast/LiveBroadcast.vue b/src/views/liveBroadcast/LiveBroadcast.vue index b04352c..566984c 100644 --- a/src/views/liveBroadcast/LiveBroadcast.vue +++ b/src/views/liveBroadcast/LiveBroadcast.vue @@ -55,9 +55,9 @@ background: `${new Date(data.liveStartTime).getTime() > new Date().getTime() ? '#999' : data.signFlag ? '#999' : 'rgb(57, 146, 249)'}`, }" @click="signClick">{{ data.signFlag ? "已签到" : "签到" }} - +
-
- {{ value.currentRatio }}% + {{ parseInt(value.currentRatio) }}%
diff --git a/src/views/roadmap/PathDetails.vue b/src/views/roadmap/PathDetails.vue index 40c8507..6b99c12 100644 --- a/src/views/roadmap/PathDetails.vue +++ b/src/views/roadmap/PathDetails.vue @@ -62,7 +62,7 @@
当前进度
-
- {{ value.currentRatio }}% + {{ parseInt(value.currentRatio) }}%