3.28-3

components/todayclass-box/todayclass-box.vue

@@ -0,0 +1,100 @@
+<template>
+	<!-- 今日课程 -->
+	<!-- 内容 -->
+	<view>
+		<view class="home-title-text">
+			<view class="msg">课程数:</view>
+			<view class="card-content">{{classList.length}}</view>
+			<view style="display: flex; align-items: center; margin-left: auto; margin-right: 30rpx;">
+				<view class="t-icon t-icon-chakan" @click="navClass"></view>
+				<view class="msg" style="margin-left: 10rpx;" @click="navClass">查看全部课程</view>
+			</view>
+		</view>
+
+		<!-- 课程列表 -->
+		<view class="u-page__item">
+			<view class="class-block">
+				<view class="block-title">{{classList[classCurrent-1]}}</view>
+				<u-tag :text="teacherList[classCurrent-1]" size="mini" plain  shape="circle"></u-tag>
+				<view class="block-subtitle">上节</view>
+				<view class="block-subtitle">14:00-15:20</view>
+				<u-tag text="查看回放" plain icon="hourglass"></u-tag>
+			</view>
+
+			<view class="class-block" style="background-color: #fff;">
+				<view class="block-title">{{classList[classCurrent]}}</view>
+				<u-tag :text="teacherList[classCurrent]" size="mini" shape="circle"></u-tag>
+				<view class="block-subtitle">当前</view>
+				<view class="block-subtitle">15:30-16:50</view>
+				<u-tag text="查看直播" type="error" icon="play-right"></u-tag>
+			</view>
+
+			<view class="class-block">
+				<view class="block-title">{{classList[classCurrent+1]}}</view>
+				<u-tag :text="teacherList[classCurrent+1]" size="mini" plain shape="circle"></u-tag>
+				<view class="block-subtitle">下节</view>
+				<view class="block-subtitle">17:00-18:20</view>
+				<u-tag text="暂未开始" plain icon="pushpin"></u-tag>
+			</view>
+		</view>
+	</view>
+
+
+</template>
+
+<script>
+	export default {
+		name: "todayclass-box",
+		data() {
+			return {
+				//今日课程
+				classList: ['数学', '语文', '英语', '体育', '思品'],
+				//授课老师
+				teacherList: ['张老师', '李老师', '王老师', '陈老师', '黄老师'],
+				//当前课程
+				classCurrent: 2,
+				//倒计时时间
+				dayTimeData: {},
+				classTimeData: {}
+			};
+		},
+		methods: {
+			navClass(){
+				uni.navigateTo({
+					url:'/subpkg/classmsg/classmsg'
+				})
+			},
+			
+		}
+	}
+</script>
+
+<style lang="scss">
+	.class-block {
+		display: flex;
+		align-items: center;
+		justify-content: space-around;
+		background-color: #f6f7f8;
+		margin: -10rpx auto 20rpx auto;
+		padding: 5rpx;
+		width: 94%;
+		height: 120rpx;
+		border-radius: $card-border-radius;
+
+		.block-title {
+			font-size: 32rpx;
+			font-weight: bold;
+			color: $color-title;
+		}
+		.block-subtitle{
+			font-size: 22rpx;
+			color: $color-title;
+		}
+	}
+
+	.t-icon {
+		width: 30rpx;
+		height: 30rpx;
+	}
+	
+</style>

components/todaydata-box/todaydata-box.vue

@@ -322,7 +322,7 @@
 			.chart-info-text {
 				font-size: 30rpx;
 				font-weight: bold;
-				color: #3B4144;
+				color: $color-title;
 				margin-left: 10rpx;
 			}
 		}

gradepkg/common/chartpage.scss

@@ -32,7 +32,7 @@
 				margin-left: 30rpx;
 
 				.children-name {
-					color: #3B4144;
+					color: $color-title;
 					font-size: 32rpx;
 					font-weight: bold;
 					margin-bottom: 10rpx;
@@ -68,7 +68,7 @@
 				.chart-name-text {
 					font-size: 30rpx;
 					font-weight: bold;
-					color: #3B4144;
+					color: $color-title;
 					margin-left: 10rpx;
 				}
 
@@ -81,7 +81,7 @@
 					.btn {
 						margin-right: 10rpx;
 						line-height: 60rpx;
-						color: #3B4144;
+						color: $color-title;
 						font-size: 28rpx;
 					}
 				}

