优化block，优化提示tooltip，优化项目结构，统一色彩等

common/style.scss

@@ -4,8 +4,10 @@ $box-shadow-stereo-white: 5px 5px 10px #f2f2f2,-5px -5px 10px #ffffff;
 $box-background-card: linear-gradient(150deg, #f0f0f0, #ffffff);
 //页面背景
 $page-background-color: #F5F5F5;
-//主题色
-$color-blue: #0080ff;
+//主题色
+$color-mixblue: #4169E1;
+$color-blue: #3C9CFF;
+$color-camblue: #bdd2ef;
 $color-green: #00b894;
 $color-pink: #ff8caf;
 $color-yellow: #f9c752;

components/back/back.vue

@@ -59,7 +59,8 @@
 		}
 		
 		.back-text{
-			font-size: 40rpx;
+			font-size: 40rpx;
+			font-weight: bold;
 			margin:0 0 6rpx 20rpx;
 		}
 	}

components/interactive-box/interactive-box.vue

@@ -2,8 +2,8 @@
 	<!-- 今日记录模块 -->
 	<view class="module-container">
 		<u-tabs :list="list" :current="current" @change="changeModule"
-			:activeStyle="{color: '#3c9cff',fontWeight: 'bold',transform: 'scale(1.08)',}"
-			:inactiveStyle="{fontWeight: 'bold',transform: 'scale(1)'}" lineColor="#3c9cff" lineWidth="60"></u-tabs>
+			:activeStyle="{color: '#4169E1',fontWeight: 'bold',transform: 'scale(1.08)',}"
+			:inactiveStyle="{fontWeight: 'bold',transform: 'scale(1)'}" lineColor="#4169E1" lineWidth="60"></u-tabs>
 
 		<!-- 记录模块 -->
 		<view class="module-box" v-if="current == 0">
@@ -98,7 +98,7 @@
 				//记录卡片
 				moduleData: [{
 						text: '自主学习记录',
-						color: 'background-color: #5b7cff;',
+						color: 'background-color: #4169E1;',
 						icon: 't-icon t-icon-bianjibi',
 						numData: '记录一下',
 					},

components/todayclass-box/todayclass-box.vue

@@ -10,16 +10,16 @@
 
 			<view class="class-block" v-for="(classInfo,classIndex) in homeClassList" :key="classIndex"
 				:style="{backgroundColor: classIndex === 1 ? '#FFF' : ''}">
-				<view class="block-title" :style="{color: classIndex === 1 ? '#3c9cff' : ''}">{{classInfo.name}}</view>
+				<view class="block-title" :style="{color: classIndex === 1 ? '#4169E1' : ''}">{{classInfo.name}}</view>
 				<view class="block-tag-box">
 					<view class="block-tag">{{classInfo.teacher}}</view>
 				</view>
 				<view class="block-subtitle" v-if="classIndex === 0 && state != 'none'">{{first}}</view>
-				<view class="block-subtitle" style="color: #3c9cff;" v-if="classIndex === 1 && state != 'none'">
+				<view class="block-subtitle" style="color: #4169E1;" v-if="classIndex === 1 && state != 'none'">
 					{{second}}
 				</view>
 				<view class="block-subtitle" v-if="classIndex === 2 && state != 'none'">{{third}}</view>
-				<view class="block-subtitle" :style="{color: classIndex === 1 ? '#3c9cff' : ''}" @click="navClass">
+				<view class="block-subtitle" :style="{color: classIndex === 1 ? '#4169E1' : ''}" @click="navClass">
 					{{classInfo.time}}
 				</view>
 				<u-tag :text="before" :type="beforeType" plain icon="hourglass"
@@ -34,7 +34,6 @@
 
 	</view>
 </template>
-
 <script>
 	import {
 		mapState
@@ -127,19 +126,19 @@
 			},
 			navClass() {
 				uni.navigateTo({
-					url: '/subpkg/classmsg/classmsg'
+					url: '/subpkg/classlist/classlist'
 				})
 			},
 			navVideoBefore() {
 				if (this.before === '查看回放') {
 					uni.navigateTo({
-						url: '/subpkg/classvideo/classvideo'
+						url: '/subpkg/video/videopage'
 					})
 				}
 			},
 			navVideoNow() {
 				uni.navigateTo({
-					url: '/subpkg/classvideo/classvideo'
+					url: '/subpkg/video/livepage'
 				})
 			},
 		},
@@ -153,7 +152,7 @@
 	@import '@/pages/common/blockmsg.scss';
 
 	.detail-image {
-		margin-top: -80rpx;
+		margin-top: -50rpx;
 		width: 100%;
 		height: 450rpx;
 		background-size: 100%;

components/top-box/top-box.vue

@@ -7,13 +7,13 @@
 				:style="'top:'+ capsuleBottom + 'px;left:'+ capsuleMiddle + 'px;'+'width:'+capsuleWidth+ 'px'">
 				<text class="time-text">更新于: {{timeStamp}}</text>
 				<!-- 订阅版本 -->
-				<button class="estate" :style="{backgroundImage:`url(${backgroundImage})`}" @click="navSubscribe">{{myData.subscribeLevel}}</button>
+				<button class="estate" :style="{backgroundImage:`url(${backgroundImage})`}"
+					@click="navSubscribe">{{myData.subscribeLevel}}</button>
 			</view>
-
 		</view>
 		<view style="display: flex;margin-top: -450rpx;
     margin-bottom: 120rpx;">
-			<image class="children-avatar" :src="childreninfo.avatar" @click="showChildrenList"></image>
+			<image class="children-avatar" :src="childreninfo.avatar"></image>
 			<view class="children-name">
 				<text class="name">{{childreninfo.name}}</text>
 				<view class="detail-box">
@@ -29,17 +29,6 @@
 		<u-picker class="picker" :show="setSemesterPicker" :closeOnClickOverlay="true" :columns="semesterList"
 			ref="uPicker" @confirm="pickerConfirm" @cancel="pickerCancel" :immediateChange="true"></u-picker>
 
-		<!-- 切换孩子 -->
-		<view class="list-box" v-show="show">
-			<view class="children-item" v-for="(item,index) in parentdetail.childrenList" :key="index"
-				@click="switchChildren(item)">
-				<view class="item-box">
-					<image class="item-avatar" :src="item.avatar"></image>
-					<text class="item-text">{{item.name}}</text>
-				</view>
-			</view>
-		</view>
-
 	</view>
 </template>
 
@@ -57,12 +46,12 @@
 				default: false
 			}
 		},
