2.17

components/arcbar-mini-chart/arcbar-mini-chart.vue

@@ -0,0 +1,72 @@
+<template>
+	<view class="chart-container">
+		<view class="chart-name">
+			<view class="t-icon t-icon-xtubiao-4"></view>
+			<text class="chart-name-text">排名占比</text>
+		</view>
+		
+		<view class="charts-box">
+		  <qiun-data-charts
+		    type="arcbar"
+		    :chartData="chartData"
+		    :loadingType="4"
+				:title.name="series.name"
+		    background="none"
+		  />
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name:"arcbar-mini-chart",
+		data() {
+			return {
+				chartData:{
+				  series:[ {
+				    "data": 0.88,
+				    "color": "#0052d4"
+				}],
+				},
+				
+				
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+.chart-container {
+		border-radius: 20rpx;
+		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);
+		width: 340rpx;
+	
+		.chart-name {
+			display: flex;
+			align-items: center;
+			justify-content: flex-start;
+			width: 100%;
+			margin: 20rpx 0 20rpx 40rpx;
+			
+			.chart-name-text {
+				margin-left: 20rpx;
+				font-size: 30rpx;
+				font-weight: bold;
+				color: #3B4144;
+			}
+		}
+	.charts-box{
+		width: 100%;
+		height: 240rpx;
+	}
+}
+.t-icon{
+		width: 40rpx;
+		height: 40rpx;
+	}
+</style>

components/area-mini-chart/area-mini-chart.vue

@@ -75,13 +75,13 @@
 
 <style lang="scss">
 .chart-container {
-		border-radius: 10px;
+		border-radius: 20rpx;
 		display: flex;
 		align-items: center;
 		justify-content: center;
 		flex-direction: column;
 		background-color: #FFFFFF;
-		box-shadow: 0 2px 4px rgba(0,0,0,0.05);
+		box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.05);
 		width: 340rpx;
 	
 		.chart-name {
@@ -89,11 +89,11 @@
 			align-items: center;
 			justify-content: flex-start;
 			width: 100%;
-			margin: 10px 0px 10px 20px;
+			margin: 20rpx 0 20rpx 40rpx;
 			
 			.chart-name-text {
-				margin-left: 10px;
-				font-size: 15px;
+				margin-left: 20rpx;
+				font-size: 30rpx;
 				font-weight: bold;
 				color: #3B4144;
 			}
@@ -104,7 +104,7 @@
 	}
 }
 .t-icon{
-		width: 20px;
-		height: 20px;
+		width: 40rpx;
+		height: 40rpx;
 	}
 </style>

components/column-chart/column-chart.vue

@@ -1,86 +0,0 @@
-<template>
-	<view class="chart-container">
-		<view class="chart-name">
-			<text class="chart-name-text">近期成绩对比</text>
-		</view>
-		<view class="charts-box">
-			<qiun-data-charts type="column" :chartData="chartData" :loadingType="4" background="none" />
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "column-chart",
-		data() {
-			return {
-				chartData: {
-					categories: [
-						"数学",
-						"语文",
-						"英语",
-						"体育",
-						"科学",
-						"思品"
-					],
-					series: [{
-							"name": "最近成绩",
-							"data": [
-								91,
-								92,
-								94,
-								88,
-								82,
-								89
-							]
-						},
-						{
-							"name": "上次成绩",
-							"data": [
-								88,
-								84,
-								97,
-								92,
-								89,
-								81
-							]
-						}
-					],
-				},
-			};
-		}
-	}
-</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);
-	
-		.chart-name {
-			width: 100%;
-			text-align: left;
-			margin-left: 30px;
-			margin-top: 8px;
-			font-weight: bold;
-			color: #3B4144;
-	
-			.chart-name-text {
-				font-size: 13px;
-			}
-		}
-	
-		/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
-		.charts-box {
-			width: 100%;
-			height: 190px;
-		}
-	}
-</style>

components/line-chart/line-chart.vue

