3-15

common/style.scss

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

components/analysis-box/analysis-box.vue

@@ -112,7 +112,7 @@
 		.item-container {
 			display: flex;
 			align-items: center;
-			border-radius: 16rpx;
+			border-radius: $card-border-radius;
 			background-color: #FFFFFF;
 			// box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
 			width: 100%;
@@ -138,7 +138,7 @@
 	.nosub-box {
 		display: flex;
 		flex-direction: column;
-		border-radius: 16rpx;
+		border-radius: $card-border-radius;
 		background: $card-back-base64;
 		background-size: cover; //背景图片自适应
 		// box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);

components/back/back.vue

@@ -51,6 +51,7 @@
 		padding: 0 0 120rpx 20rpx;
 		display: flex;
 		align-items: center;
+		z-index: 99;
 
 		.t-icon {
 			width: 45rpx;
@@ -58,7 +59,7 @@
 		}
 		
 		.back-text{
-			font-size: 48rpx;
+			font-size: 40rpx;
 			margin-left: 20rpx;
 		}
 	}

components/todaydata-box/todaydata-box.vue

@@ -7,7 +7,7 @@
 
 		<!-- 记录模块 -->
 		<view class="module-box" v-if="current == 0">
-			<view class="module-item" @click="studyTimePicker = true">
+			<view class="module-item" style="background-color: #5b7cff;" @click="studyTimePicker = true">
 				<view class="module-item-box">
 					<text class="module-item-text">自主学习记录</text>
 					<view class="num-box">
@@ -64,9 +64,9 @@
 			<view class="card-item" style="width: 710rpx;">
 				<view class="card-info">
 					<view class="t-icon t-icon-jiaoshidaka"></view>
-					<text class="info-text">本周学习记录</text>
+					<text class="info-text">近七天学习记录</text>
 				</view>
-				<view style="width: 100%; height: 500rpx; margin-top: -30rpx;">
+				<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}}}" />
 				</view>
@@ -75,9 +75,9 @@
 			<view class="card-item">
 				<view class="card-info">
 					<view class="t-icon t-icon-jiankangshangbao"></view>
-					<text class="info-text">本周运动</text>
+					<text class="info-text">近七天运动</text>
 				</view>
-				<view style="width: 100%; height: 350rpx; margin-top: -10rpx;">
+				<view class="charts-box">
 					<qiun-data-charts type="pie" :chartData="todayData.exercisePie" :loadingType="4" :canvas2d='true'
 						canvasId='canvans8121' />
 				</view>
@@ -86,9 +86,9 @@
 			<view class="card-item">
 				<view class="card-info">
 					<view class="t-icon t-icon-jiankangshangbao"></view>
-					<text class="info-text">本周睡眠</text>
+					<text class="info-text">近七天睡眠</text>
 				</view>
-				<view style="width: 100%; height: 350rpx; margin-top: -10rpx;">
+				<view class="charts-box">
 					<qiun-data-charts type="ring" :chartData="todayData.sleepRing" :loadingType="4" :canvas2d='true'
 						canvasId='canvans9122' :tooltipFormat='yAxisDemo1' />
 				</view>
@@ -125,8 +125,7 @@
 
 				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'
-					],
+						'5.5', '6', '6.5', '7', '7.5', '8', '8.5', '9', '9.5', '10'],
 				],
 
 				//选择数据暂存