pages.json

@@ -40,8 +40,7 @@
 			"path": "pages/homework/homework",
 			"style": {
 				"enablePullDownRefresh": true,
-				"navigationStyle": "custom",
-				"disableScroll": true
+				"navigationStyle": "custom"
 			}
 
 		}
@@ -96,6 +95,20 @@
 					"disableScroll": true
 				}
 
+			}, {
+				"path": "calendarmsg/calendarmsg",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
+			}, {
+				"path": "classmsg/classmsg",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
 			}
 		]
 	}, {

pages/common/mainpage.scss

@@ -14,15 +14,16 @@
 			justify-content: space-between;
 
 			.card-item {
-				margin: 2% 0;
+				margin: 2% 0;
+				width: 48%;
+				height: auto;
 				display: flex;
-				flex-direction: column;
+				flex-direction: column;
 				justify-content: space-around;
 				background-color: #FFF;
 				// box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
 				border-radius: $card-border-radius;
-				width: 48%;
-				height: auto;
+				
 
 				.card-info {
 					display: flex;
@@ -45,21 +46,15 @@
 			}
 		}
 	}
-	//日历组件
-	.calendar_container {
-		height: 100%;
-		width: auto;
-		background-color: #FFF;
-		margin: 10rpx;
-		box-sizing: border-box;
-	}
+	
 	.home-title-text {
 		display: flex;
-		align-items: center;
+		align-items: center;
+		flex-wrap: wrap;
 		margin: -10rpx 0 10rpx 0;
 	}
 	.msg {
-		color: #3B4144;
+		color: $color-title;
 		margin-left: 30rpx;
 		font-size: 30rpx;
 		font-weight: bold;
@@ -74,40 +69,4 @@
 		width: 40rpx;
 		height: 40rpx;
 	}
-	//倒计时
-	.time {
-		@include flex;
-		align-items: center;
-		margin-left: 30rpx;
-		margin-bottom: 5rpx;
-	
-		&__custom {
-			margin-top: 4px;
-			width: 22px;
-			height: 22px;
-			background-color: $u-primary;
-			border-radius: 4px;
-			/* #ifndef APP-NVUE */
-			display: flex;
-			/* #endif */
-			justify-content: center;
-			align-items: center;
-	
-			&__item {
-				color: #fff;
-				font-size: 12px;
-				text-align: center;
-			}
-		}
-	
-		&__doc {
-			color: $u-primary;
-			padding: 0px 4px;
-		}
-	
-		&__item {
-			color: #606266;
-			font-size: 15px;
-			margin-right: 4px;
-		}
-	}
+	

pages/grade/grade.vue

@@ -63,7 +63,7 @@
 				<view class="chart-container" @click="navAbility">
 					<view class="chart-name">
 						<view :class="icon.Ability"></view>
-						<text class="chart-name-text">考试能力分析</text>
+						<text class="chart-name-text">个人能力分析</text>
 					</view>
 					<view class="charts-box">
 						<qiun-data-charts type="mini-column" :chartData="gradeData.abilityChart.importantAnalyse"
@@ -244,7 +244,7 @@
 				margin-left: 20rpx;
 				font-size: 30rpx;
 				font-weight: bold;
-				color: #3B4144;
+				color: $color-title;
 			}
 		}
 

pages/home/home.vue

@@ -10,116 +10,48 @@
 		<!-- 卡片区域 -->
 		<view class="card-box">
 
-			<!-- 今日打卡 -->
+			<!-- 今日课程 -->
 			<view class="card-item" style="width: 100%;">
+				<view class="card-info">
+					<view :class="icon.class"></view>
+					<text class="info-text">今日课程</text>
+				</view>
+				<todayclass-box></todayclass-box>
+			</view>
+			
+			<!-- 今日打卡 -->
+			<view class="card-item">
 				<view class="card-info">
 					<view :class="icon.record"></view>
 					<text class="info-text">今日打卡</text>
 				</view>
