update: 修改家校数据记录逻辑

components/top-info/top-info.vue

@@ -60,7 +60,7 @@
 			},
 			navSubscribe() {
 				uni.navigateTo({
-					url: '/subpkg/userinfo/subscribeinfo'
+					url: '/subpkg/mine/subscribeinfo'
 				})
 			}
 		}

components/top-return/top-return.vue

@@ -1,7 +1,14 @@
 <template>
 	<view class="back" :style="{height: capsuleHeight+ 'px',top:capsuleTop+'px'}">
-		<u-icon name="arrow-left" v-if="show === 'back'" :color="color" size="24" @click="backIconHandler"></u-icon>
-		<u-icon name="home-fill" v-if="show === 'home'" :color="color" size="24" @click="backHomeHandler"></u-icon>
+		<view v-if="!refresh">
+			<u-icon name="arrow-left" v-if="show === 'back'" :color="color" size="24" @click="backIconHandler"></u-icon>
+			<u-icon name="home-fill" v-if="show === 'home'" :color="color" size="24" @click="backHomeHandler"></u-icon>
+		</view>
+		
+		<view v-if="refresh">
+			<u-icon name="arrow-left" v-if="show === 'back'" :color="color" size="24" @click="backIconHandlerRefresh"></u-icon>
+			<u-icon name="home-fill" v-if="show === 'home'" :color="color" size="24" @click="backIconHandlerRefresh"></u-icon>
+		</view>
 		<view class="back-text" :style="{color: color}">{{ text }}</view>
 	</view>
 </template>