@@ -157,7 +156,6 @@
 			},
 			//自主学习
 			hourStudy() {
-
 				let arr = this.studyTime
 				let num = parseFloat(this.changeValue)
 				arr.push(num)
@@ -198,11 +196,6 @@
 <style lang="scss">
 	@import '@/pages/common/mainpage.scss';
 
-	.module-container {
-		display: flex;
-		flex-direction: column;
-	}
-
 	.module-box {
 		display: flex;
 		flex-direction: row;
@@ -213,12 +206,10 @@
 			margin: 2% 0;
 			display: flex;
 			flex-direction: column;
-			justify-content: space-between;
 			background-color: #FFFFFF;
-			border-radius: 16rpx;
+			border-radius: $card-border-radius;
 			width: 48%;
-			height: 230rpx;
-			background-color: #5b7cff;
+			height: auto;
 			overflow: hidden;
 
 			.module-item-box {
@@ -239,7 +230,7 @@
 
 
 	.module-item-text {
-		color: #FFFFFF;
+		color: #FFF;
 		font-size: 35rpx;
 		font-weight: bold;
 		z-index: 1;
@@ -251,7 +242,7 @@
 		align-items: flex-end;
 
 		.module-item-num {
-			color: #FFFFFF;
+			color: #FFF;
 			font-size: 70rpx;
 			font-weight: bold;
 			z-index: 1;
@@ -260,7 +251,7 @@
 		.unit {
 			margin-bottom: 15rpx;
 			margin-left: 20rpx;
-			color: #f5f5f5;
+			color: #FFF;
 			font-size: 35rpx;
 			font-weight: bold;
 			z-index: 1;

components/top-box/top-box.vue

@@ -160,8 +160,6 @@
 		}
 	}
 
-	
-
 	.list-box {
 		margin: -100rpx 40rpx 120rpx 33rpx;
 		display: flex;

gradepkg/arcbar-chart/arcbar-chart.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-box">
-		<back @click="returnList"></back>
+		<back></back>
 
 		<view class="children-box">
 			<image class="children-avatar" :src="childreninfo.avatar"></image>
@@ -16,7 +16,7 @@
 				v-bind:style="{background: gradeData.rankArcbarChart.recentAnalyse.series[0].color}">
 				<view class="item-text">{{gradeData.rankArcbarChart.recentAnalyse.series[0].name}}</view>
 				<view class="item-number">{{gradeData.rankArcbarChart.recentAnalyse.series[0].data/0.01}}%</view>
-				<view style="display: flex;align-items: center;padding-bottom: 15rpx;padding: 0 15rpx 10rpx 15rpx;">
+				<view class="analysis-box">
 					<view v-if="gradeData.rankArcbarChart.recentAnalyse.series[0].data<0.4"
 						class="t-icon t-icon-jiangbei-20"></view>
 					<view
@@ -38,7 +38,7 @@
 				v-bind:style="{background: gradeData.rankArcbarChart.recentAnalyse.series[1].color}">
 				<view class="item-text">{{gradeData.rankArcbarChart.recentAnalyse.series[1].name}}</view>
 				<view class="item-number">{{gradeData.rankArcbarChart.recentAnalyse.series[1].data/0.01}}%</view>
-				<view style="display: flex;align-items: center;padding-bottom: 15rpx;padding: 0 15rpx 10rpx 15rpx;">
+				<view class="analysis-box">
 					<view v-if="gradeData.rankArcbarChart.recentAnalyse.series[1].data<0.4"
 						class="t-icon t-icon-jiangbei-20"></view>
 					<view
@@ -97,12 +97,7 @@
 			return {};
 		},
 		methods: {
-			//返回成绩页面
-			returnList() {
-				uni.switchTab({
-					url: '/pages/grade/grade'
-				})
-			},
+			
 		},
 		onLoad() {}
 	}
@@ -110,53 +105,9 @@
 
 <style lang="scss">
 	@import '@/gradepkg/common/chartpage.scss';
+	@import '@/gradepkg/common/databox.scss';
 
 	.page-box {
 		background: linear-gradient(#ffd071, $page-background-color);
 	}
-
-	.data-box {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		flex-wrap: wrap;
-		justify-content: space-between;
-		margin: 40rpx 20rpx 20rpx 20rpx;
-
-		.data-box-item {
-			display: flex;
-			flex-direction: column;
-			background-color: #FFFFFF;
-			border-radius: 15rpx;
-			width: 340rpx;
-			height: 290rpx;
-			box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.1);
-
-			.item-text {
-				font-size: 30rpx;
-				font-weight: bold;
-				color: #FFFFFF;
-				margin: 30rpx 0 0 30rpx;
-			}
-
-			.t-icon {
-				width: 100rpx;
-				height: 100rpx;
-			}
-
-			.item-number {
-				font-size: 60rpx;
-				margin: 20rpx 0 10rpx 30rpx;
-				color: #FFFFFF;
-				font-weight: bold;
-			}
-		}
-	}
-
-	.icon-text-item {
-		font-size: 35rpx;
-		font-weight: bold;
-		color: #FFFFFF;
-		margin-left: 20rpx;
-	}
 </style>

gradepkg/area-chart/area-chart.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page-box">
 		<!-- 返回按钮 -->
-		<back @click="returnList"></back>
+		<back></back>
 		<!-- 学生信息头部 -->
 		<view class="children-box">
 			<image class="children-avatar" :src="childreninfo.avatar"></image>
@@ -94,12 +94,6 @@
 				uni.$showMsg('取消选择')
 				this.show = false
 			},
-			//返回成绩页面
-			returnList() {
-				uni.switchTab({
-					url: '/pages/grade/grade'
-				})
-			},
 
 		}
 	}

