update: 课程推荐模块和个人信息页面等

components/top-info/top-info.vue

@@ -1,25 +1,29 @@
 <template>
 	<view>
 		<view class="info_box">
-			<image class="avatar" v-if="childInfo.avatar === '默认'" :src="childInfo.gender==='男'?'/static/default_icons/boy_avatar.svg':'/static/default_icons/girl_avatar.svg'"></image>
+			<image class="avatar" v-if="childInfo.avatar === '默认'"
+				:src="childInfo.gender==='男'?'/static/default_icons/boy_avatar.svg':'/static/default_icons/girl_avatar.svg'">
+			</image>
 			<image class="avatar" v-if="childInfo.avatar != '默认'" :src="childInfo.avatar"></image>
 			<view class="flex_cloumn">
 				<view class="content_name">{{childInfo.name}}</view>
 				<view class="content_class">{{childInfo.class}}</view>
 			</view>
 			<view class="user_data">
-				
+
 				<view class="tag_text" style="color: #FFF;font-size: 22rpx;transform: skew(-15deg);">
 					{{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" @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;">
 						{{userData.subscribeLevel}}
 					</view>
 				</view>
-				
+
 			</view>
 		</view>
 	</view>
@@ -76,8 +80,9 @@
 			width: 112rpx;
 			height: 112rpx;
 			border-radius: 100%;
-			border: 4rpx solid #FFFFFF;
+			border: 4rpx solid #FFF;
 			box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.2);
+			z-index: 55;
 		}
 
 		.flex_cloumn {
@@ -92,6 +97,7 @@
 				font-size: 50rpx;
 				transform: skew(-15deg);
 				color: #FFF;
+				z-index: 99;
 			}
 
 			.content_class {
@@ -99,6 +105,7 @@
 				font-size: 30rpx;
 				transform: skew(-15deg);
 				color: #FFF;
+				z-index: 99;
 			}
 		}
 

pages/style/tab_pages.scss

@@ -131,6 +131,29 @@
 	.scroll_view_bottom{
 		white-space: nowrap;
 		height: 400rpx;
+		._item_box{
+			margin: 0 20rpx;
+			display: inline-block;
+			vertical-align: top;
+			height: 600rpx;
+			width: 84%;
+			.column_item_box{
+				height: 180rpx;
+				width: 100%;
+				margin-bottom: 20rpx;
+				border-radius: $border-radius;
+				background-color: #FFF;
+				overflow: hidden;
+				.image_item{
+					width: 180rpx;
+					height: 180rpx;
+					border-radius: $border-radius;
+					background-size: cover; //背景图片自适应
+					background-repeat: no-repeat;
+					z-index: 50;
+				}
+			}
+		}
 		._item{
 			margin: 0 20rpx;
 			display: inline-block;
@@ -150,4 +173,42 @@
 				z-index: 50;
 			}
 		}
