4.15

common/data.js

@@ -1,4 +1,4 @@
-const subjectDataList = [
+const subjectData = [
 	{
 		categories: [
 			"开学考试",
@@ -307,7 +307,7 @@ const subjectDataList = [
 	},
 ]
 
-const subjectRank = [
+const rankData = [
 	{
 		name: "语文",
 		categories: [
@@ -514,7 +514,7 @@ const subjectRank = [
 	},
 ]
 
-module.exports = {
-	subjectData: subjectDataList,
-	rankData: subjectRank,
+export default {
+	subjectData, //主要科目列表
+	rankData, //排行科目列表
 }

components/todaydata-box/todaydata-box.vue

@@ -2,8 +2,8 @@
 	<!-- 今日记录模块 -->
 	<view class="module-container">
 		<u-tabs :list="list" :current="current" @change="changeModule"
-			:activeStyle="{color: '#5b7cff',fontWeight: 'bold',transform: 'scale(1.08)',}"
-			:inactiveStyle="{fontWeight: 'bold',transform: 'scale(1)'}" lineColor="#5b7cff" lineWidth="60"></u-tabs>
+			:activeStyle="{color: '#3c9cff',fontWeight: 'bold',transform: 'scale(1.08)',}"
+			:inactiveStyle="{fontWeight: 'bold',transform: 'scale(1)'}" lineColor="#3c9cff" lineWidth="60"></u-tabs>
 
 		<!-- 记录模块 -->
 		<view class="module-box" v-if="current == 0">
@@ -76,7 +76,7 @@
 
 <script>
 	export default {
-		name: "todaydata-box",
+		name: "interactive-box",
 		data() {
 			return {
 				//学习记录表

gradepkg/general-chart/general-chart.vue

@@ -21,8 +21,7 @@
 				<text class="chart-name-text">{{semester}} 总成绩对比</text>
 				<!-- 按钮区域 -->
 				<view class="btn-box">
-					<text class="btn"  @click="tooltipMsg">图表详情</text>
-					<u-icon name="question-circle" color="#3B4144;"  @click="tooltipMsg"></u-icon>
+					<view class="t-icon t-icon-tishi2" style="width: 50rpx; height: 50rpx;"  @click="tooltipMsg"></view>
 				</view>
 			</view>
 			<view class="charts-box">
@@ -97,7 +96,6 @@
 		computed: {
 			...mapState('m_children', ['childreninfo', 'semester']),
 			...mapState('m_chart', ['gradeData']),
-			...mapGetters('m_chart', ['getSubjectList'])
 		},
 		//picker选择科目的变化通过监听器，监听变化并做出对应图表的整体变化
 		watch: {
@@ -106,7 +104,7 @@
 				//newValue为变化后的新值
 				handler(newValue) {
 					//拿到对应图表数据
-					let subjectChartData = this.getdata.find(x => x.series[0].name.includes(newValue))
+					let subjectChartData = this.data.find(x => x.series[0].name.includes(newValue))
 					this.updateSubjectComparison(subjectChartData)
 				},
 				//immediate 属性用来声明此监听器是否在页面初次加载完毕后立即调用
@@ -116,7 +114,7 @@
 		data() {
 			return {
 				//模拟数据
-				getdata: getdata.subjectData,
+				data: getdata.subjectData,
 				//科目切换
 				setSubjectPicker: false,
 				//数据展示切换
@@ -143,13 +141,12 @@
 			setSubject() {
 				//通过table获取孩子考试科目
 				if (this.subjectList.length === 0) {
-					let res = [this.getSubjectList]
-					this.subjectList = res
+					this.subjectList = [["语文","数学","英语","思品","体育","科学"]]
 					if (this.subjectCurrent === '')
-						this.subjectCurrent = this.getSubjectList[0]
+						this.subjectCurrent = this.subjectList[0][0]
 				}
-				console.log('111',this.subjectList);
-				console.log('222',this.subjectCurrent);
+				console.log('科目列表',this.subjectList);
+				console.log('当前科目',this.subjectCurrent);
 			},
 			//设置默认图表模式
 			setScoreType() {

gradepkg/rank-chart/rank-chart.vue

@@ -75,12 +75,11 @@
 		computed: {
 			...mapState('m_children', ['childreninfo', 'semester']),
 			...mapState('m_chart', ['gradeData']),
-			...mapGetters('m_chart', ['getSubjectList'])
 		},
 		watch: {
 			subjectCurrent:{
 				handler(newValue){
-					let subjectChartData = this.getdata.find(x=>x.name.includes(newValue))
+					let subjectChartData = this.data.find(x=>x.name.includes(newValue))
 					let Data = {categories:[],series:[],}
 					Data.categories = subjectChartData.categories
 					Data.series = subjectChartData.series
@@ -92,7 +91,7 @@
 		data() {
 			return {
 				//模拟数据
-				getdata: getdata.rankData,
+				data: getdata.rankData,
 				//科目切换
 				setSubjectPicker: false,
 				//当前选择科目
@@ -122,13 +121,13 @@
 			...mapMutations('m_chart', ['updateSemesterSubjectRank']),
 			//设置孩子科目
 			setSubject() {
-				//通过table获取孩子考试科目
 				if (this.subjectList.length === 0) {
-					let res = [this.getSubjectList]
-					this.subjectList = res
+					this.subjectList = [["语文","数学","英语","思品","体育","科学"]]
 					if (this.subjectCurrent === '')
-						this.subjectCurrent = this.getSubjectList[0]
+						this.subjectCurrent = this.subjectList[0][0]
 				}
+				console.log('科目列表',this.subjectList);
+				console.log('当前科目',this.subjectCurrent);
 			},
 			//切换科目
 			pickerConfirm(e) {

information/chart.js

@@ -1,511 +0,0 @@
-//导出全局表信息存储模块
-export default {
-	//开启命名空间
-	namespaced: true,
-
-	//模块数据
-	state: () => ({
-		//成绩图表数据
-		gradeData: {
-			//表格数据
-			tableData: [{
-					'考试': '开学',
-					'语文': 83,
-					'数学': 95,
-					'英语': 95,
-					'体育': 92,
-					'思品': 88,
-					'科学': 90,
-				},
-				{
-					'考试': '四月月考',
-					'语文': 93,
-					'数学': 92,
-					'英语': 90,
-					'体育': 82,
-					'思品': 90,
-					'科学': 99,
-				},
-				{
-					'考试': '期中',
-					'语文': 99,
-					'数学': 91,
-					'英语': 82,
-					'体育': 94,
-					'思品': 85,
-					'科学': 100,
-				},
-				{
-					'考试': '五月月考',
-					'语文': 99,
-					'数学': 92,
-					'英语': 97,
-					'体育': 92,
-					'思品': 98,
-					'科学': 88,
-				},
-				{
-					'考试': '六月月考',
-					'语文': 99,
-					'数学': 90,
-					'英语': 92,
-					'体育': 92,
-					'思品': 80,
-					'科学': 90,
-				},
-				{
-					'考试': '期末',
-					'语文': 99,
-					'数学': 85,
-					'英语': 92,
-					'体育': 95,
-					'思品': 91,
-					'科学': 99,
-				}
-			],
-			//学期折线图数据
-			semesterLineChart: {
-				//总成绩
-				generalComparison: {
-					categories: [
-						"开学考试",
-						"第一月考",
-						"第二月考",
-						"期中考试",
-						"第三月考",
-						"期末考试"
-					],
-					series: [{
-							"name": "孩子总分",
-							"data": [
-								556,
-								577,
-								540,
-								588,
-								563,
-								594
-							]
-						},
-						{
-							"name": "班级平均分",
-							"data": [
-								460,
-								477,
-								455,
-								522,
-								538,
-								511
-							]
-						},
-						{
-							"name": "年级平均分",
-							"data": [
-								533,
-								476,
-								484,
-								547,
-								485,
-								502
-							]
-						}
-					],
-				},
-				//单科与平均对比
-				singleAverageComparison: '',
-				//单科对比
-				subjectComparison: {
-					categories: [
-						"开学考试",
-						"第一月考",
-						"第二月考",
-						"期中考试",
-						"第三月考",
-						"期末考试"
-					],
-					series: [{
-							"name": "数学",
-							"data": [
-								90,
-								95,
-								92,
-								100,
-								88,
-								99
-							]
-						},
-						{
-							"name": "语文",
-							"data": [
-								95,
-								98,
-								84,
-								92,
-								93,
-								89
-							]
-						},
-						{
-							"name": "英语",
-							"data": [
-								98,
-								89,
-								97,
-								84,
-								95,
-								89
-							]
-						},
-						{
-							"name": "科学",
-							"data": [
-								91,
-								72,
-								92,
-								89,
-								97,
-								92
-							]
-						},
-						{
-							"name": "体育",
-							"data": [
-								95,
-								89,
-								92,
-								87,
-								91,
-								83
-							]
-						},
-						{
-							"name": "思品",
-							"data": [
-								91,
-								82,
-								87,
-								84,
-								90,
-								85
-							]
-						}
-					],
-				},
-			},
-			//近期单次考试数据
-			recentTestChart: {
-				//近两次对比
-				recentComparison: {
-					categories: [
-						"数学",
-						"语文",
-						"英语",
-						"体育",
-						"科学",
-						"思品"
-					],
-					series: [{
-							"name": "最近成绩",
-							"data": [
-								91,
-								92,
-								94,
-								88,
-								88,
-								98
-							]
-						},
-						{
-							"name": "上次成绩",
-							"data": [
-								88,
-								84,
-								97,
-								92,
-								89,
-								93
-							]
-						}
-					],
-				},
-				//近期排名占比分析
-				recentRank: {
-					series: [{
-							"name": "超过年级中",
-							"data": 0.8,
-							"color": "#0080ff"
-						},
-						{
-							"name": "超过班级中",
-							"data": 0.90,
-							"color": "#ff8caf"
-						}
-					],
-				},
-			},
-			//排名占比分析
-			rankChart: {
-				//学期排名占比分析
-				semesterRank: {
-					categories: [
-						"开学考试",
-						"第一月考",
-						"第二月考",
-						"期中考试",
-						"第三月考",
-						"期末考试"
-					],
-					series: [{
-							"name": "超过年级中",
-							"data": [
-								90,
-								95,
-								92,
-								100,
-								88,
-								99
-							]
-						},
-						{
-							"name": "超过班级中",
-							"data": [
-								95,
-								98,
-								84,
-								92,
-								93,
-								79
-							]
-						}
-					]
-				},
-				//单科学期排名
-				semesterSubjectRank: '',
-			},
-			//优势科目分析
-			advantageRoseChart: {
-				//近期优势科目分析
-				recentAdvantage: {
-					series: [{
-						"data": [{
-								"name": "数学",
-								"value": 100
-							},
-							{
-								"name": "语文",
-								"value": 86
-							},
-							{
-								"name": "英语",
-								"value": 100
-							},
-							{
-								"name": "科学",
-								"value": 79
-							},
-							{
-								"name": "体育",
-								"value": 88
-							},
-							{
-								"name": "思品",
-								"value": 95
-							}
-						]
-					}]
-				},
-				//学期综合分析
-				semesterAdvantage: {
-					series: [{
-						"data": [{
-								"name": "数学",
-								"value": 95
-							},
-							{
-								"name": "语文",
-								"value": 88
-							},
-							{
-								"name": "英语",
-								"value": 99
-							},
-							{
-								"name": "科学",
-								"value": 80
-							},
-							{
-								"name": "体育",
-								"value": 77
-							},
-							{
-								"name": "思品",
-								"value": 95
-							}
-						]
-					}]
-				},
-			},
-			//能力雷达图分析
-			abilityChart: {
-				//重要考试分析
-				importantAnalyse: {
-					categories: [
-						"语文",
-						"数学",
-						"英语",
-						"科学",
-						"体育",
-						"思品"
-					],
-					series: [{
-							"name": "开学考试",
-							"data": [
-								90,
-								89,
-								98,
-								88,
-								95,
-								89
-							]
-						},
-						{
-							"name": "期中考试",
-							"data": [
-								94,
-								89,
-								97,
-								91,
-								95,
-								90
-							]
-						},
-						{
-							"name": "期末考试",
-							"data": [
-								90,
-								90,
-								95,
-								96,
-								90,
-								92
-							]
-						}
-					],
-				},
-				//普通考试分析
-				commonAnalyse: {
-					categories: [
-						"语文",
-						"数学",
-						"英语",
-						"科学",
-						"体育",
-						"思品"
-					],
-					series: [{
-							"name": "第一月考",
-							"data": [
-								90,
-								100,
-								77,
-								78,
-								75,
-								95
-							]
-						},
-						{
-							"name": "第二月考",
-							"data": [
-								89,
-								94,
-								75,
-								99,
-								80,
-								92
-							]
-						},
-						{
-							"name": "第三月考",
-							"data": [
-								79,
-								84,
-								94,
-								73,
-								99,
-								87
-							]
-						}
-					],
-				},
-			},
-
-		},
-		//今日页面图表数据
-		todayData: {
-			//评测进度条数据
-			evaluationArcbar: {
-				"series": [{
-					"name": "评测完成",
-					"data": 0.60,
-					"color": "#0080ff"
-				}]
-			},
-			//作业进度条数据
-			homeworkArcbar: {
-				"series": [{
-					"name": "作业完成",
-					"data": 1,
-					"color": "#ff8caf"
-				}]
-			},
-			//活动进度条数据
-			activityArcbar: {
-				"series": [{
-					"name": "活动完成",
-					"data": 0.83,
-					"color": "#f9c752"
-				}]
-			},
-		},
-		//作业页面图表数据
-		homeworkData: {
-			//评测完成率
-			testData: '',
-			homeworkData: '',
-			activityData: '',
-		}
-
-	}),
-	//模块方法(修改数据)
-	mutations: {
-		// 更新图表数据
-		updateSubjectComparison(state, singleAverageComparison) {
-			state.gradeData.semesterLineChart.singleAverageComparison = singleAverageComparison
-		},
-		updateSemesterSubjectRank(state, semesterSubjectRank){
-			state.gradeData.rankChart.semesterSubjectRank = semesterSubjectRank
-		},
-		
-		//更新作业模块数据
-		updateTestArea(state, testData){
-			state.homeworkData.testData = testData
-		},
-		updateHomeworkArea(state, homeworkData){
-			state.homeworkData.homeworkData = homeworkData
-		},
-		updateActivityArea(state, activityData){
-			state.homeworkData.activityData = activityData
-		},
-
-	},
-	//模块属性(数据包装)
-	getters: {
-		//学科科目
-		getSubjectList(state) {
-			let {
-				考试,
-				...subject
-			} = state.gradeData.tableData[0]
-			return Object.keys(subject)
-		}
-	}
-}

information/children.js

@@ -1,175 +0,0 @@
-//导出学生信息存储模块
-export default {
-	//开启命名空间
-	namespaced: true,
-
-	//模块数据
-	state: () => ({
-
-		grade: JSON.parse(uni.getStorageSync('grade') || '{}'),
-
-		childreninfo: JSON.parse(uni.getStorageSync('childreninfo') || '{}'),
-
-		semester: uni.getStorageSync('semester') || '请选择学期',
-
-		semesterList: [
-			['21学年下学期', '21学年上学期', '20学年下学期', '20学年上学期']
-		],
-
-		classList: [{
-			name: '语文',
-			teacher: '王老师',
-			time: '09:00-09:50',
-			timeFrame: '上午第一节'
-		}, {
-			name: '数学',
-			teacher: '李老师',
-			time: '10:00-10:50',
-			timeFrame: '上午第二节'
-		}, {
-			name: '外语',
-			teacher: '张老师',
-			time: '11:00-11:50',
-			timeFrame: '上午第三节'
-		}, {
-			name: '思品',
-			teacher: '史老师',
-			time: '14:00-14:50',
-			timeFrame: '下午第一节'
-		}, {
-			name: '体育',
-			teacher: '李老师',
-			time: '15:00-15:50',
-			timeFrame: '下午第二节'
-		}, {
-			name: '科学',
-			teacher: '张老师',
-			time: '16:00-16:50',
-			timeFrame: '上午第三节'
-		}],
-
-		//打卡记录
-		records: [{
-			date: 28,
-			month: 3,
-			year: 2022,
-			time: '08:25'
-		}, {
-			date: 29,
-			month: 3,
-			year: 2022,
-			time: '08:27'
-		}, {
-			date: 30,
-			month: 3,
-			year: 2022,
-			time: '08:15'
-		}, {
-			date: 31,
-			month: 3,
-			year: 2022,
-			time: '08:19'
-		}, {
-			date: 2,
-			month: 4,
-			year: 2022,
-			time: '08:25'
-		}, {
-			date: 3,
-			month: 4,
-			year: 2022,
-			time: '08:09'
-		}, {
-			date: 4,
-			month: 4,
-			year: 2022,
-			time: '08:20'
-		}, {
-			date: 5,
-			month: 4,
-			year: 2022,
-			time: '08:02'
-		}, {
-			date: 6,
-			month: 4,
-			year: 2022,
-			time: '08:05'
-		}, {
-			date: 7,
-			month: 4,
-			year: 2022,
-			time: '08:22'
-		}, {
-			date: 8,
-			month: 4,
-			year: 2022,
-			time: '08:25'
-		}, {
-			date: 11,
-			month: 4,
-			year: 2022,
-			time: '08:20'
-		}],
-		//评测作业活动内容
-		homeworkDetail: '',
-		//日历打卡统计数据
-		calendar: {
-			isAttendNum: '',
-			noAttendNum: '',
-		},
-
-	}),
-	//模块方法(修改数据)
-	mutations: {
-		//更新学期信息
-		updateChildrenSemester(state, semester) {
-			state.semester = semester
-			this.commit('m_children/saveChildrenSemesterToStorage')
-		},
-		//更新所有学期信息
-		updateChildrenSemesterList(state, semesterList) {
-			state.semesterList = semesterList
-		},
-		//更新学生信息
-		updateChildrenInfo(state, childreninfo) {
-			state.childreninfo = childreninfo
-			this.commit('m_children/saveChildrenInfoToStorage')
-		},
-		//更新成绩信息
-		updateChildrenGrade(state, grade) {
-			state.grade = grade
-			this.commit('m_children/saveChildrenGradeToStorage')
-		},
-		//更新评测作业活动信息
-		updateHomeworkDetail(state, homeworkDetail) {
-			state.homeworkDetail = homeworkDetail
-		},
-		//更新日历页未打卡数据
-		updateNoAttendNum(state, noAttendNum) {
-			state.calendar.noAttendNum = noAttendNum
-		},
-		//更新日历页已打卡数据
-		updateIsAttendNum(state, isAttendNum) {
-			state.calendar.isAttendNum = isAttendNum
-		},
-
-		//持久化存储
-		//学生信息
-		saveChildrenInfoToStorage(state) {
-			uni.setStorageSync('childreninfo', JSON.stringify(state.childreninfo))
-		},
-		//学生成绩
-		saveChildrenGradeToStorage(state) {
-			uni.setStorageSync('grade', JSON.stringify(state.grade))
-		},
-		//学期信息
-		saveChildrenSemesterToStorage(state) {
-			uni.setStorageSync('semester', state.semester)
-		}
-
-	},
-	//模块属性(数据包装)
-	getters: {
-
-	}
-}

main.js

@@ -4,16 +4,22 @@ import App from './App'
 //导入网络请求包
 import {$http} from '@escook/request-miniprogram'
 //5.导入store的自定义模块
-import store from '@/information/store.js'
+import store from '@/store/store.js'
 //导入uView组件库
 import uView from '@/uni_modules/uview-ui'
 //导入公共方法
 import Common from './utils/Common.js'
-import TimeUtils from './utils/TimeUtils.js'
+import APIHandler from './utils/APIHandler.js'
+//挂载公共方法实例
 Vue.prototype.$noMultipleClicks = Common.noMultipleClicks;
 Vue.prototype.$getCapsuleSite = Common.getCapsuleSite;
-Vue.prototype.$getTimeStamp = TimeUtils.getTimeStamp;
-Vue.prototype.$getRecentDateArray = TimeUtils.getRecentDateArray;
+Vue.prototype.$getTimeStamp = Common.getTimeStamp;
+Vue.prototype.$getRecentDateArray = Common.getRecentDateArray;
+//API数据获取与处理
+Vue.prototype.$initGrade = APIHandler.initGrade;
+Vue.prototype.$initHomework = APIHandler.initHomework;
+Vue.prototype.$initHome = APIHandler.initHome;
+Vue.prototype.$initApp = APIHandler.initApp;
 
 //挂载到uni.$http上方便调用
 uni.$http = $http

pages.json

@@ -190,10 +190,6 @@
 		"subpkg/guide/guide": {
 			"network": "all",
 			"packages": ["subpkg"]
-		},
-		"pages/grade/grade": {
-			"network": "all",
-			"packages": ["gradepkg"]
 		}
 	},
 
@@ -206,41 +202,37 @@
 	"tabBar": {
 		"backgroundColor": "#FFFFFF",
 		"borderStyle": "white",
-		"color": "#b0b0b1",
-		"selectedColor": "#303133",
-		"spacing": "5px",
-		"fontSize": "14px",
-		"height": "55px",
-		"iconWidth": "24px",
+		"color": "#cdcdcd",
+		"selectedColor": "#3B4144",
 
 		"list": [{
 				"pagePath": "pages/home/home",
 				"iconPath": "static/tab-icons/home.png",
-				"selectedIconPath": "static/tab-icons/home.png",
+				"selectedIconPath": "static/tab-icons/homeselect.png",
 				"text": "首页"
 			},
 			{
 				"pagePath": "pages/grade/grade",
 				"iconPath": "static/tab-icons/grade.png",
-				"selectedIconPath": "static/tab-icons/grade.png",
+				"selectedIconPath": "static/tab-icons/gradeselect.png",
 				"text": "成绩"
 			},
 			{
 				"pagePath": "pages/homework/homework",
 				"iconPath": "static/tab-icons/homework.png",
-				"selectedIconPath": "static/tab-icons/homework.png",
+				"selectedIconPath": "static/tab-icons/homeworkselect.png",
 				"text": "作业"
 			},
 			{
 				"pagePath": "pages/interactive/interactive",
 				"iconPath": "static/tab-icons/approval.png",
-				"selectedIconPath": "static/tab-icons/approval.png",
+				"selectedIconPath": "static/tab-icons/approvalselect.png",
 				"text": "家校"
 			},
 			{
 				"pagePath": "pages/my/my",
 				"iconPath": "static/tab-icons/my.png",
-				"selectedIconPath": "static/tab-icons/my.png",
+				"selectedIconPath": "static/tab-icons/myselect.png",
 				"text": "我的"
 			}
 		]

pages/grade/grade.vue

@@ -79,7 +79,7 @@
 						<view :class="icon.table"></view>
 						<text class="chart-name-text">成绩表单</text>
 					</view>
-					<z-table class="table" :tableData="gradeData.tableData" :columns="columns"
+					<z-table class="table" :tableData="tableData" :columns="columns"
 						showBottomSum="true">
 					</z-table>
 				</view>
@@ -143,11 +143,69 @@
 						'key': '科学',
 					}
 				],
+				//表格数据
+				tableData: [{
+						'考试': '开学',
+						'语文': 83,
+						'数学': 95,
+						'英语': 95,
+						'体育': 92,
+						'思品': 88,
+						'科学': 90,
+					},
+					{
+						'考试': '四月月考',
+						'语文': 93,
+						'数学': 92,
+						'英语': 90,
+						'体育': 82,
+						'思品': 90,
+						'科学': 99,
+					},
+					{
+						'考试': '期中',
+						'语文': 99,
+						'数学': 91,
+						'英语': 82,
+						'体育': 94,
+						'思品': 85,
+						'科学': 100,
+					},
+					{
+						'考试': '五月月考',
+						'语文': 99,
+						'数学': 92,
+						'英语': 97,
+						'体育': 92,
+						'思品': 98,
+						'科学': 88,
+					},
+					{
+						'考试': '六月月考',
+						'语文': 99,
+						'数学': 90,
+						'英语': 92,
+						'体育': 92,
+						'思品': 80,
+						'科学': 90,
+					},
+					{
+						'考试': '期末',
+						'语文': 99,
+						'数学': 85,
+						'英语': 92,
+						'体育': 95,
+						'思品': 91,
+						'科学': 99,
+					}
+				],
 					
 			}
 		},
 		onLoad() {
 			this.$getTimeStamp()
+			//获取成绩数据
+			this.$initGrade()
 		},
 		//刷新页面
 		onPullDownRefresh() {

pages/home/home.vue

@@ -21,47 +21,32 @@
 						<view class="msg" style="margin-left: 10rpx; font-size: 14px;color: #3C9CFF;" @click="navClass">
 							课程列表</view>
 					</view>
-
 				</view>
 				<todayclass-box :classCurrent="classCurrent"></todayclass-box>
 			</view>
 
 			<!-- 今日打卡 -->
-			<view class="card-item"
-				@click="navCalendar(attendanceData.attendance,attendanceData.attendanceTime,attendanceData.attendanceQuality)">
-				<view class="card-info">
-					<view :class="icon.record"></view>
-					<text class="info-text">今日打卡</text>
+			<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>
-
-				<view class="space">
-					<view class="home-title-text">
-						<view class="msg">今日出勤:</view>
-						<view class="card-content">{{attendanceData.attendance}}</view>
-					</view>
-					<view class="home-title-text">
-						<view class="msg">打卡时间:</view>
-						<view style="margin-left: 10rpx;" v-if="attendanceData.attendance === '已打卡'">
-
-							<view style="display: flex; align-items: center; margin-left: 10rpx;">
-								<view class="number-box">{{attendanceData.attendanceTimeAfter[0]}}</view>
-								<view style="color: #3C9CFF;">:</view>
-								<view class="number-box">{{attendanceData.attendanceTimeAfter[1]}}</view>
-							</view>
-						</view>
-						<view v-if="attendanceData.attendance === '未打卡'" style="margin: 10rpx 0 10rpx 25rpx;">
-							<u-tag :text="attendanceData.attendanceTime" plain shape="circle"></u-tag>
-						</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>
-					<view class="home-title-text">
-						<view class="msg">出勤效率:</view>
-						<view class="card-content">{{attendanceData.attendanceQuality}}</view>
+					<view class="text-content">打卡时间:</view>
+					<view class="state"
+						:style="{backgroundColor: attendance==='已打卡'?'#3C9CFF':(attendance === '未打卡'?'#f9c752':'#FFF')}">
+						<view class="state-text">{{attendanceTime}}</view>
 					</view>
 				</view>
 			</view>
 
-
 			<!-- 评测 -->
 			<view class="card-item" @click="navHomework(0)">
 				<view class="card-info">
@@ -69,7 +54,7 @@
 					<text class="info-text">今日评测</text>
 				</view>
 				<view class="charts-box">
-					<qiun-data-charts type="arcbar" :chartData="todayData.evaluationArcbar" :loadingType="4"
+					<qiun-data-charts type="arcbar" :chartData="homeData.evaluationArcbar" :loadingType="4"
 						:canvas2d='true' canvasId='canvans9313111' :opts="evaluationOpts" />
 				</view>
 			</view>
@@ -80,7 +65,7 @@
 					<text class="info-text">今日作业</text>
 				</view>
 				<view class="charts-box">
-					<qiun-data-charts type="arcbar" :chartData="todayData.homeworkArcbar" :loadingType="4"
+					<qiun-data-charts type="arcbar" :chartData="homeData.homeworkArcbar" :loadingType="4"
 						:canvas2d='true' canvasId='canvans9327676' :opts="homeworkOpts" />
 				</view>
 			</view>
@@ -91,11 +76,10 @@
 					<text class="info-text">今日活动</text>
 				</view>
 				<view class="charts-box">
-					<qiun-data-charts type="arcbar" :chartData="todayData.activityArcbar" :loadingType="4"
+					<qiun-data-charts type="arcbar" :chartData="homeData.activityArcbar" :loadingType="4"
 						:canvas2d='true' canvasId='canvans9313176' :opts="activityOpts" />
 				</view>
 			</view>
-
 		</view>
 	</view>
 </template>
@@ -106,7 +90,7 @@
 	} from 'vuex'
 	export default {
 		computed: {
-			...mapState('m_chart', ['todayData']),
+			...mapState('m_chart', ['homeData']),
 			...mapState('m_children', ['childreninfo', 'classList', 'records']),
 			...mapState('m_parent', ['myData'])
 		},
@@ -116,28 +100,9 @@
 				noticeMsg: '',
 				//当前课程索引
 				classCurrent: '',
-				//打卡数据
-				attendanceData: {
-					//出勤状况
-					attendance: '',
-					//打卡时间
-					attendanceTime: '',
-					//处理后时间
-					attendanceTimeAfter: [],
-					//出勤质量
-					attendanceQuality: ''
-				},
-
-
+				attendance: '',
+				attendanceTime: '',
 				//属性(不修改)
-				//图标
-				icon: {
-					record: 't-icon t-icon-dakaqiandao',
-					class: 't-icon t-icon-banji',
-					evaluation: 't-icon t-icon-ceping',
-					homework: 't-icon t-icon-bianji1',
-					activity: 't-icon t-icon-huodong'
-				},
 				//评测进度条属性
 				evaluationOpts: {},
 				//作业进度条属性
@@ -146,6 +111,15 @@
 				activityOpts: {},
 				//时间戳
 				timeStamp: '',
+				//图标
+				icon: {
+					isRecord: 't-icon t-icon-dakaxbeifen',
+					noRecord: 't-icon t-icon-dakaxbeifen-copy',
+					class: 't-icon t-icon-banji',
+					evaluation: 't-icon t-icon-ceping',
+					homework: 't-icon t-icon-bianji1',
+					activity: 't-icon t-icon-huodong'
+				},
 			}
 		},
 		onLoad() {
@@ -161,36 +135,17 @@
 			//页面方法初始化
 			init() {
 				this.$getTimeStamp()
+				this.$initHome()
 				this.setOpts()
 				this.getNoticeMsg()
 				this.getClassCurrent()
-				this.getTodayAttendance()
-				this.getAttendanceTimeAfter()
+				this.getAttendance()
 			},
 			//获取滚动通知
 			getNoticeMsg() {
 				this.noticeMsg = `您有 ${this.myData.msgList.length} 个通知,请点击查看`
 			},
-			//展示今日打卡
-			getTodayAttendance() {
-				//获得当前时间时间戳
-				let timeNow = (new Date()).format("yyyy-M-dd")
-				let timeArr = timeNow.split("-")
-				let info = this.records.filter(x => x.year == timeArr[0] && x.month == timeArr[1] && x.date == timeArr[2])
-				if (info.length === 0) {
-					//出勤状况
-					this.attendanceData.attendance = '未打卡',
-					//打卡时间
-					this.attendanceData.attendanceTime = '未记录',
-					//出勤质量
-					this.attendanceData.attendanceQuality = '未记录'
-				} else {
-					this.attendanceData.attendance = '已打卡'
-					this.attendanceData.attendanceTime = info[0].time
-					this.attendanceData.attendanceQuality = info[0].time>'08:15'? '一般':'优秀'
-				}
-			},
-			//计算当前课程
+			//计算出当前课程
 			getClassCurrent() {
 				//当前时间戳是否在课程时间段内
 				function CompareDate(start, finish) {
@@ -227,36 +182,30 @@
 				this.classCurrent = i
 				i = 0
 			},
-			//处理打卡时间
-			getAttendanceTimeAfter() {
-				this.attendanceData.attendanceTimeAfter = this.attendanceData.attendanceTime.split(':')
-			},
-			//导航
-			navHomework(index) {
-				uni.reLaunch({
-					url: `/pages/homework/homework?index=${index}`
-				})
-			},
-			navCalendar(attendance, attendanceTime, attendanceQuality) {
-				uni.navigateTo({
-					url: `/subpkg/calendarmsg/calendarmsg?attendance=${attendance}&attendanceTime=${attendanceTime}&attendanceQuality=${attendanceQuality}`
-				})
-			},
-			navClass() {
-				uni.navigateTo({
-					url: '/subpkg/classmsg/classmsg'
-				})
+			//获得今日是否打卡
+			getAttendance() {
+				//获得当前时间时间戳
+				let timeNow = (new Date()).format("yyyy-M-dd")
+				let timeArr = timeNow.split("-")
+				let info = this.records.filter(x => x.year == timeArr[0] && x.month == timeArr[1] && x.date == timeArr[2])
+				if (info.length != 0) {
+					this.attendance = '已打卡'
+					this.attendanceTime = info[0].time
+				} else {
+					this.attendance = '未打卡'
+					this.attendanceTime = '未记录'
+				}
 			},
 			//设置圆环图描述更新
 			setOpts() {
 				//圆环图标题和副标题动态变化
 				let evaluation = {
 					title: {
-						name: this.todayData.evaluationArcbar.series[0].data * 100 + "%",
-						color: this.todayData.evaluationArcbar.series[0].color
+						name: this.homeData.evaluationArcbar.series[0].data * 100 + "%",
+						color: this.homeData.evaluationArcbar.series[0].color
 					},
 					subtitle: {
-						name: this.todayData.evaluationArcbar.series[0].name
+						name: this.homeData.evaluationArcbar.series[0].name
 					},
 					extra: {
 						arcbar: {
@@ -266,11 +215,11 @@
 				}
 				let homework = {
 					title: {
-						name: this.todayData.homeworkArcbar.series[0].data * 100 + "%",
-						color: this.todayData.homeworkArcbar.series[0].color
+						name: this.homeData.homeworkArcbar.series[0].data * 100 + "%",
+						color: this.homeData.homeworkArcbar.series[0].color
 					},
 					subtitle: {
-						name: this.todayData.homeworkArcbar.series[0].name
+						name: this.homeData.homeworkArcbar.series[0].name
 					},
 					extra: {
 						arcbar: {
@@ -280,11 +229,11 @@
 				}
 				let activity = {
 					title: {
-						name: this.todayData.activityArcbar.series[0].data * 100 + "%",
-						color: this.todayData.activityArcbar.series[0].color
+						name: this.homeData.activityArcbar.series[0].data * 100 + "%",
+						color: this.homeData.activityArcbar.series[0].color
 					},
 					subtitle: {
-						name: this.todayData.activityArcbar.series[0].name
+						name: this.homeData.activityArcbar.series[0].name
 					},
 					extra: {
 						arcbar: {
@@ -296,7 +245,22 @@
 				this.homeworkOpts = homework;
 				this.activityOpts = activity;
 			},
-
+			//导航
+			navHomework(index) {
+				uni.reLaunch({
+					url: `/pages/homework/homework?index=${index}`
+				})
+			},
+			navCalendar() {
+				uni.navigateTo({
+					url: '/subpkg/calendarmsg/calendarmsg'
+				})
+			},
+			navClass() {
+				uni.navigateTo({
+					url: '/subpkg/classmsg/classmsg'
+				})
+			},
 		},
 	}
 </script>
@@ -304,24 +268,32 @@
 <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;
+	.state-box {
 		display: flex;
-		justify-content: center;
+		flex-direction: column;
 		align-items: center;
-	}
-
-	.space {
 		height: 100%;
 		width: 100%;
-		display: flex;
-		flex-direction: column;
-		justify-content: space-around;
+
+		.state {
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			border-radius: 50rpx;
+			height: 21%;
+			width: 90%;
+		}
+	}
+	.state-text {
+		font-size: 32rpx;
+		font-weight: bold;
+		color: #FFF;
+	}
+
+	.text-content {
+		font-size: 30rpx;
+		font-weight: bold;
+		color: $color-title;
+		margin:20rpx auto 20rpx 7%;
 	}
 </style>

pages/homework/homework.vue

@@ -5,12 +5,12 @@
 		<view class="module-container">
 			<view style="margin: 0 20rpx;">
 				<u-tabs :list="list" :current="current" @change="changeModule"
-					:activeStyle="{color: '#5b7cff',fontWeight: 'bold',transform: 'scale(1.08)',}"
-					:inactiveStyle="{fontWeight: 'bold',transform: 'scale(1)'}" lineColor="#5b7cff" lineWidth="60">
+					:activeStyle="{color: '#3c9cff',fontWeight: 'bold',transform: 'scale(1.08)',}"
+					:inactiveStyle="{fontWeight: 'bold',transform: 'scale(1)'}" lineColor="#3c9cff" lineWidth="60">
 				</u-tabs>
 			</view>
 
-			<view class="module-box" v-for="(item,index) in card" :key="index" v-if="current == index">
+			<view class="module-box" v-for="(item,index) in pageData" :key="index" v-if="current == index">
 				<!-- 详情头部卡片 -->
 				<view class="card" :style="{backgroundColor: `${item.color}`}">
 					<view class="box">
@@ -20,12 +20,11 @@
 						</view>
 						<view class="box" style="margin: 10rpx 0 0 0;">
 							<view class="flex">
-								<text class="card-subtitle">{{item.name}}完成数量:</text>
-								<text class="card-subtitle"
-									style="margin-left: 20rpx;">{{item.detail.finishData.length}}</text>
+								<text class="card-subtitle">完成数量:</text>
+								<text class="card-subtitle" style="margin-left: 20rpx;">{{finishData.length}}</text>
 							</view>
 							<view class="flex">
-								<text class="card-subtitle">{{item.name}}完成情况:</text>
+								<text class="card-subtitle">完成情况:</text>
 								<text class="card-subtitle" style="margin-left: 20rpx;">{{item.level}}</text>
 							</view>
 						</view>
@@ -34,8 +33,7 @@
 				</view>
 				<!-- 中间标题 -->
 				<view class="flex">
-					<view class="cut-off">{{item.detail.nav}}</view>
-					<!-- <u-button text="获得报表" :plain="true" :hairline="true" shape="circle" size="small"></u-button> -->
+					<view class="cut-off">{{item.name}}信息</view>
 				</view>
 				<!-- 列表 -->
 				<view class="detail-box" v-if="current == index">
@@ -66,17 +64,17 @@
 							<!-- 完成列表展示所有已完成的评测作业和活动信息 -->
 						</view>
 						<view style="margin-bottom: 20rpx;">
-							<view class="block-box" v-for="(j,y) in item.detail.finishData" :key="y">
+							<view class="block-box" v-for="(item,index) in finishData" :key="index">
 								<view class="index" style="height: 100rpx;background-color: #00b894;"></view>
 								<view class="class-block" style="height: 100rpx;width: 90%;">
-									<view class="block-title">{{j.name}}</view>
+									<view class="block-title">{{item.name}}</view>
 									<view class="block-subtitle">科目:</view>
 									<view class="block-tag-box">
-										<view class="block-tag">{{j.subject}}</view>
+										<view class="block-tag">{{item.subject}}</view>
 									</view>
 									<view class="block-subtitle">布置老师:</view>
 									<view class="block-tag-box">
-										<view class="block-tag">{{j.teacher}}</view>
+										<view class="block-tag">{{item.teacher}}</view>
 									</view>
 								</view>
 							</view>
@@ -89,7 +87,8 @@
 							<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="t-icon t-icon-liebiao" style="width: 30rpx; height: 30rpx;"
+									@click="navData"></view>
 								<view class="msg" @click="navData" style="color: #3C9CFF;">详情列表</view>
 							</view>
 						</view>
@@ -139,209 +138,70 @@
 				}],
 				//当前模块
 				current: 0,
-				//时间戳
-				timeStamp: '',
-				//卡片内容
-				card: [{
-					name: '评测',
-					level: '良好',
-					color: '#0080ff;',
-					image: 'https://ouch-cdn2.icons8.com/yFl5NWU3aVehLBlQf9ctvnZPqtm5U0hqM3IzWvFDCaQ/rs:fit:912:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9wbmcvNzY5/LzY1ZTQxZmZjLTg1/YWQtNDYyMi1hYzU0/LWQ3NDEzZmY2NGI1/YS5wbmc.png',
-					detail: {
-						nav: '评测信息',
-						title: '评测列表',
-						data: [{
-							name: '评测数据1',
-							subject: '数学',
-							teacher: '王老师',
-							description: '这里是评测描述信息',
-							content: '这里是评测详细信息。。。312323782109381029840917489012611'
-						}, {
-							name: '评测数据2',
-							subject: '语文',
-							teacher: '张老师',
-							description: '这里是评测描述信息',
-							content: '这里是评测详细信息。。。312323782109381029840917489012611'
-						}, {
-							name: '评测数据3',
-							subject: '语文',
-							teacher: '张老师',
-							description: '这里是评测描述信息',
-							content: '这里是评测详细信息。。。312323782109381029840917489012611'
-						}, {
-							name: '评测数据4',
-							subject: '思品',
-							teacher: '李老师',
-							description: '这里是评测描述信息',
-							content: '这里是评测详细信息。。。312323782109381029840917489012611'
-						}, {
-							name: '评测数据5',
-							subject: '科学',
-							teacher: '李老师',
-							description: '这里是评测描述信息',
-							content: '这里是评测详细信息。。。312323782109381029840917489012611'
-						}],
-
-
-						finishData: [{
-							name: '评测数据1',
-							subject: '数学',
-							teacher: '王老师',
-						}, {
-							name: '评测数据2',
-							subject: '语文',
-							teacher: '张老师',
-						}, {
-							name: '评测数据3',
-							subject: '语文',
-							teacher: '张老师',
-						}]
-					}
-				}, {
-					name: '作业',
-					level: '优秀',
-					color: '#ff8caf;',
-					image: 'https://ouch-cdn2.icons8.com/AVOwJ9emg_ZOeHvQaunQAZlgeLsG-b1cGhiYvgoJ06g/rs:fit:912:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9wbmcvNTAw/LzI5YjU1YWQ4LWMw/YTEtNDE1MS1iYmQw/LWIyMDdhYmRkOTE0/Mi5wbmc.png',
-					detail: {
-						nav: '作业信息',
-						title: '作业列表',
-						data: [{
-							name: '作业数据1',
-							subject: '数学',
-							teacher: '王老师',
-							description: '这里是作业描述信息',
-							content: '这里是作业详细信息。。1421312712987192371298739812733123'
-						}, {
-							name: '作业数据2',
-							subject: '数学',
-							teacher: '王老师',
-							description: '这里是作业描述信息',
-							content: '这里是作业详细信息。。1421312712987192371298739812733123'
-						}, {
-							name: '作业数据3',
-							subject: '数学',
-							teacher: '王老师',
-							description: '这里是作业描述信息',
-							content: '这里是作业详细信息。。1421312712987192371298739812733123'
-						}],
-
-						finishData: [{
-							name: '作业数据1',
-							subject: '数学',
-							teacher: '王老师',
-						}, {
-							name: '作业数据2',
-							subject: '数学',
-							teacher: '王老师',
-						}, {
-							name: '作业数据3',
-							subject: '数学',
-							teacher: '王老师',
-						}]
-					}
-				}, {
-					name: '活动',
-					level: '优秀',
-					color: '#f9c752;',
-					image: 'https://ouch-cdn2.icons8.com/LW70TMgW1cGfYeGNSTEp7__kiKVgIhwdZwUmykdLYMY/rs:fit:912:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9wbmcvOTI0/LzU3MWU4ZDZkLTg0/NzEtNGM5YS04MDJk/LTEzNTM5YmZmZTM2/YS5wbmc.png',
-					detail: {
-						nav: '活动信息',
-						title: '活动列表',
-						data: [{
-							name: '活动数据1',
-							subject: '数学',
-							teacher: '王老师',
-							description: '这里是活动描述信息',
-							content: '这里是活动详细信息。13312313122183081230128309128390281。'
-						}, {
-							name: '活动数据2',
-							subject: '语文',
-							teacher: '张老师',
-							description: '这里是活动描述信息',
-							content: '这里是活动详细信息。13312313122183081230128309128390281。'
-						}, {
-							name: '活动数据3',
-							subject: '语文',
-							teacher: '张老师',
-							description: '这里是活动描述信息',
-							content: '这里是活动详细信息。13312313122183081230128309128390281。'
-						}, {
-							name: '活动数据4',
-							subject: '数学',
-							teacher: '王老师',
-							description: '这里是活动描述信息',
-							content: '这里是活动详细信息2183081230128309128390281。。'
-						}, {
-							name: '活动数据5',
-							subject: '数学',
-							teacher: '王老师',
-							description: '这里是活动描述信息',
-							content: '这里是活动详细信息2183081230128309128390281。。'
-						}, {
-							name: '活动数据6',
-							subject: '数学',
-							teacher: '王老师',
-							description: '这里是活动描述信息',
-							content: '这里是活动详细信息2183081230128309128390281。。'
-						}],
-
-
-						finishData: [{
-							name: '活动数据1',
-							subject: '数学',
-							teacher: '王老师',
-						}, {
-							name: '活动数据2',
-							subject: '语文',
-							teacher: '张老师',
-						}, {
-							name: '活动数据3',
-							subject: '语文',
-							teacher: '张老师',
-						}, {
-							name: '活动数据4',
-							subject: '数学',
-							teacher: '王老师',
-						}, {
-							name: '活动数据5',
-							subject: '数学',
-							teacher: '王老师',
-						}]
-					}
-				}],
+				//页面数据内容
+				pageData: '',
+				//完成内容
+				finishData: [],
 				//历史数据
 				historyData: {
 					test: [90, 89, 98, 100, 50, 55, 60],
 					homework: [10, 29, 38, 60, 50, 88, 100],
 					activity: [70, 19, 28, 40, 60, 100, 83]
 				},
-
-
+				//时间戳
+				timeStamp: '',
 			};
 		},
+		watch: {
+			current() {
+				this.getFinishData()
+			}
+		},
 		onLoad(options) {
-			this.$getTimeStamp()
-			this.saveToStudyChart()
-			// let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
-			// let curParam = routes[routes.length - 1].options; //获取路由参数
-			if(options.index)
-			this.current = options.index
+			this.init()
+			if (options.index)
+				this.current = options.index
 		},
 		//刷新页面
 		onPullDownRefresh() {
-			this.$getTimeStamp()
-			console.log('refresh');
+			this.init()
 			setTimeout(function() {
 				uni.stopPullDownRefresh();
 			}, 1000);
 		},
 		methods: {
 			...mapMutations('m_chart', ['updateTestArea', 'updateHomeworkArea', 'updateActivityArea']),
-			...mapMutations('m_children',['updateHomeworkDetail']),
+			...mapMutations('m_children', ['updateHomeworkDetail']),
+			//初始化页面
+			init() {
+				this.$getTimeStamp()
+				this.$initHomework()
+				this.saveToStudyChart()
+				this.getLevel()
+				this.getFinishData()
+			},
 			//更改模块
 			changeModule(index) {
 				this.current = index.index
 			},
+			//获得评判信息
+			getLevel() {
+				this.pageData[0].level = this.historyData.test[6] >= 40 ? (this.historyData.test[6] >= 70 ? '优秀' : '良好') :
+					'较差'
+				this.pageData[1].level = this.historyData.homework[6] >= 40 ? (this.historyData.homework[6] >= 70 ? '优秀' :
+					'良好') : '较差'
+				this.pageData[2].level = this.historyData.activity[6] >= 40 ? (this.historyData.activity[6] >= 70 ? '优秀' :
+					'良好') : '较差'
+			},
+			//获得完成数量
+			getFinishData() {
+				if (this.current === 0)
+					this.finishData = this.pageData[0].detail.data.filter(x => x.finish === true)
+				if (this.current === 1)
+					this.finishData = this.pageData[1].detail.data.filter(x => x.finish === true)
+				if (this.current === 2)
+					this.finishData = this.pageData[2].detail.data.filter(x => x.finish === true)
+			},
 			//记录到图表
 			saveToStudyChart() {
 				let temp = {
@@ -367,8 +227,9 @@
 				let activityDataTemp = JSON.parse(JSON.stringify(temp))
 				this.updateActivityArea(activityDataTemp)
 			},
+			//导航到详情页面
 			navData() {
-				this.updateHomeworkDetail(this.card[this.current].detail.data)
+				this.updateHomeworkDetail(this.pageData[this.current].detail.data)
 				uni.navigateTo({
 					url: '/subpkg/homeworkdata/homeworkdata'
 				})
@@ -449,11 +310,11 @@
 		.detail-box {
 			display: flex;
 			flex-flow: row wrap;
-			margin: 20rpx;
+			margin: 20rpx 20rpx 0 20rpx;
 			justify-content: space-between;
 
 			.detail-box-item {
-				margin: 2% 0;
+				margin: 0 0 4% 0;
 				width: 100%;
 				height: auto;
 				background-color: #FFF;

pages/init/init.vue

@@ -23,14 +23,12 @@
 					url:'/subpkg/login/login'
 				})
 			} else{
-				this.updateChildrenSemester(this.semesterList[0][0])
 				uni.switchTab({
 					url:'/pages/home/home'
 				})
 			}
 		},
 		methods:{
-			...mapMutations('m_children', ['updateChildrenSemester']),
 		}
 	}
 </script>

pages/interactive/interactive.vue

@@ -3,7 +3,7 @@
 		<!-- 头部区域 -->
 		<top-box :timeStamp="timeStamp"></top-box>
 		<!-- 记录模块 -->
-		<todaydata-box></todaydata-box>
+		<interactive-box></interactive-box>
 		<!-- 列表区域 -->
 		<view class="card-box">
 			<view class="card-item" v-for="(item,index) in subArr" :style="{backgroundImage:`url(${item.image})`}"></view>

store/chart.js

@@ -0,0 +1,63 @@
+//导出全局表信息存储模块
+export default {
+	//开启命名空间
+	namespaced: true,
+	//模块数据
+	state: () => ({
+		//首页图表数据
+		homeData: '',
+		//成绩图表数据
+		gradeData: '',
+		
+		//作业图表数据
+		homeworkData: {
+			//评测完成率
+			testData: '',
+			homeworkData: '',
+			activityData: '',
+		}
+
+	}),
+	//模块方法(修改数据)
+	mutations: {
+		updateHomeChart(state,homeData){
+			state.homeData = homeData
+		},
+		//更新成绩图表数据
+		updateGradeChart(state,gradeData){
+			state.gradeData = gradeData
+		},
+		
+		
+		//更新单个图表数据
+		updateSubjectComparison(state, singleAverageComparison) {
+			state.gradeData.semesterLineChart.singleAverageComparison = singleAverageComparison
+		},
+		updateSemesterSubjectRank(state, semesterSubjectRank){
+			state.gradeData.rankChart.semesterSubjectRank = semesterSubjectRank
+		},
+		
+		//更新作业模块数据
+		updateTestArea(state, testData){
+			state.homeworkData.testData = testData
+		},
+		updateHomeworkArea(state, homeworkData){
+			state.homeworkData.homeworkData = homeworkData
+		},
+		updateActivityArea(state, activityData){
+			state.homeworkData.activityData = activityData
+		},
+
+	},
+	//模块属性(数据包装)
+	getters: {
+		//学科科目
+		// getSubjectList(state) {
+		// 	let {
+		// 		考试,
+		// 		...subject
+		// 	} = state.gradeData.tableData[0]
+		// 	return Object.keys(subject)
+		// }
+	}
+}

store/children.js

@@ -0,0 +1,76 @@
+//导出学生信息存储模块
+export default {
+	//开启命名空间
+	namespaced: true,
+
+	//模块数据
+	state: () => ({
+		childreninfo: JSON.parse(uni.getStorageSync('childreninfo') || '{}'),
+		semesterList: '',
+		semester: uni.getStorageSync('semester') || '请选择学期',
+		//课程列表
+		classList: '',
+		//打卡记录
+		records: '',
+		//日历打卡统计数据
+		calendar: {
+			isAttendNum: '',
+			noAttendNum: '',
+		},
+		//评测作业活动内容
+		homeworkDetail: '',
+	}),
+	//模块方法(修改数据)
+	mutations: {
+		//更新学生信息
+		updateChildrenInfo(state, childreninfo) {
+			state.childreninfo = childreninfo
+			this.commit('m_children/saveChildrenInfoToStorage')
+		},
+		//更新学期列表信息
+		updateChildrenSemesterList(state, semesterList) {
+			state.semesterList = semesterList
+		},
+		//更新学期信息
+		updateChildrenSemester(state, semester) {
+			state.semester = semester
+			this.commit('m_children/saveChildrenSemesterToStorage')
+		},
+		//更新课程列表
+		updateClassList(state, classList){
+			state.classList = classList
+		},
+		//更新打卡数据
+		updateRecords(state, records){
+			state.records = records
+		},
+		//更新评测作业活动信息
+		updateHomeworkDetail(state, homeworkDetail) {
+			state.homeworkDetail = homeworkDetail
+		},
+		//更新日历页未打卡数据
+		updateNoAttendNum(state, noAttendNum) {
+			state.calendar.noAttendNum = noAttendNum
+		},
+		//更新日历页已打卡数据
+		updateIsAttendNum(state, isAttendNum) {
+			state.calendar.isAttendNum = isAttendNum
+		},
+		
+		
+		//持久化存储
+		//学生信息
+		saveChildrenInfoToStorage(state) {
+			uni.setStorageSync('childreninfo', JSON.stringify(state.childreninfo))
+		},
+		//学期信息
+		saveChildrenSemesterToStorage(state) {
+			uni.setStorageSync('semester', state.semester)
+		}
+
+	},
+	//模块属性(数据包装)
+	getters: {
+
+	}
+}

information/parent.js

@@ -11,75 +11,57 @@ export default {
 		parentinfo: JSON.parse(uni.getStorageSync('parentinfo') || '{}'),
 
 		parentdetail: JSON.parse(uni.getStorageSync('parentdetail') || '{}'),
-		myData: {
-			subscribeLevel: '专业版',
-			subscribePrivilege: '这里是订阅权益描述信息',
-			subscribeTime: '2022.2.15-2025.2.15',
-			msgList: [{
-					icon: 't-icon t-icon-shuju',
-					title: '成绩通知',
-					msgTime: '12分钟前',
-					content: '您的孩子【张梅】在 【青城山学校】的【2020年语文期末测试】成绩已经生成，请点击查看详情 > ',
-					image: 'https://image.meiye.art/pic_9ikZaVYnJE38Ao6AZlVIx?imageMogr2/thumbnail/450x/interlace/1'
-				},
-				{
-					icon: 't-icon t-icon-tishi',
-					title: '系统通知',
-					msgTime: '20分钟前',
-					content: '您以成功绑定【青城山学校】【五年级8班】【张梅】学生。',
-					image: 'https://image.meiye.art/pic_ucQUd7WwkuW1vKvjbgUlv?imageMogr2/thumbnail/450x/interlace/1'
-				},
-				{
-					icon: 't-icon t-icon-bianji',
-					title: '任务通知',
-					msgTime: '40分钟前',
-					content: '您的孩子【张梅】班主任李老师给您发布一个新的问卷活动【周末孩子表现问卷调查】，快去填写吧 ',
-					image: 'https://image.meiye.art/pic_1628927180566LfOmH3IV5i24Mmc65BGE0?imageMogr2/thumbnail/450x/interlace/1'
-				}
-			]
-		}
+		//个人数据
+		myData: JSON.parse(uni.getStorageSync('myData') || '{}'),
 
 	}),
 	//模块方法(修改数据)
 	mutations: {
+		//更新token字符串
+		updateToken(state, token) {
+			state.token = token
+			this.commit('m_parent/saveTokenToStorage')
+		},
 		//更新用户信息
 		updateParentInfo(state, parentinfo) {
 			state.parentinfo = parentinfo
 			this.commit('m_parent/saveParentInfoToStorage')
 		},
-		//持久化存储
-		saveParentInfoToStorage(state) {
-			uni.setStorageSync('parentinfo', JSON.stringify(state.parentinfo))
-		},
 		//更新家长详细信息
 		updateParentDetail(state,parentdetail){
 			state.parentdetail = parentdetail
 			this.commit('m_parent/saveParentDetailToStorage')
 		},
-		//持久化存储
-		saveParentDetailToStorage(state){
-			uni.setStorageSync('parentdetail', JSON.stringify(state.parentdetail))
+		//更新我的消息
+		updateMyMsg(state,msgList) {
+			state.msgList = msgList
 		},
-
-		//更新token字符串
-		updateToken(state, token) {
-			state.token = token
-			this.commit('m_parent/saveTokenToStorage')
+		//更新订阅信息
+		updateSubscribe(state,subscribe){
+			state.subscribe = subscribe
 		},
-
+		//更新个人数据
+		updateMyData(state,myData){
+			state.myData = myData
+			this.commit('m_parent/saveMyDataToStorage')
+		},
+		
+		
+		//持久化存储
 		//token持久化存储
 		saveTokenToStorage(state) {
 			uni.setStorageSync('token',state.token)
 		},
-		//更新我的消息
-		updateMyMsg(state,msgList) {
-			state.msgList = msgList
+		saveParentInfoToStorage(state) {
+			uni.setStorageSync('parentinfo', JSON.stringify(state.parentinfo))
 		},
-		updateSubscribe(state,subscribe){
-			state.subscribe = subscribe
+		saveParentDetailToStorage(state){
+			uni.setStorageSync('parentdetail', JSON.stringify(state.parentdetail))
+		},
+		saveMyDataToStorage(state){
+			uni.setStorageSync('myData', JSON.stringify(state.myData))
 		}
 
-
 	},
 	//模块属性(数据包装)
 	getters: {

subpkg/calendarmsg/calendarmsg.vue

@@ -17,7 +17,7 @@
 							<view class="number-detail">缺卡次数</view>
 						</view>
 						<view class="number-box">
-							<view class="number">{{monthAttendQuality}}</view>
+							<text class="number" :style="{color: monthAttendQuality==='优秀'?'#3C9CFF':(monthAttendQuality === '良好'?'#f9c752':'#3B4144'),fontSize: 40+'rpx'}">{{monthAttendQuality}}</text>
 							<view class="number-detail">本月出勤质量</view>
 						</view>
 					</view>
@@ -26,7 +26,7 @@
 
 			<view class="card-item">
 				<view class="calendar_container">
-					<zsyCalendar :sundayIndex="6" @change="dateHandler" @chooseDate="chooseDate"/>
+					<zsyCalendar :sundayIndex="6" @chooseDate="chooseDate"/>
 				</view>
 				<view class="state-box">
 					<view class="state"
@@ -40,7 +40,7 @@
 						</view>
 						<view class="flex">
 							<text class="msg-text" style="font-weight: normal;font-size: 28rpx;">出勤效率:</text>
-							<text class="msg-text">{{attendanceQuality}}</text>
+							<text class="msg-text" :style="{color: attendanceQuality==='优秀'?'#3C9CFF':(attendanceQuality === '良好'?'#f9c752':'#3B4144')}">{{attendanceQuality}}</text>
 						</view>
 					</view>
 				</view>
@@ -54,7 +54,6 @@
 	import {
 		mapState,
 	} from 'vuex'
-	import getdata from '../../common/data.js'
 	import zsyCalendar from '@/subpkg/zsy-calendar/zsy-calendar.vue'
 	export default {
 		name: 'Calendar',
@@ -76,18 +75,33 @@
 			};
 		},
 		onLoad(options) {
-			this.attendance = options.attendance
-			this.attendanceTime = options.attendanceTime
-			this.attendanceQuality = options.attendanceQuality
+			this.getTodayAttendance()
 			this.getMonthAttendQuality()
 		},
 		methods: {
+			//今日打卡
+			getTodayAttendance() {
+				//获得当前时间时间戳
+				let timeNow = (new Date()).format("yyyy-M-dd")
+				let timeArr = timeNow.split("-")
+				let info = this.records.filter(x => x.year == timeArr[0] && x.month == timeArr[1] && x.date == timeArr[2])
+				if (info.length === 0) {
+					//出勤状况
+					this.attendance = '未打卡',
+					//打卡时间
+					this.attendanceTime = '未记录',
+					//出勤质量
+					this.attendanceQuality = '未记录'
+				} else {
+					this.attendance = '已打卡'
+					this.attendanceTime = info[0].time
+					this.attendanceQuality = info[0].time<='08:15'? '优秀':(info[0].time<='08:25'? '良好' : '较差')
+				}
+			},
 			//判断本月出勤质量
 			getMonthAttendQuality() {
-				this.monthAttendQuality = this.calendar.noAttendNum <= 5? '优秀':'一般'
+				this.monthAttendQuality = this.calendar.noAttendNum <= 5? '优秀':(this.calendar.noAttendNum <= 10? '良好' : '较差')
 			},
-			//日历事件
-			dateHandler(e) {},
 			//选择日期
 			chooseDate(dateInfo, dateIndex) {
 				// console.log(dateInfo);
@@ -95,7 +109,7 @@
 					this.attendance = '已打卡'
 					this.attendanceTime = this.records.filter(x => x.date === dateInfo.date && x.month === dateInfo.month && x.year === x.year)[0].time
 					// console.log(info);
-					this.attendanceQuality = this.attendanceTime>'08:15'? '一般':'优秀'
+					this.attendanceQuality = this.attendanceTime<='08:15'? '优秀':(this.attendanceTime<='08:25'? '良好' : '较差')
 				}
 				if (dateInfo.isAttend === 0) {
 					this.attendance = '未打卡'
@@ -183,7 +197,6 @@
 	.state-box {
 		display: flex;
 		align-items: center;
-		justify-content: center;
 		height: 200rpx;
 		width: 100%;
 

subpkg/childrenlist/childrenlist.vue

@@ -30,23 +30,21 @@
 	} from 'vuex'
 	export default {
 		computed: {
-			...mapState('m_parent', ['parentdetail']),
-			...mapState('m_children', ['semesterList'])
+			...mapState('m_parent', ['parentdetail'])
 		},
 		data() {
 			return {
 
 			};
+		},
+		onLoad() {
+			this.$initApp()
 		},
 		methods: {
-			...mapMutations('m_children', ['updateChildrenInfo', 'updateChildrenSemester']),
-
+			...mapMutations('m_children', ['updateChildrenInfo']),
 			//选择孩子并跳转首页传入id查询显示孩子信息
 			chooseChildren(item) {
-				console.log(item.tmdid);
 				this.updateChildrenInfo(item)
-				//默认学期
-				this.updateChildrenSemester(this.semesterList[0][0])
 				uni.switchTab({
 					url: '/pages/home/home'
 				})

subpkg/homeworkdata/homeworkdata.vue

@@ -1,5 +1,4 @@
 <template>
-
 	<view class="container">
 		<!-- 返回按钮 -->
 		<back text="详情列表"></back>
@@ -11,11 +10,11 @@
 
 		<view class="detail-box" v-if="!loading">
 			<view class="detail-item" v-for="(item,index) in homeworkDetail" :key="index">
-				<view class="detail-item-title">
-					<view class="flex">
-						<view class="t-icon t-icon-daiban"></view>
-						<view class="name">{{item.name}}</view>
-					</view>
+				<view class="flex" style="width: 100%;">
+					<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>
 				</view>
 
 				<view class="content-box">
@@ -79,43 +78,40 @@
 			background-color: #fff;
 			padding: 30rpx;
 
-			&-title {
-				display: flex;
-
-				.t-icon {
-					display: inline-block;
-					margin-right: 10rpx;
-					width: 40rpx;
-					height: 40rpx;
-				}
-
-				.name {
-					font-size: 32rpx;
-					font-weight: bold;
-					color: $color-title;
-				}
+			.t-icon {
+				display: inline-block;
+				margin-right: 10rpx;
+				width: 40rpx;
+				height: 40rpx;
 			}
 
-			.content-box {
-				padding: 20rpx 20rpx 10rpx 20rpx;
-
-				.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;
-				}
+			.name {
+				font-size: 32rpx;
+				font-weight: bold;
+				color: $color-title;
+			}
+		}
+
+		.content-box {
+			padding: 10rpx 20rpx 10rpx 20rpx;
+
+			.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;
 			}
 		}
 	}
 
+
 	.flex {
 		display: flex;
 		align-items: center;

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

@@ -121,7 +121,7 @@ const cfu = {
 			return category + ' ' + item.name + ': ' + item.data + ' % '
 		},
 		"HomeworkPercent": function(item, category, index, opts) {
-			let value = item.data >= 50? (item.data >= 80? '优秀' : '良好') : '一般'
+			let value = item.data >= 40? (item.data >= 70? '优秀' : '良好') : '较差'
 			return category + ' ' + item.name + '完成情况:' + value+ ' ' + item.data + ' % '
 		},
 		"tooltipHour": function(item, category, index, opts) {

uni_modules/uni-icons/changelog.md

@@ -1,22 +0,0 @@
-## 1.3.5（2022-01-24）
-- 优化 size 属性可以传入不带单位的字符串数值
-## 1.3.4（2022-01-24）
-- 优化 size 支持其他单位
-## 1.3.3（2022-01-17）
-- 修复 nvue 有些图标不显示的bug，兼容老版本图标
-## 1.3.2（2021-12-01）
-- 优化 示例可复制图标名称
-## 1.3.1（2021-11-23）
-- 优化 兼容旧组件 type 值
-## 1.3.0（2021-11-19）
-- 新增 更多图标
-- 优化 自定义图标使用方式
-- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
-- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
-## 1.1.7（2021-11-08）
-## 1.2.0（2021-07-30）
-- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
-## 1.1.5（2021-05-12）
-- 新增 组件示例地址
-## 1.1.4（2021-02-05）
-- 调整为uni_modules目录规范

uni_modules/uni-icons/components/uni-icons/uni-icons.vue

@@ -1,96 +0,0 @@
-<template>
-	<!-- #ifdef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
-	<!-- #endif -->
-	<!-- #ifndef APP-NVUE -->
-	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
-	<!-- #endif -->
-</template>
-
-<script>
-	import icons from './icons.js';
-	const getVal = (val) => {
-		const reg = /^[0-9]*$/g
-		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
-	} 
-	// #ifdef APP-NVUE
-	var domModule = weex.requireModule('dom');
-	import iconUrl from './uniicons.ttf'
-	domModule.addRule('fontFace', {
-		'fontFamily': "uniicons",
-		'src': "url('"+iconUrl+"')"
-	});
-	// #endif
-
-	/**
-	 * Icons 图标
-	 * @description 用于展示 icons 图标
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
-	 * @property {Number} size 图标大小
-	 * @property {String} type 图标图案，参考示例
-	 * @property {String} color 图标颜色
-	 * @property {String} customPrefix 自定义图标
-	 * @event {Function} click 点击 Icon 触发事件
-	 */
-	export default {
-		name: 'UniIcons',
-		emits:['click'],
-		props: {
-			type: {
-				type: String,
-				default: ''
-			},
-			color: {
-				type: String,
-				default: '#333333'
-			},
-			size: {
-				type: [Number, String],
-				default: 16
-			},
-			customPrefix:{
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				icons: icons.glyphs
-			}
-		},
-		computed:{
-			unicode(){
-				let code = this.icons.find(v=>v.font_class === this.type)
-				if(code){
-					return unescape(`%u${code.unicode}`)
-				}
-				return ''
-			},
-			iconSize(){
-				return getVal(this.size)
-			}
-		},
-		methods: {
-			_onClick() {
-				this.$emit('click')
-			}
-		}
-	}
-</script>
-
-<style lang="scss">
-	/* #ifndef APP-NVUE */
-	@import './uniicons.css';
-	@font-face {
-		font-family: uniicons;
-		src: url('./uniicons.ttf') format('truetype');
-	}
-
-	/* #endif */
-	.uni-icons {
-		font-family: uniicons;
-		text-decoration: none;
-		text-align: center;
-	}
-
-</style>

uni_modules/uni-icons/components/uni-icons/uniicons.css

@@ -1,663 +0,0 @@
-.uniui-color:before {
-  content: "\e6cf";
-}
-
-.uniui-wallet:before {
-  content: "\e6b1";
-}
-
-.uniui-settings-filled:before {
-  content: "\e6ce";
-}
-
-.uniui-auth-filled:before {
-  content: "\e6cc";
-}
-
-.uniui-shop-filled:before {
-  content: "\e6cd";
-}
-
-.uniui-staff-filled:before {
-  content: "\e6cb";
-}
-
-.uniui-vip-filled:before {
-  content: "\e6c6";
-}
-
-.uniui-plus-filled:before {
-  content: "\e6c7";
-}
-
-.uniui-folder-add-filled:before {
-  content: "\e6c8";
-}
-
-.uniui-color-filled:before {
-  content: "\e6c9";
-}
-
-.uniui-tune-filled:before {
-  content: "\e6ca";
-}
-
-.uniui-calendar-filled:before {
-  content: "\e6c0";
-}
-
-.uniui-notification-filled:before {
-  content: "\e6c1";
-}
-
-.uniui-wallet-filled:before {
-  content: "\e6c2";
-}
-
-.uniui-medal-filled:before {
-  content: "\e6c3";
-}
-
-.uniui-gift-filled:before {
-  content: "\e6c4";
-}
-
-.uniui-fire-filled:before {
-  content: "\e6c5";
-}
-
-.uniui-refreshempty:before {
-  content: "\e6bf";
-}
-
-.uniui-location-filled:before {
-  content: "\e6af";
-}
-
-.uniui-person-filled:before {
-  content: "\e69d";
-}
-
-.uniui-personadd-filled:before {
-  content: "\e698";
-}
-
-.uniui-back:before {
-  content: "\e6b9";
-}
-
-.uniui-forward:before {
-  content: "\e6ba";
-}
-
-.uniui-arrow-right:before {
-  content: "\e6bb";
-}
-
-.uniui-arrowthinright:before {
-  content: "\e6bb";
-}
-
-.uniui-arrow-left:before {
-  content: "\e6bc";
-}
-
-.uniui-arrowthinleft:before {
-  content: "\e6bc";
-}
-
-.uniui-arrow-up:before {
-  content: "\e6bd";
-}
-
-.uniui-arrowthinup:before {
-  content: "\e6bd";
-}
-
-.uniui-arrow-down:before {
-  content: "\e6be";
-}
-
-.uniui-arrowthindown:before {
-  content: "\e6be";
-}
-
-.uniui-bottom:before {
-  content: "\e6b8";
-}
-
-.uniui-arrowdown:before {
-  content: "\e6b8";
-}
-
-.uniui-right:before {
-  content: "\e6b5";
-}
-
-.uniui-arrowright:before {
-  content: "\e6b5";
-}
-
-.uniui-top:before {
-  content: "\e6b6";
-}
-
-.uniui-arrowup:before {
-  content: "\e6b6";
-}
-
-.uniui-left:before {
-  content: "\e6b7";
-}
-
-.uniui-arrowleft:before {
-  content: "\e6b7";
-}
-
-.uniui-eye:before {
-  content: "\e651";
-}
-
-.uniui-eye-filled:before {
-  content: "\e66a";
-}
-
-.uniui-eye-slash:before {
-  content: "\e6b3";
-}
-
-.uniui-eye-slash-filled:before {
-  content: "\e6b4";
-}
-
-.uniui-info-filled:before {
-  content: "\e649";
-}
-
-.uniui-reload:before {
-  content: "\e6b2";
-}
-
-.uniui-micoff-filled:before {
-  content: "\e6b0";
-}
-
-.uniui-map-pin-ellipse:before {
-  content: "\e6ac";
-}
-
-.uniui-map-pin:before {
-  content: "\e6ad";
-}
-
-.uniui-location:before {
-  content: "\e6ae";
-}
-
-.uniui-starhalf:before {
-  content: "\e683";
-}
-
-.uniui-star:before {
-  content: "\e688";
-}
-
-.uniui-star-filled:before {
-  content: "\e68f";
-}
-
-.uniui-calendar:before {
-  content: "\e6a0";
-}
-
-.uniui-fire:before {
-  content: "\e6a1";
-}
-
-.uniui-medal:before {
-  content: "\e6a2";
-}
-
-.uniui-font:before {
-  content: "\e6a3";
-}
-
-.uniui-gift:before {
-  content: "\e6a4";
-}
-
-.uniui-link:before {
-  content: "\e6a5";
-}
-
-.uniui-notification:before {
-  content: "\e6a6";
-}
-
-.uniui-staff:before {
-  content: "\e6a7";
-}
-
-.uniui-vip:before {
-  content: "\e6a8";
-}
-
-.uniui-folder-add:before {
-  content: "\e6a9";
-}
-
-.uniui-tune:before {
-  content: "\e6aa";
-}
-
-.uniui-auth:before {
-  content: "\e6ab";
-}
-
-.uniui-person:before {
-  content: "\e699";
-}
-
-.uniui-email-filled:before {
-  content: "\e69a";
-}
-
-.uniui-phone-filled:before {
-  content: "\e69b";
-}
-
-.uniui-phone:before {
-  content: "\e69c";
-}
-
-.uniui-email:before {
-  content: "\e69e";
-}
-
-.uniui-personadd:before {
-  content: "\e69f";
-}
-
-.uniui-chatboxes-filled:before {
-  content: "\e692";
-}
-
-.uniui-contact:before {
-  content: "\e693";
-}
-
-.uniui-chatbubble-filled:before {
-  content: "\e694";
-}
-
-.uniui-contact-filled:before {
-  content: "\e695";
-}
-
-.uniui-chatboxes:before {
-  content: "\e696";
-}
-
-.uniui-chatbubble:before {
-  content: "\e697";
-}
-
-.uniui-upload-filled:before {
-  content: "\e68e";
-}
-
-.uniui-upload:before {
-  content: "\e690";
-}
-
-.uniui-weixin:before {
-  content: "\e691";
-}
-
-.uniui-compose:before {
-  content: "\e67f";
-}
-
-.uniui-qq:before {
-  content: "\e680";
-}
-
-.uniui-download-filled:before {
-  content: "\e681";
-}
-
-.uniui-pyq:before {
-  content: "\e682";
-}
-
-.uniui-sound:before {
-  content: "\e684";
-}
-
-.uniui-trash-filled:before {
-  content: "\e685";
-}
-
-.uniui-sound-filled:before {
-  content: "\e686";
-}
-
-.uniui-trash:before {
-  content: "\e687";
-}
-
-.uniui-videocam-filled:before {
-  content: "\e689";
-}
-
-.uniui-spinner-cycle:before {
-  content: "\e68a";
-}
-
-.uniui-weibo:before {
-  content: "\e68b";
-}
-
-.uniui-videocam:before {
-  content: "\e68c";
-}
-
-.uniui-download:before {
-  content: "\e68d";
-}
-
-.uniui-help:before {
-  content: "\e679";
-}
-
-.uniui-navigate-filled:before {
-  content: "\e67a";
-}
-
-.uniui-plusempty:before {
-  content: "\e67b";
-}
-
-.uniui-smallcircle:before {
-  content: "\e67c";
-}
-
-.uniui-minus-filled:before {
-  content: "\e67d";
-}
-
-.uniui-micoff:before {
-  content: "\e67e";
-}
-
-.uniui-closeempty:before {
-  content: "\e66c";
-}
-
-.uniui-clear:before {
-  content: "\e66d";
-}
-
-.uniui-navigate:before {
-  content: "\e66e";
-}
-
-.uniui-minus:before {
-  content: "\e66f";
-}
-
-.uniui-image:before {
-  content: "\e670";
-}
-
-.uniui-mic:before {
-  content: "\e671";
-}
-
-.uniui-paperplane:before {
-  content: "\e672";
-}
-
-.uniui-close:before {
-  content: "\e673";
-}
-
-.uniui-help-filled:before {
-  content: "\e674";
-}
-
-.uniui-paperplane-filled:before {
-  content: "\e675";
-}
-
-.uniui-plus:before {
-  content: "\e676";
-}
-
-.uniui-mic-filled:before {
-  content: "\e677";
-}
-
-.uniui-image-filled:before {
-  content: "\e678";
-}
-
-.uniui-locked-filled:before {
-  content: "\e668";
-}
-
-.uniui-info:before {
-  content: "\e669";
-}
-
-.uniui-locked:before {
-  content: "\e66b";
-}
-
-.uniui-camera-filled:before {
-  content: "\e658";
-}
-
-.uniui-chat-filled:before {
-  content: "\e659";
-}
-
-.uniui-camera:before {
-  content: "\e65a";
-}
-
-.uniui-circle:before {
-  content: "\e65b";
-}
-
-.uniui-checkmarkempty:before {
-  content: "\e65c";
-}
-
-.uniui-chat:before {
-  content: "\e65d";
-}
-
-.uniui-circle-filled:before {
-  content: "\e65e";
-}
-
-.uniui-flag:before {
-  content: "\e65f";
-}
-
-.uniui-flag-filled:before {
-  content: "\e660";
-}
-
-.uniui-gear-filled:before {
-  content: "\e661";
-}
-
-.uniui-home:before {
-  content: "\e662";
-}
-
-.uniui-home-filled:before {
-  content: "\e663";
-}
-
-.uniui-gear:before {
-  content: "\e664";
-}
-
-.uniui-smallcircle-filled:before {
-  content: "\e665";
-}
-
-.uniui-map-filled:before {
-  content: "\e666";
-}
-
-.uniui-map:before {
-  content: "\e667";
-}
-
-.uniui-refresh-filled:before {
-  content: "\e656";
-}
-
-.uniui-refresh:before {
-  content: "\e657";
-}
-
-.uniui-cloud-upload:before {
-  content: "\e645";
-}
-
-.uniui-cloud-download-filled:before {
-  content: "\e646";
-}
-
-.uniui-cloud-download:before {
-  content: "\e647";
-}
-
-.uniui-cloud-upload-filled:before {
-  content: "\e648";
-}
-
-.uniui-redo:before {
-  content: "\e64a";
-}
-
-.uniui-images-filled:before {
-  content: "\e64b";
-}
-
-.uniui-undo-filled:before {
-  content: "\e64c";
-}
-
-.uniui-more:before {
-  content: "\e64d";
-}
-
-.uniui-more-filled:before {
-  content: "\e64e";
-}
-
-.uniui-undo:before {
-  content: "\e64f";
-}
-
-.uniui-images:before {
-  content: "\e650";
-}
-
-.uniui-paperclip:before {
-  content: "\e652";
-}
-
-.uniui-settings:before {
-  content: "\e653";
-}
-
-.uniui-search:before {
-  content: "\e654";
-}
-
-.uniui-redo-filled:before {
-  content: "\e655";
-}
-
-.uniui-list:before {
-  content: "\e644";
-}
-
-.uniui-mail-open-filled:before {
-  content: "\e63a";
-}
-
-.uniui-hand-down-filled:before {
-  content: "\e63c";
-}
-
-.uniui-hand-down:before {
-  content: "\e63d";
-}
-
-.uniui-hand-up-filled:before {
-  content: "\e63e";
-}
-
-.uniui-hand-up:before {
-  content: "\e63f";
-}
-
-.uniui-heart-filled:before {
-  content: "\e641";
-}
-
-.uniui-mail-open:before {
-  content: "\e643";
-}
-
-.uniui-heart:before {
-  content: "\e639";
-}
-
-.uniui-loop:before {
-  content: "\e633";
-}
-
-.uniui-pulldown:before {
-  content: "\e632";
-}
-
-.uniui-scan:before {
-  content: "\e62a";
-}
-
-.uniui-bars:before {
-  content: "\e627";
-}
-
-.uniui-cart-filled:before {
-  content: "\e629";
-}
-
-.uniui-checkbox:before {
-  content: "\e62b";
-}
-
-.uniui-checkbox-filled:before {
-  content: "\e62c";
-}
-
-.uniui-shop:before {
-  content: "\e62f";
-}
-
-.uniui-headphones:before {
-  content: "\e630";
-}
-
-.uniui-cart:before {
-  content: "\e631";
-}

uni_modules/uni-icons/package.json

@@ -1,86 +0,0 @@
-{
-  "id": "uni-icons",
-  "displayName": "uni-icons 图标",
-  "version": "1.3.5",
-  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
-  "keywords": [
-    "uni-ui",
-    "uniui",
-    "icon",
-    "图标"
-],
-  "repository": "https://github.com/dcloudio/uni-ui",
-  "engines": {
-    "HBuilderX": "^3.2.14"
-  },
-  "directories": {
-    "example": "../../temps/example_temps"
-  },
-  "dcloudext": {
-    "category": [
-      "前端组件",
-      "通用组件"
-    ],
-    "sale": {
-      "regular": {
-        "price": "0.00"
-      },
-      "sourcecode": {
-        "price": "0.00"
-      }
-    },
-    "contact": {
-      "qq": ""
-    },
-    "declaration": {
-      "ads": "无",
-      "data": "无",
-      "permissions": "无"
-    },
-    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
-  },
-  "uni_modules": {
-    "dependencies": ["uni-scss"],
-    "encrypt": [],
-    "platforms": {
-      "cloud": {
-        "tcb": "y",
-        "aliyun": "y"
-      },
-      "client": {
-        "App": {
-          "app-vue": "y",
-          "app-nvue": "y"
-        },
-        "H5-mobile": {
-          "Safari": "y",
-          "Android Browser": "y",
-          "微信浏览器(Android)": "y",
-          "QQ浏览器(Android)": "y"
-        },
-        "H5-pc": {
-          "Chrome": "y",
-          "IE": "y",
-          "Edge": "y",
-          "Firefox": "y",
-          "Safari": "y"
-        },
-        "小程序": {
-          "微信": "y",
-          "阿里": "y",
-          "百度": "y",
-          "字节跳动": "y",
-          "QQ": "y"
-        },
-        "快应用": {
-          "华为": "u",
-          "联盟": "u"
-        },
-        "Vue": {
-            "vue2": "y",
-            "vue3": "y"
-        }
-      }
-    }
-  }
-}

uni_modules/uni-icons/readme.md

@@ -1,8 +0,0 @@
-## Icons 图标
-> **组件名：uni-icons**
-> 代码块： `uIcons`
-
-用于展示 icons 图标 。
-
-### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons)
-#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 

utils/APIHandler.js

@@ -0,0 +1,668 @@
+//初始化App数据
+function initApp() {
+	let semesterList = [
+		['21学年下学期', '21学年上学期', '20学年下学期', '20学年上学期']
+	]
+	this.$store.commit('m_children/updateChildrenSemesterList', semesterList)
+	this.$store.commit('m_children/updateChildrenSemester', semesterList[0][0])
+	let myData = {
+		subscribeLevel: '专业版',
+		subscribePrivilege: '这里是订阅权益描述信息',
+		subscribeTime: '2022.2.15-2025.2.15',
+		msgList: [{
+				icon: 't-icon t-icon-shuju',
+				title: '成绩通知',
+				msgTime: '12分钟前',
+				content: '您的孩子【张梅】在 【青城山学校】的【2020年语文期末测试】成绩已经生成，请点击查看详情 > ',
+				image: 'https://image.meiye.art/pic_9ikZaVYnJE38Ao6AZlVIx?imageMogr2/thumbnail/450x/interlace/1'
+			},
+			{
+				icon: 't-icon t-icon-tishi',
+				title: '系统通知',
+				msgTime: '20分钟前',
+				content: '您以成功绑定【青城山学校】【五年级8班】【张梅】学生。',
+				image: 'https://image.meiye.art/pic_ucQUd7WwkuW1vKvjbgUlv?imageMogr2/thumbnail/450x/interlace/1'
+			},
+			{
+				icon: 't-icon t-icon-bianji',
+				title: '任务通知',
+				msgTime: '40分钟前',
+				content: '您的孩子【张梅】班主任李老师给您发布一个新的问卷活动【周末孩子表现问卷调查】，快去填写吧 ',
+				image: 'https://image.meiye.art/pic_1628927180566LfOmH3IV5i24Mmc65BGE0?imageMogr2/thumbnail/450x/interlace/1'
+			}
+		]
+	}
+	this.$store.commit('m_parent/updateMyData', myData)
+}
+//获取首页数据
+function initHome() {
+	let classList = [{
+		name: '语文',
+		teacher: '王老师',
+		time: '09:00-09:50',
+		timeFrame: '上午第一节'
+	}, {
+		name: '数学',
+		teacher: '李老师',
+		time: '10:00-10:50',
+		timeFrame: '上午第二节'
+	}, {
+		name: '外语',
+		teacher: '张老师',
+		time: '11:00-11:50',
+		timeFrame: '上午第三节'
+	}, {
+		name: '思品',
+		teacher: '史老师',
+		time: '14:00-14:50',
+		timeFrame: '下午第一节'
+	}, {
+		name: '体育',
+		teacher: '李老师',
+		time: '15:00-15:50',
+		timeFrame: '下午第二节'
+	}, {
+		name: '科学',
+		teacher: '张老师',
+		time: '16:00-16:50',
+		timeFrame: '上午第三节'
+	}]
+	this.$store.commit('m_children/updateClassList', classList)
+	let records = [{
+		date: 28,
+		month: 3,
+		year: 2022,
+		time: '08:25'
+	}, {
+		date: 29,
+		month: 3,
+		year: 2022,
+		time: '08:27'
+	}, {
+		date: 30,
+		month: 3,
+		year: 2022,
+		time: '08:15'
+	}, {
+		date: 31,
+		month: 3,
+		year: 2022,
+		time: '08:19'
+	}, {
+		date: 2,
+		month: 4,
+		year: 2022,
+		time: '08:25'
+	}, {
+		date: 3,
+		month: 4,
+		year: 2022,
+		time: '08:09'
+	}, {
+		date: 4,
+		month: 4,
+		year: 2022,
+		time: '08:20'
+	}, {
+		date: 5,
+		month: 4,
+		year: 2022,
+		time: '08:02'
+	}, {
+		date: 6,
+		month: 4,
+		year: 2022,
+		time: '08:05'
+	}, {
+		date: 7,
+		month: 4,
+		year: 2022,
+		time: '08:22'
+	}, {
+		date: 8,
+		month: 4,
+		year: 2022,
+		time: '08:25'
+	}, {
+		date: 11,
+		month: 4,
+		year: 2022,
+		time: '08:20'
+	}]
+	this.$store.commit('m_children/updateRecords', records)
+	let homeData = {
+		//评测进度条数据
+		evaluationArcbar: {
+			"series": [{
+				"name": "评测完成",
+				"data": 0.60,
+				"color": "#3C9CFF"
+			}]
+		},
+		//作业进度条数据
+		homeworkArcbar: {
+			"series": [{
+				"name": "作业完成",
+				"data": 1,
+				"color": "#ff8caf"
+			}]
+		},
+		//活动进度条数据
+		activityArcbar: {
+			"series": [{
+				"name": "活动完成",
+				"data": 0.83,
+				"color": "#f9c752"
+			}]
+		},
+	}
+	this.$store.commit('m_chart/updateHomeChart', homeData)
+}
+//获取成绩数据
+function initGrade() {
+	let testList = [
+		"开学考试",
+		"第一月考",
+		"第二月考",
+		"期中考试",
+		"第三月考",
+		"期末考试"
+	]
+	let subjectList = [
+		"数学",
+		"语文",
+		"英语",
+		"体育",
+		"科学",
+		"思品"
+	]
+	//成绩图表数据
+	let gradeData = {
+		//学期折线图数据
+		semesterLineChart: {
+			//总成绩
+			generalComparison: {
+				categories: testList,
+				series: [{
+						name: "孩子总分",
+						data: [
+							556,
+							577,
+							540,
+							588,
+							563,
+							594
+						]
+					},
+					{
+						name: "班级平均分",
+						data: [
+							460,
+							477,
+							455,
+							522,
+							538,
+							511
+						]
+					},
+					{
+						name: "年级平均分",
+						data: [
+							533,
+							476,
+							484,
+							547,
+							485,
+							502
+						]
+					}
+				],
+			},
+			//单科与平均对比
+			singleAverageComparison: '',
+			//单科对比
+			subjectComparison: {
+				categories: testList,
+				series: [{
+						name: subjectList[0],
+						data: [
+							90,
+							95,
+							92,
+							100,
+							88,
+							99
+						]
+					},
+					{
+						name: subjectList[1],
+						data: [
+							95,
+							98,
+							84,
+							92,
+							93,
+							89
+						]
+					},
+					{
+						name: subjectList[2],
+						data: [
+							98,
+							89,
+							97,
+							84,
+							95,
+							89
+						]
+					},
+					{
+						name: subjectList[3],
+						data: [
+							91,
+							72,
+							92,
+							89,
+							97,
+							92
+						]
+					},
+					{
+						name: subjectList[4],
+						data: [
+							95,
+							89,
+							92,
+							87,
+							91,
+							83
+						]
+					},
+					{
+						name: subjectList[5],
+						data: [
+							91,
+							82,
+							87,
+							84,
+							90,
+							85
+						]
+					}
+				],
+			},
+		},
+		//近期单次考试数据
+		recentTestChart: {
+			//近两次对比
+			recentComparison: {
+				categories: subjectList,
+				series: [{
+						name: "最近成绩",
+						data: [
+							91,
+							92,
+							94,
+							88,
+							88,
+							98
+						]
+					},
+					{
+						name: "上次成绩",
+						data: [
+							88,
+							84,
+							97,
+							92,
+							89,
+							93
+						]
+					}
+				],
+			},
+			//近期排名占比分析
+			recentRank: {
+				series: [{
+						name: "超过年级中",
+						data: 0.8,
+						color: "#0080ff"
+					},
+					{
+						name: "超过班级中",
+						data: 0.90,
+						color: "#ff8caf"
+					}
+				],
+			},
+		},
+		//排名占比分析
+		rankChart: {
+			//学期排名占比分析
+			semesterRank: {
+				categories: testList,
+				series: [{
+						name: "超过年级中",
+						data: [
+							90,
+							95,
+							92,
+							100,
+							88,
+							99
+						]
+					},
+					{
+						name: "超过班级中",
+						data: [
+							95,
+							98,
+							84,
+							92,
+							93,
+							79
+						]
+					}
+				]
+			},
+			//单科学期排名
+			semesterSubjectRank: '',
+		},
+		//优势科目分析
+		advantageRoseChart: {
+			//近期优势科目分析
+			recentAdvantage: {
+				series: [{
+					data: [{
+							name: subjectList[0],
+							value: 100
+						},
+						{
+							name: subjectList[1],
+							value: 86
+						},
+						{
+							name: subjectList[2],
+							value: 100
+						},
+						{
+							name: subjectList[3],
+							value: 79
+						},
+						{
+							name: subjectList[4],
+							value: 88
+						},
+						{
+							name: subjectList[5],
+							value: 95
+						}
+					]
+				}]
+			},
+			//学期综合分析
+			semesterAdvantage: {
+				series: [{
+					data: [{
+							name: subjectList[0],
+							value: 95
+						},
+						{
+							name: subjectList[1],
+							value: 88
+						},
+						{
+							name: subjectList[2],
+							value: 99
+						},
+						{
+							name: subjectList[3],
+							value: 80
+						},
+						{
+							name: subjectList[4],
+							value: 77
+						},
+						{
+							name: subjectList[5],
+							value: 95
+						}
+					]
+				}]
+			},
+		},
+		//能力雷达图分析
+		abilityChart: {
+			//重要考试分析
+			importantAnalyse: {
+				categories: subjectList,
+				series: [{
+						name: "开学考试",
+						data: [
+							90,
+							89,
+							98,
+							88,
+							95,
+							89
+						]
+					},
+					{
+						name: "期中考试",
+						data: [
+							94,
+							89,
+							97,
+							91,
+							95,
+							90
+						]
+					},
+					{
+						name: "期末考试",
+						data: [
+							90,
+							90,
+							95,
+							96,
+							90,
+							92
+						]
+					}
+				],
+			},
+			//普通考试分析
+			commonAnalyse: {
+				categories: subjectList,
+				series: [{
+						name: "第一月考",
+						data: [
+							90,
+							100,
+							77,
+							78,
+							75,
+							95
+						]
+					},
+					{
+						name: "第二月考",
+						data: [
+							89,
+							94,
+							75,
+							99,
+							80,
+							92
+						]
+					},
+					{
+						name: "第三月考",
+						data: [
+							79,
+							84,
+							94,
+							73,
+							99,
+							87
+						]
+					}
+				],
+			},
+		},
+	}
+	this.$store.commit('m_chart/updateGradeChart', gradeData)
+}
+//获取评测,作业,活动数据
+function initHomework() {
+	let pageData = 
+	[{
+		name: '评测',
+		level: '',
+		color: '#0080ff;',
+		image: 'https://ouch-cdn2.icons8.com/yFl5NWU3aVehLBlQf9ctvnZPqtm5U0hqM3IzWvFDCaQ/rs:fit:912:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9wbmcvNzY5/LzY1ZTQxZmZjLTg1/YWQtNDYyMi1hYzU0/LWQ3NDEzZmY2NGI1/YS5wbmc.png',
+		detail: {
+			title: '评测列表',
+			data: [{
+				id: 1,
+				name: '评测数据1',
+				subject: '数学',
+				teacher: '王老师',
+				description: '这里是评测描述信息',
+				content: '这里是评测详细信息。。。40917489012611',
+				finish: true
+			}, {
+				id: 2,
+				name: '评测数据2',
+				subject: '语文',
+				teacher: '张老师',
+				description: '这里是评测描述信息',
+				content: '这里是评测详细信息。。。9840917489012611',
+				finish: true
+			}, {
+				id: 3,
+				name: '评测数据3',
+				subject: '语文',
+				teacher: '张老师',
+				description: '这里是评测描述信息',
+				content: '这里是评测详细信息。。。29840917489012611',
+				finish: true
+			}, {
+				id: 4,
+				name: '评测数据4',
+				subject: '思品',
+				teacher: '李老师',
+				description: '这里是评测描述信息',
+				content: '这里是评测详细信息。。。81029840917489012611',
+				finish: false
+			}, {
+				id: 5,
+				name: '评测数据5',
+				subject: '科学',
+				teacher: '李老师',
+				description: '这里是评测描述信息',
+				content: '这里是评测详细信息。。。381029840917489012611',
+				finish: false
+			}],
+		}
+	}, {
+		name: '作业',
+		level: '',
+		color: '#ff8caf;',
+		image: 'https://ouch-cdn2.icons8.com/AVOwJ9emg_ZOeHvQaunQAZlgeLsG-b1cGhiYvgoJ06g/rs:fit:912:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9wbmcvNTAw/LzI5YjU1YWQ4LWMw/YTEtNDE1MS1iYmQw/LWIyMDdhYmRkOTE0/Mi5wbmc.png',
+		detail: {
+			title: '作业列表',
+			data: [{
+				id: 1,
+				name: '作业数据1',
+				subject: '数学',
+				teacher: '王老师',
+				description: '这里是作业描述信息',
+				content: '这里是作业详细信息。。87192371298739812733123',
+				finish: true
+			}, {
+				id: 2,
+				name: '作业数据2',
+				subject: '数学',
+				teacher: '王老师',
+				description: '这里是作业描述信息',
+				content: '这里是作业详细信息。。87192371298739812733123',
+				finish: true
+			}, {
+				id: 3,
+				name: '作业数据3',
+				subject: '数学',
+				teacher: '王老师',
+				description: '这里是作业描述信息',
+				content: '这里是作业详细信息。。87192371298739812733123',
+				finish: true
+			}],
+		}
+	}, {
+		name: '活动',
+		level: '',
+		color: '#f9c752;',
+		image: 'https://ouch-cdn2.icons8.com/LW70TMgW1cGfYeGNSTEp7__kiKVgIhwdZwUmykdLYMY/rs:fit:912:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9wbmcvOTI0/LzU3MWU4ZDZkLTg0/NzEtNGM5YS04MDJk/LTEzNTM5YmZmZTM2/YS5wbmc.png',
+		detail: {
+			title: '活动列表',
+			data: [{
+				id: 1,
+				name: '活动数据1',
+				subject: '数学',
+				teacher: '王老师',
+				description: '这里是活动描述信息',
+				content: '这里是活动详细信息。3081230128309128390281。',
+				finish: true
+			}, {
+				id: 2,
+				name: '活动数据2',
+				subject: '语文',
+				teacher: '张老师',
+				description: '这里是活动描述信息',
+				content: '这里是活动详细信息。3081230128309128390281。',
+				finish: true
+			}, {
+				id: 3,
+				name: '活动数据3',
+				subject: '语文',
+				teacher: '张老师',
+				description: '这里是活动描述信息',
+				content: '这里是活动详细信息。3081230128309128390281。',
+				finish: true
+			}, {
+				id: 4,
+				name: '活动数据4',
+				subject: '数学',
+				teacher: '王老师',
+				description: '这里是活动描述信息',
+				content: '这里是活动详细信息30128309128390281。。',
+				finish: true
+			}, {
+				id: 5,
+				name: '活动数据5',
+				subject: '数学',
+				teacher: '王老师',
+				description: '这里是活动描述信息',
+				content: '这里是活动详细信息30128309128390281。。',
+				finish: true
+			}, {
+				id: 6,
+				name: '活动数据6',
+				subject: '数学',
+				teacher: '王老师',
+				description: '这里是活动描述信息',
+				content: '这里是活动详细信息30128309128390281。。',
+				finish: false
+			}],
+		}
+	}]
+	this.pageData = pageData
+}
+
+export default {
+	initApp, //初始化项目数据
+	initHome, //初始化首页数据
+	initGrade, //初始化成绩数据
+	initHomework, //初始化作业数据
+
+}

utils/Common.js

@@ -20,10 +20,26 @@ function getCapsuleSite() {
 	this.capsuleBottom = res.bottom + 5
 	this.capsuleMiddle = res.left
 	this.capsuleWidth = res.width
+}
+//处理更新时间
+function getTimeStamp() {
+	this.timeStamp = (new Date()).format("hh:mm")
+}
+//获取近几天时间数组
+function getRecentDateArray(day) {
+	let recentDate = new Array();
+	for (let i = day; i > 0; i--) {
+		let dayTime = new Date();
+		dayTime.setDate(dayTime.getDate() - i + 1);
+		recentDate.push(dayTime.format("MM-dd"));
+	}
+	return recentDate
 }
 
 //导出并在Main.js中全局注册
 export default {
 	noMultipleClicks, //禁止多次点击
-	getCapsuleSite, //获取胶囊位置信息
+	getCapsuleSite, //获取胶囊位置信息
+	getTimeStamp, //处理更新时间
+	getRecentDateArray //获取近几天时间数组
 }

utils/TimeUtils.js

@@ -1,17 +0,0 @@
-//处理更新时间
-function getTimeStamp() {
-	this.timeStamp = (new Date()).format("hh:mm")
-}
-//获取近几天时间数组
-function getRecentDateArray(day) {
-	let recentDate = new Array();
-	for (let i = day; i > 0; i--) {
-		let dayTime = new Date();
-		dayTime.setDate(dayTime.getDate() - i + 1);
-		recentDate.push(dayTime.format("MM-dd"));
-	}
-	return recentDate
-}
-export default {
-	getTimeStamp,getRecentDateArray
-}