diff --git a/.env.development b/.env.development
index c6ea9765..781bd773 100644
--- a/.env.development
+++ b/.env.development
@@ -9,22 +9,26 @@ ENV = 'development'
VITE_APP_BASE_API_Url = 'https://aitstest.jlbank.com.cn:7001'
# app入口
-#VITE_APP_BASE_API_Url = 'http://25.16.122.65:7002'
+#VITE_APP_BASE_API_Url = 'http://25.16.122.65:7001'
#VITE_APP_BASE_API_Url = 'http://25.16.122.91:9786'
#VITE_APP_BASE_API_Url = 'http://25.18.122.66:9786'
# h5专用地址
+
VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001'
#VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7002'
# sit
#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
-#VITE_APP_BASE_H5_API_Url = 'http://25.18.122.116:7001'
+
+# sit
+# VITE_APP_BASE_H5_API_Url = 'http://25.18.122.91:9786'
# 任东
# VITE_APP_BASE_H5_API_Url_TRAAPP = 'http://25.64.16.130:9601'
# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.130:9602'
+
# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.130:9604'
# 张建成
# VITE_APP_BASE_H5_API_Url_TRAASK = 'http://25.64.16.144:9605'
@@ -35,4 +39,6 @@ VITE_APP_BASE_H5_API_Url = 'https://aitstest.jlbank.com.cn:7001'
# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.143:9604'
# 孙宇
# VITE_APP_BASE_H5_API_Url_TRAEXAM = 'http://25.64.16.139:9604'
+# 付丙鑫
+# VITE_APP_BASE_H5_API_Url_TRASTUDY = 'http://25.64.16.145:9602'
diff --git a/src/api/common.js b/src/api/common.js
index 0668c917..5fc53db5 100644
--- a/src/api/common.js
+++ b/src/api/common.js
@@ -144,7 +144,7 @@ export function downloadVoiceFile(url) {
};
if (token)
header['summary'] = token
- let baseUrl = get_base_url();
+ let baseUrl = get_base_url(url);
return new Promise((resolve, reject) => {
uni.downloadFile({
url: `${baseUrl}${url}`,
diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index f93874d6..081cf3b1 100644
--- a/src/pages/course/components/talkingItem.vue
+++ b/src/pages/course/components/talkingItem.vue
@@ -31,9 +31,19 @@
+
+
+ 参考答案：{{ dataInfo.itemAnswer }}
+
+
+
+
+
+
+
- {{ showContent }}
+ {{type === 5?'试题解析：':''}}{{ showContent }}
@@ -53,16 +63,6 @@
-
-
-
-
-
-
-
-
- 参考答案：{{ dataInfo.itemAnswer }}
-
举例：{{ dataInfo.exampie }}
@@ -70,11 +70,11 @@
-
+
-
+
storageStore.audioObj)
else if(props.type === 3) return unref(dataInfo)?.chatContent || unref(dataInfo)?.pgrphContent
else if(props.type === 4) return unref(dataInfo)?.chatContent || unref(dataInfo)?.qnsContent
else if(props.type === 5) return unref(dataInfo)?.chatContent || unref(dataInfo)?.analyContent
+ else if(props.type === 8) return unref(subjectInfo)?.chatContent || unref(subjectInfo)?.qnsContent
else if(props.type === 9) return unref(dataInfo)?.chatContent || unref(dataInfo)?.analyContent
else if(props.type === 0) return unref(dataInfo)?.chatContent || unref(dataInfo)?.talkingContent
else return unref(dataInfo)?.chatContent || unref(dataInfo)?.talkingContent
@@ -434,8 +435,18 @@ const audioCacheObj = computed(() => storageStore.audioObj)
},100)
}else{
voiceLoading.value = true
- let _type = props.type == 2 ? 'ans' : props.type == 3 ? 'pgrh' : props.type == 4 ? 'qns' : ''
- let _readId = props.type == 2 ? unref(dataInfo)?.intrctId : props.type == 3 ? unref(dataInfo)?.pgrphId : props.type == 4 ? unref(dataInfo)?.qnsId : ''
+ let _type = props.type == 2 ? 'ans'
+ : props.type == 3 ? 'pgrh'
+ : props.type == 4 ? 'qns'
+ : props.type == 5 ? 'analysis'
+ : props.type == 8 ? 'stemAnalysis'
+ : ''
+ let _readId = props.type == 2 ? unref(dataInfo)?.intrctId
+ : props.type == 3 ? unref(dataInfo)?.pgrphId
+ : props.type == 4 ? unref(dataInfo)?.qnsId
+ : props.type == 5 ? unref(dataInfo)?.qnsId
+ : props.type == 8 ? unref(dataInfo)?.qnsId
+ : ''
let _params = {
crsId: unref(dataInfo)?.crsId || '',
pgrphId: unref(dataInfo)?.pgrphId || '',
@@ -704,10 +715,10 @@ const audioCacheObj = computed(() => storageStore.audioObj)
}
.next-learn-btn{
float: left;
- padding: 0 60rpx 0 20rpx;
+ padding: 0 60rpx 0 15rpx;
height: 62rpx;
line-height: 62rpx;
- font-size: 30rpx;
+ font-size: 28rpx;
background-color: #06f;
color: #fff;
border-radius: 8rpx;
@@ -716,6 +727,7 @@ const audioCacheObj = computed(() => storageStore.audioObj)
position: relative;
&.replay-study-btn{
float: right;
+ margin-right: 0;
}
&.restart{
background-color: #eaf2ff;
diff --git a/src/pages/course/index.vue b/src/pages/course/index.vue
index d164e13b..25652b4a 100644
--- a/src/pages/course/index.vue
+++ b/src/pages/course/index.vue
@@ -514,12 +514,13 @@ import { onShow } from "@dcloudio/uni-app"
}
.model-filter-list{
position: fixed;
- width: 100vw;
- height: 100vh;
+ width: calc(100vw - 33rpx);
+ height: 80vh;
overflow: hidden;
- top: 0;
- left: 0;
+ top: 500rpx;
+ left: 17rpx;
z-index: 1;
+ background-color: rgba(0,0,0,.2);
}
.filter-list,
.model-filter-list{
diff --git a/src/pages/examRanking/index.vue b/src/pages/examRanking/index.vue
index 3ce91832..63a10c70 100644
--- a/src/pages/examRanking/index.vue
+++ b/src/pages/examRanking/index.vue
@@ -35,6 +35,7 @@
{{item.examGrade}}
+ 暂无数据
diff --git a/src/pages/search/result.vue b/src/pages/search/result.vue
index 49cf01b5..5e3bf419 100644
--- a/src/pages/search/result.vue
+++ b/src/pages/search/result.vue
@@ -21,14 +21,15 @@
{{ hasMore ? '滚动加载更多' : '加载完成' }}
- 暂无数据
+
+ 暂无数据
-
+
@@ -58,6 +59,9 @@
+
+ {{ hasMore ? '滚动加载更多' : '加载完成' }}
+
暂无数据
@@ -68,6 +72,9 @@
+
+ {{ hasMore ? '滚动加载更多' : '加载完成' }}
+
暂无数据
@@ -86,6 +93,9 @@
+
+ {{ hasMore ? '滚动加载更多' : '加载完成' }}
+
暂无数据
@@ -150,7 +160,7 @@ const tabList = ref([
])
const abilityListShow = computed(() => {
if (searchValue.value) {
- let _arr = abilityList.value.filter(t => t.title.includes(searchValue.value))
+ let _arr = abilityList.value.filter(t => t.title.includes(searchValue.value.toUpperCase()))
let _sum = 4 - (_arr.length % 4)
if (_sum !== 4) {
for (let i = 0; i < _sum; i++) {
@@ -219,22 +229,29 @@ const changeTab = item => {
if (!item) return
activeTab.value = item.type
console.log(item)
- switch (item.name) {
+ switch (item.type) {
case 'all':
+ pageInfo.value.limit = 3
break
case 'ability':
break
case 'course':
+ pageInfo.value.limit = 15
break
case 'task':
+ pageInfo.value.limit = 15
break
case 'test':
+ pageInfo.value.limit = 15
break
case 'exam':
+ pageInfo.value.limit = 15
break
default:
+ pageInfo.value.limit = 3
break
}
+ getData(1)
}
const clickAbility = item => {
if (item.isTab) {
@@ -262,23 +279,55 @@ const search = () => {
getData(1)
}
+const getMore = () => {
+ if(activeTab.value && activeTab.value !== 'all'){
+ getData()
+ }
+}
const getData = (flag = null) => {
if (flag) {
pageInfo.value.page = 1
courseList.value = []
+ examList.value = []
+ taskList.value = []
}
+ let _isCourse = fromType.value === 'course' || activeTab.value==='course'
appSearchCrsApi({
- type: fromType.value === 'course' ? '01' : '00', //00 首页搜索 01课程搜索
+ type: _isCourse ? '01'
+ : activeTab.value==='exam' ? '02'
+ : activeTab.value==='task' ? '03'
+ : '00', //00 首页搜索 01课程搜索 '02' 考试搜索 '03' 任务搜索
searchName: searchValue.value,
page: pageInfo.value.page,
limit: pageInfo.value.limit
}).then(res => {
- pageInfo.value.total = res.total || 0
courseList.value = courseList.value.concat(res.body.traCrsInfoVoList || [])
if (fromType.value !== 'course') {
- examList.value = res.body.traExamPapersExtVoList || []
- taskList.value = res.body.traTaskInfoExtVoList || []
+ examList.value = examList.value.concat(res.body.traExamPapersExtVoList || [])
+ taskList.value = taskList.value.concat(res.body.traTaskInfoExtVoList || [])
}
+ pageInfo.value.total = res.total || 0
+ // switch (activeTab.value) {
+ // case 'all':
+ // break
+ // case 'ability':
+ // break
+ // case 'course':
+ // pageInfo.value.total = res.total || 0
+ // break
+ // case 'task':
+ // pageInfo.value.total = res.total || 0
+ // break
+ // case 'test':
+ // pageInfo.value.total = res.total || 0
+ // break
+ // case 'exam':
+ // pageInfo.value.total = res.total || 0
+ // break
+ // default:
+ // pageInfo.value.total = res.total || 0
+ // break
+ // }
})
}
const hasMore = computed(() => {
@@ -319,6 +368,7 @@ const toCourseDetail = item => {
height: 100rpx;
line-height: 100rpx;
color: #999;
+ font-size: 26rpx;
}
.view-tips {
width: 100%;