+	}
+	.circle_line1 {
+		position: absolute;
+		width: 352rpx;
+		height: 352rpx;
+		margin-top: 440rpx;
+		margin-left: -70rpx;
+		border: 4rpx solid transparent;
+		border-radius: 100%;
+		background-clip: padding-box, border-box;
+		background-origin: padding-box, border-box;
+		background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(90deg, #FFF -50%, rgba(255, 255, 255, 0.0));
+	}
+	.circle_line2 {
+		position: absolute;
+		width: 232rpx;
+		height: 232rpx;
+		margin-top: 500rpx;
+		margin-left: -10rpx;
+		border: 4rpx solid transparent;
+		border-radius: 100%;
+		background-clip: padding-box, border-box;
+		background-origin: padding-box, border-box;
+		background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(0deg, #FFF -75%, rgba(255, 255, 255, 0.0));
+		z-index: 2;
+	}
+	.circle_line3 {
+		position: absolute;
+		width: 176rpx;
+		height: 176rpx;
+		margin-top: 530rpx;
+		margin-left: 20rpx;
+		border: 2rpx solid transparent;
+		border-radius: 100%;
+		background-clip: padding-box, border-box;
+		background-origin: padding-box, border-box;
+		background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(-90deg, #FFF -100%, rgba(255, 255, 255, 0.0));
+		z-index: 3;
 	}

pages/tab_exam/tab_exam.vue

@@ -2,6 +2,9 @@
 	<view class="page_view">
 		<!-- 统计 -->
 		<view class="bg1">
+			<view class="circle_line1"></view>
+			<view class="circle_line2"></view>
+			<view class="circle_line3"></view>
 			<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">
@@ -18,6 +21,7 @@
 				</view>
 			</scroll-view>
 		</view>
+
 		<!-- 统计卡片 -->
 		<view class="card_view">
 			<view class="total_card">
@@ -107,27 +111,27 @@
 		data() {
 			return {
 				cardList: [{
-					icon: 't-icon t-icon-pingjia',
+					icon: 't-icon t-icon-zoushi',
 					title: '总成绩走势',
 					type: 'mini-area',
 					data: ''
 				}, {
-					icon: 't-icon t-icon-zhishi',
+					icon: 't-icon t-icon-shuju',
 					title: '单次考试分析',
 					type: 'mini-column',
 					data: ''
 				}, {
-					icon: 't-icon t-icon-fengxianpinggu',
+					icon: 't-icon t-icon-jiangzhang',
 					title: '排行占比分析',
 					type: 'mini-area',
 					data: ''
 				}, {
-					icon: 't-icon t-icon-gaishuai',
+					icon: 't-icon t-icon-yingyong',
 					title: '优劣科目分析',
 					type: 'mini-rose',
 					data: ''
 				}, {
-					icon: 't-icon t-icon-tongji',
+					icon: 't-icon t-icon-yunwei',
 					title: '考试能力分析',
 					type: 'mini-column',
 					data: ''
@@ -168,9 +172,15 @@
 			},
 			//获得评判信息
 			getPerformance() {
-				this.finishData = this.examData.filter(x => x.examInfo.progress === 'finish')
-				this.performance = this.finishData.length / this.examData.length >= 0.4 ?
-					(this.finishData.length / this.examData.length >= 0.7 ? '优秀' : '良好') : '较差'
+				if(this.examData.length != 0){
+					this.finishData = this.examData.filter(x => x.examInfo.progress === 'finish')
+					this.performance = this.finishData.length / this.examData.length >= 0.4 ?
+						(this.finishData.length / this.examData.length >= 0.7 ? '优秀' : '良好') : '较差'
+				}else{
+					this.finishData = []
+					this.performance = '无评测'
+				}
+
 			},
 			//导航
 			navGradeList(index) {
@@ -226,4 +236,13 @@
 		background-color: $color-pink;
 		margin-left: 20rpx;
 	}
+	.circle_line1 {
+		background-image: linear-gradient(to right, #ff8caf, #ff8caf), linear-gradient(90deg, #FFF -50%, rgba(255, 255, 255, 0.0));
+	}
+	.circle_line2 {
+		background-image: linear-gradient(to right, #ff8caf, #ff8caf), linear-gradient(180deg, #FFF -50%, rgba(255, 255, 255, 0.0));
+	}
+	.circle_line3 {
+		background-image: linear-gradient(to right, #ff8caf, #ff8caf), linear-gradient(0deg, #FFF -50%, rgba(255, 255, 255, 0.0));
+	}
 </style>

pages/tab_home/tab_home.vue

@@ -6,6 +6,9 @@
 		<view class="page_view" v-if="isHomeLoad">
 			<!-- 成绩统计 -->
 			<view class="bg1">
+				<view class="circle_line1"></view>
+				<view class="circle_line2"></view>
+				<view class="circle_line3"></view>
 				<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">
@@ -331,16 +334,19 @@
 				<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 class="image_box" :style="{backgroundImage:`url(${'https://img08.tooopen.com/20220512/tooopen_v1036583658bee5dec1-490e-4298-8d44-e3a96b89a6e2.jpg'})`}">
+				<view class="_item_box" v-for="(item,index) in classData" :key="index">
 
+					<view class="column_item_box" v-for="(classItem,i) in item" :key="i">
+						<view style="display: flex; width: 100%;height: 100%;">
+							<view class="image_item" :style="{backgroundImage: `url(${classItem.coverImage})`}">
+							</view>
+							<view class="flex_cloumn" style="margin-left: 30rpx;">
+								<view class="title">{{classItem.title}}</view>
+							</view>
+						</view>
 					</view>
 					
 				</view>
-				<view class="_item"></view>
-				<view class="_item"></view>
-				<view class="_item"></view>
-				<view class="_item"></view>
 			</scroll-view>
 		</view>
 	</view>
@@ -356,12 +362,12 @@
 	export default {
 		computed: {
 			...mapState('m_children', ['classList', 'examData', 'workData', 'swapData', 'clockData']),
-			...mapState('m_parent', ['userData'])
+			...mapState('m_parent', ['userData', 'classData'])
 		},
 		data() {
 			return {
 				cardList: [{
-					icon: 't-icon t-icon-ceping',
+					icon: 't-icon t-icon-wenjian',
 					title: '今日评测',
 					canvasId: 'tab_home_chart1',
 					data: {
@@ -373,7 +379,7 @@
 					},
 					chartOpts: {}
 				}, {
-					icon: 't-icon t-icon-lianxi',
+					icon: 't-icon t-icon-yaoqing',
 					title: '今日作业',
 					canvasId: 'tab_home_chart2',
 					data: {
@@ -385,7 +391,7 @@
 					},
 					chartOpts: {}
 				}, {
-					icon: 't-icon t-icon-bianji1',
+					icon: 't-icon t-icon-bianji',
 					title: '今日活动',
 					canvasId: 'tab_home_chart3',
 					data: {
@@ -696,13 +702,18 @@
 	}
 
 	.image {
-		margin-top: -140rpx;
+		margin-top: -130rpx;
 		margin-left: -20rpx;
-		height: 180rpx;
-		width: 180rpx;
+		height: 170rpx;
+		width: 170rpx;
 		background-size: 100%;
 		background-repeat: no-repeat;
 		opacity: 0.25;
 		z-index: 1;
 	}
+
+	.scroll_view_bottom {
+		white-space: nowrap;
+		height: 630rpx;
+	}
 </style>

pages/tab_mine/tab_mine.vue

@@ -20,8 +20,8 @@
 						<view class="t-icon t-icon-a-boshimaojiaoyu"
 							style="width: 60rpx;height: 60rpx;margin-left: 25rpx;"></view>
 						<view class="flex_cloumn" style="margin: 30rpx 0 30rpx 25rpx;">
-							<view class="title" style="margin: 20rpx 0; font-weight: 500;transform: skew(-10deg);">孩子管理</view>
-							<view class="subtitle" style="font-size: 26rpx;margin: 10rpx 0;font-weight: 400;">查看更多孩子信息</view>
+							<view class="title" style="margin: 20rpx 0; font-weight: 500;transform: skew(-10deg);">孩子切换</view>
+							<view class="subtitle" style="font-size: 26rpx;margin: 10rpx 0;font-weight: 400;">管理并查看更多</view>
 						</view>
 					</view>
 				</view>
@@ -105,7 +105,7 @@
 	} from 'vuex'
 	export default {
 		computed: {
-			...mapState('m_parent', ['parentInfo', 'userData']),
+			...mapState('m_parent', ['parentInfo', 'userData','childrenData']),
 			...mapState('m_children', ['childInfo'])
 		},
 		data() {
@@ -141,8 +141,10 @@
 			},
 			//孩子名片
 			navChildInfo() {
+				let tmdidArr = this.childrenData.map(x=>{return x.tmdid})
+				let index = tmdidArr.indexOf(this.childInfo.tmdid)
 				uni.navigateTo({
-					url: '/subpkg/userinfo/childinfo'
+					url: `/subpkg/userinfo/childinfo?index=${index}`
 				})
 			},
 			//家长信息

pages/tab_swap/tab_swap.vue

@@ -2,6 +2,9 @@
 	<view class="page_view">
 		<!-- 统计 -->
 		<view class="bg1">
+			<view class="circle_line1"></view>
+			<view class="circle_line2"></view>
+			<view class="circle_line3"></view>
 			<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">
@@ -71,7 +74,8 @@
 								<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>
+										{{item.vote.description || item.survey.description}}
+									</view>
 								</view>
 							</view>
 						</view>
@@ -111,17 +115,17 @@
 			return {
 				//图表卡片列表
 				cardList: [{
-					icon: 't-icon t-icon-ceping',
+					icon: 't-icon t-icon-zoushi1',
 					title: '近期学习对比',
 					type: 'mini-column',
 					data: '',
 				}, {
-					icon: 't-icon t-icon-lianxi',
+					icon: 't-icon t-icon-lishijilu',
 					title: '近期运动记录',
 					type: 'pie',
 					data: '',
 				}, {
-					icon: 't-icon t-icon-lianxi',
+					icon: 't-icon t-icon-naozhong',
 					title: '近期睡眠记录',
 					type: 'ring',
 					data: '',
@@ -159,10 +163,15 @@
 			},
 			//获得评判信息
 			getPerformance() {
-				this.finishData = this.swapData.filter(x => x.vote && x.vote.progress === 'finish')
-				this.finishData.push(...this.swapData.filter(x => x.survey && x.survey.progress === 'finish'))
-				this.performance = this.finishData.length / this.swapData.length >= 0.4 ?
-					(this.finishData.length / this.swapData.length >= 0.7 ? '优秀' : '良好') : '较差'
+				if (this.swapData.length != 0) {
+					this.finishData = this.swapData.filter(x => x.vote && x.vote.progress === 'finish')
+					this.finishData.push(...this.swapData.filter(x => x.survey && x.survey.progress === 'finish'))
+					this.performance = this.finishData.length / this.swapData.length >= 0.4 ?
+						(this.finishData.length / this.swapData.length >= 0.7 ? '优秀' : '良好') : '较差'
+				} else {
+					this.finishData = []
+					this.performance = '无活动'
+				}
 			},
 			navSwapStats() {
 				uni.navigateTo({
@@ -199,4 +208,13 @@
 		background-color: $color-orange;
 		margin-left: 20rpx;
 	}
+	.circle_line1 {
+		background-image: linear-gradient(to right, #FF6D31, #FF6D31), linear-gradient(90deg, #FFF -50%, rgba(255, 255, 255, 0.0));
+	}
+	.circle_line2 {
+		background-image: linear-gradient(to right, #FF6D31, #FF6D31), linear-gradient(180deg, #FFF -50%, rgba(255, 255, 255, 0.0));
+	}
+	.circle_line3 {
+		background-image: linear-gradient(to right, #FF6D31, #FF6D31), linear-gradient(0deg, #FFF -50%, rgba(255, 255, 255, 0.0));
+	}
 </style>

pages/tab_work/tab_work.vue

@@ -2,6 +2,9 @@
 	<view class="page_view">
 		<!-- 统计 -->
 		<view class="bg1">
+			<view class="circle_line1"></view>
+			<view class="circle_line2"></view>
+			<view class="circle_line3"></view>
 			<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">
@@ -65,8 +68,10 @@
 										</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.work.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.work.description}}</view>
 								</view>
 							</view>
 						</view>
@@ -78,7 +83,7 @@
 				<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">
@@ -103,12 +108,12 @@
 		data() {
 			return {
 				cardList: [{
-					icon: 't-icon t-icon-ceping',
+					icon: 't-icon t-icon-gongzuo',
 					title: '近期作业完成率',
 					type: 'mini-column',
 					data: ''
 				}, {
-					icon: 't-icon t-icon-lianxi',
+					icon: 't-icon t-icon-renzheng',
 					title: '近期作业得分率',
 					type: 'mini-area',
 					data: ''
@@ -146,9 +151,14 @@
 			},
 			//获得评判信息
 			getPerformance() {
-				this.finishData = this.workData.filter(x => x.work.progress === 'finish')
-				this.performance = this.finishData.length / this.workData.length >= 0.4 ?
-					(this.finishData.length / this.workData.length >= 0.7 ? '优秀' : '良好') : '较差'
+				if (this.workData.length != 0) {
+					this.finishData = this.workData.filter(x => x.work.progress === 'finish')
+					this.performance = this.finishData.length / this.workData.length >= 0.4 ?
+						(this.finishData.length / this.workData.length >= 0.7 ? '优秀' : '良好') : '较差'
+				} else {
+					this.finishData = []
+					this.performance = '无作业'
+				}
 			},
 			navWorkStats() {
 				uni.navigateTo({
@@ -189,4 +199,13 @@
 	.image {
 		top: -50rpx;
 	}
+	.circle_line1 {
+		background-image: linear-gradient(to right, #f9c752, #f9c752), linear-gradient(90deg, #FFF -50%, rgba(255, 255, 255, 0.0));
+	}
+	.circle_line2 {
+		background-image: linear-gradient(to right, #f9c752, #f9c752), linear-gradient(180deg, #FFF -50%, rgba(255, 255, 255, 0.0));
+	}
+	.circle_line3 {
+		background-image: linear-gradient(to right, #f9c752, #f9c752), linear-gradient(0deg, #FFF -50%, rgba(255, 255, 255, 0.0));
+	}
 </style>

store/parent.js

@@ -12,6 +12,8 @@ export default {
 		childrenData: JSON.parse(uni.getStorageSync('childrenData') || '{}'),
 		//个人数据
 		userData: JSON.parse(uni.getStorageSync('userData') || '{}'),
+		//已购课程数据
+		classData: JSON.parse(uni.getStorageSync('classData') || '{}'),
 	}),
 	mutations: {
 		//更新登录凭证
@@ -39,6 +41,11 @@ export default {
 			state.userData = userData
 			uni.setStorageSync('userData', JSON.stringify(state.userData))
 		},
+		//更新已购课程数据
+		updateClassData(state,classData){
+			state.classData = classData
+			uni.setStorageSync('classData', JSON.stringify(state.classData))
+		},
 	},
 	getters:{
 		

subpkg/datalist/classdetail.vue

@@ -57,10 +57,10 @@
 						</view>
 					</view>
 				</view>
-				<view style="display: flex;flex-direction: column;height: 100%;align-items: center;margin-bottom: 50rpx;" v-if="!currentClassList">
+				<view style="display: flex;flex-direction: column;height: 100%;align-items: center;margin-bottom: 70rpx;" 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">当前选中日期孩子暂无课程</view>
+					<view class="subtitle" style="margin-top: 20rpx;">注意劳逸结合</view>
 				</view>
 			</view>
 		</view>
@@ -147,8 +147,8 @@
 		.week_item {
 			display: inline-block;
 			vertical-align: top;
-			height: 150rpx;
-			width: 130rpx;
+			height: 140rpx;
+			width: 120rpx;
 			margin: 20rpx;
 			padding: 20rpx;
 			border-radius: $border-radius;
@@ -178,8 +178,8 @@
 		.week_item_select {
 			display: inline-block;
 			vertical-align: top;
-			height: 180rpx;
-			width: 160rpx;
+			height: 160rpx;
+			width: 140rpx;
 			margin: 20rpx;
 			padding: 20rpx;
 			border-radius: $border-radius;

subpkg/datalist/examdata.vue

@@ -2,11 +2,10 @@
 	<view class="page_view">
 		<top-return color="#FFF"></top-return>
 		<view class="flex_row">
-			<view class="flex_cloumn" style="margin: 150rpx 0 0 50rpx;">
-				<view class="page_title" style="font-size: 40rpx;">Exam</view>
-				<view class="page_title" style="font-size: 40rpx;">Analysis report</view>
-				<view class="page_title" style="margin-top: 20rpx;">评测</view>
+			<view class="flex_cloumn" style="margin: 120rpx 0 0 50rpx;">
+				<view class="page_title">评测</view>
 				<view class="page_title">分析报告</view>
+				<view class="page_subtitle" style="margin-top: 30rpx;">{{examData[index].examInfo.name}}</view>
 			</view>
 			<view class="bg1"></view>
 			<view class="detail_image1" :style="{backgroundImage:`url(${image1})`}"></view>
@@ -55,6 +54,12 @@
 		transform: skew(-15deg);
 		color: #FFF;
 	}
+	.page_subtitle {
+		font-size: 34rpx;
+		font-weight: bold;
+		transform: skew(-15deg);
+		color: #FFF;
+	}
 
 	.bg1 {
 		position: absolute;

subpkg/datalist/examlist.vue

@@ -17,13 +17,14 @@
 				<view class="content_title" style="font-size: 60rpx; margin-left: 10rpx;">{{dayTime.split('月')[1]}}
 				</view>
 				<view class="content_title" style="margin-left: 10rpx;">日</view>
-				<view class="content_title" style="margin-left: 10rpx;">完成情况</view>
 				<view class="content_title" style="margin-left: 10rpx;font-size: 50rpx;">{{value}}</view>
+				<view class="content_title" style="margin-left: 10rpx;">完成</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(-15deg);">
-					{{examData.length}}</view>
+					{{examData.length}}
+				</view>
 				<view class="content_subtitle" style="margin-left: 20rpx;opacity: 0.8;">例评测</view>
 			</view>
 		</view>
@@ -35,7 +36,9 @@
 					<view class="front_tag" style="height: 40rpx;"></view>
 					<view class="title" style="font-size: 36rpx;">{{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;"></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;">
+					</view>
 				</view>
 				<view class="cloumn">
 					<view class="flex_row">

subpkg/datalist/swapdata.vue

@@ -2,11 +2,10 @@
 	<view class="page_view">
 		<top-return color="#FFF"></top-return>
 		<view class="flex_row">
-			<view class="flex_cloumn" style="margin: 150rpx 0 0 50rpx;">
-				<view class="page_title" style="font-size: 40rpx;">Activity</view>
-				<view class="page_title" style="font-size: 40rpx;">Information details</view>
-				<view class="page_title" style="margin-top: 20rpx;">活动</view>
+			<view class="flex_cloumn" style="margin: 120rpx 0 0 50rpx;">
+				<view class="page_title">活动</view>
 				<view class="page_title">详情信息</view>
+				<view class="page_subtitle" style="margin-top: 30rpx;">{{swapData[index].survey.name||swapData[index].vote.name}}</view>
 			</view>
 			<view class="bg1"></view>
 			<view class="detail_image" :style="{backgroundImage:`url(${image})`}"></view>
@@ -53,6 +52,12 @@
 		transform: skew(-15deg);
 		color: #FFF;
 	}
+	.page_subtitle {
+		font-size: 34rpx;
+		font-weight: bold;
+		transform: skew(-15deg);
+		color: #FFF;
+	}
 
 	.bg1 {
 		position: absolute;
@@ -66,7 +71,7 @@
 
 	.detail_image {
 		position: absolute;
-		top: 170rpx;
+		top: 140rpx;
 		left: 430rpx;
 		width: 370rpx;
 		height: 350rpx;

subpkg/datalist/swaplist.vue

@@ -11,8 +11,8 @@
 				<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="margin-left: 10rpx;">日</view>
-				<view class="content_title" style="margin-left: 10rpx;">完成情况</view>
 				<view class="content_title" style="margin-left: 10rpx;font-size: 50rpx;">{{value}}</view>
+								<view class="content_title" style="margin-left: 10rpx;">完成</view>
 			</view>
 			<view class="flex_baseline">
 				<view class="content_subtitle" style="opacity: 0.8;">当前共</view>

subpkg/datalist/workdata.vue

@@ -2,17 +2,15 @@
 	<view class="page_view">
 		<top-return color="#FFF"></top-return>
 		<view class="flex_row">
-			<view class="flex_cloumn" style="margin: 150rpx 0 0 50rpx;">
-				<view class="page_title" style="font-size: 40rpx;">Homework</view>
-				<view class="page_title" style="font-size: 40rpx;">Analysis report</view>
-				<view class="page_title" style="margin-top: 20rpx;">作业</view>
+			<view class="flex_cloumn" style="margin: 120rpx 0 0 50rpx;">
+				<view class="page_title">作业</view>
 				<view class="page_title">分析报告</view>
+				<view class="page_subtitle" style="margin-top: 30rpx;">{{workData[index].work.name}}</view>
 			</view>
 			<view class="bg1"></view>
 			<view class="detail_image" :style="{backgroundImage:`url(${image})`}"></view>
 		</view>
 
-
 		<view class="card_view">
 			<view class="card_item" style="width: 100%;height: 2300rpx;opacity: 0.9;"></view>
 		</view>
@@ -53,6 +51,12 @@
 		transform: skew(-15deg);
 		color: #FFF;
 	}
+	.page_subtitle {
+		font-size: 34rpx;
+		font-weight: bold;
+		transform: skew(-15deg);
+		color: #FFF;
+	}
 
 	.bg1 {
 		position: absolute;

subpkg/datalist/worklist.vue

@@ -11,8 +11,8 @@
 				<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="margin-left: 10rpx;">日</view>
-				<view class="content_title" style="margin-left: 10rpx;">完成情况</view>
 				<view class="content_title" style="margin-left: 10rpx;font-size: 50rpx;">{{value}}</view>
+								<view class="content_title" style="margin-left: 10rpx;">完成</view>
 			</view>
 			<view class="flex_baseline">
 				<view class="content_subtitle" style="opacity: 0.8;">孩子共</view>

subpkg/userinfo/childinfo.vue

@@ -15,21 +15,21 @@
 		<!-- 卡片信息 -->
 		<view class="main_card">
 			<view class="flex_row">
-				<view class="t-icon t-icon-baike"></view>
+				<view class="t-icon t-icon-baohu"></view>
 				<view class="flex_cloumn">
 					<view class="subtitle">基础信息</view>
 					<view class="title" style="margin-top: 10rpx;">性别 {{childInfo.gender}} 年龄 {{childInfo.age}}岁</view>
 				</view>
 			</view>
 			<view class="flex_row" style="margin-top: 50rpx;">
-				<view class="t-icon t-icon-tuandui1"></view>
+				<view class="t-icon t-icon-fenlei1"></view>
 				<view class="flex_cloumn">
 					<view class="subtitle">孩子班级</view>
 					<view class="title">{{childInfo.class}}</view>
 				</view>
 			</view>
 			<view class="flex_row" style="margin-top: 50rpx;">
-				<view class="t-icon t-icon-xuewei"></view>
+				<view class="t-icon t-icon-jiaoyu"></view>
 				<view class="flex_cloumn">
 					<view class="subtitle">学期信息</view>
 					<view class="title">{{childInfo.semester}}</view>
@@ -55,16 +55,20 @@
 	} from 'vuex'
 	export default {
 		computed: {
-			...mapState('m_children', ['childInfo']),
+			...mapState('m_parent', ['childrenData']),
 		},
 		data() {
 			return {
 				image: 'https://images.unsplash.com/photo-1648522102128-ef9759d8d27c?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=764&q=80',
 				medals: [
 					
-				]
+				],
+				childInfo: ''
 			};
 		},
+		onLoad(param) {
+			this.childInfo = this.childrenData[param.index]
+		},
 		methods: {
 			updateAvatar() {
 				uni.chooseImage({

subpkg/userinfo/parentinfo.vue

@@ -14,21 +14,21 @@
 		<!-- 卡片信息 -->
 		<view class="main_card">
 			<view class="flex_row">
-				<view class="t-icon t-icon-huiyuan"></view>
+				<view class="t-icon t-icon-huangguan"></view>
 				<view class="flex_cloumn">
 					<view class="subtitle">我的订阅</view>
 					<view class="title">{{userData.subscribeLevel}}</view>
 				</view>
 			</view>
 			<view class="flex_row" style="margin-top: 50rpx;">
-				<view class="t-icon t-icon-qingjiashenqing"></view>
+				<view class="t-icon t-icon-jiesuo"></view>
 				<view class="flex_cloumn">
 					<view class="subtitle">订阅时间</view>
 					<view class="title">{{userData.subscribeTime}}</view>
 				</view>
 			</view>
 			<view class="flex_row" style="margin-top: 50rpx;">
-				<view class="t-icon t-icon-keji"></view>
+				<view class="t-icon t-icon-quanxian"></view>
 				<view class="flex_cloumn">
 					<view class="subtitle">订阅权益</view>
 					<view class="title">{{userData.subscribePrivilege}}</view>
@@ -41,8 +41,8 @@
 					<view class="bottom_tag"></view>
 				</view>
 			</view>
-			
-			<view class="card_box">
+
+			<!-- <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>
@@ -53,8 +53,28 @@
 						<image class="avatar" v-if="item.avatar != '默认'" :src="item.avatar"></image>
 					</view>
 				</view>
+			</view> -->
+			<view class="card_box">
+				<view class="card" v-for="(item,index) in childrenData" :key="index" @click="navChildInfo(index)">
+					<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 class="flex_cloumn_box"
+						style="margin-left: 30rpx;height: 100rpx;justify-content: space-around;">
+						<view class="flex_baseline">
+							<view class="card_title">{{item.name}}</view>
+							<view class="card_title" style="font-size: 26rpx;margin-left: 20rpx;">{{item.tmdid}}</view>
+						</view>
+						<view class="flex_row">
+							<view class="t-icon t-icon-xuewei1" style="width: 30rpx;height: 30rpx;margin-right: 5rpx;"></view>
+							<view class="card_subtitle">{{item.school}}</view>
+							<view class="t-icon t-icon-zhengceguizhang2" style="width: 30rpx;height: 30rpx;margin-right: 5rpx;margin-left: 20rpx;"></view>
+							<view class="card_subtitle">{{item.class}}</view>
+						</view>
+					</view>
+				</view>
 			</view>
-
 		</view>
 	</view>
 </template>
@@ -72,10 +92,13 @@
 				image: 'https://images.unsplash.com/photo-1568269477456-11e3f3b5c7a5?ixlib=rb-1.2.1&ixid=MnwxMjA3fDB8MHxwaG90by1wYWdlfHx8fGVufDB8fHx8&auto=format&fit=crop&w=1000&q=80',
 			};
 		},
-		onLoad() {
-		},
 		methods: {
-
+			//孩子名片
+			navChildInfo(index) {
+				uni.navigateTo({
+					url: `/subpkg/userinfo/childinfo?index=${index}`
+				})
+			},
 		},
 	}
 </script>
@@ -209,13 +232,10 @@
 		flex-wrap: wrap; //元素换行
 
 		.card {
-			width: 210rpx;
-			height: 210rpx;
-			margin: 20rpx 40rpx 20rpx 0;
+			width: 100%;
+			margin: 10rpx 0 10rpx 0;
 			padding: 20rpx;
 			display: flex;
-			flex-direction: column;
-			justify-content: center;
 			align-items: center;
 			box-shadow: $box-shadow;
 			background-color: #FFFFFF;
@@ -223,19 +243,22 @@
 			z-index: 99;
 
 			.card_title {
-				line-height: 30rpx;
-				font-size: 30rpx;
-				font-weight: bold;
+				line-height: 34rpx;
+				font-size: 34rpx;
 				color: $title;
 			}
 
-			.avatar_box {
-				padding-top: 10rpx;
-				.avatar {
-					width: 180rpx;
-					height: 180rpx;
-				}
+			.card_subtitle {
+				line-height: 26rpx;
+				font-size: 26rpx;
+				color: $subtitle;
 			}
+
+			.avatar {
+				width: 100rpx;
+				height: 100rpx;
+			}
+
 		}
 	}
 </style>

subpkg/userinfo/subscribeinfo.vue

@@ -20,6 +20,8 @@
 
 				<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>
 			</view>
 		</view>
@@ -42,24 +44,24 @@
 
 			<view style="margin: 20rpx;">
 				<view class="flex_row" style="margin: 40rpx 0;">
-					<view class="t-icon t-icon-jingxuan"></view>
+					<view class="t-icon t-icon-jiance"></view>
 					<view class="flex_cloumn" style="margin-left: 30rpx;height: 80rpx;justify-content: space-around;">
 						<view class="subscribe_view_title">畅享成绩进阶分析</view>
 						<view class="subscribe_view_subtitle">全方位掌握孩子考试能力</view>
 					</view>
 				</view>
 				<view class="flex_row" style="margin: 40rpx 0;">
-					<view class="t-icon t-icon-pingjia"></view>
+					<view class="t-icon t-icon-renwu"></view>
 					<view class="flex_cloumn" style="margin-left: 30rpx;height: 80rpx;justify-content: space-around;">
 						<view class="subscribe_view_title">测验作业内容早知道</view>
-						<view class="subscribe_view_subtitle">随时随地了解孩子日常表现</view>
+						<view class="subscribe_view_subtitle">随时随地了解孩子学习表现</view>
 					</view>
 				</view>
 				<view class="flex_row" style="margin: 40rpx 0;">
-					<view class="t-icon t-icon-huiyuan"></view>
+					<view class="t-icon t-icon-tishi"></view>
 					<view class="flex_cloumn" style="margin-left: 30rpx;height: 80rpx;justify-content: space-around;">
 						<view class="subscribe_view_title">家校互动零距离</view>
-						<view class="subscribe_view_subtitle">记录孩子在家点点滴滴</view>
+						<view class="subscribe_view_subtitle">记录孩子在校在家点点滴滴</view>
 					</view>
 				</view>
 			</view>
@@ -71,21 +73,21 @@
 
 			<view style="margin: 20rpx;">
 				<view class="privilege_card">
-					<view class="t-icon t-icon-jingxuan"></view>
+					<view class="t-icon t-icon-renzheng"></view>
 					<view class="flex_cloumn" style="margin-left: 30rpx;height: 80rpx;justify-content: space-around;">
 						<view class="subscribe_view_title">敬请期待</view>
 						<view class="subscribe_view_subtitle">敬请期待</view>
 					</view>
 				</view>
 				<view class="privilege_card">
-					<view class="t-icon t-icon-pingjia"></view>
+					<view class="t-icon t-icon-erweima"></view>
 					<view class="flex_cloumn" style="margin-left: 30rpx;height: 80rpx;justify-content: space-around;">
 						<view class="subscribe_view_title">敬请期待</view>
 						<view class="subscribe_view_subtitle">敬请期待</view>
 					</view>
 				</view>
 				<view class="privilege_card">
-					<view class="t-icon t-icon-huiyuan"></view>
+					<view class="t-icon t-icon-dianzan"></view>
 					<view class="flex_cloumn" style="margin-left: 30rpx;height: 80rpx;justify-content: space-around;">
 						<view class="subscribe_view_title">敬请期待</view>
 						<view class="subscribe_view_subtitle">敬请期待</view>

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

@@ -8,8 +8,9 @@
   width: 112rpx;
   height: 112rpx;
   border-radius: 100%;
-  border: 4rpx solid #FFFFFF;
+  border: 4rpx solid #FFF;
   box-shadow: 0 10rpx 20rpx rgba(0, 0, 0, 0.2);
+  z-index: 55;
 }
 .info_box .flex_cloumn {
   margin-left: 40rpx;
@@ -23,12 +24,14 @@
   -webkit-transform: skew(-15deg);
           transform: skew(-15deg);
   color: #FFF;
+  z-index: 99;
 }
 .info_box .flex_cloumn .content_class {
   font-size: 30rpx;
   -webkit-transform: skew(-15deg);
           transform: skew(-15deg);
   color: #FFF;
+  z-index: 99;
 }
 .info_box .user_data {
   display: flex;

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

@@ -117,6 +117,29 @@
   white-space: nowrap;
   height: 400rpx;
 }
+.scroll_view_bottom ._item_box {
+  margin: 0 20rpx;
+  display: inline-block;
+  vertical-align: top;
+  height: 600rpx;
+  width: 84%;
+}
+.scroll_view_bottom ._item_box .column_item_box {
+  height: 180rpx;
+  width: 100%;
+  margin-bottom: 20rpx;
+  border-radius: 12rpx;
+  background-color: #FFF;
+  overflow: hidden;
+}
+.scroll_view_bottom ._item_box .column_item_box .image_item {
+  width: 180rpx;
+  height: 180rpx;
+  border-radius: 12rpx;
+  background-size: cover;
+  background-repeat: no-repeat;
+  z-index: 50;
+}
 .scroll_view_bottom ._item {
   margin: 0 20rpx;
   display: inline-block;
@@ -136,6 +159,44 @@
   background-repeat: no-repeat;
   z-index: 50;
 }
+.circle_line1 {
+  position: absolute;
+  width: 352rpx;
+  height: 352rpx;
+  margin-top: 440rpx;
+  margin-left: -70rpx;
+  border: 4rpx solid transparent;
+  border-radius: 100%;
+  background-clip: padding-box, border-box;
+  background-origin: padding-box, border-box;
+  background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(90deg, #FFF -50%, rgba(255, 255, 255, 0));
+}
+.circle_line2 {
+  position: absolute;
+  width: 232rpx;
+  height: 232rpx;
+  margin-top: 500rpx;
+  margin-left: -10rpx;
+  border: 4rpx solid transparent;
+  border-radius: 100%;
+  background-clip: padding-box, border-box;
+  background-origin: padding-box, border-box;
+  background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(0deg, #FFF -75%, rgba(255, 255, 255, 0));
+  z-index: 2;
+}
+.circle_line3 {
+  position: absolute;
+  width: 176rpx;
+  height: 176rpx;
+  margin-top: 530rpx;
+  margin-left: 20rpx;
+  border: 2rpx solid transparent;
+  border-radius: 100%;
+  background-clip: padding-box, border-box;
+  background-origin: padding-box, border-box;
+  background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(-90deg, #FFF -100%, rgba(255, 255, 255, 0));
+  z-index: 3;
+}
 .bg1 {
   background-color: #ff8caf;
 }
@@ -143,4 +204,13 @@
   background-color: #ff8caf;
   margin-left: 20rpx;
 }
+.circle_line1 {
+  background-image: linear-gradient(to right, #ff8caf, #ff8caf), linear-gradient(90deg, #FFF -50%, rgba(255, 255, 255, 0));
+}
+.circle_line2 {
+  background-image: linear-gradient(to right, #ff8caf, #ff8caf), linear-gradient(180deg, #FFF -50%, rgba(255, 255, 255, 0));
+}
+.circle_line3 {
+  background-image: linear-gradient(to right, #ff8caf, #ff8caf), linear-gradient(0deg, #FFF -50%, rgba(255, 255, 255, 0));
+}
 

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

@@ -117,6 +117,29 @@
   white-space: nowrap;
   height: 400rpx;
 }
+.scroll_view_bottom ._item_box {
+  margin: 0 20rpx;
+  display: inline-block;
+  vertical-align: top;
+  height: 600rpx;
+  width: 84%;
+}
+.scroll_view_bottom ._item_box .column_item_box {
+  height: 180rpx;
+  width: 100%;
+  margin-bottom: 20rpx;
+  border-radius: 12rpx;
+  background-color: #FFF;
+  overflow: hidden;
+}
+.scroll_view_bottom ._item_box .column_item_box .image_item {
+  width: 180rpx;
+  height: 180rpx;
+  border-radius: 12rpx;
+  background-size: cover;
+  background-repeat: no-repeat;
+  z-index: 50;
+}
 .scroll_view_bottom ._item {
   margin: 0 20rpx;
   display: inline-block;
@@ -136,6 +159,44 @@
   background-repeat: no-repeat;
   z-index: 50;
 }
+.circle_line1 {
+  position: absolute;
+  width: 352rpx;
+  height: 352rpx;
+  margin-top: 440rpx;
+  margin-left: -70rpx;
+  border: 4rpx solid transparent;
+  border-radius: 100%;
+  background-clip: padding-box, border-box;
+  background-origin: padding-box, border-box;
+  background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(90deg, #FFF -50%, rgba(255, 255, 255, 0));
+}
+.circle_line2 {
+  position: absolute;
+  width: 232rpx;
+  height: 232rpx;
+  margin-top: 500rpx;
+  margin-left: -10rpx;
+  border: 4rpx solid transparent;
+  border-radius: 100%;
+  background-clip: padding-box, border-box;
+  background-origin: padding-box, border-box;
+  background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(0deg, #FFF -75%, rgba(255, 255, 255, 0));
+  z-index: 2;
+}
+.circle_line3 {
+  position: absolute;
+  width: 176rpx;
+  height: 176rpx;
+  margin-top: 530rpx;
+  margin-left: 20rpx;
+  border: 2rpx solid transparent;
+  border-radius: 100%;
+  background-clip: padding-box, border-box;
+  background-origin: padding-box, border-box;
+  background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(-90deg, #FFF -100%, rgba(255, 255, 255, 0));
+  z-index: 3;
+}
 .bg2 {
   margin-top: -1065rpx;
   height: 1200rpx;
@@ -207,13 +268,17 @@
           transform: skew(-10deg);
 }
 .image {
-  margin-top: -140rpx;
+  margin-top: -130rpx;
   margin-left: -20rpx;
-  height: 180rpx;
-  width: 180rpx;
+  height: 170rpx;
+  width: 170rpx;
   background-size: 100%;
   background-repeat: no-repeat;
   opacity: 0.25;
   z-index: 1;
 }
+.scroll_view_bottom {
+  white-space: nowrap;
+  height: 630rpx;
+}
 

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

@@ -117,6 +117,29 @@
   white-space: nowrap;
   height: 400rpx;
 }
+.scroll_view_bottom ._item_box {
+  margin: 0 20rpx;
+  display: inline-block;
+  vertical-align: top;
+  height: 600rpx;
+  width: 84%;
+}
+.scroll_view_bottom ._item_box .column_item_box {
+  height: 180rpx;
+  width: 100%;
+  margin-bottom: 20rpx;
+  border-radius: 12rpx;
+  background-color: #FFF;
+  overflow: hidden;
+}
+.scroll_view_bottom ._item_box .column_item_box .image_item {
+  width: 180rpx;
+  height: 180rpx;
+  border-radius: 12rpx;
+  background-size: cover;
+  background-repeat: no-repeat;
+  z-index: 50;
+}
 .scroll_view_bottom ._item {
   margin: 0 20rpx;
   display: inline-block;
@@ -136,6 +159,44 @@
   background-repeat: no-repeat;
   z-index: 50;
 }
+.circle_line1 {
+  position: absolute;
+  width: 352rpx;
+  height: 352rpx;
+  margin-top: 440rpx;
+  margin-left: -70rpx;
+  border: 4rpx solid transparent;
+  border-radius: 100%;
+  background-clip: padding-box, border-box;
+  background-origin: padding-box, border-box;
+  background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(90deg, #FFF -50%, rgba(255, 255, 255, 0));
+}
+.circle_line2 {
+  position: absolute;
+  width: 232rpx;
+  height: 232rpx;
+  margin-top: 500rpx;
+  margin-left: -10rpx;
+  border: 4rpx solid transparent;
+  border-radius: 100%;
+  background-clip: padding-box, border-box;
+  background-origin: padding-box, border-box;
+  background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(0deg, #FFF -75%, rgba(255, 255, 255, 0));
+  z-index: 2;
+}
+.circle_line3 {
+  position: absolute;
+  width: 176rpx;
+  height: 176rpx;
+  margin-top: 530rpx;
+  margin-left: 20rpx;
+  border: 2rpx solid transparent;
+  border-radius: 100%;
+  background-clip: padding-box, border-box;
+  background-origin: padding-box, border-box;
+  background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(-90deg, #FFF -100%, rgba(255, 255, 255, 0));
+  z-index: 3;
+}
 .bg1 {
   background-color: #FF6D31;
 }
@@ -146,4 +207,13 @@
   background-color: #FF6D31;
   margin-left: 20rpx;
 }
+.circle_line1 {
+  background-image: linear-gradient(to right, #FF6D31, #FF6D31), linear-gradient(90deg, #FFF -50%, rgba(255, 255, 255, 0));
+}
+.circle_line2 {
+  background-image: linear-gradient(to right, #FF6D31, #FF6D31), linear-gradient(180deg, #FFF -50%, rgba(255, 255, 255, 0));
+}
+.circle_line3 {
+  background-image: linear-gradient(to right, #FF6D31, #FF6D31), linear-gradient(0deg, #FFF -50%, rgba(255, 255, 255, 0));
+}
 

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

@@ -117,6 +117,29 @@
   white-space: nowrap;
   height: 400rpx;
 }
+.scroll_view_bottom ._item_box {
+  margin: 0 20rpx;
+  display: inline-block;
+  vertical-align: top;
+  height: 600rpx;
+  width: 84%;
+}
+.scroll_view_bottom ._item_box .column_item_box {
+  height: 180rpx;
+  width: 100%;
+  margin-bottom: 20rpx;
+  border-radius: 12rpx;
+  background-color: #FFF;
+  overflow: hidden;
+}
+.scroll_view_bottom ._item_box .column_item_box .image_item {
+  width: 180rpx;
+  height: 180rpx;
+  border-radius: 12rpx;
+  background-size: cover;
+  background-repeat: no-repeat;
+  z-index: 50;
+}
 .scroll_view_bottom ._item {
   margin: 0 20rpx;
   display: inline-block;
@@ -136,6 +159,44 @@
   background-repeat: no-repeat;
   z-index: 50;
 }
+.circle_line1 {
+  position: absolute;
+  width: 352rpx;
+  height: 352rpx;
+  margin-top: 440rpx;
+  margin-left: -70rpx;
+  border: 4rpx solid transparent;
+  border-radius: 100%;
+  background-clip: padding-box, border-box;
+  background-origin: padding-box, border-box;
+  background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(90deg, #FFF -50%, rgba(255, 255, 255, 0));
+}
+.circle_line2 {
+  position: absolute;
+  width: 232rpx;
+  height: 232rpx;
+  margin-top: 500rpx;
+  margin-left: -10rpx;
+  border: 4rpx solid transparent;
+  border-radius: 100%;
+  background-clip: padding-box, border-box;
+  background-origin: padding-box, border-box;
+  background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(0deg, #FFF -75%, rgba(255, 255, 255, 0));
+  z-index: 2;
+}
+.circle_line3 {
+  position: absolute;
+  width: 176rpx;
+  height: 176rpx;
+  margin-top: 530rpx;
+  margin-left: 20rpx;
+  border: 2rpx solid transparent;
+  border-radius: 100%;
+  background-clip: padding-box, border-box;
+  background-origin: padding-box, border-box;
+  background-image: linear-gradient(to right, #4169E1, #4169E1), linear-gradient(-90deg, #FFF -100%, rgba(255, 255, 255, 0));
+  z-index: 3;
+}
 .bg1 {
   background-color: #f9c752;
 }
@@ -149,4 +210,13 @@
 .image {
   top: -50rpx;
 }
+.circle_line1 {
+  background-image: linear-gradient(to right, #f9c752, #f9c752), linear-gradient(90deg, #FFF -50%, rgba(255, 255, 255, 0));
+}
+.circle_line2 {
+  background-image: linear-gradient(to right, #f9c752, #f9c752), linear-gradient(180deg, #FFF -50%, rgba(255, 255, 255, 0));
+}
+.circle_line3 {
+  background-image: linear-gradient(to right, #f9c752, #f9c752), linear-gradient(0deg, #FFF -50%, rgba(255, 255, 255, 0));
+}
 

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

@@ -4,8 +4,8 @@
 .week_view .week_item {
   display: inline-block;
   vertical-align: top;
-  height: 150rpx;
-  width: 130rpx;
+  height: 140rpx;
+  width: 120rpx;
   margin: 20rpx;
   padding: 20rpx;
   border-radius: 12rpx;
@@ -31,8 +31,8 @@
 .week_view .week_item_select {
   display: inline-block;
   vertical-align: top;
-  height: 180rpx;
-  width: 160rpx;
+  height: 160rpx;
+  width: 140rpx;
   margin: 20rpx;
   padding: 20rpx;
   border-radius: 12rpx;

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

@@ -8,6 +8,13 @@
           transform: skew(-15deg);
   color: #FFF;
 }
+.page_subtitle {
+  font-size: 34rpx;
+  font-weight: bold;
+  -webkit-transform: skew(-15deg);
+          transform: skew(-15deg);
+  color: #FFF;
+}
 .bg1 {
   position: absolute;
   top: 200rpx;

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

@@ -8,6 +8,13 @@
           transform: skew(-15deg);
   color: #FFF;
 }
+.page_subtitle {
+  font-size: 34rpx;
+  font-weight: bold;
+  -webkit-transform: skew(-15deg);
+          transform: skew(-15deg);
+  color: #FFF;
+}
 .bg1 {
   position: absolute;
   top: 200rpx;
@@ -19,7 +26,7 @@
 }
 .detail_image {
   position: absolute;
-  top: 170rpx;
+  top: 140rpx;
   left: 430rpx;
   width: 370rpx;
   height: 350rpx;

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

@@ -8,6 +8,13 @@
           transform: skew(-15deg);
   color: #FFF;
 }
+.page_subtitle {
+  font-size: 34rpx;
+  font-weight: bold;
+  -webkit-transform: skew(-15deg);
+          transform: skew(-15deg);
+  color: #FFF;
+}
 .bg1 {
   position: absolute;
   top: 200rpx;

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

@@ -110,13 +110,10 @@
   flex-wrap: wrap;
 }
 .card_box .card {
-  width: 210rpx;
-  height: 210rpx;
-  margin: 20rpx 40rpx 20rpx 0;
+  width: 100%;
+  margin: 10rpx 0 10rpx 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;
@@ -124,16 +121,17 @@
   z-index: 99;
 }
 .card_box .card .card_title {
-  line-height: 30rpx;
-  font-size: 30rpx;
-  font-weight: bold;
+  line-height: 34rpx;
+  font-size: 34rpx;
   color: #303133;
 }
-.card_box .card .avatar_box {
-  padding-top: 10rpx;
+.card_box .card .card_subtitle {
+  line-height: 26rpx;
+  font-size: 26rpx;
+  color: #909399;
 }
-.card_box .card .avatar_box .avatar {
-  width: 180rpx;
-  height: 180rpx;
+.card_box .card .avatar {
+  width: 100rpx;
+  height: 100rpx;
 }