diff --git a/src/pages/course/components/talkingItem.vue b/src/pages/course/components/talkingItem.vue
index f93874d6..6c6d77cd 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)
},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 +714,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 +726,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/search/result.vue b/src/pages/search/result.vue
index 87bb2d3c..814dd047 100644
--- a/src/pages/search/result.vue
+++ b/src/pages/search/result.vue
@@ -21,14 +21,15 @@
{{ hasMore ? '滚动加载更多' : '加载完成' }}
- 暂无数据
+
+ 暂无数据
-
+
@@ -58,6 +59,9 @@
+
+ {{ hasMore ? '滚动加载更多' : '加载完成' }}
+
暂无数据
@@ -219,22 +223,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 +273,53 @@ 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' : '00', //00 首页搜索 01课程搜索
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 || [])
}
+
+ 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(() => {