gradepkg/column-chart/column-chart.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-box">
-		<back @click="returnList"></back>
+		<back></back>
 		
 		<view class="children-box">
 			<image class="children-avatar" :src="childreninfo.avatar"></image>
@@ -48,12 +48,6 @@
 			};
 		},
 		methods:{
-			//返回成绩页面
-			returnList(){
-				uni.switchTab({
-					url: '/pages/grade/grade'
-				})
-			},
 
 		},
 		onLoad(){

gradepkg/common/chartpage.scss

@@ -37,7 +37,7 @@
 
 		.chart-container {
 			margin: 20rpx;
-			border-radius: 15rpx;
+			border-radius: $card-border-radius;
 			display: flex;
 			align-items: center;
 			justify-content: center;

gradepkg/common/databox.scss

@@ -0,0 +1,50 @@
+	.data-box {
+		display: flex;
+		flex-direction: row;
+		flex-wrap: wrap;
+		margin: 40rpx 20rpx 0 20rpx;
+		justify-content: space-between;
+		
+
+		.data-box-item {
+			margin: 2% 0;
+			display: flex;
+			flex-direction: column;
+			background-color: #0052d4;
+			border-radius: $card-border-radius;
+			width: 48%;
+			height: auto;
+
+			.item-text {
+				font-size: 30rpx;
+				font-weight: bold;
+				color: #FFFFFF;
+				margin: 30rpx 0 0 30rpx;
+			}
+			.item-number {
+				font-size: 60rpx;
+				margin: 20rpx 0 10rpx 30rpx;
+				color: #FFFFFF;
+				font-weight: bold;
+			}
+			
+			.analysis-box{
+				display: flex;
+				align-items: center;
+				padding: 0 15rpx 15rpx 15rpx;
+				
+				.t-icon {
+					width: 100rpx;
+					height: 100rpx;
+				}
+				.icon-text-item {
+					font-size: 35rpx;
+					font-weight: bold;
+					color: #FFFFFF;
+					margin-left: 20rpx;
+				}
+			}
+		}
+	}
+
+	

gradepkg/line-chart/line-chart.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="page-box">
 		<!-- 返回按钮 -->
-		<back @click="returnList"></back>
+		<back></back>
 		<!-- 学生信息头部 -->
 		<view class="children-box">
 			<image class="children-avatar" :src="childreninfo.avatar"></image>
@@ -62,12 +62,6 @@
 			}
 		},
 		methods:{
-			//返回成绩页面
-			returnList(){
-				uni.switchTab({
-					url: '/pages/grade/grade'
-				})
-			},
 		},
 		onLoad(){
 		}

