update: 新模块设计与部分bug修复

.vs/ProjectSettings.json

@@ -0,0 +1,3 @@
+{
+  "CurrentProjectSetting": null
+}

common/global_scss/pages_style.scss

@@ -127,7 +127,7 @@ page{
 	.bg_box {
 		position: fixed;
 		width: 100%;
-		height: 1000rpx;
+		height: 900rpx;
 		background-size: 100%;
 		background-repeat: no-repeat;
 		background-image: linear-gradient(to top, #f3f4f9, rgba(255, 255, 255, 0)),url('https://images.unsplash.com/photo-1527066579998-dbbae57f45ce?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1000&q=80');
@@ -144,7 +144,7 @@ page{
 	.bg_card{
 		position: fixed;
 		width: 100%;
-		height: 1000rpx;
+		height: 900rpx;
 		background-size: 100%;
 		background-repeat: no-repeat;
 		background-image: linear-gradient(to top, #f3f4f9, rgba(255, 255, 255, 0)),url('https://images.unsplash.com/photo-1630638865523-fd3a48512b0e?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1000&q=80');

pages/init/init.vue

@@ -1,6 +1,6 @@
 <template>
 	<view>
-		<u-loading-page :loading="true" loadingText="正在加载中" loadingMode="semicircle"></u-loading-page>
+		<u-loading-page :loading="true" loadingText="正在加载中..." loadingMode="semicircle"></u-loading-page>
 	</view>
 </template>
 

pages/style/tab_pages.scss

@@ -46,7 +46,6 @@
 					}
 				}
 			}
-			
 		}
 	}
 	//课程表列
@@ -128,4 +127,27 @@
 		font-size: 26rpx;
 		opacity: 0.7;
 		color: #FFF;
+	}
+	.scroll_view_bottom{
+		white-space: nowrap;
+		height: 400rpx;
+		._item{
+			margin: 0 20rpx;
+			display: inline-block;
+			vertical-align: top;
+			background-color: #FFF;
+			border-radius: $border-radius;
+			height: 350rpx;
+			width: 300rpx;
+			overflow: hidden;
+			z-index: 55;
+			.image_box{
+				height: 220rpx;
+				width: 100%;
+				border-radius: $border-radius;
+				background-size: cover; //背景图片自适应
+				background-repeat: no-repeat;
+				z-index: 50;
+			}
+		}
 	}

pages/tab_exam/tab_exam.vue

@@ -77,17 +77,21 @@
 					</view>
 				</view>
 			</view>
-			<!-- 卡片 -->
-			<!-- 课例列表 -->
-			<view class="flex_cloumn" style="margin-left: 20rpx;">
-				<view class="title" style="font-size: 32rpx;">评测成绩</view>
+
+			<view class="flex_cloumn" style="margin: 15rpx 0 10rpx 20rpx;">
+				<view class="title" style="font-size: 32rpx;">评测练习</view>
 				<view class="bottom_tag"></view>
 			</view>
 			
 			<view class="flex_row" style="width: 70%;"></view>
-			
-			<view class="card_item" style="width: 35%;"></view>
 		</view>
+		<scroll-view class="scroll_view_bottom" scroll-x="true" :scroll-with-animation="true" scroll-left="0">
+			<view class="_item"></view>
+			<view class="_item"></view>
+			<view class="_item"></view>
+			<view class="_item"></view>
+			<view class="_item"></view>
+		</scroll-view>
 	</view>
 </template>
 

pages/tab_home/tab_home.vue

@@ -1,327 +1,350 @@
 <template>
-	<view class="page_view">
-		<!-- 成绩统计 -->
-		<view class="bg1">
-			<top-info :timeStamp="timeStamp"></top-info>
-			<scroll-view class="scroll_view" scroll-x="true" :scroll-with-animation="true" scroll-left="0">
-				<view class="view_box">
-					<view class="scroll_view_item" v-for="(item,index) in cardList" :key="index" @click="navTab(index)">
-						<view class="card_info">
-							<view :class="item.icon"></view>
-							<view class="title">{{item.title}}</view>
-						</view>
-						<view class="chart_box">
-							<qiun-data-charts type="arcbar" :chartData="item.data" :canvas2d='true'
-								:canvasId='item.canvasId' :opts="item.chartOpts" />
+	<view>
+		<view v-if="!isHomeLoad">
+			<u-loading-page :loading="true" loadingText="请稍候..." loadingMode="semicircle"></u-loading-page>
+		</view>
+		<view class="page_view" v-if="isHomeLoad">
+			<!-- 成绩统计 -->
+			<view class="bg1">
+				<top-info :timeStamp="timeStamp"></top-info>
+				<scroll-view class="scroll_view" scroll-x="true" :scroll-with-animation="true" scroll-left="0">
+					<view class="view_box">
+						<view class="scroll_view_item" v-for="(item,index) in cardList" :key="index"
+							@click="navTab(index)">
+							<view class="card_info">
+								<view :class="item.icon"></view>
+								<view class="title">{{item.title}}</view>
+							</view>
+							<view class="chart_box">
+								<qiun-data-charts type="arcbar" :chartData="item.data" :canvas2d='true'
+									:canvasId='item.canvasId' :opts="item.chartOpts" />
+							</view>
 						</view>
 					</view>
-				</view>
 
-			</scroll-view>
-		</view>
-		<!-- 通知 -->
-		<view class="bg2">
-			<view class="notice">
-				<u-notice-bar :text="noticeData" bgColor="rgba(65,105,225,0.4)" color="#FFF"
-					url="/subpkg/datalist/messagedetail"></u-notice-bar>
+				</scroll-view>
 			</view>
-		</view>
-		<!-- 课程 -->
-		<view class="card_view">
-			<!-- 今日课程模块 -->
-			<view class="card_item" style="width: 100%;" v-if="classCurrent != -1">
-				<view class="card_title">
-					<view class="front_tag"></view>
-					<view class="title">今日课程</view>
-					<view class="flex_row" style="margin: 0 0 0 auto;" @click="navClassDetail">
-						<view class="t-icon t-icon-fenlei"></view>
-						<view class="title" style="color: #4169E1;margin-left: 10rpx;">课程列表</view>
-					</view>
+			<!-- 通知 -->
+			<view class="bg2">
+				<view class="notice">
+					<u-notice-bar :text="noticeData" bgColor="rgba(65,105,225,0.4)" color="#FFF"
+						url="/subpkg/datalist/messagedetail"></u-notice-bar>
 				</view>
-				<view class="class_list">
-					<!-- 上上节 -->
-					<view class="class_item" v-if="classCurrent === classList.length">
-						<view class="flex_row">
-							<view class="t-icon t-icon-classicon-copy" style="width: 60rpx; height: 60rpx;"></view>
-							<view class="flex_cloumn">
-								<view class="flex_row">
-									<view class="class_item_title">{{classList[classCurrent - 3].title}}</view>
-									<view class="tag">
-										<view class="tag_text">{{classList[classCurrent - 3].name}}</view>
+			</view>
+			<!-- 课程 -->
+			<view class="card_view">
+				<!-- 今日课程模块 -->
+				<view class="card_item" style="width: 100%;" v-if="classCurrent != -1">
+					<view class="card_title">
+						<view class="front_tag"></view>
+						<view class="title">今日课程</view>
+						<view class="flex_row" style="margin: 0 0 0 auto;" @click="navClassDetail">
+							<view class="t-icon t-icon-fenlei"></view>
+							<view class="title" style="color: #4169E1;margin-left: 10rpx;">课程列表</view>
+						</view>
+					</view>
+					<view class="class_list">
+						<!-- 上上节 -->
+						<view class="class_item" v-if="classCurrent === classList.length">
+							<view class="flex_row">
+								<view class="t-icon t-icon-classicon-copy" style="width: 60rpx; height: 60rpx;"></view>
+								<view class="flex_cloumn">
+									<view class="flex_row">
+										<view class="class_item_title">{{classList[classCurrent - 3].title}}</view>
+										<view class="tag">
+											<view class="tag_text">{{classList[classCurrent - 3].name}}</view>
+										</view>
+										<view class="tag">
+											<view class="tag_text">{{classList[classCurrent - 3].teacher}}</view>
+										</view>
 									</view>
