修改预览

src/views/resetTeaming/modals/subject-preview.vue

@@ -6,7 +6,7 @@
 			2、为避免因部分已注册家长放弃名额导致乐团声部失衡，系统设定各声部限额放大20%比例开放注册，系统自动按照完全完成注册的先后顺序确认录取名单，因此，超员后有可能出现无法注册的情况，请您理解。如果其他声部仍有名额，在您孩子的身体条件适合该乐器的前提下，我们将优先予以调配。
 		</div>
 
-        <template v-if="courseViewType == 2 || courseViewType == 3">
+        <template v-if="courseViewType == 1">
 			<h2 class="title" >学习工具包</h2>
 			<div class="yunTrain">
 				<img :src="trainBg" />
@@ -19,38 +19,13 @@
 			</div>
 		</template>
 
-		<template v-if="courseViewType == 1 && courseShowInfo.length > 0">
-			<div class="yunTrain" style="margin-top: 12px;">
-				<img :src="trainBg" />
-				<div class="toolText">
-					<p class="toolTitle">服务</p>
-					<p class="toolDate" v-if="serviceValidDate">服务有效期:{{ serviceValidDate }}</p>
-				</div>
-			</div>
-		</template>
-
 		<h2 class="titles" style="margin-top: 12px;" v-if="courseViewType == 0">
 			<img :src="trainSmallBg" />
 			<span>乐团课程</span>
 		</h2>
 		<template class="section">
-			<!-- 所有不可选的课程合集 -->
-			<div class="section" v-if="courseShowStatus && courseViewType == 1">
-				<el-row class="option-row"  v-for="(item, index) in courseShowInfo" :class="[!item.isStudentOptional ? 'disabled' : '']" :key="index" @click.native="onCourseChange(item)">
-					<el-col :span="16">
-						<i class="check_default" :class="[item.isStatus ? 'check_active' : '']"></i>
-						<span style="display: flex; align-items: center;">
-							<template v-if="item.courseType == 'PROJECT'">{{ chargeTypeName }} </template><template v-else>{{ item.courseType | coursesType }}</template>
-						</span>
-						<el-icon v-if="item.courseType == 'PROJECT'" class="el-icon-question" @click.native="onQuestions('amr')" />
-					</el-col>
-					<el-col :span="8">
-						<span style="color: #1A1A1A">￥{{ item.courseCurrentPrice | moneyFormat }}</span>
-					</el-col>
-				</el-row>
-			</div>
 
-            <div class="section" v-if="courseViewType == 2 || courseViewType == 3">
+            <div class="section" v-if="courseViewType == 1">
 				<div v-for="(item, index) in toolsPackage" :key="index">
 					<el-row class="option-row" style="padding-top: 0;" @click.native="onTrainChange(item)">
 						<el-col :span="18">
@@ -60,20 +35,14 @@
 							</span>
 						</el-col>
 						<el-col :span="6">
-							<span style="color: #1A1A1A" v-if="courseViewType == 2">￥{{ cloudTeacherFee | moneyFormat }}</span>
-							<span style="color: #1A1A1A" v-if="courseViewType == 3">￥{{ cloudTeacherPlusFee | moneyFormat }}</span>
+							<span style="color: #1A1A1A" v-if="courseViewType == 1">￥{{ cloudTeacherFee | moneyFormat }}</span>
 						</el-col>
 					</el-row>
-					<el-row style="padding-left: .24rem;" v-if="item.childGoodsList && courseViewType == 2">
+					<el-row style="padding-left: .24rem;" v-if="item.childGoodsList && courseViewType == 1">
 						<el-col v-for="(child, index) in item.childGoodsList" :key="child.name">
 							<span style="font-size: 12px; color: #808080;">{{ child.name }} {{item.childGoodsList.length - 1 == index ? '' : '、'}}</span>
 						</el-col>
 					</el-row>
-                    <el-row style="padding-left: .24rem;" v-if="item.childGoodsListPlus && courseViewType == 3">
-						<el-col v-for="(child, index) in item.childGoodsListPlus" :key="child.name">
-							<span style="font-size: 12px; color: #808080;">{{ child.name }} {{item.childGoodsListPlus.length - 1 == index ? '' : '、'}}</span>
-						</el-col>
-					</el-row>
 				</div>
 			</div>
 
@@ -98,29 +67,6 @@
 			</div>
 		</template>
 
