|
@@ -659,7 +659,7 @@ export default {
|
|
|
"isShowMusicCourseForPay",
|
|
|
res.data?.calender?.paymentItemShowState?.isShowMusicCourseForPay
|
|
|
);
|
|
|
- if (res.data.member) {
|
|
|
+ if (res.data.member && res.data.member.length > 0) {
|
|
|
// 团练保
|
|
|
this.member = true;
|
|
|
|
|
@@ -1217,10 +1217,13 @@ export default {
|
|
|
const calenderMember = []
|
|
|
tempMemberList.forEach(item => {
|
|
|
const { memberRankSettingId, ...more } = item
|
|
|
- calenderMember.push({
|
|
|
- ...more,
|
|
|
- memberRankSettingId: memberRankSettingId.length > 0 ? memberRankSettingId[memberRankSettingId.length - 1] : null
|
|
|
- })
|
|
|
+ if(memberRankSettingId) {
|
|
|
+ calenderMember.push({
|
|
|
+ ...more,
|
|
|
+ memberRankSettingId: memberRankSettingId.length > 0 ? memberRankSettingId[memberRankSettingId.length - 1] : null
|
|
|
+ })
|
|
|
+ }
|
|
|
+
|
|
|
})
|
|
|
return {
|
|
|
payUserType: this.$route.query.payUserType,
|
|
@@ -1240,7 +1243,7 @@ export default {
|
|
|
// this.form.memberList[0]?.memberRankSettingId
|
|
|
// ? { ...this.form.memberList[0] }
|
|
|
// : null,
|
|
|
- calenderMemberList: calenderMember.length > 0 ? calenderMember : [],
|
|
|
+ calenderMemberList: calenderMember.length > 0 ? calenderMember : null,
|
|
|
musicGroupPaymentCalenderCourseSettingsList:
|
|
|
this.form.eclass?.length > 0 ? this.form.eclass : null,
|
|
|
musicGroupId: this.$route.query.id,
|
|
@@ -1261,10 +1264,12 @@ export default {
|
|
|
const calenderMember = []
|
|
|
tempMemberList.forEach(item => {
|
|
|
const { memberRankSettingId, ...more } = item
|
|
|
- calenderMember.push({
|
|
|
- ...more,
|
|
|
- memberRankSettingId: memberRankSettingId.length > 0 ? memberRankSettingId[memberRankSettingId.length - 1] : null
|
|
|
- })
|
|
|
+ if(memberRankSettingId) {
|
|
|
+ calenderMember.push({
|
|
|
+ ...more,
|
|
|
+ memberRankSettingId: memberRankSettingId.length > 0 ? memberRankSettingId[memberRankSettingId.length - 1] : null
|
|
|
+ })
|
|
|
+ }
|
|
|
})
|
|
|
return {
|
|
|
payUserType: this.$route.query.payUserType,
|
|
@@ -1284,7 +1289,7 @@ export default {
|
|
|
// this.form.memberList[0]?.memberRankSettingId
|
|
|
// ? { ...this.form.memberList[0] }
|
|
|
// : null,
|
|
|
- calenderMemberList: calenderMember.length > 0 ? calenderMember : [],
|
|
|
+ calenderMemberList: calenderMember.length > 0 ? calenderMember : null,
|
|
|
musicGroupPaymentCalenderCourseSettingsList:
|
|
|
this.form.eclass?.length > 0 ? this.form.eclass : null,
|
|
|
musicGroupId: this.$route.query.id,
|