3.30-3

pages/common/blockmsg.scss

@@ -1,3 +1,7 @@
+	.block-box{
+		display: flex;
+		align-items: center;
+	}
 	.class-block {
 		display: flex;
 		align-items: center;
@@ -28,4 +32,11 @@
 				color: #3C9CFF;
 			}
 		}
+	}
+	.index {
+		width: 1%;
+		height: 120rpx;
+		background-color: #3C9CFF;
+		border-radius: $card-border-radius;
+		margin-left: 22rpx;
 	}

pages/homework/homework.vue

@@ -10,27 +10,35 @@
 				</u-tabs>
 			</view>
 
-			<!-- 详情头部卡片 -->
 			<view class="module-box" v-for="(item,index) in card" :key="index" v-if="current == index">
+				<!-- 详情头部卡片 -->
 				<view class="card" :style="{backgroundColor: `${item.color}`}">
 					<view class="box">
-						<text class="card-title">{{item.title}}{{item.detail.data.length}}</text>
+						<view class="flex">
+							<text class="card-title">{{item.title}}</text>
+							<text class="card-title" style="margin-left: 20rpx;">{{item.detail.data.length}}</text>
+						</view>
 						<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 class="flex">
+								<text class="card-subtitle">{{item.subtitle}}</text>
+								<text class="card-subtitle"
+									style="margin-left: 20rpx;">{{item.detail.finishData.length}}</text>
+							</view>
+							<view class="flex">
+								<text class="card-subtitle">完成情况: </text>
+								<text class="card-subtitle" style="margin-left: 20rpx;">{{item.level}}</text>
+							</view>
 						</view>
 					</view>
 					<view class="image" :style="{backgroundImage:`url(${item.image})`}"></view>
 				</view>
-
 				<!-- 中间标题 -->
-				<view style="display: flex; align-items: center;">
+				<view class="flex">
 					<view class="cut-off">{{item.detail.nav}}</view>
 					<!-- <u-button text="获得报表" :plain="true" :hairline="true" shape="circle" size="small"></u-button> -->
 				</view>
 				<!-- 列表 -->
 				<view class="detail-box" v-if="current == index">
-
 					<view class="detail-box-item">
 						<view class="item-info">
 							<view class="t-icon t-icon-ceping"></view>
@@ -50,46 +58,50 @@
 								:canvas2d='true' tooltipFormat='HomeworkPercent' canvasId='canvans0531032' />
 						</view>
 					</view>
-
+					<!-- 完成列表 -->
 					<view class="detail-box-item">
 						<view class="item-info">
 							<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>
-								<view style="display: flex;">
-									<view class="tag-box">
-										<view class="tag">{{j.subject}}</view>
+						<view style="margin-bottom: 20rpx;">
+							<view class="block-box" v-for="(j,y) in item.detail.finishData" :key="y">
+								<view class="index"></view>
+								<view class="class-block" style="width: 90%;">
+									<view class="block-title">{{j.name}}</view>
+									<view class="block-subtitle">科目:</view>
+									<view class="block-tag-box">
+										<view class="block-tag">{{j.subject}}</view>
 									</view>
-									<view class="tag-box">
-										<view class="tag">{{j.teacher}}</view>
+									<view class="block-subtitle">布置老师:</view>
+									<view class="block-tag-box">
+										<view class="block-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">
-								<view class="block-tag">{{i.subject}}</view>
-							</view>
-							<view class="block-tag-box">
-								<view class="block-tag">{{i.teacher}}</view>
+						<view style="margin-bottom: 20rpx;">
+							<view class="block-box" v-for="(i,x) in item.detail.data" :key="x">
+								<view class="index"></view>
+								<view class="class-block" style="width: 90%;">
+									<view class="block-title">{{i.name}}</view>
+									<view class="block-tag-box">
+										<view class="block-tag">{{i.subject}}</view>
+									</view>
+									<view class="block-tag-box">
+										<view class="block-tag">{{i.teacher}}</view>
+									</view>
+									<view class="block-subtitle">{{i.description}}</view>
+								</view>
 							</view>
-							<view class="block-subtitle">{{i.description}}</view>
 						</view>
 					</view>
 
