update:完成5.7讨论修改

.vs/VSWorkspaceState.json

@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\store",
+  "PreviewInSolutionExplorer": false
+}

.vs/miniprogram/project-colors.json

@@ -0,0 +1,11 @@
+{
+  "Version": 1,
+  "ProjectMap": {
+    "a2fe74e1-b743-11d0-ae1a-00a0c90fffc3": {
+      "ProjectGuid": "a2fe74e1-b743-11d0-ae1a-00a0c90fffc3",
+      "DisplayName": "杂项文件",
+      "ColorIndex": -1
+    }
+  },
+  "NextColorIndex": 0
+}

components/back/back.vue

@@ -71,7 +71,7 @@
 		.back-text{
 			font-size: 40rpx;
 			font-weight: bold;
-			margin:0 0 6rpx 20rpx;
+			margin:0 0 4rpx 20rpx;
 		}
 	}
 </style>

components/interactive-box/interactive-box.vue

@@ -12,13 +12,16 @@
 				<view class="module-item-box">
 					<text class="module-item-text">{{item.text}}</text>
 					<view class="num-box">
-
-						<text class="module-item-num" v-if="item.numData === '记录一下'">{{item.numData}}</text>
+						
+						<view style="display: flex;align-items: baseline;" v-if="item.numData === '记录一下'">
+							<text class="module-item-num">记录</text>
+							<text class="module-item-num" style="font-size: 30rpx;opacity:0.8;">今日时长</text>
+						</view>
 						<view style="display: flex;align-items: baseline;" v-else>
 							<text class="module-item-num">{{item.numData.split('小时')[0]}}</text>
-							<text class="module-item-num" style="font-size: 30rpx;">小时</text>
+							<text class="module-item-num" style="font-size: 30rpx;opacity:0.8;">小时</text>
 							<text class="module-item-num">{{item.numData.split('小时')[1].replace('分','')}}</text>
-							<text class="module-item-num" style="font-size: 30rpx;">分钟</text>
+							<text class="module-item-num" style="font-size: 30rpx;opacity:0.8;">分钟</text>
 						</view>
 					</view>
 					<view :class="item.icon"></view>

pages/home/home.vue

@@ -15,7 +15,8 @@
 				<view class="card-info" style="padding-bottom: 20rpx;">
 					<view :class="icon.class"></view>
 					<text class="info-text">今日课程</text>
-					<view style="display: flex; align-items: center;margin: 0 5rpx 0 auto;" @click="navClass" v-if="classCurrent != -1">
+					<view style="display: flex; align-items: center;margin: 0 5rpx 0 auto;" @click="navClass"
+						v-if="classCurrent != -1">
 						<view class="t-icon t-icon-fenlei"></view>
 						<view class="msg" style="font-size: 30rpx; margin-left: 5px;color: #4169E1;">课程列表</view>
 					</view>
@@ -24,36 +25,43 @@
 			</view>
 
 			<!-- 今日打卡 -->
