|
@@ -11,7 +11,7 @@ import styles from './index.module.less'
|
|
|
import OSticky from '@/components/o-sticky'
|
|
|
import OSearch from '@/components/o-search'
|
|
|
import OHeader from '@/components/o-header'
|
|
|
-import { getInstrumentName } from '@/constant/instruments'
|
|
|
+// import { getInstrumentName } from '@/constant/instruments'
|
|
|
import { browser } from '@/helpers/utils'
|
|
|
|
|
|
export default defineComponent({
|
|
@@ -106,16 +106,18 @@ export default defineComponent({
|
|
|
const v1: any = data.musicTree
|
|
|
//.find((n: any) => n.id == route.query.categorieid)
|
|
|
if (Array.isArray(v1)) {
|
|
|
- const list = v1.map((m: any) => {
|
|
|
- if (!data.value1) {
|
|
|
- data.value1 = m.id
|
|
|
+ const list = [{ text: '全部级别', value: null }].concat(
|
|
|
+ v1.map((m: any) => {
|
|
|
+ // if (!data.value1) {
|
|
|
+ data.value1 = null
|
|
|
data.value2 = null
|
|
|
- }
|
|
|
- return {
|
|
|
- text: m.name,
|
|
|
- value: m.id
|
|
|
- }
|
|
|
- })
|
|
|
+ // }
|
|
|
+ return {
|
|
|
+ text: m.name,
|
|
|
+ value: m.id
|
|
|
+ }
|
|
|
+ })
|
|
|
+ )
|
|
|
return list
|
|
|
}
|
|
|
return []
|
|
@@ -128,7 +130,7 @@ export default defineComponent({
|
|
|
const v2: any = v1?.find((n: any) => n.id == data.value1)
|
|
|
|
|
|
if (Array.isArray(v2?.musicSheetCategoriesList)) {
|
|
|
- const list = [{ text: '全部', value: null }].concat(
|
|
|
+ const list = [{ text: '全部类型', value: null }].concat(
|
|
|
v2.musicSheetCategoriesList.map((m: any) => {
|
|
|
return {
|
|
|
text: m.name,
|
|
@@ -139,7 +141,7 @@ export default defineComponent({
|
|
|
return list
|
|
|
}
|
|
|
}
|
|
|
- return [{ text: '全部', value: null }]
|
|
|
+ return [{ text: '全部类型', value: null }]
|
|
|
})
|
|
|
|
|
|
const getList = async () => {
|
|
@@ -148,7 +150,7 @@ export default defineComponent({
|
|
|
const bodyData: any = {
|
|
|
...data.pagenation,
|
|
|
keyword: data.keyword,
|
|
|
- musicSheetCategoriesId: data.value2 || data.value1,
|
|
|
+ musicSheetCategoriesId: data.value2 || data.value1 || route.query.categorieid,
|
|
|
status: 1
|
|
|
}
|
|
|
if (state.platformType == 'TEACHER') {
|