From 9c1f73d17597b88d3f95ae0aaa9fa1f5264d1185 Mon Sep 17 00:00:00 2001
From: libowei <3423564950@qq.com>
Date: Tue, 19 Dec 2023 18:12:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=A6=96=E9=A1=B5=E9=83=A8?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/compoents/pages_home.vue | 344 +++++++++++++++++++++------------
 1 file changed, 225 insertions(+), 119 deletions(-)

diff --git a/pages/compoents/pages_home.vue b/pages/compoents/pages_home.vue
index 7882b02..f180796 100644
--- a/pages/compoents/pages_home.vue
+++ b/pages/compoents/pages_home.vue
@@ -4,75 +4,81 @@
 		<view>
 			<u-navbar :is-back="false" title='首页' title-color="#000" :border-bottom="false" :background="true" id="navbar">
 			</u-navbar>
-			<view class="header_button">
-				<u-button type="primary" shape="circle" :hair-line="false" class="custom-style">学生</u-button>
-				<u-button class="custom-style" shape="circle" :hair-line="false">班级</u-button>
-			</view>
 		</view>
-		<!-- 登录之后显示的页面 -->
-		<view v-if="flag">
-			<view class="view_body">
+
+		<view class="headert" >
+			<!-- 登录之后显示的头部 -->
+			<view class="view_body" v-if="flag">
 				<view class="content_box">
 					<view class="view_text">32</view>
-					<view>已完成人数（人）</view>
+					<view class="content_wz"> 已完成人数（人） </view>
 				</view>
 				<view class="content_box">
 					<view class="view_text">90%</view>
-					<view>已完成作业正确率</view>
+					<view class="content_wz"> 已完成作业正确率 </view>
 				</view>
 			</view>
-			<!-- 作业完成情况 -->
-			<view class="echarts_bar">
+			<!-- 没有登录之后的头部 -->
+			<view v-if="!flag">
+				<view class="deer">
+					<view class="deer_images">
+						<image src="https://file.langsi.online/yasiimg/web/static/udGRdnpSfgV3LMD8Ksuv" mode=""></image>
+					</view>
+					<view class="deer_right">
+						<view class="deer_text">当前暂无学习数据，快去布置作业吧！</view>
+						<view class="deer_button">
+							<view>
+								去安排
+								<view class="deer_images" >
+									<image src="https://file.langsi.online/yasiimg/web/static/unXLZbc2dymxc1E4Cfui" mode=""></image>
+								</view>
+								</view>
+						
+						</view>
+					</view>
+					<!-- 没有登录之后的echars图 -->
+					<view class= "echarts_bar  bar_postion" >
+						<view>
+							<text>作业完成情况</text>
+							<view class="echarts_text">
+								<view class="weekend">本周</view>
+								<view class="echarts_text_images">
+									<image src="https://file.langsi.online/yasiimg/web/static/uNvIMlLMVTIDXq2uygtH" mode=""></image>
+								</view>
+							</view>
+						</view>
+						<!-- echarts图 -->
+						<view>
+								<l-echart ref="chart" @finished="initChart" class="iinsf"></l-echart>
+						</view>
+					</view>
+				</view>
+			</view>
+			<!-- 登录之后的echarts图 -->
+			<view class="echarts_bar" v-if="flag">
 				<view>
 					<text>作业完成情况</text>
 					<view class="echarts_text">
-						<view>本周</view>
-			
+						<view class="weekend">本周</view>
+						<view class="echarts_text_images">
+							<image src="https://file.langsi.online/yasiimg/web/static/uNvIMlLMVTIDXq2uygtH" mode=""></image>
+						</view>
 					</view>
 				</view>
-			
-				<view class="echarts">
-					<l-echart ref="chart" @finished="initChart"></l-echart>
-				</view>
-			
-			</view>
-		</view>
-		<!-- 没有数据显示的页面 -->
-		<view>
-			<view class="deer">
-				<view class="deer_images">
-					<image src="https://file.langsi.online/yasiimg/web/static/udGRdnpSfgV3LMD8Ksuv" mode=""></image>
-				</view>
-				<view class="deer_right">
-						<view class="deer_text">当前暂无学习数据，快去布置作业吧！</view>
-						<view class="deer_button">
-							<view>去安排</view>
-							<view class="r_image"><image src="https://file.langsi.online/yasiimg/web/static/uITFZ6vUIiA0P2KBz1i8" mode=""></image></view>
-						</view>
-				</view>
-		
-			</view>
-		<view class="echarts_bar">
-			<view>
-				<text>作业完成情况</text>
-				<view class="echarts_text">
-					<view>本周</view>
-		
+				<!-- echarts图 -->
+				<view>
+				
 				</view>
 			</view>