-        <div class="section" v-if="courseInfo && courseInfo.length > 0 && isClickStatus && courseViewType == 1">
-			<h2 class="title">{{ '乐团课程' }}</h2>
-			<el-row class="title-row">
-				<el-col :span="12">课程类型</el-col>
-				<!-- <el-col :span="5" :offset="1" style="text-align: right;">原价</el-col> -->
-				<el-col :span="11" :offset="1" style="text-align: right;">现价</el-col>
-			</el-row>
-			<!-- 可选课程信息集合 -->
-			<template v-for="(item, index) in courseInfo">
-				<el-row class="option-row" :key="index"  @click.native="onCourseChange(item)" v-if="item.isStudentOptional">
-					<el-col :span="12">
-						<i class="check_default" :class="[item.isStatus ? 'check_active' : '', !item.isStudentOptional ? 'disabled' : '']"></i><template v-if="item.courseType == 'PROJECT'">{{ item.name }}</template><template v-else>{{ item.courseType | coursesType }}</template>
-					</el-col>
-					<!-- <el-col :span="6">
-						<del style="color: #AAA; font-size: .12rem;">￥{{ item.courseOriginalPrice | moneyFormat }}</del>
-					</el-col> -->
-					<el-col :span="11" :offset="1">
-						<span style="color: #1A1A1A">￥{{ item.courseCurrentPrice | moneyFormat }}</span>
-					</el-col>
-				</el-row>
-			</template>
-		</div>
-
         <h2 class="titles" v-if="instrumentResultList && instrumentResultList.length > 0">
 			<img :src="trainSmallBg" />
 			<span>乐器</span>
@@ -147,16 +93,16 @@
 				<el-row class="title-row">
 					<el-col :span="12">
 						<template v-if="i[0]['kitType'] == 'GROUP'">
-							团购乐器{{ courseViewType == 2 ? '(赠送辅件一套)' : null }}
+							团购乐器{{ courseViewType == 1 ? '(赠送辅件一套)' : null }}
 						</template>
 						<template v-if="i[0]['kitType'] == 'LEASE'">
-							乐器租赁{{ courseViewType == 2 ? '(请自行购买辅件)' : null }}
+							乐器租赁{{ courseViewType == 1 ? '(请自行购买辅件)' : null }}
 						</template>
 						<template v-if="i[0]['kitType'] == 'FREE'">
-							免费乐器{{ courseViewType == 2 ? '(请自行购买辅件)' : null }}
+							免费乐器{{ courseViewType == 1 ? '(请自行购买辅件)' : null }}
 						</template>
 						<template v-if="i[0]['kitType'] == 'owned'">
-							自备乐器{{ courseViewType == 2 ? '(请自行购买辅件)' : null }}
+							自备乐器{{ courseViewType == 1 ? '(请自行购买辅件)' : null }}
 						</template>
 					</el-col>
 					<el-col :span="5" :offset="1" style="text-align: right;">
@@ -230,38 +176,10 @@
 					</el-col>
 				</el-row>
             </div>
-
-			<!-- <el-row class="option-row lines">
-				<el-col :span="12" class="fontBold">
-					仅需支付
-				</el-col>
-				<el-col :span="6">
-					<del style="color: #f85043; font-size: 12px;">￥{{ orderInfo.accessMarketPrice | moneyFormat }}</del>
-				</el-col>
-				<el-col :span="6">
-					<span class="fontBold" style="color: #f85043;">￥{{ orderInfo.accessPrice | moneyFormat }}</span>
-				</el-col>
-			</el-row> -->
 		</div>
 
-		<!-- 原价现价 -->
-		<!-- <div class="section">
-			<div class="needprice markerprice">
-				<del>原价</del>
-				<del>￥{{ orderInfo.marketPrice | moneyFormat }}</del>
-			</div>
-			<div class="needprice grouopprice">
-				<span>仅需支付</span>
-				<span>￥{{ orderInfo.amount | moneyFormat }}</span>
-			</div>
-		</div> -->
-
 		<div class="buy">
 			<div class="price">
-				<!-- <p class="use_price">
-					<img class="logo" src="@/assets/images/mycard.png" alt="">
-					<span>￥{{ needPrice | moneyFormat }}</span>
-				</p> -->
                 <p class="oldprice">
                     <del class="text">原价</del>
                     <del style=" font-size: 13px;">￥{{ orderInfo.marketPrice | moneyFormat }}</del>
@@ -282,7 +200,7 @@
             :append-to-body="true"
             class="videoDialog"
             width="30%">
-            <video style="width: 100%;" v-if="videoStatus" controls="controls" class="ql-video" :src="courseViewType == 3 ? 'https://daya.ks3-cn-beijing.ksyun.com/202105/SWmqmvW.mp4' : 'https://daya.ks3-cn-beijing.ksyun.com/202105/SWmqmvW.mp4'" :poster="courseViewType == 3 ? require('../../../assets/images/musicGroup/video_bg.png') : require('../../../assets/images/musicGroup/video_bg.png')" />
+            <video style="width: 100%;" v-if="videoStatus" controls="controls" class="ql-video" :src="'https://daya.ks3-cn-beijing.ksyun.com/202105/SWmqmvW.mp4'" :poster="require('../../../assets/images/musicGroup/video_bg.png')" />
         </el-dialog>
     </div>
 </template>