-		watch:{
-			setSemesterPicker(newValue){
-				if(newValue === true){
+		watch: {
+			setSemesterPicker(newValue) {
+				if (newValue === true) {
 					uni.hideTabBar({})
 				}
-				if(newValue === false){
+				if (newValue === false) {
 					uni.showTabBar({})
 				}
 			}
@@ -79,6 +68,8 @@
 				capsuleWidth: 0,
 				//订阅背景图片
 				backgroundImage: 'https://tse1-mm.cn.bing.net/th/id/OIP-C.Vg_hgwLC0hRD46zTHmCD8wHaHr?pid=ImgDet&rs=1',
+				//是否正在加载
+				isLoading: false,
 			};
 		},
 		computed: {
@@ -89,28 +80,32 @@
 			...mapMutations('m_children', ['updateChildrenInfo', 'updateChildrenSemester']),
 			//学期选择
 			pickerConfirm(e) {
-				//拼接图表数据
-				this.updateChildrenSemester(e.value[0])
-				uni.$showMsg('切换完成', 1000)
-				this.setSemesterPicker = false
+				if (e.value[0] != this.semester) {
+					//拼接图表数据
+					this.updateChildrenSemester(e.value[0])
+					this.isLoading = true
+					console.log(e.value[0], this.childreninfo.tmdid);
+					this.$initGrade(e.value[0], this.childreninfo.tmdid)
+					this.setSemesterPicker = false
+					this.isLoading = false
+				} else {
+					this.setSemesterPicker = false
+				}
+
 			},
 			//取消选择
 			pickerCancel() {
 				uni.$showMsg('取消选择', 1000)
 				this.setSemesterPicker = false
 			},
-			//头部孩子选择
-			showChildrenList(e) {
-				this.show = !this.show
-			},
 			switchChildren(item) {
 				this.updateChildrenInfo(item)
 				this.show = false
 			},
 			//订阅页面
-			navSubscribe(){
+			navSubscribe() {
 				uni.navigateTo({
-					url: '/subpkg/subscribecenter/subscribecenter'
+					url: '/subpkg/mydata/subscribepage'
 				})
 			}
 
@@ -191,36 +186,6 @@
 		}
 	}
 
-	.list-box {
-		margin: -100rpx 40rpx 120rpx 33rpx;
-		display: flex;
-		flex-wrap: wrap;
-
-		.children-item {
-			margin: 0 10rpx 0 10rpx;
-
-			.item-box {
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-
-				.item-avatar {
-					width: 90rpx;
-					height: 90rpx;
-					border-radius: 50rpx;
-					border: 4rpx solid #FFFFFF;
-				}
-
-				.item-text {
-					font-size: 24rpx;
-					font-weight: bold;
-					color: #6b778d;
-				}
-			}
-		}
-	}
-
 	.t-icon {
 		width: 40rpx;
 		height: 40rpx;

components/z-table/z-table.vue

@@ -525,7 +525,7 @@
 
 			.z-table-title-item {
 				border-bottom: solid 1rpx #DCDCDC;
-				background: #6495ED;
+				background: $color-mixblue;
 				color: #FFFFFF;
 			}
 
@@ -581,7 +581,7 @@
 			display: flex;
 			justify-items: center;
 			width: 100%;
-			background: #6495ED !important;
+			background: $color-mixblue !important;
 			color: #fff !important;
 			white-space: nowrap;
 			box-sizing: border-box;
@@ -591,7 +591,7 @@
 			}
 
 			.z-table-stick-side {
-				background: #6495ED !important;
+				background: $color-mixblue !important;
 				box-sizing: border-box;
 
 			}

gradepkg/ability-chart/ability-chart.vue

@@ -12,7 +12,7 @@
 
 		<!-- 数据分析模块 -->
 		<view class="data-box">
-			<view class="data-box-item" style="background-color: #0080ff;">
+			<view class="data-box-item" style="background-color: #4169E1;">
 				<view class="item-text">考试成绩波动对比:</view>
 				<view class="item-text" style="font-size: 50rpx;">{{mainExamUndulate>=quizExamUndulate?'小考稳定':'大考稳定'}}</view>
 				<view class="analysis-box">

gradepkg/common/chartpage.scss

@@ -17,6 +17,7 @@
 				width: 48%;
 				height: 300rpx;
 				border-radius: $card-border-radius;
+				padding-top: 15rpx;
 		
 				.item-text {
 					margin-left: 20rpx;
@@ -35,28 +36,34 @@
 						background-repeat: no-repeat;
 					}
 					.icon-text-item {
-						width: 280rpx;
+						width: 225rpx;
 						font-size: 32rpx;
 						font-weight: bold;
 						color: #FFFFFF;
+						margin-left: auto;
+						margin-right: 20rpx;
 					}
 				}
 				
 			}
 		}
-	.tooltip {
-			height: auto;
-			position: absolute;
-			display: flex;
-			flex-direction: column;
-			z-index: 99;
-			.tooltip-text {
-				margin: 0 auto;
-				font-size: 24rpx;
-				color: #FFFFFF;
-				font-weight: bold;
-			}
-		}
+	.tooltip {
+		position: absolute;
+		width: auto;
+		height: auto;
+		z-index: 99;
+		padding: 15rpx;
+		top: 220rpx;
+		right: 20rpx;
+		background-color: #FFF;
+		border-radius: $card-border-radius;
+			
+		.tooltip-text {
+			font-size: 24rpx;
+			color: $color-title;
+			font-weight: bold;
+		}
+	}
 		//头像区域
 		.children-box {
 			display: flex;
@@ -120,14 +127,17 @@
 					display: flex;
 					align-items: center;
 					margin-left: auto;
-					margin-right: 50rpx;
-					border-radius: $card-border-radius;
+					margin-right: 40rpx;
 					.btn {
 						margin-right: 10rpx;
 						line-height: 60rpx;
-						color: $color-title;
+						color: $color-mixblue;
 						font-size: 28rpx;
 					}
+					.t-icon{
+						width: 60rpx; 
+						height: 60rpx;
+					}
 				}
 			}
 		

gradepkg/general-chart/general-chart.vue

@@ -2,7 +2,7 @@
 	<view class="page-box">
 
 		<!-- 返回按钮 -->
-		<back></back>
+		<back text="成绩走势"></back>
 
 		<!-- 学生信息头部 -->
 		<view class="children-box">
@@ -11,8 +11,11 @@
 				<view class="children-name">{{childreninfo.name}}</view>
 				<view class="children-class">{{childreninfo.class}}</view>
 			</view>
+		</view>
+		<!-- 提示框 -->
+		<view class="tooltip" v-if="msgBox">
+			<view class="tooltip-text">点击图表显示内容</view>
 		</view>
-
 		<!-- 图表区域 -->
 		<!-- 总成绩图表 -->
 		<view class="chart-container">
@@ -21,7 +24,7 @@
 				<text class="chart-name-text">{{semester}} 总成绩对比</text>
 				<!-- 按钮区域 -->
 				<view class="btn-box">
-					<view class="t-icon t-icon-tishi2" style="width: 50rpx; height: 50rpx;"  @click="tooltipMsg"></view>
+					<view class="t-icon t-icon-tishi2"  @click="showMsgBox"></view>
 				</view>
 			</view>
 			<view class="charts-box">
@@ -37,7 +40,7 @@
 				<!-- 按钮区域 -->
 				<view class="btn-box" @click="setSubjectPicker = true">
 					<text class="btn">{{subjectCurrent}}</text>
-					<u-icon name="arrow-down" color="#3B4144;"></u-icon>
+					<view class="t-icon t-icon-xia"></view>
 				</view>
 			</view>
 			<!-- 图表 -->
@@ -55,7 +58,7 @@
 				<!-- 按钮 -->
 				<view class="btn-box" @click="switchScoreTypePicker = true">
 					<text class="btn">{{scoreTypeCurrent}}</text>
-					<u-icon name="arrow-down" color="#3B4144;"></u-icon>
+					<view class="t-icon t-icon-xia"></view>
 				</view>
 			</view>
 			<!-- 图表 -->
@@ -114,7 +117,9 @@
 		data() {
 			return {
 				//模拟数据
-				data: getdata.subjectData,
+				data: getdata.subjectData,
+				//提示框
+				msgBox: false,
 				//科目切换
 				setSubjectPicker: false,
 				//数据展示切换
@@ -173,8 +178,14 @@
 				this.switchScoreTypePicker = false
 			},
 			//提示信息
-			tooltipMsg() {
-				uni.$showMsg('点击图表展示更多信息', 1500)
+			showMsgBox() {
+				this.msgBox = true
+				console.log(this.msgBox);
+				let that = this;
+				setTimeout(function() {
+					that.msgBox = false;
+					console.log(that.msgBox);
+				}, 3000)
 			}
 		}
 	}

gradepkg/rank-chart/rank-chart.vue

@@ -47,7 +47,7 @@
 				<!-- 按钮区域 -->
 				<view class="btn-box" @click="setSubjectPicker = true">
 					<text class="btn">{{subjectCurrent}}</text>
-					<u-icon name="arrow-down" color="#3B4144;"></u-icon>
+					<view class="t-icon t-icon-xia"></view>
 				</view>
 			</view>
 			<view class="charts-box">