-									<view class="tag">
-										<view class="tag_text">{{classList[classCurrent - 3].teacher}}</view>
+									<view class="flex_row">
+										<view class="class_item_subtitle">上节</view>
+										<view class="class_item_detail" style="font-size: 32rpx;">
+											{{classList[classCurrent - 3].time}}
+										</view>
 									</view>
 								</view>
-								<view class="flex_row">
-									<view class="class_item_subtitle">上节</view>
-									<view class="class_item_detail" style="font-size: 32rpx;">
-										{{classList[classCurrent - 3].time}}
-									</view>
+
+								<view class="class_btn">
+									<view class="_text">{{classList[classCurrent - 3].attendance?'已出勤':'未出勤'}}</view>
 								</view>
-							</view>
 
-							<view class="class_btn">
-								<view class="_text">{{classList[classCurrent - 3].attendance?'已出勤':'未出勤'}}</view>
 							</view>
-
 						</view>
-					</view>
-					<!-- 上节 -->
-					<view class="class_item" v-if="classCurrent >= 2">
-						<view class="flex_row">
-							<view class="t-icon t-icon-classicon-copy" style="width: 60rpx; height: 60rpx;"></view>
-							<view class="flex_cloumn">
-								<view class="flex_row">
-									<view class="class_item_title">{{classList[classCurrent - 2].title}}</view>
-									<view class="tag">
-										<view class="tag_text">{{classList[classCurrent - 2].name}}</view>
+						<!-- 上节 -->
+						<view class="class_item" v-if="classCurrent >= 2">
+							<view class="flex_row">
+								<view class="t-icon t-icon-classicon-copy" style="width: 60rpx; height: 60rpx;"></view>
+								<view class="flex_cloumn">
+									<view class="flex_row">
+										<view class="class_item_title">{{classList[classCurrent - 2].title}}</view>
+										<view class="tag">
+											<view class="tag_text">{{classList[classCurrent - 2].name}}</view>
+										</view>
+										<view class="tag">
+											<view class="tag_text">{{classList[classCurrent - 2].teacher}}</view>
+										</view>
 									</view>
-									<view class="tag">
-										<view class="tag_text">{{classList[classCurrent - 2].teacher}}</view>
+									<view class="flex_row">
+										<view class="class_item_subtitle">上节</view>
+										<view class="class_item_detail" style="font-size: 32rpx;">
+											{{classList[classCurrent - 2].time}}
+										</view>
 									</view>
 								</view>
-								<view class="flex_row">
-									<view class="class_item_subtitle">上节</view>
-									<view class="class_item_detail" style="font-size: 32rpx;">
-										{{classList[classCurrent - 2].time}}
-									</view>
+
+								<view class="class_btn">
+									<view class="_text">{{classList[classCurrent - 2].attendance?'已出勤':'未出勤'}}</view>
 								</view>
-							</view>
 
-							<view class="class_btn">
-								<view class="_text">{{classList[classCurrent - 2].attendance?'已出勤':'未出勤'}}</view>
 							</view>
-
 						</view>
-					</view>
-					<!-- 当前 -->
-					<view class="class_item" style="background-color: #FFF;background: #FFF;">
-						<view class="flex_row">
-							<view class="t-icon t-icon-classicon-copy" style="width: 60rpx; height: 60rpx;"></view>
-							<view class="flex_cloumn">
-								<view class="flex_row">
-									<view class="class_item_title" style="color: #4169E1;">
-										{{classList[classCurrent - 1].title}}
-									</view>
-									<view class="tag">
-										<view class="tag_text">{{classList[classCurrent - 1].name}}</view>
+						<!-- 当前 -->
+						<view class="class_item" style="background-color: #FFF;background: #FFF;">
+							<view class="flex_row">
+								<view class="t-icon t-icon-classicon-copy" style="width: 60rpx; height: 60rpx;"></view>
+								<view class="flex_cloumn">
+									<view class="flex_row">
+										<view class="class_item_title" style="color: #4169E1;">
+											{{classList[classCurrent - 1].title}}
+										</view>
+										<view class="tag">
+											<view class="tag_text">{{classList[classCurrent - 1].name}}</view>
+										</view>
+										<view class="tag">
+											<view class="tag_text">{{classList[classCurrent - 1].teacher}}</view>
+										</view>
 									</view>
-									<view class="tag">
-										<view class="tag_text">{{classList[classCurrent - 1].teacher}}</view>
+									<view class="flex_row">
+										<view class="class_item_subtitle" style="color: #4169E1;">当前</view>
+										<view class="class_item_detail" style="font-size: 32rpx;color: #4169E1;">
+											{{classList[classCurrent - 1].time}}
+										</view>
 									</view>
 								</view>
-								<view class="flex_row">
-									<view class="class_item_subtitle" style="color: #4169E1;">当前</view>
-									<view class="class_item_detail" style="font-size: 32rpx;color: #4169E1;">
-										{{classList[classCurrent - 1].time}}
-									</view>
+
+								<view class="class_btn" style="background-color: #ff5959;">
+									<view class="_text">{{classList[classCurrent - 1].attendance?'课程中':'未出勤'}}</view>
 								</view>
-							</view>
 
-							<view class="class_btn" style="background-color: #ff5959;">
-								<view class="_text">{{classList[classCurrent - 1].attendance?'课程中':'未出勤'}}</view>
 							</view>
-
 						</view>
-					</view>
-					<!-- 下节 -->
-					<view class="class_item" v-if="classCurrent != classList.length">
-						<view class="flex_row">
-							<view class="t-icon t-icon-classicon-noarrive" style="width: 60rpx; height: 60rpx;"></view>
-							<view class="flex_cloumn">
-								<view class="flex_row">
-									<view class="class_item_title">{{classList[classCurrent].title}}</view>
-									<view class="tag">
-										<view class="tag_text">{{classList[classCurrent].name}}</view>
+						<!-- 下节 -->
+						<view class="class_item" v-if="classCurrent != classList.length">
+							<view class="flex_row">
+								<view class="t-icon t-icon-classicon-noarrive" style="width: 60rpx; height: 60rpx;">
+								</view>
+								<view class="flex_cloumn">
+									<view class="flex_row">
+										<view class="class_item_title">{{classList[classCurrent].title}}</view>
+										<view class="tag">
+											<view class="tag_text">{{classList[classCurrent].name}}</view>
+										</view>
+										<view class="tag">
+											<view class="tag_text">{{classList[classCurrent].teacher}}</view>
+										</view>
 									</view>
-									<view class="tag">
-										<view class="tag_text">{{classList[classCurrent].teacher}}</view>
+									<view class="flex_row">
+										<view class="class_item_subtitle">下节</view>
+										<view class="class_item_detail" style="font-size: 32rpx;">
+											{{classList[classCurrent].time}}
+										</view>
 									</view>
 								</view>
-								<view class="flex_row">
-									<view class="class_item_subtitle">下节</view>
-									<view class="class_item_detail" style="font-size: 32rpx;">
-										{{classList[classCurrent].time}}
-									</view>
+
+								<view class="class_btn" style="background-color: #909399;">
+									<view class="_text">未开始</view>
 								</view>
-							</view>
 
-							<view class="class_btn" style="background-color: #909399;">
-								<view class="_text">未开始</view>
 							</view>
-
 						</view>
-					</view>
-					<!-- 下下节 -->
-					<view class="class_item" v-if="classCurrent === 1">
-						<view class="flex_row">
-							<view class="t-icon t-icon-classicon-noarrive" style="width: 60rpx; height: 60rpx;"></view>
-							<view class="flex_cloumn">
-								<view class="flex_row">
-									<view class="class_item_title">{{classList[classCurrent+1].title}}</view>
-									<view class="tag">
-										<view class="tag_text">{{classList[classCurrent+1].name}}</view>
+						<!-- 下下节 -->
+						<view class="class_item" v-if="classCurrent === 1">
+							<view class="flex_row">
+								<view class="t-icon t-icon-classicon-noarrive" style="width: 60rpx; height: 60rpx;">
+								</view>
+								<view class="flex_cloumn">
+									<view class="flex_row">
+										<view class="class_item_title">{{classList[classCurrent+1].title}}</view>
+										<view class="tag">
+											<view class="tag_text">{{classList[classCurrent+1].name}}</view>
+										</view>
+										<view class="tag">
+											<view class="tag_text">{{classList[classCurrent+1].teacher}}</view>
+										</view>
 									</view>
