完成成绩页基本功能与图表的封装

components/mainline-chart/mainline-chart.vue

@@ -1,46 +0,0 @@
-<template>
-		<view class="charts-box">
-			<qiun-data-charts class="chart" :canvas2d='true' canvasId='canvans5' type="mainline" :chartData="chartData" :loadingType="4"/>
-		</view>
-</template>
-
-<script>
-	export default {
-		name: "mainline-chart",
-		data() {
-			return {
-
-				chartData: {
-					categories: [
-						"开学考试",
-						"第一月考",
-						"第二月考",
-						"期中考试",
-						"第三月考",
-						"期末考试"
-					],
-					series: [{
-						"name": "总成绩",
-						"data": [
-							555,
-							577,
-							540,
-							588,
-							563,
-							594
-						]
-					}]
-				},
-
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-.charts-box{
-  width: 100%;
-  height:180px;
-	margin-top: -120rpx;
-}
-</style>

gradepkg/arcbar-chart/arcbar-chart.vue

@@ -1,76 +1,92 @@
-<template>
-	<view class="chart-container">
-		<view class="chart-name">
-			<text class="chart-name-text">排名分析</text>
+<template>
+	<view class="page-box">
+		<view class="icon-box">
+			<view class="t-icon t-icon-xuexirenwu"></view>
+			<view class="t-icon t-icon-ceshi"></view>
+			<view class="t-icon t-icon-silu"></view>
 		</view>
-		
-		<view class="charts-box">
-		  <qiun-data-charts
-		    type="arcbar"
-		    :chartData="chartData"
-		    :loadingType="4"
-		    background="none"
-		  />
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				chartData:{
-				  series:[ {
-            "name": "排名",
-            "data": 0.8,
-            "color": "#0052d4"
-        },
-        {
-            "name": "排名",
-            "data": 0.8,
-            "color": "#ff5959"
-        },
-        {
-            "name": "排名",
-            "data": 0.8,
-            "color": "#f9b248"
-        }],
-				},
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-.chart-container {
-		margin: 20rpx;
-		border-radius: 30rpx;
-		padding: 6rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		background-color: #FFFFFF;
-		box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.05);
-	
-		.chart-name {
-			width: 100%;
-			text-align: left;
-			margin-left: 60rpx;
-			margin-top: 16rpx;
-			font-weight: bold;
-			color: #3B4144;
+
+
+		<view class="chart-container">
+			<view class="chart-name">
+				<view class="t-icon t-icon-dajumao"></view>
+				<text class="chart-name-text">排行分析</text>
+			</view>
+
+			<view class="charts-box">
+		 	<qiun-data-charts type="arcbar" :chartData="chartData" :loadingType="4" :opts.title="this.chartData.series.name" />
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				chartData: {
+					series: [{
+							"name": "您的孩子超过",
+							"data": 0.8,
+							"color": "#0052d4"
+						},
+						{
+							"name": "班级平均分",
+							"data": 0.9,
+							"color": "#ff5959"
+						},
+						{
+							"name": "年纪平均分",
+							"data": 1,
+							"color": "#f9b248"
+						}
+					],
+				},
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.page-box{
+		height: 400rpx;
+		background: linear-gradient(#419eea, #f1f3f5);
+		.icon-box{
 			display: flex;
 			justify-content: space-between;
-	
-			.chart-name-text {
-				font-size: 32rpx;
-				margin-top: 10rpx;
+			margin: 0 80rpx 40rpx 80rpx;
+			padding-top: 20rpx;
+		}
+		.chart-container {
+			margin: 0 20rpx;
+			padding: 0rpx 10rpx 0rpx 0rpx;
+			border-radius: 15rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			background-color: #FFFFFF;
+			box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
+		
+			.chart-name {
+				width: 100%;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				margin-left: 40rpx;
+				margin-top: 20rpx;
+		
+				.chart-name-text {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #3B4144;
+					margin-left: 10rpx;
+				}
+			}
+			.charts-box {
+				width: 100%;
+				height: 550rpx;
 			}
-		}
-		.charts-box {
-			width: 100%;
-			height: 700rpx;
 		}
-	}
+	}
 </style>

gradepkg/area-chart/area-chart.vue

@@ -1,30 +1,46 @@
-<template>
-	<view class="chart-container">
-		<view class="chart-name">
-			<text class="chart-name-text">单科成绩走向图</text>
-			<!-- 选择器 -->
-			<view class="chart-name-btn">
-				<u-picker :show="show" :columns="subject" ref="uPicker" @confirm="confirm" @change="changeHandler"></u-picker>
-				<!-- <u-button class="btn" @click="show = true" size="small" shape="circle">科目</u-button> -->
-			</view>
+<template>
+	<view class="page-box">
+		<view class="icon-box">
+			<view class="t-icon t-icon-xuexirenwu"></view>
+			<view class="t-icon t-icon-ceshi"></view>
+			<view class="t-icon t-icon-silu"></view>
 		</view>
-		<!-- 图表 -->
-		<view class="charts-box">
-			<qiun-data-charts type="area" :canvas2d='true' canvasId='canvans7' :chartData="chartData" :loadingType="4" background="none" />
+
+		<view class="chart-container">
+			<view class="chart-name">
+				<view class="t-icon t-icon-buoumao-zhongdianse"></view>
+				<text class="chart-name-text">单科成绩走向图</text>
+				<!-- 选择器 -->
+				<view class="chart-name-btn">
+					<u-picker :show="show" :columns="subject" ref="uPicker" @confirm="confirm" @change="changeHandler">
+					</u-picker>
+					<!-- <u-button class="btn" @click="show = true" size="small" shape="circle">科目</u-button> -->
+				</view>
+			</view>
+			<!-- 图表 -->
+			<view class="charts-box">
+				<qiun-data-charts type="area" :chartData="chartData" :loadingType="4" background="none" />
+			</view>
 		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
 			return {
-				
+
 				show: false,
-				subject:[
-					['语文','数学','英语','体育','思品','科学']
+				//是否正在加载
+				isLoading: false,
+				subject: [
+					['语文', '数学', '英语', '体育', '思品', '科学']
 				],
-				
+				//请求参数对象
+				queryObj: {
+					
+				},
+
 				chartData: {
 					categories: [
 						"测验1",
@@ -69,57 +85,78 @@
 						}
 					],
 				},
-				
-				
-			};
+
+
+			};
+		},
+		onLoad(){
+			// this.getChartData();
 		},
-		methods:{
-			confirm(e){
-				console.log('confirm',e)
+		methods: {
+			
+			//获取图表数据
+			// async getChartData(){
+			// 	//打开节流阀
+			// 	this.isLoading = true
+			// 	//发起请求
+			// 	const {data:res} = await uni.$http.post('https://',this.queryObj)
+			// 	//关闭节流阀
+			// 	this.isLoading = false
+			// 	//判断请求获取结果
+			// 	if(res.meta.status !== 200) return uni.$showMsg()
+			// 	//为数据赋值:通过展开运算符的形式进行，新旧数据的拼接
+			// 	this.chartData = {categories:[...res.test],series[...res.object,...res.class,...res.grade]}
+			// },
+			
+			confirm(e) {
+				console.log('confirm', e)
 				uni.$showMsg('切换完成')
 				this.show = false
 			}
-		}
-	}
-</script>
-
-<style lang="scss">
-.chart-container {
-		margin: 20px 10px;
-		padding: 5px 5px 5px 2px;
-		border-radius: 15px;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		background-color: #FFFFFF;
-		box-shadow: 0 2px 4px rgba(0,0,0,0.1);
+		}
+	}
+</script>
 
-		.chart-name {
-			width: 100%;
-			text-align: left;
-			margin-left: 30px;
-			margin-top: 8px;
-			font-weight: bold;
-			color: #3B4144;
+<style lang="scss">
+	.page-box{
+		height: 400rpx;
+		background: linear-gradient(#ff6187, #f1f3f5);
+		.icon-box{
 			display: flex;
 			justify-content: space-between;
-
-			.chart-name-text {
-				font-size: 13px;
+			margin: 0 80rpx 40rpx 80rpx;
+			padding-top: 20rpx;
+		}
+		.chart-container {
+			margin: 0 20rpx;
+			padding: 0rpx 10rpx 0rpx 0rpx;
+			border-radius: 15rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			background-color: #FFFFFF;
+			box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
+		
+			.chart-name {
+				width: 100%;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				margin-left: 40rpx;
+				margin-top: 20rpx;
+		
+				.chart-name-text {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #3B4144;
+					margin-left: 10rpx;
+				}
 			}
-			.chart-name-btn{
-				width: 50px;
-				font-size: 13px;
-				margin:-4px 30px 0 0;
-				z-index: 999;
+			.charts-box {
+				width: 100%;
+				height: 500rpx;
 			}
 		}
-
-		/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
-		.charts-box {
-			width: 100%;
-			height: 600rpx;
-		}
-	}
+	}
 </style>

gradepkg/bar-chart/bar-chart.vue

@@ -1,19 +1,28 @@
-<template>
-	<view class="chart-container">
-		<view class="chart-name">
-			<text class="chart-name-text">成绩目标</text>
+<template>
+	<view class="page-box">
+		<view class="icon-box">
+			<view class="t-icon t-icon-xuexirenwu"></view>
+			<view class="t-icon t-icon-ceshi"></view>
+			<view class="t-icon t-icon-silu"></view>
 		</view>
-		<view class="charts-box">
-			<qiun-data-charts type="bar" :canvas2d='true' canvasId='canvans4' 
-			:chartData="chartData" :loadingType="4" background="none" />
+
+
+		<view class="chart-container">
+			<view class="chart-name">
+				<view class="t-icon t-icon-buoumao-haibaoshuangse"></view>
+				<text class="chart-name-text">成绩目标</text>
+			</view>
+			<view class="charts-box">
+				<qiun-data-charts type="bar" :chartData="chartData" :loadingType="4"/>
+			</view>
 		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
 				chartData: {
 					categories: [
 						"数学",
@@ -47,42 +56,53 @@
 						}
 					],
 				},
-				
-				
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-.chart-container {
-		margin: 40rpx 20rpx;
-		padding: 14rpx 14rpx 14rpx 4rpx;
-		border-radius: 30rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		background-color: #FFFFFF;
-		box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
 
-		.chart-name {
-			width: 100%;
-			text-align: left;
-			margin-left: 60rpx;
-			margin-top: 16rpx;
-			font-weight: bold;
-			color: #3B4144;
 
-			.chart-name-text {
-				font-size: 26rpx;
-			}
+			};
 		}
+	}
+</script>
 
-		/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
-		.charts-box {
-			width: 100%;
-			height: 560rpx;
+<style lang="scss">
+	.page-box{
+		height: 400rpx;
+		background: linear-gradient(#5fb7ff, #f1f3f5);
+		.icon-box{
+			display: flex;
+			justify-content: space-between;
+			margin: 0 80rpx 40rpx 80rpx;
+			padding-top: 20rpx;
+		}
+		.chart-container {
+			margin: 0 20rpx;
+			padding: 0rpx 10rpx 0rpx 0rpx;
+			border-radius: 15rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			background-color: #FFFFFF;
+			box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
+		
+			.chart-name {
+				width: 100%;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				margin-left: 40rpx;
+				margin-top: 20rpx;
+		
+				.chart-name-text {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #3B4144;
+					margin-left: 10rpx;
+				}
+			}
+			.charts-box {
+				width: 100%;
+				height: 600rpx;
+			}
 		}
-	}
+	}
 </style>

gradepkg/column-chart/column-chart.vue

@@ -1,18 +1,28 @@
-<template>
-	<view class="chart-container">
-		<view class="chart-name">
-			<text class="chart-name-text">近期成绩对比</text>
+<template>
+	<view class="page-box">
+		<view class="icon-box">
+			<view class="t-icon t-icon-xuexirenwu"></view>
+			<view class="t-icon t-icon-ceshi"></view>
+			<view class="t-icon t-icon-silu"></view>
 		</view>
-		<view class="charts-box">
-			<qiun-data-charts type="column" :chartData="chartData" :loadingType="4" background="none" />
+
+
+		<view class="chart-container">
+			<view class="chart-name">
+				<view class="t-icon t-icon-buoumao-xiyouse"></view>
+				<text class="chart-name-text">近期成绩对比</text>
+			</view>
+			<view class="charts-box">
+				<qiun-data-charts type="column" :chartData="chartData" :loadingType="4" background="none" />
+			</view>
 		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
 				chartData: {
 					categories: [
 						"数学",
@@ -46,42 +56,53 @@
 						}
 					],
 				},
-				
-				
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-.chart-container {
-		margin: 40rpx 20rpx;
-		padding: 10rpx 10rpx 10rpx 4rpx;
-		border-radius: 30rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		background-color: #FFFFFF;
-		box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
-	
-		.chart-name {
-			width: 100%;
-			text-align: left;
-			margin-left: 60rpx;
-			margin-top: 16rpx;
-			font-weight: bold;
-			color: #3B4144;
-	
-			.chart-name-text {
-				font-size: 26rpx;
-			}
+
+
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.page-box{
+		height: 400rpx;
+		background: linear-gradient(#f9cd98, #f1f3f5);
+		.icon-box{
+			display: flex;
+			justify-content: space-between;
+			margin: 0 80rpx 40rpx 80rpx;
+			padding-top: 20rpx;
 		}
-	
-		/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
-		.charts-box {
-			width: 100%;
-			height: 600rpx;
+		.chart-container {
+			margin: 0 20rpx;
+			padding: 0rpx 10rpx 0rpx 0rpx;
+			border-radius: 15rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			background-color: #FFFFFF;
+			box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
+		
+			.chart-name {
+				width: 100%;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				margin-left: 40rpx;
+				margin-top: 20rpx;
+		
+				.chart-name-text {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #3B4144;
+					margin-left: 10rpx;
+				}
+			}
+			.charts-box {
+				width: 100%;
+				height: 500rpx;
+			}
 		}
-	}
+	}
 </style>

gradepkg/line-chart/line-chart.vue

@@ -69,45 +69,45 @@
 </script>
 
 <style lang="scss">
-.page-box{
-	height: 400rpx;
-	background: linear-gradient(#5fb7ff, #f1f3f5);
-	.icon-box{
-		display: flex;
-		justify-content: space-between;
-		margin: 0 80rpx 40rpx 80rpx;
-		padding-top: 20rpx;
-	}
-	.chart-container {
-		margin: 0 20rpx;
-		padding: 0rpx 10rpx 0rpx 0rpx;
-		border-radius: 15rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		background-color: #FFFFFF;
-		box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
-	
-		.chart-name {
-			width: 100%;
+	.page-box{
+		height: 400rpx;
+		background: linear-gradient(#5fb7ff, #f1f3f5);
+		.icon-box{
+			display: flex;
+			justify-content: space-between;
+			margin: 0 80rpx 40rpx 80rpx;
+			padding-top: 20rpx;
+		}
+		.chart-container {
+			margin: 0 20rpx;
+			padding: 0rpx 10rpx 0rpx 0rpx;
+			border-radius: 15rpx;
 			display: flex;
-			justify-content: flex-start;
 			align-items: center;
-			margin-left: 40rpx;
-			margin-top: 20rpx;
-	
-			.chart-name-text {
-				font-size: 30rpx;
-				font-weight: bold;
-				color: #3B4144;
-				margin-left: 10rpx;
+			justify-content: center;
+			flex-direction: column;
+			background-color: #FFFFFF;
+			box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
+		
+			.chart-name {
+				width: 100%;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				margin-left: 40rpx;
+				margin-top: 20rpx;
+		
+				.chart-name-text {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #3B4144;
+					margin-left: 10rpx;
+				}
+			}
+			.charts-box {
+				width: 100%;
+				height: 500rpx;
 			}
 		}
-		.charts-box {
-			width: 100%;
-			height: 500rpx;
-		}
-	}
-}
+	}
 </style>

gradepkg/mainradar-chart/mainradar-chart.vue

@@ -1,19 +1,29 @@
-<template>
-	<view class="chart-container">
-		<view class="chart-name">
-			<text class="chart-name-text">成绩雷达图</text>
+<template>
+	<view class="page-box">
+		<view class="icon-box">
+			<view class="t-icon t-icon-xuexirenwu"></view>
+			<view class="t-icon t-icon-ceshi"></view>
+			<view class="t-icon t-icon-silu"></view>
 		</view>
-		<!-- 图表 -->
-		<view class="charts-box">
-			<qiun-data-charts type="mainradar" :canvas2d='true' canvasId='canvans6' :chartData="chartData" :loadingType="4" background="none" />
+
+
+		<view class="chart-container">
+			<view class="chart-name">
+				<view class="t-icon t-icon-buoumao-zhongdianse"></view>
+				<text class="chart-name-text">成绩雷达图</text>
+			</view>
+			<!-- 图表 -->
+			<view class="charts-box">
+				<qiun-data-charts type="mainradar" :chartData="chartData" :loadingType="4" />
+			</view>
 		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
 				chartData: {
 					categories: ["语文",
 						"数学",
@@ -57,44 +67,53 @@
 						}
 					],
 				},
-				
-				
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-.chart-container {
-			margin: 40rpx 34rpx;
-			padding: 10rpx 10rpx 10rpx 4rpx;
-			border-radius: 30rpx;
+
+
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.page-box{
+		height: 400rpx;
+		background: linear-gradient(#ff6187, #f1f3f5);
+		.icon-box{
+			display: flex;
+			justify-content: space-between;
+			margin: 0 80rpx 40rpx 80rpx;
+			padding-top: 20rpx;
+		}
+		.chart-container {
+			margin: 0 20rpx;
+			padding: 0rpx 10rpx 0rpx 0rpx;
+			border-radius: 15rpx;
 			display: flex;
 			align-items: center;
 			justify-content: center;
 			flex-direction: column;
 			background-color: #FFFFFF;
 			box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
-	
+		
 			.chart-name {
 				width: 100%;
-				text-align: left;
-				margin-left: 60rpx;
-				margin-top: 16rpx;
-				font-weight: bold;
-				color: #3B4144;
 				display: flex;
-				justify-content: space-between;
-	
+				justify-content: flex-start;
+				align-items: center;
+				margin-left: 40rpx;
+				margin-top: 20rpx;
+		
 				.chart-name-text {
 					font-size: 30rpx;
+					font-weight: bold;
+					color: #3B4144;
+					margin-left: 10rpx;
 				}
 			}
-			
-	.charts-box{
-		width: 100%;
-		height:600rpx;
+			.charts-box {
+				width: 100%;
+				height: 600rpx;
+			}
+		}
 	}
-
-}
 </style>

gradepkg/radar-chart/radar-chart.vue

@@ -1,30 +1,40 @@
-<template>
-	<view class="chart-container">
-		<view class="chart-name">
-			<text class="chart-name-text">单科能力</text>
-			<!-- 选择器 -->
-			<!-- <view class="chart-name-btn">
+<template>
+	<view class="page-box">
+		<view class="icon-box">
+			<view class="t-icon t-icon-xuexirenwu"></view>
+			<view class="t-icon t-icon-ceshi"></view>
+			<view class="t-icon t-icon-silu"></view>
+		</view>
+
+
+		<view class="chart-container">
+			<view class="chart-name">
+				<view class="t-icon t-icon-heimao"></view>
+				<text class="chart-name-text">单科能力</text>
+				<!-- 选择器 -->
+				<!-- <view class="chart-name-btn">
 				<u-picker :show="show" :columns="subject" ref="uPicker" @confirm="confirm" @change="changeHandler"></u-picker>
 				<u-button class="btn" @click="show = true" size="small" shape="circle">科目</u-button>
 			</view> -->
+			</view>
+
+			<!-- 图表 -->
+			<view class="charts-box">
+				<qiun-data-charts type="radar" :chartData="chartData" :loadingType="4" />
+			</view>
 		</view>
-		
-		<!-- 图表 -->
-		<view class="charts-box">
-			<qiun-data-charts type="radar" :canvas2d='true' canvasId='canvans8' :chartData="chartData" :loadingType="4" />
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
 			return {
 				show: false,
-				subject:[
-					['语文','数学','英语','体育','思品','科学']
+				subject: [
+					['语文', '数学', '英语', '体育', '思品', '科学']
 				],
-				
+
 				chartData: {
 					categories: [
 						"数学",
@@ -58,51 +68,60 @@
 						}
 					],
 				},
-				
-				
-			};
+
+
+			};
 		},
-		methods:{
-			confirm(e){
-				console.log('confirm',e)
+		methods: {
+			confirm(e) {
+				console.log('confirm', e)
 				uni.$showMsg('切换完成')
 				this.show = false
 			}
-		}
+		}
 	}
-	
-</script>
-
-<style lang="scss">
-.chart-container {
-		margin: 20rpx;
-		border-radius: 30rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		background-color: #FFFFFF;
-		box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
+</script>
 
-		.chart-name {
-			width: 100%;
-			text-align: left;
-			margin-left: 60rpx;
-			margin-top: 16rpx;
-			font-weight: bold;
-			color: #3B4144;
+<style lang="scss">
+	.page-box{
+		height: 400rpx;
+		background: linear-gradient(#c1cbf7, #f1f3f5);
+		.icon-box{
 			display: flex;
 			justify-content: space-between;
-
-			.chart-name-text {
-				font-size: 26rpx;
-				margin-top: 10rpx;
-			}
+			margin: 0 80rpx 40rpx 80rpx;
+			padding-top: 20rpx;
 		}
-
-		.charts-box {
-			width: 100%;
-			height: 700rpx;
+		.chart-container {
+			margin: 0 20rpx;
+			padding: 0rpx 10rpx 0rpx 0rpx;
+			border-radius: 15rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			background-color: #FFFFFF;
+			box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
+		
+			.chart-name {
+				width: 100%;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				margin-left: 40rpx;
+				margin-top: 20rpx;
+		
+				.chart-name-text {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #3B4144;
+					margin-left: 10rpx;
+				}
+			}
+			.charts-box {
+				width: 100%;
+				height: 550rpx;
+			}
 		}
-	}
+	}
 </style>

gradepkg/rose-chart/rose-chart.vue

@@ -1,92 +1,106 @@
-<template>
-	<view class="chart-container">
-		<view class="chart-name">
-			<text class="chart-name-text">偏科分析</text>
+<template>
+	<view class="page-box">
+		<view class="icon-box">
+			<view class="t-icon t-icon-xuexirenwu"></view>
+			<view class="t-icon t-icon-ceshi"></view>
+			<view class="t-icon t-icon-silu"></view>
 		</view>
-		
-		<view class="charts-box">
-		  <qiun-data-charts
-		    type="rose"
-		    :chartData="chartData"
-		    :loadingType="4"
-		    background="none"
-		    :tapLegend="true"
-		  />
+
+
+		<view class="chart-container">
+			<view class="chart-name">
+				<view class="t-icon t-icon-shizimao"></view>
+				<text class="chart-name-text">科目分析</text>
+			</view>
+
+			<view class="charts-box">
+				<qiun-data-charts type="rose" :chartData="chartData" :loadingType="4" background="none"
+					:tapLegend="true" />
+			</view>
 		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				chartData:{
-					series:[{
-				    "data": [
-				        {
-				            "name": "数学",
-				            "value": 100
-				        },
-				        {
-				            "name": "语文",
-				            "value": 85
-				        },
-				        {
-				            "name": "英语",
-				            "value": 100
-				        },
-				        {
-				            "name": "科学",
-				            "value": 77
-				        },
-				        {
-				            "name": "体育",
-				            "value": 88
-				        },
-				        {
-				            "name": "思品",
-				            "value": 95
-				        }
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				chartData: {
+					series: [{
+						"data": [{
+								"name": "数学",
+								"value": 100
+							},
+							{
+								"name": "语文",
+								"value": 85
+							},
+							{
+								"name": "英语",
+								"value": 100
+							},
+							{
+								"name": "科学",
+								"value": 77
+							},
+							{
+								"name": "体育",
+								"value": 88
+							},
+							{
+								"name": "思品",
+								"value": 95
+							}
 						]
 					}]
 				},
-				
-				
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-.chart-container {
-		margin: 20rpx;
-		border-radius: 30rpx;
-		padding: 6rpx;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		flex-direction: column;
-		background-color: #FFFFFF;
-		box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.05);
-	
-		.chart-name {
-			width: 100%;
-			text-align: left;
-			margin-left: 60rpx;
-			margin-top: 16rpx;
-			font-weight: bold;
-			color: #3B4144;
+
+
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.page-box{
+		height: 400rpx;
+		background: linear-gradient(#f97f41, #f1f3f5);
+		.icon-box{
 			display: flex;
 			justify-content: space-between;
-	
-			.chart-name-text {
-				font-size: 32rpx;
-				margin-top: 10rpx;
+			margin: 0 80rpx 40rpx 80rpx;
+			padding-top: 20rpx;
+		}
+		.chart-container {
+			margin: 0 20rpx;
+			padding: 0rpx 10rpx 0rpx 0rpx;
+			border-radius: 15rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			background-color: #FFFFFF;
+			box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
+		
+			.chart-name {
+				width: 100%;
+				display: flex;
+				justify-content: flex-start;
+				align-items: center;
+				margin-left: 40rpx;
+				margin-top: 20rpx;
+		
+				.chart-name-text {
+					font-size: 30rpx;
+					font-weight: bold;
+					color: #3B4144;
+					margin-left: 10rpx;
+				}
+			}
+			.charts-box {
+				width: 100%;
+				height: 550rpx;
 			}
-		}
-		.charts-box {
-			width: 100%;
-			height: 700rpx;
 		}
-	}
+	}
 </style>

pages.json

@@ -63,12 +63,17 @@
 		"root": "gradepkg",
 		"pages": [{
 			"path": "rose-chart/rose-chart",
-			"style": {}
+			"style": {
+				"navigationBarTitleText": "",
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor":"#f97f41"
+			}
 		}, {
 			"path": "radar-chart/radar-chart",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor":"#c1cbf7"
 			}
 
 		}, {
@@ -83,35 +88,40 @@
 			"path": "area-chart/area-chart",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor":"#ff6187"
 			}
 
 		}, {
 			"path": "column-chart/column-chart",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor":"#f9cd98"
 			}
 
 		}, {
 			"path": "arcbar-chart/arcbar-chart",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor":"#419eea"
 			}
 
 		}, {
 			"path": "bar-chart/bar-chart",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor":"#5fb7ff"
 			}
 
 		}, {
 			"path": "mainradar-chart/mainradar-chart",
 			"style": {
 				"navigationBarTitleText": "",
-				"enablePullDownRefresh": false
+				"enablePullDownRefresh": false,
+				"navigationBarBackgroundColor":"#ff6187"
 			}
 
 		}]

pages/grade/grade.vue

@@ -2,26 +2,26 @@
 	<view class="chart-list-container">
 		<!-- 头部区域 -->
 		<top-box></top-box>
-		
+
 		<!-- 缩略图区域 -->
 		<view class="mini-chart-list">
-			
-			<view class="mini-chart-item" @click="navMainLineChart">
+
+			<view class="mini-chart-item">
 				<mainline-mini-chart></mainline-mini-chart>
 			</view>
-			
+
 			<view class="mini-chart-item" @click="navLineChart">
 				<line-mini-chart></line-mini-chart>
 			</view>
-			
+
 			<view class="mini-chart-item" @click="navAreaChart">
 				<area-mini-chart></area-mini-chart>
 			</view>
-			
+
 			<view class="mini-chart-item" @click="navColumnChart">
 				<column-mini-chart></column-mini-chart>
 			</view>
-			
+
 			<!-- 按钮区域 -->
 			<view class="mini-chart-item">
 				<view class="item-i" @click="navRoseChart">
@@ -32,7 +32,7 @@
 						</view>
 					</view>
 				</view>
-				
+
 				<view class="item-i" @click="navRadarChart">
 					<view class="item-container">
 						<view class="chart-name">
@@ -41,7 +41,7 @@
 						</view>
 					</view>
 				</view>
-				
+
 				<view class="item-i" @click="navArcbarChart">
 					<view class="item-container">
 						<view class="chart-name">
@@ -51,32 +51,23 @@
 					</view>
 				</view>
 			</view>
-			
-			
+
+
 			<view class="mini-chart-item" @click="navMainRadarChart">
 				<radar-mini-chart></radar-mini-chart>
-				
-				<!-- <view class="item-i" @click="navArcbarChart">
-					<view class="item-container">
-						<view class="chart-name">
-							<view class="t-icon t-icon-xtubiao-6"></view>
-							<text class="chart-name-text">排名分析</text>
-						</view>
-					</view>
-				</view> -->
-				
 			</view>
-			
+
 			<view class="mini-chart-item" @click="navBarChart">
 				<bar-mini-chart></bar-mini-chart>
 			</view>
-				
 		</view>
-			
-			
-			
-			
-			
+		<!-- 成绩表单 -->
+		<view class="table-card">
+			<view class="table-name">
+				<view class="t-icon t-icon-xtubiao-5"></view>
+				<text class="table-name-text">成绩概览</text>
+			</view>
+			<z-table class="table" :tableData="tableData" :columns="columns" stickSide="true" showBottomSum="true"></z-table>
 		</view>
 	</view>
 </template>
@@ -85,88 +76,147 @@
 	export default {
 		data() {
 			return {
-
+				tableData: [
+				{
+					'name':'数学',
+					'open':83,
+					'mid':95,
+					'final':96
+				},
+				{
+					'name':'语文',
+					'open':93,
+					'mid':90,
+					'final':96
+				},
+				{
+					'name':'英语',
+					'open':99,
+					'mid':82,
+					'final':96
+				},
+				{
+					'name':'体育',
+					'open':99,
+					'mid':97,
+					'final':96
+				},
+				{
+					'name':'科学',
+					'open':99,
+					'mid':92,
+					'final':96
+				},
+				{
+					'name':'思品',
+					'open':99,
+					'mid':94,
+					'final':96
+				}
+				],
+				columns: [
+					{
+						'title':'科目',
+						'key':'name',
+					},
+					{
+						'title':'开学',
+						'key':'open',
+					},
+					{
+						'title':'期中',
+						'key':'mid',
+					},
+					{
+						'title':'期末',
+						'key':'final',
+					}
+				]
+				
+				
 			}
 		},
 		mounted() {
 
 		},
 		methods: {
-			open(e){
+			open(e) {
 				console.log(e);
 			},
 			//导航柱状图页面
-			navColumnChart(e){
+			navColumnChart(e) {
 				console.log(e);
 				uni.navigateTo({
-					url:"/gradepkg/column-chart/column-chart"
+					url: "/gradepkg/column-chart/column-chart"
 				})
 			},
 			//导航面积折线图页面
-			navAreaChart(e){
+			navAreaChart(e) {
 				console.log(e);
 				uni.navigateTo({
-					url:"/gradepkg/area-chart/area-chart"
+					url: "/gradepkg/area-chart/area-chart"
 				})
 			},
 			//导航折线图页面
-			navLineChart(e){
+			navLineChart(e) {
 				console.log(e);
 				uni.navigateTo({
-					url:"/gradepkg/line-chart/line-chart"
+					url: "/gradepkg/line-chart/line-chart"
 				})
 			},
 			//导航玫瑰图页面
-			navRoseChart(e){
+			navRoseChart(e) {
 				console.log(e);
 				uni.navigateTo({
-					url:"/gradepkg/rose-chart/rose-chart"
+					url: "/gradepkg/rose-chart/rose-chart"
 				})
 			},
 			//导航雷达图页面
-			navRadarChart(e){
+			navRadarChart(e) {
 				console.log(e);
 				uni.navigateTo({
-					url:"/gradepkg/radar-chart/radar-chart"
+					url: "/gradepkg/radar-chart/radar-chart"
 				})
 			},
 			//导航到进度条页面
-			navArcbarChart(e){
+			navArcbarChart(e) {
 				console.log(e);
 				uni.navigateTo({
-					url:"/gradepkg/arcbar-chart/arcbar-chart"
+					url: "/gradepkg/arcbar-chart/arcbar-chart"
 				})
 			},
 			//导航到条状图页
-			navBarChart(e){
+			navBarChart(e) {
 				console.log(e);
 				uni.navigateTo({
-					url:"/gradepkg/bar-chart/bar-chart"
+					url: "/gradepkg/bar-chart/bar-chart"
 				})
 			},
 			//导航到学年雷达图页
-			navMainRadarChart(e){
+			navMainRadarChart(e) {
 				console.log(e);
 				uni.navigateTo({
-					url:"/gradepkg/mainradar-chart/mainradar-chart"
+					url: "/gradepkg/mainradar-chart/mainradar-chart"
 				})
 			}
-			
+
 		},
-		onLoad(){
-			
+		onLoad() {
+
 		}
 	}
 </script>
 
 <style lang="scss">
-	.chart-list-container{
+	.chart-list-container {
 		height: 100%;
 		overflow-x: hidden;
-		.home-topinfo{
+
+		.home-topinfo {
 			background: linear-gradient(#FFC600, #f1f3f5);
 		}
-		.mini-chart-list{
+
+		.mini-chart-list {
 			display: flex;
 			flex-direction: row;
 			justify-content: center;
@@ -174,26 +224,30 @@
 			flex-wrap: wrap;
 			margin: -100rpx 22rpx 0 22rpx;
 			justify-content: space-between;
-			
-			.mini-chart-item{
+
+			.mini-chart-item {
 				margin-top: 22rpx;
 				display: flex;
 				flex-direction: column;
 				justify-content: space-between;
-				.item-i{
+
+				.item-i {
 					margin: -10rpx 0;
-					.item-container{
+
+					.item-container {
 						border-radius: 20rpx;
 						background-color: #FFFFFF;
-						box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.05);
+						box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
 						width: 340rpx;
 						height: auto;
+
 						.chart-name {
 							display: flex;
 							align-items: center;
 							justify-content: flex-start;
 							width: 100%;
 							margin: 20rpx 0rpx 20rpx 40rpx;
+
 							.chart-name-text {
 								margin: 26rpx;
 								font-size: 30rpx;
@@ -202,12 +256,41 @@
 							}
 						}
 					}
-				.t-icon{
+
+					.t-icon {
 						width: 40rpx;
 						height: 40rpx;
+					}
+				}
+			}
+		}
+		.table-card{
+			margin: 40rpx 22rpx;
+			border-radius: 16rpx;
+			display: flex;
+			align-items: center;
+			justify-content: center;
+			flex-direction: column;
+			background-color: #FFFFFF;
+			box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.05);
+			
+			.table-name{
+				width: 100%;
+				text-align: left;
+				margin: 20rpx 0 0 50rpx;
+				display: flex;
+				align-items: center;
+				font-weight: bold;
+				color: #3B4144;
+				.table-name-text {
+					font-size: 30rpx;
+					margin-left: 20rpx;
 				}
 			}
+			.table{
+				margin: 20rpx;
+				width: 90%;
+			}
 		}
 	}
-}
 </style>

pages/home/home.vue

@@ -1,25 +1,24 @@
 <template>
 	<view class="home-container">
+		<view class="bg1"></view>
 		<!-- 头部区域 -->
 		<top-box></top-box>
-		<mainline-chart class="main-chart"></mainline-chart>
-		
-		
 		<!-- 滚动条 -->
 		<view class="notice">
 			<u-notice-bar :text="notification" mode="closable" bgColor="#6495ED" color="#FFFFFF"></u-notice-bar>
 		</view>
-		
-		<!-- 成绩表单 -->
-		<view class="table-card">
-			<view class="table-name">
-				<text class="table-name-text">成绩概览</text>
-			</view>
-			<z-table class="table" :tableData="tableData" :columns="columns" stickSide="true" showBottomSum="true"></z-table>
+		<!-- 孩子全方位展示 -->
+		<view class="develop-box">
+				<view class="develop-item" v-for="(item, index) in model" :key="index">
+					<view class="desc">{{item}}</view>
+					<view class="icon-item">
+						<view class="t-icon t-icon-jiaoyan"></view>
+					</view>
+				</view>
 		</view>
 		
-
-	</view>
+		
+		
 	</view>
 </template>
 
@@ -29,64 +28,11 @@
 	export default {
 		data() {
 			return {
-				notification: '这里是滚动条的内容，显示重要通知等等消息',		
+				notification: '这里是滚动条的内容，显示重要通知等等消息',
+				model: ['德','智','体','美','劳']
+				
+				
 				
-				tableData: [
-				{
-					'name':'数学',
-					'open':83,
-					'mid':95,
-					'final':96
-				},
-				{
-					'name':'语文',
-					'open':93,
-					'mid':90,
-					'final':96
-				},
-				{
-					'name':'英语',
-					'open':99,
-					'mid':82,
-					'final':96
-				},
-				{
-					'name':'体育',
-					'open':99,
-					'mid':97,
-					'final':96
-				},
-				{
-					'name':'科学',
-					'open':99,
-					'mid':92,
-					'final':96
-				},
-				{
-					'name':'思品',
-					'open':99,
-					'mid':94,
-					'final':96
-				}
-				],
-				columns: [
-					{
-						'title':'科目',
-						'key':'name',
-					},
-					{
-						'title':'开学',
-						'key':'open',
-					},
-					{
-						'title':'期中',
-						'key':'mid',
-					},
-					{
-						'title':'期末',
-						'key':'final',
-					}
-				]
 				
 			}
 		},
@@ -110,87 +56,13 @@
 <style lang="scss">
 	.home-container {
 		height: 100%;
-
-		.main-chart{
-			width: 100%;
-			margin-top: -60rpx;
-		}
-		
-
-		.steps-box {
-			margin: -110rpx 34rpx 20rpx 34rpx;
-		}
 		.notice{
-			margin: -5px 17px 10px 17px;
+			margin: -80rpx 20rpx 20rpx 20rpx;
 		}
-
-		.home-card {
-			margin: 10px 17px 17px 17px;
-			background-color: #FFFFFF;
-			flex: 1 1 auto;
-			box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+		.develop-box{
 			display: flex;
-			flex-direction: column;
-			border-radius: 10px;
-			padding: 3px;
-
-
-			.card-edit{
-				width: 100%;
-				display: flex;
-				justify-content: space-between;
-				
-				.card-title {
-					font-size: 15px;
-					margin: 12px;
-					font-weight: bold;
-					color: #3B4144;
-				}
-				.card-button{
-					margin: 10px;
-					width: 80px;
-					height: 30px;
-					font-size: 13px;
-					background-color: #6495ED;
-					color: #FFFFFF;
-				}
-			}
-
-			.card-content {
-				table-layout: fixed;
-				font-size: 13px;
-				margin: 0px 12px 12px 12px;
-				word-wrap: break-word;
-				word-break: normal;
-				overflow: hidden;
-				color: #3B4144;
-			}
-		}
-		.table-card{
-			margin: 20px 17px;
-			border-radius: 8px;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			flex-direction: column;
-			background-color: #FFFFFF;
-			box-shadow: 0 4px 8px rgba(0,0,0,0.1);
 			
-			.table-name{
-				width: 100%;
-				text-align: left;
-				margin: 10px 0 0 33px;
-				font-weight: bold;
-				color: #3B4144;
-				.table-name-text {
-					font-size: 13px;
-				}
-			}
-			.table{
-				margin: 10px;
-				width: 90%;
-			}
 		}
-
+		
 	}
 </style>

pages/my/my.vue

@@ -34,23 +34,6 @@
 							</view>
 						</view>
 					</view>
-					<!-- <view class="cart-big" @click="updateChildrenInfo">
-						<image class="cart-icon" src="/static/my-icons/boy-my.png" mode="aspectFill"></image>
-						<text class="cart-text">孩子信息</text>
-					</view>
-					
-					<view class="cart-small">
-						<view class="cart-item" @click="show = true">
-							<image class="cart-icon-sim" src="/static/my-icons/childrenmessage.png"></image>
-							<text class="cart-text-sim">学习打卡</text>
-						</view>
-						
-						<view class="cart-item" @click="chooseChildren">
-							<image class="cart-icon-sim" src="/static/my-icons/mychildren.png" mode="aspectFill"></image>
-							<text class="cart-text-sim">孩子管理</text>
-						</view>
-						
-					</view> -->
 				</view>
 				
 				<!-- 用户功能 -->
@@ -183,7 +166,7 @@
 			right: -280rpx;
 			width: 700rpx;
 			height: 700rpx;
-			margin-right: 250px;
+			margin-right: 500rpx;
 			border-radius: 100%;
 			background-color: #6495ed;
 			z-index: -1;
@@ -207,27 +190,27 @@
 			align-items: center;
 
 			.parent-avatar {
-				margin-top: 11px;
-				margin-left: 20px;
-				width: 60px;
-				height: 60px;
-				border-radius: 35px;
-				border: 3px solid #FFFFFF;
-				box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+				margin-top: 40rpx;
+				margin-left: 40rpx;
+				width: 120rpx;
+				height: 120rpx;
+				border-radius: 70rpx;
+				border: 6rpx solid #FFFFFF;
+				box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.2);
 			}
 
 			.parent-name {
-				margin-top: 10px;
-				margin-left: 10px;
+				margin-top: 20rpx;
+				margin-left: 20rpx;
 				display: flex;
 				flex-direction: column;
 				font-weight: bold;
 
 				.name {
 					color: #000000;
-					font-size: 16px;
+					font-size: 32rpx;
 					font-weight: bold;
-					margin: 2px 0px 0px 5px;
+					margin: 4rpx 0 0 10rpx;
 				}
 				
 				.u-tag{
@@ -236,25 +219,25 @@
 					line-height: 36rpx;
 					
 					.u-tag__text{
-						font-size: 12px !important;
+						font-size: 24rpx !important;
 					}
 				}
 
 				.detail {
-					height: 10px;
-					font-size: 12px;
-					margin: 5px 0px 0px 5px;
+					height: 20rpx;
+					font-size: 24rpx;
+					margin: 10rpx 0 0 10rpx;
 				}
 			}
 
 			.parent-avatar {
-				margin-top: 11px;
-				margin-left: 20px;
-				width: 60px;
-				height: 60px;
-				border-radius: 35px;
-				border: 3px solid #FFFFFF;
-				box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+				margin-top: 22rpx;
+				margin-left: 40rpx;
+				width: 120rpx;
+				height: 120rpx;
+				border-radius: 70rpx;
+				border: 6rpx solid #FFFFFF;
+				box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.2);
 			}
 		}
 		.userinfo-container{
@@ -283,7 +266,7 @@
 							margin-right: 20rpx;
 						}
 						.card-text{
-							font-size: 16px;
+							font-size: 32rpx;
 							font-weight: bolder;
 							margin: 20rpx 0;
 							color: #616161;
@@ -291,7 +274,7 @@
 							.card-des{
 								margin-top: 10rpx;
 								font-weight: 400;
-								font-size: 12px;
+								font-size: 24rpx;
 								color: #a6aaaf;
 							}
 						}

subpkg/guide/guide.vue

@@ -38,7 +38,7 @@
 		},
 		onLoad(){
 			//判断用户信息
-			this.hasParentInfo()
+			this.hasParentDetail()
 		},
 		methods:{
 			...mapMutations('m_children',['updateChildrenInfo']),
@@ -54,7 +54,7 @@
 			},
 			
 			//判断用户基本信息是否存在
-			hasParentInfo(){
+			hasParentDetail(){
 				if(uni.getStorageSync('parentdetail'))
 					this.show = true
 				else

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

@@ -133,10 +133,10 @@ const cfu = {
 			"#ff55a3"
 		],
 		"padding": [
-			5,
-			5,
-			5,
-			5
+			-20,
+			-10,
+			-10,
+			-10
 		],
 		"rotate": false,
 		"errorReload": true,
@@ -214,11 +214,6 @@ const cfu = {
 			"#91CB74",
 			"#FAC858",
 			"#EE6666",
-			"#73C0DE",
-			"#3CA272",
-			"#FC8452",
-			"#9A60B4",
-			"#ea7ccc"
 		],
 		"rotate": false,
 		"errorReload": true,
@@ -232,18 +227,14 @@ const cfu = {
 		"dataPointShapeType": "solid",
 		"tapLegend": true,
 		"title": {
-			"name": "百分比",
+			"name": "孩子",
 			"fontSize": 25,
-			"color": "#65c7f7",
-			"offsetX": 0,
-			"offsetY": 0
+			"color": "#0052d4",
 		},
 		"subtitle": {
-			"name": "默认标题",
+			"name": "排名百分比",
 			"fontSize": 15,
 			"color": "#666666",
-			"offsetX": 0,
-			"offsetY": 0
 		},
 		"extra": {
 			"arcbar": {
@@ -525,9 +516,9 @@ const cfu = {
 		],
 		"padding": [
 			1,
-			15,
-			3,
-			3
+			20,
+			5,
+			5
 		],
 		"rotate": false,
 		"errorReload": true,
@@ -678,7 +669,7 @@ const cfu = {
 			"rotateLabel": false,
 			"labelCount": 6,
 			"itemCount": 5,
-			"boundaryGap": "justify",
+			"boundaryGap": "center",
 			"disableGrid": true,
 			"gridColor": "#CCCCCC",
 			"gridType": "solid",