+				<view style="display: flex; align-items: center; margin:0 0 20rpx 30rpx;">
+					<view class="t-icon t-icon-chakan" style="width: 30rpx; height: 30rpx;" @click="navCalendar"></view>
+					<view class="msg" style="margin-left: 10rpx;" @click="navCalendar">查看详细记录</view>
+				</view>
 				<view class="home-title-text">
 					<view class="msg">今日出勤:</view>
 					<view class="card-content">{{homeData.attendance}}</view>
 				</view>
-				<view class="calendar_container">
-					<zsyCalendar :sundayIndex="6" @change="dateHandler" />
-				</view>
-			</view>
-
-			<!-- 今日课程 -->
-			<view class="card-item" style="width: 100%;">
-				<view class="card-info">
-					<view :class="icon.class"></view>
-					<text class="info-text">今日课程</text>
-				</view>
-				<!-- 内容 -->
-				<view class="home-title-text" style="justify-content: space-between;">
-					<view style="display: flex;align-items: center;">
-						<view class="msg">课程数:</view>
-						<view class="card-content">{{homeData.classList.length}}</view>
-					</view>
-
-
-					<view class="time-box" style=" margin:-20rpx 30rpx 20rpx 0;">
-						<view class="msg">今日课程在:</view>
+				<view class="home-title-text">
+					<view class="msg">打卡时间:</view>
+					<view style="margin-left: 10rpx;">
+						<!-- <u-tag text="8点15分" plain shape="circle"></u-tag> -->
 						<view style="display: flex; align-items: center;">
-							<u-count-down :time="8*60 * 60 * 1000" format="HH:mm:ss" autoStart millisecond
-								@change="dayChange">
-								<view class="time">
-									<view class="time__custom">
-										<text
-											class="time__custom__item">{{ dayTimeData.hours>10?dayTimeData.hours:'0'+dayTimeData.hours}}</text>
-									</view>
-									<text class="time__doc">:</text>
-									<view class="time__custom">
-										<text class="time__custom__item">{{ dayTimeData.minutes }}</text>
-									</view>
-									<text class="time__doc">:</text>
-									<view class="time__custom">
-										<text class="time__custom__item">{{ dayTimeData.seconds }}</text>
-									</view>
-								</view>
-							</u-count-down>
-							<view class="msg">后结束</view>
+							<view class="number-box">08</view>
+							<view style="color: #3C9CFF;">:</view>
+							<view class="number-box">15</view>
 						</view>
 					</view>
-
-
 				</view>
-				<view class="u-page__item">
-					<u-collapse :border="false">
-						<u-collapse-item title="今日课程列表:">
-							<u-subsection :list="homeData.classList" :current="homeData.classCurrent"></u-subsection>
-						</u-collapse-item>
-						<u-collapse-item title="今日授课老师:">
-							<u-subsection :list="homeData.teacherList" :current="homeData.classCurrent"></u-subsection>
-						</u-collapse-item>
-					</u-collapse>
+				<view class="home-title-text">
+					<view class="msg">本周出勤质量:</view>
+					<view class="card-content">优秀</view>
 				</view>
+				
 			</view>
-			<!-- 正在参与课程 -->
-			<view class="card-item">
-				<view class="card-info">
-					<view :class="icon.classNow"></view>
-					<text class="info-text">当前课堂</text>
-				</view>
-				<view style="display: flex; justify-content: center; flex-direction: column;">
-					<view class="home-title-text">
-						<view class="msg">孩子正在上:</view>
-						<view class="card-content">{{homeData.classList[homeData.classCurrent]}}课</view>
-					</view>
-					<view class="home-title-text">
-						<view class="msg">教学老师是:</view>
-						<view class="card-content">{{homeData.teacherList[homeData.classCurrent]}}</view>
-					</view>
-					<view class="msg" style="margin: 0 0 20rpx 30rpx;">当前课程在:</view>
-					<!-- 倒计时组件 -->
-					<view class="home-title-text">
-						<u-count-down :time="60 * 60 * 1000" format="HH:mm:ss" autoStart millisecond @change="classChange">
-							<view class="time">
-								<view class="time__custom">
-									<text
-										class="time__custom__item">{{ classTimeData.hours>10?classTimeData.hours:'0'+classTimeData.hours}}</text>
-								</view>
-								<text class="time__doc">:</text>
-								<view class="time__custom">
-									<text class="time__custom__item">{{ classTimeData.minutes }}</text>
-								</view>
-								<text class="time__doc">:</text>
-								<view class="time__custom">
-									<text class="time__custom__item">{{ classTimeData.seconds }}</text>
-								</view>
-							</view>
-						</u-count-down>
-						<view class="msg" style="margin-left: 10rpx;">后结束</view>
-					</view>
-					<view class="home-title-text">
-						<view class="msg">下一堂课:</view>
-						<view class="card-content">{{homeData.classList[homeData.classCurrent+1]}}课</view>
-					</view>
-				</view>
-
-
-			</view>
+			
+			
 			<!-- 评测 -->
 			<view class="card-item" @click="navHomework">
 				<view class="card-info">