-									<view class="tag">
-										<view class="tag_text">{{classList[classCurrent+1].teacher}}</view>
+									<view class="flex_row">
+										<view class="class_item_subtitle">下节</view>
+										<view class="class_item_detail" style="font-size: 32rpx;">
+											{{classList[classCurrent+1].time}}
+										</view>
 									</view>
 								</view>
-								<view class="flex_row">
-									<view class="class_item_subtitle">下节</view>
-									<view class="class_item_detail" style="font-size: 32rpx;">
-										{{classList[classCurrent+1].time}}
-									</view>
+
+								<view class="class_btn" style="background-color: #909399;">
+									<view class="_text">未开始</view>
 								</view>
-							</view>
 
-							<view class="class_btn" style="background-color: #909399;">
-								<view class="_text">未开始</view>
 							</view>
-
 						</view>
 					</view>
 				</view>
-			</view>
-			<!-- 插画模块 -->
-			<view class="card_item" style="width: 100%;" v-if="classCurrent === -1">
-				<view class="card_title">
-					<view class="front_tag"></view>
-					<view class="title">今日课程</view>
-				</view>
-				<view class="detail_image" :style="{backgroundImage:`url(${image})`}"></view>
-				<view class="class_list">
-					<view class="class_item" style="height: 120rpx;">
-						<view class="flex_row" style="justify-content: space-around;">
-							<view class="class_item_title">{{classList.length === 0 ? '自由安排' : '准备上课'}}</view>
-							<view class="tag" style="margin: 0;">
-								<view class="tag_text">{{classList.length === 0 ? '无课程' : '已下课'}}</view>
-							</view>
-							<view class="class_item_subtitle">{{classList.length === 0 ? '假期' : '课间'}}</view>
-							<view class="flex_row" @click="navClassDetail">
-								<view class="t-icon t-icon-fenlei"></view>
-								<view class="class_item_title" style="color: #4169E1;margin-left: 10rpx;">课程列表</view>
+				<!-- 插画模块 -->
+				<view class="card_item" style="width: 100%;" v-if="classCurrent === -1">
+					<view class="card_title">
+						<view class="front_tag"></view>
+						<view class="title">今日课程</view>
+					</view>
+					<view class="detail_image" :style="{backgroundImage:`url(${image})`}"></view>
+					<view class="class_list">
+						<view class="class_item" style="height: 120rpx;">
+							<view class="flex_row" style="justify-content: space-around;">
+								<view class="class_item_title">{{classList.length === 0 ? '自由安排' : '准备上课'}}</view>
+								<view class="tag" style="margin: 0;">
+									<view class="tag_text">{{classList.length === 0 ? '无课程' : '已下课'}}</view>
+								</view>
+								<view class="class_item_subtitle">{{classList.length === 0 ? '假期' : '课间'}}</view>
+								<view class="flex_row" @click="navClassDetail">
+									<view class="t-icon t-icon-fenlei"></view>
+									<view class="class_item_title" style="color: #4169E1;margin-left: 10rpx;">课程列表
+									</view>
+								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-			</view>
-			<!-- 今日打卡模块 -->
-			<view class="card_item" style="height: 300rpx;" @click="navClockStats">
-				<view class="flex_row" style="margin: 20rpx 20rpx 0 20rpx;">
-					<view class="icon_box" style="width: 110rpx;height: 110rpx; background-color: #d8deff;">
-						<view class="t-icon t-icon-a-rilidaka" style="width: 60rpx;height: 60rpx;"></view>
-					</view>
-					<view class="item_block">
-						<view class="subtitle">打卡记录</view>
-						<view class="flex_baseline">
-							<view class="title" style="transform: skew(-10deg);">{{dayTime.split('月')[0]}}</view>
-							<view class="title" style="font-size: 22rpx; margin-left: 10rpx;">月</view>
-							<view class="title" style="margin-left: 10rpx;transform: skew(-10deg);">
-								{{dayTime.split('月')[1]}}
+				<!-- 今日打卡模块 -->
+				<view class="card_item" style="height: 300rpx;" @click="navClockStats">
+					<view class="flex_row" style="margin: 20rpx 20rpx 0 20rpx;">
+						<view class="icon_box" style="width: 110rpx;height: 110rpx; background-color: #d8deff;">
+							<view class="t-icon t-icon-a-rilidaka" style="width: 60rpx;height: 60rpx;"></view>
+						</view>
+						<view class="item_block">
+							<view class="subtitle">打卡记录</view>
+							<view class="flex_baseline">
+								<view class="title" style="transform: skew(-10deg);">{{dayTime.split('月')[0]}}</view>
+								<view class="title" style="font-size: 22rpx; margin-left: 10rpx;">月</view>
+								<view class="title" style="margin-left: 10rpx;transform: skew(-10deg);">
+									{{dayTime.split('月')[1]}}
+								</view>
+								<view class="title" style="font-size: 22rpx; margin-left: 10rpx;">日</view>
 							</view>
-							<view class="title" style="font-size: 22rpx; margin-left: 10rpx;">日</view>
 						</view>
 					</view>
-				</view>
-				<view class="flex_row" style="margin: auto 20rpx 20rpx 20rpx;justify-content: space-between;">
-					<view class="item_block" style="margin-left: -10rpx;">
-						<view class="subtitle">打卡时间</view>
-						<view class="title" v-if="clockTime === '未记录'" style="transform: skew(-10deg);">{{clockTime}}
-						</view>
-						<view class="flex_baseline" v-if="clockTime != '未记录'">
-							<view class="title" style="transform: skew(-10deg);">
-								{{clockTime.split(':')[0].replace('0','')}}
+					<view class="flex_row" style="margin: auto 20rpx 20rpx 20rpx;justify-content: space-between;">
+						<view class="item_block" style="margin-left: -10rpx;">
+							<view class="subtitle">打卡时间</view>
+							<view class="title" v-if="clockTime === '无记录'" style="transform: skew(-10deg);">
+								{{clockTime}}
 							</view>
-							<view class="title" style="font-size: 22rpx; margin-left: 10rpx;">点</view>
-							<view class="title" style="transform: skew(-10deg);margin-left: 10rpx;">
-								{{clockTime.split(':')[1]}}
+							<view class="flex_baseline" v-if="clockTime != '无记录'">
+								<view class="title" style="transform: skew(-10deg);">
+									{{clockTime.split(':')[0].replace('0','')}}
+								</view>
+								<view class="title" style="font-size: 22rpx; margin-left: 10rpx;">点</view>
+								<view class="title" style="transform: skew(-10deg);margin-left: 10rpx;">
+									{{clockTime.split(':')[1]}}
+								</view>
+								<view class="title" style="font-size: 22rpx; margin-left: 10rpx;">分</view>
 							</view>
-							<view class="title" style="font-size: 22rpx; margin-left: 10rpx;">分</view>
-						</view>
 
-					</view>
-					<view class="icon_box" style="width: 110rpx;height: 110rpx;"
-						:style="{backgroundColor: clockState === '未打卡' ? '#ff5959':'#4169E1'}">
-						<view class="title" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">{{clockState}}
+						</view>
+						<view class="icon_box" style="width: 110rpx;height: 110rpx;"
+							:style="{backgroundColor: clockState === '未打卡' ? '#ff5959':'#4169E1'}">
+							<view class="title" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">
+								{{clockState}}
+							</view>
 						</view>
 					</view>
-				</view>
-				<view style="width: 0;height: 0;">
-					<view class="image"
-						:style="{backgroundImage: clockState === '已打卡'?`url(${image2})`:`url(${image1})`}">
+					<view style="width: 0;height: 0;">
+						<view class="image"
+							:style="{backgroundImage: clockState === '已打卡'?`url(${image2})`:`url(${image1})`}">
+						</view>
 					</view>