@@ -103,7 +103,7 @@
 				[{
 					title: '学期平均排行超年级:',
 					data: '',
-					color: '#0080ff',
+					color: '#4169E1',
 				}, {
 					title: '学期平均排行超班级:',
 					data: '',

gradepkg/subject-chart/subject-chart.vue

@@ -73,7 +73,7 @@
 				[{
 					title: '本学期优势科目为:',
 					data: '',
-					color: '#0080ff'
+					color: '#4169E1'
 				},{
 					title: '本学期劣势科目为:',
 					data: '',

pages.json

@@ -58,14 +58,14 @@
 
 			},
 			{
-				"path": "guide/guide",
+				"path": "guide/accesspage",
 				"style": {
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom",
 					"disableScroll": true
 				}
 			}, {
-				"path": "childrenInfo/childrenInfo",
+				"path": "info/childrenpage",
 				"style": {
 					"navigationStyle": "custom",
 					"enablePullDownRefresh": false,
@@ -73,14 +73,14 @@
 				}
 
 			}, {
-				"path": "mymsg/mymsg",
+				"path": "mydata/notificationpage",
 				"style": {
 					"navigationStyle": "custom",
 					"enablePullDownRefresh": true
 				}
 
 			}, {
-				"path": "parentInfo/parentInfo",
+				"path": "info/parentpage",
 				"style": {
 					"navigationStyle": "custom",
 					"enablePullDownRefresh": false,
@@ -88,7 +88,7 @@
 				}
 
 			}, {
-				"path": "childrenlist/childrenlist",
+				"path": "guide/childrenlist",
 				"style": {
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom",
@@ -96,42 +96,47 @@
 				}
 
 			}, {
-				"path": "calendarmsg/calendarmsg",
+				"path": "calendar/calendar",
 				"style": {
 					"navigationStyle": "custom",
 					"enablePullDownRefresh": false
 				}
 
 			}, {
-				"path": "classmsg/classmsg",
+				"path": "classlist/classlist",
 				"style": {
 					"navigationStyle": "custom",
 					"enablePullDownRefresh": false
 				}
 
 			}, {
-				"path": "classvideo/classvideo",
+				"path": "video/videopage",
 				"style": {
 					"navigationStyle": "custom",
 					"enablePullDownRefresh": false
 				}
 
 			}, {
-				"path": "homeworkdata/homeworkdata",
+				"path": "detaillist/detaillist",
 				"style": {
 					"navigationStyle": "custom",
 					"enablePullDownRefresh": false
 				}
 
-			}
-
-			, {
-				"path": "subscribecenter/subscribecenter",
+			}, {
+				"path": "mydata/subscribepage",
 				"style": {
 					"navigationStyle": "custom",
 					"enablePullDownRefresh": false
 				}
 
+			}, {
+				"path": "video/livepage",
+				"style": {
+					"navigationBarTitleText": "",
+					"enablePullDownRefresh": false
+				}
+
 			}
 		]
 	}, {
@@ -187,7 +192,7 @@
 			"network": "all",
 			"packages": ["__APP__"]
 		},
-		"subpkg/guide/guide": {
+		"subpkg/guide/accesspage": {
 			"network": "all",
 			"packages": ["subpkg"]
 		}
@@ -202,8 +207,8 @@
 	"tabBar": {
 		"backgroundColor": "#FFFFFF",
 		"borderStyle": "white",
-		"color": "#cdcdcd",
-		"selectedColor": "#3B4144",
+		"color": "#bdd2ef",
+		"selectedColor": "#6495ed",
 
 		"list": [{
 				"pagePath": "pages/home/home",
@@ -225,8 +230,8 @@
 			},
 			{
 				"pagePath": "pages/interactive/interactive",
-				"iconPath": "static/tab-icons/approval.png",
-				"selectedIconPath": "static/tab-icons/approvalselect.png",
+				"iconPath": "static/tab-icons/interactive.png",
+				"selectedIconPath": "static/tab-icons/interactiveselect.png",
 				"text": "家校"
 			},
 			{

pages/common/blockmsg.scss

@@ -25,18 +25,18 @@
 		}
 		.block-tag-box{
 			border-radius: 20rpx;
-			border: 1rpx solid #3C9CFF;
+			border: 1rpx solid $color-mixblue;
 			padding: 6rpx;
 			.block-tag{
 				font-size: 22rpx;
-				color: #3C9CFF;
+				color: $color-mixblue;
 			}
 		}
 	}
 	.index {
 		width: 1%;
 		height: 120rpx;
-		background-color: #3C9CFF;
+		background-color: $color-mixblue;
 		border-radius: $card-border-radius;
 		margin-left: 22rpx;
 	}

pages/home/home.vue

@@ -4,22 +4,20 @@
 		<top-box v-bind:timeStamp="timeStamp"></top-box>
 		<!-- 滚动条 -->
 		<view class="notice">
-			<u-notice-bar :text="noticeMsg" mode="closable" bgColor="rgba(73, 125, 220, 0.25)" color="#FFF"
-				url="/subpkg/mymsg/mymsg"></u-notice-bar>
+			<u-notice-bar :text="noticeMsg" mode="closable" bgColor="#4169e140" color="#FFF"
+				url="/subpkg/mydata/notificationpage"></u-notice-bar>
 		</view>
 		<!-- 卡片区域 -->
 		<view class="card-box">
 
 			<!-- 今日课程 -->
 			<view class="card-item" style="width: 100%;">
-				<view class="card-info" style="padding-bottom: 30rpx;">
+				<view class="card-info" style="padding-bottom: 20rpx;">
 					<view :class="icon.class"></view>
 					<text class="info-text">今日课程</text>
-					<view style="display: flex; align-items: center;margin: 0 10rpx 0 auto;">
-						<view class="t-icon t-icon-liebiao" style="width: 30rpx; height: 30rpx;" @click="navClass">
-						</view>
-						<view class="msg" style="margin-left: 10rpx; font-size: 14px;color: #3C9CFF;" @click="navClass">
-							课程列表</view>
+					<view style="display: flex; align-items: center;margin: 0 5rpx 0 auto;" @click="navClass">
+						<view class="t-icon t-icon-fenlei"></view>
+						<view class="msg" style="font-size: 30rpx; margin-left: 5px;color: #4169E1;">课程列表</view>
 					</view>
 				</view>
 				<todayclass-box :classCurrent="classCurrent"></todayclass-box>
@@ -28,22 +26,38 @@
 			<!-- 今日打卡 -->
 			<view class="card-item" @click="navCalendar">
 				<view class="card-info" style="padding-bottom: 0;">
-					<view :class="icon.isRecord" v-if="attendance==='已打卡'" style="width:150rpx;height: 60rpx;background-repeat: no-repeat;"></view>
-					<view :class="icon.noRecord" v-if="attendance==='未打卡'" style="width:150rpx;height: 60rpx;background-repeat: no-repeat;"></view>
-					<view class="t-icon t-icon-weizhidaka-dakachenggong" v-if="attendance==='已打卡'" style="width:60rpx;height: 60rpx;background-repeat: no-repeat;margin-left: auto;"></view>
-					<view class="t-icon t-icon-weizhidaka-dakacuowu" v-if="attendance==='未打卡'" style="width:60rpx;height: 60rpx;background-repeat: no-repeat;margin-left: auto;"></view>
+					<view :class="icon.isRecord" v-if="attendance==='已打卡'"
+						style="width:150rpx;height: 60rpx;background-repeat: no-repeat;"></view>
+					<view :class="icon.noRecord" v-if="attendance==='未打卡'"
+						style="width:150rpx;height: 60rpx;background-repeat: no-repeat;"></view>
+					<view class="t-icon t-icon-weizhidaka-dakachenggong" v-if="attendance==='已打卡'"
+						style="width:60rpx;height: 60rpx;background-repeat: no-repeat;margin-left: auto;"></view>
+					<view class="t-icon t-icon-weizhidaka-dakacuowu" v-if="attendance==='未打卡'"
+						style="width:60rpx;height: 60rpx;background-repeat: no-repeat;margin-left: auto;"></view>
 				</view>
 				<view class="state-box">
 					<view class="text-content">今日打卡:</view>
-					<view class="state"
-						:style="{backgroundColor: attendance==='已打卡'?'#3C9CFF':(attendance === '未打卡'?'#f9c752':'#FFF')}">
-						<view class="state-text">{{attendance}}</view>
+
+					<view class="flex">
+						<view v-if="attendance==='已打卡'" class="t-icon t-icon-gou" style="width: 70rpx;height: 70rpx;"></view>
+						<view v-if="attendance==='未打卡'" class="t-icon t-icon-jinggao" style="width: 70rpx;height: 70rpx;"></view>
+						<view class="state"
+							:style="{backgroundColor: attendance==='已打卡'?'#4169E1':(attendance === '未打卡'?'#f9c752':'#FFF')}">
+							<view class="state-text">{{attendance}}</view>
+						</view>
 					</view>
+					
 					<view class="text-content">打卡时间:</view>
-					<view class="state"
-						:style="{backgroundColor: attendance==='已打卡'?'#3C9CFF':(attendance === '未打卡'?'#f9c752':'#FFF')}">
-						<view class="state-text">{{attendanceTime}}</view>
+
+					<view class="flex">
+						<view v-if="attendance==='已打卡'" class="t-icon t-icon-shijian1" style="width: 70rpx;height: 70rpx;"></view>
+						<view v-if="attendance==='未打卡'" class="t-icon t-icon-bangzhu" style="width: 70rpx;height: 70rpx;"></view>
+						<view class="state"
+							:style="{backgroundColor: attendance==='已打卡'?'#4169E1':(attendance === '未打卡'?'#f9c752':'#FFF')}">
+							<view class="state-text">{{attendanceTime}}</view>
+						</view>
 					</view>
+
 				</view>
 			</view>
 
@@ -253,12 +267,12 @@
 			},
 			navCalendar() {
 				uni.navigateTo({
-					url: '/subpkg/calendarmsg/calendarmsg'
+					url: '/subpkg/calendar/calendar'
 				})
 			},
 			navClass() {
 				uni.navigateTo({
-					url: '/subpkg/classmsg/classmsg'
+					url: '/subpkg/classlist/classlist'
 				})
 			},
 		},
@@ -280,10 +294,11 @@
 			align-items: center;
 			justify-content: center;
 			border-radius: 50rpx;
-			height: 21%;
-			width: 90%;
+			height: 70rpx;
+			width: 210rpx;
 		}
 	}