@@ -160,21 +92,15 @@
 </template>
 
 <script>
-	import zsyCalendar from '@/components/zsy-calendar/zsy-calendar'
 	import {
 		mapState
 	} from 'vuex'
 	export default {
-		name: 'Calendar',
-		components: {
-			zsyCalendar
-		},
 		computed: {
 			...mapState('m_chart', ['todayData']),
 			...mapState('m_children', ['childreninfo']),
 			...mapState('m_parent', ['myData'])
 		},
-		components: {},
 		data() {
 			return {
 				//滚动通知
@@ -183,18 +109,11 @@
 				homeData: {
 					//出勤状况
 					attendance: '已打卡',
-					//今日课程
-					classList: ['数学', '语文', '英语', '体育', '思品'],
-					//授课老师
-					teacherList: ['张老师', '李老师', '王老师', '陈老师', '黄老师'],
-					//当前课程
-					classCurrent: 2,
 				},
 				//图标
 				icon: {
 					record: 't-icon t-icon-dakaqiandao',
 					class: 't-icon t-icon-banji',
-					classNow: 't-icon t-icon-shijian',
 					evaluation: 't-icon t-icon-ceping',
 					homework: 't-icon t-icon-bianji1',
 					activity: 't-icon t-icon-huodong'
@@ -207,9 +126,7 @@
 				activityOpts: {},
 				//时间戳
 				timeStamp: '',
-				//倒计时时间
-				dayTimeData: {},
-				classTimeData: {}
+
 			}
 		},
 		onLoad() {
@@ -234,6 +151,11 @@
 					url: '/pages/homework/homework'
 				})
 			},
+			navCalendar() {
+				uni.navigateTo({
+					url:'/subpkg/calendarmsg/calendarmsg'
+				})
+			},
 			//设置圆环图描述更新
 			setOpts() {
 				//圆环图标题和副标题动态变化
@@ -283,22 +205,23 @@
 				this.homeworkOpts = homework;
 				this.activityOpts = activity;
 			},
-			//日历事件
-			dateHandler(e) {
-				console.log(e)
-			},
-			//倒计时事件
-			classChange(e) {
-				this.classTimeData = e
-			},
-			dayChange(e) {
-				this.dayTimeData = e
-			}
-
+			
 		},
 	}
 </script>
 
 <style lang="scss">
 	@import '@/pages/common/mainpage.scss';
+	.number-box{
+		width: 40rpx;
+		height: 40rpx;
+		border-radius: 8rpx;
+		background-color: #3C9CFF;
+		color: #FFF;
+		padding: 5rpx;
+		margin: 5rpx;
+		display: flex;
+		justify-content: center;
+		align-items: center;
+	}
 </style>

pages/homework/homework.vue

@@ -20,17 +20,18 @@
 					</view>
 					<view class="image" :style="{backgroundImage:`url(${item.image})`}"></view>
 				</view>
-
+				<!-- 中间标题 -->
 				<view style="display: flex; align-items: center;">
 					<view class="cut-off">{{item.detail.nav}}</view>
 					<!-- <u-button text="获得报表" :plain="true" :hairline="true" shape="circle" size="small"></u-button> -->
 				</view>
-
+				<!-- 列表 -->
 				<view class="detail-box" v-if="current == index">
