update: 字体与详情列表页面

common/global_scss/pages_style.scss

@@ -32,7 +32,7 @@ page{
 	height: 100%;
 	width: 10rpx;
 	border-radius: 100rpx;
-	background-image: $tag-blue;
+	background-image: linear-gradient(#4169E1, rgba(1,1,1,0));
 	z-index: 99;
 }
 //标题底
@@ -42,7 +42,7 @@ page{
 	height: 20rpx;
 	width: 90%;
 	border-radius: 6rpx;
-	background-image: linear-gradient(to right, #4169E1, #f3f4f9);
+	background-image: linear-gradient(to right, #4169E1, rgba(1,1,1,0));
 	z-index: -1;
 }
 //标签

common/global_scss/theme_style.scss

@@ -14,7 +14,6 @@ $title: #303133;
 $subtitle: #909399;
 //渐变
 $gradient-color: linear-gradient(to right, #4169E1, #d8deff );
-$tag-blue: linear-gradient($color-blue, #d8deff);
 //卡片圆弧
 $border-radius: 12rpx;
 //阴影

components/loading/loading.vue

@@ -0,0 +1,145 @@
+<template>
+	<view class="flex">
+		<view class="sk-folding-cube">
+			<view class="sk-cube1 sk-cube"></view>
+			<view class="sk-cube2 sk-cube"></view>
+			<view class="sk-cube4 sk-cube"></view>
+			<view class="sk-cube3 sk-cube"></view>
+		</view>
+		<view class="YS_title" style="margin-top: 20rpx;color: #555555;">正在加载中...</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		name: "loading",
+		data() {
+			return {
+
+			};
+		}
+	}
+</script>
+
+<style lang="scss">
+	.flex {
+		width: 100vw;
+		height: 100vh;
+		display: flex;
+		flex-direction: column;
+		align-items: center;
+		justify-content: center;
+	}
+
+	.sk-folding-cube {
+		margin: 20px auto;
+		width: 40px;
+		height: 40px;
+		position: relative;
+		-webkit-transform: rotateZ(45deg);
+		transform: rotateZ(45deg);
+	}
+
+	.sk-folding-cube .sk-cube {
+		float: left;
+		width: 50%;
+		height: 50%;
+		position: relative;
+		-webkit-transform: scale(1.1);
+		-ms-transform: scale(1.1);
+		transform: scale(1.1);
+	}
+
+	.sk-folding-cube .sk-cube:before {
+		content: '';
+		position: absolute;
+		top: 0;
+		left: 0;
+		width: 100%;
+		height: 100%;
+		background-color: #555555;
+		-webkit-animation: sk-foldCubeAngle 2.4s infinite linear both;
+		animation: sk-foldCubeAngle 2.4s infinite linear both;
+		-webkit-transform-origin: 100% 100%;
+		-ms-transform-origin: 100% 100%;
+		transform-origin: 100% 100%;
+	}
+
+	.sk-folding-cube .sk-cube2 {
+		-webkit-transform: scale(1.1) rotateZ(90deg);
+		transform: scale(1.1) rotateZ(90deg);
+	}
+
+	.sk-folding-cube .sk-cube3 {
+		-webkit-transform: scale(1.1) rotateZ(180deg);
+		transform: scale(1.1) rotateZ(180deg);
+	}
+
+	.sk-folding-cube .sk-cube4 {
+		-webkit-transform: scale(1.1) rotateZ(270deg);
+		transform: scale(1.1) rotateZ(270deg);
+	}
+
+	.sk-folding-cube .sk-cube2:before {
+		-webkit-animation-delay: 0.3s;
+		animation-delay: 0.3s;
+	}
+
+	.sk-folding-cube .sk-cube3:before {
+		-webkit-animation-delay: 0.6s;
+		animation-delay: 0.6s;
+	}
+
+	.sk-folding-cube .sk-cube4:before {
+		-webkit-animation-delay: 0.9s;
+		animation-delay: 0.9s;
+	}
+
+	@-webkit-keyframes sk-foldCubeAngle {
+
+		0%,
+		10% {
+			-webkit-transform: perspective(140px) rotateX(-180deg);
+			transform: perspective(140px) rotateX(-180deg);
+			opacity: 0;
+		}
+
+		25%,
+		75% {
+			-webkit-transform: perspective(140px) rotateX(0deg);
+			transform: perspective(140px) rotateX(0deg);
+			opacity: 1;
+		}
+
+		90%,
+		100% {
+			-webkit-transform: perspective(140px) rotateY(180deg);
+			transform: perspective(140px) rotateY(180deg);
+			opacity: 0;
+		}
+	}
+
+	@keyframes sk-foldCubeAngle {
+
+		0%,
+		10% {
+			-webkit-transform: perspective(140px) rotateX(-180deg);
+			transform: perspective(140px) rotateX(-180deg);
+			opacity: 0;
+		}
+
+		25%,
+		75% {
+			-webkit-transform: perspective(140px) rotateX(0deg);
+			transform: perspective(140px) rotateX(0deg);
+			opacity: 1;
+		}
+
+		90%,
+		100% {
+			-webkit-transform: perspective(140px) rotateY(180deg);
+			transform: perspective(140px) rotateY(180deg);
+			opacity: 0;
+		}
+	}
+</style>

components/top-info/top-info.vue

@@ -11,15 +11,13 @@
 			</view>
 			<view class="user_data">
 
-				<view class="tag_text" style="color: #FFF;font-size: 24rpx;transform: skew(-10deg);font-family: YSfont;font-weight: 400;">
+				<view class="time_stamp">
 					{{timeStamp}}更新
 				</view>
 
-				<view class="tag" @click="navSubscribe"
-					style="background-image: linear-gradient(90deg, #ffc87e, #ffd192, #ffddae, #ffe3bc);">
-					<view class="t-icon t-icon-huangguan1-copy11-copy"
-						style="width: 30rpx; height: 30rpx;margin-right: 5rpx;"></view>
-					<view class="tag_text" style="color: #714c1b;font-weight: bold;">
+				<view class="subscribe_tag" @click="navSubscribe">
+					<view class="t-icon t-icon-huangguan1"></view>
+					<view class="subscribe_tag_text">
 						{{userData.subscribeLevel}}
 					</view>
 				</view>
@@ -114,14 +112,35 @@
 			margin-left: auto;
 			height: 120rpx;
 
-			.tag {
-				border: 1px solid #FFF;
+			.subscribe_tag {
 				display: flex;
-				justify-content: center;
 				align-items: center;
 				border-radius: 6rpx;
-				padding: 6rpx 10rpx;
-				margin-left: 0;
+				padding: 2rpx 12rpx;
+				transform: skew(-5deg);
+				background: #2f3137;
+				z-index: 99;
+
+				.subscribe_tag_text {
+					margin-left: 2rpx;
+					font-size: 28rpx;
+					font-family: YSfont;
+					color: #d0a97e;
+					z-index: 99;
+				}
+
+				.t-icon {
+					width: 28rpx;
+					height: 28rpx;
+					margin-top: -2rpx;
+					margin-right: 2rpx;
+				}
+			}
+
+			.time_stamp {
+				color: #FFF;
+				font-size: 24rpx;
+				font-family: YSfont;
 			}
 		}
 	}

components/top-semester/top-semester.vue

@@ -4,12 +4,12 @@
 		<view class="flex_row" style="margin: 140rpx 40rpx 0 40rpx;">
 			<view class="flex_cloumn">
 				<view class="flex_baseline">
-					<view class="content_title" style="font-size: 60rpx;">{{childInfo.semester.split('学年')[0]}}</view>
-					<view class="content_title" style="margin-left: 20rpx;font-size: 38rpx;">学年</view>
-					<view class="content_title" style="font-size: 60rpx;margin-left: 20rpx;">
+					<view class="content_title">{{childInfo.semester.split('学年')[0]}}</view>
+					<view class="content_title" style="margin-left: 20rpx;font-size: 40rpx;">学年</view>
+					<view class="content_title" style="margin-left: 20rpx;">
 						{{childInfo.semester.split('学年')[1].split('学期')[0]}}
 					</view>
-					<view class="content_title" style="margin-left: 20rpx;font-size: 38rpx;">学期</view>
+					<view class="content_title" style="margin-left: 20rpx;font-size: 40rpx;">学期</view>
 
 				</view>
 
@@ -67,24 +67,17 @@
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;
 		}
-
-		.content_subtitle {
-			font-size: 50rpx;
-			font-family: YSfont;
-			color: #FFF;
-			z-index: 2;
-		}
 	}
 
 	.tag {
 		margin-left: 20rpx;
 		border-radius: 6rpx;
 		border: 2px solid #FFF;
-		padding: 4rpx 10rpx;
+		padding: 0 6rpx;
 		z-index: 9;
 
 		.tag_text {
-			font-size: 30rpx;
+			font-size: 32rpx;
 			font-family: YSfont;
 			color: #FFF;
 			z-index: 9;

pages/init/init.vue

@@ -1,6 +1,7 @@
 <template>
-	<view>
-		<u-loading-page :loading="true" loadingText="正在加载中..." loadingMode="semicircle"></u-loading-page>
+	<view class="page_view" 
+	style="align-items: center;justify-content: center;height: 100vh;width: 100vw;">
+		<loading></loading>
 	</view>
 </template>
 

pages/style/tab_pages.scss

@@ -64,10 +64,6 @@
 			height: 120rpx;
 			border-bottom: 4rpx solid #f3f4f9;
 			border-top: 4rpx solid #f3f4f9;
-			border-image: linear-gradient(to right, #FFF, #d5d5d5) 1;
-			// background: linear-gradient(135deg, #f3f4f9 21px, #FFF 22px, #FFF 24px, transparent 24px, transparent 67px, #FFF 67px, #FFF 69px, transparent 69px), linear-gradient(225deg, #f3f4f9 21px, #FFF 22px, #FFF 24px, transparent 24px, transparent 67px, #FFF 67px, #FFF 69px, transparent 69px)0 64px;
-			// background-color: $page-color;
-			// background-size: 64px 128px;
 
 			&_title {
 				font-size: 32rpx;
@@ -116,17 +112,19 @@
 	}
 	// 卡片字体
 	._title{
-		font-size: 48rpx;
-		font-weight: bold;
+		font-size: 54rpx;	
+		font-family: YSfont;
 		color: #FFF;
 	}
 	._subtitle{
-		font-size: 32rpx;
+		font-size: 34rpx;
+		font-family: YSfont;
 		color: #FFF;
 	}
 	._unit{
 		margin-left: 20rpx;
-		font-size: 26rpx;
+		font-size: 30rpx;
+		font-family: YSfont;
 		opacity: 0.7;
 		color: #FFF;
 	}

pages/tab_exam/tab_exam.vue

@@ -38,7 +38,7 @@
 					</view>
 					<view class="flex_baseline">
 						<text class="_subtitle">完成情况</text>
-						<text class="_subtitle" style="margin-left: 20rpx;font-weight: bold;">{{performance}}</text>
+						<text class="_subtitle" style="margin-left: 20rpx;">{{performance}}</text>
 					</view>
 				</view>
 				<view class="image" :style="{backgroundImage:`url(${image})`}"></view>
@@ -112,7 +112,7 @@
 						<view class="t-icon t-icon-dili" v-if="item.subject === '地理'"></view>
 						<view class="t-icon t-icon-lishi" v-if="item.subject === '历史'"></view>
 						<view class="flex_cloumn" style="height: 100rpx;justify-content: space-around;">
-							<view class="title" style="font-size: 32rpx;">{{item.subject}}</view>
+							<view class="YS_title" style="font-size: 40rpx;">{{item.subject}}</view>
 							<view class="tag_fill"
 								style="background-color: #d8deff;width:fit-content;margin-left: 0;padding: 5rpx 10rpx;">
 								<view class="t-icon t-icon-zhengceguizhang"
@@ -122,8 +122,8 @@
 						</view>
 					</view>
 					<view class="flex_cloumn" style="height: 100%;justify-content: space-around;margin: 0 30rpx 20rpx 30rpx;">
-						<view class="title" style="font-size: 32rpx;">{{item.title}}</view>
-						<view class="title" style="font-size: 30rpx;font-weight: 400;">「 {{item.modality}} 」</view>
+						<view class="YS_title">{{item.title}}</view>
+						<view class="YS_title" style="font-size: 30rpx;">「 {{item.modality}} 」</view>
 						<view class="flex_baseline">
 								<view class="subtitle" style="font-weight: 400;font-size: 28rpx;">评测题量,共</view>
 								<view class="subtitle" style="font-weight: 400;font-size: 40rpx;margin-left: 4rpx;">{{item.amount}}</view>

pages/tab_home/tab_home.vue

@@ -1,7 +1,7 @@
 <template>
 	<view>
 		<view v-if="!isHomeLoad">
-			<u-loading-page :loading="true" loadingText="请稍候..." loadingMode="semicircle"></u-loading-page>
+			<loading></loading>
 		</view>
 		<view class="page_view" v-if="isHomeLoad">
 			<!-- 成绩统计 -->
@@ -471,6 +471,7 @@
 				this.getClassAttendance()
 				this.isHomeLoad = true
 			},
+
 			//计算出当前课程
 			getClassCurrent() {
 				//当前时间戳是否在课程时间段内
@@ -539,12 +540,12 @@
 							if (value) {
 								classIndex = -1
 								finishNum = index - 1
-								return this.isAfterDayClass = false
+								this.isAfterDayClass = false
 							} else {
 								//放学时间(有课程但已上完状态)
 								classIndex = -1
 								finishNum = this.classList.length
-								return this.isAfterDayClass = true
+								this.isAfterDayClass = true
 							}
 						})
 						//当前课程赋值

pages/tab_swap/tab_swap.vue

@@ -36,7 +36,7 @@
 					</view>
 					<view class="flex_baseline">
 						<text class="_subtitle">完成情况</text>
-						<text class="_subtitle" style="margin-left: 20rpx;font-weight: bold;">{{performance}}</text>
+						<text class="_subtitle" style="margin-left: 20rpx;">{{performance}}</text>
 					</view>
 				</view>
 				<view class="image" :style="{backgroundImage:`url(${image})`}"></view>
@@ -95,7 +95,7 @@
 		</view>
 		<scroll-view class="scroll_view_bottom" scroll-x="true" :scroll-with-animation="true" scroll-left="0">
 			<view class="_item">
-
+				<view class="_item_inner"></view>
 			</view>
 			<view class="_item"></view>
 			<view class="_item"></view>
@@ -224,4 +224,15 @@
 	.circle_line3 {
 		background-image: linear-gradient(to right, #FF6D31, #FF6D31), linear-gradient(0deg, #FFF -50%, rgba(255, 255, 255, 0.0));
 	}
+	._item{
+		background-color: #ccc;
+		background-image: radial-gradient(#fff 50%, transparent 50%);
+		background-position: -5px -5px;
+		background-repeat: repeat;
+		background-size: 10px 10px;
+		padding: 5px;
+		._item_inner{
+			background-color: #ccc;
+		}
+	}
 </style>

pages/tab_work/tab_work.vue

@@ -36,7 +36,7 @@
 					</view>
 					<view class="flex_baseline">
 						<text class="_subtitle">完成情况</text>
-						<text class="_subtitle" style="margin-left: 20rpx;font-weight: bold;">{{performance}}</text>
+						<text class="_subtitle" style="margin-left: 20rpx;">{{performance}}</text>
 					</view>
 				</view>
 				<view class="image" :style="{backgroundImage:`url(${image})`}"></view>
@@ -101,7 +101,7 @@
 					<view class="book_title">{{item.subject}}</view>
 
 					<view class="flex_cloumn_box">
-						<view class="title" style="color: #FFF;font-size: 50rpx;margin-left: auto;">{{item.subject}}
+						<view class="YS_title" style="color: #FFF;font-size: 60rpx;margin-left: auto;">{{item.subject}}
 						</view>
 						<view class="flex_baseline" style="margin-left: auto;">
 							<view class="subtitle" style="font-size: 28rpx;color: #FFF;font-weight: 400;">收录错题</view>

subpkg/datalist/classdetail.vue

@@ -6,16 +6,16 @@
 		<!-- 页面标题内容 -->
 		<view class="flex_cloumn">
 			<view class="flex_baseline">
-				<view class="content_title" style="font-size: 60rpx;">{{dayTime.split('月')[0]}}</view>
+				<view class="content_title" style="font-size: 70rpx;">{{dayTime.split('月')[0]}}</view>
 				<view class="content_title" style="margin-left: 10rpx;">月</view>
-				<view class="content_title" style="font-size: 60rpx; margin-left: 10rpx;">{{dayTime.split('月')[1]}}
+				<view class="content_title" style="font-size: 70rpx; margin-left: 10rpx;">{{dayTime.split('月')[1]}}
 				</view>
 				<view class="content_title" style="margin-left: 10rpx;">日</view>
-				<view class="content_title" style="font-size: 60rpx;margin-left: 20rpx;">{{weekTime}}</view>
+				<view class="content_title" style="font-size: 70rpx;margin-left: 20rpx;">{{weekTime}}</view>
 			</view>
 			<view class="flex_baseline">
 				<view class="content_subtitle" style="opacity: 0.8;">孩子今日共</view>
-				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;transform: skew(-10deg);">
+				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 60rpx;">
 					{{classList.length}}
 				</view>
 				<view class="content_subtitle" style="margin-left: 20rpx;opacity: 0.8;">节课程</view>
@@ -281,16 +281,16 @@
 		justify-content: space-around;
 
 		.content_title {
-			font-size: 35rpx;
-			font-weight: bold;
-			transform: skew(-10deg);
+			font-size: 40rpx;
+			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;
 		}
 
 		.content_subtitle {
-			font-size: 35rpx;
+			font-size: 40rpx;
+			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;
 		}

subpkg/datalist/examdata.vue

@@ -49,15 +49,14 @@
 	}
 
 	.page_title {
-		font-size: 55rpx;
-		font-weight: bold;
-		transform: skew(-10deg);
+		font-size: 75rpx;
+		font-family: YSfont;
 		color: #FFF;
 	}
+
 	.page_subtitle {
-		font-size: 34rpx;
-		font-weight: bold;
-		transform: skew(-10deg);
+		font-size: 40rpx;
+		font-family: YSfont;
 		color: #FFF;
 	}
 

subpkg/datalist/examlist.vue

@@ -1,60 +1,68 @@
 <template>
 	<view class="page_view">
 		<top-return :color="'#FFF'" text="评测列表"></top-return>
-		<!-- 		骨架页
-		<view style="margin:140rpx 20rpx 20rpx 20rpx; z-index: 9;">
-			<u-skeleton :rows="examData.length" rowsHeight="200px" :title="false" :loading="loading">
-			</u-skeleton>
-		</view> -->
 
 		<view class="bg_card"></view>
 
 		<!-- 页面标题内容 -->
 		<view class="flex_cloumn">
 			<view class="flex_baseline">
-				<view class="content_title" style="font-size: 60rpx;">{{dayTime.split('月')[0]}}</view>
+				<view class="content_title" style="font-size: 70rpx;">{{dayTime.split('月')[0]}}</view>
 				<view class="content_title" style="margin-left: 10rpx;">月</view>
-				<view class="content_title" style="font-size: 60rpx; margin-left: 10rpx;">{{dayTime.split('月')[1]}}
+				<view class="content_title" style="font-size: 70rpx; margin-left: 10rpx;">{{dayTime.split('月')[1]}}
 				</view>
 				<view class="content_title" style="margin-left: 10rpx;">日</view>
-				<view class="content_title" style="font-size: 40rpx;margin-left: 20rpx;">完成率</view>
-				<view class="content_title" style="margin-left: 10rpx;font-size: 60rpx;">{{value}}%</view>
+				<view class="content_title" style="font-size: 40rpx;margin-left: 20rpx;">已完成</view>
+				<view class="content_title" style="margin-left: 10rpx;font-size: 70rpx;">{{value}}%</view>
 			</view>
 			<view class="flex_baseline">
 				<view class="content_subtitle" style="opacity: 0.8;">孩子今日共</view>
-				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;transform: skew(-10deg);">
+				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 60rpx;">
 					{{examData.length}}
 				</view>
 				<view class="content_subtitle" style="margin-left: 20rpx;opacity: 0.8;">例评测</view>
 			</view>
 		</view>
+
 		<!-- 卡片内容 -->
 		<view class="card_view">
-			<view class="card_item" style="width: 100%;" v-for="(item,index) in examData" :key="index"
-				@click="navExamData(index)">
-				<view class="card_title">
-					<view class="front_tag" style="height: 40rpx;"></view>
-					<view class="title" style="font-size: 36rpx;">{{item.examInfo.name}}</view>
+
+<!-- 			<view style="margin: -88rpx 0 20rpx auto;">
+				<u-tabs :list="tabList" lineWidth="30" lineColor="#ff8caf" :activeStyle="{
+            color: '#FFF',
+            fontWeight: 'bold',
+            transform: 'scale(1.07)'
+        }" :inactiveStyle="{
+            color: 'rgb(255,255,255,0.8)',
+            transform: 'scale(1)'
+        }" itemStyle="padding-left: 10px; padding-right: 10px; height: 34px;"></u-tabs>
+			</view> -->
+
+			<view class="card_item" style="width: 100%;" v-for="(item,index) in examData" :key="index" @click="navExamData(index)">
+				<view class="card_title" style="padding: 40rpx;height: 40rpx;">
+					<view class="t-icon t-icon-examicon" style="height: 40rpx;width: 40rpx;margin-right: 10rpx;">
+					</view>
+					<view class="YS_title" style="font-size: 45rpx;">{{item.examInfo.name}}</view>
 					<view
 						:class="item.examInfo.progress === 'finish'?'t-icon t-icon-yiwancheng1':'t-icon t-icon-jinhangzhong'"
-						style="position: absolute; width: 100rpx; height: 100rpx;margin-left: 570rpx;margin-top: 50rpx;">
+						style="width: 55px;height: 55px;margin-left: auto;margin-right: -20rpx;">
 					</view>
 				</view>
-				<view class="cloumn">
+				<view class="cloumn" style="margin: 0 40rpx 40rpx 40rpx;">
 					<view class="flex_row">
-						<view class="tag">
+						<view class="tag_fill" :style="{backgroundColor: item.examInfo.progress === 'finish'? '#23b46c': '#ff8caf' }">
 							<view class="tag_text">{{item.examInfo.subjects[0].name}}</view>
 						</view>
-						<view class="tag" style="margin-left: 20rpx;">
+						<view class="tag_fill" style="margin-left: 20rpx;" :style="{backgroundColor: item.examInfo.progress === 'finish'? '#23b46c': '#ff8caf' }">
 							<view class="tag_text">{{item.examInfo.examType.name}}</view>
 						</view>
 					</view>
 					<view class="flex_baseline" style="margin-top: 20rpx;">
 						<view class="subtitle">布置老师:</view>
-						<view class="title" style="margin-left: 20rpx; font-size: 30rpx;">{{item.examInfo.creatorId}}
+						<view class="YS_title" style="margin-left: 10rpx;">{{item.examInfo.creatorId}}
 						</view>
-						<view class="subtitle" style="margin-left: 20rpx;">截至时间:</view>
-						<view class="title" style="margin-left: 20rpx; font-size: 30rpx;">
+						<view class="subtitle" style="margin-left: 20rpx;">截止时间:</view>
+						<view class="YS_title" style="margin-left: 10rpx;">
 							{{$timeStampToTime(item.examInfo.endTime)}}
 						</view>
 					</view>
@@ -62,7 +70,7 @@
 
 				<view class="content_box">
 					<view class="title_box"
-						:style="{backgroundColor: item.examInfo.progress === 'finish'? '#23b46c': '#4169E1' }">
+						:style="{backgroundColor: item.examInfo.progress === 'finish'? '#23b46c': '#ff8caf' }">
 						<view class="title_text">{{item.examInfo.papers[0].name}}</view>
 					</view>
 					<view class="content_detail"></view>
@@ -84,6 +92,11 @@
 		},
 		data() {
 			return {
+				// tabList: [{
+				// 	name: '已完成'
+				// }, {
+				// 	name: '未完成'
+				// }],
 				value: '',
 				dayTime: ''
 			}
@@ -108,15 +121,8 @@
 		font-size: 26rpx;
 	}
 
-	.tag {
-		border-radius: 6rpx;
-		border: 1rpx solid $color-blue;
-		padding: 5rpx 16rpx;
-
-		.tag_text {
-			font-size: 22rpx;
-			color: $color-blue;
-		}
+	.tag_fill {
+		background-color: $color-pink;
 	}
 
 	.content_box {
@@ -130,7 +136,7 @@
 			top: -20rpx;
 			width: fit-content;
 			height: 36rpx;
-			border-radius: 10rpx;
+			border-radius: 6rpx;
 			padding: 5rpx 20rpx;
 
 			.title_text {
@@ -160,16 +166,16 @@
 		justify-content: space-around;
 
 		.content_title {
-			font-size: 35rpx;
-			font-weight: bold;
-			transform: skew(-10deg);
+			font-size: 40rpx;
+			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;
 		}
 
 		.content_subtitle {
-			font-size: 35rpx;
+			font-size: 40rpx;
+			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;
 		}

subpkg/datalist/swapdata.vue

@@ -47,15 +47,14 @@
 	}
 
 	.page_title {
-		font-size: 55rpx;
-		font-weight: bold;
-		transform: skew(-10deg);
+		font-size: 75rpx;
+		font-family: YSfont;
 		color: #FFF;
 	}
+
 	.page_subtitle {
-		font-size: 34rpx;
-		font-weight: bold;
-		transform: skew(-10deg);
+		font-size: 40rpx;
+		font-family: YSfont;
 		color: #FFF;
 	}
 

subpkg/datalist/swaplist.vue

@@ -7,37 +7,38 @@
 		<!-- 页面标题内容 -->
 		<view class="cloumn">
 			<view class="flex_baseline">
-				<view class="content_title" style="font-size: 60rpx;">{{dayTime.split('月')[0]}}</view>
+				<view class="content_title" style="font-size: 70rpx;">{{dayTime.split('月')[0]}}</view>
 				<view class="content_title" style="margin-left: 10rpx;">月</view>
-				<view class="content_title" style="font-size: 60rpx; margin-left: 10rpx;">{{dayTime.split('月')[1]}}</view>
+				<view class="content_title" style="font-size: 70rpx; margin-left: 10rpx;">{{dayTime.split('月')[1]}}</view>
 				<view class="content_title" style="margin-left: 10rpx;">日</view>
-				<view class="content_title" style="font-size: 40rpx;margin-left: 20rpx;">完成率</view>
-				<view class="content_title" style="margin-left: 10rpx;font-size: 60rpx;">{{value}}%</view>
+				<view class="content_title" style="font-size: 40rpx;margin-left: 20rpx;">已完成</view>
+				<view class="content_title" style="font-size: 70rpx; margin-left: 10rpx;">{{value}}%</view>
 			</view>
 			<view class="flex_baseline">
 				<view class="content_subtitle" style="opacity: 0.8;">当前共</view>
-					<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;transform: skew(-10deg);">{{swapData.length}}</view>
+					<view class="content_subtitle" style="margin-left: 20rpx;font-size: 60rpx;">{{swapData.length}}</view>
 				<view class="content_subtitle" style="margin-left: 20rpx;opacity: 0.8;">场活动</view>
 			</view>
 		</view>
 		
 		<view class="card_view">
 			<view class="card_item" style="width: 100%;" v-for="(item,index) in swapData" :key="index" @click="navSwapData(index)">
-				<view class="card_title">
-					<view class="front_tag" style="height: 40rpx;"></view>
-					<view class="title" style="font-size: 36rpx;">{{item.survey.name||item.vote.name}}</view>
-					<view :class="item.survey.progress === 'finish'||item.vote.progress === 'finish'?'t-icon t-icon-yiwancheng1':'t-icon t-icon-jinhangzhong-copy'" style="position: absolute; width: 100rpx; height: 100rpx;margin-left: 570rpx;margin-top: 50rpx;"></view>
-				</view>
-				<view class="flex_cloumn" style="margin: 20rpx 50rpx;">
-					<view class="flex_row">
-						<u-parse class="title" style="font-size: 30rpx;" :content="item.survey.description||item.vote.description" :selectable="true"></u-parse>
+				<view class="card_title" style="padding: 40rpx;height: 40rpx;">
+					<view class="t-icon t-icon-swapfont" style="height: 40rpx;width: 40rpx;margin-right: 10rpx;">
 					</view>
-					<view class="flex_baseline" style="margin-top: 20rpx;">
+					<view class="YS_title" style="font-size: 45rpx;">{{item.survey.name||item.vote.name}}</view>
+					<view :class="item.survey.progress === 'finish'||item.vote.progress === 'finish'?'t-icon t-icon-yiwancheng1':'t-icon t-icon-jinhangzhong-copy'" style="width: 55px;height: 55px;margin-left: auto;margin-right: -20rpx;"></view>
+				</view>
+				<view class="flex_cloumn" style="margin: 0 40rpx 40rpx 40rpx;">
+					<view class="flex_baseline">
 						<view class="subtitle">布置老师:</view>
-						<view class="title" style="margin-left: 20rpx; font-size: 30rpx;">{{item.survey.creatorId||item.vote.creatorId}}</view>
+						<view class="YS_title" style="margin-left: 10rpx;">{{item.survey.creatorId||item.vote.creatorId}}</view>
 						<view class="subtitle" style="margin-left: 20rpx;">截至时间:</view>
-						<view class="title" style="margin-left: 20rpx; font-size: 30rpx;" v-if="item.survey">{{$timeStampToTime(item.survey.endTime)}}</view>
-						<view class="title" style="margin-left: 20rpx; font-size: 30rpx;" v-if="item.vote">{{$timeStampToTime(item.vote.endTime)}}</view>
+						<view class="YS_title" style="margin-left: 10rpx;" v-if="item.survey">{{$timeStampToTime(item.survey.endTime)}}</view>
+						<view class="YS_title" style="margin-left: 10rpx;" v-if="item.vote">{{$timeStampToTime(item.vote.endTime)}}</view>
+					</view>
+					<view class="flex_row" style="margin-top: 20rpx;">
+						<u-parse class="YS_title" style="font-size: 30rpx;" :content="item.survey.description||item.vote.description" :selectable="true"></u-parse>
 					</view>
 				</view>
 				<!-- 正文 -->
@@ -117,7 +118,7 @@
 			top: -20rpx;
 			width:fit-content;
 			height: 36rpx;
-			border-radius: 10rpx;
+			border-radius: 6rpx;
 			padding: 5rpx 20rpx;
 			.title_text{
 				font-size: 25rpx;
@@ -148,16 +149,16 @@
 		justify-content: space-around;
 	
 		.content_title {
-			font-size: 35rpx;
-			font-weight: bold;
-			transform: skew(-10deg);
+			font-size: 40rpx;
+			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;
 		}
-	
+
 		.content_subtitle {
-			font-size: 35rpx;
+			font-size: 40rpx;
+			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;
 		}

subpkg/datalist/workdata.vue

@@ -46,15 +46,14 @@
 	}
 
 	.page_title {
-		font-size: 55rpx;
-		font-weight: bold;
-		transform: skew(-10deg);
+		font-size: 75rpx;
+		font-family: YSfont;
 		color: #FFF;
 	}
+
 	.page_subtitle {
-		font-size: 34rpx;
-		font-weight: bold;
-		transform: skew(-10deg);
+		font-size: 40rpx;
+		font-family: YSfont;
 		color: #FFF;
 	}
 

subpkg/datalist/worklist.vue

@@ -7,18 +7,19 @@
 		<!-- 页面标题内容 -->
 		<view class="flex_cloumn">
 			<view class="flex_baseline">
-				<view class="content_title" style="font-size: 60rpx;">{{dayTime.split('月')[0]}}</view>
+				<view class="content_title" style="font-size: 70rpx;">{{dayTime.split('月')[0]}}</view>
 				<view class="content_title" style="margin-left: 10rpx;">月</view>
-				<view class="content_title" style="font-size: 60rpx; margin-left: 10rpx;">{{dayTime.split('月')[1]}}
+				<view class="content_title" style="font-size: 70rpx; margin-left: 10rpx;">{{dayTime.split('月')[1]}}
 				</view>
 				<view class="content_title" style="margin-left: 10rpx;">日</view>
-				<view class="content_title" style="font-size: 40rpx;margin-left: 20rpx;">完成率</view>
-				<view class="content_title" style="margin-left: 10rpx;font-size: 60rpx;">{{value}}%</view>
+				<view class="content_title" style="margin-left: 20rpx;">已完成</view>
+				<view class="content_title" style="margin-left: 10rpx;font-size: 70rpx;">{{value}}%</view>
 			</view>
 			<view class="flex_baseline">
 				<view class="content_subtitle" style="opacity: 0.8;">孩子今日共</view>
-				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;">
-					{{workData.length}}</view>
+				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 60rpx;">
+					{{workData.length}}
+				</view>
 				<view class="content_subtitle" style="margin-left: 20rpx;opacity: 0.8;">份作业</view>
 			</view>
 		</view>
@@ -26,25 +27,27 @@
 		<view class="card_view">
 			<view class="card_item" style="width: 100%;" v-for="(item,index) in workData" :key="index"
 				@click="navWorkData(index)">
-				<view class="card_title">
-					<view class="front_tag" style="height: 40rpx;"></view>
-					<view class="title" style="font-size: 36rpx;">{{item.work.name}}</view>
+				<view class="card_title" style="padding: 40rpx;height: 40rpx;">
+					<view class="t-icon t-icon-workicon" style="height: 40rpx;width: 40rpx;margin-right: 10rpx;">
+					</view>
+					<view class="YS_title" style="font-size: 45rpx;">{{item.work.name}}</view>
 					<view
 						:class="item.work.progress === 'finish'?'t-icon t-icon-yiwancheng1':'t-icon t-icon-jinhangzhong-copy1'"
-						style="position: absolute; width: 100rpx; height: 100rpx;margin-left: 570rpx;margin-top: 50rpx;">
+						style="width: 55px;height: 55px;margin-left: auto;margin-right: -20rpx;">
 					</view>
 				</view>
-				<view class="cloumn">
-					<view class="flex_row">
-						<u-parse class="title" style="font-size: 30rpx;" :content="item.work.description"
-							:selectable="true"></u-parse>
-					</view>
-					<view class="flex_baseline" style="margin-top: 20rpx;">
+				<view class="cloumn" style="margin: 0 40rpx 40rpx 40rpx;">
+					<view class="flex_baseline" >
 						<view class="subtitle">布置老师:</view>
-						<view class="title" style="margin-left: 20rpx; font-size: 30rpx;">{{item.work.creatorId}}</view>
-						<view class="subtitle" style="margin-left: 20rpx;">截至时间:</view>
-						<view class="title" style="margin-left: 20rpx; font-size: 30rpx;">
-							{{$timeStampToTime(item.work.endTime)}}</view>
+						<view class="YS_title" style="margin-left: 10rpx;">{{item.work.creatorId}}</view>
+						<view class="subtitle" style="margin-left: 20rpx;">截止时间:</view>
+						<view class="YS_title" style="margin-left: 10rpx;">
+							{{$timeStampToTime(item.work.endTime)}}
+						</view>
+					</view>
+					<view class="flex_row" style="margin-top: 20rpx;">
+						<u-parse class="YS_title" style="font-size: 30rpx;" :content="item.work.description"
+							:selectable="true"></u-parse>
 					</view>
 				</view>
 				<!-- 正文 -->
@@ -133,7 +136,7 @@
 			top: -20rpx;
 			width: fit-content;
 			height: 36rpx;
-			border-radius: 10rpx;
+			border-radius: 6rpx;
 			padding: 5rpx 20rpx;
 
 			.title_text {
@@ -144,8 +147,8 @@
 		}
 
 		.content_detail {
-			font-size: 30rpx;
-			font-weight: bold;
+			font-size: 35rpx;
+			font-family: YSfont;
 			color: $title;
 			word-break: break-all;
 		}
@@ -161,7 +164,7 @@
 		display: flex;
 		margin-bottom: 20rpx;
 		align-items: center;
-		padding: 15rpx 20rpx;
+		padding: 6rpx 20rpx;
 		background-color: #FFF;
 		border-radius: 10rpx;
 
@@ -177,15 +180,15 @@
 		justify-content: space-around;
 
 		.content_title {
-			font-size: 70rpx;
+			font-size: 40rpx;
 			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;
 		}
-		
+
 		.content_subtitle {
-			font-size: 50rpx;
+			font-size: 40rpx;
 			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;

subpkg/exam/exercisesinfo.vue

@@ -1,6 +1,5 @@
 <template>
-	<view class="page_view">
-		<view style="height: 200rpx;"></view>
+	<view>
 		<top-return text="评测练习"></top-return>
 		<!-- 天数选择 -->
 <!-- 		<scroll-view class="week_view" scroll-x="true" :scroll-with-animation="true" scroll-left="0">

subpkg/gradelist/gradelist_pages.scss

@@ -19,9 +19,8 @@
 	
 	.analysis_data {
 		font-size: 50rpx;
-		font-weight: bold;
 		color: #FFF;
-		transform: skew(-10deg);
+		font-family: YSfont;
 		z-index: 5;
 	}
 	

subpkg/gradelist/total.vue

@@ -21,7 +21,7 @@
 
 					<view class="flex_baseline">
 						<view class="analysis_text">
-							{{analysisData[0].data === 'top' ? '班级和年级平均分':(analysisData[0].data === 'midClass'? '班级学期平均分':(analysisData[0].data === 'midGrade'?'年级学期平均分':'班级或年级平均分'))}}
+							{{analysisData[0].data === 'top' ? '班级和年级学期平均':(analysisData[0].data === 'midClass'? '班级学期平均分':(analysisData[0].data === 'midGrade'?'年级学期平均分':'班级和年级学期平均'))}}
 						</view>
 					</view>
 				</view>
@@ -46,7 +46,7 @@
 			
 					<view class="flex_baseline">
 						<view class="analysis_text">
-							{{analysisData[1].data === 'top' ? '班级和年级平均分':(analysisData[1].data === 'midClass'? '班级学期平均分':(analysisData[1].data === 'midGrade'?'年级学期平均分':'班级或年级平均分'))}}
+							{{analysisData[1].data === 'top' ? '班级和年级学期平均':(analysisData[1].data === 'midClass'? '班级学期平均分':(analysisData[1].data === 'midGrade'?'年级学期平均分':'班级和年级学期平均'))}}
 						</view>
 					</view>
 				</view>

subpkg/home/recommendinfo.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="page_view">
+	<view>
 		<top-return text="课程推荐"></top-return>
 	</view>
 </template>

subpkg/statslist/swapstats.vue

@@ -6,12 +6,12 @@
 		<!-- 页面标题内容 -->
 		<view class="flex_cloumn">
 			<view class="flex_baseline">
-				<view class="content_title" style="font-size: 60rpx;">{{dayTime.split('月')[0]}}</view>
+				<view class="content_title" style="font-size: 70rpx;">{{dayTime.split('月')[0]}}</view>
 				<view class="content_title" style="margin-left: 10rpx;">月</view>
-				<view class="content_title" style="font-size: 60rpx; margin-left: 10rpx;">{{dayTime.split('月')[1]}}
+				<view class="content_title" style="font-size: 70rpx; margin-left: 10rpx;">{{dayTime.split('月')[1]}}
 				</view>
 				<view class="content_title" style="margin-left: 10rpx;">日</view>
-				<view class="content_title" style="font-size: 60rpx;margin-left: 20rpx;">{{weekTime}}</view>
+				<view class="content_title" style="font-size: 70rpx;margin-left: 20rpx;">{{weekTime}}</view>
 			</view>
 			<view class="flex_baseline">
 				<view class="content_subtitle" style="opacity: 0.8;">记录今日孩子表现吧</view>
@@ -24,22 +24,22 @@
 				<view class="_item_subtext" style="margin-left: 30rpx;">{{item.text}}</view>
 
 				<view class="flex_baseline" style="margin-left: 30rpx;" v-if="item.numData === ''">
-					<text class="_item_text" style="transform: skew(-10deg);">记录</text>
-					<text class="_item_subtext" style="margin-left: 10rpx;opacity:0.8;">今日时长</text>
+					<text class="_item_text">记录</text>
+					<text class="_item_subtext" style="margin-left: 8rpx;opacity:0.8;">今日时长</text>
 				</view>
 				<view class="flex_baseline" style="margin-left: 30rpx;"
 					v-if="item.numData.includes('小时') && item.numData != ''">
-					<text class="_item_text" style="transform: skew(-10deg);">{{item.numData.split('小时')[0]}}</text>
-					<text class="_item_subtext" style="margin-left: 10rpx;opacity:0.8;">小时</text>
+					<text class="_item_text">{{item.numData.split('小时')[0]}}</text>
+					<text class="_item_subtext" style="margin-left: 8rpx;opacity:0.8;">小时</text>
 					<text class="_item_text"
-						style="margin-left: 10rpx;transform: skew(-10deg);">{{item.numData.split('小时')[1].replace('分','')}}</text>
-					<text class="_item_subtext" style="margin-left: 10rpx;opacity:0.8;">分钟</text>
+						style="margin-left: 8rpx;">{{item.numData.split('小时')[1].replace('分','')}}</text>
+					<text class="_item_subtext" style="margin-left: 8rpx;opacity:0.8;">分钟</text>
 				</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(-10deg);">{{item.numData.replace('分','')}}</text>
-					<text class="_item_subtext" style="margin-left: 10rpx;opacity:0.8;">分钟</text>
+						style="margin-left: 8rpx;">{{item.numData.replace('分','')}}</text>
+					<text class="_item_subtext" style="margin-left: 8rpx;opacity:0.8;">分钟</text>
 				</view>
 				<view :class="item.icon"></view>
 			</view>
@@ -413,16 +413,16 @@
 		justify-content: space-around;
 
 		.content_title {
-			font-size: 35rpx;
-			font-weight: bold;
-			transform: skew(-10deg);
+			font-size: 40rpx;
+			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;
 		}
 
 		.content_subtitle {
-			font-size: 35rpx;
+			font-size: 40rpx;
+			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;
 		}
@@ -451,7 +451,7 @@
 				line-height: 80rpx;
 				color: #FFF;
 				font-size: 50rpx;
-				font-weight: bold;
+				font-family: YSfont;
 				z-index: 5;
 			}
 

subpkg/statslist/workstats.vue

@@ -6,15 +6,16 @@
 		<!-- 页面标题内容 -->
 		<view class="flex_cloumn">
 			<view class="flex_baseline">
-				<view class="content_title" style="font-size: 60rpx;">{{dayTime.split('月')[0]}}</view>
+				<view class="content_title" style="font-size: 70rpx;">{{dayTime.split('月')[0]}}</view>
 				<view class="content_title" style="margin-left: 10rpx;">月</view>
-				<view class="content_title" style="font-size: 60rpx;margin-left: 10rpx;">{{dayTime.split('月')[1]}}</view>
+				<view class="content_title" style="font-size: 70rpx;margin-left: 10rpx;">{{dayTime.split('月')[1]}}
+				</view>
 				<view class="content_title" style="margin-left: 10rpx;">日</view>
-				<view class="content_title" style="font-size: 60rpx;margin-left: 20rpx;">{{weekTime}}</view>
+				<view class="content_title" style="font-size: 70rpx;margin-left: 20rpx;">{{weekTime}}</view>
 			</view>
 			<view class="flex_baseline">
 				<view class="content_subtitle" style="opacity: 0.8;">孩子今日共</view>
-				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 40rpx;transform: skew(-10deg);">{{workData.length}}</view>
+				<view class="content_subtitle" style="margin-left: 20rpx;font-size: 60rpx;">{{workData.length}}</view>
 				<view class="content_subtitle" style="margin-left: 20rpx;opacity: 0.8;">份作业</view>
 			</view>
 		</view>
@@ -27,7 +28,8 @@
 					<view class="title">近期作业完成率</view>
 				</view>
 				<view class="chart_box">
-					<qiun-data-charts type="column" ontouch="true" :chartData="workChartData[0]" tooltipFormat='HomeworkPercent' :canvas2d="true" canvasId="work_chart1" />
+					<qiun-data-charts type="column" ontouch="true" :chartData="workChartData[0]"
+						tooltipFormat='HomeworkPercent' :canvas2d="true" canvasId="work_chart1" />
 				</view>
 			</view>
 
@@ -37,12 +39,13 @@
 					<view class="title">近期作业得分率</view>
 				</view>
 				<view class="chart_box">
-					<qiun-data-charts type="area" ontouch="true" :chartData="workChartData[1]" tooltipFormat='HomeworkPercent' :canvas2d="true" canvasId="work_chart2" />
+					<qiun-data-charts type="area" ontouch="true" :chartData="workChartData[1]"
+						tooltipFormat='HomeworkPercent' :canvas2d="true" canvasId="work_chart2" />
 				</view>
 			</view>
 		</view>
-		
-		
+
+
 	</view>
 </template>
 
@@ -74,27 +77,28 @@
 </script>
 
 <style lang="scss">
-	.chart_box{
+	.chart_box {
 		width: 100%;
 		height: 500rpx;
 	}
+
 	.flex_cloumn {
 		margin: 140rpx 0 0 50rpx;
 		height: 170rpx;
 		justify-content: space-around;
-	
+
 		.content_title {
 			font-size: 35rpx;
-			font-weight: bold;
-			transform: skew(-10deg);
+			font-family: YSfont;
 			color: #FFF;
 			z-index: 2;
 			text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;
 		}
-	
+
 		.content_subtitle {
-			font-size: 35rpx;
+			font-size: 40rpx;
 			color: #FFF;
+			font-family: YSfont;
 			z-index: 2;
 		}
 	}

subpkg/userinfo/childinfo.vue

@@ -209,15 +209,5 @@
 			font-weight: bold;
 			color: $title;
 		}
-
-		.bottom_tag {
-			margin-top: -10rpx;
-			margin-left: 20%;
-			height: 20rpx;
-			width: 90%;
-			border-radius: 6rpx;
-			background-image: linear-gradient(to right, #4169E1, #FFF);
-			z-index: -1;
-		}
 	}
 </style>

subpkg/userinfo/parentinfo.vue

@@ -199,16 +199,6 @@
 			font-weight: bold;
 			color: $title;
 		}
-
-		.bottom_tag {
-			margin-top: -10rpx;
-			margin-left: 20%;
-			height: 20rpx;
-			width: 90%;
-			border-radius: 6rpx;
-			background-image: linear-gradient(to right, #4169E1, #FFF);
-			z-index: -1;
-		}
 	}
 
 	.card_box {

subpkg/userinfo/subscribeinfo.vue

@@ -10,8 +10,10 @@
 						<view class="flex_row">
 							<view class="card_title">{{parentInfo.nickName}}</view>
 							<view class="subscribe_tag" style="margin-left: 30rpx;">
-								<view class="t-icon t-icon-huangguan1"></view>
-								<view class="subscribe_tag_text">{{userData.subscribeLevel}}</view>
+								<view class="t-icon t-icon-huangguan1" style="margin-right: 2rpx;"></view>
+								<view class="subscribe_tag_text" style="margin-left: 2rpx;font-size: 28rpx;">
+									{{userData.subscribeLevel}}
+								</view>
 							</view>
 						</view>
 						<view class="card_subtitle">{{userData.subscribeTime}} 到期</view>
@@ -20,8 +22,15 @@
 
 				<view class="icon_box">
 					<view class="t-icon t-icon-huangguan1-copy"></view>
-					<view class="t-icon t-icon-huangguan1-copy" style="margin-top: -500rpx;width: 300rpx;height: 300rpx;opacity: 0.5;"></view>
-					<view class="t-icon t-icon-huangguan1-copy" style="margin-top: -700rpx;width: 250rpx;height: 250rpx;opacity: 0.25;"></view>
+					<view class="t-icon t-icon-huangguan1-copy"
+						style="margin-top: -132px;margin-left: -30rpx;width: 300rpx;height: 300rpx;opacity: 0.75;">
+					</view>
+					<view class="t-icon t-icon-huangguan1-copy"
+						style="margin-top: -107px;margin-left: 30rpx;width: 250rpx;height: 250rpx;opacity: 0.5;">
+					</view>
+					<view class="t-icon t-icon-huangguan1-copy"
+						style="margin-top: -82px;margin-left: 80rpx;width: 200rpx;height: 200rpx;opacity: 0.5;">
+					</view>
 				</view>
 			</view>
 		</view>
@@ -29,10 +38,10 @@
 
 		<view class="flex_row" style="margin: 370rpx 100rpx 0 100rpx;">
 			<view class="subscribe_tag" style="padding: 6rpx 12rpx;" @click="subscribeShow = true">
-				<view class="subscribe_tag_text" style="font-size: 30rpx;" @click="subscribeShow = true">续费会员</view>
+				<view class="subscribe_tag_text" @click="subscribeShow = true">续费会员</view>
 			</view>
 			<view class="subscribe_tag" style="padding: 6rpx 12rpx;margin-left: 50rpx;" @click="subscribeShow = true">
-				<view class="subscribe_tag_text" style="font-size: 30rpx;" @click="subscribeShow = true">升级会员</view>
+				<view class="subscribe_tag_text" @click="subscribeShow = true">升级会员</view>
 			</view>
 		</view>
 
@@ -182,7 +191,12 @@
 		width: 2300rpx;
 		height: 950rpx;
 		border-radius: 50%;
-		background-color: #31343d;
+    background-color: #797572;
+    background-image: 
+        linear-gradient(-173deg, rgba(255,255,255,0.20) 0%, #000000 100%),
+        linear-gradient(72deg, rgba(255,255,255,0.25) 25%, rgba(0,0,0,0.25) 100%),
+        radial-gradient(47% 102%, rgba(255,255,255,0.50) 0%, rgba(21,24,32,0.60) 120%);
+    background-blend-mode: multiply;
 		z-index: -1;
 		overflow: hidden;
 	}
@@ -232,7 +246,10 @@
 		}
 
 		.icon_box {
-			margin: -150rpx 0 0 350rpx;
+			position: absolute;
+			display: flex;
+			flex-direction: column;
+			margin: -90rpx 0 0 320rpx;
 
 			.t-icon {
 				width: 350rpx;
@@ -253,21 +270,21 @@
 		align-items: center;
 		border-radius: 6rpx;
 		padding: 4rpx 10rpx;
-		transform: skew(-10deg);
+		transform: skew(-5deg);
 		background: #2f3137;
 		z-index: 99;
 
 		.subscribe_tag_text {
-			font-size: 22rpx;
-			font-weight: bold;
+			font-size: 30rpx;
+			font-family: YSfont;
 			color: #d0a97e;
-			margin-left: 6rpx;
 			z-index: 99;
 		}
 
 		.t-icon {
-			width: 32rpx;
-			height: 32rpx;
+			width: 28rpx;
+			height: 28rpx;
+			margin-top: -2rpx;
 		}
 	}
 
@@ -326,23 +343,24 @@
 
 		&_title {
 			font-size: 70rpx;
-			font-weight: bold;
-			transform: skew(-10deg);
+			font-family: YSfont;
 			color: #FFF;
 			text-shadow: 1px -1px 0px #c0c0c0,
 				2px -2px 0px #b0b0b0,
 				1px -1px 0px #a0a0a0,
 				2px -2px 0px #909090;
 		}
-		._tag{
+
+		._tag {
 			display: flex;
 			align-items: center;
 			justify-content: space-around;
-			margin:20rpx 50rpx 50rpx 50rpx;
+			margin: 20rpx 50rpx 50rpx 50rpx;
 			width: 200rpx;
 			border-radius: 6rpx;
 			border: 2px solid #31343d;
 			padding: 8rpx 16rpx;
+
 			.tag_text {
 				font-size: 28rpx;
 				font-weight: bold;

subpkg/work/wrongbookinfo.vue

@@ -1,5 +1,5 @@
 <template>
-	<view class="page_view">
+	<view>
 		<top-return text="错题本"></top-return>
 	</view>
 </template>

uni_modules/uview-ui/components/u-tabs/u-tabs.vue

@@ -330,7 +330,8 @@
 					}
 
 					&__text {
-						font-size: 15px;
+						font-size: 35rpx;
+						font-family: YSfont;
 						color: $u-content-color;
 
 						&--disabled {

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

@@ -504,7 +504,7 @@ page {
   height: 100%;
   width: 10rpx;
   border-radius: 100rpx;
-  background-image: linear-gradient(#4169E1, #d8deff);
+  background-image: linear-gradient(#4169E1, rgba(1, 1, 1, 0));
   z-index: 99;
 }
 .bottom_tag {
@@ -513,7 +513,7 @@ page {
   height: 20rpx;
   width: 90%;
   border-radius: 6rpx;
-  background-image: linear-gradient(to right, #4169E1, #f3f4f9);
+  background-image: linear-gradient(to right, #4169E1, rgba(1, 1, 1, 0));
   z-index: -1;
 }
 .tag {

unpackage/dist/dev/mp-weixin/components/loading/loading.json

@@ -0,0 +1,4 @@
+{
+  "component": true,
+  "usingComponents": {}
+}

unpackage/dist/dev/mp-weixin/components/loading/loading.wxml

@@ -0,0 +1 @@
+<view class="flex"><view class="sk-folding-cube"><view class="sk-cube1 sk-cube"></view><view class="sk-cube2 sk-cube"></view><view class="sk-cube4 sk-cube"></view><view class="sk-cube3 sk-cube"></view></view><view class="YS_title" style="margin-top:20rpx;color:#555555;">正在加载中...</view></view>

unpackage/dist/dev/mp-weixin/components/loading/loading.wxss

@@ -0,0 +1,102 @@
+.flex {
+  width: 100vw;
+  height: 100vh;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+  justify-content: center;
+}
+.sk-folding-cube {
+  margin: 20px auto;
+  width: 40px;
+  height: 40px;
+  position: relative;
+  -webkit-transform: rotateZ(45deg);
+  transform: rotateZ(45deg);
+}
+.sk-folding-cube .sk-cube {
+  float: left;
+  width: 50%;
+  height: 50%;
+  position: relative;
+  -webkit-transform: scale(1.1);
+  transform: scale(1.1);
+}
+.sk-folding-cube .sk-cube:before {
+  content: '';
+  position: absolute;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: #555555;
+  -webkit-animation: sk-foldCubeAngle 2.4s infinite linear both;
+  animation: sk-foldCubeAngle 2.4s infinite linear both;
+  -webkit-transform-origin: 100% 100%;
+  transform-origin: 100% 100%;
+}
+.sk-folding-cube .sk-cube2 {
+  -webkit-transform: scale(1.1) rotateZ(90deg);
+  transform: scale(1.1) rotateZ(90deg);
+}
+.sk-folding-cube .sk-cube3 {
+  -webkit-transform: scale(1.1) rotateZ(180deg);
+  transform: scale(1.1) rotateZ(180deg);
+}
+.sk-folding-cube .sk-cube4 {
+  -webkit-transform: scale(1.1) rotateZ(270deg);
+  transform: scale(1.1) rotateZ(270deg);
+}
+.sk-folding-cube .sk-cube2:before {
+  -webkit-animation-delay: 0.3s;
+  animation-delay: 0.3s;
+}
+.sk-folding-cube .sk-cube3:before {
+  -webkit-animation-delay: 0.6s;
+  animation-delay: 0.6s;
+}
+.sk-folding-cube .sk-cube4:before {
+  -webkit-animation-delay: 0.9s;
+  animation-delay: 0.9s;
+}
+@-webkit-keyframes sk-foldCubeAngle {
+0%,
+  10% {
+    -webkit-transform: perspective(140px) rotateX(-180deg);
+    transform: perspective(140px) rotateX(-180deg);
+    opacity: 0;
+}
+25%,
+  75% {
+    -webkit-transform: perspective(140px) rotateX(0deg);
+    transform: perspective(140px) rotateX(0deg);
+    opacity: 1;
+}
+90%,
+  100% {
+    -webkit-transform: perspective(140px) rotateY(180deg);
+    transform: perspective(140px) rotateY(180deg);
+    opacity: 0;
+}
+}
+@keyframes sk-foldCubeAngle {
+0%,
+  10% {
+    -webkit-transform: perspective(140px) rotateX(-180deg);
+    transform: perspective(140px) rotateX(-180deg);
+    opacity: 0;
+}
+25%,
+  75% {
+    -webkit-transform: perspective(140px) rotateX(0deg);
+    transform: perspective(140px) rotateX(0deg);
+    opacity: 1;
+}
+90%,
+  100% {
+    -webkit-transform: perspective(140px) rotateY(180deg);
+    transform: perspective(140px) rotateY(180deg);
+    opacity: 0;
+}
+}
+

unpackage/dist/dev/mp-weixin/components/top-info/top-info.wxss

@@ -38,13 +38,32 @@
   margin-left: auto;
   height: 120rpx;
 }
-.info_box .user_data .tag {
-  border: 1px solid #FFF;
+.info_box .user_data .subscribe_tag {
   display: flex;
-  justify-content: center;
   align-items: center;
   border-radius: 6rpx;
-  padding: 6rpx 10rpx;
-  margin-left: 0;
+  padding: 2rpx 12rpx;
+  -webkit-transform: skew(-5deg);
+          transform: skew(-5deg);
+  background: #2f3137;
+  z-index: 99;
+}
+.info_box .user_data .subscribe_tag .subscribe_tag_text {
+  margin-left: 2rpx;
+  font-size: 28rpx;
+  font-family: YSfont;
+  color: #d0a97e;
+  z-index: 99;
+}
+.info_box .user_data .subscribe_tag .t-icon {
+  width: 28rpx;
+  height: 28rpx;
+  margin-top: -2rpx;
+  margin-right: 2rpx;
+}
+.info_box .user_data .time_stamp {
+  color: #FFF;
+  font-size: 24rpx;
+  font-family: YSfont;
 }
 

unpackage/dist/dev/mp-weixin/components/top-semester/top-semester.wxss

@@ -9,21 +9,15 @@
   z-index: 2;
   text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;
 }
-.flex_cloumn .content_subtitle {
-  font-size: 50rpx;
-  font-family: YSfont;
-  color: #FFF;
-  z-index: 2;
-}
 .tag {
   margin-left: 20rpx;
   border-radius: 6rpx;
   border: 2px solid #FFF;
-  padding: 4rpx 10rpx;
+  padding: 0 6rpx;
   z-index: 9;
 }
 .tag .tag_text {
-  font-size: 30rpx;
+  font-size: 32rpx;
   font-family: YSfont;
   color: #FFF;
   z-index: 9;

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

@@ -2,6 +2,6 @@
   "enablePullDownRefresh": false,
   "navigationStyle": "custom",
   "usingComponents": {
-    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page"
+    "loading": "/components/loading/loading"
   }
 }

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 class="page_view" style="align-items:center;justify-content:center;height:100vh;width:100vw;"><loading vue-id="1e0302c0-1" bind:__l="__l"></loading></view>

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

@@ -56,7 +56,6 @@
   height: 120rpx;
   border-bottom: 4rpx solid #f3f4f9;
   border-top: 4rpx solid #f3f4f9;
-  border-image: linear-gradient(to right, #FFF, #d5d5d5) 1;
 }
 .class_list .class_item_title {
   font-size: 32rpx;
@@ -98,17 +97,19 @@
   z-index: 2;
 }
 ._title {
-  font-size: 48rpx;
-  font-weight: bold;
+  font-size: 54rpx;
+  font-family: YSfont;
   color: #FFF;
 }
 ._subtitle {
-  font-size: 32rpx;
+  font-size: 34rpx;
+  font-family: YSfont;
   color: #FFF;
 }
 ._unit {
   margin-left: 20rpx;
-  font-size: 26rpx;
+  font-size: 30rpx;
+  font-family: YSfont;
   opacity: 0.7;
   color: #FFF;
 }

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

@@ -2,7 +2,7 @@
   "enablePullDownRefresh": true,
   "navigationStyle": "custom",
   "usingComponents": {
-    "u-loading-page": "/uni_modules/uview-ui/components/u-loading-page/u-loading-page",
+    "loading": "/components/loading/loading",
     "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

@@ -56,7 +56,6 @@
   height: 120rpx;
   border-bottom: 4rpx solid #f3f4f9;
   border-top: 4rpx solid #f3f4f9;
-  border-image: linear-gradient(to right, #FFF, #d5d5d5) 1;
 }
 .class_list .class_item_title {
   font-size: 32rpx;
@@ -98,17 +97,19 @@
   z-index: 2;
 }
 ._title {
-  font-size: 48rpx;
-  font-weight: bold;
+  font-size: 54rpx;
+  font-family: YSfont;
   color: #FFF;
 }
 ._subtitle {
-  font-size: 32rpx;
+  font-size: 34rpx;
+  font-family: YSfont;
   color: #FFF;
 }
 ._unit {
   margin-left: 20rpx;
-  font-size: 26rpx;
+  font-size: 30rpx;
+  font-family: YSfont;
   opacity: 0.7;
   color: #FFF;
 }

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

@@ -56,7 +56,6 @@
   height: 120rpx;
   border-bottom: 4rpx solid #f3f4f9;
   border-top: 4rpx solid #f3f4f9;
-  border-image: linear-gradient(to right, #FFF, #d5d5d5) 1;
 }
 .class_list .class_item_title {
   font-size: 32rpx;
@@ -98,17 +97,19 @@
   z-index: 2;
 }
 ._title {
-  font-size: 48rpx;
-  font-weight: bold;
+  font-size: 54rpx;
+  font-family: YSfont;
   color: #FFF;
 }
 ._subtitle {
-  font-size: 32rpx;
+  font-size: 34rpx;
+  font-family: YSfont;
   color: #FFF;
 }
 ._unit {
   margin-left: 20rpx;
-  font-size: 26rpx;
+  font-size: 30rpx;
+  font-family: YSfont;
   opacity: 0.7;
   color: #FFF;
 }
@@ -242,4 +243,15 @@
 .circle_line3 {
   background-image: linear-gradient(to right, #FF6D31, #FF6D31), linear-gradient(0deg, #FFF -50%, rgba(255, 255, 255, 0));
 }
+._item {
+  background-color: #ccc;
+  background-image: radial-gradient(#fff 50%, transparent 50%);
+  background-position: -5px -5px;
+  background-repeat: repeat;
+  background-size: 10px 10px;
+  padding: 5px;
+}
+._item ._item_inner {
+  background-color: #ccc;
+}
 

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

@@ -56,7 +56,6 @@
   height: 120rpx;
   border-bottom: 4rpx solid #f3f4f9;
   border-top: 4rpx solid #f3f4f9;
-  border-image: linear-gradient(to right, #FFF, #d5d5d5) 1;
 }
 .class_list .class_item_title {
   font-size: 32rpx;
@@ -98,17 +97,19 @@
   z-index: 2;
 }
 ._title {
-  font-size: 48rpx;
-  font-weight: bold;
+  font-size: 54rpx;
+  font-family: YSfont;
   color: #FFF;
 }
 ._subtitle {
-  font-size: 32rpx;
+  font-size: 34rpx;
+  font-family: YSfont;
   color: #FFF;
 }
 ._unit {
   margin-left: 20rpx;
-  font-size: 26rpx;
+  font-size: 30rpx;
+  font-family: YSfont;
   opacity: 0.7;
   color: #FFF;
 }

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

@@ -108,16 +108,15 @@
   justify-content: space-around;
 }
 .flex_cloumn .content_title {
-  font-size: 35rpx;
-  font-weight: bold;
-  -webkit-transform: skew(-10deg);
-          transform: skew(-10deg);
+  font-size: 40rpx;
+  font-family: YSfont;
   color: #FFF;
   z-index: 2;
   text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;
 }
 .flex_cloumn .content_subtitle {
-  font-size: 35rpx;
+  font-size: 40rpx;
+  font-family: YSfont;
   color: #FFF;
   z-index: 2;
 }

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

@@ -2,17 +2,13 @@
   background-color: #ff8caf;
 }
 .page_title {
-  font-size: 55rpx;
-  font-weight: bold;
-  -webkit-transform: skew(-10deg);
-          transform: skew(-10deg);
+  font-size: 75rpx;
+  font-family: YSfont;
   color: #FFF;
 }
 .page_subtitle {
-  font-size: 34rpx;
-  font-weight: bold;
-  -webkit-transform: skew(-10deg);
-          transform: skew(-10deg);
+  font-size: 40rpx;
+  font-family: YSfont;
   color: #FFF;
 }
 .bg1 {

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

@@ -2,14 +2,8 @@
   font-weight: 400;
   font-size: 26rpx;
 }
-.tag {
-  border-radius: 6rpx;
-  border: 1rpx solid #4169E1;
-  padding: 5rpx 16rpx;
-}
-.tag .tag_text {
-  font-size: 22rpx;
-  color: #4169E1;
+.tag_fill {
+  background-color: #ff8caf;
 }
 .content_box {
   margin: 20rpx;
@@ -23,7 +17,7 @@
   width: -webkit-fit-content;
   width: fit-content;
   height: 36rpx;
-  border-radius: 10rpx;
+  border-radius: 6rpx;
   padding: 5rpx 20rpx;
 }
 .content_box .title_box .title_text {
@@ -48,16 +42,15 @@
   justify-content: space-around;
 }
 .flex_cloumn .content_title {
-  font-size: 35rpx;
-  font-weight: bold;
-  -webkit-transform: skew(-10deg);
-          transform: skew(-10deg);
+  font-size: 40rpx;
+  font-family: YSfont;
   color: #FFF;
   z-index: 2;
   text-shadow: 1px -1px 0px #c0c0c0, 2px -2px 0px #b0b0b0, 1px -1px 0px #a0a0a0, 2px -2px 0px #909090;
 }
 .flex_cloumn .content_subtitle {
-  font-size: 35rpx;
+  font-size: 40rpx;
+  font-family: YSfont;
   color: #FFF;
   z-index: 2;
 }