-			<view class="card-item" style="overflow: hidden;" @click="navCalendar">
-				<!-- <view class="card-info" style="padding-bottom: 15rpx;">
-					<view class="t-icon t-icon-dakaqiandao"></view>
-					<text class="info-text">今日打卡</text>
-				</view> -->
-				<view class="head-card" :style="{backgroundColor: attendance==='已打卡'?'#4169E1':'#f9c752'}">
-					<view class="flex-colum">
-						<view style="display: flex;align-items: center; width: 100%;margin-top: 10rpx;">
-							<view class="index" :style="{backgroundColor: '#FFF'}"></view>
-							<view class="text-content" style="color: #FFF;z-index: 2;">打卡记录</view>
+			<view class="card-item" style="overflow: hidden;height: 400rpx;" @click="navCalendar">
+				<view class="card-info">
+					<view class="t-icon t-icon-daka"></view>
+					<text class="info-text">今日出勤</text>
+				</view>
+				<view class="flex" style="flex-direction: column;">
+					<!-- 是否打卡 -->
+					<view class="flex">
+						<view class="index" :style="{backgroundColor: attendance==='已打卡'?'#4169E1':'#f9c752'}"></view>
+						<view class="text-content" style="z-index: 2;">打卡记录</view>
+					</view>
+					<view class="flex">
+						<view
+							:class="attendance==='已打卡'?'t-icon t-icon-weizhidaka-dakachenggong':'t-icon t-icon-weizhidaka-dakacuowu'"
+							style="width:60rpx;height: 60rpx;margin-left: 20rpx;z-index: 2;"></view>
+						<view class="text-info" style="margin: 20rpx;">{{attendance}}</view>
+					</view>
+					<view class="image"
+						:style="{backgroundImage: attendance==='已打卡'?`url(${image02})`:`url(${image01})`}"></view>
+					<!-- 打卡时间 -->
+					<view class="flex">
+						<view class="index" :style="{backgroundColor: attendance==='已打卡'?'#4169E1':'#f9c752'}"></view>
+						<view class="text-content">打卡时间</view>
+					</view>
+					<view class="flex">
+						<view class="flex" v-if="attendance==='未打卡'" style="align-items: baseline;">
+							<view class="text-info" style="margin-left: 30rpx;font-size: 30rpx;">时间</view>
+							<view class="text-info">未记录</view>
 						</view>
-						<view class="flex">
-							<view class="state-text" style="z-index: 2;">{{attendance}}</view>
+						<view class="flex" v-else style="align-items: baseline;">
+							<view class="text-info" style="margin-left: 30rpx;font-size: 30rpx;">上午</view>
+							<view class="text-info">{{attendanceTime.split(':')[0].replace('0','')}}</view>
+							<view class="text-info" style="font-size: 30rpx;">点</view>
+							<view class="text-info">{{attendanceTime.split(':')[1]}}</view>
+							<view class="text-info" style="font-size: 30rpx;">分</view>
 						</view>
 					</view>
-					<view :class="attendance==='已打卡'?'t-icon t-icon-gou1':'t-icon t-icon-cha'"
-						style="position: relative;top: -230rpx;left: 180rpx;width: 200rpx;height: 200rpx;z-index: 1;"></view>
-				</view>
-
-				<view style="display: flex;align-items: center; width: 100%;">
-					<view class="index" :style="{backgroundColor: attendance==='已打卡'?'#4169E1':'#f9c752'}" />
-					<view class="text-content">打卡时间</view>
-				</view>
-				<view class="flex" style="margin-left: 17rpx;">
-					<view :class="attendance==='已打卡'?'t-icon t-icon-weizhidaka-dakachenggong':'t-icon t-icon-weizhidaka-dakacuowu'"
-						style="width:70rpx;height: 70rpx;"></view>
-					<view class="state"
-						:style="{backgroundColor: attendance==='已打卡'?'#4169E1':(attendance === '未打卡'?'#f9c752':'#FFF')}">
-						<view class="state-text" style="font-size: 40rpx;">{{attendanceTime}}</view>
-					</view>
 				</view>
 			</view>
 
@@ -129,6 +137,8 @@
 					homework: 't-icon t-icon-bianji1',
 					activity: 't-icon t-icon-huodong'
 				},