-				</view>
 
-			</view>
-			<!-- 今日出席模块 -->
-			<view class="card_item" style="background-color: #f3f4f9;justify-content: space-between;">
-				<!-- 当前课程 -->
-				<view class="item_box">
-					<view class="icon_box" style="background-color: #d8deff; margin-left: 20rpx;">
-						<view class="t-icon t-icon-shangke-"></view>
-					</view>
-					<view class="flex_cloumn" style="align-items: center; justify-content: space-around;height: 80rpx;">
-						<view class="subtitle" style="font-size: 24rpx;">当前课程</view>
-						<view class="title" style="font-size: 32rpx;" v-if="classCurrent!=-1">
-							{{classList[classCurrent - 1].name}}
+				</view>
+				<!-- 今日出席模块 -->
+				<view class="card_item" style="background-color: #f3f4f9;justify-content: space-between;">
+					<!-- 当前课程 -->
+					<view class="item_box">
+						<view class="icon_box" style="background-color: #d8deff; margin-left: 20rpx;">
+							<view class="t-icon t-icon-shangke-"></view>
 						</view>
-						<view class="title" style="font-size: 32rpx;" v-if="classCurrent===-1">无课程</view>
-					</view>
-					<view v-if="classCurrent != -1">
-						<view class="icon_box" style="margin-right: 20rpx;"
-							:style="{backgroundColor: classList[classCurrent - 1].attendance ? '#23b46c':'#ff5959'}">
-							<view class="subtitle" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">
-								{{classList[classCurrent - 1].attendance ? '出勤':'缺勤'}}
+						<view class="flex_cloumn"
+							style="align-items: center; justify-content: space-around;height: 80rpx;">
+							<view class="subtitle" style="font-size: 24rpx;">当前课程</view>
+							<view class="title" style="font-size: 32rpx;" v-if="classCurrent!=-1">
+								{{classList[classCurrent - 1].name}}
 							</view>
+							<view class="title" style="font-size: 32rpx;" v-if="classCurrent===-1">无课程</view>
 						</view>
-					</view>
-					<view v-if="classCurrent === -1">
-						<view class="icon_box" style="margin-right: 20rpx;background-color: #f9c752;">
-							<view class="subtitle" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">休息
+						<view v-if="classCurrent != -1">
+							<view class="icon_box" style="margin-right: 20rpx;"
+								:style="{backgroundColor: classList[classCurrent - 1].attendance ? '#23b46c':'#ff5959'}">
+								<view class="subtitle" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">
+									{{classList[classCurrent - 1].attendance ? '出勤':'缺勤'}}
+								</view>
 							</view>
 						</view>
-					</view>
-				</view>
-				<!-- 出勤课程统计 -->
-				<view class="item_box">
-					<view class="icon_box" style="background-color: #d8deff;margin-left: 20rpx;">
-						<view class="t-icon t-icon-shangkejilu"></view>
-					</view>
-					<view class="flex_cloumn" style="align-items: center;justify-content: space-around;height: 80rpx;">
-						<view class="subtitle" style="font-size: 24rpx;">出勤课程</view>
-						<view class="title" style="font-size: 32rpx;" v-if="classCurrent!=-1">{{finishClassNum}} 节
+						<view v-if="classCurrent === -1">
+							<view class="icon_box" style="margin-right: 20rpx;background-color: #f9c752;">
+								<view class="subtitle" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">休息
+								</view>
+							</view>
 						</view>
-						<view class="title" style="font-size: 32rpx;" v-if="classCurrent===-1">无统计</view>
 					</view>
-					<view v-if="classList">
-						<view class="icon_box" style="margin-right: 20rpx;"
-							:style="{backgroundColor: classAttendanceQuality === '全勤' ? '#23b46c':'#ff5959'}">
-							<view class="subtitle" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">
-								{{classAttendanceQuality}}
+					<!-- 出勤课程统计 -->
+					<view class="item_box">
+						<view class="icon_box" style="background-color: #d8deff;margin-left: 20rpx;">
+							<view class="t-icon t-icon-shangkejilu"></view>
+						</view>
+						<view class="flex_cloumn"
+							style="align-items: center;justify-content: space-around;height: 80rpx;">
+							<view class="subtitle" style="font-size: 24rpx;">出勤课程</view>
+							<view class="title" style="font-size: 32rpx;" v-if="classCurrent!=-1">{{finishClassNum}} 节
 							</view>
+							<view class="title" style="font-size: 32rpx;" v-if="classCurrent===-1">无统计</view>
 						</view>
-					</view>
-					<view v-if="!classList">
-						<view class="icon_box" style="margin-right: 20rpx;background-color: #f9c752;">
-							<view class="subtitle" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">休息
+						<view v-if="classList">
+							<view class="icon_box" style="margin-right: 20rpx;"
+								:style="{backgroundColor: classAttendanceQuality === '全勤' ? '#23b46c':'#ff5959'}">
+								<view class="subtitle" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">
+									{{classAttendanceQuality}}
+								</view>
+							</view>
+						</view>
+						<view v-if="!classList">
+							<view class="icon_box" style="margin-right: 20rpx;background-color: #f9c752;">
+								<view class="subtitle" style="color: #FFF;font-size: 26rpx;transform: skew(-10deg);">休息
+								</view>
 							</view>
 						</view>
 					</view>
 				</view>
-			</view>
 
-			<!-- 课例列表 -->
-			<view class="flex_cloumn" style="margin-left: 20rpx;">
-				<view class="title" style="font-size: 32rpx;">今日推荐</view>
-				<view class="bottom_tag"></view>
+				<!-- 课例列表 -->
+				<view class="flex_cloumn" style="margin: 15rpx 0 10rpx 20rpx;">
+					<view class="title" style="font-size: 32rpx;">课程推荐</view>
+					<view class="bottom_tag"></view>
+				</view>
+				<view class="flex_row" style="width: 70%;"></view>
 			</view>
-			<view class="flex_row" style="width: 70%;"></view>
-
-			<view class="card_item" style="width: 35%;"></view>
+			<scroll-view class="scroll_view_bottom" scroll-x="true" :scroll-with-animation="true" scroll-left="0">
+				<view class="_item">
+					<view class="image_box" :style="{backgroundImage:`url(${'https://img08.tooopen.com/20220512/tooopen_v1036583658bee5dec1-490e-4298-8d44-e3a96b89a6e2.jpg'})`}">
 
+					</view>
+					
+				</view>
+				<view class="_item"></view>
+				<view class="_item"></view>
+				<view class="_item"></view>
+				<view class="_item"></view>
+			</scroll-view>
 		</view>
 	</view>
+
 </template>
 
 <script>
@@ -343,8 +366,8 @@
 					canvasId: 'tab_home_chart1',
 					data: {
 						"series": [{
-							"name": "评测完成",
-							"data": '',
+							"name": "评测完成率",
+							"data": '无评测',
 							"color": "#ff8caf"
 						}]
 					},
@@ -355,8 +378,8 @@
 					canvasId: 'tab_home_chart2',
 					data: {
 						"series": [{
-							"name": "作业完成",
-							"data": '',
+							"name": "作业完成率",
+							"data": '无作业',
 							"color": "#f9c752"
 						}]
 					},
@@ -367,8 +390,8 @@
 					canvasId: 'tab_home_chart3',
 					data: {
 						"series": [{
-							"name": "活动完成",
-							"data": '',
+							"name": "活动完成率",
+							"data": '无活动',
 							"color": "#FF6D31"
 						}]
 					},
@@ -392,7 +415,8 @@
 				classAttendanceQuality: '',
 				//打卡状态image
 				image1: 'https://ouch-cdn2.icons8.com/2farWQUdLe8J4mb4oQoEvJpl5OFXtM5P7AZi8nhuOxk/rs:fit:912:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9zdmcvOTYz/L2VkZGEwNzAzLTAw/MWYtNGZiZS1hY2I3/LTVlNjRhZGYzNTAx/Mi5zdmc.png',
