抽离css，优化图表tooltips，实现按钮功能，实现今日数据记录

common/data.js

@@ -0,0 +1,276 @@
+const subjectDataList = [
+	{
+		categories: [
+			"开学考试",
+			"第一月考",
+			"第二月考",
+			"期中考试",
+			"第三月考",
+			"期末考试"
+		],
+		series: [{
+				"name": "语文成绩",
+				"data": [
+					90,
+					95,
+					92,
+					80,
+					88,
+					99
+				]
+			},
+			{
+				"name": "班级平均",
+				"data": [
+					85,
+					88,
+					84,
+					42,
+					93,
+					89
+				]
+			},
+			{
+				"name": "年纪平均",
+				"data": [
+					88,
+					79,
+					77,
+					74,
+					85,
+					59
+				]
+			}
+		],
+	},
+	
+	{
+		categories: [
+			"开学考试",
+			"第一月考",
+			"第二月考",
+			"期中考试",
+			"第三月考",
+			"期末考试"
+		],
+		series: [{
+				"name": "数学成绩",
+				"data": [
+					90,
+					95,
+					62,
+					100,
+					88,
+					99
+				]
+			},
+			{
+				"name": "班级平均",
+				"data": [
+					85,
+					88,
+					84,
+					92,
+					73,
+					89
+				]
+			},
+			{
+				"name": "年纪平均",
+				"data": [
+					88,
+					99,
+					77,
+					74,
+					85,
+					89
+				]
+			}
+		],
+	},
+	
+	{
+		categories: [
+			"开学考试",
+			"第一月考",
+			"第二月考",
+			"期中考试",
+			"第三月考",
+			"期末考试"
+		],
+		series: [{
+				"name": "英语成绩",
+				"data": [
+					90,
+					75,
+					92,
+					100,
+					88,
+					99
+				]
+			},
+			{
+				"name": "班级平均",
+				"data": [
+					85,
+					48,
+					84,
+					92,
+					93,
+					89
+				]
+			},
+			{
+				"name": "年纪平均",
+				"data": [
+					88,
+					99,
+					77,
+					74,
+					85,
+					86
+				]
+			}
+		],
+	},
+	
+	{
+		categories: [
+			"开学考试",
+			"第一月考",
+			"第二月考",
+			"期中考试",
+			"第三月考",
+			"期末考试"
+		],
+		series: [{
+				"name": "科学成绩",
+				"data": [
+					90,
+					95,
+					92,
+					50,
+					88,
+					99
+				]
+			},
+			{
+				"name": "班级平均",
+				"data": [
+					85,
+					88,
+					84,
+					92,
+					63,
+					89
+				]
+			},
+			{
+				"name": "年纪平均",
+				"data": [
+					78,
+					79,
+					77,
+					74,
+					85,
+					89
+				]
+			}
+		],
+	},
+	
+	{
+		categories: [
+			"开学考试",
+			"第一月考",
+			"第二月考",
+			"期中考试",
+			"第三月考",
+			"期末考试"
+		],
+		series: [{
+				"name": "体育成绩",
+				"data": [
+					90,
+					95,
+					92,
+					70,
+					88,
+					99
+				]
+			},
+			{
+				"name": "班级平均",
+				"data": [
+					85,
+					88,
+					84,
+					92,
+					83,
+					89
+				]
+			},
+			{
+				"name": "年纪平均",
+				"data": [
+					88,
+					79,
+					87,
+					74,
+					55,
+					89
+				]
+			}
+		],
+	},
+	
+	{
+		categories: [
+			"开学考试",
+			"第一月考",
+			"第二月考",
+			"期中考试",
+			"第三月考",
+			"期末考试"
+		],
+		series: [{
+				"name": "思品成绩",
+				"data": [
+					90,
+					95,
+					92,
+					60,
+					88,
+					99
+				]
+			},
+			{
+				"name": "班级平均",
+				"data": [
+					85,
+					88,
+					84,
+					92,
+					93,
+					79
+				]
+			},
+			{
+				"name": "年纪平均",
+				"data": [
+					88,
+					79,
+					77,
+					74,
+					55,
+					89
+				]
+			}
+		],
+	},
+
+]
+
+module.exports = {
+	data: subjectDataList
+}

common/style.scss

@@ -10,6 +10,7 @@ $color-green: #00cca3;
 $color-pink: #ff9db2;
 $color-yellow: #f9c752;
 //字体色
-$color-subtitle: #b0b0b1;
+$color-title: #3B4144;
+$color-subtitle: #aaaaaa;
 //卡片圆弧
 $card-border-radius: 20rpx

components/todaydata-box/todaydata-box.vue

@@ -1,63 +1,27 @@
 <template>
 	<!-- 今日记录模块 -->
 	<view class="module-container">
-		<u-tabs :list="list" :current="current" @change="change"
+		<u-tabs :list="list" :current="current" @change="changeModule"
 			:activeStyle="{color: '#5b7cff',fontWeight: 'bold',transform: 'scale(1.04)',}"
 			:inactiveStyle="{fontWeight: 'bold',transform: 'scale(1)'}" lineColor="#5b7cff" lineWidth="60"></u-tabs>
 
 		<!-- 记录模块 -->
 		<view class="module-box" v-if="current == 0">
-			<view class="module-item" style="background-color: #5b7cff;" @click="studyTimePicker = true">
+			<view class="module-item" v-for="(item,index) in moduleData" :key="index" :style="item.color"
+				@click="setTime(index)">
 				<view class="module-item-box">
-					<text class="module-item-text">自主学习记录</text>
+					<text class="module-item-text">{{item.text}}</text>
 					<view class="num-box">
-						<text class="module-item-num">{{studyTime[6]}}</text>
-						<text class="unit">小时</text>
+						<text class="module-item-num">{{item.numData}}</text>
 					</view>
-					<view class="t-icon t-icon-bianjibi"></view>
-				</view>
-			</view>
-
-			<view class="module-item" style="background-color: #00cca3;" @click="restTimePicker = true">
-				<view class="module-item-box">
-					<text class="module-item-text">娱乐放松记录</text>
-					<view class="num-box">
-						<text class="module-item-num">{{restTime}}</text>
-						<text class="unit">小时</text>
-					</view>
-					<view class="t-icon t-icon-leimucuyule"></view>
-				</view>
-			</view>
-
-			<view class="module-item" style="background-color: #ff9db2;">
-				<view class="module-item-box">
-					<text class="module-item-text">运动锻炼记录</text>
-					<view class="num-box">
-						<text class="module-item-num">5</text>
-						<text class="unit">分钟</text>
-					</view>
-					<view class="t-icon t-icon-yundong"></view>
-				</view>
-			</view>
-
-			<view class="module-item" style="background-color: #f9c752;" @click="sleepTimePicker = true">
-				<view class="module-item-box">
-					<text class="module-item-text">睡眠记录</text>
-					<view class="num-box">
-						<text class="module-item-num">{{sleepTime}}</text>
-						<text class="unit">小时</text>
-					</view>
-					<view class="t-icon t-icon-a-icon_wananyueliangshuimian"></view>
+					<view :class="item.icon"></view>
 				</view>
 			</view>
 		</view>
+
 		<!-- 时间选择器 -->
-		<u-picker :show="studyTimePicker" :columns="pickerHour" title="单位(小时)" ref="uPickerStudy" @confirm="hourStudy"
-			@cancel="studyCancel" :closeOnClickOverlay="true" @change="changeTime"></u-picker>
-		<u-picker :show="restTimePicker" :columns="pickerHour" title="单位(小时)" ref="uPickerRest" @confirm="hourRest"
-			@cancel="restCancel" :closeOnClickOverlay="true"></u-picker>
-		<u-picker :show="sleepTimePicker" :columns="pickerHour" title="单位(小时)" ref="uPickerSleep" @confirm="hourSleep"
-			@cancel="sleepCancel" :closeOnClickOverlay="true"></u-picker>
+		<u-picker :show="setTimePicker" :columns="pickerList" ref="uPicker" @confirm="pickerConfirm"
+			@cancel="pickerCancel" :closeOnClickOverlay="true" @change="changeHandler" :immediateChange="true"></u-picker>
 
 		<!-- 记录表 -->
 		<view class="module-box" v-if="current == 1">
@@ -67,8 +31,9 @@
 					<text class="info-text">近七天学习记录</text>
 				</view>
 				<view style=" width:100%; 500rpx; margin-top: -30rpx;">
-					<qiun-data-charts type="column" :chartData="todayData.studyColumn" :loadingType="4" :canvas2d='true'
-						canvasId='canvans912' :opts="{dataLabel:false, extra:{column: {barBorderCircle:true}}}" />
+					<qiun-data-charts type="column" :chartData="todayData.studyColumn" :loadingType="4"
+						:opts="{dataLabel:false}" tooltipFormat='tooltipHour' :canvas2d="true"
+						canvasId="canvasId9839618" />
 				</view>
 			</view>
 
@@ -78,8 +43,8 @@
 					<text class="info-text">近七天运动</text>
 				</view>
 				<view class="charts-box">
-					<qiun-data-charts type="pie" :chartData="todayData.exercisePie" :loadingType="4" :canvas2d='true'
-						canvasId='canvans8121' />
+					<qiun-data-charts type="pie" :chartData="todayData.exercisePie" :loadingType="4"
+						tooltipFormat='pieMinute' :canvas2d="true" canvasId="canvasId91234111" />
 				</view>
 			</view>
 
