Эх сурвалжийг харах

Signed-off-by: liuboyan <632697560@qq.com>
样式

liuboyan 4 жил өмнө
parent
commit
b6637606cb

+ 1 - 1
pages/member/index.vue

@@ -10,7 +10,7 @@
 					<u-card :head-border-bottom="false" :foot-border-top="false" padding="0px" margin="10px" borderRadius="40" v-for="(site, index2) in item.tableList"
 					 :key="index" class="class-card" @click="goToMyClass(site)">
 						<view class="class-content" slot="head" style="padding-top: 10px;">
-							<view class="student-name">{{site.nastudentNameme}}</view>
+							<view class="student-name">{{site.studentName}}</view>
 							<view class="class-name">{{site.name}}</view>
 						</view>
 						<view class="class-content" slot="body">

+ 0 - 12
pagesMain/openMember.vue

@@ -226,17 +226,5 @@
 				margin-bottom: 5px;
 			}
 		}
-
-		.handle-fix-box {
-			width: 100%;
-			box-sizing: border-box;
-			padding: 10px 15px;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			height: 60px;
-			background-color: #FFFFFF;
-			z-index: 2;
-		}
 	}
 </style>

+ 1 - 12
pagesMain/payResult.vue

@@ -65,6 +65,7 @@
 	}
 </style>
 <style lang="scss" scoped>
+	@import "@/static/css/themes.scss";
 	.content {
 		width: 100%;
 		float: left;
@@ -95,17 +96,5 @@
 			font-size: 12px;
 			text-align: center;
 		}
-
-		.handle-fix-box {
-			width: 100%;
-			box-sizing: border-box;
-			padding: 10px 15px;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			height: 60px;
-			background-color: #FFFFFF;
-			z-index: 2;
-		}
 	}
 </style>

+ 0 - 12
pagesMain/studentList.vue

@@ -135,17 +135,5 @@
 				}
 			}
 		}
-
-		.handle-fix-box {
-			width: 100%;
-			box-sizing: border-box;
-			padding: 10px 15px;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			height: 60px;
-			background-color: #FFFFFF;
-			z-index: 2;
-		}
 	}
 </style>

+ 1 - 12
pagesMain/subscribelSuccess.vue

@@ -44,6 +44,7 @@
 	}
 </style>
 <style lang="scss" scoped>
+	@import "@/static/css/themes.scss";
 	.content {
 		width: 100%;
 		float: left;
@@ -74,17 +75,5 @@
 			text-align: center;
 			margin-top: 20px;
 		}
-
-		.handle-fix-box {
-			width: 100%;
-			box-sizing: border-box;
-			padding: 10px 15px;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			height: 60px;
-			background-color: #FFFFFF;
-			z-index: 2;
-		}
 	}
 </style>

+ 10 - 14
pagesMember/classDetail.vue

@@ -2,8 +2,14 @@
 	<view class="content">
 		<u-card :title="classInfo.name" :show-foot="false" title-size="32" margin="0px 0px 10px 0px" :head-style="cardStyle">
 			<view slot="body">
-				<view class="class-info-text">{{classInfo.classStartDate}}&nbsp;&nbsp;{{classInfo.classStartHours}}&nbsp;&nbsp;{{classInfo.residue}}课时</view>
-				<view class="class-info-text">{{classInfo.address}}</view>
+				<view class="class-info-text">
+					<u-icon name="clock"></u-icon>
+					{{classInfo.classStartDate}}&nbsp;&nbsp;{{classInfo.classStartHours}}&nbsp;&nbsp;{{classInfo.residue}}课时
+				</view>
+				<view class="class-info-text">
+					<u-icon name="map"></u-icon>
+					{{classInfo.address}}
+				</view>
 			</view>
 		</u-card>
 		<u-card title="授课教练" :show-foot="false" title-size="32" margin="0px 0px 10px 0px" :head-style="cardStyle">
@@ -87,7 +93,7 @@
 				NET.request(API.getClassDetail, {
 					id: this.classId
 				}, 'POST').then(res => {
-					this.swiperList = res.data
+					this.classInfo = res.data
 				}).catch(error => {
 					this.$refs.uTips.show({
 						title: '获取班级详情失败',
@@ -114,6 +120,7 @@
 	}
 </style>
 <style lang="scss" scoped>
+	@import "@/static/css/themes.scss";
 	.content {
 		width: 100%;
 		float: left;
@@ -158,16 +165,5 @@
 				}
 			}
 		}
-
-		.handle-fix-box {
-			width: 100%;
-			box-sizing: border-box;
-			padding: 10px 15px;
-			position: fixed;
-			bottom: 0px;
-			height: 60px;
-			background-color: #FFFFFF;
-			z-index: 2;
-		}
 	}
 </style>

+ 4 - 15
pagesMember/courseForm.vue

@@ -1,10 +1,10 @@
 <template>
 	<view class="content">
 		<u-form :model="form" ref="form" label-width="140">