gradepkg/radar-chart/radar-chart.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-box">
-		<back @click="returnList"></back>
+		<back></back>
 
 		<view class="children-box">
 			<image class="children-avatar" :src="childreninfo.avatar"></image>
@@ -15,7 +15,7 @@
 			<view class="data-box-item">
 				<view class="item-text">考试成绩波动对比:</view>
 				<view class="item-number">{{mainExamUndulate>=quizExamUndulate?'小考稳定':'大考稳定'}}</view>
-				<view style="display: flex;align-items: center;padding-bottom: 15rpx;padding: 0 15rpx 10rpx 15rpx;">
+				<view class="analysis-box">
 					<view v-if="mainExamUndulate>=quizExamUndulate" class="t-icon t-icon-jiangbei-4"></view>
 					<view v-if="mainExamUndulate<quizExamUndulate" class="t-icon t-icon-jiangbei-3"></view>
 					<view v-if="mainExamUndulate>=quizExamUndulate" class="icon-text-item">重要考试时沉住气稳住心态</view>
@@ -23,10 +23,10 @@
 				</view>
 			</view>
 
-			<view class="data-box-item2">
+			<view class="data-box-item" style="background-color: #ff5959;">
 				<view class="item-text">考试得分能力对比:</view>
 				<view class="item-number">{{avgMain>=avgquiz?'大考能力强':'小考能力强'}}</view>
-				<view style="display: flex;align-items: center;padding-bottom: 15rpx;padding: 0 15rpx 10rpx 15rpx;">
+				<view class="analysis-box">
 					<view v-if="avgMain<avgquiz" class="t-icon t-icon-jiangbei-4"></view>
 					<view v-if="avgMain>=avgquiz" class="t-icon t-icon-jiangbei-3"></view>
 					<view v-if="avgMain<avgquiz" class="icon-text-item">重要考试要多证明自己能力</view>
@@ -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" :canvas2d='true' canvasId='canvans8312399' />
 			</view>
 		</view>
 
@@ -55,8 +55,8 @@
 			</view>
 			<!-- 图表 -->
 			<view class="charts-box">
-				<qiun-data-charts type="radar" :chartData="gradeData.abilityRadarChart.commonAnalyse"
-					:loadingType="4" :canvas2d='true' canvasId='canvans89139'/>
+				<qiun-data-charts type="radar" :chartData="gradeData.abilityRadarChart.commonAnalyse" :loadingType="4"
+					:canvas2d='true' canvasId='canvans89139' />
 			</view>
 		</view>
 
@@ -92,12 +92,6 @@
 				uni.$showMsg('切换完成')
 				this.show = false
 			},
