|
@@ -63,11 +63,18 @@ export default defineComponent({
|
|
|
state.listState.loading = false
|
|
|
state.listState.refreshing = false
|
|
|
const result = res.data || {}
|
|
|
+ console.log(result)
|
|
|
// 处理重复请求数据
|
|
|
if (state.list.length > 0 && result.current === 1) {
|
|
|
return
|
|
|
}
|
|
|
- state.list = state.list.concat(result.rows || [])
|
|
|
+
|
|
|
+ const rows = result.rows || []
|
|
|
+ rows.forEach((item: any) => {
|
|
|
+ item.subjectNameList = item.subjectNames ? item.subjectNames.split(',') : []
|
|
|
+ })
|
|
|
+
|
|
|
+ state.list = state.list.concat(rows || [])
|
|
|
state.listState.finished = result.current >= result.pages
|
|
|
state.params.page = result.current + 1
|
|
|
state.listState.dataShow = state.list.length > 0
|
|
@@ -91,6 +98,7 @@ export default defineComponent({
|
|
|
|
|
|
onMounted(() => {
|
|
|
getSubjects()
|
|
|
+ getList()
|
|
|
})
|
|
|
return () => (
|
|
|
<>
|
|
@@ -171,19 +179,21 @@ export default defineComponent({
|
|
|
{state.list.map((item: any) => (
|
|
|
<Cell center>
|
|
|
{{
|
|
|
- icon: () => <Image src={iconStudent} class={styles.img} />,
|
|
|
+ icon: () => <Image src={item.avatar || iconStudent} class={styles.img} />,
|
|
|
title: () => (
|
|
|
<div class={styles.userInfo}>
|
|
|
- <div class={styles.userName}>测试</div>
|
|
|
+ <div class={styles.userName}>{item.nickname}</div>
|
|
|
<div class={styles.subjectNames}>
|
|
|
- <Tag type="primary">长笛</Tag>
|
|
|
+ {item.subjectNameList.map((item: any) => (
|
|
|
+ <Tag type="primary">{item}</Tag>
|
|
|
+ ))}
|
|
|
</div>
|
|
|
</div>
|
|
|
),
|
|
|
value: () => (
|
|
|
<div class={styles.mins}>
|
|
|
<div class={styles.nums}>
|
|
|
- <span>70</span> 分钟
|
|
|
+ <span>{item.practiceTimes}</span> 分钟
|
|
|
</div>
|
|
|
<div class={styles.text}>练习时长</div>
|
|
|
</div>
|