3.30

pages/common/mainpage.scss

@@ -33,8 +33,8 @@
 					.info-text {
 						font-size: 30rpx;
 						font-weight: bold;
-						color: $color-title;
-						margin-left: 15rpx;
+						color: #3B4144;
+						margin-left: 10rpx;
 					}
 				}
 			}
@@ -51,7 +51,11 @@
 		display: flex;
 		align-items: center;
 		flex-wrap: wrap;
-		margin: -10rpx 0 10rpx 0;
+		margin: -10rpx 0 10rpx 0;
+		.t-icon {
+			width: 30rpx;
+			height: 30rpx;
+		}
 	}
 	.msg {
 		color: $color-title;

pages/homework/homework.vue

@@ -13,10 +13,12 @@
 			<!-- 详情头部卡片 -->
 			<view class="module-box" v-for="(item,index) in card" :key="index" v-if="current == index">
 				<view class="card" :style="{backgroundColor: `${item.color}`}">
-					<view style="display: flex; flex-direction: column;">
+					<view class="box">
 						<text class="card-title">{{item.title}}{{item.detail.data.length}}</text>
-						<text class="card-subtitle">{{item.subtitle}}{{item.detail.finishData.length}}</text>
-						<text class="card-subtitle">完成情况: {{item.level}}</text>
+						<view class="box" style="margin-top: 20rpx;">
+							<text class="card-subtitle">{{item.subtitle}}{{item.detail.finishData.length}}</text>
+							<text class="card-subtitle">完成情况: {{item.level}}</text>
+						</view>
 					</view>
 					<view class="image" :style="{backgroundImage:`url(${item.image})`}"></view>
 				</view>
@@ -36,13 +38,16 @@
 						</view>
 						<!-- 图表部分 -->
 						<view class="charts-box" v-if="current == 0">
-							<qiun-data-charts type="fin-area" :chartData="homeworkData.testData" :loadingType="4" :canvas2d='true' tooltipFormat='HomeworkPercent' canvasId='canvans0980111' />
+							<qiun-data-charts type="fin-area" :chartData="homeworkData.testData" :loadingType="4"
+								:canvas2d='true' tooltipFormat='HomeworkPercent' canvasId='canvans0980111' />
 						</view>
 						<view class="charts-box" v-if="current == 1">
-							<qiun-data-charts type="fin-area" :chartData="homeworkData.homeworkData" :loadingType="4" :canvas2d='true' tooltipFormat='HomeworkPercent' canvasId='canvans0933511' />
+							<qiun-data-charts type="fin-area" :chartData="homeworkData.homeworkData" :loadingType="4"
+								:canvas2d='true' tooltipFormat='HomeworkPercent' canvasId='canvans0933511' />
 						</view>
 						<view class="charts-box" v-if="current == 2">
-							<qiun-data-charts type="fin-area" :chartData="homeworkData.activityData" :loadingType="4" :canvas2d='true' tooltipFormat='HomeworkPercent' canvasId='canvans0531032' />
+							<qiun-data-charts type="fin-area" :chartData="homeworkData.activityData" :loadingType="4"
+								:canvas2d='true' tooltipFormat='HomeworkPercent' canvasId='canvans0531032' />
 						</view>
 					</view>
 
@@ -51,7 +56,7 @@
 							<view class="t-icon t-icon-shenhe"></view>
 							<view class="item-text">今日已完成</view>
 						</view>
-						
+
 						<view style="display: flex; flex-wrap: wrap;">
 							<view class="block-finish" v-for="(j,y) in item.detail.finishData" :key="y">
 								<view class="title">{{j.name}}</view>
@@ -63,19 +68,19 @@
 										<view class="tag">{{j.teacher}}</view>
 									</view>
 								</view>
-								
+
 							</view>
 						</view>
-						
+
 					</view>
-					
+
 
 					<view class="detail-box-item">
 						<view class="item-info">
 							<view class="t-icon t-icon-daiban"></view>
 							<view class="item-text">{{item.detail.title}}</view>
 						</view>
-						
+
 						<view class="class-block" v-for="(i,x) in item.detail.data" :key="x">
 							<view class="block-title">{{i.name}}</view>
 							<view class="block-tag-box">
@@ -154,8 +159,8 @@
 							teacher: '李老师',
 							description: '这里是评测描述信息'
 						}],
-						
-						
+
+
 						finishData: [{
 							name: '评测数据1',
 							subject: '数学',
@@ -198,8 +203,8 @@
 							teacher: '王老师',
 							description: '这里是作业描述信息'
 						}],
-						
-						finishData:[{
+
+						finishData: [{
 							name: '作业数据1',
 							subject: '数学',
 							teacher: '王老师',
@@ -256,9 +261,9 @@
 							teacher: '王老师',
 							description: '这里是活动描述信息'
 						}],
-						
-						
-						finishData:[{
+
+
+						finishData: [{
 							name: '活动数据1',
 							subject: '数学',
 							teacher: '王老师',
@@ -301,7 +306,7 @@
 			this.saveToStudyChart()
 			let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
 			let curParam = routes[routes.length - 1].options; //获取路由参数
-			this.current = curParam.index 
+			this.current = curParam.index
 		},
 		//刷新页面
 		onPullDownRefresh() {
@@ -350,9 +355,10 @@
 
 <style lang="scss">
 	@import '@/pages/common/blockmsg.scss';
-		.home-topinfo {
-			background: linear-gradient($color-green, $page-background-color) !important;
-		}
+
+	.home-topinfo {
+		background: linear-gradient($color-green, $page-background-color) !important;
+	}
 
 	.module-container {
 		margin-top: -70rpx;
@@ -367,14 +373,14 @@
 			border-radius: $card-border-radius;
 
 			.card-title {
-				margin: 30rpx 0 20rpx 20rpx;
+				margin-left: 20rpx;
 				font-size: 45rpx;
 				font-weight: bold;
 				color: #FFF;
 			}
 
 			.card-subtitle {
-				margin: 10rpx 20rpx;
+				margin: 10rpx 0 0 20rpx;
 				font-size: 28rpx;
 				color: #FFF;
 			}
@@ -391,6 +397,13 @@
 			}
 		}
 
+		.box {
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+
+		}
+
 		.cut-off {
 			font-size: 35rpx;
 			font-weight: bold;
@@ -431,7 +444,8 @@
 			}
 		}
 	}
-	.block-finish{
+
+	.block-finish {
 		display: flex;
 		flex-direction: column;
 		align-items: center;
@@ -442,30 +456,34 @@
 		width: 44%;
 		height: 120rpx;
 		border-radius: $card-border-radius;
+
 		.title {
 			font-size: 30rpx;
 			font-weight: bold;
 			color: $color-title;
 		}
-			
+
 		.subtitle {
 			font-size: 22rpx;
 			color: $color-title;
 		}
-		.tag-box{
+
+		.tag-box {
 			border-radius: 20rpx;
 			border: 1rpx solid #3C9CFF;
 			padding: 6rpx;
 			margin: 10rpx;
-			.tag{
+
+			.tag {
 				font-size: 22rpx;
 				color: #3C9CFF;
 			}
 		}
 	}
+
 	.charts-box {
 		width: 100%;
 		height: 230rpx;
 		margin-bottom: 20rpx;
 	}
-</style>
+</style>