@@ -1,93 +0,0 @@
-<template>
-	<view class="chart-container">
-		<view class="chart-name">
-			<text class="chart-name-text">总成绩对比</text>
-		</view>
-		<view class="charts-box">
-			<qiun-data-charts type="line" :chartData="chartData" :loadingType="4"/>
-		</view>
-	</view>
-</template>
-
-<script>
-	export default {
-		name: "line-chart",
-		data() {
-			return {
-				chartData: {
-					categories: [
-						"测验1",
-						"测验2",
-						"测验3",
-						"测验4",
-						"测验5",
-					],
-					series: [{
-							"name": "孩子总分",
-							"data": [
-								400,
-								390,
-								380,
-								399,
-								366,
-							]
-						},
-						{
-							"name": "班级平均分",
-							"data": [
-								360,
-								377,
-								355,
-								322,
-								338,
-							]
-						},
-						{
-							"name": "年级平均分",
-							"data": [
-								333,
-								346,
-								364,
-								347,
-								355,
-							]
-						}
-					],
-				},
-			};
-		}
-	}
-</script>
-
-<style lang="scss">
-	.chart-container {
-		margin: 20px 10px;
-		padding: 4px 4px 4px 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);
-
-		.chart-name {
-			width: 100%;
-			text-align: left;
-			margin-left: 30px;
-			margin-top: 8px;
-			font-weight: bold;
-			color: #3B4144;
-
-			.chart-name-text {
-				font-size: 13px;
-			}
-		}
-
-		/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
-		.charts-box {
-			width: 100%;
-			height: 190px;
-		}
-	}
-</style>

components/bar-chart/bar-chart.vue