@@ -331,8 +249,7 @@ export default {
             toolsPackage: [{
                 isStatus: true,
                 name: '练习系统（六个月）',
-                childGoodsList: [{ name: '同步乐团训练教程，五线谱跟播、演奏指法跟播、任选小节循环播放、演奏速度自定义、原音/伴奏一键切换等。' }],
-                childGoodsListPlus: [{ name: '同步乐团训练教程，五线谱跟播、演奏指法跟播、任选小节循环播放、演奏速度自定义、原音/伴奏一键切换、智能评分等。' }]
+                childGoodsList: [{ name: '' }],
             }], // 学习工具包
             courseInfo: null, // 课程信息
             musicGroupSubject: null, // 基本信息
@@ -389,6 +306,21 @@ export default {
                         this.serviceValidDate = dayjs(tempResult.musicGroupPaymentCalender.paymentValidStartDate).format('YYYY/MM/DD') + '~' + dayjs(tempResult.musicGroupPaymentCalender.paymentValidEndDate).format('YYYY/MM/DD')
                     }
                     let tempInfo = tempResult.musicGroupPaymentCalender? tempResult.musicGroupPaymentCalender.musicGroupPaymentCalenderCourseSettingsList : null
+
+                    let memberPrivilegesItemList = tempResult.memberPrivilegesItemList ? tempResult.memberPrivilegesItemList : []
+						let tempMember = []
+						memberPrivilegesItemList.forEach(member => {
+							if(member.memberPrivilegesItems && member.memberPrivilegesItems.length > 0) {
+								member.memberPrivilegesItems.forEach(item => {
+									tempMember.push(item.name)
+								})
+							}
+						})
+						this.toolsPackage = [{
+							isStatus: true,
+							name: '练习系统（六个月）',
+							childGoodsList: [{ name: tempMember.join('、') }]
+						}]
                     // 判断是否有课程
                     if (tempInfo && tempInfo.length > 0) {
                         let tempCourse = {
@@ -574,10 +506,10 @@ export default {
                                 this.buyMaintenance = true
                             }
 
-                            if(item.checked && item.kitType != "GROUP" && (this.courseViewType == 2 || this.courseViewType == 3)) {
+                            if(item.checked && item.kitType != "GROUP" && (this.courseViewType == 1)) {
                                 this.accessIsShowStatus = true
                             }
-                            if(this.courseViewType != 2 && this.courseViewType != 3) {
+                            if(this.courseViewType != 1) {
                                 this.accessIsShowStatus = true
                             }
                         })
@@ -676,7 +608,7 @@ export default {
                 }
             }
             // 云教练且选择自备则不显示辅件
-            if(this.courseViewType == 2 || this.courseViewType == 3) {
+            if(this.courseViewType == 1) {
                 if(item.kitType != "GROUP") {
                     this.accessIsShowStatus = true
                 } else {
@@ -710,54 +642,15 @@ export default {
             let csi = this.courseInfo
             // 加上判断是否有课程信息
             // 如果为云教练系统则，没有课程费用
-            if((this.courseViewType == 2 || this.courseViewType == 3) && this.toolsPackage[0].isStatus) {
+            if((this.courseViewType == 1) && this.toolsPackage[0].isStatus) {
                 let tempFee = this.cloudTeacherFee
-                if(this.courseViewType == 3) {
-                    tempFee = this.cloudTeacherPlusFee
-                }
                 musicClassFee += parseFloat(tempFee)
                 marketPrice += parseFloat(tempFee)
             }
             if (mgs) {
-                let tempCourse = this.courseShowInfo
-                // if (tempCourse.length > 0 && this.courseViewType == 1) {
-                //     tempCourse.forEach(item => {
-                //         if (item.id > 0) {
-                //             courseKeys.push(item.id)
-                //         }
-                //         musicClassFee += parseFloat(item.courseCurrentPrice)
-                //         marketPrice += parseFloat(item.courseOriginalPrice)
-                //         // 不可选的课程才会减免课程费用
-                //         if (!item.isStudentOptional) {
-                //             tempGroupRemissionCourseFee += parseFloat(item.courseCurrentPrice)
-                //         }
-                //     });
-                //     buyList.unshift({
-                //         name: this.chargeTypeName,
-                //         type: paymentPatternType[this.paymentPattern],
-                //         price: Number((musicClassFee).toFixed(2))
-                //     })
-                // } else {
-                if (tempCourse.length > 0 && this.courseViewType == 1) {
-                    let m = 0
-                    tempCourse.forEach(item => {
-                        m += parseFloat(item.courseCurrentPrice)
-                        // 不可选的课程才会减免课程费用
-                        // if (!item.isStudentOptional) {
-                        //     tempGroupRemissionCourseFee += parseFloat(item.courseCurrentPrice)
-                        // }
-                    });
-                    marketPrice += parseFloat(m)
-                    buyList.unshift({
-                        name: this.chargeTypeName,
-                        type: paymentPatternType[this.paymentPattern],
-                        price: Number((m).toFixed(2))
-                    })
-                }
-
                     csi.forEach(item => {
                         if (item.isStatus) {
-                            if(this.courseViewType != 2 || this.courseViewType != 3) {
+                            if(this.courseViewType != 1) {
                                 musicClassFee += parseFloat(item.courseCurrentPrice)
                             }
                             // marketPrice += parseFloat(item.courseOriginalPrice)