+
 	.state-text {
 		font-size: 32rpx;
 		font-weight: bold;
@@ -294,6 +309,14 @@
 		font-size: 30rpx;
 		font-weight: bold;
 		color: $color-title;
-		margin:20rpx auto 20rpx 7%;
+		margin: 20rpx auto 20rpx 28rpx;
+	}
+
+	.flex {
+		width: 300rpx;
+		margin: 0 auto 0 20rpx;
+		display: flex;
+		align-items: center;
+		justify-content: space-between;
 	}
 </style>

pages/homework/homework.vue

@@ -5,8 +5,8 @@
 		<view class="module-container">
 			<view style="margin: 0 20rpx;">
 				<u-tabs :list="list" :current="current" @change="changeModule"
-					:activeStyle="{color: '#3c9cff',fontWeight: 'bold',transform: 'scale(1.08)',}"
-					:inactiveStyle="{fontWeight: 'bold',transform: 'scale(1)'}" lineColor="#3c9cff" lineWidth="60">
+					:activeStyle="{color: '#4169E1',fontWeight: 'bold',transform: 'scale(1.08)',}"
+					:inactiveStyle="{fontWeight: 'bold',transform: 'scale(1)'}" lineColor="#4169E1" lineWidth="60">
 				</u-tabs>
 			</view>
 
@@ -86,10 +86,9 @@
 							<view class="t-icon t-icon-daiban"></view>
 							<view class="item-text">{{item.detail.title}}</view>
 							<!-- 详情列表展示(评测,活动或者作业)信息 -->
-							<view style="display: flex; align-items: center;margin: 0 10rpx 0 auto;">
-								<view class="t-icon t-icon-liebiao" style="width: 30rpx; height: 30rpx;"
-									@click="navData"></view>
-								<view class="msg" @click="navData" style="color: #3C9CFF;">详情列表</view>
+							<view style="display: flex; align-items: center;margin: 0 5rpx 0 auto;" @click="navData">
+								<view class="t-icon t-icon-fenlei"></view>
+								<view class="msg">详情列表</view>
 							</view>
 						</view>
 
@@ -231,7 +230,7 @@
 			navData() {
 				this.updateHomeworkDetail(this.pageData[this.current].detail.data)
 				uni.navigateTo({
-					url: '/subpkg/homeworkdata/homeworkdata'
+					url: '/subpkg/detaillist/detaillist'
 				})
 			}
 
@@ -354,8 +353,8 @@
 	}
 
 	.msg {
-		color: $color-title;
+		color: $color-mixblue;
 		margin-left: 10rpx;
-		font-size: 28rpx;
+		font-size: 30rpx;
 	}
 </style>

pages/init/init.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-loading-page :loading="true" bgColor="#F5F5F5"></u-loading-page>
+		<u-loading-page :loading="true" bgColor="#FFF" loadingText="别着急,正在加载中" loadingMode="semicircle"></u-loading-page>
 	</view>
 </template>
 
