|
|
@@ -267,7 +267,6 @@
|
|
|
</div>
|
|
|
<!-- && (courseScheduleStatus || musicGroupSubject.fee > 0) -->
|
|
|
<div class="section"
|
|
|
- style="padding: 0"
|
|
|
v-if="courseScheduleInfo ">
|
|
|
<h2 class="title"
|
|
|
style="padding: 0 16px;">乐团课程</h2>
|
|
|
@@ -425,6 +424,23 @@
|
|
|
</template>
|
|
|
|
|
|
</div>
|
|
|
+ <div class="option"
|
|
|
+ v-if="(con.mode.isNull)"
|
|
|
+ @click="con.chiosetype='Null'">
|
|
|
+ <!-- :class="[ con.checked ? 'check_active' : '' ]" -->
|
|
|
+ <div class="o_">
|
|
|
+ <i class="check_default"
|
|
|
+ :class="[ con.chiosetype=='Null'&&con.checked ? 'check_active' : '' ]"></i>
|
|
|
+ </div>
|
|
|
+ <div class="o_bd">自备</div>
|
|
|
+ <template>
|
|
|
+ <!-- <span class="o_ft">
|
|
|
+ 押金:￥{{ (con.mode.depositFee).toFixed(2) }}
|
|
|
+ </span> -->
|
|
|
+ </template>
|
|
|
+
|
|
|
+ </div>
|
|
|
+
|
|
|
<!-- v-if="con.marketPrice" -->
|
|
|
<div class="configuration"
|
|
|
v-if="(con.mode.isLEASE)">
|
|
|
@@ -1093,8 +1109,7 @@ export default {
|
|
|
}
|
|
|
this.courseScheduleInfo = tempInfo;
|
|
|
});
|
|
|
- // console.log(this.$store.getters.payList)
|
|
|
- // console.log(this.$store.getters.checkinfo)
|
|
|
+
|
|
|
|
|
|
let type = this.topfor.type;
|
|
|
// 判断进来的乐团状态
|
|
|
@@ -1220,10 +1235,10 @@ export default {
|
|
|
let isJihua = true;
|
|
|
let isMusic = true;
|
|
|
this.activeSoundList.forEach(item => {
|
|
|
- if (!item.jihua) {
|
|
|
+ if (item && !item.jihua) {
|
|
|
isJihua = false;
|
|
|
}
|
|
|
- if (!item.yuji) {
|
|
|
+ if (item && !item.yuji) {
|
|
|
isMusic = false;
|
|
|
}
|
|
|
})
|
|
|
@@ -1231,7 +1246,7 @@ export default {
|
|
|
this.$message.error('请填写预计招生人数')
|
|
|
return
|
|
|
}
|
|
|
- if (!item.yuji) {
|
|
|
+ if (!isMusic) {
|
|
|
this.$message.error('请填写乐团课程费用')
|
|
|
return
|
|
|
}
|
|
|
@@ -1643,7 +1658,7 @@ export default {
|
|
|
}
|
|
|
}
|
|
|
}
|
|
|
- console.log(row)
|
|
|
+
|
|
|
this.editSound = row;
|
|
|
this.reductionVisible = true;
|
|
|
},
|
|
|
@@ -1661,7 +1676,6 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
groupCourseInput (item) {
|
|
|
- console.log(item)
|
|
|
let mode = item.mode
|
|
|
if (mode.yuji - mode.courseGroup < 0) {
|
|
|
mode.courseGroup = mode.yuji
|
|
|
@@ -1685,7 +1699,11 @@ export default {
|
|
|
this.calcPrice()
|
|
|
},
|
|
|
setChioseMusic (row) {
|
|
|
+ let flag = true;
|
|
|
row.fangshi.forEach(item => {
|
|
|
+ if (item.id == -1) {
|
|
|
+ flag = false;
|
|
|
+ }
|
|
|
if (item.mode.isGROUP) {
|
|
|
item.chiosetype = 'GROUP'
|
|
|
item.checked = true
|
|
|
@@ -1703,7 +1721,28 @@ export default {
|
|
|
row.markList.forEach(item => {
|
|
|
item.checked = true
|
|
|
})
|
|
|
- console.log(row.markList)
|
|
|
+ if (flag) {
|
|
|
+ row.fangshi.push({
|
|
|
+ checked: false,
|
|
|
+ id: -1,
|
|
|
+ mode: {
|
|
|
+ isFREE: false,
|
|
|
+ isGROUP: false,
|
|
|
+ isLEASE: false,
|
|
|
+ isNull: true,
|
|
|
+ yuji: 0,
|
|
|
+ FREE: 0,
|
|
|
+ GROUP: 0,
|
|
|
+ LEASE: 0,
|
|
|
+ courseGroup: 0,
|
|
|
+ courseLease: 0,
|
|
|
+ depositFee: 0,
|
|
|
+ marketPrice: 0,
|
|
|
+ price: 0
|
|
|
+ },
|
|
|
+ shopName: "自备"
|
|
|
+ })
|
|
|
+ }
|
|
|
},
|
|
|
onAuxiliarie (item) {
|
|
|
// 辅件切换状态
|
|
|
@@ -2069,7 +2108,7 @@ export default {
|
|
|
}
|
|
|
.nowMoney {
|
|
|
height: 50px;
|
|
|
- border-top: 1px solid #eaeaea;
|
|
|
+ // border-top: 1px solid #eaeaea;
|
|
|
border-bottom: 1px solid #eaeaea;
|
|
|
line-height: 50px;
|
|
|
text-align: right;
|
|
|
@@ -2401,7 +2440,8 @@ export default {
|
|
|
}
|
|
|
&.lines {
|
|
|
margin-top: 5px;
|
|
|
- border-top: 1px solid #ededed;
|
|
|
+ // border-top: 1px solid #ededed;
|
|
|
+ border-bottom: 1px solid #ededed;
|
|
|
}
|
|
|
&.sale {
|
|
|
.option {
|
