yemian

pages.json

@@ -4,10 +4,12 @@
 		    "path" : "pages/index/index",
 		    "style" : 
 		    {
-		        "navigationBarTitleText": "首页",
-		        "app-plus":{
-					"titleNView":false  //去掉app+h5顶部导航
-		        }
+		        "navigationBarTitleText": "选课中心",
+		        "navigationBarBackgroundColor":"#FFFFFF",
+		        "navigationBarTextStyle":"black"
+		   //      "app-plus":{
+					// "titleNView":false  //去掉app+h5顶部导航
+		   //      }
 		    }
 		},
 		{

pages/course/evaluate.vue

@@ -1,6 +1,7 @@
 <template>
 	<view class="center">
-		<view class="pf">
+		<view class="zhil">
+			<view class="pf">评分</view>
 			<view><uniRate text="1" size="20" margin="10" :value="evaluate_fraction" @change="rateChange1"></uniRate></view>
 		</view>
 		<view class="pjnr">
@@ -77,11 +78,15 @@ export default {
 </script>
 
 <style>
+	.pf{
+		margin-bottom: 20rpx;
+	}
 	.button{
 		height: 200rpx;
 	}
 	.zhil {
 		font-size: 28rpx !important;
 		padding: 15rpx 15rpx;
+		height: 100rpx;
 	}
 </style>

pages/course/success.vue

@@ -48,13 +48,14 @@ page {
 			font-weight: 500;
 			color: #333333;
 			margin-left: 22rpx;
+			
 		}
 		.re-succ-btn {
 			margin-top: 80rpx;
-			width: 464rpx;
-			height: 77rpx;
-			background: linear-gradient(180deg, #FD4646, #FF3535);
-			border-radius: 38rpx;
+			width: 350rpx;
+			height: 80rpx;
+			background: #1CC7C7;
+			border-radius: 40rpx;
 			font-size: 34rpx;
 			font-family: PingFang SC;
 			font-weight: bold;

pages/index/index.vue

@@ -1,33 +1,30 @@
 <template>
 	<view class="center">
+		<!-- <view class="cl"></view> -->
 		<view class="carousel-section">
-				<swiper class="carousel" autoplay="true" duration="400" interval="5000" style="height: 312rpx;" circular>
-					<swiper-item v-for="(item, index) in carouselList" :key="index" class="carousel-item">
-						<image :src="item.pic" />
-					</swiper-item>
-				</swiper>
+			<image src="../../static/img/index.jpg"></image>
 		</view>
 		<view class="navBox">
 			<view class="navBox-item" @click="navTab('/pages/course/course')">
-				<image src="../../static/img/indexMycourse.png" mode="aspectFill"></image>
+				<image class="bg1" src="../../static/img/indexMycourse.png" ></image>
 				<view class="font">
 					我的课程
 				</view>
 			</view>
 			<view class="navBox-item" @click="nav('/pages/course/coursePj')">
-				<image src="../../static/img/indexKcpj.png" mode="aspectFill"></image>
+				<image class="bg2" src="../../static/img/indexKcpj.png" ></image>
 				<view class="font">
 					课程评价
 				</view>
 			</view>
 			<view class="navBox-item" @click="nav('/pages/leave/leaveClass')">
-				<image src="../../static/img/indexQjsp.png" mode=""></image>
+				<image class="bg3" src="../../static/img/indexQjsp.png" mode=""></image>
 				<view class="font">
 					请假审批
 				</view>
 			</view>
 			<view class="navBox-item" @click="nav('/pages/problem/problem')">
-				<image src="../../static/img/indexWtfq.png" mode="aspectFill"></image>
+				<image class="bg4" src="../../static/img/indexWtfq.png" mode="aspectFill"></image>
 				<view class="font">
 					问题反馈
 				</view>
@@ -39,7 +36,6 @@
 				<view class="img"><image src="../../static/img/test.jpg" mode=""></image></view>
 				<view class="right">
 					<view class="r-title">{{ item.title }}</view>
-					<view class="content">{{ item.content }}</view>
 					<view class="time">{{ item.time }}</view>
 				</view>
 			</view>
@@ -54,28 +50,23 @@ export default {
 			carouselList: [],
 			dataList: [
 				{
-					title: "学习教育网名师在线答疑",
-					content: "为了节约学习时间",
+					title: "马云马化腾对决交通场景，一文说清双方布局",
 					time: "2020-12-26 12:30",
 				},
 				{
-					title: "学习教育网名师在线答疑",
-					content: "为了节约学习时间",
+					title: "贾跃亭的一篇采访，让我的朋友圈干起了架",
 					time: "2020-12-26 12:30",
 				},
 				{
-					title: "学习教育网名师在线答疑",
-					content: "为了节约学习时间",
+					title: "世界互联网大会红利释放 互联网产业发展迅速世界互联网",
 					time: "2020-12-26 12:30",
 				},
 				{
 					title: "学习教育网名师在线答疑",
-					content: "为了节约学习时间",
 					time: "2020-12-26 12:30",
 				},
 				{
 					title: "学习教育网名师在线答疑",
-					content: "为了节约学习时间",
 					time: "2020-12-26 12:30",
 				},
 			]
@@ -97,41 +88,67 @@ export default {
 </script>
 
 <style lang="scss">
+.center{
+	height: 100%;
+}
+.cl {
+	height: 44px;
+}
 .carousel-section {
-	background-color: #ff0000;
-	width: 100%;
-	height: 320rpx;
-	border-radius: 24rpx;
-	.titleNview-placing {
-		height: var(--status-bar-height);
-		padding-top: 44px;
-		box-sizing: content-box;
-	}
-	.carousel {
-		width: 92%;
-		height: 240rpx;
-		.carousel-item {
-			width: 100%;
-			height: 100%;
-		}
-		image {
-			width: 100%;
-			height: 100%;
-			border-radius: $border-radius-sm;
-		}
+	margin: 0 auto;
+	width: 90%;
+	height: 280rpx;
+	border-radius: 20rpx;
+	image{
+		border-radius: 20rpx;
+		height: 100%;
+		width: 100%;
 	}
+	// width: 100%;
+	// height: 320rpx;
+	// border-radius: 24rpx;
+	// .titleNview-placing {
+	// 	height: var(--status-bar-height);
+	// 	padding-top: 44px;
+	// 	box-sizing: content-box;
+	// }
+	// .carousel {
+	// 	width: 92%;
+	// 	height: 240rpx;
+	// 	.carousel-item {
+	// 		width: 100%;
+	// 		height: 100%;
+	// 	}
+	// 	image {
+	// 		width: 100%;
+	// 		height: 100%;
+	// 		border-radius: $border-radius-sm;
+	// 	}
+	// }
+}
+.bg1{
+	width: 70rpx;
+	height: 60rpx;
+}
+.bg2{
+	width: 62rpx;
+	height: 66rpx;
+}
+.bg3{
+	width: 78rpx;
+	height: 70rpx;
+}
+.bg4{
+	width: 60rpx;
+	height: 62rpx;
 }
 .navBox {
 	display: flex;
 	align-items: center;
 	.navBox-item {
 		text-align: center;
-		margin-top: 50rpx;
+		margin-top: 100rpx;
 		flex: 1;
-		image {
-			width: 81rpx;
-			height: 81rpx;
-		}
 		.font {
 			font-size: 24rpx;
 			font-family: PingFang SC;
@@ -149,23 +166,17 @@ export default {
 	color: #24272C;
 }
 .listBox {
-	width: 90%;
-	margin: 0 auto;
-	padding-top: 30rpx;
-	background: #FFFFFF;
-	border: 1px solid #F5F5F5;
-	box-shadow: 0px 8rpx 32rpx 8rpx rgba(132, 132, 132, 0.15);
-	border-radius: 24rpx;
+	margin-top: 28rpx;
 }
 .list {
-	margin-bottom: 20rpx;
+	margin-bottom: 50rpx;
+	padding-left: 34rpx;
+	padding-right: 40rpx;
 	display: flex;
 	.img{
-		padding-left: 20rpx;
 		background-color: #FFFFFF;
-		width: 254rpx;
-		height: 162rpx;
-		border-radius: 10rpx;
+		width: 200rpx;
+		height: 160rpx;
 		flex-shrink:0;
 		image {
 			width: 100%;
@@ -176,23 +187,17 @@ export default {
 		text-align: left;
 		width: 100%;
 		padding-left: 20rpx;
+		display: flex;
+		flex-direction: column;
+		justify-content: space-between;
 		.r-title {
-			font-size: 30rpx;
-			font-family: PingFang SC;
-			font-weight: bold;
+			font-size: 32rpx;
+			font-weight: 400;
 			color: #333333;
 		}
-		.content {
-			font-size: 26rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
-			color: #999999;
-		}
 		.time {
-			margin-top: 50rpx;
-			font-size: 24rpx;
-			font-family: PingFang SC;
-			font-weight: 500;
+			font-size: 26rpx;
+			font-weight: 400;
 			color: #999999;
 		}
 	}

pages/leave/details.vue

@@ -1,4 +1,24 @@
 <template>
+	<view class="center">
+		<scroll-view scroll-y="true">
+			<view v-for="(item,index) in leaveList" :key="index">
+				<view class="leave">
+					<view class="type">审批中</view>
+					<view class="top flex">
+						<image src="../../static/img/indexKcpj.png"></image>
+						<view class="font">
+							<view class="title">请假</view>
+							<view class="time">time</view>
+						</view>
+					</view>
+					<view class="leavefont">请假类型：事假</view>
+					<view class="leavefont">开始时间：2021/3/18上午</view>
+					<view class="leavefont">结束时间：2021/3/18下午</view>
+					<view class="leavefont">理由：{{ item.reason }}</view>
+				</view>
+			</view>
+		</scroll-view>
+	</view>
 </template>
 
 <script>
@@ -69,4 +89,59 @@ export default {
 </script>
 
 <style lang="scss">
+.leave {
+	position: relative;
+	padding-left: 24rpx;
+	padding-top: 34rpx;
+	margin: 0 auto;
+	margin: 20rpx;
+	padding-bottom: 20rpx;
+	background: #FFFFFF;
+	box-shadow: 0px 5rpx 24rpx 0px rgba(4, 0, 0, 0.06);
+	border-radius: 15rpx;
+	.type {
+		position: absolute;
+		top: 38rpx;
+		right: 32rpx;
+		width: 97rpx;
+		height: 38rpx;
+		background: #FCF0D8;
+		border-radius: 5rpx;
+		text-align: center;
+		font-size: 22rpx;
+		font-weight: 500;
+		color: #FEA42C;
+		line-height: 38rpx;
+	}
+	.top {
+		justify-content: start;
+		margin-bottom: 34rpx;
+		image {
+			width: 63rpx;
+			height: 66rpx;
+		}
+		.font {
+			margin-left: 10rpx;
+			
+			.title {
+				font-size: 32rpx;
+				font-family: PingFang SC;
+				font-weight: bold;
+				color: #303338;
+			}
+			.time {
+				font-size: 24rpx;
+				font-family: PingFang SC;
+				font-weight: 500;
+				color: #989DA5;
+			}
+		}
+	}
+	.leavefont {
+		font-size: 28rpx;
+		font-weight: 500;
+		color: #808080;
+		margin-bottom: 10rpx;
+	}
+}
 </style>

pages/problem/problem.vue

@@ -1,10 +1,27 @@
 <template>
 	<view class="center">
-		<view v-for="(item,index) in problemList" :key="index">
-			<view class="title">{{item.title}}</view>
-			<view class="content">{{item.content}}</view>
-			<view class="reply">{{item.reply}}</view>
+		<view class="bg">
+			<view class="title">问题反馈</view>
 		</view>
+		<scroll-view scroll-y="true" class="list">
+			<view v-for="(item,index) in problemList" :key="index">
+				<view class="problem">
+					<view class="top flex">
+						<image :src="userInfo.avatar"></image>
+						<view class="font">
+							<view class="title">{{ userInfo.nickname}}</view>
+							<view class="time">2020-10-23 16:00</view>
+						</view>
+					</view>
+					<view class="centent">
+						{{ item.content }}
+					</view>
+					<view class="huif" v-if="item.reply != null">
+						<text>老师回复：</text>{{ item.reply }}
+					</view>
+				</view>
+			</view>
+		</scroll-view>
 		<view class="buttom" @click="nav('/pages/problem/problemAdd')">
 			新增问题
 		</view>
@@ -12,8 +29,12 @@
 </template>
 
 <script>
+import { mapState, mapMutations } from 'vuex';
 import { getProblem } from '@/api/problem.js' 
 export default {
+	computed: {
+		...mapState(['hasLogin', 'userInfo', 'baseURL', 'urlFile'])
+	},
 	data(){
 		return{
 			page: 1,
@@ -81,5 +102,79 @@ export default {
 }
 </script>
 
-<style>
+<style lang="scss">
+.center {
+	background: #F6F6F6;
+}
+.bg {
+	height: 426rpx;
+	background: #1CC7C7;
+	position: relative;
+	.title {
+		position: absolute;
+		top: 204rpx;
+		left: 48rpx;
+		font-size: 71rpx;
+		font-family: 59--Regular;
+		font-weight: 400;
+		color: #FFFFFF;
+	}
+}
+.problem {
+	margin: 20rpx;
+	background: #FFFFFF;
+	padding: 28rpx 44rpx 32rpx 30rpx;
+	.top {
+		justify-content: start;
+		margin-bottom: 34rpx;
+		image {
+			width: 95rpx;
+			height: 95rpx;
+			border-radius: 50%;
+		}
+		.font {
+			margin-left: 18rpx;
+			.title {
+				font-size: 32rpx;
+				font-weight: bold;
+				color: #3D4458;
+			}
+			.time {
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #999999;
+			}
+		}
+	}
+	.centent {
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #999999;
+	}
+	.huif {
+		margin-top: 38rpx;
+		font-size: 30rpx;
+		font-family: PingFang SC;
+		font-weight: bold;
+		color: #999999;
+		text{
+			color: #1CC7C7;
+		}
+	}
+}
+.buttom {
+	width: 674rpx;
+	height: 88rpx;
+	margin: 20rpx auto;
+	background: #1CC7C7;
+	border-radius: 44rpx;
+	text-align: center;
+	font-size: 36rpx;
+	font-weight: 500;
+	color: #FFFFFF;
+	line-height: 88rpx;
+}
+.list{
+	height: 780rpx;
+}
 </style>

pages/problem/problemAdd.vue

@@ -1,7 +1,10 @@
 <template>
 	<view class="center">
 		<view class="login_name"><input class="uni-input" v-model="title" focus placeholder="标题" /></view>
-		<input class="text" v-model="content" focus placeholder="内容"></input>
+		<view class="text">
+			<textarea @input="number" v-model="content" maxlength="300" focus placeholder="详细描述您的问题，老师会根据您的反馈及时解答哦"></textarea>
+			<view class="js">{{num}}/300</view>
+		</view>
 		<view class="buttom" @click="nav('/pages/course/success')">
 			提交
 		</view>
@@ -14,7 +17,8 @@ export default {
 	data(){
 		return{
 			title:'',
-			content:''
+			content:'',
+			num: 0
 		}
 	},
 	methods: {
@@ -26,16 +30,46 @@ export default {
 				uni.navigateTo({
 					url:url
 				})
-			}).cache(err =>{
-				console.log(err)
 			})
+		},
+		number() {
+			this.num = this.content.length;
 		}
 	}
 }
 </script>
 
-<style>
+<style lang="scss">
+	.login_name {
+		width: 90%;
+		margin: 30rpx auto;
+	}
 	.text{
-		height: 300rpx;
+		position: relative;
+		width: 90%;
+		margin: 30rpx auto;
+		height: 430rpx;
+		font-size: 30rpx;
+		font-weight: 500;
+		color: #999999;
+		.js{
+			position: absolute;
+			right: 50rpx;
+			bottom: 24rpx;
+			
+		}
+		textarea {
+			height: 100%;
+			width: 100%;
+		}
+	}
+	.buttom{
+		margin: 0 auto;
+		width: 560rpx;
+		height: 90rpx;
+		background: #1CC7C7;
+		border-radius: 45px;
+		text-align: center;
+		line-height: 90rpx;
 	}
 </style>

pages/user/user.vue

@@ -1,18 +1,49 @@
 <template>
 	<view class="center">
 		<view class="top">
-			<view class="bg"><image src="../../static/img/userBg.png" mode="aspectFill"></image></view>
-			<view class="userinfo">
-				<view class="price"><image :src="userInfo.avatar" mode=""></image></view>
-				<view class="name">{{ userInfo.nickname }}</view>
-				<view class="guiwen">顾问：李丹丹 12521026301</view>
+			<image class="bg" src="../../static/img/userBg.png"></image>
+			<view class="title">我的</view>
+			<view class="user flex">
+				<view class="toux"><image :src="userInfo.avatar" mode=""></image></view>
+				<view class="font">
+					<view class="name">{{ userInfo.nickname }}</view>
+					<view class="banzhuren">顾问：李丹 12012502360</view>
+				</view>
 			</view>
 		</view>
-		<view class="box">
-			<view class="index" @click="navT()"><image src="../../static/img/we.png"></image></view>
+		<view class="navBar flex">
+			<view class="left">
+				<image src="../../static/img/userLeft.png"></image>
+				<view class="centent">
+					<view class="title">待上课程</view>
+					<view class="text">待完成数</view>
+					<view class="number">394<text>个</text></view>
+				</view>
+			</view>
 			<view class="right">
-				<view class="about" @click="nav('/pages/homework/homework')"><image src="../../static/img/about.png"></image></view>
-				<view class="set" @click="nav('/pages/user/userInfo')"><image src="../../static/img/set.png"></image></view>
+				<image src="../../static/img/userRight.png"></image>
+				<view class="centent">
+					<view class="title">完成课程</view>
+					<view class="text">总完成数</view>
+					<view class="number">65<text>个</text></view>
+				</view>
+			</view>
+		</view>
+		<view class="system">
+			<view class="item flex" @click="nav('/pages/user/userInfo')">
+				<image class="img" src="../../static/img/aboutMy.png"></image>
+				<view class="item-text">我的资料</view>
+				<image class="return" src="../../static/img/return.png" ></image>
+			</view>
+			<view class="item flex">
+				<image class="img" src="../../static/img/userAbout.png"></image>
+				<view class="item-text">关于我们</view>
+				<image class="return" src="../../static/img/return.png" ></image>
+			</view>
+			<view class="item flex">
+				<image class="img" src="../../static/img/aboutSet.png"></image>
+				<view class="item-text">设置</view>
+				<image class="return" src="../../static/img/return.png" ></image>
 			</view>
 		</view>
 	</view>
@@ -103,85 +134,136 @@ page,
 	height: 100%;
 	background-color: #f8f8f8;
 }
-.top {
-	padding-top: 82rpx;
+.top{
 	position: relative;
 	width: 100%;
-	height: 414rpx;
-	text-align: center;
+	height: 474rpx;
 	.bg {
-		width: 100%;
-		height: 414rpx;
 		position: absolute;
-		left: 0;
 		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+	}
+	.title {
+		padding-left: 38rpx;
+		padding-top: 20rpx;
+		font-size: 48rpx;
+		font-weight: 500;
+		color: #111111;
+	}
+	.user {
+		justify-content: flex-start;
+		margin-top: 35rpx;
+		padding-left: 36rpx;
+		.toux {
+			width: 136rpx;
+			height: 136rpx;
+			background: #FFFFFF;
+			border-radius: 50%;
+			image {
+				width: 136rpx;
+				height: 136rpx;
+				border-radius: 50%;
+			}
+		}
+		.font {
+			height: 136rpx;
+			padding-top: 14rpx;
+			padding-left: 30rpx;
+			.name {
+				font-size: 36rpx;
+				font-weight: bold;
+				color: #000000;
+			}
+			.banzhuren {
+				margin-top: 14rpx;
+				font-size: 26rpx;
+				font-weight: 500;
+				color: #8E8E8E;
+			}
+		}
+	}
+}
+.navBar{
+	margin-top: -100rpx;
+	padding: 18rpx;
+	width: 100%;
+	.left {
+		position: relative;
+		width: 50%;
+		height: 250rpx;
 		image {
-			width: 100%;
+			
 			height: 100%;
+			width: 100%;
 		}
+		
 	}
-	.price {
-		margin: 0 auto;
+	.right {
 		position: relative;
-		z-index: 1;
-		width: 125rpx;
-		height: 125rpx;
-		box-shadow: 0rpx 14rpx 22rpx 0rpx rgba(247, 144, 108, 0.25);
-		border-radius: 50%;
+		width: 50%;
+		height: 250rpx;
 		image {
-			width: 100%;
 			height: 100%;
-			border-radius: 50%;
+			width: 100%;
 		}
 	}
-	.name {
-		margin-top: 32rpx;
-		position: relative;
-		z-index: 1;
-		font-size: 33rpx;
+}
+.centent {
+	position: absolute;
+	top: 0;
+	left: 0;
+	padding-left: 56rpx;
+	padding-top: 52rpx;
+	.title {
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #333333;
+	}
+	.text {
+		margin-top: 10rpx;
+		font-size: 24rpx;
 		font-weight: bold;
-		color: #E66030;
+		color: #8E8E8E;
 	}
-	.guiwen {
+	.number {
+		font-size: 44rpx;
+		font-weight: bold;
+		color: #1CC7C7;
+		text-shadow: 0px 2px 24px rgba(28, 199, 199, 0.4);
 		margin-top: 20rpx;
-		position: relative;
-		z-index: 1;
-		font-size: 25rpx;
-		font-weight: 500;
-		color: #E66030;
-		opacity: 0.49;
+		text {
+			font-size: 28rpx;
+		}
 	}
 }
-.box {
-	padding-left: 22rpx;
-	margin-top: 20rpx;
-	display: flex;
-	width: 100%;
-	.index {
-		width: 470rpx;
-		height: 488rpx;
-		image {
-			height: 100%;
-			width: 100%;
+.system {
+	width: 90%;
+	margin: 0 auto;
+	padding-top: 10rpx;
+	background: #FFFFFF;
+	box-shadow: 0px 2rpx 24rpx 0rpx rgba(0, 0, 0, 0.06);
+	border-radius: 20rpx;
+	.item {
+		height: 112rpx;
+		padding: 44rpx 36rpx 36rpx 40rpx;
+		.img {
+			height: 36rpx;
+			width: 36rpx;
+			
 		}
-	}
-	.right {
-		padding-top: 14rpx;
-		.about {
-			width: 238rpx;
-			height: 238rpx;
-			image {
-				height: 100%;
-				width: 100%;
-			}
+		.item-text {
+			width: 85%;
+			text-align: left;
+			font-size: 32rpx;
+			font-weight: 500;
+			color: #555555;
+			line-height: 36rpx;
 		}
-		.set{
-			width: 238rpx;
-			height: 238rpx;
-			image {
-				height: 100%;
-				width: 100%;
-			}
+		.return {
+			width: 14rpx;
+			height: 26rpx;
 		}
 	}
 }

pages/user/userInfo.vue

@@ -2,7 +2,7 @@
 	<view class="content">
 		<view class="row1">
 			<text class="tit">头像</text>
-			<view class="background-img"><image class="background-img"   mode="aspectFill"></image></view>
+			<view class="background-img"><image class="background-img" v-model="avatar" :src="avatar" mode="aspectFill"></image></view>
 		</view>
 		<view class="row">
 			<text class="tit">家长</text>
@@ -24,6 +24,7 @@ import { mapState } from 'vuex';
 export default{
 	data(){
 		return{
+			avatar: '',
 			patriarch: '',
 			student: '',
 			phone: ''
@@ -32,9 +33,12 @@ export default{
 	computed: {
 		...mapState('user', ['userInfo'])
 	},
-	onLoad() {
-		console.log(this.userInfo)
-	}
+	onShow(option) {
+		// 获取生日日期
+		this.patriarch = this.userInfo.real_name || '';
+		this.avatar = this.userInfo.avatar || '';
+		this.phone = this.userInfo.phone || '';
+	},
 }
 </script>