-		
-			<view class="echarts">
-				<l-echart ref="chart" @finished="initChart"></l-echart>
-			</view>
-		
-		</view>
+
 		</view>
 		<!-- 底部区域 -->
 		<view v-if="flag">
 			<view class="date">
-				8月31日
+				<view class="date_rq">8月31日</view>
+				<u-icon name="arrow-down" color="#2E4975" size="20rpx"></u-icon>
 			</view>
-			
+
 			<view class="box_rate">
 				<view class="rate_item">
 					<view class="number">
@@ -130,20 +136,52 @@
 						<text>2023/02/23 12:00</text>
 					</view>
 				</view>
-			
+				<view class="view_botton">
+					<view class="view_spoken">
+						<view>
+							<image src="https://file.langsi.online/yasiimg/web/static/u80EhqyvMfcOaaSyK09X" mode=""></image>
+						</view>
+						<view class="view_span">
+							<text>口语单科模考</text>
+							<text>李斯丹妮</text>
+						</view>
+					</view>
+					<view class="view_text2">
+						<view>正确率<text class="text2">80%</text></view>
+						<text>2023/02/23 12:00</text>
+					</view>
+				</view>
+				<view class="view_botton">
+					<view class="view_spoken">
+						<view>
+							<image src="https://file.langsi.online/yasiimg/web/static/u80EhqyvMfcOaaSyK09X" mode=""></image>
+						</view>
+						<view class="view_span">
+							<text>口语单科模考</text>
+							<text>李斯丹妮</text>
+						</view>
+					</view>
+					<view class="view_text2">
+						<view>正确率<text class="text2">80%</text></view>
+						<text>2023/02/23 12:00</text>
+					</view>
+				</view>
+
 			</view>
 			<!--底部导航栏 -->
 		</view>
 		<!-- 没有数据显示的区域 -->
-		<view class="zu_footer">
-			
-				<view class="date">8月31日</view>
-				<view class="zu_zp">
-					<view class="zu_image"><image src="https://file.langsi.online/yasiimg/web/static/uFgs4acAUC68weaKB9Yi" mode=""></image></view>
-					<view class="zu_text">暂无学习记录，快去安排作业吧！</view>
+		<view class="not_logged " >
+		<view class="date">
+			<view class="date_rq">8月31日</view>
+			<u-icon name="arrow-down" color="#2E4975" size="20rpx"></u-icon>
+		</view>
+			<view class="zu_zp">
+				<view class="zu_image">
+					<image src="https://file.langsi.online/yasiimg/web/static/uFgs4acAUC68weaKB9Yi" mode=""></image>
 				</view>
-		
-			
+				<view class="zu_text">暂无学习记录，快去安排作业吧！</view>
+			</view>
 		</view>
 	</view>
 
