فهرست منبع

修改金额显示

lex-xin 4 سال پیش
والد
کامیت
9aac231f04
1فایلهای تغییر یافته به همراه23 افزوده شده و 22 حذف شده
  1. 23 22
      src/views/resetTeaming/modals/subject-preview.vue

+ 23 - 22
src/views/resetTeaming/modals/subject-preview.vue

@@ -27,8 +27,8 @@
 
             <el-row class="title-row" v-if="courseViewType == 0">
 				<el-col :span="12">课程类型</el-col>
-				<el-col :span="5" :offset="1" style="text-align: right;">原价</el-col>
-				<el-col :span="6" style="text-align: right;">现价</el-col>
+				<!-- <el-col :span="5" :offset="1" style="text-align: right;">原价</el-col> -->
+				<el-col :span="11" style="text-align: right;">现价</el-col>
 			</el-row>
 			<!-- 可选课程信息集合 -->
 			<template v-for="(item, index) in courseInfo">
@@ -36,10 +36,10 @@
 					<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">
+					<!-- <el-col :span="6">
 						<del style="color: #AAA; font-size: 12px;">¥{{ item.courseOriginalPrice | moneyFormat }}</del>
-					</el-col>
-					<el-col :span="6">
+					</el-col> -->
+					<el-col :span="11">
 						<span style="color: #1A1A1A">¥{{ item.courseCurrentPrice | moneyFormat }}</span>
 					</el-col>
 				</el-row>
@@ -50,7 +50,7 @@
 			<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="5" :offset="1" style="text-align: right;">原价</el-col> -->
 				<el-col :span="6" style="text-align: right;">现价</el-col>
 			</el-row>
 			<!-- 可选课程信息集合 -->
@@ -59,10 +59,10 @@
 					<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">
+					<!-- <el-col :span="6">
 						<del style="color: #AAA; font-size: .12rem;">¥{{ item.courseOriginalPrice | moneyFormat }}</del>
-					</el-col>
-					<el-col :span="6">
+					</el-col> -->
+					<el-col :span="11">
 						<span style="color: #1A1A1A">¥{{ item.courseCurrentPrice | moneyFormat }}</span>
 					</el-col>
 				</el-row>
@@ -111,18 +111,18 @@
 
             <div v-if="leBaoStatus">
 				<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="6" style="text-align: right;">现价</el-col>
+					<el-col :span="12" :offset="1">服务项目</el-col>
+					<!-- <el-col :span="5" :offset="1" style="text-align: right;">原价</el-col> -->
+					<el-col :span="11" style="text-align: right;">现价</el-col>
 				</el-row>
-				<el-row class="option-row" @click="onLeBao">
+				<el-row class="option-row" @click.native="onLeBao">
 					<el-col :span="12">
-						<i class="check_default" :class="[ buyMaintenance ? 'check_active' : '' ]"></i>乐器保养(一年)<el-icon style="padding-left: 0;" name="question" @click.native="onQuestions('instrument')" />
+						<i class="check_default" :class="[ buyMaintenance ? 'check_active' : '' ]"></i>乐器保养(一年)<el-icon style="padding-left: 0;" name="question" @click.stop.native="onQuestions('instrument')" />
 					</el-col>
-					<el-col :span="6">
+					<!-- <el-col :span="6">
 						<del style="color: #AAA; font-size: .12rem;">¥{{ 500 | moneyFormat }}</del>
-					</el-col>
-					<el-col :span="6">
+					</el-col> -->
+					<el-col :span="11" :offset="1">
 						<span style="color: #1A1A1A">¥{{ 300 | moneyFormat }}</span>
 					</el-col>
 				</el-row>
@@ -334,7 +334,7 @@ export default {
                         }
                     })
 
-                    console.log(this.isClickStatus)
+                    // console.log(this.isClickStatus)
 
                     this.musicGroupSubject = tempResult.musicGroupSubjectPlan
                     let instrumentInfo = {}
@@ -617,11 +617,11 @@ export default {
                             if (!item.isStudentOptional) {
                                 tempGroupRemissionCourseFee += parseFloat(item.courseCurrentPrice)
                             } else {
-                                marketPrice += parseFloat(item.courseOriginalPrice)
+                                marketPrice += parseFloat(item.courseCurrentPrice)
                             }
 
                             if(this.courseViewType == 0 && !item.isStudentOptional) {
-                                marketPrice += parseFloat(item.courseOriginalPrice)
+                                marketPrice += parseFloat(item.courseCurrentPrice)
                             }
                         }
                     })
@@ -696,7 +696,8 @@ export default {
 
             if(this.leBaoStatus && this.buyMaintenance) {
                 // 判断是否使用乐保
-                marketPrice += 500
+                // marketPrice += 500
+                marketPrice += 300
                 amount += 300
                 buyList.push({
                     name: '乐器保养',
@@ -1069,7 +1070,7 @@ export default {
         display: flex;
         // align-items: center;
     }
-    .el-col-6, .el-col-8 {
+    .el-col-6, .el-col-8, .el-col-11{
         display: flex;
         justify-content: flex-end;
     }