|
|
@@ -52,7 +52,7 @@
|
|
|
|
|
|
<div class="section" v-if="courseViewType == 2">
|
|
|
<div v-for="(item, index) in toolsPackage" :key="index">
|
|
|
- <el-row class="option-row" style="padding-top: 0;" @click="onTrainChange(item)">
|
|
|
+ <el-row class="option-row" style="padding-top: 0;" @click.native="onTrainChange(item)">
|
|
|
<el-col :span="18">
|
|
|
<i class="check_default" :class="[item.isStatus ? 'check_active' : '']"></i>
|
|
|
<span style="display: flex; align-items: center;">
|
|
|
@@ -182,12 +182,14 @@
|
|
|
<span style="color: #1A1A1A" v-if="con.kitType == 'GROUP'">￥{{ Number((con.price - con.coupon).toFixed(2)) | moneyFormat }}</span>
|
|
|
</el-col>
|
|
|
</el-row>
|
|
|
- <van-row style="padding-left: 24px; padding-top: 8px; border-top: 1px solid #F0F0F0;" v-if="con.childGoodsList">
|
|
|
- <van-col span="24" style="font-size: 14px; color: #1A1A1A">赠送辅件</van-col>
|
|
|
- <van-col v-for="(child, index) in con.childGoodsList" :key="child.id">
|
|
|
- <span style="font-size: 12px; color: #aaaaaa;">{{ child.name }} {{con.childGoodsList.length - 1 == index ? '' : '、'}}</span>
|
|
|
- </van-col>
|
|
|
- </van-row>
|
|
|
+ <el-row style="padding-left: 24px; padding-top: 8px; border-top: 1px solid #F0F0F0;" v-if="con.childGoodsList && con.kitType == 'GROUP'">
|
|
|
+ <el-col :span="24" style="font-size: 14px; color: #1A1A1A">赠送辅件</el-col>
|
|
|
+ <el-col>
|
|
|
+ <span style="font-size: 12px; color: #aaaaaa;">
|
|
|
+ {{ con.childGoodsNames }}
|
|
|
+ </span>
|
|
|
+ </el-col>
|
|
|
+ </el-row>
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -322,7 +324,7 @@ export default {
|
|
|
toolsPackage: [{
|
|
|
isStatus: true,
|
|
|
name: '练习系统（六个月）',
|
|
|
- childGoodsList: [{ name: '同步乐团训练教程、五线谱跟播、演奏指法跟播、演奏速度自定义、任选小节循环播放、原音/伴奏一键切换' }]
|
|
|
+ childGoodsList: [{ name: '同步乐团训练教程，五线谱跟播、演奏指法跟播、任选小节循环播放、演奏速度自定义、原音/伴奏一键切换等。' }]
|
|
|
}], // 学习工具包
|
|
|
courseInfo: null, // 课程信息
|
|
|
musicGroupSubject: null, // 基本信息
|
|
|
@@ -484,6 +486,16 @@ export default {
|
|
|
kitType: single
|
|
|
}
|
|
|
}
|
|
|
+ let childGoodsNameList = []
|
|
|
+ if(tempItem.childGoodsList && tempItem.childGoodsList.length > 0) {
|
|
|
+ tempItem.childGoodsList.forEach(child => {
|
|
|
+ if(child.type == "ACCESSORIES") {
|
|
|
+ childGoodsNameList.push(child.name)
|
|
|
+ }
|
|
|
+ })
|
|
|
+
|
|
|
+ tempItem.childGoodsNames = childGoodsNameList.join(',')
|
|
|
+ }
|
|
|
this.instrumentResult.push(tempItem)
|
|
|
tempInstrument.push(tempItem)
|
|
|
}
|
|
|
@@ -512,10 +524,10 @@ export default {
|
|
|
}
|
|
|
tempInstrument.push(owned)
|
|
|
this.instrumentResult.push(owned)
|
|
|
-
|
|
|
let sorted = this.groupBy(tempInstrument, (item) => {
|
|
|
return [item.kitType];
|
|
|
});
|
|
|
+ console.log(sorted)
|
|
|
this.instrumentResultList = sorted
|
|
|
this.chargeTypeList.forEach(item => {
|
|
|
if(item.id == tempResult.musicGroup.chargeTypeId) {
|
|
|
@@ -607,6 +619,7 @@ export default {
|
|
|
},
|
|
|
onTrainChange(item) {
|
|
|
// 练习系统可选
|
|
|
+ // console.log(item)
|
|
|
item.isStatus = !item.isStatus
|
|
|
let courseShowInfo = this.courseShowInfo
|
|
|
courseShowInfo.forEach(course => {
|
|
|
@@ -687,6 +700,17 @@ export default {
|
|
|
let mgs = this.musicGroupSubject
|
|
|
let csi = this.courseInfo
|
|
|
// 加上判断是否有课程信息
|
|
|
+ // 如果为云教练系统则，没有课程费用
|
|
|
+ if(this.courseViewType == 2 && this.toolsPackage[0].isStatus) {
|
|
|
+ musicClassFee += parseFloat(this.cloudTeacherFee)
|
|
|
+ marketPrice += parseFloat(this.cloudTeacherFee)
|
|
|
+ // buyList.push({
|
|
|
+ // name: '器乐练习云教练',
|
|
|
+ // type: '6个月',
|
|
|
+ // childGoodsName: ['有效期说明：自开课之日起6个月内有效'],
|
|
|
+ // price: Number((this.cloudTeacherFee).toFixed(2))
|
|
|
+ // })
|
|
|
+ }
|
|
|
if (mgs) {
|
|
|
let tempCourse = this.courseShowInfo
|
|
|
// if (tempCourse.length > 0 && this.courseViewType == 1) {
|