+
 					<view class="detail-box-item">
 						<view class="item-info">
 							<view class="t-icon t-icon-ceping"></view>
-							<view class="item-text">近五天完成率</view>
+							<view class="item-text">近七天完成率</view>
 						</view>
 						<view class="charts-box" v-if="current == 0">
 							<qiun-data-charts type="fin-column" :chartData="homeworkData.testData" :loadingType="4"
@@ -51,35 +52,31 @@
 							<view class="t-icon t-icon-shenhe"></view>
 							<view class="item-text">今日已完成</view>
 						</view>
-						<u-list>
-							<u-list-item>
-								<u-cell :title="`列表长度-${index + 1}`"></u-cell>
-								<u-cell :title="`列表长度-${index + 1}`"></u-cell>
-								<u-cell :title="`列表长度-${index + 1}`"></u-cell>
-							</u-list-item>
-						</u-list>
+
 					</view>
 
-					<view class="detail-box-item" style="height: 100%;">
+					<view class="detail-box-item">
 						<view class="item-info">
 							<view class="t-icon t-icon-daiban"></view>
 							<view class="item-text">{{item.detail.title}}</view>
 						</view>
-						<u-swipe-action v-for="(msg,i) in item.detail.data" :key="i">
-							<u-swipe-action-item :options="options1">
-								<view class="swipe-action u-border-top u-border-bottom">
-									<view class="swipe-action__content">
-										<text class="swipe-action__content__text">{{msg.name}}</text>
+						
+						<view style="padding: 20rpx;">
+							<u-swipe-action v-for="(msg,i) in item.detail.data" :key="i" >
+								<u-swipe-action-item :options="options1">
+									<view class="swipe-action u-border-top u-border-bottom">
+										<view class="swipe-action__content">
+											<text class="swipe-action__content__text">{{msg.name}}</text>
+										</view>
 									</view>
-								</view>
-							</u-swipe-action-item>
-						</u-swipe-action>
+								</u-swipe-action-item>
+							</u-swipe-action>
+						</view>
 					</view>
-				</view>
-
-			</view>
 
 
+				</view>
+			</view>
 		</view>
 
 	</view>
@@ -121,17 +118,16 @@
 						nav: '评测信息',
 						title: '评测列表',
 						data: [{
-								name: '评测数据1'
-							}, {
-								name: '评测数据2'
-							}, {
-								name: '评测数据3'
-							}, {
-								name: '评测数据4'
-							}, {
-								name: '评测数据5'
-							}
-						]
+							name: '评测数据1'
+						}, {
+							name: '评测数据2'
+						}, {
+							name: '评测数据3'
+						}, {
+							name: '评测数据4'
+						}, {
+							name: '评测数据5'
+						}]
 					}
 				}, {
 					title: '今日作业数:' + '\xa0\xa0\xa0',
@@ -145,13 +141,12 @@
 						nav: '作业信息',
 						title: '作业列表',
 						data: [{
-								name: '作业数据1'
-							}, {
-								name: '作业数据2'
-							}, {
-								name: '作业数据3'
-							}
-						]
+							name: '作业数据1'
+						}, {
+							name: '作业数据2'
+						}, {
+							name: '作业数据3'
+						}]
 					}
 				}, {
 					title: '今日活动数:' + '\xa0\xa0\xa0',
@@ -165,26 +160,25 @@
 						nav: '活动信息',
 						title: '活动列表',
 						data: [{
-								name: '活动数据1'
-							}, {
-								name: '活动数据2'
-							}, {
-								name: '活动数据3'
-							}, {
-								name: '活动数据4'
-							}, {
-								name: '活动数据5'
-							}, {
-								name: '活动数据6'
-							}
-						]
+							name: '活动数据1'
+						}, {
+							name: '活动数据2'
+						}, {
+							name: '活动数据3'
+						}, {
+							name: '活动数据4'
+						}, {
+							name: '活动数据5'
+						}, {
+							name: '活动数据6'
+						}]
 					}
 				}],
 				//历史数据
 				historyData: {
-					test: [90, 89, 98, 100, 50],
-					homework: [10, 29, 38, 60, 50],
-					activity: [70, 19, 28, 40, 60]
+					test: [90, 89, 98, 100, 50, 55,77],
+					homework: [10, 29, 38, 60, 50,88,100],
+					activity: [70, 19, 28, 40, 60,100,100]
 				},
 				options1: [{
 					text: '待办',
@@ -227,7 +221,7 @@
 					}]
 				}
 				//时间