@@ -89,8 +54,8 @@
 					<text class="info-text">近七天睡眠</text>
 				</view>
 				<view class="charts-box">
-					<qiun-data-charts type="ring" :chartData="todayData.sleepRing" :loadingType="4" :canvas2d='true'
-						canvasId='canvans9122' :tooltipFormat='yAxisDemo1' />
+					<qiun-data-charts type="ring" :chartData="todayData.sleepRing" :loadingType="4"
+						tooltipFormat='tooltipHour' :canvas2d="true" canvasId="canvasId6312231" />
 				</view>
 			</view>
 		</view>
@@ -109,11 +74,6 @@
 		},
 		data() {
 			return {
-				//选择器
-				studyTimePicker: false,
-				restTimePicker: false,
-				sleepTimePicker: false,
-
 				//模块名
 				list: [{
 					name: '今日记录'
@@ -122,71 +82,75 @@
 				}],
 				//当前模块
 				current: 0,
-
-				pickerHour: [
-					['0.5', '1', '1.5', '2', '2.5', '3', '3.5', '4', '4.5', '5',
-						'5.5', '6', '6.5', '7', '7.5', '8', '8.5', '9', '9.5', '10'],
+				//记录卡片
+				moduleData: [{
+						text: '自主学习记录',
+						color: 'background-color: #5b7cff;',
+						icon: 't-icon t-icon-bianjibi',
+						numData: '记录一下',
+					},
+					{
+						text: '娱乐放松记录',
+						color: 'background-color: #00cca3;',
+						icon: 't-icon t-icon-leimucuyule',
+						numData: '记录一下',
+					},
+					{
+						text: '运动锻炼记录',
+						color: 'background-color: #ff9db2;',
+						icon: 't-icon t-icon-yundong',
+						numData: '记录一下',
+					},
+					{
+						text: '每日睡眠记录',
+						color: 'background-color: #f9c752;',
+						icon: 't-icon t-icon-a-icon_wananyueliangshuimian',
+						numData: '记录一下',
+					}
+				],
+				//当前记录卡片
+				cardCurrent: 5,
+				//选择器
+				setTimePicker: false,
+				//时间表
+				pickerList: [
+					['0小时', '1小时', '2小时', '3小时', '4小时', '5小时', '6小时', '7小时', '8小时', '9小时', '10小时'],
+					['5分钟', '10分钟', '15分钟', '20分钟', '25分钟', '30分钟', '35分钟', '40分钟', '45分钟', '50分钟', '55分钟']
 				],
-
-				//选择数据暂存
-				changeValue: 0,
-				//今日数据记录
-				studyTime: [2, 4, 3, 3.5, 5, 4, 0],
-				restTime: 0,
-				exerciseTime: 0,
-				sleepTime: 0,
 
 			};
 		},
+		onLoad() {},
 		methods: {
 			//更改模块
-			change(index) {
-				console.log(index)
+			changeModule(index) {
 				this.current = index.index
 			},
-			changeTime(e) {
-				console.log('change事件', e)
-				if (e.value[0]) {
-					//将用户的选择的值抛出去
-					this.changeValue = e.value[0]
-				}else{
-					//默认值
-					this.changeValue = 1
-				}
+			//点击卡片唤起picker
+			setTime(index) {
+				this.cardCurrent = index
+				this.setTimePicker = true
 			},
-			//自主学习
-			hourStudy() {
-				let arr = this.studyTime
-				let num = parseFloat(this.changeValue)
-				arr.push(num)
-				if (arr.length > 7) {
-					arr.shift()
+			//更改完成事件
+			changeHandler(e) {
+				if (e.value[0] === '0小时') {
+					this.moduleData[this.cardCurrent].numData = e.value[1]
+				} else {
+					this.moduleData[this.cardCurrent].numData = e.value[0] + e.value[1]
 				}
-				console.log(arr)
-				this.studyTime = arr
-				this.studyTimePicker = false
-			},
-			studyCancel() {
-				uni.$showMsg('取消选择')
-				this.studyTimePicker = false
 			},
-			//娱乐放松
-			hourRest(e) {
-				this.restTime = e.value[0]
-				this.restTimePicker = false
+			pickerConfirm(e) {
+				// this.setTimePicker = false
+				// 闭包的运用
+				let that = this
+				setTimeout(function () {
+					uni.$showMsg('记录完成',1000)
+				  that.setTimePicker = false
+				}, 100)
 			},
-			restCancel() {
-				uni.$showMsg('取消选择')
-				this.restTimePicker = false
-			},
-			//睡眠记录
-			hourSleep(e) {
-				this.sleepTime = e.value[0]
-				this.sleepTimePicker = false
-			},
-			sleepCancel() {
-				uni.$showMsg('取消选择')
-				this.sleepTimePicker = false
+			pickerCancel() {
+				uni.$showMsg('取消选择',1000)
+				this.setTimePicker = false
 			},
 
 		}
@@ -213,7 +177,7 @@
 			overflow: hidden;
 
 			.module-item-box {
-				padding: 30rpx;
+				padding: 35rpx;
 				width: 100%;
 				display: flex;
 				flex-direction: column;
@@ -222,39 +186,27 @@
 					width: 250rpx;
 					height: 250rpx;
 					margin: -250rpx 0 0 150rpx;
+					z-index: 1;
 				}
 			}
-
 		}
 	}
 
-
 	.module-item-text {
 		color: #FFF;
-		font-size: 35rpx;
+		font-size: 44rpx;
 		font-weight: bold;
-		z-index: 1;
+		z-index: 5;
 	}
 
 	.num-box {
-		margin: 30rpx 0 0 20rpx;
-		display: flex;
-		align-items: flex-end;
+		margin-top: 20rpx;
+		z-index: 5;
 
 		.module-item-num {
 			color: #FFF;
-			font-size: 70rpx;
-			font-weight: bold;
-			z-index: 1;
-		}
-
-		.unit {
-			margin-bottom: 15rpx;
-			margin-left: 20rpx;
-			color: #FFF;
-			font-size: 35rpx;
+			font-size: 38rpx;
 			font-weight: bold;
-			z-index: 1;
 		}
 	}
 </style>

components/top-box/top-box.vue

@@ -13,17 +13,17 @@
 			<view class="children-name">
 				<text class="name">{{childreninfo.name}}</text>
 				<view class="detail-box">
-					<text class="detail" @click="select = true">{{semester}}</text>
+					<text class="detail" @click="setSemesterPicker = true">{{semester}}</text>
 					<!-- 选择学期 -->
 					<view class="select-icon">
-						<view class="t-icon t-icon-youjiantou" @click="select = true"></view>
+						<view class="t-icon t-icon-youjiantou" @click="setSemesterPicker = true"></view>
 					</view>
 				</view>
 			</view>
 		</view>
 
-		<u-picker class="picker" :show="select" :closeOnClickOverlay="true" :columns="semesterList" ref="uPicker"
-			@confirm="selectSemester" @cancel="selectCancel"></u-picker>
+		<u-picker class="picker" :show="setSemesterPicker" :closeOnClickOverlay="true" :columns="semesterList" ref="uPicker"
+			@confirm="pickerConfirm" @cancel="pickerCancel" @change="changeHandler" :immediateChange="true"></u-picker>
 		
 		<!-- 切换孩子 -->
 		<view class="list-box" v-show="show">
@@ -59,7 +59,7 @@
 		data() {
 			return {
 				show: false,
-				select: false,
+				setSemesterPicker: false,
 				//下边界坐标
 				capsuleBottom: 0,
 				capsuleMiddle: 0
@@ -71,17 +71,23 @@
 		},
 		methods: {
 			...mapMutations('m_children', ['updateChildrenInfo', 'updateChildrenSemester']),
-			//学期选择
-			selectSemester(e) {
-				console.log('selectSemester', e)
-				uni.$showMsg('切换完成')
+			changeHandler(e){
+				//更新学期存储与显示
 				this.updateChildrenSemester(e.value[0])
-				this.select = false
+			},
+			//学期选择
+			pickerConfirm(e) {
+				//拼接图表数据
+				let that = this
+				setTimeout(function (){
+					uni.$showMsg('切换完成',1000)
+					that.setSemesterPicker = false
+				},100)
 			},
 			//取消选择
-			selectCancel() {
-				uni.$showMsg('取消选择')
-				this.select = false
+			pickerCancel() {
+				uni.$showMsg('取消选择',1000)
+				this.setSemesterPicker = false
 			},
 
 			//头部孩子选择

gradepkg/arcbar-chart/arcbar-chart.vue

@@ -64,8 +64,9 @@
 				<view class="t-icon t-icon-xianxingpaiqiu"></view>
 				<text class="chart-name-text">近期排行占比分析</text>
 			</view>
-			<view class="charts-box">
-				<qiun-data-charts type="arcbar" :chartData="gradeData.rankArcbarChart.recentAnalyse" :loadingType="4" :canvas2d='true' canvasId='canvans8939' />
+			<view class="charts-box" style="margin: 20rpx 0 -20rpx 0;">
+				<qiun-data-charts type="arcbar" :chartData="gradeData.rankArcbarChart.recentAnalyse" :loadingType="4"
+					tooltipFormat='tooltipScore' :canvas2d="true" canvasId="canvasId312412"/>
 			</view>
 		</view>
 		<!-- 走势 -->
@@ -76,7 +77,7 @@
 			</view>
 			<view class="charts-box">
 				<qiun-data-charts type="area" :chartData="gradeData.rankArcbarChart.semesterAnalyse" :loadingType="4"
-					:opts="{dataLabel: false}" :canvas2d='true' canvasId='canvans899' />
+					:opts="{dataLabel: false}" tooltipFormat='tooltipPercent' :canvas2d="true" canvasId="canvasId931234"/>
 			</view>
 		</view>
 
@@ -97,7 +98,7 @@
 			return {};
 		},
 		methods: {
-			
+
 		},
 		onLoad() {}
 	}

gradepkg/area-chart/area-chart.vue

@@ -18,33 +18,46 @@
 				<view class="t-icon t-icon-xianxinggangqin"></view>
 				<text class="chart-name-text">{{semester}} 单科与平均对比</text>
 
-				<view class="search-box" @click="show = true">
-					<button class="subject-btn">{{gradeData.subjectAreaChart.areaComparison.series[0].name}}</button>
+				<view class="search-box" @click="setSubjectPicker = true">
+					<!-- 按钮绑定当前选择科目通过picker控制选择科目的变化 -->
+					<button class="btn">{{subjectCurrent}}</button>
 				</view>
 			</view>
 			<!-- 图表 -->
 			<view class="charts-box">
 				<qiun-data-charts type="area" :chartData="gradeData.subjectAreaChart.areaComparison" :loadingType="4"
-					background="none" :canvas2d='true' canvasId='canvans999' />
+					background="none" tooltipFormat='tooltipScore' :canvas2d="true" canvasId="canvasId99999" />
 			</view>
 		</view>
 
-		<!-- 单科成绩对比 -->
+		<!-- 主科成绩走势 -->
 		<view class="chart-container">
 			<view class="chart-name">
 				<view class="t-icon t-icon-xianxingshoufengqin"></view>
-				<text class="chart-name-text">{{semester}} 单科走势对比</text>
+				<text class="chart-name-text">{{semester}} 主科走势对比</text>
 			</view>
 			<!-- 图表 -->
 			<view class="charts-box">
-				<qiun-data-charts type="area" :chartData="gradeData.subjectAreaChart.subjectComparison" :loadingType="4"
-					:opts="{dataLabel: false}" :canvas2d='true' canvasId='canvans899' />
+				<qiun-data-charts type="area" :chartData="gradeData.subjectAreaChart.majorSubjectComparison"
+					:loadingType="4" tooltipFormat='tooltipScore' :canvas2d="true" canvasId="canvasId99998" />
+			</view>
+		</view>
+		<!-- 副科成绩走势 -->
+		<view class="chart-container">
+			<view class="chart-name">
+				<view class="t-icon t-icon-xianxingshoufengqin"></view>
+				<text class="chart-name-text">{{semester}} 副科走势对比</text>
+			</view>
+			<!-- 图表 -->
+			<view class="charts-box">
+				<qiun-data-charts type="area" :chartData="gradeData.subjectAreaChart.minorSubjectComparison"
+					:loadingType="4" tooltipFormat='tooltipScore' :canvas2d="true" canvasId="canvasId99997" />
 			</view>
 		</view>
 
 		<!-- 选择器 -->
-		<u-picker :show="show" :columns="subjectList" ref="uPicker" @confirm="selectSubject" @cancel="selectCancel"
-			:closeOnClickOverlay="true">
+		<u-picker :show="setSubjectPicker" :columns="subjectList" ref="uPicker" @confirm="pickerConfirm"
+			@cancel="pickerCancel" :closeOnClickOverlay="true" @change="changeHandler" :immediateChange="true">
 		</u-picker>
 
 
@@ -52,8 +65,11 @@
 </template>
 
 <script>
+	import getdata from '../../common/data.js'
 	import {
-		mapState, mapMutations, mapGetters
+		mapState,
+		mapMutations,
+		mapGetters
 	} from 'vuex'
 
 	export default {
@@ -62,37 +78,71 @@
 			...mapState('m_chart', ['gradeData']),
 			...mapGetters('m_chart', ['getSubjectList'])
 		},
+		//picker选择科目的变化通过监听器，监听变化并做出对应图表的整体变化
+		watch: {
+			//对象形式监听subjectCurrent的变化
+			subjectCurrent: {
+				//newValue为变化后的新值
+				handler(newValue) {
+					//拿到对应图表数据
+					// let findResult = this.gradeData.subjectAreaChart.areaComparison.series[0].name.indexOf(newValue)
+					//获得图表展示的科目名称数据并与变化后的新值做比对
+					let subjectChartData = this.getdata.data.find(x => x.series[0].name.includes(newValue))
+					console.log(newValue)
+					console.log(subjectChartData)
+					this.updateSubjectAreaComparison(subjectChartData)
+				},
+				//immediate 属性用来声明此监听器是否在页面初次加载完毕后立即调用
+				immediate: true
+			},
 
+		},
 		data() {
 			return {
-				show: false,
-				subjectList: []
+				//假数据
+				getdata: getdata,
+				setSubjectPicker: false,
+				//科目列表
+				subjectList: [],
+				//当前选择科目
+				subjectCurrent: '',
+				//科目暂存区
+				temp: '',
 			};
 		},
 		onLoad() {
-			this.setSubjectList()
+			this.setSubject()
 		},
 		methods: {
 			...mapMutations('m_chart', ['updateSubjectAreaComparison']),
+			//科目切换事件
+			changeHandler(e) {
+				console.log(e)
+				this.temp = e.value[0]
+			},
 			//设置孩子科目
-			setSubjectList(){
-				if(this.subjectList = []){
-					let temp = [this.getSubjectList]
-					this.subjectList = temp
+			setSubject() {
+				//通过table获取孩子考试科目
+				if (this.subjectList.length == 0) {
+					let res = [this.getSubjectList]
+					this.subjectList = res
+					if (this.subjectCurrent == '')
+						this.subjectCurrent = this.getSubjectList[0]
 				}
 			},
-			//选择科目
-			selectSubject(e) {
-				console.log('selectSubject', e)
-				
-				// this.updateSubjectAreaComparison(areaComparison)
-				// this.getChartData()
-				uni.$showMsg('切换完成')
-				this.show = false
+			//切换科目
+			pickerConfirm(e) {
+				//改变subjectCurrent并由监听器处理数据图表同步改变
+				this.subjectCurrent = this.temp
+				let that = this
+				setTimeout(function() {
+					uni.$showMsg('切换完成', 1000)
+					that.setSubjectPicker = false
+				}, 100)
 			},
-			selectCancel() {
-				uni.$showMsg('取消选择')
-				this.show = false
+			pickerCancel() {
+				uni.$showMsg('取消选择', 1000)
+				this.setSubjectPicker = false
 			},
 
 		}
@@ -101,13 +151,4 @@
 
 <style lang="scss">
 	@import '@/gradepkg/common/chartpage.scss';
-	.subject-btn{
-		margin-left: 2rpx;
-		line-height: 65rpx;
-		border-radius: 30rpx;
-		color: #FFFFFF;
-		font-size: 28rpx;
-		font-weight: bold;
-		background-image: linear-gradient(to right, #de5f89, #f7b997);
-	}
 </style>

gradepkg/column-chart/column-chart.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page-box">
 		<back></back>
-		
+
 		<view class="children-box">
 			<image class="children-avatar" :src="childreninfo.avatar"></image>
 			<view class="children-msg">
@@ -17,7 +17,8 @@
 				<text class="chart-name-text">近期成绩对比</text>
 			</view>
 			<view class="charts-box">
-				<qiun-data-charts type="column" :chartData="gradeData.recentColumnChart.columnComparison" :loadingType="4" background="none" />
+				<qiun-data-charts type="column" :chartData="gradeData.recentColumnChart.columnComparison"
+					:loadingType="4" tooltipFormat='tooltipScore' :canvas2d="true" canvasId="canvasId19998"/>
 			</view>
 		</view>
 		<!-- 近期成绩对比平均 -->
@@ -27,36 +28,38 @@
 				<text class="chart-name-text">近期学科能力</text>
 			</view>
 			<view class="charts-box">
-				<qiun-data-charts type="radar" :chartData="gradeData.recentColumnChart.radarSubjectComparison" :loadingType="4" />
+				<qiun-data-charts type="radar" :chartData="gradeData.recentColumnChart.radarSubjectComparison"
+					:loadingType="4" tooltipFormat='tooltipScore' :canvas2d="true" canvasId="canvasId29998"/>
 			</view>
 		</view>
-		
+
 	</view>
 </template>
 
 <script>
-	import {mapState} from 'vuex'
-	
+	import {
+		mapState
+	} from 'vuex'
+
 	export default {
-		computed:{
-			...mapState('m_children',['childreninfo','semester']),
-			...mapState('m_chart',['gradeData'])
+		computed: {
+			...mapState('m_children', ['childreninfo', 'semester']),
+			...mapState('m_chart', ['gradeData'])
 		},
-		
+
 		data() {
-			return {
-			};
+			return {};
 		},
-		methods:{
+		methods: {
 
 		},
-		onLoad(){
-		}
+		onLoad() {}
 	}
 </script>
 
 <style lang="scss">
 	@import '@/gradepkg/common/chartpage.scss';
+
 	.page-box {
 		background: linear-gradient(#ffd071, $page-background-color);
 	}

gradepkg/common/chartpage.scss

@@ -63,7 +63,16 @@
 					display: flex;
 					align-items: center;
 					margin-left: auto;
-					margin-right: 40rpx;
+					margin-right: 60rpx;
+					.btn {
+						line-height: 60rpx;
+						border-radius: $card-border-radius;
+						border: none;
+						color: #FFFFFF;
+						font-size: 26rpx;
+						font-weight: bold;
+						background-image: linear-gradient(to right, #de5f89, #f7bea2);
+					}
 				}
 			}
 

gradepkg/line-chart/line-chart.vue

@@ -18,7 +18,8 @@
 				<text class="chart-name-text">{{semester}} 总成绩对比</text>
 			</view>
 			<view class="charts-box">
-				<qiun-data-charts type="line" :chartData="gradeData.semesterLineChart.lineComparison" :loadingType="4" :canvas2d='true' canvasId='canvans8931239'/>
+				<qiun-data-charts type="line" :chartData="gradeData.semesterLineChart.lineComparison" :loadingType="4"
+					tooltipFormat='tooltipScore' :canvas2d="true" canvasId="canvasId9999"/>
 			</view>
 		</view>
 		<!-- 主科总成绩图表 -->
@@ -28,7 +29,8 @@
 				<text class="chart-name-text">{{semester}} 主科总成绩对比</text>
 			</view>
 			<view class="charts-box">
-				<qiun-data-charts type="line" :chartData="gradeData.semesterLineChart.majorComparison" :loadingType="4" :canvas2d='true' canvasId='canvans85656939'/>
+				<qiun-data-charts type="line" :chartData="gradeData.semesterLineChart.majorComparison" :loadingType="4"
+					tooltipFormat='tooltipScore' :canvas2d="true" canvasId="canvasId9998"/>
 			</view>
 		</view>
 		<!-- 副科总成绩图表 -->
@@ -38,39 +40,41 @@
 				<text class="chart-name-text">{{semester}} 副科总成绩对比</text>
 			</view>
 			<view class="charts-box">
-				<qiun-data-charts type="line" :chartData="gradeData.semesterLineChart.minorComparison" :loadingType="4"/>
+				<qiun-data-charts type="line" :chartData="gradeData.semesterLineChart.minorComparison" :loadingType="4"
+					tooltipFormat='tooltipScore' :canvas2d="true" canvasId="canvasId9997"/>
 			</view>
 		</view>
-		
-	</view>
-</template>
-
+
+	</view>
+</template>
+
 <script>
-	import {mapState} from 'vuex'
-	
+	import {
+		mapState
+	} from 'vuex'
+
 	export default {
-		computed:{
-			...mapState('m_children',['childreninfo','semester']),
+		computed: {
+			...mapState('m_children', ['childreninfo', 'semester']),
 			...mapState('m_chart', ['gradeData'])
 		},
-		
-		data() {
+
+		data() {
 			return {
 				//查询参数
 				queryObj: {},
-
-			}
+
+			}
 		},
-		methods:{
-		},
-		onLoad(){
-		}
-	}
-</script>
-
+		methods: {},
+		onLoad() {}
+	}
+</script>
+
 <style lang="scss">
 	@import '@/gradepkg/common/chartpage.scss';
+
 	.page-box {
 		background: linear-gradient(#a5c6ff, $page-background-color);
-	}
+	}
 </style>

gradepkg/radar-chart/radar-chart.vue

@@ -44,7 +44,7 @@
 			<!-- 图表 -->
 			<view class="charts-box">
 				<qiun-data-charts type="radar" :chartData="gradeData.abilityRadarChart.importantAnalyse"
-					:loadingType="4" :canvas2d='true' canvasId='canvans8312399' />
+					:loadingType="4" tooltipFormat='tooltipScore' :canvas2d="true" canvasId="canvasId876898"/>
 			</view>
 		</view>
 
@@ -56,7 +56,7 @@
 			<!-- 图表 -->
 			<view class="charts-box">
 				<qiun-data-charts type="radar" :chartData="gradeData.abilityRadarChart.commonAnalyse" :loadingType="4"
-					:canvas2d='true' canvasId='canvans89139' />
+					tooltipFormat='tooltipScore' :canvas2d="true" canvasId="canvasId931238"/>
 			</view>
 		</view>
 

gradepkg/rose-chart/rose-chart.vue

@@ -49,7 +49,7 @@
 			</view>
 			<view class="charts-box">
 				<qiun-data-charts type="rose" :chartData="gradeData.advantageRoseChart.semesterAnalyse" :loadingType="4"
-					:tapLegend="true" :canvas2d='true' canvasId='canvans83179' />
+					:tapLegend="true" tooltipFormat='tooltipScoreShort' :canvas2d="true" canvasId="canvasId713897"/>
 			</view>
 		</view>
 		<!-- 单次考试 -->
@@ -60,7 +60,7 @@
 			</view>
 			<view class="charts-box">
 				<qiun-data-charts type="rose" :chartData="gradeData.advantageRoseChart.recentAnalyse" :loadingType="4"
-					:tapLegend="true" :canvas2d='true' canvasId='canvans831459' />
+					:tapLegend="true" tooltipFormat='tooltipScoreShort' :canvas2d="true" canvasId="canvasId809061"/>
 			</view>
 		</view>
 
@@ -116,6 +116,4 @@
 	.page-box {
 		background: linear-gradient(#a5c6ff, $page-background-color);
 	}
-
-
 </style>

information/chart.js

@@ -18,7 +18,7 @@ export default {
 					"期末考试"
 				],
 				series: [{
-					"name": "总成绩",
+					"name": "总分",
 					"data": [
 						556,
 						577,
@@ -34,7 +34,7 @@ export default {
 					'考试': '开学',
 					'语文': 83,
 					'数学': 95,
-					'外语': 95,
+					'英语': 95,
 					'体育': 92,
 					'思品': 88,
 					'科学': 90,
@@ -43,7 +43,7 @@ export default {
 					'考试': '四月月考',
 					'语文': 93,
 					'数学': 92,
-					'外语': 90,
+					'英语': 90,
 					'体育': 82,
 					'思品': 90,
 					'科学': 99,
@@ -52,7 +52,7 @@ export default {
 					'考试': '期中',
 					'语文': 99,
 					'数学': 91,
-					'外语': 82,
+					'英语': 82,
 					'体育': 94,
 					'思品': 85,
 					'科学': 100,
@@ -61,7 +61,7 @@ export default {
 					'考试': '五月月考',
 					'语文': 99,
 					'数学': 92,
-					'外语': 97,
+					'英语': 97,
 					'体育': 92,
 					'思品': 98,
 					'科学': 88,
@@ -70,7 +70,7 @@ export default {
 					'考试': '六月月考',
 					'语文': 99,
 					'数学': 90,
-					'外语': 92,
+					'英语': 92,
 					'体育': 92,
 					'思品': 80,
 					'科学': 90,
@@ -79,7 +79,7 @@ export default {
 					'考试': '期末',
 					'语文': 99,
 					'数学': 85,
-					'外语': 92,
+					'英语': 92,
 					'体育': 95,
 					'思品': 91,
 					'科学': 99,
@@ -99,8 +99,8 @@ export default {
 					'key': '数学',
 				},
 				{
-					'title': '外语',
-					'key': '外语',
+					'title': '英语',
+					'key': '英语',
 				},
 				{
 					'title': '体育',
@@ -120,40 +120,44 @@ export default {
 				//总成绩
 				lineComparison: {
 					categories: [
-						"测验1",
-						"测验2",
-						"测验3",
-						"测验4",
-						"测验5",
+						"开学考试",
+						"第一月考",
+						"第二月考",
+						"期中考试",
+						"第三月考",
+						"期末考试"
 					],
 					series: [{
 							"name": "孩子总分",
 							"data": [
-								400,
-								390,
-								380,
-								399,
-								366,
+								556,
+								577,
+								540,
+								588,
+								563,
+								594
 							]
 						},
 						{
 							"name": "班级平均分",
 							"data": [
-								360,
-								377,
-								355,
-								322,
-								338,
+								460,
+								477,
+								455,
+								522,
+								538,
+								511
 							]
 						},
 						{
 							"name": "年级平均分",
 							"data": [
-								333,
-								346,
-								364,
-								347,
-								355,
+								533,
+								446,
+								464,
+								547,
+								455,
+								502
 							]
 						}
 					],
@@ -161,11 +165,12 @@ export default {
 				//主科
 				majorComparison: {
 					categories: [
-						"测验1",
-						"测验2",
-						"测验3",
-						"测验4",
-						"测验5",
+						"开学考试",
+						"第一月考",
+						"第二月考",
+						"期中考试",
+						"第三月考",
+						"期末考试"
 					],
 					series: [{
 							"name": "语数外总分",
@@ -175,6 +180,7 @@ export default {
 								258,
 								288,
 								294,
+								273
 							]
 						},
 						{
@@ -185,6 +191,7 @@ export default {
 								260,
 								264,
 								250,
+								249
 							]
 						},
 						{
@@ -195,6 +202,7 @@ export default {
 								252,
 								247,
 								255,
+								270
 							]
 						}
 					],
@@ -202,11 +210,12 @@ export default {
 				//副科
 				minorComparison: {
 					categories: [
-						"测验1",
-						"测验2",
-						"测验3",
-						"测验4",
-						"测验5",
+						"开学考试",
+						"第一月考",
+						"第二月考",
+						"期中考试",
+						"第三月考",
+						"期末考试"
 					],
 					series: [{
 							"name": "科学体育思品总分",
@@ -215,7 +224,8 @@ export default {
 								290,
 								280,
 								299,
-								266,
+								276,
+								288
 							]
 						},
 						{
@@ -226,6 +236,7 @@ export default {
 								255,
 								222,
 								238,
+								259
 							]
 						},
 						{
@@ -236,6 +247,7 @@ export default {
 								268,
 								242,
 								256,
+								270
 							]
 						}
 					],
@@ -246,12 +258,12 @@ export default {
 				//单科对比
 				areaComparison: {
 					categories: [
-						"测验1",
-						"测验2",
-						"测验3",
-						"测验4",
-						"测验5",
-						"测验6"
+						"开学考试",
+						"第一月考",
+						"第二月考",
+						"期中考试",
+						"第三月考",
+						"期末考试"
 					],
 					series: [{
 							"name": "数学成绩",
@@ -288,15 +300,15 @@ export default {
 						}
 					],
 				},
-				//学科对比
-				subjectComparison: {
+				//主科学科对比
+				majorSubjectComparison: {
 					categories: [
-						"测验1",
-						"测验2",
-						"测验3",
-						"测验4",
-						"测验5",
-						"测验6"
+						"开学考试",
+						"第一月考",
+						"第二月考",
+						"期中考试",
+						"第三月考",
+						"期末考试"
 					],
 					series: [{
 							"name": "数学",
@@ -330,8 +342,19 @@ export default {
 								95,
 								89
 							]
-						},
-						{
+						}
+					],
+				},
+				minorSubjectComparison: {
+					categories: [
+						"开学考试",
+						"第一月考",
+						"第二月考",
+						"期中考试",
+						"第三月考",
+						"期末考试"
+					],
+					series: [{
 							"name": "科学",
 							"data": [
 								91,
@@ -365,7 +388,7 @@ export default {
 							]
 						}
 					],
-				},
+				}
 			},
 			//近期考试数据
 			recentColumnChart: {
@@ -414,7 +437,7 @@ export default {
 						"思品"
 					],
 					series: [{
-							"name": "孩子",
+							"name": "最近成绩",
 							"data": [
 								91,
 								92,
@@ -570,7 +593,7 @@ export default {
 						"思品"
 					],
 					series: [{
-							"name": "4月月考",
+							"name": "第一月考",
 							"data": [
 								90,
 								100,
@@ -581,7 +604,7 @@ export default {
 							]
 						},
 						{
-							"name": "6月月考",
+							"name": "第二月考",
 							"data": [
 								89,
 								94,
@@ -592,7 +615,7 @@ export default {
 							]
 						},
 						{
-							"name": "8月月考",
+							"name": "第三月考",
 							"data": [
 								79,
 								84,
@@ -624,15 +647,15 @@ export default {
 				//学期排名占比分析
 				semesterAnalyse: {
 					categories: [
-						"测验1",
-						"测验2",
-						"测验3",
-						"测验4",
-						"测验5",
-						"测验6"
+						"开学考试",
+						"第一月考",
+						"第二月考",
+						"期中考试",
+						"第三月考",
+						"期末考试"
 					],
 					series: [{
-							"name": "超过年级中百分之",
+							"name": "超过年级中",
 							"data": [
 								90,
 								95,
@@ -643,7 +666,7 @@ export default {
 							]
 						},
 						{
-							"name": "超过班级中百分之",
+							"name": "超过班级中",
 							"data": [
 								95,
 								98,
@@ -688,7 +711,7 @@ export default {
 					"星期天"
 				],
 				"series": [{
-						"name": "自主学习(时)",
+						"name": "自主学习",
 						"data": [
 							2,
 							3,
@@ -700,7 +723,7 @@ export default {
 						]
 					},
 					{
-						"name": "娱乐放松(时)",
+						"name": "娱乐放松",
 						"data": [
 							1,
 							2,
@@ -717,31 +740,31 @@ export default {
 			exercisePie: {
 				"series": [{
 					"data": [{
-							"name": "周一(分)",
+							"name": "周一",
 							"value": 20
 						},
 						{
-							"name": "周二(分)",
+							"name": "周二",
 							"value": 30
 						},
 						{
-							"name": "周三(分)",
+							"name": "周三",
 							"value": 50
 						},
 						{
-							"name": "周四(分)",
+							"name": "周四",
 							"value": 100
 						},
 						{
-							"name": "周五(分)",
+							"name": "周五",
 							"value": 40
 						},
 						{
-							"name": "周六(分)",
+							"name": "周六",
 							"value": 40
 						},
 						{
-							"name": "周日(分)",
+							"name": "周日",
 							"value": 60
 						}
 					]
@@ -750,37 +773,37 @@ export default {
 			sleepRing: {
 				"series": [{
 					"data": [{
-							"name": "周一(时)",
+							"name": "周一",
 							"value": 8
 						},
 						{
-							"name": "周二(时)",
+							"name": "周二",
 							"value": 7
 						},
 						{
-							"name": "周三(时)",
+							"name": "周三",
 							"value": 8.5
 						},
 						{
-							"name": "周四(时)",
+							"name": "周四",
 							"value": 6.5
 						},
 						{
-							"name": "周五(时)",
+							"name": "周五",
 							"value": 8
 						},
 						{
-							"name": "周六(时)",
+							"name": "周六",
 							"value": 8
 						},
 						{
-							"name": "周日(时)",
+							"name": "周日",
 							"value": 9
 						}
 					]
 				}]
 			},
-			
+
 		},
 
 
@@ -789,7 +812,7 @@ export default {
 	mutations: {
 		// 更新图表数据
 		updateSubjectAreaComparison(state, areaComparison) {
-			state.areaComparison = areaComparison
+			state.gradeData.subjectAreaChart.areaComparison = areaComparison
 		},
 		updateLineChartData(state, lineChartData) {
 			state.lineChartData = lineChartData

information/parent.js

@@ -14,7 +14,11 @@ export default {
 
 		parentdetail: JSON.parse(uni.getStorageSync('parentdetail') || '{}'),
 		myData: {
-			msgList: ['通知一','121313123123123','bnawuidgawikdasjdhauwk']
+			msgList: {
+				'成绩通知':[''],
+				'系统通知':[],
+				'任务通知':[],
+				}
 		}
 
 	}),

main.js

@@ -8,7 +8,7 @@ import {$http} from '@escook/request-miniprogram'
 import store from '@/information/store.js'
 //导入uView组件库
 import uView from '@/uni_modules/uview-ui'
-//配置公共方法
+//导入公共方法
 import RepeatClick from './utils/RepeatClick.js'
 Vue.prototype.$noMultipleClicks = RepeatClick.noMultipleClicks;
 

pages/common/mainpage.scss

@@ -18,6 +18,7 @@
 				margin: 2% 0;
 				display: flex;
 				flex-direction: column;
+				justify-content: space-between;
 				background-color: #FFFFFF;
 				// box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
 				border-radius: $card-border-radius;

pages/grade/grade.vue

@@ -15,7 +15,7 @@
 
 					<view class="charts-box">
 						<qiun-data-charts class="chart" :canvas2d='true' canvasId='canvans5' type="mainline"
-							:chartData="gradeData.mainLineChart" :loadingType="4" />
+							:chartData="gradeData.mainLineChart" :loadingType="4" tooltipFormat='tooltipScore' />
 					</view>
 				</view>
 			</view>
@@ -70,13 +70,13 @@
 			</view>
 
 			<!-- 成绩表单 -->
-			<view class="mini-chart-item" style="width: 100%; height: 600rpx;">
+			<view class="mini-chart-item" style="width: 100%; height: 650rpx;">
 				<view class="chart-container" style="height: 100%">
 					<view class="chart-name">
 						<view class="t-icon t-icon-xtubiao-5"></view>
 						<text class="chart-name-text">成绩概览</text>
 					</view>
-					<z-table class="table" :tableData="gradeData.tableData" :columns="gradeData.columns">
+					<z-table class="table" :tableData="gradeData.tableData" :columns="gradeData.columns" showBottomSum="true">
 					</z-table>
 				</view>
 			</view>

pages/home/home.vue

@@ -4,7 +4,7 @@
 		<top-box v-bind:timeStamp="timeStamp"></top-box>
 		<!-- 滚动条 -->
 		<view class="notice">
-			<u-notice-bar :text="myData.msgList[0]" mode="closable" bgColor="rgba(91, 126, 220, 0.5)" color="#FFFFFF"></u-notice-bar>
+			<u-notice-bar :text="noticeMsg" mode="closable" bgColor="rgba(91, 126, 220, 0.5)" color="#FFFFFF"></u-notice-bar>
 		</view>
 		<!-- 卡片区域 -->
 		<view class="card-box">
@@ -28,7 +28,7 @@
 				</view>
 				<view class="charts-box">
 					<qiun-data-charts type="arcbar" :chartData="todayData.evaluationArcbar" :loadingType="4"
-						:canvas2d='true' canvasId='canvans931' :opts="evaluationOpts" />
+						:canvas2d='true' canvasId='canvans9313111' :opts="evaluationOpts" />
 				</view>
 			</view>
 
@@ -39,7 +39,7 @@
 				</view>
 				<view class="charts-box">
 					<qiun-data-charts type="arcbar" :chartData="todayData.homeworkArcbar" :loadingType="4"
-						:canvas2d='true' canvasId='canvans932' :opts="homeworkOpts" />
+						:canvas2d='true' canvasId='canvans9327676' :opts="homeworkOpts" />
 				</view>
 			</view>
 
@@ -126,6 +126,8 @@
 		},
 		data() {
 			return {
+				//滚动通知
+				noticeMsg:'',
 				//今日课堂数
 				classNum: 5,
 				//今日课程
@@ -159,6 +161,12 @@
 			}, 1000);
 		},
 		methods: {
+			//获取滚动通知
+			getNoticeMsg(){
+				for(let msg in this.myData.msgList){
+					console.log(msg)
+				}
+			},
 			//设置更新
 			setOpts() {
 				//圆环图标题和副标题动态变化

subpkg/childrenInfo/childrenInfo.vue

@@ -4,7 +4,7 @@
 		<back></back>
 		<!-- 孩子头部信息 -->
 		<view class="top-info">
-			<image class="top-avatar" :src="childreninfo.avatar" size="100"></image>
+			<image class="top-avatar" :src="childreninfo.avatar" @click="updateAvatar"></image>
 			<view class="top-name">
 				<text class="name">{{childreninfo.name}}</text>
 				<text class="detail">{{childreninfo.schoolname}}</text>
@@ -57,6 +57,17 @@
 		},
 		methods: {
 			...mapMutations('m_children', ['updateChildrenInfo']),
+			updateAvatar(){
+				uni.chooseImage({
+					count:1,//默认1个图片
+					sourceType: ['album'], //从相册选择
+					success: function(res){
+						console.log(JSON.stringify(res.tempFilePaths));
+					}
+				})
+			},
+			
+			
 		},
 	}
 </script>

subpkg/common/infopage.scss

@@ -23,13 +23,13 @@
 				font-weight: bold;
 
 				.name {
-					color: #3B4144;
+					color: $color-title;
 					font-size: 45rpx;
 					font-weight: bold;
 				}
 
 				.detail {
-					color: #596166;
+					color: $color-subtitle;
 					font-size: 40rpx;
 					font-weight: bold;
 				}
@@ -65,9 +65,8 @@
 
 			.item-text {
 				font-size: 30rpx;
-				font-weight: bold;
-				color: #353535;
-				margin: 30rpx 0 0 30rpx;
+				color: $color-title;
+				margin: 20rpx 0 0 20rpx;
 			}
 
 			.t-icon {

subpkg/login/login.vue

@@ -35,7 +35,7 @@
 		data() {
 			return {
 				query: {},
-				//是否正在点击
+				//没有点击
 				noClick: true
 			};
 		},

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

@@ -1,23 +1,38 @@
-/*
- * uCharts®
- * 高性能跨平台图表库，支持H5、APP、小程序（微信/支付宝/百度/头条/QQ/360）、Vue、Taro等支持canvas的框架平台
- * Copyright (c) 2021 QIUN®秋云 https://www.ucharts.cn All rights reserved.
- * Licensed ( http://www.apache.org/licenses/LICENSE-2.0 )
- * 复制使用请保留本段注释，感谢支持开源！
- * 
- * uCharts®官方网站
- * https://www.uCharts.cn
- * 
- * 开源地址:
- * https://gitee.com/uCharts/uCharts
- * 
- * uni-app插件市场地址：
- * http://ext.dcloud.net.cn/plugin?id=271
- * 
- */
-
 // 主题颜色配置：如每个图表类型需要不同主题，请在对应图表类型上更改color属性
 const color = ["#0052d4", "#ff5959", "#f9b248", "#c1cbf7", "#3CA272", "#5fb7ff", "#FC8452", "#9A60B4"];
+// 提示窗配置
+const tooltip = {
+	"showBox": true,
+	"showArrow": false,
+	"showCategory": false,
+	"borderRadius": 6,
+	"bgOpacity": 0.5,
+	"splitLine": true,
+};
+//x轴配置
+const X = {
+	"disableGrid": true,
+	"fontSize": 11,
+	"scrollColor": "#F5F5F5",
+	"scrollBackgroundColor": "#D3D3D3",
+	"format": ""
+};
+//y轴配置
+const Y = {
+	"data": [{
+		// "fontSize": 11,
+	}]
+};
+//图例配置
+const legend = {
+	"show": true,
+	"position": "top",
+	"float": "right",
+	"padding": 5,
+	"margin": 15,
+	"fontSize": 13,
+};
+
 
 //事件转换函数，主要用作格式化x轴为时间轴，根据需求自行修改
 const formatDateTime = (timeStamp, returnType) => {
@@ -51,19 +66,13 @@ const formatDateTime = (timeStamp, returnType) => {
 
 const cfu = {
 	//demotype为自定义图表类型，一般不需要自定义图表类型，只需要改根节点上对应的类型即可
-	"type": ["pie", "ring", "rose", "word", "funnel", "map", "arcbar", "line", "column", "bar", "area", "radar",
-		"gauge", "candle", "mix", "tline", "tarea", "scatter", "bubble", "demotype", "mainline", "mainradar",
-		"mini-line", "mini-area", "mini-column", "mini-rose", "home-arcbar"
-	],
-	"range": ["饼状图", "圆环图", "玫瑰图", "圆弧进度条", "折线图", "柱状图", "条状图", "区域图", "雷达图", "仪表盘", "K线图",
-		"散点图", "气泡图", "自定义类型", "首页趋势图", "首页雷达图", "折线缩略图", "区域缩略图", "柱状缩略图", "玫瑰缩略图",
-		"条状图缩略图", "雷达缩略图", "首页进度圆环"
+	"type": ["pie", "ring", "rose", "arcbar", "line", "column", "area", "radar", "mainline", "mini-line",
+		"mini-area", "mini-column"
 	],
+	"range": [],
 	//增加自定义图表类型，如果需要categories，请在这里加入您的图表类型，例如最后的"demotype"
 	//自定义类型时需要注意"tline","tarea","scatter","bubble"等时间轴（矢量x轴）类图表，没有categories，不需要加入categories
-	"categories": ["line", "column", "bar", "area", "radar", "gauge", "candle", "mix", "demotype", "mainline",
-		"mainradar", "mini-line", "mini-area", "mini-column", "home-arcbar"
-	],
+	"categories": ["line", "column", "bar", "area", "radar", "mainline", "mini-line", "mini-area", "mini-column"],
 	//instance为实例变量承载属性，不要删除
 	"instance": {},
 	//option为opts及eopts承载属性，不要删除
@@ -85,206 +94,44 @@ const cfu = {
 		"seriesDemo1": function(val) {
 			return val + '元'
 		},
-		"tooltipDemo1": function(item, category, index, opts) {
-			if (index == 0) {
-				return '随便用' + item.data + '年'
-			} else {
-				return '其他我没改' + item.data + '天'
-			}
+		"tooltipScore": function(item, category, index, opts) {
+			return category + ' ' + item.name + ': ' + item.data + ' 分 '
 		},
-		"pieDemo": function(val, index, series) {
-			if (index !== undefined) {
-				return series[index].name + '：' + series[index].data + '元'
-			}
+		"tooltipScoreShort": function(item, category, index, opts) {
+			return item.name + ': ' + item.data + ' 分 '
 		},
-	},
-	//这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
-	//下面是自定义配置，请添加项目所需的通用配置
-	"rose": {
-		"type": "rose",
-		"canvasId": "",
-		"canvas2d": false,
-		"background": "none",
-		"animation": true,
-		"timing": "easeOut",
-		"duration": 500,
-		"color": [
-			"#0052d4", "#ff5959", "#f9b248", "#c1cbf7", "#3CA272", "#5fb7ff", "#FC8452", "#9A60B4"
-		],
-		"padding": [
-			-20,
-			0,
-			0,
-			0
-		],
-		"rotate": false,
-		"errorReload": true,
-		"fontSize": 13,
-		"fontColor": "#666666",
-		"enableScroll": false,
-		"touchMoveLimit": 60,
-		"enableMarkLine": false,
-		"dataLabel": false,
-		"dataPointShape": false,
-		"dataPointShapeType": "hollow",
-		"tapLegend": true,
-		"legend": {
-			"show": true,
-			"position": "bottom",
-			"float": "center",
-
+		"tooltipPercent": function(item, category, index, opts) {
+			return category + ' ' + item.name + ': ' + item.data + ' % '
 		},
-		"extra": {
-			"rose": {
-				"type": "radius",
-				"minRadius": 50,
-				"activeOpacity": 0.5,
-				"activeRadius": 10,
-				"offsetAngle": 0,
-				"labelWidth": 15,
-				"border": true,
-				"borderWidth": 2,
-				"borderColor": "#FFFFFF",
-				"linearType": "none"
-			},
-			"tooltip": {
-				"showBox": true,
-				"showArrow": false,
-				"showCategory": false,
-				"borderRadius": 6,
-				"bgOpacity": 0.5,
-				"splitLine": true,
-			},
-		}
-	},
-	"arcbar": {
-		"type": "arcbar",
-		"canvasId": "",
-		"canvas2d": false,
-		"background": "none",
-		"animation": true,
-		"timing": "easeOut",
-		"duration": 500,
-		"rotate": false,
-		"errorReload": true,
-		"fontSize": 13,
-		"fontColor": "#666666",
-		"enableScroll": false,
-		"touchMoveLimit": 60,
-		"enableMarkLine": false,
-		"dataLabel": true,
-		"dataPointShape": true,
-		"dataPointShapeType": "solid",
-		"tapLegend": true,
-		"title": {
-			"name": "总成绩占比",
-			"fontSize": 20,
-			"color": "#0052d4",
+		"tooltipHour": function(item, category, index, opts) {
+			return item.name + ': ' + item.data + ' 小时 '
 		},
-		"subtitle": {
-			"name": "年级与班级",
-			"fontSize": 15,
-			"color": "#666666",
+		"pieMinute": function(item, category, index, opts) {
+			return item.name + ': ' + item.data + ' 分钟 '
 		},
-		"extra": {
-			"arcbar": {
-				"type": "default",
-				"width": 16,
-				"backgroundColor": "#E9E9E9",
-				"startAngle": 0.75,
-				"endAngle": 0.25,
-				"gap": 2,
-			}
-		}
+
 	},
+	//这里演示了自定义您的图表类型的option，可以随意命名，之后在组件上 type="demotype" 后，组件会调用这个花括号里的option，如果组件上还存在opts参数，会将demotype与opts中option合并后渲染图表。
+	//下面是自定义配置，请添加项目所需的通用配置
 	"line": {
 		"type": "line",
-		"canvasId": "",
-		"canvas2d": false,
-		"background": "none",
 		"animation": true,
 		"timing": "easeOut",
 		"duration": 500,
-		"color": [
-			"#0052d4",
-			"#ff5959",
-			"#f9b248"
-		],
+		"color": color,
 		"padding": [
-			0, 15, 15, 10
+			0, 10, 15, 5
 		],
-		"rotate": false,
-		"errorReload": true,
 		"fontSize": 12,
-		"fontColor": "#696969",
-		"enableScroll": false,
-		"touchMoveLimit": 60,
-		"enableMarkLine": true,
-		"dataLabel": true,
-		"dataPointShape": true,
-		"dataPointShapeType": "solid",
-		"tapLegend": true,
-		"xAxis": {
-			"disabled": false,
-			"axisLine": true,
-			"axisLineColor": "#CCCCCC",
-			"calibration": false,
-			"fontColor": "#696969",
-			"fontSize": 12,
-			"rotateLabel": false,
-			"labelCount": 6,
-			"itemCount": 5,
-			"boundaryGap": "center",
-			"disableGrid": true,
-			"gridColor": "#696969",
-			"gridType": "solid",
-			"dashLength": 4,
-			"gridEval": 1,
-			"scrollShow": false,
-			"scrollAlign": "left",
-			"scrollColor": "#F5F5F5",
-			"scrollBackgroundColor": "#D3D3D3",
-			"format": ""
-		},
-		"yAxis": {
-			"disabled": false,
-			"disableGrid": false,
-			"splitNumber": 5,
-			"gridType": "solid",
-			"dashLength": 10,
-			"gridColor": "#CCCCCC",
-			"padding": 10,
-			"showTitle": false,
-			"data": []
-		},
-		"legend": {
-			"show": true,
-			"position": "top",
-			"float": "right",
-			"padding": 5,
-			"margin": 15,
-			"backgroundColor": "rgba(0,0,0,0)",
-			"borderColor": "rgba(0,0,0,0)",
-			"borderWidth": 0,
-			"fontSize": 12,
-			"fontColor": "#696969",
-			"lineHeight": 10,
-			"hiddenColor": "#CECECE",
-			"itemGap": 10
-		},
+		"xAxis": X,
+		"yAxis": Y,
+		"legend": legend,
 		"extra": {
 			"line": {
 				"type": "curve",
 				"width": 2
 			},
-			"tooltip": {
-				"showBox": true,
-				"showArrow": false,
-				"showCategory": false,
-				"borderRadius": 6,
-				"bgOpacity": 0.5,
-				"splitLine": true,
-			},
+			"tooltip": tooltip,
 			"markLine": {
 				"type": "dash",
 				"dashLength": 8,
@@ -294,115 +141,26 @@ const cfu = {
 	},
 	"column": {
 		"type": "column",
-		"canvasId": "",
-		"canvas2d": false,
-		"background": "none",
 		"animation": true,
 		"timing": "easeOut",
 		"duration": 500,
-		"color": [
-			"#0052d4",
-			"#ff5959",
-			"#f9b248"
-		],
+		"color": color,
 		"padding": [
-			0, 15, 15, 10
+			0, 10, 15, 5
 		],
-		"rotate": false,
-		"errorReload": true,
 		"fontSize": 12,
-		"fontColor": "#696969",
-		"enableScroll": false,
-		"touchMoveLimit": 60,
-		"enableMarkLine": true,
-		"dataLabel": true,
-		"dataPointShape": true,
-		"dataPointShapeType": "solid",
-		"tapLegend": true,
-		"xAxis": {
-			"disabled": false,
-			"axisLine": true,
-			"axisLineColor": "#CCCCCC",
-			"calibration": false,
-			"fontColor": "#696969",
-			"fontSize": 12,
-			"rotateLabel": false,
-			"labelCount": 6,
-			"itemCount": 5,
-			"boundaryGap": "center",
-			"disableGrid": true,
-			"gridColor": "#696969",
-			"gridType": "solid",
-			"dashLength": 4,
-			"gridEval": 1,
-			"scrollShow": false,
-			"scrollAlign": "left",
-			"scrollColor": "#F5F5F5",
-			"scrollBackgroundColor": "#D3D3D3",
-			"format": ""
-		},
-		"yAxis": {
-			"disabled": false,
-			"disableGrid": false,
-			"splitNumber": 5,
-			"gridType": "solid",
-			"dashLength": 10,
-			"gridColor": "#CCCCCC",
-			"padding": 10,
-			"showTitle": false,
-			"data": []
-		},
-		"legend": {
-			"show": true,
-			"position": "top",
-			"float": "right",
-			"padding": 5,
-			"margin": 15,
-			"backgroundColor": "rgba(0,0,0,0)",
-			"borderColor": "rgba(0,0,0,0)",
-			"borderWidth": 0,
-			"fontSize": 12,
-			"fontColor": "#696969",
-			"lineHeight": 10,
-			"hiddenColor": "#CECECE",
-			"itemGap": 10
-		},
+		"xAxis": X,
+		"yAxis": Y,
+		"legend": legend,
 		"extra": {
 			"column": {
 				"type": "group",
 				"width": 17,
-				"seriesGap": 2,
-				"categoryGap": 3,
-				"barBorderCircle": false,
-				"barBorderRadius": [
-					5,
-					5,
-					5,
-					5
-				],
-				"linearType": "none",
-				"linearOpacity": 1,
-				"customColor": [
-					"#0052d4",
-					"#4364f7",
-					"#6fb1fc",
-					"#f5f5f5"
-				],
-				"colorStop": 0,
-				"meterBorder": 1,
-				"meterFillColor": "#FFFFFF",
-				"activeBgColor": "#000000",
-				"activeBgOpacity": 0.05,
-				"meterBorde": 1
-			},
-			"tooltip": {
-				"showBox": true,
-				"showArrow": false,
-				"showCategory": false,
-				"borderRadius": 6,
-				"bgOpacity": 0.5,
-				"splitLine": true,
+				"seriesGap": 3,
+				"categoryGap": 5,
+				"barBorderCircle": true,
 			},
+			"tooltip": tooltip,
 			"markLine": {
 				"type": "dash",
 				"dashLength": 8,
@@ -412,83 +170,17 @@ const cfu = {
 	},
 	"area": {
 		"type": "area",
-		"canvasId": "",
-		"canvas2d": false,
-		"background": "none",
 		"animation": true,
 		"timing": "easeOut",
 		"duration": 500,
-		"color": [
-			"#0052d4",
-			"#ff5959",
-			"#f9b248",
-			"#c1cbf7",
-			"#3CA272",
-			"#5fb7ff"
-
-		],
+		"color": color,
 		"padding": [
-			0, 15, 15, 10
+			0, 10, 15, 5
 		],
-		"rotate": false,
-		"errorReload": true,
-		"fontSize": 13,
-		"fontColor": "#666666",
-		"enableScroll": false,
-		"touchMoveLimit": 60,
-		"enableMarkLine": true,
-		"dataLabel": true,
-		"dataPointShape": true,
-		"dataPointShapeType": "solid",
-		"tapLegend": true,
-		"xAxis": {
-			"disabled": false,
-			"axisLine": true,
-			"axisLineColor": "#CCCCCC",
-			"calibration": false,
-			"fontColor": "#696969",
-			"fontSize": 12,
-			"rotateLabel": false,
-			"labelCount": 6,
-			"itemCount": 5,
-			"boundaryGap": "center",
-			"disableGrid": true,
-			"gridColor": "#CCCCCC",
-			"gridType": "solid",
-			"dashLength": 4,
-			"gridEval": 1,
-			"scrollShow": false,
-			"scrollAlign": "left",
-			"scrollColor": "#A6A6A6",
-			"scrollBackgroundColor": "#EFEBEF",
-			"format": ""
-		},
-		"yAxis": {
-			"disabled": false,
-			"disableGrid": false,
-			"splitNumber": 5,
-			"gridType": "solid",
-			"dashLength": 10,
-			"gridColor": "#CCCCCC",
-			"padding": 10,
-			"showTitle": false,
-			"data": []
-		},
-		"legend": {
-			"show": true,
-			"position": "top",
-			"float": "right",
-			"padding": 5,
-			"margin": 15,
-			"backgroundColor": "rgba(0,0,0,0)",
-			"borderColor": "rgba(0,0,0,0)",
-			"borderWidth": 0,
-			"fontSize": 12,
-			"fontColor": "#696969",
-			"lineHeight": 10,
-			"hiddenColor": "#CECECE",
-			"itemGap": 10
-		},
+		"fontSize": 12,
+		"xAxis": X,
+		"yAxis": Y,
+		"legend": legend,
 		"extra": {
 			"area": {
 				"type": "curve",
@@ -497,14 +189,7 @@ const cfu = {
 				"width": 2,
 				"gradient": true
 			},
-			"tooltip": {
-				"showBox": true,
-				"showArrow": false,
-				"showCategory": false,
-				"borderRadius": 6,
-				"bgOpacity": 0.5,
-				"splitLine": true,
-			},
+			"tooltip": tooltip,
 			"markLine": {
 				"type": "dash",
 				"dashLength": 8,
@@ -512,100 +197,105 @@ const cfu = {
 			}
 		}
 	},
+	"rose": {
+		"type": "rose",
+		"animation": true,
+		"timing": "easeOut",
+		"duration": 500,
+		"color": color,
+		"padding": [
+			-20,
+			0,
+			0,
+			0
+		],
+		"dataLabel": false,
+		"dataPointShape": false,
+		"dataPointShapeType": "hollow",
+		"legend": {
+			"show": true,
+			"position": "bottom",
+			"float": "center",
+		},
+		"extra": {
+			"rose": {
+				"type": "radius",
+				"minRadius": 50,
+				"activeOpacity": 0.5,
+				"activeRadius": 10,
+				"offsetAngle": 0,
+				"labelWidth": 15,
+				"border": true,
+				"borderWidth": 2,
+				"borderColor": "#FFFFFF",
+				"linearType": "none"
+			},
+			"tooltip": tooltip,
+		}
+	},
+	"arcbar": {
+		"type": "arcbar",
+		"animation": true,
+		"timing": "easeOut",
+		"duration": 500,
+		"title": {
+			"name": "总成绩占比",
+			"fontSize": 20,
+			"color": "#0052d4",
+		},
+		"subtitle": {
+			"name": "年级与班级",
+			"fontSize": 15,
+			"color": "#666666",
+		},
+		"extra": {
+			"arcbar": {
+				"width": 16,
+			}
+		}
+	},
 	"radar": {
 		"type": "radar",
-		"canvasId": "",
-		"canvas2d": false,
-		"background": "none",
 		"animation": true,
 		"timing": "easeOut",
 		"duration": 500,
-		"color": [
-			"#0052d4",
-			"#ff5959",
-			"#f9b248"
-		],
+		"color": color,
 		"padding": [
 			0, 15, 10, 15
 		],
-		"rotate": false,
-		"errorReload": true,
-		"fontSize": 13,
-		"fontColor": "#696969",
-		"enableScroll": false,
-		"touchMoveLimit": 60,
+		"fontSize": 12,
 		"enableMarkLine": false,
 		"dataLabel": false,
-		"dataPointShape": true,
-		"dataPointShapeType": "solid",
-		"tapLegend": true,
 		"legend": {
 			"show": true,
 			"position": "bottom",
 			"float": "right",
 			"padding": 5,
 			"margin": 5,
-			"backgroundColor": "rgba(0,0,0,0)",
-			"borderColor": "rgba(0,0,0,0)",
-			"borderWidth": 0,
-			"fontSize": 13,
 			"fontColor": "#696969",
-			"lineHeight": 10,
-			"hiddenColor": "#CECECE",
-			"itemGap": 10
 		},
 		"extra": {
 			"radar": {
 				"gridType": "circle",
-				"gridColor": "#CCCCCC",
 				"gridCount": 2,
-				"labelColor": "#696969",
 				"opacity": 0.3,
 				"border": true,
 				"borderWidth": 1,
-				"max": 100
 			},
-			"tooltip": {
-				"showBox": true,
-				"showArrow": false,
-				"showCategory": false,
-				"borderRadius": 6,
-				"bgOpacity": 0.5,
-				"splitLine": true,
-			}
+			"tooltip": tooltip,
 		}
 	},
 	"pie": {
 		"type": "pie",
-		"canvasId": "",
-		"canvas2d": false,
-		"background": "none",
 		"animation": true,
 		"timing": "easeOut",
 		"duration": 500,
-		"color": [
-			"#0052d4",
-			"#ff5959",
-			"#f9b248",
-			"#3CA272",
-			"#5fb7ff",
-			"#ff8caf",
-			"#9A60B4"
-		],
+		"color": color,
 		"padding": [
 			0, 3, 0, 3
 		],
-		"rotate": false,
-		"errorReload": true,
-		"fontSize": 13,
-		"fontColor": "#666666",
-		"enableScroll": false,
-		"touchMoveLimit": 60,
-		"enableMarkLine": false,
+		"fontSize": 12,
 		"dataLabel": false,
-		"dataPointShape": true,
-		"dataPointShapeType": "solid",
-		"tapLegend": true,
 		"legend": {
 			"show": false,
 		},
@@ -621,47 +311,20 @@ const cfu = {
 				"borderColor": "#FFFFFF",
 				"linearType": "none"
 			},
-			"tooltip": {
-				"showBox": true,
-				"showArrow": false,
-				"showCategory": false,
-				"borderRadius": 6,
-				"bgOpacity": 0.5,
-				"splitLine": true,
-			}
+			"tooltip": tooltip,
 		}
 	},
 	"ring": {
 		"type": "ring",
-		"canvasId": "",
-		"canvas2d": false,
-		"background": "none",
 		"animation": true,
 		"timing": "easeOut",
 		"duration": 500,
-		"color": [
-			"#0052d4",
-			"#ff5959",
-			"#f9b248",
-			"#3CA272",
-			"#5fb7ff",
-			"#ff8caf",
-			"#9A60B4"
-		],
+		"color": color,
 		"padding": [
 			0, 3, 0, 3
 		],
-		"rotate": false,
-		"errorReload": true,
-		"fontSize": 13,
-		"fontColor": "#666666",
-		"enableScroll": false,
-		"touchMoveLimit": 60,
-		"enableMarkLine": false,
+		"fontSize": 12,
 		"dataLabel": false,
-		"dataPointShape": true,
-		"dataPointShapeType": "solid",
-		"tapLegend": true,
 		"legend": {
 			"show": false,
 		},
@@ -679,21 +342,11 @@ const cfu = {
 				"borderColor": "#FFFFFF",
 				"linearType": "none"
 			},
-			"tooltip": {
-				"showBox": true,
-				"showArrow": false,
-				"showCategory": false,
-				"borderRadius": 6,
-				"bgOpacity": 0.5,
-				"splitLine": true,
-			}
+			"tooltip": tooltip,
 		}
 	},
 	"mainline": {
 		"type": "area",
-		"canvasId": "",
-		"canvas2d": false,
-		"background": "none",
 		"animation": true,
 		"timing": "easeOut",
 		"duration": 500,
@@ -746,17 +399,10 @@ const cfu = {
 	},
 	"mini-line": {
 		"type": "line",
-		"canvasId": "",
-		"canvas2d": false,
-		"background": "none",
 		"animation": true,
 		"timing": "easeOut",
 		"duration": 500,
-		"color": [
-			"#0052d4",
-			"#ff5959",
-			"#f9b248"
-		],
+		"color": color,
 		"padding": [
 			10,
 			0,
@@ -796,17 +442,10 @@ const cfu = {
 	},
 	"mini-area": {
 		"type": "area",
-		"canvasId": "",
-		"canvas2d": false,
-		"background": "none",
 		"animation": true,
 		"timing": "easeOut",
 		"duration": 500,
-		"color": [
-			"#0052d4",
-			"#ff5959",
-			"#f9b248"
-		],
+		"color": color,
 		"padding": [
 			10,
 			0,
@@ -849,22 +488,15 @@ const cfu = {
 	},
 	"mini-column": {
 		"type": "column",
-		"canvasId": "",
-		"canvas2d": false,
-		"background": "none",
 		"animation": true,
 		"timing": "easeOut",
 		"duration": 500,
-		"color": [
-			"#0052d4",
-			"#ff5959",
-			"#f9b248"
-		],
+		"color": color,
 		"padding": [
 			0,
-			13,
+			12,
 			0,
-			13
+			12
 		],
 		"dataLabel": false,
 		"dataPointShape": false,

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

@@ -251,7 +251,7 @@ export default {
 					@include flex;
 					justify-content: center;
 					align-items: center;
-					font-size: 16px;
+					font-size: 18px;
 					text-align: center;
 					/* #ifndef APP-NVUE */
 					display: block;

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

@@ -78,8 +78,8 @@
 		&__wrapper {
 			&__cancel {
 				color: $u-tips-color;
-				font-size: 15px;
-				padding: 0 15px;
+				font-size: 17px;
+				padding: 0 20px;
 			}
 		}
 
@@ -94,8 +94,8 @@
 		&__wrapper {
 			&__confirm {
 				color: $u-primary;
-				font-size: 15px;
-				padding: 0 15px;
+				font-size: 17px;
+				padding: 0 20px;
 			}
 		}
 	}

utils/DataUtils.js

@@ -1,50 +0,0 @@
-const grade = {
-	开学: {
-		'语文': 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,
-	}
-}

utils/RepeatClick.js

@@ -1,19 +1,21 @@
 // 处理多次点击
 function noMultipleClicks(methods) {
+		//复制this对象指向当时的this,防止找不到原来的对象
     let that = this;
-    
+
     if (that.noClick) {
         that.noClick= false;
+				//点击方法
         methods();
         setTimeout(function () {
             that.noClick= true;
         }, 2000)
     } else {
-        console.log("请稍后点击")
+        uni.$showMsg('正在加载中',500)
     }
 }
 
-//导出
+//导出并在Main.js中全局注册
 export default {
 	noMultipleClicks,//禁止多次点击
 }