|
@@ -144,58 +144,62 @@ export default {
|
|
|
});
|
|
|
} else {
|
|
|
this.teamid = this.$route.query.id;
|
|
|
- findMusicGroupSubjectInfo({ musicGroupId: this.teamid }).then(
|
|
|
- (res) => {
|
|
|
- if (res.code == 200) {
|
|
|
- let activeSound = [];
|
|
|
- this.activeSoundList = res.data?.musicGroupSubjectPlans.map(
|
|
|
- (item) => {
|
|
|
- activeSound.push(item.subjectId);
|
|
|
- return {
|
|
|
- id: parseInt(item.subjectId),
|
|
|
- sound: item.subName,
|
|
|
- expectedStudentNum: item.expectedStudentNum,
|
|
|
- chioseMusic: [],
|
|
|
- markChioseList: [],
|
|
|
- goodsList: [],
|
|
|
- markList: [],
|
|
|
- };
|
|
|
- }
|
|
|
- );
|
|
|
- this.activeSound = activeSound;
|
|
|
- this.chioseActiveSound = activeSound;
|
|
|
- this.changeActiveSound(activeSound.join(","));
|
|
|
- // 格式化商品和教辅
|
|
|
+ if (this.teamid) {
|
|
|
|
|
|
- res.data.musicGroupSubjectGoodsGroups.forEach((shop) => {
|
|
|
- let index = findIndex(this.activeSoundList, (o) => {
|
|
|
- return o.id == shop.subjectId;
|
|
|
- });
|
|
|
|
|
|
- if (index != -1) {
|
|
|
- if (shop.type == "ACCESSORIES") {
|
|
|
- shop.goodsIdList.split(",").forEach((item) => {
|
|
|
- this.activeSoundList[index].markChioseList.push(
|
|
|
- parseInt(item)
|
|
|
+ findMusicGroupSubjectInfo({ musicGroupId: this.teamid }).then(
|
|
|
+ (res) => {
|
|
|
+ if (res.code == 200) {
|
|
|
+ let activeSound = [];
|
|
|
+ this.activeSoundList = res.data?.musicGroupSubjectPlans.map(
|
|
|
+ (item) => {
|
|
|
+ activeSound.push(item.subjectId);
|
|
|
+ return {
|
|
|
+ id: parseInt(item.subjectId),
|
|
|
+ sound: item.subName,
|
|
|
+ expectedStudentNum: item.expectedStudentNum,
|
|
|
+ chioseMusic: [],
|
|
|
+ markChioseList: [],
|
|
|
+ goodsList: [],
|
|
|
+ markList: [],
|
|
|
+ };
|
|
|
+ }
|
|
|
+ );
|
|
|
+ this.activeSound = activeSound;
|
|
|
+ this.chioseActiveSound = activeSound;
|
|
|
+ this.changeActiveSound(activeSound.join(","));
|
|
|
+ // 格式化商品和教辅
|
|
|
+
|
|
|
+ res.data.musicGroupSubjectGoodsGroups.forEach((shop) => {
|
|
|
+ let index = findIndex(this.activeSoundList, (o) => {
|
|
|
+ return o.id == shop.subjectId;
|
|
|
+ });
|
|
|
+
|
|
|
+ if (index != -1) {
|
|
|
+ if (shop.type == "ACCESSORIES") {
|
|
|
+ shop.goodsIdList.split(",").forEach((item) => {
|
|
|
+ this.activeSoundList[index].markChioseList.push(
|
|
|
+ parseInt(item)
|
|
|
+ );
|
|
|
+ });
|
|
|
+ } else if (shop.type == "INSTRUMENT") {
|
|
|
+ // 商品
|
|
|
+ let typeJson = Object.keys(
|
|
|
+ JSON.parse(shop.kitGroupPurchaseTypeJson)
|
|
|
);
|
|
|
- });
|
|
|
- } else if (shop.type == "INSTRUMENT") {
|
|
|
- // 商品
|
|
|
- let typeJson = Object.keys(
|
|
|
- JSON.parse(shop.kitGroupPurchaseTypeJson)
|
|
|
- );
|
|
|
- this.activeSoundList[index].chioseMusic.push({
|
|
|
- musical: parseInt(shop.goodsIdList),
|
|
|
- type: typeJson,
|
|
|
- groupPrice: shop.price,
|
|
|
- borrowPrice: shop.depositFee,
|
|
|
- });
|
|
|
+ this.activeSoundList[index].chioseMusic.push({
|
|
|
+ musical: parseInt(shop.goodsIdList),
|
|
|
+ type: typeJson,
|
|
|
+ groupPrice: shop.price,
|
|
|
+ borrowPrice: shop.depositFee,
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- });
|
|
|
+ });
|
|
|
+ }
|
|
|
}
|
|
|
- }
|
|
|
- );
|
|
|
+ );
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
});
|