@@ -158,7 +196,7 @@
 		},
 		data() {
 			return {
-				flag:false
+				flag: false
 			}
 		},
 		methods: {
@@ -172,7 +210,7 @@
 					},
 					yAxis: {
 						type: 'value',
-						boundaryGap: ['10%', '20%',]
+						boundaryGap: ['10%', '20%', ]
 					},
 					series: [{
 						data: [120, 200, 150, 80, 70, 110, 130],
@@ -191,9 +229,10 @@
 
 <style lang="scss" scoped>
 	.view_by {
+		height: 100%;
 		background: linear-gradient(180deg, #E1EEFF 0%, #FFFFFF 100%);
 		padding: 32rpx;
-		
+
 
 		.header_button {
 			display: flex;
@@ -215,45 +254,57 @@
 			}
 
 		}
-
-		.view_body {
-			display: flex;
-			justify-content: center;
-			align-items: center;
-			margin-top: 52rpx;
-
-			.content_box {
-				flex: 1;
-			}
-
-
-
-			.content_box:first-child {
-
-				border-right: 2rpx solid rgba(0, 0, 0, 0.11);
-			}
-
-			.view_text {
-				font-size: 76rpx;
-				font-family: PingFang SC, PingFang SC;
-				font-weight: 500;
-				color: #2E4975;
-
-
-			}
-
-			view {
+		.headert{
+			position: relative;
+			.view_body {
+				position: relative;
 				display: flex;
-				flex-direction: column;
+				justify-content: center;
 				align-items: center;
-
+			
+				.content_box {
+					flex: 1;
+			
+					.content_wz {
+						font-family: 'PingFang';
+						font-size: 28rpx;
+						font-weight: 500;
+						color: #2E4975;
+					}
+				}
+			
+			
+			
+				.content_box:first-child {
+			
+					border-right: 2rpx solid rgba(0, 0, 0, 0.11);
+				}
+			
+				.view_text {
+					font-size: 76rpx;
+					font-family: 'PingFang';
+					font-weight: 500;
+					color: #2E4975;
+			
+			
+				}
+			
+				view {
+					display: flex;
+					flex-direction: column;
+					align-items: center;
+			
+				}
+			
 			}
-
+			
 		}
 
+	
+
 		.echarts_bar {
 			width: 686rpx;
-			height: 459rpx;
+			height: 229px;
 			background: #FFFFFF;
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
 			opacity: 1;
@@ -266,17 +317,38 @@
 
 				text {
 					font-size: 28rpx;
-					font-family: PingFang SC, PingFang SC;
+					font-family: 'PingFang';
 					font-weight: 800;
 					color: #2E4975;
 				}
 
 			}
 
+			.echarts_text {
+				display: flex;
+				align-items: center;
+
+				.weekend {
+					font-size: 24rpx;
+					color: rgba(46, 73, 117, 0.65);
+				}
+
+				.echarts_text_images {
+					width: 18rpx;
+					height: 10rpx;
+					margin-left: 5rpx;
+				}
+			}
+
 
 
 		}
 
+	.bar_postion{
+		position: absolute;
+		bottom: -390rpx;
+		z-index: 99;
+	}
 
 
 		.box_rate {
@@ -312,11 +384,19 @@
 		}
 
 		.date {
-			font-size: 24rpx;
-			font-family: PingFang SC, PingFang SC;
-			font-weight: 800;
-			color: #2E4975;
-			padding: 30rpx;
+			display: flex;
+			align-items: center;
+			margin: 32rpx 0 16rpx 0;
+
+			.date_rq {
+				font-size: 12px;
+				font-weight: 800;
+				color: #2E4975;
+				margin-right: 4rpx
+			}
+
+
+
 		}
 
 		.view_botton {
@@ -373,6 +453,7 @@
 
 
 
+
 			.view_text2 view {
 				font-size: 20rpx;
 				font-family: PingFang SC, PingFang SC;
@@ -392,77 +473,102 @@
 				width: 76rpx;
 				height: 76rpx;
 			}
-			
+
 		}
-		.echarts{
+
+		.echarts {
 			width: 300rpx;
 			height: 600rpx;
 			margin-top: -100rpx;
 		}
-		.deer{
+
+		.deer {
+			position: relative;
 			display: flex;
 			align-items: center;
 		}
-		.deer_images{
+
+		.deer_images {
 			width: 145rpx;
 			height: 245rpx;
-			margin-left: 15rpx;
 		}
-		.r_image{
+
+		.r_image {
 			width: 16rpx;
 			height: 16rpx;
 			line-height: 16rpx;
 			margin-left: 8rpx;
 		}
-		.deer_button{
+
+		.deer_button {
 			display: flex;
 			justify-content: center;
 			align-items: center;
 			margin-top: 19rpx;
 			width: 160rpx;
-			height: 56rpx;
 			font-size: 20rpx;
+			padding: 14rpx 0;
 			font-weight: 500;
 			color: #FFFFFF;
-		
 			background: #2D7CE6;
 			border-radius: 86rpx 86rpx 86rpx 86rpx;
-			
+			.deer_images{
+				width: 16rpx;
+				height: 16rpx;
+				line-height: 16rpx;
+				margin-left: 5rpx
+			}
+			>view {
+				display: flex;
+				align-items: center;
+			}
+
 		}
-		.deer_right{
+
+		.deer_right {
 			margin-left: 20rpx;
+			margin-top: -50rpx;
 		}
-		.deer_text{
+
+		.deer_text {
 			font-size: 28rpx;
-		
+
 			font-weight: 500;
 			color: #627698;
 		}
-		.operation{
+
+		.operation {
 			height: 459rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
 		}
-		.zu_image{
+
+		.zu_image {
 			width: 172rpx;
 			height: 162rpx;
-			
+
 		}
-		.zu_text{
+
+		.zu_text {
 			font-size: 24rpx;
 			font-weight: 400;
 			color: #0E3B77;
 			margin: 20rpx 0rpx 50rpx 0rpx;
 		}
-		.zu_footer{
+
+		.zu_footer {
 			// padding: 32rpx 0rpx;
 		}
-		.zu_zp{
+
+		.zu_zp {
 			display: flex;
 			flex-direction: column;
 			align-items: center;
 			padding: 72rpx;
 		}
-		
+		.not_logged{
+			margin-top: 423rpx
+		}
+
 	}
 </style>