套餐额外增加月卡价格、季卡价格及对应的指导价

src/views/combo/combo/add.vue

@@ -19,12 +19,20 @@
 				</el-row>
 			</el-form-item>
 
-            <el-form-item label="套餐价格" prop="price" :label-width="formLabelWidth">
+            <el-form-item label="月卡价格" prop="month_price" :label-width="formLabelWidth">
-				<el-input v-model="form.price" autocomplete="off"></el-input>
-			</el-form-item>
-
-            <el-form-item label="指导价" prop="month_price" :label-width="formLabelWidth">
 				<el-input v-model="form.month_price" autocomplete="off"></el-input>
+			</el-form-item>   
+
+            <el-form-item label="月卡指导价" prop="m_price" :label-width="formLabelWidth">
+				<el-input v-model="form.m_price" autocomplete="off"></el-input>
+			</el-form-item>       
+			
+			<el-form-item label="季卡价格" prop="seasonal_price" :label-width="formLabelWidth">
+				<el-input v-model="form.seasonal_price" autocomplete="off"></el-input>
+			</el-form-item>   
+
+            <el-form-item label="季卡指导价" prop="s_price" :label-width="formLabelWidth">
+				<el-input v-model="form.s_price" autocomplete="off"></el-input>
 			</el-form-item>
 
 			<el-form-item label="权益说明" prop="content" :label-width="formLabelWidth">
@@ -83,8 +91,10 @@ export default {
 				name: '',
 				eg_name: '',
 				image: '',
-				price: '',
 				month_price: '',
+				m_price: '',
+				seasonal_price: '',
+				s_price: '',
                 content: '',
 			},
 			formRules: {
@@ -106,18 +116,30 @@ export default {
                     trigger: 'blur'
                 }],
 
-                price: [{
+				month_price: [{
                     required: true,
-                    message: '请输入套餐价格',
+                    message: '请输入月卡价格',
-                    trigger: 'blur'
-                }],    
-                
-                month_price: [{
-                    required: true,
-                    message: '请输入指导价',
                     trigger: 'blur'
                 }],
 
+                m_price: [{
+                    required: true,
+                    message: '请输入月卡指导价',
+                    trigger: 'blur'
+                }],
+				
+				seasonal_price: [{
+					required: true,
+					message: '请输入季卡价格',
+					trigger: 'blur'
+				}],
+
+				s_price: [{
+					required: true,
+					message: '请输入季卡指导价',
+					trigger: 'blur'
+				}],
+                
                 content: [{
                     required: true,
                     message: '请输入权益说明',

src/views/combo/combo/edit.vue

@@ -19,12 +19,20 @@
 				</el-row>
 			</el-form-item>
 
-            <el-form-item label="套餐价格" prop="price" :label-width="formLabelWidth">
+			<el-form-item label="月卡价格" prop="month_price" :label-width="formLabelWidth">
-				<el-input v-model="form.price" autocomplete="off"></el-input>
-			</el-form-item>
-
-            <el-form-item label="指导价" prop="month_price" :label-width="formLabelWidth">
 				<el-input v-model="form.month_price" autocomplete="off"></el-input>
+			</el-form-item>   
+
+            <el-form-item label="月卡指导价" prop="m_price" :label-width="formLabelWidth">
+				<el-input v-model="form.m_price" autocomplete="off"></el-input>
+			</el-form-item>       
+			
+			<el-form-item label="季卡价格" prop="seasonal_price" :label-width="formLabelWidth">
+				<el-input v-model="form.seasonal_price" autocomplete="off"></el-input>
+			</el-form-item>   
+
+            <el-form-item label="季卡指导价" prop="s_price" :label-width="formLabelWidth">
+				<el-input v-model="form.s_price" autocomplete="off"></el-input>
 			</el-form-item>
 
 			<el-form-item label="权益说明" prop="content" :label-width="formLabelWidth">
@@ -85,8 +93,10 @@ export default {
 				name: '',
 				eg_name: '',
 				image: '',
-				price: '',
+				month_price: '',
-                month_price: '',
+				m_price: '',
+				seasonal_price: '',
+				s_price: '',
                 content: '',
 			},
         	file_path: '',
@@ -109,17 +119,29 @@ export default {
                     trigger: 'blur'
                 }],
 
-                price: [{
+				month_price: [{
                     required: true,
-                    message: '请输入套餐价格',
+                    message: '请输入月卡价格',
                     trigger: 'blur'
                 }],
-                
+
-                month_price: [{
+                m_price: [{
                     required: true,
-                    message: '请输入指导价',
+                    message: '请输入月卡指导价',
                     trigger: 'blur'
                 }],
+				
+				seasonal_price: [{
+					required: true,
+					message: '请输入季卡价格',
+					trigger: 'blur'
+				}],
+
+				s_price: [{
+					required: true,
+					message: '请输入季卡指导价',
+					trigger: 'blur'
+				}],
 
                 content: [{
                     required: true,
@@ -144,9 +166,11 @@ export default {
 		this.form.name = this.editform.name;
 		this.form.eg_name = this.editform.eg_name;
 		this.form.image = this.editform.image;
-		this.form.price = this.editform.price;
 		this.form.content = this.editform.content;
 		this.form.month_price = this.editform.month_price;
+		this.form.m_price = this.editform.m_price;
+		this.form.seasonal_price = this.editform.seasonal_price;
+		this.form.s_price = this.editform.s_price;
       	this.file_path = this.editform.img;
 	},
 	methods: {

src/views/combo/combo/index.vue

@@ -9,8 +9,10 @@
 				<el-table size="small" :data="tableData" border style="width: 100%" v-loading="loading">
 					<el-table-column prop="id" label="ID" width="80"></el-table-column>
 					<el-table-column prop="name" label="套餐名称"></el-table-column>
-					<el-table-column prop="price" label="套餐价格"></el-table-column>
+					<el-table-column prop="month_price" label="月卡价格"></el-table-column>
-					<el-table-column prop="month_price" label="指导价"></el-table-column>
+					<el-table-column prop="m_price" label="月卡指导价"></el-table-column>
+					<el-table-column prop="seasonal_price" label="季卡价格"></el-table-column>
+					<el-table-column prop="s_price" label="季卡指导价"></el-table-column>
 					<el-table-column fixed="right" label="操作" width="170">
 						<template slot-scope="scope">
 							<el-button @click="editClick(scope.row)" type="text" size="small"