-				image2: 'https://ouch-cdn2.icons8.com/6CkTSZQdyBYaGiqmNJRhbqoYi8QDcLFn-04VEQyQaCo/rs:fit:962:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9zdmcvNzMz/LzlhYmUzYjIyLTRl/ZGQtNDVkMi1iYWEw/LTVjYjk2NThmNDJi/OC5zdmc.png'
+				image2: 'https://ouch-cdn2.icons8.com/6CkTSZQdyBYaGiqmNJRhbqoYi8QDcLFn-04VEQyQaCo/rs:fit:962:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9zdmcvNzMz/LzlhYmUzYjIyLTRl/ZGQtNDVkMi1iYWEw/LTVjYjk2NThmNDJi/OC5zdmc.png',
+				isHomeLoad: false
 			};
 		},
 		onLoad() {
@@ -413,10 +437,10 @@
 				await this.$initHome()
 				this.getClassCurrent()
 				this.getChartData()
-				this.setOpts()
 				this.getNoticeData()
 				this.getClockData()
 				this.getClassAttendance()
+				this.isHomeLoad = true
 			},
 			//计算出当前课程
 			getClassCurrent() {
@@ -465,46 +489,73 @@
 			//更新图表数据
 			getChartData() {
 				//完成数据
-				let examFinishData = this.examData.filter(x => x.examInfo.progress === 'finish')
-				let workFinishData = this.workData.filter(x => x.work.progress === 'finish')
-				let swapFinishData = this.swapData.filter(x => x.vote && x.vote.progress === 'finish')
-				swapFinishData.push(...this.swapData.filter(x => x.survey && x.survey.progress === 'finish'))
-				//计算完成率
-				this.cardList[0].data.series[0].data = (examFinishData.length / this.examData.length).toFixed(2)
-				console.log('评测完成',(examFinishData.length / this.examData.length).toFixed(2));
-				this.cardList[1].data.series[0].data = (workFinishData.length / this.workData.length).toFixed(2)
-				console.log('作业完成',(workFinishData.length / this.workData.length).toFixed(2));
-				this.cardList[2].data.series[0].data = (swapFinishData.length / this.swapData.length).toFixed(2)
-				console.log('活动完成',(swapFinishData.length / this.swapData.length).toFixed(2));
-			},
-			//圆环图设置更新
-			setOpts() {
+				if (this.examData.length != 0) {
+					let examFinishData = this.examData.filter(x => x.examInfo.progress === 'finish')
+					this.cardList[0].data.series[0].data = parseFloat((examFinishData.length / this.examData.length)
+						.toFixed(2))
+				}
+				if (this.workData.length != 0) {
+					let workFinishData = this.workData.filter(x => x.work.progress === 'finish')
+					this.cardList[1].data.series[0].data = parseFloat((workFinishData.length / this.workData.length)
+						.toFixed(2))
+				}
+				if (this.swapData.length != 0) {
+					let swapFinishData = this.swapData.filter(x => x.vote && x.vote.progress === 'finish')
+					swapFinishData.push(...this.swapData.filter(x => x.survey && x.survey.progress === 'finish'))
+					this.cardList[2].data.series[0].data = parseFloat((swapFinishData.length / this.swapData.length)
+						.toFixed(2))
+				}
+				//完成率传入图表
 				for (let i = 0; i < 3; i++) {
-					let opt = {
-						title: {
-							name: this.cardList[i].data.series[0].data * 100 + '%',
-							color: this.cardList[i].data.series[0].color
-						},
-						subtitle: {
-							name: this.cardList[i].data.series[0].name
-						},
+					if (typeof(this.cardList[i].data.series[0].data) === typeof(0)) {
+						let opt = {
+							title: {
+								name: (this.cardList[i].data.series[0].data * 100).toFixed(0) + '%',
+								color: this.cardList[i].data.series[0].color
+							},
+							subtitle: {
+								name: this.cardList[i].data.series[0].name
+							},
+						}
+						this.cardList[i].chartOpts = JSON.parse(JSON.stringify(opt))
+					} else {
+						let opt = {
+							title: {
+								name: this.cardList[i].data.series[0].data,
+								color: this.cardList[i].data.series[0].color
+							},
+							subtitle: {
+								name: this.cardList[i].data.series[0].name
+							},
+						}
+						this.cardList[i].chartOpts = JSON.parse(JSON.stringify(opt))
 					}
-					this.cardList[i].chartOpts = JSON.parse(JSON.stringify(opt))
 				}
 			},
 			//日历数据获取
 			getClockData() {
 				//获得当前时间时间戳
-				let timeArr = (new Date()).format("yyyy-M-dd").split("-")
-				let val = this.clockData.filter(x => x.year == timeArr[0] && x.month == timeArr[1] && x.date == timeArr[2])
-				if (val.length != 0) {
-					this.clockState = '已打卡'
-					this.clockTime = val[0].time
+				let today = (new Date()).format("yyyy-M-dd")
+				let timeArr = today.split("-")
+				if (this.clockData.length != 0) {
+					let val = this.clockData.filter(x => x.year == timeArr[0] && x.month == timeArr[1] && x.date ==
+						timeArr[2])
+					if (val.length != 0) {
+						this.clockState = '已打卡'
+						this.clockTime = val[0].time
+					} else {
+						this.clockState = '未打卡'
+						this.clockTime = '无记录'
+					}
 				} else {
 					this.clockState = '未打卡'
-					this.clockTime = '未记录'
+					this.clockTime = '无记录'
 				}
-
+				// let isWeekend = new Date(today).getDay()
+				// if(isWeekend === 0 || isWeekend === 6){
+				// 	this.clockState = '放假中'
+				// 	this.clockTime = '无需打卡'
+				// }
 			},
 			//获取滚动通知
 			getNoticeData() {
@@ -519,8 +570,13 @@
 				for (let i = 0; i < this.finishClassNum; i++) {
 					finishClassData.push(this.classList[i])
 				}
-				let isAttendArr = finishClassData.filter(x => x.attendance === true)
-				this.classAttendanceQuality = isAttendArr.length === this.finishClassNum ? '全勤' : '缺勤'
+				if (finishClassData.length != 0) {
+					let isAttendArr = finishClassData.filter(x => x.attendance === true)
+					this.classAttendanceQuality = isAttendArr.length === this.finishClassNum ? '全勤' : '缺勤'
+				}
+				// else{
+				// 	this.classAttendanceQuality = '假期'
+				// }
 			},
 			//导航
 			navClassDetail() {
@@ -622,9 +678,9 @@
 		display: flex;
 		align-items: center;
 		margin-left: auto;
-		border-radius: 6rpx;
+		border-radius: $border-radius;
 		background-color: $color-green;
-		padding: 20rpx 10rpx;
+		padding: 24rpx 12rpx;
 
 		.t-icon {
 			width: 32rpx;

pages/tab_swap/tab_swap.vue

@@ -11,7 +11,7 @@
 							<view class="title">{{item.title}}</view>
 						</view>
 						<view class="chart_box">
-							<qiun-data-charts :type="item.type" :chartData="item.data" :opts="{legend:{show: false}}"/>
+							<qiun-data-charts :type="item.type" :chartData="item.data" :opts="{legend:{show: false}}" />
 						</view>
 					</view>
 				</view>
@@ -68,17 +68,33 @@
 										</view>
 									</view>
 								</view>
-								<view class="flex_row" style="width:510rpx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis">
-									<view class="class_item_subtitle" style="font-size: 26rpx;font-weight: 400;">{{item.vote.description || item.survey.description}}</view>
+								<view class="flex_row"
+									style="width:510rpx;overflow: hidden;white-space: nowrap;text-overflow: ellipsis">
+									<view class="class_item_subtitle" style="font-size: 26rpx;font-weight: 400;">
+										{{item.vote.description || item.survey.description}}</view>
 								</view>
 							</view>
 						</view>
 					</view>
 				</view>
 			</view>
-			<!-- 卡片 -->
+
+			<view class="flex_cloumn" style="margin: 15rpx 0 10rpx 20rpx;">
+				<view class="title" style="font-size: 32rpx;">家校互动</view>
+				<view class="bottom_tag"></view>
+			</view>
+
+			<view class="flex_row" style="width: 70%;"></view>
 		</view>
+		<scroll-view class="scroll_view_bottom" scroll-x="true" :scroll-with-animation="true" scroll-left="0">
+			<view class="_item">
 
+			</view>
+			<view class="_item"></view>
+			<view class="_item"></view>
+			<view class="_item"></view>
+			<view class="_item"></view>
+		</scroll-view>
 	</view>
 </template>
 
@@ -107,7 +123,7 @@
 				}, {
 					icon: 't-icon t-icon-lianxi',
 					title: '近期睡眠记录',
-					type: 'pie',
+					type: 'ring',
 					data: '',
 				}],
 				image: 'https://ouch-cdn2.icons8.com/LW70TMgW1cGfYeGNSTEp7__kiKVgIhwdZwUmykdLYMY/rs:fit:912:912/czM6Ly9pY29uczgu/b3VjaC1wcm9kLmFz/c2V0cy9wbmcvOTI0/LzU3MWU4ZDZkLTg0/NzEtNGM5YS04MDJk/LTEzNTM5YmZmZTM2/YS5wbmc.png',
@@ -159,7 +175,7 @@
 					url: `/subpkg/datalist/swaplist?value=${value}`
 				})
 			},