@@ -11,7 +11,7 @@
 
 <script>
 	export default {
-		name: "bar-chart",
+		name: "mainbar-chart",
 		data() {
 			return {
 				chartData: {

components/mini-userinfo/mini-userinfo.vue

@@ -1,252 +0,0 @@
-<template>
-	<view class="userinfo-container">
-			
-			<!-- 面板区域 -->
-			<view class="box-cart" >
-				<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>
-			
-			<!-- 用户功能 -->
-			<view class="com-item">
-				<view class="com-box">
-					<view class="cell">
-						<view class="cell-left">
-							<view class="t-icon t-icon-order_dingdan" ></view>
-							<view class="cell-text">个人信息</view>
-						</view>
-					</view>
-					<view class="cell">
-						<view class="cell-left">
-							<view class="t-icon t-icon-comment_wodepinglun" ></view>
-							<view class="cell-text">我的消息</view>
-						</view>
-					</view>
-					<view class="cell" @click="logout">
-						<view class="cell-left">
-							<view class="t-icon t-icon-Setting_shezhi"></view>
-							<view class="cell-text">退出登录</view>
-						</view>
-					</view>
-				</view>
-			</view>
-	
-			<!-- 用户服务 -->
-			<view class="com-item">
-				<view class="com-box">
-					<view class="cell">
-						<view class="cell-left">
-							<view class="t-icon t-icon-integration_jifen"></view>
-							<view class="cell-text">客服中心</view>
-						</view>
-					</view>
-					<view class="cell">
-						<view class="cell-left">
-							<view class="t-icon t-icon-question_wodewenda"></view>
-							<view class="cell-text">帮助中心</view>
-						</view>
-					</view>
-					<view class="cell">
-						<view class="cell-left">
-							<view class="t-icon t-icon-contract_hetong"></view>
-							<view class="cell-text">用户协议</view>
-						</view>
-					</view>
-				</view>
-			</view>
-			<!-- 日历组件 -->
-			<u-calendar :show="show" mode="single" @confirm="confirm"></u-calendar>
-			
-	</view>
-</template>
-
-<script>
-	import { mapState,mapMutations } from 'vuex'
-	
-	export default {
-		computed:{
-			...mapState('m_parent',['parentinfo','parentdetail']),
-			...mapState('m_children',['childreninfo'])
-		},
-		name: 'mini-userinfo',
-		
-		data() {
-			return {
-				
-				show: false,
-				
-			};
-		},
-		methods:{
-			...mapMutations('m_parent',['updateParentDetail','updateParentInfo','updateToken']),
-			...mapMutations('m_children',['updateChildrenInfo']),
-			//日历事件
-			confirm(e){
-				console.log('confirm',e)
-				uni.$showMsg('打卡成功!')
-				this.show = false
-			},
-			
-			//退出登录
-			async logout(){
-				const [err,succ] = await uni.showModal({
-					title: '提示',
-					content: '确认退出登录吗?'
-				}).catch(err => err)
-				if(succ && succ.confirm)
-				{
-					this.updateChildrenInfo()
-					// this.updateParentDetail()
-					this.updateParentInfo()
-					this.updateToken()
-					
-					uni.reLaunch({
-						url:'/subpkg/login/login'
-					})
-				}
-			},
-			//切换孩子
-			chooseChildren(){
-				// if(parentdetail.childrenList.length == 1)
-				// return uni.showMsg('您只有一个孩子，不能切换')
-				uni.navigateTo({
-					url: '/subpkg/guide/guide'
-				})
-			},
-			//修改孩子信息
-			updateChildrenInfo(e){
-				console.log(e);
-			}
-			
-		}
-	}
-</script>
-
-<style lang="scss">
-.userinfo-container{
-		height: 100%;
-		
-		// 面板区域
-		.box-cart{
-			margin: -100rpx 20rpx 20rpx 20rpx;
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			justify-content: space-around;
-			
-			.cart-big{
-				border-radius: 15rpx;
-				width: 80px;
-				height: 120px;
-				overflow: hidden;
-				margin: 10px 0 10px 0;
-				display: flex;
-				flex-direction: column;
-				justify-content: center;
-				align-items: center;
-				background-color: #FFFFFF;
-				box-shadow: 0 2px 4px rgba(0,0,0,0.05);
-				
-				.cart-icon{
-					width: 55px;
-					height: 80px;
-					margin: 10px 10px 0px 10px;
-				}
-				.cart-text{
-					margin: 10px;
-					font-size: 15px;
-				}
-			}
-			
-			.cart-small{
-				width: 65%;
-				height: 130px;
-				display: flex;
-				flex-direction: column;
-				justify-content: space-around;
-				
-				.cart-item{
-					height: 35px;
-					background-color: #FFFFFF;
-					display: flex;
-					flex-direction: row;
-					align-items: center;
-					padding: 10px;
-					border-radius: 15rpx;
-					overflow: hidden;
-					box-shadow: 0 2px 4px rgba(0,0,0,0.05);
-					
-					.cart-icon-sim{
-						width: 50rpx;
-						height: 50rpx;
-						margin: 10px;
-					}
-					.cart-text-sim{
-						margin: 10px;
-						font-size: 15px;
-						color: #3B4144;
-					}
-				}
-			}
-		}
-		// 功能列表
-		.com-item {
-				margin-top: 20rpx;
-		
-				.com-box {
-					overflow: hidden;
-				}
-			}
-		
-			.cell {
-				height: 80rpx;
-				padding-left: 20rpx;
-				padding-right: 20rpx;
-				display: flex;
-				justify-content: space-between;
-				align-items: center;
-				background: #fff;
-				border-bottom: 1px solid #f8f8f8;
-		
-				&:active {
-					background: #f2f2f2;
-				}
-		
-				&:last-child {
-					border-bottom: none !important;
-				}
-		
-				.cell-left {
-					display: flex;
-					align-items: center;
-					padding-left: 20rpx;
-		
-					.cell-icon {
-						width: 50rpx;
-						height: 50rpx;
-					}
-		
-					.cell-text {
-						color: #666;
-						font-size: 28rpx;
-						margin-left: 20rpx;
-					}
-				}
-			}
-	}
-</style>

components/top-box/top-box.vue

@@ -5,13 +5,23 @@
 			<image class="children-avatar" :src="childreninfo.avatar" @click="showChildrenList"></image>
 			<view class="children-name">
 				<text class="name">{{childreninfo.name}}</text>
-				<text class="detail">{{childreninfo.className}}</text>
+				<view class="detail-box">
+					<text class="detail">{{childreninfo.className}}</text>
+					<!-- 选择学期 -->
+					<view class="select-box">
+						<u-picker :show="select" :columns="semester" ref="uPicker" @confirm="selectemester" @change="changeHandler"></u-picker>
+						<!-- <u-button class="select-btn" @click="select = true" size="small" shape="circle">学期</u-button> -->
+					</view>
+				</view>
 			</view>
 		</view>
 		<!-- 切换孩子 -->
 		<view class="list-box" v-show="show">
 			<view class="children-item" v-for="(item,index) in parentdetail.childrenList" :key="index" @click="switchChildren(item)">
-				<image class="children-avatar-item" :src="item.avatar"></image>
+				<view class="item-box">
+					<image class="item-avatar" :src="item.avatar"></image>
+					<text class="item-text">{{item.name}}</text>
+				</view>
 			</view>
 		</view>
 		
@@ -28,7 +38,15 @@
 		name: "top-box",
 		data() {
 			return {
+				
 				show: false,
+				
+				select: false,
+				semester:[
+					['19学年','20学年','21学年','22学年']
+				],
+				
+				
 			};
 		},
 		computed: {
@@ -38,9 +56,17 @@
 		methods: {
 			...mapMutations('m_children',['updateChildrenInfo']),
 			
+			//学期选择
+			selectemester(e){
+				console.log('selectemester',e)
+				uni.$showMsg('切换完成')
+				this.select = false
+			},
+			
+			//头部孩子选择
 			showChildrenList(e){
 				console.log('chooseChildren' + e)
-				this.show = true
+				this.show = !this.show
 			},
 			switchChildren(item){
 				console.log(item);
@@ -60,47 +86,58 @@
 		align-items: center;
 
 		.children-avatar {
-			margin-top: 11px;
-			margin-left: 20px;
-			width: 48px;
-			height: 48px;
-			border-radius: 25px;
-			border: 2px solid #FFFFFF;
-			box-shadow: 0 5px 10px rgba(0, 0, 0, 0.2);
+			margin-top: 22rpx;
+			margin-left: 40rpx;
+			width: 96rpx;
+			height: 96rpx;
+			border-radius: 50rpx;
+			border: 4rpx solid #FFFFFF;
+			box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.2);
 
 		}
 
 		.children-name {
-			margin-top: 12px;
-			margin-left: 10px;
+			margin-top: 24rpx;
+			margin-left: 20rpx;
 			display: flex;
 			flex-direction: column;
 
 			.name {
-				color: #6b778d;
-				font-size: 15px;
-				margin: 2px 0px 0px 5px;
+				color: #3B4144;
+				font-size: 32rpx;
+				margin: 4rpx 0 0 10rpx;
 				font-weight: bold;
 			}
-
 			.detail {
-				color: #3B4144;
+				color: #6b778d;
 				font-weight: bold;
-				margin: 5px 0px 0px 5px;
+				font-size: 28rpx;
+				margin: 10rpx 0rpx 0 10rpx;
 			}
 		}
 	}
 	.list-box{
-		margin: -120rpx 20px 60px 15px;
+		margin: -120rpx 40rpx 120rpx 30rpx;
 		display: flex;
 		flex-wrap: wrap;
 		.children-item{
-			margin: 0px 5px 0 5px;
-			.children-avatar-item{
-				width: 48px;
-				height: 48px;
-				border-radius: 25px;
-				border: 2px solid #FFFFFF;
+			margin: 0 10rpx 0 10rpx;
+			.item-box{
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+				.item-avatar{
+					width: 90rpx;
+					height: 90rpx;
+					border-radius: 50rpx;
+					border: 4rpx solid #FFFFFF;
+				}
+				.item-text{
+					font-size: 24rpx;
+					font-weight: bold;
+					color: #6b778d;
+				}
 			}
 		}
 	}

gradepkg/arcbar-chart/arcbar-chart.vue

@@ -0,0 +1,63 @@
+<template>
+	<view class="chart-container">
+		<view class="chart-name">
+			<text class="chart-name-text">排名占比</text>
+		</view>
+		<view class="charts-box">
+		  <qiun-data-charts
+		    type="arcbar"
+		    :chartData="chartData"
+		    :loadingType="4"
+		  />
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				chartData:{
+				  series:[ {
+            "name": "排名",
+            "data": 0.88,
+            "color": "#0052d4"
+        }],
+				},
+			};
+		}
+	}
+</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;
+			}
+		}
+	
+		/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
+		.charts-box {
+			width: 100%;
+			height: 600rpx;
+		}
+	}
+</style>