-			<u-form-item label="评价内容" placeholder="请输入评价内容" prop="estimateContent" required>
-				<u-input v-model="form.estimateContent" type="textarea " auto-height :height="100" />
+			<u-form-item label="评价内容" prop="estimateContent" required>
+				<u-input v-model="form.estimateContent" placeholder="请输入评价内容" type="textarea" auto-height :height="100" />
 			</u-form-item>
-			<u-form-item label="上传附件" placeholder="请上传附件" prop="estimateContent" required>
+			<u-form-item label="上传附件" prop="estimateContent" required>
 				<u-upload :action="uploadAaction" :head="uploadHeader" max-count="5" :multiple="false" :file-list="fileList"></u-upload>
 			</u-form-item>
 		</u-form>
@@ -94,22 +94,11 @@
 	}
 </style>
 <style lang="scss" scoped>
+	@import "@/static/css/themes.scss";
 	.content {
 		width: 100%;
 		float: left;
 		padding: 0 15px 60px 15px;
 		box-sizing: border-box;
-
-		.handle-fix-box {
-			width: 100%;
-			box-sizing: border-box;
-			padding: 10px 15px;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			height: 60px;
-			background-color: #FFFFFF;
-			z-index: 2;
-		}
 	}
 </style>

+ 4 - 15
pagesMember/evaluateForm.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="content">
 		<u-form :model="form" ref="form" label-width="140">
-			<u-form-item label="评价星级" placeholder="请选择评价星级" prop="level" required>
+			<u-form-item label="评价星级" prop="level" required>
 				<u-rate :count="5" v-model="form.level" :active-color="mainColor"></u-rate>
 			</u-form-item>
-			<u-form-item label="评价内容" placeholder="请输入评价内容" prop="estimateContent" required>
-				<u-input v-model="form.estimateContent" type="textarea " auto-height :height="100" />
+			<u-form-item label="评价内容" prop="estimateContent" required>
+				<u-input v-model="form.estimateContent" placeholder="请输入评价内容" type="textarea" auto-height :height="100" />
 			</u-form-item>
 		</u-form>
 		<view class="handle-fix-box">
@@ -92,22 +92,11 @@
 	}
 </style>
 <style lang="scss" scoped>
+	@import "@/static/css/themes.scss";
 	.content {
 		width: 100%;
 		float: left;
 		padding: 0 15px 60px 15px;
 		box-sizing: border-box;
-
-		.handle-fix-box {
-			width: 100%;
-			box-sizing: border-box;
-			padding: 10px 15px;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			height: 60px;
-			background-color: #FFFFFF;
-			z-index: 2;
-		}
 	}
 </style>

+ 5 - 16
pagesMember/leaveForm.vue

@@ -1,11 +1,11 @@
 <template>
 	<view class="content">
 		<u-form :model="form" ref="form" label-width="140">
-			<u-form-item label="请假时间" placeholder="请选择请假时间" prop="leaveTime" required>
-				<u-input v-model="form.leaveTime" :select-open="leaveTimeShow" type="select" @click="leaveTimeShow = true" />
+			<u-form-item label="请假时间" prop="leaveTime" required>
+				<u-input v-model="form.leaveTime" placeholder="请选择请假时间" :select-open="leaveTimeShow" type="select" @click="leaveTimeShow = true" />
 			</u-form-item>
-			<u-form-item label="请假理由" placeholder="请输入请假理由" prop="leaveReason" required>
-				<u-input v-model="form.leaveReason" type="textarea " auto-height :height="100"/>
+			<u-form-item label="请假理由" prop="leaveReason" required>
+				<u-input v-model="form.leaveReason" placeholder="请输入请假理由" type="textarea" auto-height :height="100" />
 			</u-form-item>
 		</u-form>
 		<u-calendar v-model="leaveTimeShow" mode="date" :active-bg-color="mainColor" btn-type="error" availableText="有课"
@@ -109,22 +109,11 @@
 	}
 </style>
 <style lang="scss" scoped>
+	@import "@/static/css/themes.scss";
 	.content {
 		width: 100%;
 		float: left;
 		padding: 0 15px 60px 15px;
 		box-sizing: border-box;
-
-		.handle-fix-box {
-			width: 100%;
-			box-sizing: border-box;
-			padding: 10px 15px;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			height: 60px;
-			background-color: #FFFFFF;
-			z-index: 2;
-		}
 	}
 </style>

+ 1 - 11
pagesMember/myClassDetail.vue

@@ -120,6 +120,7 @@
 	}
 </style>
 <style lang="scss" scoped>
+	@import "@/static/css/themes.scss";
 	.content {
 		width: 100%;
 		float: left;
@@ -144,16 +145,5 @@
 		/deep/.u-cell {
 			padding: 26rpx 0;
 		}
-
-		.handle-fix-box {
-			width: 100%;
-			box-sizing: border-box;
-			padding: 10px 15px;
-			position: fixed;
-			bottom: 0px;
-			height: 60px;
-			background-color: #FFFFFF;
-			z-index: 2;
-		}
 	}
 </style>