-			navSwapData(index){
+			navSwapData(index) {
 				uni.navigateTo({
 					url: `/subpkg/datalist/swapdata?index=${index}`
 				})

pages/tab_work/tab_work.vue

@@ -73,8 +73,21 @@
 					</view>
 				</view>
 			</view>
-			<!-- 卡片 -->
+
+			<view class="flex_cloumn" style="margin: 15rpx 0 10rpx 20rpx;">
+				<view class="title" style="font-size: 32rpx;">作业例题</view>
+				<view class="bottom_tag"></view>
+			</view>
+			
+			<view class="flex_row" style="width: 70%;"></view>
 		</view>
+		<scroll-view class="scroll_view_bottom" scroll-x="true" :scroll-with-animation="true" scroll-left="0">
+			<view class="_item"></view>
+			<view class="_item"></view>
+			<view class="_item"></view>
+			<view class="_item"></view>
+			<view class="_item"></view>
+		</scroll-view>
 	</view>
 </template>
 

subpkg/datalist/classdetail.vue

@@ -60,7 +60,7 @@
 				<view style="display: flex;flex-direction: column;height: 100%;align-items: center;margin-bottom: 50rpx;" v-if="!currentClassList">
 					<view class="detail_image1" :style="{backgroundImage:`url(${image1})`}"></view>
 					<view class="subtitle">当前选中日期暂无课程</view>
-					<view class="subtitle" style="margin-top: 20rpx;">孩子自由安排</view>
+					<view class="subtitle" style="margin-top: 20rpx;">自由安排当前时间</view>
 				</view>
 			</view>
 		</view>
@@ -178,7 +178,7 @@
 		.week_item_select {
 			display: inline-block;
 			vertical-align: top;
-			height: 200rpx;
+			height: 180rpx;
 			width: 160rpx;
 			margin: 20rpx;
 			padding: 20rpx;

subpkg/startup/options.vue

@@ -13,8 +13,8 @@
 					<view class="card_title">{{item.name}}</view>
 				</view>
 				<view class="avatar_box">
-					<u-avatar size="120" class="avatar" v-if="item.avatar === '默认'" :src="item.gender==='男'?'/static/default_icons/boy_avatar.svg':'/static/default_icons/girl_avatar.svg'" mode="aspectFill"></u-avatar>
-					<u-avatar size="120" class="avatar" v-if="item.avatar != '默认'" :src="item.avatar" mode="aspectFill"></u-avatar>
+						<image class="avatar" v-if="item.avatar === '默认'" :src="item.gender==='男'?'/static/default_icons/boy_avatar.svg':'/static/default_icons/girl_avatar.svg'"></image>
+						<image class="avatar" v-if="item.avatar != '默认'" :src="item.avatar"></image>
 				</view>
 			</view>
 		</view>
@@ -89,8 +89,8 @@
 			.avatar_box {
 				padding-top: 10rpx;
 				.avatar {
-					width: 220rpx;
-					height: 220rpx;
+					width: 240rpx;
+					height: 240rpx;
 				}
 			}
 		}

subpkg/statslist/swapstats.vue

@@ -37,7 +37,8 @@
 				</view>
 				<view class="flex_baseline" style="margin-left: 30rpx;"
 					v-if="item.numData.includes('小时') === false && item.numData != ''">
-					<text class="_item_text" style="margin-left: 10rpx;transform: skew(-15deg);">{{item.numData.replace('分','')}}</text>
+					<text class="_item_text"
+						style="margin-left: 10rpx;transform: skew(-15deg);">{{item.numData.replace('分','')}}</text>
 					<text class="_item_subtext" style="margin-left: 10rpx;opacity:0.8;">分钟</text>
 				</view>
 				<view :class="item.icon"></view>
@@ -48,6 +49,12 @@
 		</u-picker>
 		<!-- 统计列表 -->
 		<view class="card_view" style="margin-top: 0;">
+			<!-- 统计列表 -->
+			<view class="flex_cloumn_box" style="margin-left: 20rpx;">
+				<view class="title" style="font-size: 32rpx;">近期统计</view>
+				<view class="bottom_tag"
+					style="background-image: linear-gradient(to right, #4169E1, rgba(255, 255, 255, 0.01));"></view>
+			</view>
 			<!-- 总成绩对比 -->
 			<view class="card_item" style="width: 100%;">
 				<view class="card_title">
@@ -55,8 +62,8 @@
 					<view class="title">学习娱乐时长对比</view>
 				</view>
 				<view class="chart_box">
-					<qiun-data-charts type="column" ontouch="true" :chartData="swapChartData[0]" tooltipFormat='tooltipHourColum'
-						:canvas2d="true" canvasId="swap_chart1" />
+					<qiun-data-charts type="column" ontouch="true" :chartData="swapChartData[0]"
+						tooltipFormat='tooltipHourColum' :canvas2d="true" canvasId="swap_chart1" />
 				</view>
 			</view>
 			<!-- 单科与平均对比 -->
@@ -76,8 +83,8 @@
 					<view class="title">近期睡眠记录</view>
 				</view>
 				<view class="chart_box" style="height: 350rpx;">
-					<qiun-data-charts type="pie" :chartData="swapChartData[2]" tooltipFormat='pieHour' :canvas2d="true"
-						canvasId="swap_chart3" />
+					<qiun-data-charts type="ring" :chartData="swapChartData[2]" tooltipFormat='pieHour' :canvas2d="true"
+						canvasId="swap_chart3" :opts="ringOpts" />
 				</view>
 			</view>
 		</view>
@@ -121,6 +128,8 @@
 						numData: '',
 					}
 				],
+				//标题配置
+				ringOpts: {},
 				//当前记录卡片
 				cardCurrent: 5,
 				//选择器
@@ -131,12 +140,6 @@
 					['5分', '10分', '15分', '20分', '25分', '30分', '35分', '40分', '45分', '50分', '55分']
 				],
 				//历史数据
-				historyData: {
-					study: [2, 3, 2.5, 3, 2, 1, 3],
-					rest: [1, 2, 0.5, 3, 0.5, 3.5, 2],
-					exercise: [50, 77, 25, 30, 55, 20, 60],
-					sleep: [8, 9, 8, 8.5, 7.8, 8, 7.6]
-				},
 				dayTime: '',
 				weekTime: '',
 				//是否重新记录
@@ -151,6 +154,7 @@
 			init() {
 				this.getToday()
 				this.getData()
+				this.getRingOpts()
 			},
 			getToday() {
 				this.dayTime = (new Date()).format('M-d').replace('-', '月')
@@ -165,6 +169,28 @@
 					this.saveToStudyChart()
 				}
 			},
