diff --git a/.env.development b/.env.development
index 5b24174e..87a63ae8 100644
--- a/.env.development
+++ b/.env.development
@@ -26,7 +26,7 @@ VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
# dev
# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.65:7001'
# sit
-#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
+VITE_APP_BASE_H5_API_Url = 'http://25.18.122.92:9786'
# UAT
# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.78:9786'
diff --git a/src/api/request.js b/src/api/request.js
index be358012..cda6bc54 100644
--- a/src/api/request.js
+++ b/src/api/request.js
@@ -21,7 +21,7 @@ export const get_base_url = (url = '') => {
// #endif
} else { // 其他环境,包括生产环境,sit环境,uat环境
return ENV.VITE_APP_BASE_API_Url
-
+
}
}
@@ -46,7 +46,7 @@ export const goto_login_fun = (from = 'http') => {
if (page_route === 'pages/login/login') return;
common.hideLoading()
common.show('未登录', '现在去登录', false).then(() => {
- common.navigateTo('/pages/login/login')
+ // common.navigateTo('/pages/login/login')
if (from === 'socket' && page_route !== '') {
common.redirectTo('/pages/login/login?path=' + page_route)
} else {
diff --git a/src/pages/course/components/chartFive.vue b/src/pages/course/components/chartFive.vue
index 327b21e0..b43d42ed 100644
--- a/src/pages/course/components/chartFive.vue
+++ b/src/pages/course/components/chartFive.vue
@@ -18,7 +18,7 @@
- {{ item.gradeDimens || item.gradeDimensName }}
+ {{ item.gradeDimensName || item.gradeDimens }}
{{ item.anlyGrade }}
diff --git a/src/pages/course/components/chartFour.vue b/src/pages/course/components/chartFour.vue
index 17d70295..3b2130db 100644
--- a/src/pages/course/components/chartFour.vue
+++ b/src/pages/course/components/chartFour.vue
@@ -17,7 +17,7 @@
- {{ item.gradeDimensName }}
+ {{ item.gradeDimensName || item.gradeDimens }}
{{ item.anlyGrade }}
diff --git a/src/pages/course/components/chartThree.vue b/src/pages/course/components/chartThree.vue
index 44e0160a..d96b33ac 100644
--- a/src/pages/course/components/chartThree.vue
+++ b/src/pages/course/components/chartThree.vue
@@ -20,7 +20,7 @@
- {{ item.gradeDimensName }}
+ {{ item.gradeDimensName || item.gradeDimens }}
{{ item.anlyGrade }}
diff --git a/src/pages/course/study.vue b/src/pages/course/study.vue
index 8411859e..29dbb772 100644
--- a/src/pages/course/study.vue
+++ b/src/pages/course/study.vue
@@ -671,7 +671,7 @@ const initsocketTask = () => {
}
} else {
// if(['0005', 'QQ0005'].includes(res.rtnCode)) {
- // goto_login_fun();
+ // goto_login_fun('socket');
// }
}
})
@@ -722,6 +722,7 @@ const changeAppHeightBottom = height => {
// #endif
}
onHide(() => {
+ console.log('onHide')
//#ifdef APP-PLUS
uni.offKeyboardHeightChange(setHeight)
// #endif
@@ -733,6 +734,7 @@ onHide(() => {
// }).finally(() => {})
})
onShow(() => {
+ console.log('onShow')
//#ifdef APP-PLUS
uni.onKeyboardHeightChange(setHeight)
// #endif
@@ -742,6 +744,7 @@ onShow(() => {
})
const watchFlag = ref(1)
onUnload(() => {
+ console.log('onUnload')
socketStore.closeSocket()
changePlayItemId('')
console.log(typeof teacherVoiceObj);