+				image01: 'https://ouch-cdn2.icons8.com/2farWQUdLe8J4mb4oQoEvJpl5OFXtM5P7AZi8nhuOxk/rs:fit:912:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9zdmcvOTYz/L2VkZGEwNzAzLTAw/MWYtNGZiZS1hY2I3/LTVlNjRhZGYzNTAx/Mi5zdmc.png',
+				image02: 'https://ouch-cdn2.icons8.com/6CkTSZQdyBYaGiqmNJRhbqoYi8QDcLFn-04VEQyQaCo/rs:fit:962:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9zdmcvNzMz/LzlhYmUzYjIyLTRl/ZGQtNDVkMi1iYWEw/LTVjYjk2NThmNDJi/OC5zdmc.png'
 			}
 		},
 		onLoad() {
@@ -262,49 +272,26 @@
 <style lang="scss">
 	@import '@/pages/common/mainpage.scss';
 
-	.head-card {
-		height: 200rpx;
-		width: 100%;
-		border-radius: $card-border-radius;
-		background-color: $color-mixblue;
-	}
-
-	.flex-colum {
+	.flex {
 		display: flex;
-		flex-direction: column;
 		align-items: center;
-		height: 100%;
 		width: 100%;
 	}
 
-	.state {
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		border-radius: 50rpx;
-		height: 70rpx;
-		width: 210rpx;
-	}
-
-	.state-text {
-		font-size: 48rpx;
-		font-weight: bold;
-		color: #FFF;
-	}
-
 	.text-content {
 		font-size: 30rpx;
 		font-weight: bold;
 		color: $color-title;
-		margin: 20rpx auto 20rpx 15rpx;
+		margin: 10rpx 0 10rpx 15rpx;
+		z-index: 2;
 	}
 
-	.flex {
-		width: 300rpx;
-		margin: 10rpx auto 10rpx 15px;
-		display: flex;
-		align-items: center;
-		justify-content: space-between;
+	.text-info {
+		margin: 10rpx 0 0 10rpx;
+		font-size: 45rpx;
+		font-weight: bold;
+		color: $color-title;
+		z-index: 2;
 	}
 
 	.t-icon {
@@ -317,4 +304,15 @@
 		border-radius: 100rpx;
 		margin-left: 30rpx;
 	}
+
+	.image {
+		position: absolute;
+		margin: 20rpx 0 0 50rpx;
+		height: 300rpx;
+		width: 300rpx;
+		background-size: 100%;
+		background-repeat: no-repeat;
+		opacity: 0.25;
+		z-index: 1;
+	}
 </style>

pages/homework/homework.vue

@@ -15,19 +15,29 @@
 				<view class="card" style="background-color: #4169E1;" v-if="current == 0">
 					<view class="box">
 						<view class="flex">
-							<text class="card-title">今日评测数:</text>
-							<text class="card-title" style="margin-left: 20rpx;">{{testData.length}}</text>
+							<text class="card-title">今日评测:</text>
+							<view class="flex-line">
+								<text class="card-title" style="margin-left: 20rpx;">{{testData.length}}</text>
+								<text class="card-title"
+									style="margin-left: 10rpx;font-size: 36rpx;opacity: 0.8;">份</text>
+							</view>
 						</view>
 						<view class="box" style="margin: 10rpx 0 0 0;">
 							<view class="flex">
 								<view class="index-box"></view>
-								<text class="card-subtitle">完成数量:</text>
-								<text class="card-subtitle" style="margin-left: 20rpx;">{{testFinish}}</text>
+								<text class="card-subtitle">已完成:</text>
+								<view class="flex-line">
+									<text class="card-subtitle"
+										style="margin-left: 20rpx;font-size: 36rpx;">{{testFinish}}</text>
+									<text class="card-subtitle"
+										style="margin-left: 10rpx;font-size: 30rpx;opacity: 0.8;">份</text>
+								</view>
 							</view>
 							<view class="flex">
 								<view class="index-box"></view>
 								<text class="card-subtitle">完成情况:</text>
-								<text class="card-subtitle" style="margin-left: 20rpx;">{{list[0].level}}</text>
+								<text class="card-subtitle"
+									style="margin-left: 20rpx;font-size: 34rpx;">{{list[0].level}}</text>
 							</view>
 						</view>
 					</view>
@@ -37,19 +47,29 @@
 				<view class="card" style="background-color: #ff8caf;" v-if="current == 1">
 					<view class="box">
 						<view class="flex">
-							<text class="card-title">今日作业数:</text>
-							<text class="card-title" style="margin-left: 20rpx;">{{homeworkData.length}}</text>
+							<text class="card-title">今日作业:</text>
+							<view class="flex-line">
+								<text class="card-title" style="margin-left: 20rpx;">{{homeworkData.length}}</text>
+								<text class="card-title"
+									style="margin-left: 10rpx;font-size: 36rpx;opacity: 0.8;">份</text>
+							</view>
 						</view>
 						<view class="box" style="margin: 10rpx 0 0 0;">
 							<view class="flex">
 								<view class="index-box"></view>
-								<text class="card-subtitle">完成数量:</text>
-								<text class="card-subtitle" style="margin-left: 20rpx;">{{homeworkFinish}}</text>
+								<text class="card-subtitle">已完成:</text>
+								<view class="flex-line">
+									<text class="card-subtitle"
+										style="margin-left: 20rpx;font-size: 36rpx;">{{homeworkFinish}}</text>
+									<text class="card-subtitle"
+										style="margin-left: 10rpx;font-size: 30rpx;opacity: 0.8;">份</text>
+								</view>
 							</view>
 							<view class="flex">
 								<view class="index-box"></view>
 								<text class="card-subtitle">完成情况:</text>
-								<text class="card-subtitle" style="margin-left: 20rpx;">{{list[1].level}}</text>
+								<text class="card-subtitle"
+									style="margin-left: 20rpx;font-size: 34rpx;">{{list[1].level}}</text>
 							</view>
 						</view>
 					</view>
@@ -59,19 +79,29 @@
 				<view class="card" style="background-color: #f9c752;" v-if="current == 2">
 					<view class="box">
 						<view class="flex">
-							<text class="card-title">今日活动数:</text>
-							<text class="card-title" style="margin-left: 20rpx;">{{activityData.length}}</text>
+							<text class="card-title">今日活动:</text>
+							<view class="flex-line">
+								<text class="card-title" style="margin-left: 20rpx;">{{activityData.length}}</text>
+								<text class="card-title"
+									style="margin-left: 10rpx;font-size: 36rpx;opacity: 0.8;">例</text>
+							</view>
 						</view>
 						<view class="box" style="margin: 10rpx 0 0 0;">
 							<view class="flex">
 								<view class="index-box"></view>
-								<text class="card-subtitle">完成数量:</text>
-								<text class="card-subtitle" style="margin-left: 20rpx;">{{activityFinish}}</text>
+								<text class="card-subtitle">已完成:</text>
+								<view class="flex-line">
+									<text class="card-subtitle"
+										style="margin-left: 20rpx;font-size: 36rpx;">{{activityFinish}}</text>
+									<text class="card-subtitle"
+										style="margin-left: 10rpx;font-size: 30rpx;opacity: 0.8;">例</text>
+								</view>
 							</view>
 							<view class="flex">
 								<view class="index-box"></view>
 								<text class="card-subtitle">完成情况:</text>
-								<text class="card-subtitle" style="margin-left: 20rpx;">{{list[2].level}}</text>
+								<text class="card-subtitle"
+									style="margin-left: 20rpx;font-size: 34rpx;">{{list[2].level}}</text>
 							</view>
 						</view>
 					</view>
@@ -91,11 +121,13 @@
 						</view>
 						<view class="charts-box" v-if="current == 1">
 							<qiun-data-charts type="fin-area" :chartData="assignment.homeworkData" :loadingType="4"
-								:canvas2d='true' tooltipFormat='HomeworkPercent' canvasId='canvans0933511' :opts="{color:['#ff8caf']}"/>
+								:canvas2d='true' tooltipFormat='HomeworkPercent' canvasId='canvans0933511'
+								:opts="{color:['#ff8caf']}" />
 						</view>
 						<view class="charts-box" v-if="current == 2">
 							<qiun-data-charts type="fin-area" :chartData="assignment.activityData" :loadingType="4"
-								:canvas2d='true' tooltipFormat='HomeworkPercent' canvasId='canvans0531032' :opts="{color:['#f9c752']}"/>
+								:canvas2d='true' tooltipFormat='HomeworkPercent' canvasId='canvans0531032'
+								:opts="{color:['#f9c752']}" />
 						</view>
 					</view>
 					<!-- 详情列表 -->
@@ -120,14 +152,22 @@
 									</view>
 
 									<view style=" display: flex; justify-content: space-between; width: 50%;">
-										<view class="block-tag-box" :style="{borderColor: item.examInfo.progress === 'finish'? '#23b46c':'#4169E1'}">
-											<view class="block-tag" :style="{color: item.examInfo.progress === 'finish'? '#23b46c':'#4169E1'}">{{item.examInfo.subjects[0].name}}</view>
+										<view class="block-tag-box"
+											:style="{borderColor: item.examInfo.progress === 'finish'? '#23b46c':'#4169E1'}">
+											<view class="block-tag"
+												:style="{color: item.examInfo.progress === 'finish'? '#23b46c':'#4169E1'}">
+												{{item.examInfo.subjects[0].name}}</view>
 										</view>
-										<view class="block-tag-box" :style="{borderColor: item.examInfo.progress === 'finish'? '#23b46c':'#4169E1'}">
-											<view class="block-tag" :style="{color: item.examInfo.progress === 'finish'? '#23b46c':'#4169E1'}">{{item.examInfo.examType.name}}</view>
+										<view class="block-tag-box"
+											:style="{borderColor: item.examInfo.progress === 'finish'? '#23b46c':'#4169E1'}">
+											<view class="block-tag"
+												:style="{color: item.examInfo.progress === 'finish'? '#23b46c':'#4169E1'}">
+												{{item.examInfo.examType.name}}</view>
 										</view>
-										<view class="block-tag-box" :style="{borderColor: item.examInfo.progress === 'finish'? '#23b46c':'#4169E1'}">
-											<view class="block-tag" :style="{color: item.examInfo.progress === 'finish'? '#23b46c':'#4169E1'}">
+										<view class="block-tag-box"
+											:style="{borderColor: item.examInfo.progress === 'finish'? '#23b46c':'#4169E1'}">
+											<view class="block-tag"
+												:style="{color: item.examInfo.progress === 'finish'? '#23b46c':'#4169E1'}">
 												{{item.examInfo.progress === 'finish' ? '已完成' : '进行中'}}
 											</view>
 										</view>
@@ -147,7 +187,8 @@
 							</view>
 						</view>
 						<view style="margin-bottom: 20rpx;">
-							<view class="block-box" v-for="(item,i) in homeworkData" :key="i" @click="navSingleData(item)">
+							<view class="block-box" v-for="(item,i) in homeworkData" :key="i"
+								@click="navSingleData(item)">
 								<view class="index"
 									:style="{backgroundColor: item.work.progress === 'finish'? '#23b46c':'#ff8caf'}">
 								</view>
@@ -156,12 +197,17 @@
 
 										<view style="display: flex;margin-left: 30rpx;align-items: center;">
 											<view class="list-item-title">{{item.work.name}}</view>
-											<view class="block-tag-box" :style="{marginLeft: 40+'rpx',borderColor: item.work.progress === 'finish'? '#23b46c':'#ff8caf'}">
-												<view class="block-tag" :style="{color: item.work.progress === 'finish'? '#23b46c':'#ff8caf'}">{{item.work.scope === 'private' ? '个人':'学校'}}作业
+											<view class="block-tag-box"
+												:style="{marginLeft: 40+'rpx',borderColor: item.work.progress === 'finish'? '#23b46c':'#ff8caf'}">
+												<view class="block-tag"
+													:style="{color: item.work.progress === 'finish'? '#23b46c':'#ff8caf'}">
+													{{item.work.scope === 'private' ? '个人':'学校'}}作业
 												</view>
 											</view>
-											<view class="block-tag-box" :style="{marginLeft: 20+'rpx',borderColor: item.work.progress === 'finish'? '#23b46c':'#ff8caf'}">
-												<view class="block-tag" :style="{color: item.work.progress === 'finish'? '#23b46c':'#ff8caf'}">
+											<view class="block-tag-box"
+												:style="{marginLeft: 20+'rpx',borderColor: item.work.progress === 'finish'? '#23b46c':'#ff8caf'}">
+												<view class="block-tag"
+													:style="{color: item.work.progress === 'finish'? '#23b46c':'#ff8caf'}">
 													{{item.work.progress === 'finish' ? '已完成' : '进行中'}}
 												</view>
 											</view>
@@ -184,7 +230,8 @@
 							</view>
 						</view>
 						<view style="margin-bottom: 20rpx;">
-							<view class="block-box" v-for="(item,i) in activityData" :key="i" @click="navSingleData(item)">
+							<view class="block-box" v-for="(item,i) in activityData" :key="i"
+								@click="navSingleData(item)">
 								<view class="index"
 									:style="{ backgroundColor: item.survey.progress === 'finish' || item.vote.progress === 'finish'? '#23b46c':'#f9c752'}">
 								</view>
@@ -195,13 +242,17 @@
 												{{item.survey.name || item.vote.name}}
 											</view>
 
-											<view class="block-tag-box" :style="{ marginLeft: 40+'rpx',borderColor: item.survey.progress === 'finish' || item.vote.progress === 'finish'? '#23b46c':'#f9c752'}">
-												<view class="block-tag" :style="{color: item.survey.progress === 'finish' || item.vote.progress === 'finish'? '#23b46c':'#f9c752'}">
+											<view class="block-tag-box"
+												:style="{ marginLeft: 40+'rpx',borderColor: item.survey.progress === 'finish' || item.vote.progress === 'finish'? '#23b46c':'#f9c752'}">
+												<view class="block-tag"
+													:style="{color: item.survey.progress === 'finish' || item.vote.progress === 'finish'? '#23b46c':'#f9c752'}">
 													{{item.survey.scope === 'private' ? '个人':'学校' || item.vote.scope === 'private' ? '个人':'学校'}}活动
 												</view>
 											</view>
-											<view class="block-tag-box" :style="{ marginLeft: 20+'rpx',borderColor: item.survey.progress === 'finish' || item.vote.progress === 'finish'? '#23b46c':'#f9c752'}">
-												<view class="block-tag" :style="{color: item.survey.progress === 'finish' || item.vote.progress === 'finish'? '#23b46c':'#f9c752'}">
+											<view class="block-tag-box"
+												:style="{ marginLeft: 20+'rpx',borderColor: item.survey.progress === 'finish' || item.vote.progress === 'finish'? '#23b46c':'#f9c752'}">
+												<view class="block-tag"
+													:style="{color: item.survey.progress === 'finish' || item.vote.progress === 'finish'? '#23b46c':'#f9c752'}">
 													{{item.survey.progress === 'finish' || item.vote.progress === 'finish' ? '已完成' : '进行中'}}
 												</view>
 											</view>
@@ -238,14 +289,17 @@
 					name: '评测详情',
 					level: '',
 					image: 'https://ouch-cdn2.icons8.com/yFl5NWU3aVehLBlQf9ctvnZPqtm5U0hqM3IzWvFDCaQ/rs:fit:912:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9wbmcvNzY5/LzY1ZTQxZmZjLTg1/YWQtNDYyMi1hYzU0/LWQ3NDEzZmY2NGI1/YS5wbmc.png',
+					// image: 'https://ouch-cdn2.icons8.com/Fc-Mi2ntM_Ixcp_lS3XI6bUS2YaAyfiX2vlyWGtt7lU/rs:fit:1186:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9zdmcvOTk1/L2FkZjRlMGQzLTg3/N2ItNGMwYy04ZjY5/LWQxODUwOGRjMWMy/NC5zdmc.png'
 				}, {
 					name: '作业详情',
 					level: '',
 					image: 'https://ouch-cdn2.icons8.com/AVOwJ9emg_ZOeHvQaunQAZlgeLsG-b1cGhiYvgoJ06g/rs:fit:912:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9wbmcvNTAw/LzI5YjU1YWQ4LWMw/YTEtNDE1MS1iYmQw/LWIyMDdhYmRkOTE0/Mi5wbmc.png',
+					// image: 'https://ouch-cdn2.icons8.com/HHFusNSROgWCPTuBkHHGmsnUa6MIJA1AxYfCtXQg310/rs:fit:1094:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9zdmcvMzYx/LzlhM2NmMWQzLTg5/NTgtNDNmMi1hYTc1/LTk5NmY0M2U2NTc4/MC5zdmc.png'
 				}, {
 					name: '活动详情',
 					level: '',
 					image: 'https://ouch-cdn2.icons8.com/LW70TMgW1cGfYeGNSTEp7__kiKVgIhwdZwUmykdLYMY/rs:fit:912:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9wbmcvOTI0/LzU3MWU4ZDZkLTg0/NzEtNGM5YS04MDJk/LTEzNTM5YmZmZTM2/YS5wbmc.png',
+					// image: 'https://ouch-cdn2.icons8.com/2OQwTztN6Gf0XXjbHCAS3a1Qa9CWEr2EG759oTb7MFM/rs:fit:1216:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9zdmcvNzgw/LzdhNTk3OThlLTU2/ZmEtNGY3OC05Mjdm/LTRhMmQ0NWNhOWY3/MC5zdmc.png'
 				}],
 				//当前模块
 				current: 0,
@@ -281,7 +335,7 @@
 		},
 		methods: {
 			...mapMutations('m_chart', ['updateTestArea', 'updateHomeworkArea', 'updateActivityArea']),
-			...mapMutations('m_children', ['updateDetailList','updateDetail']),
+			...mapMutations('m_children', ['updateDetailList', 'updateDetail']),
 			//初始化页面
 			init() {
 				this.timeStamp = (new Date()).format("hh:mm")
@@ -366,7 +420,7 @@
 				}
 			},
 			//导航到单条数据页面