+			getRingOpts() {
+				let sleepData = ''
+				if (uni.getStorageSync('historyData')) {
+					sleepData = JSON.parse(uni.getStorageSync('historyData')).sleep;
+					let sum = 0
+					for (let i = 0; i < sleepData.length; i++) {
+						sum += sleepData[i]
+					}
+					let sleepAvg = (sum/sleepData.length).toFixed(1)
+					let opt = {
+						title: {
+							name: '平均睡眠',
+							color: '#909399'
+						},
+						subtitle: {
+							name: sleepAvg + ' 小时',
+							color: '#4169E1'
+						},
+					}
+					this.ringOpts = opt
+				}
+			},
 			//点击卡片唤起picker
 			setTime(index) {
 				if (this.moduleData[index].numData === '') {
@@ -362,6 +388,7 @@
 				swapChartData.push(exercisePie)
 				swapChartData.push(sleepRing)
 				this.updateSwapChartData(swapChartData)
+				this.getRingOpts()
 			},
 		}
 	}
@@ -373,6 +400,13 @@
 		height: 500rpx;
 	}
 
+	.flex_cloumn_box {
+		margin: 20rpx 0;
+		display: flex;
+		flex-direction: column;
+		z-index: 55;
+	}
+
 	.flex_cloumn {
 		margin: 140rpx 0 0 50rpx;
 		height: 170rpx;

subpkg/userinfo/childinfo.vue

@@ -36,9 +36,9 @@
 				</view>
 			</view>
 			
-			<view class="card_view" style="margin-top: 50rpx;">
+			<view class="card_view" style="margin-top: 40rpx;">
 				<view class="flex_cloumn_box" style="margin:0 auto 0 -40rpx;">
-					<view class="cloumn_title">勋章列表</view>
+					<view class="cloumn_title">勋章卡片</view>
 					<view class="bottom_tag"></view>
 				</view>
 			</view>
@@ -151,7 +151,6 @@
 		top: 80rpx;
 		left: 50rpx;
 		border-radius: 50rpx;
-		width: 750rpx;
 		height: 1200rpx;
 		z-index: 55;
 

subpkg/userinfo/parentinfo.vue

@@ -35,19 +35,27 @@
 				</view>
 			</view>
 
-			<view class="card_view" style="margin-top: 50rpx;">
+			<view class="card_view" style="margin-top: 40rpx;">
 				<view class="flex_cloumn_box" style="margin:0 auto 0 -40rpx;">
-					<view class="cloumn_title">我的孩子</view>
+					<view class="cloumn_title">孩子卡片</view>
 					<view class="bottom_tag"></view>
 				</view>
 			</view>
-
-			<view style="margin-top: 20rpx;">
-				<u-avatar-group :urls="avatarGroup" size="80" gap="0.25"></u-avatar-group>
+			
+			<view class="card_box">
+				<view class="card" v-for="(item,index) in childrenData" :key="index">
+					<view class="flex_row" style="width: 100%;">
+						<view class="front_tag"></view>
+						<view class="card_title">{{item.name}}</view>
+					</view>
+					<view class="avatar_box">
+						<image class="avatar" v-if="item.avatar === '默认'" :src="item.gender==='男'?'/static/default_icons/boy_avatar.svg':'/static/default_icons/girl_avatar.svg'"></image>
+						<image class="avatar" v-if="item.avatar != '默认'" :src="item.avatar"></image>
+					</view>
+				</view>
 			</view>
 
 		</view>
-
 	</view>
 </template>
 
@@ -62,29 +70,12 @@
 		data() {
 			return {
 				image: 'https://images.unsplash.com/photo-1568269477456-11e3f3b5c7a5?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1000&q=80',
-				avatarGroup: ''
 			};
 		},
 		onLoad() {
-			this.init()
 		},
 		methods: {
-			init() {
-				this.getAvatarGroup()
-			},
-			getAvatarGroup() {
-				let arrTemp = []
-				for (let item of this.childrenData) {
-					if (item.avatar === '默认' && item.gender === '男')
-						arrTemp.push('/static/default_icons/boy_avatar.svg')
-					if (item.avatar === '默认' && item.gender === '女')
-						arrTemp.push('/static/default_icons/girl_avatar.svg')
-					if (item.avatar != '默认')
-						arrTemp.push(item.avatar)
-				}
-				this.avatarGroup = arrTemp
-				console.log(this.avatarGroup);
-			}
+
 		},
 	}
 </script>
@@ -159,7 +150,6 @@
 		top: 80rpx;
 		left: 50rpx;
 		border-radius: 50rpx;
-		width: 750rpx;
 		height: 1200rpx;
 		z-index: 55;
 
@@ -212,4 +202,40 @@
 			z-index: -1;
 		}
 	}
+
+	.card_box {
+		display: flex;
+		align-items: center;
+		flex-wrap: wrap; //元素换行
+
+		.card {
+			width: 210rpx;
+			height: 210rpx;
+			margin: 20rpx 40rpx 20rpx 0;
+			padding: 20rpx;
+			display: flex;
+			flex-direction: column;
+			justify-content: center;
+			align-items: center;
+			box-shadow: $box-shadow;
+			background-color: #FFFFFF;
+			border-radius: $border-radius;
+			z-index: 99;
+
+			.card_title {
+				line-height: 30rpx;
+				font-size: 30rpx;
+				font-weight: bold;
+				color: $title;
+			}
+
+			.avatar_box {
+				padding-top: 10rpx;
+				.avatar {
+					width: 180rpx;
+					height: 180rpx;
+				}
+			}
+		}
+	}
 </style>

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

@@ -239,23 +239,23 @@ const cfu = {
 		"animation": true,
 		"timing": "easeOut",
 		"duration": 500,
-		"padding": [20, 20, 20, 20],
+		"padding": [30, 30, 30, 30],
 		"title": {
 			"name": "",
-			"fontSize": 24,
+			"fontSize": 28,
 			"color": "#4169E1",
+			"offsetY": -5
 		},
 		"subtitle": {
 			"name": "",
-			"fontSize": 16,
-			"color": "#aaa",
+			"fontSize": 15,
+			"color": "#909399",
 		},
 		"extra": {
 			"arcbar": {
-				"width": 18,
+				"width": 15,
 				"type": "circle",
-				"radius": 190,
-				"backgroundColor": "#F5F5F5"
+				"backgroundColor": "#F5F5F5",
 			}
 		}
 	},