@@ -17,8 +17,7 @@
 		},
 		onLoad() {
 			//缓存中同步token
-			const value = uni.getStorageSync('token')
-			if(!value){
+			if(!uni.getStorageSync('token')){
 				uni.redirectTo({
 					url:'/subpkg/login/login'
 				})

pages/my/my.vue

@@ -38,21 +38,23 @@
 			<!-- 用户功能 -->
 			<view class="com-item">
 				<view class="com-box">
-					<view class="cell" @click="myInfo">
+					<view class="cell" @click="navInfo">
 						<view class="cell-left">
 							<view class="t-icon t-icon-zhanghu"></view>
 							<view class="cell-text">个人信息</view>
 						</view>
-						<u-icon name="arrow-right" color="#bababa" size="16"></u-icon>
+						<view class="t-icon t-icon-you" style="width: 20px;height: 20px;"></view>
 					</view>
-					<view class="cell" @click="myMsg">
+					<view class="cell" @click="navMsg">
 						<view class="cell-left">
 							<view class="t-icon t-icon-a-liaotianpingluntaolunduihua"></view>
 							<view class="cell-text">我的消息</view>
 						</view>
 						<view class="cell-right">
-							<u-badge type="warning" shape="horn" :value="myData.msgList.length"></u-badge>
-							<u-icon name="arrow-right" color="#bababa" size="16"></u-icon>
+							<view style="margin-right: 20rpx;">
+								<u-badge type="warning" shape="horn" :value="myData.msgList.length"></u-badge>
+							</view>
+							<view class="t-icon t-icon-you" style="width: 20px;height: 20px;"></view>
 						</view>
 					</view>
 					<view class="cell" @click="logout">
@@ -60,11 +62,10 @@
 							<view class="t-icon t-icon-a-tuichulikai"></view>
 							<view class="cell-text">退出登录</view>
 						</view>
-						<u-icon name="arrow-right" color="#bababa" size="16"></u-icon>
+						<view class="t-icon t-icon-you" style="width: 20px;height: 20px;"></view>
 					</view>
 				</view>
 			</view>
-
 			<!-- 用户服务 -->
 			<view class="com-item">
 				<view class="com-box">
@@ -73,21 +74,21 @@
 							<view class="t-icon t-icon-shoucang"></view>
 							<view class="cell-text">订阅中心</view>
 						</view>
-						<u-icon name="arrow-right" color="#bababa" size="16"></u-icon>
+						<view class="t-icon t-icon-you" style="width: 20px;height: 20px;"></view>
 					</view>
 					<view class="cell">
 						<view class="cell-left">
 							<view class="t-icon t-icon-a-appyingyongchengxukaifa"></view>
 							<view class="cell-text">帮助中心</view>
 						</view>
-						<u-icon name="arrow-right" color="#bababa" size="16"></u-icon>
+						<view class="t-icon t-icon-you" style="width: 20px;height: 20px;"></view>
 					</view>
 					<view class="cell">
 						<view class="cell-left">
 							<view class="t-icon t-icon-shuji"></view>
 							<view class="cell-text">用户协议</view>
 						</view>
-						<u-icon name="arrow-right" color="#bababa" size="16"></u-icon>
+						<view class="t-icon t-icon-you" style="width: 20px;height: 20px;"></view>
 					</view>
 				</view>
 			</view>
@@ -142,30 +143,30 @@
 				// 	uni.setStorageSync('parentdetail',)
 				// }
 				uni.navigateTo({
-					url: '/subpkg/childrenlist/childrenlist'
+					url: '/subpkg/guide/childrenlist'
 				})
 			},
 			//孩子名片
 			childrenInfo() {
 				uni.navigateTo({
-					url: '/subpkg/childrenInfo/childrenInfo'
+					url: '/subpkg/info/childrenpage'
 				})
 			},
 			//我的消息
-			myMsg() {
+			navMsg() {
 				uni.navigateTo({
-					url: '/subpkg/mymsg/mymsg'
+					url: '/subpkg/mydata/notificationpage'
 				})
 			},
 			//我的信息
-			myInfo() {
+			navInfo() {
 				uni.navigateTo({
-					url: '/subpkg/parentInfo/parentInfo'
+					url: '/subpkg/info/parentpage'
 				})
 			},
 			mySubscribe(){
 				uni.navigateTo({
-					url: '/subpkg/subscribecenter/subscribecenter'
+					url: '/subpkg/mydata/subscribepage'
 				})
 			}
 
@@ -179,8 +180,8 @@
 
 		.bg1 {
 			position: fixed;
-			top: -400rpx;
-			right: -250rpx;
+			top: -320rpx;
+			right: -300rpx;
 			width: 800rpx;
 			height: 800rpx;
 			margin-right: 500rpx;
@@ -191,12 +192,12 @@
 
 		.bg2 {
 			position: fixed;
-			top: -300rpx;
-			right: -320rpx;
+			top: -200rpx;
+			right: -300rpx;
 			width: 800rpx;
 			height: 800rpx;
 			border-radius: 100%;
-			background-color: #4169E1;
+			background-color: $color-mixblue;
 			z-index: -2;
 		}
 

store/children.js

@@ -6,7 +6,7 @@ export default {
 	//模块数据
 	state: () => ({
 		childreninfo: JSON.parse(uni.getStorageSync('childreninfo') || '{}'),
-		semesterList: '',
+		semesterList: JSON.parse(uni.getStorageSync('semesterList') || '{}'),
 		semester: uni.getStorageSync('semester') || '请选择学期',
 		//课程列表
 		classList: '',
@@ -30,6 +30,7 @@ export default {
 		//更新学期列表信息
 		updateChildrenSemesterList(state, semesterList) {
 			state.semesterList = semesterList
+			this.commit('m_children/saveChildrenSemesterListToStorage')
 		},
 		//更新学期信息
 		updateChildrenSemester(state, semester) {
@@ -66,7 +67,12 @@ export default {
 		//学期信息
 		saveChildrenSemesterToStorage(state) {
 			uni.setStorageSync('semester', state.semester)
-		}
+		},
+		//学期列表信息
+		saveChildrenSemesterListToStorage(state) {
+			uni.setStorageSync('semesterList', JSON.stringify(state.semesterList))
+		},
+		
 
 	},
 	//模块属性(数据包装)

subpkg/calendarmsg/calendarmsg.vue

@@ -17,7 +17,7 @@
 							<view class="number-detail">缺卡次数</view>
 						</view>
 						<view class="number-box">
-							<text class="number" :style="{color: monthAttendQuality==='优秀'?'#3C9CFF':(monthAttendQuality === '良好'?'#f9c752':'#3B4144'),fontSize: 40+'rpx'}">{{monthAttendQuality}}</text>
+							<text class="number" :style="{color: monthAttendQuality==='优秀'?'#4169E1':(monthAttendQuality === '良好'?'#f9c752':'#3B4144')}">{{monthAttendQuality}}</text>
 							<view class="number-detail">本月出勤质量</view>
 						</view>
 					</view>
@@ -30,7 +30,7 @@
 				</view>
 				<view class="state-box">
 					<view class="state"
-						:style="{backgroundColor: attendance==='已打卡'?'#3C9CFF':(attendance === '未打卡'?'#f9c752':'#bebebe')}">
+						:style="{backgroundColor: attendance==='已打卡'?'#4169E1':(attendance === '未打卡'?'#f9c752':'#bebebe')}">
 						<view class="state-text">{{attendance}}</view>
 					</view>
 					<view class="msg-box">
@@ -40,7 +40,7 @@
 						</view>
 						<view class="flex">
 							<text class="msg-text" style="font-weight: normal;font-size: 28rpx;">出勤效率:</text>
-							<text class="msg-text" :style="{color: attendanceQuality==='优秀'?'#3C9CFF':(attendanceQuality === '良好'?'#f9c752':'#3B4144')}">{{attendanceQuality}}</text>
+							<text class="msg-text" :style="{color: attendanceQuality==='优秀'?'#4169E1':(attendanceQuality === '良好'?'#f9c752':'#3B4144')}">{{attendanceQuality}}</text>
 						</view>
 					</view>
 				</view>
@@ -54,7 +54,7 @@
 	import {
 		mapState,
 	} from 'vuex'
-	import zsyCalendar from '@/subpkg/zsy-calendar/zsy-calendar.vue'
+	import zsyCalendar from '@/subpkg/z-calendar/zsy-calendar.vue'
 	export default {
 		name: 'Calendar',
 		components: {
@@ -100,7 +100,7 @@
 			},
 			//判断本月出勤质量
 			getMonthAttendQuality() {
-				this.monthAttendQuality = this.calendar.noAttendNum <= 5? '优秀':(this.calendar.noAttendNum <= 10? '良好' : '较差')
+				this.monthAttendQuality = this.calendar.noAttendNum <= 3? '优秀':(this.calendar.noAttendNum <= 6? '良好' : '较差')
 			},
 			//选择日期
 			chooseDate(dateInfo, dateIndex) {

subpkg/common/infopage.scss

@@ -1,6 +1,6 @@
 .container {
 		height: 600rpx;
-		background: linear-gradient(#ff8caf, $page-background-color);
+		background: linear-gradient($color-pink, $page-background-color);
 
 		.top-info {
 			display: flex;

subpkg/common/ocean.scss

@@ -4,7 +4,7 @@
 		margin-left: -520rpx;
 		width: 1800rpx;
 		height: 1800rpx;
-		background-color: #4169E1;
+		background-color: $color-mixblue;
 		border-radius: 50%;
 
 		&::before,

subpkg/homeworkdata/homeworkdata.vue

@@ -14,9 +14,9 @@
 					<view class="t-icon t-icon-daiban"></view>
 					<view class="name">{{item.name}}</view>
 					<view class="t-icon t-icon-yiwancheng" v-if="item.finish"
-						style="margin-left: auto; width: 100rpx; height: 100rpx;"></view>
+						style="margin-left: auto; width: 90rpx; height: 90rpx;"></view>
 				</view>
-
+				<!-- 正文 -->
 				<view class="content-box">
 					<view class="flex" style="justify-content: space-between; width: 70%;">
 						<view class="subtitle">布置老师:</view>
@@ -28,8 +28,12 @@
 							<view class="block-tag">{{item.subject}}</view>
 						</view>
 					</view>
-					<view class="subtitle" style="margin-bottom: 20rpx;">{{item.description}}</view>
-					<view class="content-detail">{{item.content}}</view>
+					<view class="subtitle">{{item.description}}</view>
+					
+					<view class="content-detail-box">
+						<view class="content-detail">{{item.content}}</view>
+					</view>
+					
 				</view>
 			</view>
 		</view>
@@ -76,11 +80,9 @@
 			border-radius: $card-border-radius;
 			margin-bottom: 20rpx;
 			background-color: #fff;
-			padding: 30rpx;
+			padding: 20rpx;
 
 			.t-icon {
-				display: inline-block;
-				margin-right: 10rpx;
 				width: 40rpx;
 				height: 40rpx;
 			}
@@ -89,24 +91,34 @@
 				font-size: 32rpx;
 				font-weight: bold;
 				color: $color-title;
+				margin-left: 10rpx;
+				line-height: 90rpx;
 			}
 		}
 
 		.content-box {
-			padding: 10rpx 20rpx 10rpx 20rpx;
+			padding: 0 10rpx;
+			display: flex;
+			flex-direction: column;
 
 			.subtitle {
 				font-size: 26rpx;
 				font-weight: bold;
 				color: $color-title;
 			}
-
-			.content-detail {
-				margin-top: 10rpx;
-				font-size: 32rpx;
-				font-weight: bold;
-				color: $color-title;
-				word-break: break-all;
+			
+			.content-detail-box{
+				margin: 40rpx 0 20rpx 0;
+				padding: 20rpx;
+				background-color: #f6f6f6;
+				border-radius: $card-border-radius;
+				
+				.content-detail {
+					font-size: 32rpx;
+					font-weight: bold;
+					color: $color-title;
+					word-break: break-all;
+				}
 			}
 		}
 	}
@@ -119,12 +131,12 @@
 
 	.block-tag-box {
 		border-radius: 20rpx;
-		border: 1rpx solid #3C9CFF;
+		border: 1rpx solid $color-mixblue;
 		padding: 6rpx;
 
 		.block-tag {
 			font-size: 22rpx;
-			color: #3C9CFF;
+			color: $color-mixblue;
 		}
 	}
 </style>

subpkg/guide/guide.vue

@@ -66,7 +66,7 @@
 							}, ]
 						})
 						uni.navigateTo({
-							url:'/subpkg/childrenlist/childrenlist'
+							url:'/subpkg/guide/childrenlist'
 						})
 					}
 				}
@@ -96,7 +96,7 @@
 				line-height: 70rpx;
 				font-weight: bold;
 				font-size: 50rpx;
-				color: #4169E1;
+				color: $color-mixblue;
 				// background-clip: text; //裁剪成文字的前景色
 				// color: transparent; //文字颜色变成透明
 			}
@@ -120,7 +120,7 @@
 				position: relative;
 				margin: 100rpx auto; //relative相对定位居中
 				border: none;
-				background: linear-gradient(to right, #506AE7, #87CEFA);
+				background: linear-gradient(to right, $color-mixblue, $color-camblue);
 
 			}
 		}

subpkg/childrenlist/childrenlist.vue

@@ -74,7 +74,7 @@
 				line-height: 70rpx;
 				font-weight: bold;
 				font-size: 50rpx;
-				color: #4169E1;
+				color: $color-mixblue;
 				// background-clip: text; //裁剪成文字的前景色
 				// color: transparent; //文字颜色变成透明
 			}

subpkg/parentInfo/parentInfo.vue

@@ -73,7 +73,7 @@
 	@import '@/subpkg/common/infopage.scss';
 
 	.container {
-		background: linear-gradient(#0080ff, $page-background-color);
+		background: linear-gradient($color-blue, $page-background-color);
 	}
 
 	.avatar-box {

subpkg/login/login.vue

@@ -84,7 +84,7 @@
 							this.getToken()
 							this.updateParentInfo(infoRes.userInfo)
 							uni.redirectTo({
-								url: '/subpkg/guide/guide'
+								url: '/subpkg/guide/accesspage'
 							})
 						} else {
 							uni.$showMsg('获取不到您的信息!')
@@ -138,14 +138,14 @@
 			width: 650rpx;
 			height: 650rpx;
 			border-radius: 100%;
-			background-color: #4169E1;
+			background-color: $color-mixblue;
 			margin-right: 20rpx;
 			z-index: 5;
 		}
 
 		.bg2 {
 			position: fixed;
-			top: -100rpx;
+			top: -40rpx;
 			right: -320rpx;
 			width: 630rpx;
 			height: 630rpx;
@@ -162,7 +162,7 @@
 			width: 600rpx;
 			height: 600rpx;
 			border-radius: 100%;
-			background-color: #FFC600;
+			background-color: $color-yellow;
 			z-index: 4;
 		}
 
@@ -182,7 +182,7 @@
 				position: relative;
 				margin: 0 auto;
 				border: none;
-				background: linear-gradient(to right, #506AE7, #87CEFA);
+				background: linear-gradient(to right, $color-mixblue, $color-camblue);
 				box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.1);
 				z-index: 99;
 			}

subpkg/video/livepage.vue

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

subpkg/zsy-calendar/dateBox.vue

@@ -11,7 +11,7 @@
 				<view class="calendar_date__number">{{ dateInfo.date }}</view>
 				<view class="calendar_date__isToday" v-if="dateInfo.isToday"
 					:style="{ backgroundColor: dateActiveColor }"></view>
-				<view class="calendar_date__cricle" :style="{backgroundColor: dateInfo.isAttend === 1 ? '#3C9CFF' : (dateInfo.isAttend === -1 ? '#FFF' : '#f9c752')}"></view>
+				<view class="calendar_date__cricle" :style="{backgroundColor: dateInfo.isAttend === 1 ? '#4169E1' : (dateInfo.isAttend === -1 ? '#FFF' : '#f9c752')}"></view>
 			</view>
 		</view>
 	</view>
@@ -36,7 +36,7 @@
 			},
 			dateActiveColor: { // 日期选中颜色
 				type: String,
-				default: '#3C9CFF'
+				default: '#4169E1'
 			},
 			swiperMode: { // 日历显示模式
 				type: String,

subpkg/zsy-calendar/zsy-calendar.vue

@@ -70,7 +70,7 @@
 			},
 			dateActiveColor: { // 日期选中颜色
 				type: String,
-				default: '#3C9CFF'
+				default: '#4169E1'
 			},
 			sundayIndex: { // 星期天所在索引，0表示第一个、6表示最后一个
 				type: Number,
@@ -652,7 +652,7 @@
 		justify-content: center;
 	}
 
-	.calendar_toggle .icon {
+	/* .calendar_toggle .icon {
 		width: 30rpx;
 		height: 30rpx;
 		background-image: url('../../subpkg/zsy-calendar/icon/arrow.png');
@@ -664,7 +664,7 @@
 
 	.icon.down {
 		transform: rotate(180deg);
-	}
+	} */
 
 	.calendar_toggle::before,
 	.calendar_toggle::after {

uni_modules/qiun-data-charts/js_sdk/u-charts/config-ucharts.js

@@ -1,5 +1,5 @@
 // 主题颜色配置：如每个图表类型需要不同主题，请在对应图表类型上更改color属性
-const color = ["#0052d4", "#ff5959", "#f9b248", "#c1cbf7", "#3CA272", "#5fb7ff", "#FC8452", "#9A60B4"];
+const color = ["#4169E1", "#ff5959", "#f9c752", "#bdd2ef", "#00b894", "#ff8caf", "#FC8452", "#9A60B4"];
 // 提示窗配置
 const tooltip = {
 	"showBox": true,
@@ -253,7 +253,7 @@ const cfu = {
 		"title": {
 			"name": "总成绩占比",
 			"fontSize": 20,
-			"color": "#0052d4",
+			"color": "#4169E1",
 		},
 		"subtitle": {
 			"name": "年级与班级",
@@ -442,7 +442,7 @@ const cfu = {
 				"linearType": "opacity",
 				"linearOpacity": 0.7,
 				"customColor": [
-					"#0052d4",
+					"#4169E1",
 					"#FFFFFF",
 					"#ff5959",
 					"#FFFFFF"

uni_modules/uview-ui/components/u-calendar/month.vue

@@ -44,7 +44,7 @@
 			// 主题色，对底部按钮和选中日期有效
 			color: {
 				type: String,
-				default: '#3c9cff'
+				default: '#4169E1'
 			},
 			// 月份数据
 			months: {

uni_modules/uview-ui/components/u-calendar/u-calendar.vue

@@ -82,7 +82,7 @@ import Calendar from '../../libs/util/calendar.js'
  * @property {String}				startText			mode=range时，第一个日期底部的提示文字  (默认 '开始' )
  * @property {String}				endText				mode=range时，最后一个日期底部的提示文字 (默认 '结束' )
  * @property {Array}				customList			自定义列表
- * @property {String}				color				主题色，对底部按钮和选中日期有效  (默认 ‘#3c9cff' )
+ * @property {String}				color				主题色，对底部按钮和选中日期有效  (默认 '#4169E1' )
  * @property {String | Number}		minDate				最小的可选日期	 (默认 0 )
  * @property {String | Number}		maxDate				最大可选日期  (默认 0 )
  * @property {Array | String| Date}	defaultDate			默认选中的日期，mode为multiple或range是必须为数组格式

uni_modules/uview-ui/components/u-column-notice/u-column-notice.vue

@@ -65,7 +65,7 @@
 	 * @property {Array}			text 			显示的内容，字符串
 	 * @property {String}			icon 			是否显示左侧的音量图标 （ 默认 'volume' ）
 	 * @property {String}			mode 			通告模式，link-显示右箭头，closable-显示右侧关闭图标
-	 * @property {String}			color 			文字颜色，各图标也会使用文字颜色 （ 默认 '#f9ae3d' ）
+	 * @property {String}			color 			文字颜色，各图标也会使用文字颜色 （ 默认 '#f9c752' ）
 	 * @property {String}			bgColor 		背景颜色 （ 默认 '#fdf6ec' ）
 	 * @property {String | Number}	fontSize		字体大小，单位px  （ 默认 14 ）
 	 * @property {String | Number}	speed			水平滚动时的滚动速度，即每秒滚动多少px(rpx)，这有利于控制文字无论多少时，都能有一个恒定的速度 （ 默认 80 ）

uni_modules/uview-ui/components/u-datetime-picker/u-datetime-picker.vue

@@ -51,7 +51,7 @@
 	 * @property {String}			cancelText			取消按钮的文字  ( 默认 '取消' )
 	 * @property {String}			confirmText			确认按钮的文字  ( 默认 '确认' )
 	 * @property {String}			cancelColor			取消按钮的颜色  ( 默认 '#909193' )
-	 * @property {String}			confirmColor		确认按钮的颜色  ( 默认 '#3c9cff' )
+	 * @property {String}			confirmColor		确认按钮的颜色  ( 默认 '#4169E1' )
 	 * @property {String | Number}	visibleItemCount	每列中可见选项的数量  ( 默认 5 )
 	 * @property {Boolean}			closeOnClickOverlay	是否允许点击遮罩关闭选择器  ( 默认 false )
 	 * @property {Array}			defaultIndex		各列的默认索引

uni_modules/uview-ui/components/u-notice-bar/u-notice-bar.vue

@@ -50,7 +50,7 @@
 	 * @property {Boolean}			step			direction = row时，是否使用步进形式滚动  ( 默认 false )
 	 * @property {String}			icon			是否显示左侧的音量图标 ( 默认 'volume' )
 	 * @property {String}			mode			通告模式，link-显示右箭头，closable-显示右侧关闭图标
-	 * @property {String}			color			文字颜色，各图标也会使用文字颜色 ( 默认 '#f9ae3d' )
+	 * @property {String}			color			文字颜色，各图标也会使用文字颜色 ( 默认 '#f9c752' )
 	 * @property {String}			bgColor			背景颜色 ( 默认 '#fdf6ec' )
 	 * @property {String | Number}	speed			水平滚动时的滚动速度，即每秒滚动多少px(px)，这有利于控制文字无论多少时，都能有一个恒定的速度 ( 默认 80 )
 	 * @property {String | Number}	fontSize		字体大小 ( 默认 14 )

uni_modules/uview-ui/components/u-picker/u-picker.vue

@@ -65,7 +65,7 @@
  * @property {String}			cancelText			取消按钮的文字（默认 '取消' ）
  * @property {String}			confirmText			确认按钮的文字（默认 '确定' ）
  * @property {String}			cancelColor			取消按钮的颜色（默认 '#909193' ）
- * @property {String}			confirmColor		确认按钮的颜色（默认 '#3c9cff' ）
+ * @property {String}			confirmColor		确认按钮的颜色（默认 '#4169E1' ）
  * @property {Array}			singleIndex			选择器只有一列时，默认选中项的索引，从0开始（默认 0 ）
  * @property {String | Number}	visibleItemCount	每列中可见选项的数量（默认 5 ）
  * @property {String}			keyName				选项对象中，需要展示的属性键名（默认 'text' ）

uni_modules/uview-ui/components/u-row-notice/u-row-notice.vue

@@ -58,7 +58,7 @@
 	 * @property {String | Number}	text			显示的内容，字符串
 	 * @property {String}			icon			是否显示左侧的音量图标 (默认 'volume' )
 	 * @property {String}			mode			通告模式，link-显示右箭头，closable-显示右侧关闭图标
-	 * @property {String}			color			文字颜色，各图标也会使用文字颜色 (默认 '#f9ae3d' )
+	 * @property {String}			color			文字颜色，各图标也会使用文字颜色 (默认 '#f9c752' )
 	 * @property {String}			bgColor			背景颜色 (默认 ''#fdf6ec' )
 	 * @property {String | Number}	fontSize		字体大小，单位px (默认 14 )
 	 * @property {String | Number}	speed			水平滚动时的滚动速度，即每秒滚动多少px(rpx)，这有利于控制文字无论多少时，都能有一个恒定的速度  (默认 80 )

uni_modules/uview-ui/components/u-scroll-list/u-scroll-list.vue

@@ -89,7 +89,7 @@
  * @property {String | Number}	indicatorBarWidth		滑块的宽度 (默认 20 )
  * @property {Boolean}			indicator				是否显示面板指示器 (默认 true )
  * @property {String}			indicatorColor			指示器非激活颜色 (默认 '#f2f2f2' )
- * @property {String}			indicatorActiveColor	指示器的激活颜色 (默认 '#3c9cff' )
+ * @property {String}			indicatorActiveColor	指示器的激活颜色 (默认 '#4169E1' )
  * @property {String | Object}	indicatorStyle			指示器样式，可通过bottom，left，right进行定位
  * @event {Function} left	滑动到左边时触发
  * @event {Function} right	滑动到右边时触发

uni_modules/uview-ui/components/u-steps/u-steps.vue

@@ -15,7 +15,7 @@
 	 * @tutorial https://uviewui.com/components/steps.html
 	 * @property {String}			direction		row-横向，column-竖向 (默认 'row' )
 	 * @property {String | Number}	current			设置当前处于第几步 (默认 0 )
-	 * @property {String}			activeColor		激活状态颜色 (默认 '#3c9cff' )
+	 * @property {String}			activeColor		激活状态颜色 (默认 '#4169E1' )
 	 * @property {String}			inactiveColor	未激活状态颜色 (默认 '#969799' )
 	 * @property {String}			activeIcon		激活状态的图标
 	 * @property {String}			inactiveIcon	未激活状态图标 

uni_modules/uview-ui/components/u-subsection/u-subsection.vue

@@ -59,7 +59,7 @@ import props from "./props.js";
  * @tutorial https://www.uviewui.com/components/subsection.html
  * @property {Array}			list			tab的数据
  * @property {String ｜ Number}	current			当前活动的tab的index（默认 0 ）
- * @property {String}			activeColor		激活时的颜色（默认 '#3c9cff' ）
+ * @property {String}			activeColor		激活时的颜色（默认 '#4169E1' ）
  * @property {String}			inactiveColor	未激活时的颜色（默认 '#303133' ）
  * @property {String}			mode			模式选择，mode=button为按钮形式，mode=subsection时为分段模式（默认 'button' ）
  * @property {String ｜ Number}	fontSize		字体大小，单位px（默认 12 ）

uni_modules/uview-ui/components/u-toolbar/u-toolbar.vue

@@ -45,7 +45,7 @@
 	 * @property {String}	cancelText		取消按钮的文字（默认 '取消' ）
 	 * @property {String}	confirmText		确认按钮的文字（默认 '确认' ）
 	 * @property {String}	cancelColor		取消按钮的颜色（默认 '#909193' ）
-	 * @property {String}	confirmColor	确认按钮的颜色（默认 '#3c9cff' ）
+	 * @property {String}	confirmColor	确认按钮的颜色（默认 '#4169E1' ）
 	 * @property {String}	title			标题文字
 	 * @event {Function} 
 	 * @example 

uni_modules/uview-ui/libs/config/color.js

@@ -1,10 +1,10 @@
 // 为了让用户能够自定义主题，会逐步弃用此文件，各颜色通过css提供
 // 为了给某些特殊场景使用和向后兼容，无需删除此文件(2020-06-20)
 const color = {
-    primary: '#3c9cff',
+    primary: '#4169E1',
     info: '#909399',
     default: '#909399',
-    warning: '#f9ae3d',
+    warning: '#f9c752',
     error: '#f56c6c',
     success: '#5ac725',
     mainColor: '#303133',

uni_modules/uview-ui/libs/config/config.js

@@ -3,7 +3,7 @@ const version = '2.0.28'
 
 // 开发环境才提示，生产环境不会提示
 if (process.env.NODE_ENV === 'development') {
-	console.log(`\n %c uView V${version} %c https://www.uviewui.com/ \n\n`, 'color: #ffffff; background: #3c9cff; padding:5px 0;', 'color: #3c9cff;background: #ffffff; padding:5px 0;');
+	console.log(`\n %c uView V${version} %c https://www.uviewui.com/ \n\n`, 'color: #ffffff; background: #4169E1; padding:5px 0;', 'color: #4169E1;background: #ffffff; padding:5px 0;');
 }
 
 export default {

uni_modules/uview-ui/libs/config/props/calendar.js

@@ -17,7 +17,7 @@ export default {
         startText: '开始',
         endText: '结束',
         customList: () => [],
-        color: '#3c9cff',
+        color: '#4169E1',
         minDate: 0,
         maxDate: 0,
         defaultDate: null,

uni_modules/uview-ui/libs/config/props/columnNotice.js

@@ -13,7 +13,7 @@ export default {
         text: '',
         icon: 'volume',
         mode: '',
-        color: '#f9ae3d',
+        color: '#f9c752',
         bgColor: '#fdf6ec',
         fontSize: 14,
         speed: 80,

uni_modules/uview-ui/libs/config/props/datetimePicker.js

@@ -28,7 +28,7 @@ export default {
         cancelText: '取消',
         confirmText: '确认',
         cancelColor: '#909193',
-        confirmColor: '#3c9cff',
+        confirmColor: '#4169E1',
         visibleItemCount: 5,
         closeOnClickOverlay: false,
         defaultIndex: () => []

uni_modules/uview-ui/libs/config/props/noticeBar.js

@@ -15,7 +15,7 @@ export default {
         step: false,
         icon: 'volume',
         mode: '',
-        color: '#f9ae3d',
+        color: '#f9c752',
         bgColor: '#fdf6ec',
         speed: 80,
         fontSize: 14,

uni_modules/uview-ui/libs/config/props/picker.js

@@ -19,7 +19,7 @@ export default {
         cancelText: '取消',
         confirmText: '确定',
         cancelColor: '#909193',
-        confirmColor: '#3c9cff',
+        confirmColor: '#4169E1',
         singleIndex: 0,
         visibleItemCount: 5,
         keyName: 'text',

uni_modules/uview-ui/libs/config/props/rowNotice.js

@@ -13,7 +13,7 @@ export default {
         text: '',
         icon: 'volume',
         mode: '',
-        color: '#f9ae3d',
+        color: '#f9c752',
         bgColor: '#fdf6ec',
         fontSize: 14,
         speed: 80

uni_modules/uview-ui/libs/config/props/scrollList.js

@@ -14,7 +14,7 @@ export default {
         indicatorBarWidth: 20,
         indicator: true,
         indicatorColor: '#f2f2f2',
-        indicatorActiveColor: '#3c9cff',
+        indicatorActiveColor: '#4169E1',
         indicatorStyle: ''
     }
 }

uni_modules/uview-ui/libs/config/props/steps.js

@@ -12,7 +12,7 @@ export default {
     steps: {
         direction: 'row',
         current: 0,
-        activeColor: '#3c9cff',
+        activeColor: '#4169E1',
         inactiveColor: '#969799',
         activeIcon: '',
         inactiveIcon: '',

uni_modules/uview-ui/libs/config/props/subsection.js

@@ -12,7 +12,7 @@ export default {
     subsection: {
         list: [],
         current: 0,
-        activeColor: '#3c9cff',
+        activeColor: '#4169E1',
         inactiveColor: '#303133',
         mode: 'button',
         fontSize: 12,

uni_modules/uview-ui/libs/config/props/tabs.js

@@ -12,7 +12,7 @@ export default {
     tabs: {
         duration: 300,
         list: () => [],
-        lineColor: '#3c9cff',
+        lineColor: '#4169E1',
         activeStyle: () => ({
             color: '#303133'
         }),

uni_modules/uview-ui/libs/config/props/toolbar.js

@@ -14,7 +14,7 @@ export default {
         cancelText: '取消',
         confirmText: '确认',
         cancelColor: '#909193',
-        confirmColor: '#3c9cff',
+        confirmColor: '#4169E1',
         title: ''
     }
 

uni_modules/uview-ui/theme.scss

@@ -10,12 +10,12 @@ $u-border-color: #dadbde;
 $u-bg-color: #f3f4f6;
 $u-disabled-color: #c8c9cc;
 
-$u-primary: #3c9cff;
+$u-primary: #4169E1;
 $u-primary-dark: #398ade;
 $u-primary-disabled: #9acafc;
 $u-primary-light: #ecf5ff;
 
-$u-warning: #f9ae3d;
+$u-warning: #f9c752;
 $u-warning-dark: #f1a532;
 $u-warning-disabled: #f9d39b;
 $u-warning-light: #fdf6ec;

utils/APIHandler.js

@@ -128,6 +128,11 @@ function initHome() {
 		month: 4,
 		year: 2022,
 		time: '08:20'
+	},{
+		date: 18,
+		month: 4,
+		year: 2022,
+		time: '08:20'
 	}]
 	this.$store.commit('m_children/updateRecords', records)
 	let homeData = {
@@ -136,7 +141,7 @@ function initHome() {
 			"series": [{
 				"name": "评测完成",
 				"data": 0.60,
-				"color": "#3C9CFF"
+				"color": "#4169E1"
 			}]
 		},
 		//作业进度条数据
@@ -159,7 +164,7 @@ function initHome() {
 	this.$store.commit('m_chart/updateHomeChart', homeData)
 }
 //获取成绩数据
-function initGrade() {
+function initGrade(semester,tmdid) {
 	let testList = [
 		"开学考试",
 		"第一月考",
@@ -326,7 +331,7 @@ function initGrade() {
 				series: [{
 						name: "超过年级中",
 						data: 0.8,
-						color: "#0080ff"
+						color: "#4169E1"
 					},
 					{
 						name: "超过班级中",
@@ -519,7 +524,7 @@ function initHomework() {
 	[{
 		name: '评测',
 		level: '',
-		color: '#0080ff;',
+		color: '#4169E1;',
 		image: 'https://ouch-cdn2.icons8.com/yFl5NWU3aVehLBlQf9ctvnZPqtm5U0hqM3IzWvFDCaQ/rs:fit:912:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9wbmcvNzY5/LzY1ZTQxZmZjLTg1/YWQtNDYyMi1hYzU0/LWQ3NDEzZmY2NGI1/YS5wbmc.png',
 		detail: {
 			title: '评测列表',