gradepkg/area-chart/area-chart.vue

@@ -119,7 +119,7 @@
 		/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
 		.charts-box {
 			width: 100%;
-			height: 190px;
+			height: 600rpx;
 		}
 	}
 </style>

gradepkg/column-chart/column-chart.vue

@@ -55,33 +55,33 @@
 
 <style lang="scss">
 .chart-container {
-		margin: 20px 10px;
-		padding: 5px 5px 5px 2px;
-		border-radius: 15px;
+		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 2px 4px rgba(0,0,0,0.1);
+		box-shadow: 0 4rpx 8rpx rgba(0,0,0,0.1);
 	
 		.chart-name {
 			width: 100%;
 			text-align: left;
-			margin-left: 30px;
-			margin-top: 8px;
+			margin-left: 60rpx;
+			margin-top: 16rpx;
 			font-weight: bold;
 			color: #3B4144;
 	
 			.chart-name-text {
-				font-size: 13px;
+				font-size: 26rpx;
 			}
 		}
 	
 		/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
 		.charts-box {
 			width: 100%;
-			height: 190px;
+			height: 600rpx;
 		}
 	}
 </style>

gradepkg/line-chart/line-chart.vue

@@ -86,7 +86,7 @@
 		/* 请根据需求修改图表容器尺寸，如果父容器没有高度图表则会显示异常 */
 		.charts-box {
 			width: 100%;
-			height: 190px;
+			height: 600rpx;
 		}
 	}
 