@@ -333,6 +333,15 @@ const cfu = {
 		"legend": {
 			"show": false,
 		},
+		"title": {
+			"name": "",
+			"fontSize": 12,
+			"offsetY": -5
+		},
+		"subtitle": {
+			"name": "",
+			"fontSize": 16,
+		},
 		"extra": {
 			"ring": {
 				"ringWidth": 30,

unpackage/dist/dev/mp-weixin/common/main.wxss

@@ -524,7 +524,7 @@ page {
 .bg_box {
   position: fixed;
   width: 100%;
-  height: 1000rpx;
+  height: 900rpx;
   background-size: 100%;
   background-repeat: no-repeat;
   background-image: linear-gradient(to top, #f3f4f9, rgba(255, 255, 255, 0)), url("https://images.unsplash.com/photo-1527066579998-dbbae57f45ce?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1000&q=80");
@@ -532,7 +532,7 @@ page {
 .bg_card {
   position: fixed;
   width: 100%;
-  height: 1000rpx;
+  height: 900rpx;
   background-size: 100%;
   background-repeat: no-repeat;
   background-image: linear-gradient(to top, #f3f4f9, rgba(255, 255, 255, 0)), url("https://images.unsplash.com/photo-1630638865523-fd3a48512b0e?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1000&q=80");

unpackage/dist/dev/mp-weixin/pages/init/init.wxml

@@ -1 +1 @@
-<view><u-loading-page vue-id="1e0302c0-1" loading="{{true}}" loadingText="正在加载中" loadingMode="semicircle" bind:__l="__l"></u-loading-page></view>
+<view><u-loading-page vue-id="1e0302c0-1" loading="{{true}}" loadingText="正在加载中..." loadingMode="semicircle" bind:__l="__l"></u-loading-page></view>

unpackage/dist/dev/mp-weixin/pages/tab_exam/tab_exam.wxss

@@ -113,6 +113,29 @@
   opacity: 0.7;
   color: #FFF;
 }
+.scroll_view_bottom {
+  white-space: nowrap;
+  height: 400rpx;
+}
+.scroll_view_bottom ._item {
+  margin: 0 20rpx;
+  display: inline-block;
+  vertical-align: top;
+  background-color: #FFF;
+  border-radius: 12rpx;
+  height: 350rpx;
+  width: 300rpx;
+  overflow: hidden;
+  z-index: 55;
+}
+.scroll_view_bottom ._item .image_box {
+  height: 220rpx;
+  width: 100%;
+  border-radius: 12rpx;
+  background-size: cover;
+  background-repeat: no-repeat;
+  z-index: 50;
+}
 .bg1 {
   background-color: #ff8caf;
 }

unpackage/dist/dev/mp-weixin/pages/tab_home/tab_home.json

@@ -2,6 +2,7 @@
   "enablePullDownRefresh": true,
   "navigationStyle": "custom",
   "usingComponents": {
+    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page",
     "top-info": "/components/top-info/top-info",
     "qiun-data-charts": "/uni_modules/qiun-data-charts/components/qiun-data-charts/qiun-data-charts",
     "u-notice-bar": "/uni_modules/uview-ui/components/u-notice-bar/u-notice-bar"

unpackage/dist/dev/mp-weixin/pages/tab_home/tab_home.wxss

@@ -113,6 +113,29 @@
   opacity: 0.7;
   color: #FFF;
 }
+.scroll_view_bottom {
+  white-space: nowrap;
+  height: 400rpx;
+}
+.scroll_view_bottom ._item {
+  margin: 0 20rpx;
+  display: inline-block;
+  vertical-align: top;
+  background-color: #FFF;
+  border-radius: 12rpx;
+  height: 350rpx;
+  width: 300rpx;
+  overflow: hidden;
+  z-index: 55;
+}
+.scroll_view_bottom ._item .image_box {
+  height: 220rpx;
+  width: 100%;
+  border-radius: 12rpx;
+  background-size: cover;
+  background-repeat: no-repeat;
+  z-index: 50;
+}
 .bg2 {
   margin-top: -1065rpx;
   height: 1200rpx;
@@ -168,9 +191,9 @@
   display: flex;
   align-items: center;
   margin-left: auto;
-  border-radius: 6rpx;
+  border-radius: 12rpx;
   background-color: #23b46c;
-  padding: 20rpx 10rpx;
+  padding: 24rpx 12rpx;
 }
 .class_btn .t-icon {
   width: 32rpx;

unpackage/dist/dev/mp-weixin/pages/tab_swap/tab_swap.wxss

@@ -113,6 +113,29 @@
   opacity: 0.7;
   color: #FFF;
 }
+.scroll_view_bottom {
+  white-space: nowrap;
+  height: 400rpx;
+}
+.scroll_view_bottom ._item {
+  margin: 0 20rpx;
+  display: inline-block;
+  vertical-align: top;
+  background-color: #FFF;
+  border-radius: 12rpx;
+  height: 350rpx;
+  width: 300rpx;
+  overflow: hidden;
+  z-index: 55;
+}
+.scroll_view_bottom ._item .image_box {
+  height: 220rpx;
+  width: 100%;
+  border-radius: 12rpx;
+  background-size: cover;
+  background-repeat: no-repeat;
+  z-index: 50;
+}
 .bg1 {
   background-color: #FF6D31;
 }

unpackage/dist/dev/mp-weixin/pages/tab_work/tab_work.wxss

@@ -113,6 +113,29 @@
   opacity: 0.7;
   color: #FFF;
 }
+.scroll_view_bottom {
+  white-space: nowrap;
+  height: 400rpx;
+}
+.scroll_view_bottom ._item {
+  margin: 0 20rpx;
+  display: inline-block;
+  vertical-align: top;
+  background-color: #FFF;
+  border-radius: 12rpx;
+  height: 350rpx;
+  width: 300rpx;
+  overflow: hidden;
+  z-index: 55;
+}
+.scroll_view_bottom ._item .image_box {
+  height: 220rpx;
+  width: 100%;
+  border-radius: 12rpx;
+  background-size: cover;
+  background-repeat: no-repeat;
+  z-index: 50;
+}
 .bg1 {
   background-color: #f9c752;
 }

unpackage/dist/dev/mp-weixin/project.private.config.json

@@ -45,5 +45,5 @@
       ]
     }
   },
-  "libVersion": "2.24.5"
+  "libVersion": "2.21.4"
 }

unpackage/dist/dev/mp-weixin/subpkg/datalist/classdetail.wxss

@@ -31,7 +31,7 @@
 .week_view .week_item_select {
   display: inline-block;
   vertical-align: top;
-  height: 200rpx;
+  height: 180rpx;
   width: 160rpx;
   margin: 20rpx;
   padding: 20rpx;

unpackage/dist/dev/mp-weixin/subpkg/startup/options.json

@@ -3,7 +3,6 @@
   "navigationStyle": "custom",
   "disableScroll": true,
   "usingComponents": {
-    "top-return": "/components/top-return/top-return",
-    "u-avatar": "/uni_modules/uview-ui/components/u-avatar/u-avatar"
+    "top-return": "/components/top-return/top-return"
   }
 }

unpackage/dist/dev/mp-weixin/subpkg/startup/options.wxss

@@ -112,7 +112,7 @@
   padding-top: 10rpx;
 }
 .card_box .card .avatar_box .avatar {
-  width: 220rpx;
-  height: 220rpx;
+  width: 240rpx;
+  height: 240rpx;
 }
 

unpackage/dist/dev/mp-weixin/subpkg/statslist/swapstats.wxss

@@ -2,6 +2,12 @@
   width: 100%;
   height: 500rpx;
 }
+.flex_cloumn_box {
+  margin: 20rpx 0;
+  display: flex;
+  flex-direction: column;
+  z-index: 55;
+}
 .flex_cloumn {
   margin: 140rpx 0 0 50rpx;
   height: 170rpx;

unpackage/dist/dev/mp-weixin/subpkg/userinfo/childinfo.wxss

@@ -59,7 +59,6 @@
   top: 80rpx;
   left: 50rpx;
   border-radius: 50rpx;
-  width: 750rpx;
   height: 1200rpx;
   z-index: 55;
 }

unpackage/dist/dev/mp-weixin/subpkg/userinfo/parentinfo.json

@@ -3,7 +3,6 @@
   "navigationStyle": "custom",
   "disableScroll": true,
   "usingComponents": {
-    "top-return": "/components/top-return/top-return",
-    "u-avatar-group": "/uni_modules/uview-ui/components/u-avatar-group/u-avatar-group"
+    "top-return": "/components/top-return/top-return"
   }
 }

unpackage/dist/dev/mp-weixin/subpkg/userinfo/parentinfo.wxss

@@ -59,7 +59,6 @@
   top: 80rpx;
   left: 50rpx;
   border-radius: 50rpx;
-  width: 750rpx;
   height: 1200rpx;
   z-index: 55;
 }
@@ -105,4 +104,36 @@
   background-image: linear-gradient(to right, #4169E1, #FFF);
   z-index: -1;
 }
+.card_box {
+  display: flex;
+  align-items: center;
+  flex-wrap: wrap;
+}
+.card_box .card {
+  width: 210rpx;
+  height: 210rpx;
+  margin: 20rpx 40rpx 20rpx 0;
+  padding: 20rpx;
+  display: flex;
+  flex-direction: column;
+  justify-content: center;
+  align-items: center;
+  box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.1);
+  background-color: #FFFFFF;
+  border-radius: 12rpx;
+  z-index: 99;
+}
+.card_box .card .card_title {
+  line-height: 30rpx;
+  font-size: 30rpx;
+  font-weight: bold;
+  color: #303133;
+}
+.card_box .card .avatar_box {
+  padding-top: 10rpx;
+}
+.card_box .card .avatar_box .avatar {
+  width: 180rpx;
+  height: 180rpx;
+}