@@ -21,6 +28,10 @@
 			show: {
 				type: String,
 				default: 'back'
+			},
+			refresh: {
+				type: Boolean,
+				default: false
 			}
 		},
 		data() {
@@ -37,6 +48,15 @@
 			backIconHandler() {
 				uni.navigateBack()
 			},
+			backIconHandlerRefresh() {
+				let pages = getCurrentPages(); // 当前页面
+				let beforePage = pages[pages.length - 2]; // 上一页
+				uni.navigateBack({
+					success: function() {
+						beforePage.onLoad()// 执行上一页的onLoad方法
+					}
+				})
+			},
 			backHomeHandler() {
 				uni.switchTab({
 					url: '/pages/tab_home/tab_home'

pages.json

@@ -69,21 +69,21 @@
 				}
 			},
 			{
-				"path": "datalist/classdetail",
+				"path": "home/classlist",
 				"style": {
 					"enablePullDownRefresh": true,
 					"navigationStyle": "custom"
 				}
 			},
 			{
-				"path": "datalist/messagedetail",
+				"path": "mine/messagelist",
 				"style": {
 					"enablePullDownRefresh": true,
 					"navigationStyle": "custom"
 				}
 			},
 			{
-				"path": "userinfo/childinfo",
+				"path": "mine/childinfo",
 				"style": {
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom",
@@ -91,7 +91,7 @@
 				}
 			},
 			{
-				"path": "userinfo/parentinfo",
+				"path": "mine/parentinfo",
 				"style": {
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom",
@@ -99,7 +99,7 @@
 				}
 			},
 			{
-				"path": "userinfo/subscribeinfo",
+				"path": "mine/subscribeinfo",
 				"style": {
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom",
@@ -142,21 +142,21 @@
 				}
 			},	
 			{
-				"path": "statslist/workstats",
+				"path": "work/workstats",
 				"style": {
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom"
 				}
 			},
 			{
-				"path": "statslist/swapstats",
+				"path": "swap/swapstats",
 				"style": {
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom"
 				}
 			},
 			{
-				"path": "statslist/clockstats",
+				"path": "home/clockstats",
 				"style": {
 					"enablePullDownRefresh": false,
 					"navigationStyle": "custom",

pages/init/init.vue

@@ -1,6 +1,5 @@
 <template>
-	<view class="page_view" 
-	style="align-items: center;justify-content: center;height: 100vh;width: 100vw;">
+	<view>
 		<loading></loading>
 	</view>
 </template>
@@ -45,11 +44,9 @@
 			async allTasks() {
 				try {
 					await this.$initTab()
-					setTimeout(function() {
-						uni.switchTab({
-							url: '/pages/tab_home/tab_home'
-						})
-					}, 1000);
+					uni.switchTab({
+						url: '/pages/tab_home/tab_home'
+					})
 				} catch (e) {
 					console.log(e);
 				}

pages/tab_home/tab_home.vue

@@ -31,7 +31,7 @@
 			<view class="bg2">
 				<view class="notice">
 					<u-notice-bar :text="noticeData" bgColor="rgba(65,105,225,0.4)" color="#FFF"
-						url="/subpkg/datalist/messagedetail"></u-notice-bar>
+						url="/subpkg/mine/messagelist"></u-notice-bar>
 				</view>
 			</view>
 			<!-- 课程 -->
@@ -41,7 +41,7 @@
 					<view class="card_title">
 						<view class="front_tag"></view>
 						<view class="title">今日课程</view>
-						<view class="flex_row" style="margin: 0 0 0 auto;" @click="navClassDetail">
+						<view class="flex_row" style="margin: 0 0 0 auto;" @click="navClassList">
 							<view class="t-icon t-icon-fenlei"></view>
 							<view class="title" style="color: #4169E1;margin-left: 10rpx;">课程列表</view>
 						</view>
@@ -219,7 +219,7 @@
 								</view>
 								<view class="class_item_subtitle" style="font-weight: 400;font-size: 26rpx;"
 									v-if="isAfterDayClass">巩固所学</view>
-								<view class="flex_row" @click="navClassDetail">
+								<view class="flex_row" @click="navClassList">
 									<view class="t-icon t-icon-fenlei"></view>
 									<view class="class_item_title" style="color: #4169E1;margin-left: 10rpx;">课程列表
 									</view>
@@ -461,9 +461,9 @@
 		methods: {
 			//初始化页面
 			async init() {
+				await this.$initHome()
 				this.dayTime = (new Date()).format('M-d').replace('-', '月')
 				this.timeStamp = (new Date()).format("hh:mm")
-				await this.$initHome()
 				this.getClassCurrent()
 				this.getChartData()
 				this.getNoticeData()
@@ -651,10 +651,10 @@
 				}
 			},
 			//导航
-			navClassDetail() {
+			navClassList() {
 				let current = this.classCurrent
 				uni.navigateTo({
-					url: `/subpkg/datalist/classdetail?index=${current}`
+					url: `/subpkg/home/classlist?index=${current}`
 				})
 			},
 			navTab(index) {
@@ -676,7 +676,7 @@
 			},
 			navClockStats() {
 				uni.navigateTo({
-					url: '/subpkg/statslist/clockstats'
+					url: '/subpkg/home/clockstats'
 				})
 			},
 			navRecommendInfo(index){

pages/tab_mine/tab_mine.vue

@@ -143,25 +143,25 @@
 				let tmdidArr = this.childrenData.map(x=>{return x.tmdid})
 				let index = tmdidArr.indexOf(this.childInfo.tmdid)
 				uni.navigateTo({
-					url: `/subpkg/userinfo/childinfo?index=${index}`
+					url: `/subpkg/mine/childinfo?index=${index}`
 				})
 			},
 			//家长信息
 			navInfo() {
 				uni.navigateTo({
-					url: '/subpkg/userinfo/parentinfo'
+					url: '/subpkg/mine/parentinfo'
 				})
 			},
 			//我的消息
 			navMsg() {
 				uni.navigateTo({
-					url: '/subpkg/datalist/messagedetail'
+					url: '/subpkg/mine/messagelist'
 				})
 			},
 			//订阅信息
 			navSubscribe(){
 				uni.navigateTo({
-					url: '/subpkg/userinfo/subscribeinfo'
+					url: '/subpkg/mine/subscribeinfo'
 				})
 			}
 			

pages/tab_swap/tab_swap.vue

@@ -107,12 +107,13 @@
 
 <script>
 	import {
-		mapState
+		mapState,
+		mapMutations
 	} from 'vuex'
 	export default {
 		computed: {
 			...mapState('m_children', ['swapData']),
-			...mapState('m_chart', ['swapChartData'])
+			...mapState('m_parent', ['childDailyData'])
 		},
 		data() {
 			return {
@@ -154,6 +155,7 @@
 			}, 1000);
 		},
 		methods: {
+			...mapMutations('m_chart', ['updateSwapChartData']),
 			//初始化
 			init() {
 				this.timeStamp = (new Date()).format("hh:mm")
@@ -161,10 +163,47 @@
 				this.$initSwap()
 				this.getSwapChartData()
 			},
+			//获得统计图表信息
 			getSwapChartData() {
-				this.cardList[0].data = this.swapChartData[0]
-				this.cardList[1].data = this.swapChartData[1]
-				this.cardList[2].data = this.swapChartData[2]
+				let recentDate = this.$getRecentDateArray(this.childDailyData.study.length);
+				let swapChartData = [];
+				let studyColumn = {
+					categories: recentDate,
+					series: [{
+							name: '自主学习',
+							data: this.childDailyData.study
+						},
+						{
+							name: '娱乐放松',
+							data: this.childDailyData.rest
+						}
+					]
+				};
+				//运动记录表
+				let exercisePie = {
+					series: [{
+						data: [{}, {}, {}, {}, {}, {}, {}]
+					}]
+				};
+				//睡眠记录表
+				let sleepRing = {
+					series: [{
+						data: [{}, {}, {}, {}, {}, {}, {}]
+					}]
+				};
+				studyColumn.categories.forEach((value, index) => {
+					exercisePie.series[0].data[index].name = value;
+					exercisePie.series[0].data[index].value = parseFloat((this.childDailyData.exercise[index]));
+					sleepRing.series[0].data[index].name = value;
+					sleepRing.series[0].data[index].value = this.childDailyData.sleep[index];
+				});
+				swapChartData.push(studyColumn);
+				swapChartData.push(exercisePie);
+				swapChartData.push(sleepRing);
+				this.updateSwapChartData(swapChartData)
+				this.cardList[0].data = studyColumn
+				this.cardList[1].data = exercisePie
+				this.cardList[2].data = sleepRing
 			},
 			//获得评判信息
 			getPerformance() {
@@ -182,7 +221,7 @@
 			},
 			navSwapStats() {
 				uni.navigateTo({
-					url: '/subpkg/statslist/swapstats'
+					url: '/subpkg/swap/swapstats'
 				})
 			},
 			navSwapList() {

pages/tab_work/tab_work.vue

@@ -190,7 +190,7 @@
 			},
 			navWorkStats() {
 				uni.navigateTo({
-					url: '/subpkg/statslist/workstats'
+					url: '/subpkg/work/workstats'
 				})
 			},
 			navWorkList() {

store/parent.js

@@ -14,6 +14,8 @@ export default {
 		userData: JSON.parse(uni.getStorageSync('userData') || '{}'),
 		//已购课程数据
 		classData: JSON.parse(uni.getStorageSync('classData') || '{}'),
+		//孩子日常记录数据
+		childDailyData: JSON.parse(uni.getStorageSync('childDailyData') || '{}'),
 	}),
 	mutations: {
 		//更新登录凭证
@@ -46,6 +48,11 @@ export default {
 			state.classData = classData
 			uni.setStorageSync('classData', JSON.stringify(state.classData))
 		},
+		//更新孩子日常记录数据
+		updateChildDailyData(state,childDailyData){
+			state.childDailyData = childDailyData
+			uni.setStorageSync('childDailyData', JSON.stringify(state.childDailyData))
+		},
 	},
 	getters:{
 		

subpkg/gradelist/total.vue

@@ -15,8 +15,10 @@
 					<view class="flex_baseline">
 						<view class="analysis_data" style="font-size: 44rpx;">{{totalSemAvg}}</view>
 						<view class="analysis_text" style="margin-right: 20rpx;font-size: 26rpx;">分</view>
-						<view class="analysis_text" style="font-size: 26rpx;" v-if="analysisData[0].data != 'btm'">超过</view>
-						<view class="analysis_text" style="font-size: 26rpx;" v-if="analysisData[0].data === 'btm'">未超过</view>
+						<view class="analysis_text" style="font-size: 26rpx;" v-if="analysisData[0].data != 'btm'">超过
+						</view>
+						<view class="analysis_text" style="font-size: 26rpx;" v-if="analysisData[0].data === 'btm'">未超过
+						</view>
 					</view>
 
 					<view class="flex_baseline">
@@ -27,23 +29,26 @@
 				</view>
 				<view class="icon_box">
 					<view v-if="analysisData[0].data==='top'" class="t-icon t-icon-a-bianzu6"></view>
-					<view v-if="analysisData[0].data==='midGrade'||analysisData[0].data === 'midClass'" class="t-icon t-icon-a-bianzu7">
+					<view v-if="analysisData[0].data==='midGrade'||analysisData[0].data === 'midClass'"
+						class="t-icon t-icon-a-bianzu7">
 					</view>
 					<view v-if="analysisData[0].data==='btm'" class="t-icon t-icon-a-bianzu8"></view>
 				</view>
 			</view>
-			
+
 			<view class="card_item" style="background-color: #ff8caf;height: 200rpx;">
 				<view class="analysis_box">
 					<view class="analysis_text">{{analysisData[1].title}}</view>
-			
+
 					<view class="flex_baseline">
 						<view class="analysis_data" style="font-size: 44rpx;">{{singleSemAvg}}</view>
 						<view class="analysis_text" style="margin-right: 20rpx;font-size: 26rpx;">分</view>
-						<view class="analysis_text" style="font-size: 26rpx;" v-if="analysisData[1].data != 'btm'">超过</view>
-						<view class="analysis_text" style="font-size: 26rpx;" v-if="analysisData[1].data === 'btm'">未超过</view>
+						<view class="analysis_text" style="font-size: 26rpx;" v-if="analysisData[1].data != 'btm'">超过
+						</view>
+						<view class="analysis_text" style="font-size: 26rpx;" v-if="analysisData[1].data === 'btm'">未超过
+						</view>
 					</view>
-			
+
 					<view class="flex_baseline">
 						<view class="analysis_text">
 							{{analysisData[1].data === 'top' ? '班级和年级学期平均':(analysisData[1].data === 'midClass'? '班级学期平均分':(analysisData[1].data === 'midGrade'?'年级学期平均分':'班级和年级学期平均'))}}
@@ -52,7 +57,8 @@
 				</view>
 				<view class="icon_box">
 					<view v-if="analysisData[1].data==='top'" class="t-icon t-icon-a-bianzu6"></view>
-					<view v-if="analysisData[1].data==='midGrade'||analysisData[1].data === 'midClass'" class="t-icon t-icon-a-bianzu7">
+					<view v-if="analysisData[1].data==='midGrade'||analysisData[1].data === 'midClass'"
+						class="t-icon t-icon-a-bianzu7">
 					</view>
 					<view v-if="analysisData[1].data==='btm'" class="t-icon t-icon-a-bianzu8"></view>
 				</view>
@@ -63,7 +69,7 @@
 				<view class="card_title">
 					<view class="front_tag"></view>
 					<view class="title">总成绩趋势</view>
-					<!-- <view class="t-icon t-icon-tishi2" style="margin-left: auto;"></view> -->
+					<view class="t-icon t-icon-tishi2" style="margin-left: auto;" @click="isShowHint = true"></view>
 				</view>
 				<view class="chart_box">
 					<qiun-data-charts type="area" ontouch="true" :chartData="examChartData.totalChartData[0]"
@@ -110,6 +116,10 @@
 		<u-picker :show="subjectPicker" :columns="subjectList" @confirm="subjectConfirm" @cancel="cancel" />
 		<!-- 模式选择 -->
 		<u-picker :show="scoreTypePicker" :columns="scoreTypeList" @confirm="scoreTypeConfirm" @cancel="cancel" />
+		<!-- 模态框 -->
+		<u-modal :content="content" title="数据图表的基础使用" :show="isShowHint" :zoom="false"
+			@confirm="() => isShowHint = false"></u-modal>
+
 	</view>
 </template>
 
@@ -162,7 +172,9 @@
 				//学期平均总得分
 				totalSemAvg: '',
 				//单科学期平均得分
-				singleSemAvg: ''
+				singleSemAvg: '',
+				isShowHint: false,
+				content: '点击图表展示详细内容\n点击上方数据名可以隐藏或显示数据\n信息过多可以试试左右滑动查看'
 			}
 		},
 		onLoad() {
@@ -183,11 +195,14 @@
 					}
 					return cont;
 				}
-				let totalSemAvg = parseInt((arrSum(this.examChartData.totalChartData[0].series[0].data) / this.examChartData.totalChartData[0].series[0].data.length).toFixed(0))
+				let totalSemAvg = parseInt((arrSum(this.examChartData.totalChartData[0].series[0].data) / this
+					.examChartData.totalChartData[0].series[0].data.length).toFixed(0))
 				this.totalSemAvg = totalSemAvg
-				let classSemAvg = parseInt((arrSum(this.examChartData.totalChartData[0].series[1].data) / this.examChartData.totalChartData[0].series[1].data.length).toFixed(0))
+				let classSemAvg = parseInt((arrSum(this.examChartData.totalChartData[0].series[1].data) / this
+					.examChartData.totalChartData[0].series[1].data.length).toFixed(0))
 				console.log('班级平均总分', classSemAvg);
-				let gradeSemAvg = parseInt((arrSum(this.examChartData.totalChartData[0].series[2].data) / this.examChartData.totalChartData[0].series[2].data.length).toFixed(0))
+				let gradeSemAvg = parseInt((arrSum(this.examChartData.totalChartData[0].series[2].data) / this
+					.examChartData.totalChartData[0].series[2].data.length).toFixed(0))
 				console.log('年级平均总分', gradeSemAvg);
 				if (totalSemAvg > classSemAvg && totalSemAvg > gradeSemAvg) {
 					this.analysisData[0].data = 'top'
@@ -199,7 +214,7 @@
 					this.analysisData[0].data = 'btm'
 				}
 			},
-			chooseAnalysisSubject(){
+			chooseAnalysisSubject() {
 				function arrSum(array) {
 					let cont = 0
 					for (let i = 0; i < array.length; i++) {
@@ -209,11 +224,14 @@
 				}
 				this.analysisData[1].title = this.subjectCurrent + '学期平均分'
 				console.log(this.examChartData.totalChartData[1]);
-				let singleSemAvg = parseInt((arrSum(this.examChartData.totalChartData[1].series[0].data) / this.examChartData.totalChartData[1].series[0].data.length).toFixed(0))
+				let singleSemAvg = parseInt((arrSum(this.examChartData.totalChartData[1].series[0].data) / this
+					.examChartData.totalChartData[1].series[0].data.length).toFixed(0))
 				this.singleSemAvg = singleSemAvg
-				let classSemSinAvg = parseInt((arrSum(this.examChartData.totalChartData[1].series[1].data) / this.examChartData.totalChartData[1].series[1].data.length).toFixed(0))
+				let classSemSinAvg = parseInt((arrSum(this.examChartData.totalChartData[1].series[1].data) / this
+					.examChartData.totalChartData[1].series[1].data.length).toFixed(0))
 				console.log('班级平均单科总分', classSemSinAvg);
-				let gradeSemSinAvg = parseInt((arrSum(this.examChartData.totalChartData[1].series[2].data) / this.examChartData.totalChartData[1].series[2].data.length).toFixed(0))
+				let gradeSemSinAvg = parseInt((arrSum(this.examChartData.totalChartData[1].series[2].data) / this
+					.examChartData.totalChartData[1].series[2].data.length).toFixed(0))
 				console.log('年级平均单科总分', gradeSemSinAvg);
 				if (singleSemAvg > classSemSinAvg && singleSemAvg > gradeSemSinAvg) {
 					this.analysisData[1].data = 'top'
@@ -234,7 +252,7 @@
 					arr.push(this.subjectExamData.subjectList)
 					this.subjectList = arr
 					this.subjectCurrent = this.subjectList[0][0]
-				}else{
+				} else {
 					this.subjectCurrent = this.subjectList[0][0]
 				}
 			},

subpkg/userinfo/parentinfo.vue

@@ -88,7 +88,7 @@
 			//孩子名片
 			navChildInfo(index) {
 				uni.navigateTo({
-					url: `/subpkg/userinfo/childinfo?index=${index}`
+					url: `/subpkg/mine/childinfo?index=${index}`
 				})
 			},
 		},

subpkg/statslist/swapstats.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page_view">
-		<top-return color="#FFF" text="日常记录"></top-return>
+		<top-return color="#FFF" text="日常记录" refresh="true"></top-return>
 		<!-- 背景 -->
 		<view class="bg_box"></view>
 		<!-- 页面标题内容 -->
@@ -37,8 +37,7 @@
 				</view>
 				<view class="flex_baseline" style="margin-left: 30rpx;"
 					v-if="item.numData.includes('小时') === false && item.numData != ''">
-					<text class="_item_text"
-						style="margin-left: 8rpx;">{{item.numData.replace('分','')}}</text>
+					<text class="_item_text" style="margin-left: 8rpx;">{{item.numData.replace('分','')}}</text>
 					<text class="_item_subtext" style="margin-left: 8rpx;opacity:0.8;">分钟</text>
 				</view>
 				<view :class="item.icon"></view>
@@ -151,6 +150,7 @@
 		},
 		methods: {
 			...mapMutations('m_chart', ['updateSwapChartData']),
+			...mapMutations('m_parent', ['updateChildDailyData']),
 			init() {
 				this.getToday()
 				this.getData()
@@ -164,32 +164,32 @@
 			getData() {
 				if (uni.getStorageSync('moduleData'))
 					this.moduleData = JSON.parse(uni.getStorageSync('moduleData'));
-				if (uni.getStorageSync('historyData')) {
-					this.historyData = JSON.parse(uni.getStorageSync('historyData'));
-					this.saveToStudyChart()
-				}
+				if (uni.getStorageSync('childDailyData'))
+					this.historyData = JSON.parse(uni.getStorageSync('childDailyData'));
+				this.saveToStudyChart()
 			},
+			
+			//睡眠记录统计
 			getRingOpts() {
 				let sleepData = ''
-				if (uni.getStorageSync('historyData')) {
-					sleepData = JSON.parse(uni.getStorageSync('historyData')).sleep;
-					let sum = 0
-					for (let i = 0; i < sleepData.length; i++) {
-						sum += sleepData[i]
-					}
-					let sleepAvg = (sum / sleepData.length).toFixed(1)
-					let opt = {
-						title: {
-							name: '平均睡眠',
-							color: '#909399'
-						},
-						subtitle: {
-							name: sleepAvg + ' 小时',
-							color: '#4169E1'
-						},
-					}
-					this.ringOpts = opt
+				if (uni.getStorageSync('childDailyData'))
+				sleepData = JSON.parse(uni.getStorageSync('childDailyData')).sleep;
+				let sum = 0
+				for (let i = 0; i < sleepData.length; i++) {
+					sum += sleepData[i]
+				}
+				let sleepAvg = (sum / sleepData.length).toFixed(1)
+				let opt = {
+					title: {
+						name: '平均睡眠',
+						color: '#909399'
+					},
+					subtitle: {
+						name: sleepAvg + ' 小时',
+						color: '#4169E1'
+					},
 				}
+				this.ringOpts = opt
 			},
 			//点击卡片唤起picker
 			setTime(index) {
@@ -243,7 +243,7 @@
 								break
 						}
 						uni.setStorageSync('moduleData', JSON.stringify(this.moduleData))
-						uni.setStorageSync('historyData', JSON.stringify(this.historyData))
+						this.updateChildDailyData(this.historyData)
 						this.saveToStudyChart()
 					} else {
 						let timeTemp = this.moduleData[this.cardCurrent].numData.replace('小时', '.').replace('分', '').split(
@@ -265,8 +265,7 @@
 								break
 						}
 						uni.setStorageSync('moduleData', JSON.stringify(this.moduleData))
-						uni.setStorageSync('historyData', JSON.stringify(this.historyData))
-						// 记录到图表
+						this.updateChildDailyData(this.historyData)
 						this.saveToStudyChart()
 					}
 					this.setTimePicker = false
@@ -302,7 +301,7 @@
 								break
 						}
 						uni.setStorageSync('moduleData', JSON.stringify(this.moduleData))
-						uni.setStorageSync('historyData', JSON.stringify(this.historyData))
+						this.updateChildDailyData(this.historyData)
 						this.saveToStudyChart()
 					} else {
 						let timeTemp = this.moduleData[this.cardCurrent].numData.replace('小时', '.').replace('分', '').split(
@@ -328,8 +327,7 @@
 								break
 						}
 						uni.setStorageSync('moduleData', JSON.stringify(this.moduleData))
-						uni.setStorageSync('historyData', JSON.stringify(this.historyData))
-						// 记录到图表
+						this.updateChildDailyData(this.historyData)
 						this.saveToStudyChart()
 					}
 					this.setTimePicker = false

unpackage/dist/dev/mp-weixin/app.json

@@ -14,19 +14,19 @@
         "startup/login",
         "startup/guide",
         "startup/options",
-        "datalist/classdetail",
-        "datalist/messagedetail",
-        "userinfo/childinfo",
-        "userinfo/parentinfo",
-        "userinfo/subscribeinfo",
+        "home/classlist",
+        "mine/messagelist",
+        "mine/childinfo",
+        "mine/parentinfo",
+        "mine/subscribeinfo",
         "gradelist/total",
         "gradelist/single",
         "gradelist/ranking",
         "gradelist/subject",
         "gradelist/level",
-        "statslist/workstats",
-        "statslist/swapstats",
-        "statslist/clockstats",
+        "work/workstats",
+        "swap/swapstats",
+        "home/clockstats",
         "datalist/examdata",
         "datalist/workdata",
         "datalist/swapdata",

unpackage/dist/dev/mp-weixin/pages/init/init.wxml

@@ -1 +1 @@
-<view class="page_view" style="align-items:center;justify-content:center;height:100vh;width:100vw;"><loading vue-id="1e0302c0-1" bind:__l="__l"></loading></view>
+<view><loading vue-id="1e0302c0-1" bind:__l="__l"></loading></view>

unpackage/dist/dev/mp-weixin/subpkg/gradelist/total.json

@@ -5,6 +5,7 @@
     "top-return": "/components/top-return/top-return",
     "top-semester": "/components/top-semester/top-semester",
     "qiun-data-charts": "/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts",
-    "u-picker": "/uni_modules/uview-ui/components/u-picker/u-picker"
+    "u-picker": "/uni_modules/uview-ui/components/u-picker/u-picker",
+    "u-modal": "/uni_modules/uview-ui/components/u-modal/u-modal"
   }
 }