|
@@ -81,7 +81,7 @@ export default defineComponent({
|
|
const activeItem = computed(() => {
|
|
const activeItem = computed(() => {
|
|
const list = state.list[state.listActive] || {}
|
|
const list = state.list[state.listActive] || {}
|
|
const mp3 = {
|
|
const mp3 = {
|
|
- GYT: list?.metronomeUrl || list?.audioFileUrl,
|
|
|
|
|
|
+ GYT: list?.audioFileUrl,
|
|
GYM: list?.musicSheetType === "CONCERT" ? list?.metronomeUrl : list?.metronomeMp3Url || list?.mp3Url,
|
|
GYM: list?.musicSheetType === "CONCERT" ? list?.metronomeUrl : list?.metronomeMp3Url || list?.mp3Url,
|
|
KLX: ""
|
|
KLX: ""
|
|
}
|
|
}
|
|
@@ -269,6 +269,7 @@ export default defineComponent({
|
|
musicSubject: state.subjectId === -1 ? null : state.subjectId,
|
|
musicSubject: state.subjectId === -1 ? null : state.subjectId,
|
|
musicSheetCategoriesId: state.typeId === -1 ? state.levelId : state.typeId,
|
|
musicSheetCategoriesId: state.typeId === -1 ? state.levelId : state.typeId,
|
|
keyword: state.queryStr,
|
|
keyword: state.queryStr,
|
|
|
|
+ detailFlag: true,
|
|
status: 1
|
|
status: 1
|
|
}
|
|
}
|
|
console.log(state.typeId, state.levelId, "level")
|
|
console.log(state.typeId, state.levelId, "level")
|
|
@@ -306,7 +307,7 @@ export default defineComponent({
|
|
}).then(res => {
|
|
}).then(res => {
|
|
loading.value = false
|
|
loading.value = false
|
|
if (res.code === 200) {
|
|
if (res.code === 200) {
|
|
- storeData.value = res.data || []
|
|
|
|
|
|
+ state.categoryList = res.data || []
|
|
|
|
|
|
setDefaultData()
|
|
setDefaultData()
|
|
}
|
|
}
|
|
@@ -316,14 +317,14 @@ export default defineComponent({
|
|
const handleGetSubject_klx = async () => {
|
|
const handleGetSubject_klx = async () => {
|
|
loading.value = true
|
|
loading.value = true
|
|
await httpAjaxErrMsg(querySubjectIds_klx, {
|
|
await httpAjaxErrMsg(querySubjectIds_klx, {
|
|
- enableFlag: true,
|
|
|
|
|
|
+ queryType: "list",
|
|
page: 1,
|
|
page: 1,
|
|
rows: 100
|
|
rows: 100
|
|
}).then(res => {
|
|
}).then(res => {
|
|
loading.value = false
|
|
loading.value = false
|
|
if (res.code === 200) {
|
|
if (res.code === 200) {
|
|
- const result = res.data || []
|
|
|
|
-
|
|
|
|
|
|
+ const result = res.data?.rows || []
|
|
|
|
+ console.log(res, "res")
|
|
state.subjectList = result.map((item: any) => {
|
|
state.subjectList = result.map((item: any) => {
|
|
return {
|
|
return {
|
|
label: item.name,
|
|
label: item.name,
|
|
@@ -530,23 +531,23 @@ export default defineComponent({
|
|
}
|
|
}
|
|
|
|
|
|
const initCategories_klx = (type?: "first" | "category" | "level" | "type") => {
|
|
const initCategories_klx = (type?: "first" | "category" | "level" | "type") => {
|
|
- // if (storeData.value.length > 0 && !["level", "type"].includes(type as any)) {
|
|
|
|
- // let result: any = []
|
|
|
|
- // if (type === "first" && state.firstTreeId) {
|
|
|
|
- // result = storeData.value.find((item: any) => item.id === state.firstTreeId)?.musicSheetCategoriesList || []
|
|
|
|
- // } else {
|
|
|
|
- // state.firstTreeId = storeData.value[0]?.id
|
|
|
|
- // result = storeData.value[0]?.musicSheetCategoriesList || []
|
|
|
|
- // }
|
|
|
|
- // console.log(result, "result -----")
|
|
|
|
- // state.levelList = result.map((item: any) => {
|
|
|
|
- // return {
|
|
|
|
- // label: item.name,
|
|
|
|
- // value: item.id,
|
|
|
|
- // musicSheetCategoriesList: item.musicSheetCategoriesList || []
|
|
|
|
- // }
|
|
|
|
- // })
|
|
|
|
- // }
|
|
|
|
|
|
+ if (state.categoryList.length > 0 && !["level", "type"].includes(type as any)) {
|
|
|
|
+ let result: any = []
|
|
|
|
+ if (type === "category" && state.categoryId) {
|
|
|
|
+ result = state.categoryList.find((item: any) => item.id === state.categoryId)?.musicSheetCategoriesList || []
|
|
|
|
+ } else {
|
|
|
|
+ state.categoryId = state.categoryList[0]?.id
|
|
|
|
+ result = state.categoryList[0]?.musicSheetCategoriesList || []
|
|
|
|
+ }
|
|
|
|
+ console.log(result, "result -----")
|
|
|
|
+ state.levelList = result.map((item: any) => {
|
|
|
|
+ return {
|
|
|
|
+ label: item.name,
|
|
|
|
+ value: item.id,
|
|
|
|
+ musicSheetCategoriesList: item.musicSheetCategoriesList || []
|
|
|
|
+ }
|
|
|
|
+ })
|
|
|
|
+ }
|
|
// if (state.levelList.length > 0) {
|
|
// if (state.levelList.length > 0) {
|
|
// let result: any = []
|
|
// let result: any = []
|
|
// if (type === "level" && state.levelId) {
|
|
// if (type === "level" && state.levelId) {
|