gradepkg/radar-chart/radar-chart.vue

@@ -107,7 +107,7 @@
 
 		.charts-box {
 			width: 100%;
-			height: 200px;
+			height: 700rpx;
 		}
 	}
 </style>

gradepkg/rose-chart/rose-chart.vue

@@ -86,7 +86,7 @@
 		}
 		.charts-box {
 			width: 100%;
-			height: 800rpx;
+			height: 700rpx;
 		}
 	}
 </style>

pages.json

@@ -91,7 +91,16 @@
 				"enablePullDownRefresh": false
 			}
 
-		}]
+		}    ,{
+                    "path" : "arcbar-chart/arcbar-chart",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
 	}],
 	"preloadRule": {
 		"subpkg/login/login": {

pages/grade/grade.vue

@@ -31,13 +31,15 @@
 				</view>
 			</view>
 			
+			<view class="mini-chart-item">
+				<arcbar-mini-chart></arcbar-mini-chart>
+			</view>
+			
 			
 		</view>
 		
 		<view class="chart-card">
-			<line-chart></line-chart>
-			<column-chart></column-chart>
-			<bar-chart></bar-chart>
+			<mainbar-chart></mainbar-chart>
 		</view>
 		
 	</view>

pages/home/home.vue

@@ -31,7 +31,7 @@
 		
 		<!-- 目标图表 -->
 		<view class="chart-card">
-			<bar-chart class="home-bar-chart"></bar-chart>
+			<mainbar-chart class="home-bar-chart"></mainbar-chart>
 		</view>
 		
 		

pages/my/my.vue

@@ -10,16 +10,88 @@
 				<text class="detail" @click="getUserInfo">{{childreninfo.name + '家长'}}</text>
 			</view>
 		</view>
+		
+		
 		<!-- 功能组件 -->
-		<mini-userinfo v-if="parentdetail"></mini-userinfo>
+		<view class="userinfo-container">
+				
+				<!-- 面板区域 -->
+				<view class="box-cart" >
+					<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>
+				
+				<!-- 用户功能 -->
+				<view class="com-item">
+					<view class="com-box">
+						<view class="cell">
+							<view class="cell-left">
+								<view class="t-icon t-icon-order_dingdan" ></view>
+								<view class="cell-text">个人信息</view>
+							</view>
+						</view>
+						<view class="cell">
+							<view class="cell-left">
+								<view class="t-icon t-icon-comment_wodepinglun" ></view>
+								<view class="cell-text">我的消息</view>
+							</view>
+						</view>
+						<view class="cell" @click="logout">
+							<view class="cell-left">
+								<view class="t-icon t-icon-Setting_shezhi"></view>
+								<view class="cell-text">退出登录</view>
+							</view>
+						</view>
+					</view>
+				</view>
+		
+				<!-- 用户服务 -->
+				<view class="com-item">
+					<view class="com-box">
+						<view class="cell">
+							<view class="cell-left">
+								<view class="t-icon t-icon-integration_jifen"></view>
+								<view class="cell-text">客服中心</view>
+							</view>
+						</view>
+						<view class="cell">
+							<view class="cell-left">
+								<view class="t-icon t-icon-question_wodewenda"></view>
+								<view class="cell-text">帮助中心</view>
+							</view>
+						</view>
+						<view class="cell">
+							<view class="cell-left">
+								<view class="t-icon t-icon-contract_hetong"></view>
+								<view class="cell-text">用户协议</view>
+							</view>
+						</view>
+					</view>
+				</view>
+				<!-- 日历组件 -->
+				<u-calendar class="calendar" :show="show" mode="single" @confirm="confirm"></u-calendar>
+				
+		</view>
 	</view>
 </template>
 
 <script>
-	import {
-		mapState,
-		mapMutations
-	} from 'vuex'
+	import { mapState,mapMutations } from 'vuex'
 
 	export default {
 		computed: {
@@ -29,13 +101,50 @@
 
 		data() {
 			return {
-
+				show: false,
 			};
 		},
 		onLoad() {},
 		methods: {
-			...mapMutations('m_parent', ['updateParentInfo']),
-
+			...mapMutations('m_parent',['updateParentDetail','updateParentInfo','updateToken']),
+			...mapMutations('m_children',['updateChildrenInfo']),
+			//日历事件
+			confirm(e){
+				console.log('confirm',e)
+				uni.$showMsg('打卡成功!')
+				this.show = false
+			},
+			//退出登录事件
+			async logout(){
+				const [err,succ] = await uni.showModal({
+					title: '提示',
+					content: '确认退出登录吗?'
+				}).catch(err => err)
+				if(succ && succ.confirm)
+				{
+					this.updateChildrenInfo()
+					// this.updateParentDetail()
+					this.updateParentInfo()
+					this.updateToken()
+					
+					uni.reLaunch({
+						url:'/subpkg/login/login'
+					})
+				}
+			},
+			//切换孩子
+			chooseChildren(){
+				// if(parentdetail.childrenList.length == 1)
+				// return uni.showMsg('您只有一个孩子，不能切换')
+				uni.navigateTo({
+					url: '/subpkg/guide/guide'
+				})
+			},
+			//修改孩子信息
+			updateChildrenInfo(e){
+				console.log(e);
+			},
+			//获取用户信息事件
 			async getUserInfo(e) {
 				console.log(e);
 				console.log(uni.getStorageSync('parentinfo'));
@@ -154,6 +263,120 @@
 				}
 			}
 		}
+		.userinfo-container{
+				height: 100%;
+				
+				// 面板区域
+				.box-cart{
+					margin: -100rpx 20rpx 20rpx 20rpx;
+					display: flex;
+					justify-content: center;
+					align-items: center;
+					justify-content: space-around;
+					
+					.cart-big{
+						border-radius: 15rpx;
+						width: 80px;
+						height: 120px;
+						overflow: hidden;
+						margin: 10px 0 10px 0;
+						display: flex;
+						flex-direction: column;
+						justify-content: center;
+						align-items: center;
+						background-color: #FFFFFF;
+						box-shadow: 0 2px 4px rgba(0,0,0,0.05);
+						
+						.cart-icon{
+							width: 55px;
+							height: 80px;
+							margin: 10px 10px 0px 10px;
+						}
+						.cart-text{
+							margin: 10px;
+							font-size: 15px;
+						}
+					}
+					
+					.cart-small{
+						width: 65%;
+						height: 130px;
+						display: flex;
+						flex-direction: column;
+						justify-content: space-around;
+						
+						.cart-item{
+							height: 35px;
+							background-color: #FFFFFF;
+							display: flex;
+							flex-direction: row;
+							align-items: center;
+							padding: 10px;
+							border-radius: 15rpx;
+							overflow: hidden;
+							box-shadow: 0 2px 4px rgba(0,0,0,0.05);
+							
+							.cart-icon-sim{
+								width: 50rpx;
+								height: 50rpx;
+								margin: 10px;
+							}
+							.cart-text-sim{
+								margin: 10px;
+								font-size: 15px;
+								color: #3B4144;
+							}
+						}
+					}
+				}
+				// 功能列表
+				.com-item {
+						margin-top: 20rpx;
+				
+						.com-box {
+							overflow: hidden;
+						}
+					}
+				
+					.cell {
+						height: 80rpx;
+						padding-left: 20rpx;
+						padding-right: 20rpx;
+						display: flex;
+						justify-content: space-between;
+						align-items: center;
+						background: #fff;
+						border-bottom: 1px solid #f8f8f8;
+				
+						&:active {
+							background: #f2f2f2;
+						}
+				
+						&:last-child {
+							border-bottom: none !important;
+						}
+				
+						.cell-left {
+							display: flex;
+							align-items: center;
+							padding-left: 20rpx;
+				
+							.cell-icon {
+								width: 50rpx;
+								height: 50rpx;
+							}
+				
+							.cell-text {
+								color: #666;
+								font-size: 28rpx;
+								margin-left: 20rpx;
+							}
+						}
+					}
+					.calendar{
+						z-index: 999;
+					}
+			}
 
 	}
 </style>

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

@@ -210,7 +210,7 @@ const cfu = {
 		"title": {
 			"name": "百分比",
 			"fontSize": 25,
-			"color": "#00FF00"
+			"color": "#0052d4"
 		},
 		"subtitle": {
 			"name": "默认标题",
@@ -268,7 +268,7 @@ const cfu = {
 			"rotateLabel": false,
 			"labelCount": 6,
 			"itemCount": 5,
-			"boundaryGap": "center",
+			"boundaryGap": "justify",
 			"disableGrid": true,
 			"gridColor": "#696969",
 			"gridType": "solid",
@@ -642,7 +642,7 @@ const cfu = {
 			"rotateLabel": false,
 			"labelCount": 6,
 			"itemCount": 5,
-			"boundaryGap": "center",
+			"boundaryGap": "justify",
 			"disableGrid": true,
 			"gridColor": "#CCCCCC",
 			"gridType": "solid",
@@ -731,10 +731,10 @@ const cfu = {
 			"#f9b248"
 		],
 		"padding": [
-			1,
-			2,
-			2,
-			2
+			0,
+			0,
+			0,
+			0
 		],
 		"rotate": false,
 		"errorReload": true,