+ 13 - 23
pagesMember/subscribelForm.vue

@@ -1,23 +1,23 @@
 <template>
 	<view class="content">
 		<u-form :model="subscribelForm" ref="subscribelForm" label-width="140">
-			<u-form-item label="学生姓名" placeholder="请输入学生姓名" prop="studentName" required>
-				<u-input v-model="subscribelForm.studentName" />
+			<u-form-item label="学生姓名" prop="studentName" required>
+				<u-input v-model="subscribelForm.studentName" placeholder="请输入学生姓名" />
 			</u-form-item>
-			<u-form-item label="家长姓名" placeholder="请输入家长姓名" prop="fatherName" required>
-				<u-input v-model="subscribelForm.fatherName" />
+			<u-form-item label="家长姓名" prop="fatherName" required>
+				<u-input v-model="subscribelForm.fatherName" placeholder="请输入家长姓名" />
 			</u-form-item>
-			<u-form-item label="学生性别" placeholder="请选择学生性别" prop="sex" required>
-				<u-input v-model="subscribelForm.sex" :select-open="sexShow" type="select" @click="sexShow = true" />
+			<u-form-item label="学生性别" prop="sex" required>
+				<u-input v-model="subscribelForm.sex" placeholder="请选择学生性别" :select-open="sexShow" type="select" @click="sexShow = true" />
 			</u-form-item>
-			<u-form-item label="学生年龄" placeholder="请输入学生年龄" prop="age" required>
-				<u-input v-model="subscribelForm.age" type="number" />
+			<u-form-item label="学生年龄" prop="age" required>
+				<u-input v-model="subscribelForm.age" placeholder="请输入学生年龄" type="number" />
 			</u-form-item>
-			<u-form-item label="学生生日" placeholder="请选择学生生日" prop="birthday" required>
-				<u-input v-model="subscribelForm.birthday" :select-open="birthdayShow" type="select" @click="birthdayShow = true" />
+			<u-form-item label="学生生日" prop="birthday" required>
+				<u-input v-model="subscribelForm.birthday" placeholder="请选择学生生日" :select-open="birthdayShow" type="select" @click="birthdayShow = true" />
 			</u-form-item>
-			<u-form-item label="手机号码" placeholder="请输入手机号码" prop="phone" required>
-				<u-input v-model="subscribelForm.phone" />
+			<u-form-item label="手机号码" prop="phone" required>
+				<u-input v-model="subscribelForm.phone" placeholder="请输入手机号码" />
 			</u-form-item>
 			<!-- <u-form-item label="体验日期" placeholder="请选择体验日期" prop="experience">
 				<u-input v-model="subscribelForm.experience" :select-open="experienceShow" type="select" @click="experienceShow = true" />
@@ -187,22 +187,12 @@
 	}
 </style>
 <style lang="scss" scoped>
+	@import "@/static/css/themes.scss";
 	.content {
 		width: 100%;
 		float: left;
 		padding: 0 15px 60px 15px;
 		box-sizing: border-box;
 
-		.handle-fix-box {
-			width: 100%;
-			box-sizing: border-box;
-			padding: 10px 15px;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			height: 60px;
-			background-color: #FFFFFF;
-			z-index: 2;
-		}
 	}
 </style>

+ 1 - 12
pagesMember/subscribelSuccess.vue

@@ -44,6 +44,7 @@
 	}
 </style>
 <style lang="scss" scoped>
+	@import "@/static/css/themes.scss";
 	.content {
 		width: 100%;
 		float: left;
@@ -74,17 +75,5 @@
 			text-align: center;
 			margin-top: 20px;
 		}
-
-		.handle-fix-box {
-			width: 100%;
-			box-sizing: border-box;
-			padding: 10px 15px;
-			position: fixed;
-			left: 0;
-			bottom: 0;
-			height: 60px;
-			background-color: #FFFFFF;
-			z-index: 2;
-		}
 	}
 </style>

+ 13 - 1
static/css/themes.scss

@@ -1,2 +1,14 @@
 $mainColor: #ff6e3e;
-$pageBgColor: #f7f7f7;
+$pageBgColor: #f7f7f7;
+
+.handle-fix-box {
+	width: 100%;
+	height: 60px;
+	padding: 10px 15px;
+	position: fixed;
+	z-index: 2;
+	bottom: 0px;
+	left: 0px;
+	background-color: #FFFFFF;
+	box-sizing: border-box;
+}

+ 1 - 1
utils/request.js

@@ -4,7 +4,7 @@ const request = (url, data, method = 'GET') => {
 			'Content-Type': 'application/json',
 		}
 		if (uni.getStorageSync('token')) {
-			header.token = 'Bearer ' + uni.getStorageSync('token')
+			header.Authorization = uni.getStorageSync('token')
 		}
 		uni.request({
 			url: url,