-			navSingleData(item){
+			navSingleData(item) {
 				if (this.current === 0) {
 					this.updateDetail(item)
 					console.log(item);
@@ -508,6 +562,7 @@
 		height: 30rpx;
 		width: 10rpx;
 		border-radius: 100rpx;
+		margin-left: 10rpx;
 	}
 
 	//图表
@@ -533,4 +588,9 @@
 		align-items: center;
 		margin: 0 5rpx 0 auto;
 	}
+
+	.flex-line {
+		display: flex;
+		align-items: baseline;
+	}
 </style>

subpkg/calendar/calendar.vue

@@ -19,7 +19,7 @@
 						<view class="number-box">
 							<text class="number"
 								:style="{color: monthAttendQuality==='优秀'?'#4169E1':(monthAttendQuality === '良好'?'#f9c752':'#ff5959')}">{{monthAttendQuality}}</text>
-							<view class="number-detail">出勤质量</view>
+							<view class="number-detail">出勤率</view>
 						</view>
 					</view>
 				</view>
@@ -43,7 +43,7 @@
 							<text class="msg-text">{{attendanceTime}}</text>
 						</view>
 						<view class="flex">
-							<text class="msg-text" style="font-weight: normal;font-size: 28rpx;">出勤速度:</text>
+							<text class="msg-text" style="font-weight: normal;font-size: 28rpx;">出勤效率:</text>
 							<text class="msg-text"
 								:style="{color: attendanceQuality==='优秀'?'#4169E1':(attendanceQuality === '良好'?'#f9c752':'#3B4144')}">{{attendanceQuality}}</text>
 						</view>

subpkg/common/videopage.scss

@@ -105,13 +105,13 @@
 				justify-content: center;
 				margin-left: 20rpx;
 				height: 70rpx;
-				width: 120rpx;
+				width: 140rpx;
 				border-radius: 10rpx;
 				
 			}
 			.t-icon{
-				width: 60rpx;
-				height: 60rpx;
+				width: 50rpx;
+				height: 50rpx;
 			}
 		}
 		.flex-box{

subpkg/video/livepage.vue

@@ -49,10 +49,12 @@
 			<!-- 正文 -->
 			<view class="class-block">
 				<view class="content-box">
-					<view
-						:class="index<classCurrent-1? 't-icon t-icon-tick-square-svgrepo-com':(index===classCurrent-1? 't-icon t-icon-a-play-svgrepo-com1':'t-icon t-icon-time-square-svgrepo-com')">
+					<view style="display: flex;align-items: center;">
+						<view :class="index<classCurrent-1? 't-icon t-icon-tick-square-svgrepo-com':(index===classCurrent-1? 't-icon t-icon-a-play-svgrepo-com1':'t-icon t-icon-time-square-svgrepo-com')">
+						</view>
+						<view class="content-info" style="margin-left: 10rpx;font-size: 34rpx;line-height: 50rpx;">{{item.name}}</view>
 					</view>
-					<view class="content-info">{{item.name}}</view>
+					
 					<view class="block-tag-box">
 						<view class="block-tag">{{item.teacher}}</view>
 					</view>
@@ -158,7 +160,7 @@
 				})
 			},
 			showLive(index) {
-				if (index === this.classCurrent) {
+				if (index === this.classCurrent-1) {
 					uni.$showMsg('当前正在播放此课程')
 				} else {
 					this.classInfo = this.classList[index]
@@ -171,8 +173,4 @@
 
 <style lang="scss">
 	@import '@/subpkg/common/videopage.scss';
-
-	.u-icon__icon.data-v-2ee87dc9 {
-		display: none !important;
-	}
 </style>

subpkg/video/videopage.vue

@@ -48,10 +48,12 @@
 			<!-- 正文 -->
 			<view class="class-block">
 				<view class="content-box">
-					<view
-						:class="index<classCurrent-1? 't-icon t-icon-tick-square-svgrepo-com':(index===classCurrent-1? 't-icon t-icon-a-play-svgrepo-com1':'t-icon t-icon-time-square-svgrepo-com')">
+					<view style="display: flex;align-items: center;">
+						<view :class="index<classCurrent-1? 't-icon t-icon-tick-square-svgrepo-com':(index===classCurrent-1? 't-icon t-icon-a-play-svgrepo-com1':'t-icon t-icon-time-square-svgrepo-com')">
+						</view>
+						<view class="content-info" style="margin-left: 10rpx;font-size: 34rpx;line-height: 50rpx;">{{item.name}}</view>
 					</view>
-					<view class="content-info">{{item.name}}</view>
+
 					<view class="block-tag-box">
 						<view class="block-tag">{{item.teacher}}</view>
 					</view>
@@ -65,7 +67,7 @@
 						@click="showLive(index)">
 						<view class="content-subtitle">正在直播</view>
 					</view>
-					<view class="btn" v-if="index>classCurrent1-1" :style="{backgroundColor:'#aaa'}">
+					<view class="btn" v-if="index>classCurrent-1" :style="{backgroundColor:'#aaa'}">
 						<view class="content-subtitle">暂未开始</view>
 					</view>
 				</view>
@@ -238,8 +240,4 @@
 			color: #FFF;
 		}
 	}
-
-	.u-icon__icon.data-v-2ee87dc9 {
-		display: none !important;
-	}
 </style>

uni_modules/uview-ui/components/u-action-sheet/u-action-sheet.vue

@@ -18,12 +18,6 @@
 				    class="u-action-sheet__header__icon-wrap"
 				    @tap.stop="close"
 				>
-					<u-icon
-					    name="close"
-					    size="17"
-					    color="#c8c9cc"
-					    bold
-					></u-icon>
 				</view>
 			</view>
 			<text

utils/APIHandler.js

@@ -979,6 +979,21 @@ function initHome() {
 		date: 7,
 		month: 5,
 		year: 2022,
+		time: '08:07'
+	}, {
+		date: 8,
+		month: 5,
+		year: 2022,
+		time: '08:27'
+	}, {
+		date: 9,
+		month: 5,
+		year: 2022,
+		time: '08:15'
+	}, {
+		date: 10,
+		month: 5,
+		year: 2022,
 		time: '08:17'
 	}]
 	this.$store.commit('m_children/updateRecords', records)