@@ -125,8 +137,8 @@
 				timeStamp: '',
 				//卡片内容
 				card: [{
-					title: '今日评测数:' + '\xa0\xa0\xa0',
-					subtitle: '评测已完成:' + '\xa0\xa0\xa0',
+					title: '今日评测数:',
+					subtitle: '评测已完成:',
 					level: '良好',
 					color: '#0080ff;',
 					image: 'https://ouch-cdn2.icons8.com/gpV8ZT40juL5H5uR0cv7ptJaV0vbUu64ANLmkch6cr4/rs:fit:1289:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9zdmcvNTE3/L2M0Zjg4MDUzLTMx/ZDUtNDlhZS05M2Nj/LWU4YWM3YTNjODAx/My5zdmc.png',
@@ -179,8 +191,8 @@
 						}]
 					}
 				}, {
-					title: '今日作业数:' + '\xa0\xa0\xa0',
-					subtitle: '作业已完成:' + '\xa0\xa0\xa0',
+					title: '今日作业数:',
+					subtitle: '作业已完成:',
 					level: '完美',
 					color: '#ff8caf;',
 					image: 'https://ouch-cdn2.icons8.com/XuAMXajgkDqsOY7cp6uY1LQivtTxahNZjWM1Qk2bfoY/rs:fit:1216:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9zdmcvMzE4/LzdjYTU2NDM4LTc4/MTktNDVhNi1hMjZh/LTMyZWE5NDE4YzI5/My5zdmc.png',
@@ -222,8 +234,8 @@
 						}]
 					}
 				}, {
-					title: '今日活动数:' + '\xa0\xa0\xa0',
-					subtitle: '活动已完成:' + '\xa0\xa0\xa0',
+					title: '今日活动数:',
+					subtitle: '活动已完成:',
 					level: '优秀',
 					color: '#f9c752;',
 					image: 'https://ouch-cdn2.icons8.com/xrmiKHmKAqKegMFWYXXUHk6mqTXXTqoU0wsTFULoboQ/rs:fit:1002:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9zdmcvNzcy/LzczYWVmZjhkLTk4/N2ItNDI2Ny04NmNk/LTA1NTI4YjhiMTIw/Ni5zdmc.png',
@@ -357,12 +369,14 @@
 	@import '@/pages/common/blockmsg.scss';
 
 	.home-topinfo {
-		background: linear-gradient($color-green, $page-background-color) !important;
+		background: linear-gradient($color-yellow, $page-background-color) !important;
 	}
 
+	//模块
 	.module-container {
 		margin-top: -70rpx;
 
+		//头部卡片
 		.card {
 			display: flex;
 			justify-content: space-around;
@@ -373,18 +387,24 @@
 			border-radius: $card-border-radius;
 
 			.card-title {
-				margin-left: 20rpx;
 				font-size: 45rpx;
 				font-weight: bold;
 				color: #FFF;
 			}
 
 			.card-subtitle {
-				margin: 10rpx 0 0 20rpx;
 				font-size: 28rpx;
 				color: #FFF;
 			}
 
+			.border-bottom {
+				height: 10rpx;
+				width: 100%;
+				border-radius: $card-border-radius;
+				background-color: #FFF;
+				margin: 5rpx 0 5rpx 0;
+			}
+
 			.image {
 				position: relative;
 				top: -40rpx;
@@ -397,13 +417,15 @@
 			}
 		}
 
+		//头部卡片
 		.box {
 			display: flex;
 			flex-direction: column;
 			justify-content: center;
-
+			margin-left: 20rpx;
 		}
 
+		//中间标题
 		.cut-off {
 			font-size: 35rpx;
 			font-weight: bold;
@@ -411,6 +433,7 @@
 			margin-left: 40rpx;
 		}
 
+		//列表block
 		.detail-box {
 			display: flex;
 			flex-flow: row wrap;
@@ -445,45 +468,15 @@
 		}
 	}
 
-	.block-finish {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: space-around;
-		background-color: #f6f6f6;
-		margin: 10rpx auto 10rpx auto;
-		padding: 5rpx;
-		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 {
-			border-radius: 20rpx;
-			border: 1rpx solid #3C9CFF;
-			padding: 6rpx;
-			margin: 10rpx;
-
-			.tag {
-				font-size: 22rpx;
-				color: #3C9CFF;
-			}
-		}
-	}
-
+	//图表
 	.charts-box {
 		width: 100%;
 		height: 230rpx;
 		margin-bottom: 20rpx;
 	}
+
+	.flex {
+		display: flex;
+		align-items: center;
+	}
 </style>

pages/interactive/interactive.vue

@@ -62,7 +62,7 @@
 <style lang="scss">
 	@import '@/pages/common/mainpage.scss';
 	.home-topinfo {
-		background: linear-gradient($color-yellow, $page-background-color) !important;
+		background: linear-gradient($color-green, $page-background-color) !important;
 	}
 	.container {
 		width: 100%;

pages/my/my.vue

@@ -172,10 +172,10 @@
 			position: fixed;
 			top: -400rpx;
 			right: -250rpx;
-			width: 1000rpx;
-			height: 1000rpx;
+			width: 800rpx;
+			height: 800rpx;
 			margin-right: 500rpx;
-			border-radius: 100%;
+			border-radius: 50%;
 			background-color: #6495ed;
 			z-index: -1;
 		}

subpkg/classmsg/classmsg.vue

@@ -20,7 +20,7 @@
 				</view>
 				<!-- 课程列表 -->
 				<view style="margin-bottom: 20rpx;">
-					<view style="display: flex; align-items: center;" v-for="(item,index) in classList" :key="index">
+					<view class="block-box" v-for="(item,index) in classList" :key="index">
 						<view class="index"></view>
 
 						<view class="class-block" style="width: 90%;">
@@ -97,14 +97,6 @@
 					margin-left: 10rpx;
 				}
 			}
-
-			.index {
-				width: 1%;
-				height: 120rpx;
-				background-color: #3C9CFF;
-				border-radius: 20rpx;
-				margin-left: 20rpx;
-			}
 		}
 	}