-			//返回成绩页面
-			returnList() {
-				uni.switchTab({
-					url: '/pages/grade/grade'
-				})
-			},
 			//成绩波动数据(标准差)
 			getExamUndulate() {
 				//求和函数封装
@@ -152,78 +146,26 @@
 
 <style lang="scss">
 	@import '@/gradepkg/common/chartpage.scss';
+	@import '@/gradepkg/common/databox.scss';
+
 	.page-box {
 		background: linear-gradient(#ff8caf, $page-background-color);
 	}
 
-	.data-box {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		flex-wrap: wrap;
-		justify-content: space-between;
-		margin: 40rpx 20rpx 20rpx 20rpx;
-
-		.data-box-item2 {
-			display: flex;
-			flex-direction: column;
-			background-color: #ff5959;
-			border-radius: 15rpx;
-			width: 340rpx;
-			height: 290rpx;
-			box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.1);
-
-			.item-text {
-				font-size: 30rpx;
-				font-weight: bold;
-				color: #FFFFFF;
-				margin: 30rpx 0 0 30rpx;
-			}
-
-			.t-icon {
-				width: 180rpx;
-				height: 100rpx;
-			}
-
-			.item-number {
-				font-size: 60rpx;
-				margin: 10rpx 0 10rpx 25rpx;
-				color: #FFFFFF;
-				font-weight: bold;
-			}
-		}
+	//细节配置
+	.data-box .data-box-item .analysis-box .t-icon {
+		width: 180rpx;
+		height: 100rpx;
+	}
 
-		.data-box-item {
-			display: flex;
-			flex-direction: column;
-			background-color: #0052d4;
-			border-radius: 15rpx;
-			width: 340rpx;
-			height: 290rpx;
-			box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.1);
-
-			.item-text {
-				font-size: 30rpx;
-				font-weight: bold;
-				color: #FFFFFF;
-				margin: 30rpx 0 0 30rpx;
-			}
-
-			.t-icon {
-				width: 180rpx;
-				height: 100rpx;
-			}
-
-			.item-number {
-				font-size: 60rpx;
-				margin: 10rpx 0 10rpx 25rpx;
-				color: #FFFFFF;
-				font-weight: bold;
-			}
-		}
+	.data-box .data-box-item .item-number {
+		font-size: 60rpx;
+		margin: 10rpx 0 10rpx 25rpx;
+		color: #FFFFFF;
+		font-weight: bold;
 	}
 
-	.icon-text-item {
+	.data-box .data-box-item .analysis-box .icon-text-item {
 		font-size: 30rpx;
 		font-weight: bold;
 		color: #FFFFFF;

gradepkg/rose-chart/rose-chart.vue

@@ -1,6 +1,6 @@
 <template>
 	<view class="page-box">
-		<back @click="returnList"></back>
+		<back></back>
 
 		<view class="children-box">
 			<image class="children-avatar" :src="childreninfo.avatar"></image>
@@ -15,7 +15,7 @@
 			<view class="data-box-item">
 				<view class="item-text">本学期优势科目为:</view>
 				<view class="item-number">{{bestSubject.name}}{{bestSubject.value}}分</view>
-				<view style="display: flex;align-items: center;padding-bottom: 15rpx;padding: 0 15rpx 10rpx 15rpx;">
+				<view class="analysis-box">
 					<view v-if="bestSubject.value>=80" class="t-icon t-icon-jiangbei-9"></view>
 					<view v-if="bestSubject.value<80 && bestSubject.value>=50" class="t-icon t-icon-jiangbei-10"></view>
 					<view v-if="bestSubject.value<50" class="t-icon t-icon-jiangbei-11"></view>
@@ -25,10 +25,10 @@
 				</view>
 			</view>
 
-			<view class="data-box-item2">
+			<view class="data-box-item" style="background-color: #ff5959;">
 				<view class="item-text">本学期劣势科目为:</view>
 				<view class="item-number">{{worstSubject.name}}{{worstSubject.value}}分</view>
-				<view style="display: flex;align-items: center;padding-bottom: 15rpx;padding: 0 15rpx 10rpx 15rpx;">
+				<view class="analysis-box">
 					<view v-if="worstSubject.value>=80" class="t-icon t-icon-jiangbei-9"></view>
 					<view v-if="worstSubject.value<80 && bestSubject.value>=50" class="t-icon t-icon-jiangbei-10">
 					</view>
@@ -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" :canvas2d='true' canvasId='canvans83179' />
 			</view>
 		</view>
 		<!-- 单次考试 -->
@@ -60,14 +60,11 @@
 			</view>
 			<view class="charts-box">
 				<qiun-data-charts type="rose" :chartData="gradeData.advantageRoseChart.recentAnalyse" :loadingType="4"
-					:tapLegend="true" :canvas2d='true' canvasId='canvans831459'/>
+					:tapLegend="true" :canvas2d='true' canvasId='canvans831459' />
 			</view>
 		</view>
 
 
-
-
-	</view>
 	</view>
 </template>
 
@@ -94,12 +91,6 @@
 			this.getGradeDetail()
 		},
 		methods: {
-			//返回成绩页面
-			returnList() {
-				uni.switchTab({
-					url: '/pages/grade/grade'
-				})
-			},
 			//通过map方法返回成绩的数组
 			getGradeDetail() {
 				//获取成绩最好科目
@@ -120,81 +111,11 @@
 
 <style lang="scss">
 	@import '@/gradepkg/common/chartpage.scss';
+	@import '@/gradepkg/common/databox.scss';
+
 	.page-box {
 		background: linear-gradient(#a5c6ff, $page-background-color);
 	}
 
-	.data-box {
-		display: flex;
-		flex-direction: row;
-		align-items: center;
-		flex-wrap: wrap;
-		justify-content: space-between;
-		margin: 40rpx 20rpx 20rpx 20rpx;
-
-		.data-box-item2 {
-			display: flex;
-			flex-direction: column;
-			background-color: #ff5959;
-			border-radius: 15rpx;
-			width: 340rpx;
-			height: 290rpx;
-			box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.1);
-
-			.item-text {
-				font-size: 30rpx;
-				font-weight: bold;
-				color: #FFFFFF;
-				margin: 30rpx 0 0 30rpx;
-			}
-
-			.t-icon {
-				width: 100rpx;
-				height: 100rpx;
-			}
-
-			.item-number {
-				font-size: 60rpx;
-				margin: 20rpx 0 10rpx 30rpx;
-				color: #FFFFFF;
-				font-weight: bold;
-			}
-		}
-
-		.data-box-item {
-			display: flex;
-			flex-direction: column;
-			background-color: #0052d4;
-			border-radius: 15rpx;
-			width: 340rpx;
-			height: 290rpx;
-			box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.1);
-
-			.item-text {
-				font-size: 30rpx;
-				font-weight: bold;
-				color: #FFFFFF;
-				margin: 30rpx 0 0 30rpx;
-			}
-
-			.t-icon {
-				width: 100rpx;
-				height: 100rpx;
-			}
 
-			.item-number {
-				font-size: 60rpx;
-				margin: 20rpx 0 10rpx 30rpx;
-				color: #FFFFFF;
-				font-weight: bold;
-			}
-		}
-	}
-
-	.icon-text-item {
-		font-size: 35rpx;
-		font-weight: bold;
-		color: #FFFFFF;
-		margin-left: 20rpx;
-	}
 </style>

pages/common/mainpage.scss

@@ -18,17 +18,16 @@
 				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: 16rpx;
+				border-radius: $card-border-radius;
 				width: 48%;
 				height: auto;
 
 				.card-info {
 					display: flex;
 					align-items: center;
-					padding: 15rpx;
+					padding: 20rpx;
 
 					.info-text {
 						font-size: 30rpx;

pages/grade/grade.vue

@@ -7,13 +7,13 @@
 		<view class="mini-chart-list">
 
 			<view class="mini-chart-item" style="width: 100%;">
-				<view class="mainchart-container">
-					<view class="mainchart-name">
+				<view class="chart-container">
+					<view class="chart-name">
 						<view class="t-icon t-icon-xtubiao-4"></view>
-						<text class="mainchart-text">成绩走势</text>
+						<text class="chart-name-text">成绩走势</text>
 					</view>
 
-					<view class="mainchart-box">
+					<view class="charts-box">
 						<qiun-data-charts class="chart" :canvas2d='true' canvasId='canvans5' type="mainline"
 							:chartData="gradeData.mainLineChart" :loadingType="4" />
 					</view>
@@ -173,39 +173,9 @@
 		}
 	}
 
-	//总成绩折线图
-	.mainchart-container {
-		border-radius: 16rpx;
-		display: flex;
-		align-items: center;
-		flex-direction: column;
-		background-color: #FFFFFF;
-		// box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
-		width: 100%;
-
-		.mainchart-name {
-			display: flex;
-			align-items: center;
-			justify-content: flex-start;
-			width: 100%;
-			margin: 20rpx 0 20rpx 40rpx;
-
-			.mainchart-text {
-				margin-left: 20rpx;
-				font-size: 30rpx;
-				font-weight: bold;
-				color: #3B4144;
-			}
-		}
-
-		.mainchart-box {
-			height: 300rpx;
-		}
-	}
-
-	//缩略图
+	//图表卡片
 	.chart-container {
-		border-radius: 16rpx;
+		border-radius: $card-border-radius;
 		display: flex;
 		align-items: center;
 		justify-content: center;

pages/my/my.vue

@@ -254,7 +254,7 @@
 					width: 48%;
 					height: 100%;
 					padding-left: 20rpx;
-					border-radius: 20rpx;
+					border-radius: $card-border-radius;
 					background-color: #fff;
 					display: flex;
 					align-items: center;
@@ -297,7 +297,7 @@
 
 				.com-box {
 					overflow: hidden;
-					border-radius: 20rpx;
+					border-radius: $card-border-radius;
 				}
 			}
 

pages/subscribe/subscribe.vue

@@ -88,7 +88,7 @@
 				justify-content: space-between;
 				background-size: cover;
 				box-shadow: 0 4rpx 8rpx rgba(0, 0, 0, 0.05);
-				border-radius: 16rpx;
+				border-radius: $card-border-radius;
 				width: 100%;
 				height: 300rpx;
 			}

subpkg/MyMsg/MyMsg.vue

@@ -71,16 +71,16 @@
 	.notice-container{
 		.notice-title{
 			font-size: 48rpx;
-			padding-left: 20px;
+			padding-left: 40rpx;
 		}
 		
 		.notice-wrap{
-			padding: 20px;
+			padding: 40rpx;
 			
 			.notice-item{
 				// width: 100%;
 				// height: 400rpx;
-				border-radius: 10px;
+				border-radius: $card-border-radius;
 				margin-bottom: 40rpx;
 				background-color: #fff;
 				padding: 30rpx;
@@ -92,8 +92,8 @@
 					.t-icon{
 						display: inline-block;
 						margin-right: 10rpx;
-						width: 20px;
-						height: 20px;
+						width: 40rpx;
+						height: 40rpx;
 					}
 					
 					.left{

subpkg/childrenInfo/childrenInfo.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="container">
 		<!-- 返回按钮 -->
-		<back @click="returnMy"></back>
+		<back></back>
 		<!-- 孩子头部信息 -->
 		<view class="top-info">
 			<image class="top-avatar" :src="childreninfo.avatar" size="100"></image>
@@ -57,12 +57,6 @@
 		},
 		methods: {
 			...mapMutations('m_children', ['updateChildrenInfo']),
-			//返回成绩页面
-			returnMy() {
-				uni.switchTab({
-					url: '/pages/my/my'
-				})
-			},
 		},
 	}
 </script>

subpkg/childrenlist/childrenlist.vue

@@ -1,5 +1,6 @@
 <template>
 	<view class="children-container">
+		<back></back>
 		<view class="tips">
 			<view class="title">选择您的孩子</view>
 		</view>
@@ -62,8 +63,6 @@
 	.children-container {
 		display: flex;
 		flex-direction: column;
-		justify-content: center;
-		align-items: center;
 
 		.tips {
 			width: 100%;
@@ -72,7 +71,7 @@
 			z-index: 99;
 
 			.title {
-				padding-top: 200rpx;
+				padding-top: 50rpx;
 				padding-left: 40rpx;
 				line-height: 70rpx;
 				font-weight: bold;
@@ -101,7 +100,7 @@
 					align-items: center;
 					box-shadow: $box-shadow-stereo-white;
 					background-color: #FFFFFF;
-					border-radius: 20rpx;
+					border-radius: $card-border-radius;
 					width: 280rpx;
 					height: 300rpx;
 					z-index: 99;

subpkg/common/infopage.scss

@@ -35,14 +35,14 @@
 				}
 			}
 		}
-
+		//背景大卡片
 		.card-box {
 			position: relative;
 			background-color: #FFFFFF;
 			box-shadow: 0 6rpx 10rpx rgba(0, 0, 0, 0.2);
 			top: 80rpx;
 			left: 50rpx;
-			border-radius: 100rpx;
+			border-radius: 50rpx;
 			width: 750rpx;
 			height: 100vh;
 
@@ -58,7 +58,7 @@
 			flex-direction: column;
 			margin: 20rpx;
 			background-color: #FFFFFF;
-			border-radius: 16rpx;
+			border-radius: $card-border-radius;
 			width: 280rpx;
 			height: 280rpx;
 			box-shadow: $box-shadow-stereo-white;

subpkg/common/ocean.scss

@@ -1,6 +1,7 @@
 .ocean {
 		display: flex;
 		margin-top: -600rpx;
+		margin-left: -520rpx;
 		width: 1800rpx;
 		height: 1800rpx;
 		background-color: #4169E1;

subpkg/guide/guide.vue

@@ -82,8 +82,6 @@
 	.children-container {
 		display: flex;
 		flex-direction: column;
-		justify-content: center;
-		align-items: center;
 
 		.tips {
 			width: 100%;
@@ -112,16 +110,16 @@
 			}
 
 			.detail-button {
-				line-height: 80rpx;
-				height: 80rpx;
+				line-height: 100rpx;
+				height: 100rpx;
 				width: 80%;
 				font-weight: bold;
 				font-size: 36rpx;
-				border-radius: 80rpx;
+				color: #FFFFFF;
+				border-radius: 100rpx;
 				position: relative;
 				margin: 100rpx auto; //relative相对定位居中
 				border: none;
-				color: #FFFFFF;
 				background: linear-gradient(to right, #506AE7, #87CEFA);
 
 			}

subpkg/login/login.vue

@@ -113,7 +113,6 @@
 			padding-left: 80rpx;
 			display: flex;
 			flex-direction: column;
-			z-index: 99;
 
 			.title {
 				line-height: 70rpx;
@@ -159,7 +158,7 @@
 		.bg3 {
 			position: fixed;
 			top: 500rpx;
-			right: 480rpx;
+			right: 450rpx;
 			width: 600rpx;
 			height: 600rpx;
 			border-radius: 100%;
@@ -167,34 +166,33 @@
 			z-index: 4;
 		}
 
-
-
 		.form-box {
-			padding-top: 250rpx;
-			padding-left: 70rpx;
-			width: 610rpx;
+			margin-top: 400rpx;
+			width: 100%;
 
 
 			.btn {
-				display: flex;
-				justify-content: center;
-				align-items: center;
-				width: 100%;
+				line-height: 100rpx;
 				height: 100rpx;
+				width: 80%;
+				font-weight: bold;
+				font-size: 36rpx;
+				color: #FFFFFF;
 				border-radius: 100rpx;
+				position: relative;
+				margin: 0 auto;
 				border: none;
-				color: #FFFFFF;
-				font-weight: bold;
 				background: linear-gradient(to right, #506AE7, #87CEFA);
-				box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.2);
-				margin-top: 60rpx;
+				box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.1);
 				z-index: 99;
 			}
-
+			//字体按钮
 			.other {
 				display: flex;
 				justify-content: space-between;
-				z-index: 99;
+				position: relative;
+				margin: 0 auto;
+				width: 80%;
 
 				text {
 					line-height: 80rpx;
@@ -218,7 +216,5 @@
 		}
 	}
 
-	.ocean {
-		margin-left: -520rpx;
-	}
+
 </style>

uni_modules/uview-ui/components/u-notice-bar/u-notice-bar.vue

@@ -97,6 +97,6 @@
 		overflow: hidden;
 		padding: 9px 12px;
 		flex: 1;
-		border-radius: 16rpx;
+		border-radius: 20rpx;
 	}
 </style>