Merge branch 'v3' of http://git.jihengcc.cn/starfire/spark-coach into v3

pages/index/index.vue

@@ -28,11 +28,11 @@
 		data() {
 			return {
 				cardList: [
-					 // {
-					 // 	icon: 'iconzu4931',
-					 // 	label: '我的补课',
-					 // 	path: 'extraLessonsForm'
-					 // },
+					 /*{
+					 	icon: 'iconzu4931',
+					 	label: '我的补课',
+					 	path: 'extraLessonsForm'
+					 },*/
 					{
 						icon: 'iconwodebanji',
 						label: '我的班级',

pagesClass/classDetail.vue

@@ -57,7 +57,7 @@
 				</u-grid-item>
 			</u-grid>
 		</u-card>
-		<u-card :title="'续费卡(' + getStudentsNumber(4) + ')'" title-size="32" margin="0px 0px 10px 0px" :head-style="cardStyle">
+		<u-card :title="'续费卡和自定义卡(' + getStudentsNumber(4) + ')'" title-size="32" margin="0px 0px 10px 0px" :head-style="cardStyle">
 			<u-grid :col="3" slot="body" :border="false"  v-if="classInfo.studentRenewList.length">
 				<u-grid-item v-for="(item, index) in classInfo.studentRenewList" :key="index" :custom-style="gridCustomStyle">
 					<view class="class-student-col" :class="item.state ? 'student-active' : ''" @click="handleVtCardClick(item)">
@@ -157,6 +157,7 @@
 					classEndHours: '',
 					residue: '',
 					address: '',
+					studentLeaveList: [],
 					classExtrasList: [],
 					studentSignList: [],
 					showList: [],
@@ -327,7 +328,7 @@
 					case 2: 
 						return this.classInfo.studentLeaveRecordList.length
 					case 3:
-							return this.classInfo.studentLeaveList.length
+						return this.classInfo.studentLeaveList.length
 					case 4:
 						return this.classInfo.studentRenewList.length
 				}
@@ -602,7 +603,7 @@
 		.class-student-col {
 			height: 28px;
 			display: flex;
-			padding: 0 10px;
+			padding: 0 10rpx;
 			line-height: 28px;
 			color: $mainColor;
 			white-space: nowrap;