-				temp.categories = this.$getRecentDateArray(5)
+				temp.categories = this.$getRecentDateArray(7)
 				//数据
 				//解除对象指向同一块内存(拷贝)
 				temp.series[0].data = this.historyData.test
@@ -277,8 +271,7 @@
 
 			.card-subtitle {
 				margin: 10rpx 20rpx;
-				font-size: 30rpx;
-				font-weight: bold;
+				font-size: 28rpx;
 				color: #FFF;
 			}
 
@@ -303,23 +296,20 @@
 
 		.detail-box {
 			display: flex;
-			flex-flow: column wrap;
+			flex-flow: row wrap;
+			margin: 20rpx;
 			justify-content: space-between;
-			margin: 20rpx 0 20rpx 0;
-			height: 700rpx;
-			width: 100%;
 
 			.detail-box-item {
-				margin: 0 2%;
-				height: 48%;
-				width: 46%;
+				margin: 2% 0;
+				width: 100%;
+				height: auto;
 				background-color: #FFF;
 				border-radius: $card-border-radius;
 
 				.item-info {
 					display: flex;
 					align-items: center;
-					padding: 10rpx;
 
 					.t-icon {
 						width: 40rpx;
@@ -329,13 +319,12 @@
 					.item-text {
 						font-size: 30rpx;
 						font-weight: bold;
-						color: #3B4144;
+						color: $color-title;
 						margin-left: 10rpx;
 					}
 				}
 			}
 		}
-
 	}
 
 	.charts-box {

pages/my/my.vue

@@ -215,7 +215,7 @@
 				font-weight: bold;
 
 				.name {
-					color: #3B4144;
+					color: $color-title;
 					font-size: 36rpx;
 					font-weight: bold;
 					margin-left: 10rpx;

subpkg/calendarmsg/calendarmsg.vue

@@ -0,0 +1,40 @@
+<template>
+	<view>
+		<view class="calendar_container">
+			<zsyCalendar :sundayIndex="6" @change="dateHandler" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import zsyCalendar from '@/subpkg/zsy-calendar/zsy-calendar.vue'
+	export default {
+		name: 'Calendar',
+		components: {
+			zsyCalendar
+		},
+		data() {
+			return {
+				
+			};
+		},
+		methods:{
+			//日历事件
+			dateHandler(e) {
+				console.log(e)
+			},
+		}
+	}
+</script>
+
+<style lang="scss">
+//日历组件
+	.calendar_container {
+		height: 100%;
+		width: auto;
+		background-color: #FFF;
+		margin: 20rpx;
+		box-sizing: border-box;
+		border-radius: $card-border-radius;
+	}
+</style>

subpkg/classmsg/classmsg.vue

@@ -0,0 +1,19 @@
+<template>
+	<view>
+		
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+
+</style>

subpkg/common/infopage.scss

@@ -56,7 +56,7 @@
 			margin: 10rpx 0 0 60rpx;
 			font-size: 35rpx;
 			font-weight: bold;
-			color: #3B4144;
+			color: $color-title;
 		}
 
 		.data-box-item {

components/zsy-calendar/zsy-calendar.vue

@@ -3,7 +3,7 @@
 	<view class="zsy_calendar">
 		<!-- 日历顶部信息 -->
 		<view class="calendar_info">
-			<text class="title">每日记录</text>
+			<text class="title">打卡记录</text>
 			<text class="desc">
 				({{ getAssignDateInfo(false, 0) === getAssignDateInfo(true, 0) ? '' : getAssignDateInfo(false, 0) + '年' }}{{ getAssignDateInfo(false, 1) }}月)
 			</text>
@@ -96,7 +96,7 @@
 			},
 			mode: { // 日历模式
 				type: String,
-				default: 'close'
+				default: 'open'
 			},
 			changeSetDefault: { // 月份切换时是否显示一号还是当前月份选中高亮
 				type: Boolean,