From e71150d648c0fbc825ad8ba82060ab9524545a4d Mon Sep 17 00:00:00 2001
From: taoxu <2622874537@qq.com>
Date: Mon, 18 Dec 2023 22:45:53 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BA=95=E9=83=A8tabbar=E4=BF=AE=E6=94=B9=20?=
 =?UTF-8?q?=E9=A6=96=E9=A1=B5=20=E7=8F=AD=E7=BA=A7=20=E6=88=91=E7=9A=84?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BF=AE=E6=94=B9=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E7=8F=AD=E7=BA=A7=E5=8A=9F=E8=83=BD=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E8=80=81=E5=B8=88=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 common/http.interceptor.js                    |    6 +-
 components/tab-bar/tab-bar.vue                |   47 +
 pages.json                                    |   58 +-
 pages/Mystudent/addTeacher.vue                |  371 ++++
 pages/Mystudent/addclass.vue                  | 1144 +++++------
 pages/Mystudent/arrange_work.vue              |  563 +++---
 pages/Mystudent/student.vue                   | 1714 +++++++++++------
 pages/compoents/pages_my.vue                  |   38 -
 pages/index/index.vue                         |  479 ++++-
 pages/pages_index/teacher_index.vue           |  105 -
 pages/user/user.vue                           |  279 +++
 .../teacher_teachers/teacher_addOperation.vue |    2 +-
 static/logo.png                               |  Bin 4023 -> 0 bytes
 static/tabbar/chuanti-act.png                 |  Bin 0 -> 532 bytes
 static/tabbar/chuanti.png                     |  Bin 0 -> 466 bytes
 static/tabbar/class-active.png                |  Bin 0 -> 2538 bytes
 static/tabbar/class.png                       |  Bin 0 -> 1735 bytes
 static/tabbar/course-active.png               |  Bin 0 -> 2538 bytes
 static/tabbar/course.png                      |  Bin 0 -> 1735 bytes
 static/tabbar/home-active.png                 |  Bin 0 -> 4385 bytes
 static/tabbar/home.png                        |  Bin 0 -> 3934 bytes
 static/tabbar/memory-active.png               |  Bin 0 -> 533 bytes
 static/tabbar/my-active.png                   |  Bin 0 -> 653 bytes
 static/tabbar/my.png                          |  Bin 0 -> 646 bytes
 static/tabbar/signup-active.png               |  Bin 0 -> 3630 bytes
 static/tabbar/signup.png                      |  Bin 0 -> 3240 bytes
 static/tabbar/tiku-act.png                    |  Bin 0 -> 4202 bytes
 static/tabbar/tiku.png                        |  Bin 0 -> 3388 bytes
 static/tabbar/writing-active.png              |  Bin 0 -> 3481 bytes
 static/tabbar/writing.png                     |  Bin 0 -> 2543 bytes
 30 files changed, 3157 insertions(+), 1649 deletions(-)
 create mode 100644 components/tab-bar/tab-bar.vue
 create mode 100644 pages/Mystudent/addTeacher.vue
 delete mode 100644 pages/compoents/pages_my.vue
 delete mode 100644 pages/pages_index/teacher_index.vue
 create mode 100644 pages/user/user.vue
 delete mode 100644 static/logo.png
 create mode 100644 static/tabbar/chuanti-act.png
 create mode 100644 static/tabbar/chuanti.png
 create mode 100644 static/tabbar/class-active.png
 create mode 100644 static/tabbar/class.png
 create mode 100644 static/tabbar/course-active.png
 create mode 100644 static/tabbar/course.png
 create mode 100644 static/tabbar/home-active.png
 create mode 100644 static/tabbar/home.png
 create mode 100644 static/tabbar/memory-active.png
 create mode 100644 static/tabbar/my-active.png
 create mode 100644 static/tabbar/my.png
 create mode 100644 static/tabbar/signup-active.png
 create mode 100644 static/tabbar/signup.png
 create mode 100644 static/tabbar/tiku-act.png
 create mode 100644 static/tabbar/tiku.png
 create mode 100644 static/tabbar/writing-active.png
 create mode 100644 static/tabbar/writing.png

diff --git a/common/http.interceptor.js b/common/http.interceptor.js
index 9e7a09e..905f51f 100644
--- a/common/http.interceptor.js
+++ b/common/http.interceptor.js
@@ -4,9 +4,9 @@ const install = (Vue, vm) => {
 		// baseUrl: 'http://2087p773d1.wicp.vip', // 请求的本域名
 		// baseUrl: 'https://lchighpass.zhieasy.cn',    
 		// baseUrl: 'http://speaking.viphk.91tunnel.com',//测试https://speaking.iava.top/
-		baseUrl: 'http://yml.dev.bc3.top',//
+		// baseUrl: 'http://yml.dev.bc3.top',//
 		// baseUrl: 'https://ielts.zhieasy.cn',//正式
-		 // baseURL: 'https://api.admin-v2.langsi.online',
+		 baseURL: 'https://api.admin-v2.langsi.online',
 		// baseUrl: 'http://i3qsdb.natappfree.cc',//正式
 		
 		// baseUrl: 'http://hwihh5.natappfree.cc', 
@@ -42,7 +42,7 @@ const install = (Vue, vm) => {
 		// 所以哪怕您重新登录修改了Storage，下一次的请求将会是最新值
 		// const token = uni.getStorageSync('token');
 
-		const token = "	Bearer f545811267c149bc85fb14e8e8638e94"
+		const token = "	Bearer ca5a6cd7473c4b18b22044321b1fba91"
 
 		// console.log("我是token", token)
 		config.header.Authorization = token; 
diff --git a/components/tab-bar/tab-bar.vue b/components/tab-bar/tab-bar.vue
new file mode 100644
index 0000000..6cdc447
--- /dev/null
+++ b/components/tab-bar/tab-bar.vue
@@ -0,0 +1,47 @@
+<template>
+	<view>
+		<view class="u-page">
+			<!-- 所有内容的容器 -->
+		</view>
+		<!-- 与包裹页面所有内容的元素u-page同级，且在它的下方 -->
+		<u-tabbar v-model="current" :list="list" icon-size='40rpx' active-color='#3996fd' inactive-color="#c8c7cb"></u-tabbar>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				list: [
+					{
+						iconPath: require('@/static/tabbar/home.png'),
+						selectedIconPath:require('@/static/tabbar/home-active.png'),
+						text: '首页',
+						customIcon: true,
+						pagePath:'/pages/index/index2'
+					},
+					{
+						iconPath: require('@/static/tabbar/tiku.png'),
+						selectedIconPath:require('@/static/tabbar/tiku-act.png'),
+						text: '题库',
+						customIcon: true,
+						pagePath:'/pages/home/home'
+					}
+					,{
+						iconPath: require('@/static/tabbar/my.png'),
+						selectedIconPath:require('@/static/tabbar/my-active.png'),
+						text: '我的',
+						customIcon: true,
+						pagePath:'/pages/user/usertwo'
+					},
+				],
+				current: 0
+			}
+		},
+	}
+</script>
+<style lang="scss" scoped>
+	/deep/.u-tabbar__content__item__button{
+		top: 20rpx !important;
+	}
+</style>
\ No newline at end of file
diff --git a/pages.json b/pages.json
index a4d67f3..173704d 100644
--- a/pages.json
+++ b/pages.json
@@ -34,16 +34,7 @@
 			}
 		},
 			
-		{
-			"path" : "pages/pages_index/teacher_index",
-			"style" : 
-			{
-				"navigationBarTitleText": "首页",
-				"navigationBarBackgroundColor": "#4473f6",
-				"enablePullDownRefresh": false,
-				"navigationStyle": "custom"
-			}
-		},
+	
 	
 		{
 			
@@ -138,7 +129,28 @@
 				"enablePullDownRefresh": false,
 				"navigationStyle": "custom"
 			}
+		},
+		{
+			"path" : "pages/user/user",
+			"style" : 
+			{
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#4473f6",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
+		},
+		{
+			"path" : "pages/Mystudent/addTeacher",
+			"style" : 
+			{
+				"navigationBarTitleText": "",
+				"navigationBarBackgroundColor": "#4473f6",
+				"enablePullDownRefresh": false,
+				"navigationStyle": "custom"
+			}
 		}
+		
 	],
 	  "subPackages": [
 	  		{
@@ -218,6 +230,32 @@
 	
 	  		
 	  	],
+		"tabBar": {
+				"color": "#a9b7b7",
+				"selectedColor": "#5185fd",
+				"borderStyle": "white",
+				"backgroundColor": "#ffffff",
+				"list": [
+					{
+						"selectedIconPath": "/static/tabbar/home.png",
+						"iconPath": "/static/tabbar/home-active.png",
+						"pagePath": "pages/index/index",
+						"text": "首页"
+					},
+					{
+						"selectedIconPath": "/static/tabbar/tiku.png",
+						"iconPath": "/static/tabbar/tiku-act.png",
+						"pagePath": "pages/Mystudent/student",
+						"text": "题库"
+					}
+					,{
+						"selectedIconPath": "/static/tabbar/my.png",
+						"iconPath": "/static/tabbar/my-active.png",
+						"pagePath": "pages/user/user",
+						"text": "我的"
+					}
+				]
+			},
 	"globalStyle": {
 		"navigationBarTextStyle": "black",
 		"navigationBarTitleText": "uni-app",
diff --git a/pages/Mystudent/addTeacher.vue b/pages/Mystudent/addTeacher.vue
new file mode 100644
index 0000000..28d0e2a
--- /dev/null
+++ b/pages/Mystudent/addTeacher.vue
@@ -0,0 +1,371 @@
+<template>
+	<view class="searchpage">
+		<u-navbar title="添加老师" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
+			height='36'  :custom-back="addstu"></u-navbar>
+			<u-toast ref="uToast" />
+		<view class="serchbox">
+			<view class="serchimg">
+				<image src="https://file.langsi.online/yasiimg/web/static/uVMACkynkipOxuTYDqm0">
+
+				</image>
+			</view>
+			<input type="text"
+				 v-model="searchKeyword"
+				 placeholder="搜索相关内容..."
+				 class="input"
+				 placeholder-style="color:#C7CDD3"
+				 @input="search()">
+		</view>
+		<view class="check_card">
+		<!-- 	<view class="check_card_stu " v-for="(item,index ) in stulist" :key="index" @click="toggleSelection(item)" :class="{ 'act1': item.isSelected }"> 
+				<view class="check_card_stu_info_left">
+					<view class="class_card_left">
+						<image :src="item.headImgUrl"></image>
+					</view>
+					<view class="class_card_right">
+						<view class="class_card_right_top" v-html="highlightSearch(item.nickName)">
+							
+						</view>
+						<view class="class_card_right_bot">
+							ID：{{item.id}}
+						</view>
+					</view>
+				</view>
+			
+			</view> -->
+			<view class="teacher_card" v-for="(item,index) in stulist" :key="index"   @click="toggleSelection(item)" :class="{ 'act1': item.isSelected }">
+				<view class="class_card_left">
+						<image src=" https://file.langsi.online/yasiimg/web/static/udWNTRG6GulmTtgPRQ49"></image>
+					</view>
+					<view class="class_card_right">
+						<view class="class_card_right_top" v-html="item.teacherInfo.nickname">
+						
+						</view>
+						<view class="class_card_right_bot">
+							{{item.roleText}}
+						</view>
+					</view>
+			</view>
+
+		</view>
+		<view class="zhanwei" style="width: 100%; height: 230rpx;">
+			
+		</view>
+		<view class="botbtn" @click="addstu()" v-show="selectedIds.length>0">
+			<view class="btn">
+				确定添加（{{selectedIds.length}}）
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				bgc: {
+					backgroundColor: "#F6F9FC",
+				},
+				checkindex: 1,
+				stulist:[],
+				searchKeyword:'',
+				orgstulist:[],
+				selectedIds: [],
+			}
+		},
+		onLoad(option) {
+			// this.classid=option.id
+			this.selectedIds=JSON.parse(decodeURIComponent(option.teacherinfo))
+			
+		},
+		onShow(){
+			this.getallstu()
+		},
+		methods: {
+			addstu() {
+				console.log('调用了');
+				uni.setStorageSync('selectedteacherinfo', this.selectedIds);
+							
+				// Navigate back to the previous page
+				uni.navigateBack({
+				delta: 1, // Number of pages to go back
+				success(res) {
+					console.log(res);
+				},
+				fail(err) {
+					console.error(err);
+				}
+				});
+			
+		
+			},
+			 toggleSelection(item) {
+			    // const selectedIndex = this.selectedIds.indexOf(item.id);
+				  const selectedIndex = this.selectedIds.findIndex(selectedItem => selectedItem.id === item.id);
+			    if (selectedIndex === -1) {
+			      // If not selected, add to the array and apply the 'act1' class
+				  this.selectedIds.push({ name: item.teacherInfo.nickname, avatar: item.teacherInfo.avatar, id: item.teacherId });
+			     
+			      item.isSelected = true;  // Add a property to the item to track selection
+			    } else {
+			      // If already selected, remove from the array and remove the 'act1' class
+			      this.selectedIds.splice(selectedIndex, 1);
+			      item.isSelected = false;
+				  console.log(this.selectedIds,'selectedIdsselectedIdsselectedIds');
+			    }
+				
+			  },
+			search() {
+			    // 根据关键字过滤 this.classlist
+			    if (this.searchKeyword !== '') {
+			        const filteredList = JSON.parse(JSON.stringify(this.orgstulist)).filter(item => {
+			            // 匹配 nickName 或者 id
+			            return item.teacherInfo.nickname.includes(this.searchKeyword)
+			        });
+			        // 更新 this.classlist 为过滤后的列表
+			        this.stulist = filteredList;
+					this.selectedIds.forEach(selectedItem => {
+					   const index = this.stulist.findIndex(item => item.teacherId === selectedItem.teacherId);
+					   if (index !== -1) {
+					     this.$set(this.stulist, index, { ...this.stulist[index], isSelected: true });
+					   }
+					 });
+			    } else {
+			        this.fuwei();
+			    }
+			},
+			fuwei() {
+				
+				this.stulist = JSON.parse(JSON.stringify(this.orgstulist));
+				this.selectedIds.forEach(selectedItem => {
+				   const index = this.stulist.findIndex(item => item.teacherId === selectedItem.teacherId);
+				   if (index !== -1) {
+				     this.$set(this.stulist, index, { ...this.stulist[index], isSelected: true });
+				   }
+				 });
+			},
+			highlightSearch(name) {
+			    // 使用正则表达式替换匹配到的 searchKeyword 为带有颜色的文字
+			    if (this.searchKeyword) {
+			      const regex = new RegExp(this.searchKeyword, 'gi');
+			      return name.replace(regex, match => `<span style="color: #2D7CE6 ;">${match}</span>`);
+			    }
+			    return name;
+			  },
+			getallstu(){
+				this.$u.get(`https://api.admin-v2.langsi.online/admin-api/classroom/teacher/list`).then(res => {
+				
+							
+					if (res.code == 0) {
+						this.stulist=res.data
+						this.orgstulist = JSON.parse(JSON.stringify(res.data));
+						this.selectedIds.forEach(selectedItem => {
+						   const index = this.stulist.findIndex(item => item.teacherId === selectedItem.id);
+						   if (index !== -1) {
+						     this.$set(this.stulist, index, { ...this.stulist[index], isSelected: true });
+						   }
+						 });
+							
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	page {
+		background: linear-gradient(183deg, #F0F6FF 0%, #FAFAFA 100%);
+	}
+	
+	.searchpage {
+		width: 750rpx;
+		padding: 0 32rpx;
+
+		.serchbox {
+			padding: 0 32rpx;
+			display: flex;
+			flex-wrap: nowrap;
+			margin-top: 30rpx;
+			align-items: center;
+			width: 686rpx;
+			height: 88rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+
+			.serchimg {
+				width: 30.51rpx;
+				height: 32rpx;
+				margin-right: 24rpx;
+			}
+
+			.input {
+				margin: 0 auto;
+				width: 568rpx;
+				height: 88rpx;
+				border-radius: 30rpx;
+				// background-color: #f5f8fc;
+				// display: flex;
+				// justify-content: center;
+				// align-items: center;
+				// text-align: center;
+				font-size: 28rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN-Light;
+				font-weight: 300;
+				text-align: left;
+				color: #a7b9cd;
+				letter-spacing: 1.2rpx;
+				line-height: 36rpx;
+				// padding: 0 100rpx;
+				// padding-right: 135rpx;
+				box-sizing: border-box;
+
+			}
+		}
+		
+		.check_card {
+			margin-top: 20rpx;
+			.teacher_card{
+				margin-bottom: 20rpx;
+				padding: 24rpx;
+				display: flex;
+				flex-wrap: nowrap;
+				width: 686rpx;
+				height: 130rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				.class_card_left {
+						width: 76rpx;
+						height: 76rpx;
+					}
+						
+					.class_card_right {
+						margin-left: 20rpx;
+						display: flex;
+						flex-wrap: wrap;
+						
+						.class_card_right_top {
+							width: 100%;
+							font-size: 28rpx;
+							font-family:'PingFang','PingFang';
+							font-weight: bold;
+							color: #072F5A;
+						}
+						
+						.class_card_right_bot {
+							margin-top: 8rpx;
+							font-size: 24rpx;
+							font-family:'PingFang','PingFang';
+							font-weight: 500;
+							color: #2D7CE6;
+						}
+					}
+			}
+			
+			.check_card_stu {
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				justify-content: space-between;
+				padding: 32rpx;
+				width: 686rpx;
+				height: 148rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				border: 2rpx solid #FFFFFF;
+				margin-bottom: 20rpx;
+
+				.check_card_stu_info_left {
+					display: flex;
+					flex-wrap: nowrap;
+
+					.class_card_left {
+						width: 76rpx;
+						height: 76rpx;
+					}
+
+					.class_card_right {
+						margin-left: 12rpx;
+						display: flex;
+						flex-wrap: wrap;
+
+						.class_card_right_top {
+							width: 100%;
+							font-size: 28rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: bold;
+							color: #072F5A;
+						}
+
+						.class_card_right_bot {
+							margin-top: 4rpx;
+							font-size: 20rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: 500;
+							color: rgba(7, 47, 90, 0.6);
+						}
+					}
+				}
+
+				.check_card_stu_info_right {
+					width: 50%;
+					display: flex;
+					flex-wrap: nowrap;
+					align-items: center;
+					justify-content: space-between;
+
+					.class_info {
+						width: 110rpx;
+						display: flex;
+						flex-wrap: wrap;
+						justify-content: center;
+
+						.class_info_top {
+							font-size: 20rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: 500;
+							color: rgba(7, 47, 90, 0.5);
+						}
+
+						.class_info_bot {
+							margin-top: 12rpx;
+							font-size: 28rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: 800;
+							color: #2D7CE6;
+						}
+					}
+				}
+			}
+
+			
+			.act1 {
+				border: 2rpx solid #2D7CE6;
+			}
+		}
+		.botbtn{
+			padding: 32rpx 32rpx 0 32rpx;
+			margin-left: -32rpx;
+			position: fixed;
+			bottom: 0;
+			width: 750rpx;
+			height: 200rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx -10rpx 16rpx 0rpx rgba(202,202,202,0.25);
+			border-radius: 40rpx 40rpx 0rpx 0rpx;
+			.btn{
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 28rpx;
+				font-family:'PingFang','PingFang';
+				font-weight: 800;
+				color: #FFFFFF;
+				width: 686rpx;
+				height: 80rpx;
+				background: linear-gradient(180deg, #74AFFF 0%, #2D7CE6 100%);
+				border-radius: 104rpx 104rpx 104rpx 104rpx;
+			}
+		}
+	}
+</style>
\ No newline at end of file
diff --git a/pages/Mystudent/addclass.vue b/pages/Mystudent/addclass.vue
index cb90847..ddeaa05 100644
--- a/pages/Mystudent/addclass.vue
+++ b/pages/Mystudent/addclass.vue
@@ -1,41 +1,34 @@
 <template>
 	<view class="addpage">
-		<u-navbar :title="title"
-				  :border-bottom="false"
-				  :background="bgc"
-				  title-color='#2E4975'
-				  title-size='36'
-				  height='36'></u-navbar>
+		<u-navbar :title="title" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
+			height='36'></u-navbar>
 		<view class="topbox">
 			<view class="search_box">
-			<!-- <view class="check_search">
+				<!-- <view class="check_search">
 				{{ checkindex == "0" ? "班级" : '学生' }}
 				<view class="iconfont icon-arow_down"></view>
 			</view> -->
-			<view class="serchbox">
-				<view class="serchimg">
-					<image src="https://file.langsi.online/yasiimg/web/static/uVMACkynkipOxuTYDqm0"
-						   mode="scaleToFill">
+				<view class="serchbox">
+					<view class="serchimg">
+						<image src="https://file.langsi.online/yasiimg/web/static/uVMACkynkipOxuTYDqm0"
+							mode="scaleToFill">
 
-					</image>
+						</image>
+					</view>
+					<input type="text" placeholder="搜索相关内容..." class="input" placeholder-style="color:#C7CDD3 ">
 				</view>
-				<input type="text"
-					   placeholder="搜索相关内容..."
-					   class="input"
-					   placeholder-style="color:#C7CDD3 ">
+
+			</view>
+			<view class="addclass" @click="create()">
+				+ {{ checkindex == "0" ? "创建班级" : '添加学生' }}
 			</view>
-			
 		</view>
-		<view class="addclass" @click="create()">
-				+ {{ checkindex == "0" ? "创建班级" : '添加学生' }}	
-		</view>
-		</view>
-	
+
 		<view class="check_card" v-show="checkindex==0">
 			<!-- <view class="check_card_stu">
 					
 					</view> -->
-			
+
 			<view class="check_card_cls">
 				<view class="check_card_cls_info_left">
 					<view class="class_card_left">
@@ -51,23 +44,23 @@
 					</view>
 				</view>
 				<view class="check_card_cls_info_right">
-					<view class="class_info" >
-							<view class="class_info_top" >
-								平均成绩/分
-							</view>
-							<view class="class_info_bot" >
-								6
-							</view>
+					<view class="class_info">
+						<view class="class_info_top">
+							平均成绩/分
 						</view>
-					<view class="class_info" >
-							<view class="class_info_top" >
-								作业完成度
-							</view>
-							<view class="class_info_bot" >
-								80%
-							</view>
+						<view class="class_info_bot">
+							6
 						</view>
-						
+					</view>
+					<view class="class_info">
+						<view class="class_info_top">
+							作业完成度
+						</view>
+						<view class="class_info_bot">
+							80%
+						</view>
+					</view>
+
 				</view>
 			</view>
 			<view class="check_card_cls act1">
@@ -85,23 +78,23 @@
 					</view>
 				</view>
 				<view class="check_card_cls_info_right">
-					<view class="class_info" >
-							<view class="class_info_top" >
-								平均成绩/分
-							</view>
-							<view class="class_info_bot" >
-								6
-							</view>
+					<view class="class_info">
+						<view class="class_info_top">
+							平均成绩/分
 						</view>
-					<view class="class_info" >
-							<view class="class_info_top" >
-								作业完成度
-							</view>
-							<view class="class_info_bot" >
-								80%
-							</view>
+						<view class="class_info_bot">
+							6
 						</view>
-						
+					</view>
+					<view class="class_info">
+						<view class="class_info_top">
+							作业完成度
+						</view>
+						<view class="class_info_bot">
+							80%
+						</view>
+					</view>
+
 				</view>
 			</view>
 		</view>
@@ -121,23 +114,23 @@
 					</view>
 				</view>
 				<view class="check_card_stu_info_right">
-					<view class="class_info" >
-							<view class="class_info_top" >
-								平均成绩/分
-							</view>
-							<view class="class_info_bot" >
-								6
-							</view>
+					<view class="class_info">
+						<view class="class_info_top">
+							平均成绩/分
 						</view>
-					<view class="class_info" >
-							<view class="class_info_top" >
-								作业完成度
-							</view>
-							<view class="class_info_bot" >
-								80%
-							</view>
+						<view class="class_info_bot">
+							6
 						</view>
-						
+					</view>
+					<view class="class_info">
+						<view class="class_info_top">
+							作业完成度
+						</view>
+						<view class="class_info_bot">
+							80%
+						</view>
+					</view>
+
 				</view>
 			</view>
 			<view class="check_card_stu act1">
@@ -155,26 +148,26 @@
 					</view>
 				</view>
 				<view class="check_card_stu_info_right">
-					<view class="class_info" >
-							<view class="class_info_top" >
-								平均成绩/分
-							</view>
-							<view class="class_info_bot" >
-								6
-							</view>
+					<view class="class_info">
+						<view class="class_info_top">
+							平均成绩/分
 						</view>
-					<view class="class_info" >
-							<view class="class_info_top" >
-								作业完成度
-							</view>
-							<view class="class_info_bot" >
-								80%
-							</view>
+						<view class="class_info_bot">
+							6
 						</view>
-						
+					</view>
+					<view class="class_info">
+						<view class="class_info_top">
+							作业完成度
+						</view>
+						<view class="class_info_bot">
+							80%
+						</view>
+					</view>
+
 				</view>
 			</view>
-			
+
 		</view>
 		<view class="botbtn">
 			<view class="btn">
@@ -182,521 +175,544 @@
 			</view>
 		</view>
 		<!-- 弹出层 -->
-			<u-popup v-model="show" mode="bottom" length="75%" :safe-area-inset-bottom='true' :closeable="true" :duration="300">
-					<view class="pop-up">
-						<view class="caption">创建班级</view>
-						<!-- 班级图像 -->
-						<view style="margin-top: 16rpx;">
-							<view class="caption_top">班级头像</view>
-							<view style="width: 112rpx; height: 112rpx; position: relative;">
-								<image src="http://tmp/8D3SdarqBJPA14a79bffdaa7e81aa0b93c1ef2173bcd.png" mode=""></image>
-								<view class="dashboard">
-									<image src="http://tmp/GqjTUH3Ahh770a1353bd35d1ebfdd80316b5cf6136ff.png" mode=""></image>
-								</view>
-							</view>
+		<u-popup v-model="show" mode="bottom" length="75%" :safe-area-inset-bottom='true' :closeable="true"
+			:duration="300">
+			<view class="pop-up">
+				<view class="caption">创建班级</view>
+				<!-- 班级图像 -->
+				<view style="margin-top: 16rpx;">
+					<view class="caption_top">班级头像</view>
+					<view style="width: 112rpx; height: 112rpx; position: relative;">
+						<image src="http://tmp/8D3SdarqBJPA14a79bffdaa7e81aa0b93c1ef2173bcd.png" mode=""></image>
+						<view class="dashboard">
+							<image src="http://tmp/GqjTUH3Ahh770a1353bd35d1ebfdd80316b5cf6136ff.png" mode=""></image>
 						</view>
-						<!-- 班级名称 -->
-						<view>
-							<view class="caption_top">班级名称</view>
-							<view class="caption_input">
-								<u-input v-model="designation" :type="type" :border="border"  placeholder="请输入班级名称"/>
-							</view>
-						</view>
-						<!-- 班级标签 -->
-						<view>
-							<view class="caption_top">班级标签</view>
-						<!-- 弹出层 -->
-						<u-select v-model="show2" :list="list" @confirm="confirm"></u-select>
-						
-						<view class="caption_input">
-								<u-form-item :border-bottom="false" :right-icon="icons" class="no-padding">
-							<u-input v-model="form.name"  @click="showPopup" placeholder="请输入班级标签"/>
-								</u-form-item>
-						</view>
-							
-						
-						
-						
-						</view>
-						<!-- 班级学生 -->
-						<view class="class_body">
-							<view class="caption_flex">
-								<view>班级学生</view>
-								<view class="caption_boder_text2">点击头像选择班级学员</view>
-							</view>
-							<view class="caption_boder">
-							<view class="class_tp_image"><image src="http://tmp/4cj9prAeuoV015239042fae83018055c4c5c86e5231e.png" mode=""></image></view>
-							</view>
-						</view>
-						<!-- 班级老师 -->
+					</view>
+				</view>
+				<!-- 班级名称 -->
+				<view>
+					<view class="caption_top">班级名称</view>
+					<view class="caption_input">
+						<u-input v-model="designation" :type="type" :border="border" placeholder="请输入班级名称" />
+					</view>
+				</view>
+				<!-- 班级标签 -->
+				<view>
+					<view class="caption_top">班级标签</view>
+					<!-- 弹出层 -->
+					<u-select v-model="show2" :list="list" @confirm="confirm"></u-select>
+
+					<view class="caption_input">
+						<u-form-item :border-bottom="false" :right-icon="icons" class="no-padding">
+							<u-input v-model="form.name" @click="showPopup" placeholder="请输入班级标签" />
+						</u-form-item>
+					</view>
+
+
+
+
+				</view>
+				<!-- 班级学生 -->
 				<view class="class_body">
 					<view class="caption_flex">
 						<view>班级学生</view>
 						<view class="caption_boder_text2">点击头像选择班级学员</view>
 					</view>
 					<view class="caption_boder">
-					<view class="class_tp_image"><image src="http://tmp/4cj9prAeuoV015239042fae83018055c4c5c86e5231e.png" mode=""></image></view>
+						<view class="class_tp_image">
+							<image src="http://tmp/4cj9prAeuoV015239042fae83018055c4c5c86e5231e.png" mode=""></image>
+						</view>
 					</view>
 				</view>
-						<view class="caption_add">添加</view>
+				<!-- 班级老师 -->
+				<view class="class_body">
+					<view class="caption_flex">
+						<view>班级学生</view>
+						<view class="caption_boder_text2">点击头像选择班级学员</view>
 					</view>
-			</u-popup>
+					<view class="caption_boder">
+						<view class="class_tp_image">
+							<image src="http://tmp/4cj9prAeuoV015239042fae83018055c4c5c86e5231e.png" mode=""></image>
+						</view>
+					</view>
+				</view>
+				<view class="caption_add">添加</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			title: '添加班级',
-			// 班级名称数据绑定
-			designation:'',
-			// 班级标签数据绑定
-			labels:'',
-			// 弹出层的变量
-			show: false,
-			// 下拉框
-			show2:false,
-			form:{
-				name: ''
+	export default {
+		data() {
+			return {
+				title: '添加班级',
+				// 班级名称数据绑定
+				designation: '',
+				// 班级标签数据绑定
+				labels: '',
+				// 弹出层的变量
+				show: false,
+				// 下拉框
+				show2: false,
+				form: {
+					name: ''
+				},
+				list: [{
+						value: '1',
+						label: '听力'
+					},
+					{
+						value: '2',
+						label: '阅读'
+					},
+					{
+						value: '3',
+						label: '写作'
+					},
+					{
+						value: '4',
+						label: '口语'
+					}
+				],
+				icons: 'arrow-down-fill',
+				icons_rigth: 'arrow-down-fill',
+				icons_top: 'arrow-up-fill',
+
+				bgc: {
+					backgroundColor: "#F6F9FC",
+				},
+				checkindex: 0,
+
+
+			}
+		},
+		methods: {
+			// 创建班级点击事件
+			create() {
+				this.show = !this.show
 			},
-					list: [
-								{
-									value: '1',
-									label: '听力'
-								},
-								{
-									value: '2',
-									label: '阅读'
-								},
-								{
-									value: '3',
-									label: '写作'
-								},
-								{
-									value: '4',
-									label: '口语'
-								}
-							],
-							icons:'arrow-down-fill',
-							icons_rigth:'arrow-down-fill',
-							icons_top:'arrow-up-fill',
-							
-			bgc: {
-				backgroundColor: "#F6F9FC",
+			showPopup() {
+				this.show2 = !this.show2
+				this.icons = this.icons_top
 			},
-			checkindex: 0,
-		
+			confirm(e) {
+				this.icons = this.icons_rigth
+				e.forEach(item => {
+					this.form.name = item.label
+				})
+			}
+
 
 		}
-	},
-	methods: {
-		// 创建班级点击事件
-		create(){
-			this.show = !this.show
-		},
-		showPopup(){
-			this.show2 =!this.show2
-			this.icons= this.icons_top
-		},
-		confirm(e){
-				this.icons= this.icons_rigth
-			e.forEach(item=>{
-				this.form.name=item.label
-			})
-		}
-		
-
 	}
-}
 </script>
 
 <style lang="scss" scoped>
-.no-padding /deep/ .u-form-item {
-  padding: 0;
-}
-page {
-	background: #F6F9FC;
-}
-
-.addpage {
-	width: 750rpx;
-	padding: 0 32rpx;
-	flex-wrap: wrap;
-
-	// display: flex;
-	// flex-wrap: wrap;
-	.topbox{
-		margin-top: 46rpx;
-		display: flex;
-		flex-wrap: nowrap;
-		justify-content:space-between;
-		align-items: center;
-		.search_box {
-		
-		width: 480rpx;
-		height: 88rpx;
-		background: #FFFFFF;
-		border-radius: 20rpx 20rpx 20rpx 20rpx;
-		display: flex;
-		flex-wrap: nowrap;
-
-		.check_search {
-			display: flex;
-			flex-wrap: nowrap;
-			align-items: center;
-			justify-content: center;
-			width: 148rpx;
-			height: 88rpx;
-			background: #FFF2E4;
-			border-radius: 20rpx 0rpx 0rpx 20rpx;
-			font-size: 28rpx;
-			font-family:'PingFang','PingFang';
-			font-weight: 500;
-			color: #F39852;
-
-			.icon-arow_down {
-				margin-left: 8rpx;
-				font-size: 20rpx;
-			}
-		}
-
-		.serchbox {
-			// padding: 0 32rpx;
-			display: flex;
-			flex-wrap: nowrap;
-			// margin-top: 30rpx;
-			align-items: center;
-			// justify-content: space-between;
-			width: 538rpx;
-			height: 88rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
-
-			.serchimg {
-				margin-left: 32rpx;
-
-				width: 32rpx;
-				height: 32rpx;
-
-			}
-
-			.input {
-				margin-left: 24rpx;
-				width: 394rpx;
-				height: 88rpx;
-				// border-radius: 30rpx;
-				// background-color: #f5f8fc;
-				// display: flex;
-				// justify-content: center;
-				// align-items: center;
-				// text-align: center;
-				font-size: 28rpx;
-				font-family: Source Han Sans CN, Source Han Sans CN-Light;
-				font-weight: 300;
-				text-align: left;
-				color: #a7b9cd;
-				letter-spacing: 1.2rpx;
-				line-height: 36rpx;
-				// padding: 0 100rpx;
-				// padding-right: 135rpx;
-				box-sizing: border-box;
-
-			}
-		}
-		
+	.no-padding /deep/ .u-form-item {
+		padding: 0;
 	}
-	.addclass{
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			width: 194rpx;
-			height: 88rpx;
-			background: #FFF2E4;
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
 
-			font-size: 28rpx;
-			font-family:'PingFang','PingFang';
-			font-weight: 500;
-			color: #F39852;
-		}
+	page {
+		background: #F6F9FC;
 	}
-	
-	.check_card {
-		margin-top: 20rpx;
 
-		.check_card_stu {
-			display: flex;
-			flex-wrap: nowrap;
-			align-items: center;
-			justify-content: space-between;
-			padding: 32rpx;
-			width: 686rpx;
-			height: 148rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
-			border: 2rpx solid #FFFFFF;
-			margin-bottom: 20rpx;
-
-			.check_card_stu_info_left {
-				display: flex;
-				flex-wrap: nowrap;
-
-				.class_card_left {
-					width: 76rpx;
-					height: 76rpx;
-				}
-
-				.class_card_right {
-					margin-left: 12rpx;
-					display: flex;
-					flex-wrap: wrap;
-
-					.class_card_right_top {
-						width: 100%;
-						font-size: 28rpx;
-						font-family:'PingFang','PingFang';
-						font-weight: bold;
-						color: #072F5A;
-					}
-
-					.class_card_right_bot {
-						margin-top: 4rpx;
-						font-size: 20rpx;
-						font-family:'PingFang','PingFang';
-						font-weight: 500;
-						color: rgba(7,47,90,0.6);
-					}
-				}
-			}
-
-			.check_card_stu_info_right {
-				width: 50%;
-				display: flex;
-				flex-wrap: nowrap;
-				align-items: center;
-				justify-content: space-between;
-
-				.class_info {
-					width: 110rpx;
-					display: flex;
-					flex-wrap: wrap;
-					justify-content: center;
-
-					.class_info_top {
-						font-size: 20rpx;
-						font-family:'PingFang','PingFang';
-						font-weight: 500;
-						color: rgba(7, 47, 90, 0.5);
-					}
-
-					.class_info_bot {
-						margin-top: 12rpx;
-						font-size: 28rpx;
-						font-family:'PingFang','PingFang';
-						font-weight: 800;
-						color: #2D7CE6;
-					}
-				}
-			}
-		}
-
-		.check_card_cls {
-			display: flex;
-			flex-wrap: nowrap;
-			align-items: center;
-			justify-content: space-between;
-			padding: 32rpx;
-			width: 686rpx;
-			height: 148rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
-			border: 2rpx solid #FFFFFF;
-			margin-bottom: 20rpx;
-
-			.check_card_cls_info_left {
-				display: flex;
-				flex-wrap: nowrap;
-
-				.class_card_left {
-					width: 84rpx;
-					height: 84rpx;
-				}
-
-				.class_card_right {
-					margin-left: 12rpx;
-					display: flex;
-					flex-wrap: wrap;
-
-					.class_card_right_top {
-						width: 100%;
-						font-size: 32rpx;
-						font-family:'PingFang','PingFang';
-						font-weight: bold;
-						color: #072F5A;
-					}
-
-					.class_card_right_bot {
-						margin-top: 8rpx;
-						background: #EBF3FF;
-						border-radius: 4rpx 4rpx 4rpx 4rpx;
-						padding: 10rpx 20rpx;
-						font-size: 20rpx;
-						font-family:'PingFang','PingFang';
-						font-weight: 500;
-						color: #2D7CE6;
-					}
-				}
-			}
-
-			.check_card_cls_info_right {
-				width: 50%;
-				display: flex;
-				flex-wrap: nowrap;
-				align-items: center;
-				justify-content: space-between;
-
-				.class_info {
-					width: 110rpx;
-					display: flex;
-					flex-wrap: wrap;
-					justify-content: center;
-
-					.class_info_top {
-						font-size: 20rpx;
-						font-family:'PingFang','PingFang';
-						font-weight: 500;
-						color: rgba(7, 47, 90, 0.5);
-					}
-
-					.class_info_bot {
-						margin-top: 12rpx;
-						font-size: 28rpx;
-						font-family:'PingFang','PingFang';
-						font-weight: 800;
-						color: #2D7CE6;
-					}
-				}
-			}
-
-		}
-
-		.act1{
-			border: 2rpx solid #2D7CE6;
-		}
-	}
-	.botbtn{
-		padding: 32rpx 32rpx 0 32rpx;
-		margin-left: -32rpx;
-		position: fixed;
-		bottom: 0;
+	.addpage {
 		width: 750rpx;
-		height: 200rpx;
-		background: #FFFFFF;
-		box-shadow: 0rpx -10rpx 16rpx 0rpx rgba(202,202,202,0.25);
-		border-radius: 40rpx 40rpx 0rpx 0rpx;
-		.btn{
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			font-size: 28rpx;
-			font-family:'PingFang','PingFang';
-			font-weight: 800;
-			color: #FFFFFF;
-			width: 686rpx;
-			height: 80rpx;
-			background: linear-gradient(180deg, #74AFFF 0%, #2D7CE6 100%);
-			border-radius: 104rpx 104rpx 104rpx 104rpx;
-		}
-	}
-}
-.pop-up{
-	padding: 30rpx 32rpx;
-	.caption{
-		font-size: 36rpx;
-		text-align: center;
-		font-weight: 800;
-		color: #2E4975;
-		padding-top: 20rpx;
-	}
-	.caption_top{
-		font-size: 28rpx;
-		font-family: 'PingFang';
-		color: #2E4975;
-		margin-top: 40rpx;
-	}
-	.dashboard{
-		 position: absolute; 
-		width: 40rpx;
-		 height: 40rpx; 
-		 bottom: 0; 
-		 right: 0;
-	}
-	.caption_input{
-		border-radius: 20rpx 20rpx 20rpx 20rpx;
-		border: 2rpx solid #DDE2EE;
-		margin-top: 16rpx;
-		padding: 0  20rpx;
-	}
-	.caption_top_links{
-		font-size: 20rpx;
-		font-family: 'PingFang';
-		font-weight: 500;
-		color: #2D7CE6;
-	}
-	.element.style{
-		background-color: red;
-	}
-	.u-list-item u-add-wrap {
-		width: 62rpx !important;
-	}
-	.caption_add{
-		    width: 93.1%;
-		  background: #2D7CE6;
-		  border-radius: 20rpx 20rpx 20rpx 20rpx;
-		    text-align: center;
-		    margin: 0 auto;
-		    padding: 24rpx 0;
-			color: #fff;
-			margin-top: 40rpx;
-	}
-	.caption_class{
-		margin-top: 40rpx;
-	}
+		padding: 0 32rpx;
+		flex-wrap: wrap;
 
-	.class_body{
-		margin-top: 40rpx;
-		.caption_flex{
+		// display: flex;
+		// flex-wrap: wrap;
+		.topbox {
+			margin-top: 46rpx;
 			display: flex;
+			flex-wrap: nowrap;
+			justify-content: space-between;
 			align-items: center;
-			.caption_boder_text2{
-				font-size: 23rpx;
+
+			.search_box {
+
+				width: 480rpx;
+				height: 88rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				display: flex;
+				flex-wrap: nowrap;
+
+				.check_search {
+					display: flex;
+					flex-wrap: nowrap;
+					align-items: center;
+					justify-content: center;
+					width: 148rpx;
+					height: 88rpx;
+					background: #FFF2E4;
+					border-radius: 20rpx 0rpx 0rpx 20rpx;
+					font-size: 28rpx;
+					font-family: 'PingFang', 'PingFang';
+					font-weight: 500;
+					color: #F39852;
+
+					.icon-arow_down {
+						margin-left: 8rpx;
+						font-size: 20rpx;
+					}
+				}
+
+				.serchbox {
+					// padding: 0 32rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					// margin-top: 30rpx;
+					align-items: center;
+					// justify-content: space-between;
+					width: 538rpx;
+					height: 88rpx;
+					background: #FFFFFF;
+					border-radius: 20rpx 20rpx 20rpx 20rpx;
+
+					.serchimg {
+						margin-left: 32rpx;
+
+						width: 32rpx;
+						height: 32rpx;
+
+					}
+
+					.input {
+						margin-left: 24rpx;
+						width: 394rpx;
+						height: 88rpx;
+						// border-radius: 30rpx;
+						// background-color: #f5f8fc;
+						// display: flex;
+						// justify-content: center;
+						// align-items: center;
+						// text-align: center;
+						font-size: 28rpx;
+						font-family: Source Han Sans CN, Source Han Sans CN-Light;
+						font-weight: 300;
+						text-align: left;
+						color: #a7b9cd;
+						letter-spacing: 1.2rpx;
+						line-height: 36rpx;
+						// padding: 0 100rpx;
+						// padding-right: 135rpx;
+						box-sizing: border-box;
+
+					}
+				}
+
+			}
+
+			.addclass {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				width: 194rpx;
+				height: 88rpx;
+				background: #FFF2E4;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+
+				font-size: 28rpx;
+				font-family: 'PingFang', 'PingFang';
 				font-weight: 500;
-				color: #2D7CE6;
+				color: #F39852;
 			}
 		}
-		.caption_boder{
-			position: relative;
-			width: 96rpx;
-			height: 96rpx;
+
+		.check_card {
+			margin-top: 20rpx;
+
+			.check_card_stu {
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				justify-content: space-between;
+				padding: 32rpx;
+				width: 686rpx;
+				height: 148rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				border: 2rpx solid #FFFFFF;
+				margin-bottom: 20rpx;
+
+				.check_card_stu_info_left {
+					display: flex;
+					flex-wrap: nowrap;
+
+					.class_card_left {
+						width: 76rpx;
+						height: 76rpx;
+					}
+
+					.class_card_right {
+						margin-left: 12rpx;
+						display: flex;
+						flex-wrap: wrap;
+
+						.class_card_right_top {
+							width: 100%;
+							font-size: 28rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: bold;
+							color: #072F5A;
+						}
+
+						.class_card_right_bot {
+							margin-top: 4rpx;
+							font-size: 20rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: 500;
+							color: rgba(7, 47, 90, 0.6);
+						}
+					}
+				}
+
+				.check_card_stu_info_right {
+					width: 50%;
+					display: flex;
+					flex-wrap: nowrap;
+					align-items: center;
+					justify-content: space-between;
+
+					.class_info {
+						width: 110rpx;
+						display: flex;
+						flex-wrap: wrap;
+						justify-content: center;
+
+						.class_info_top {
+							font-size: 20rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: 500;
+							color: rgba(7, 47, 90, 0.5);
+						}
+
+						.class_info_bot {
+							margin-top: 12rpx;
+							font-size: 28rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: 800;
+							color: #2D7CE6;
+						}
+					}
+				}
+			}
+
+			.check_card_cls {
+				display: flex;
+				flex-wrap: nowrap;
+				align-items: center;
+				justify-content: space-between;
+				padding: 32rpx;
+				width: 686rpx;
+				height: 148rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				border: 2rpx solid #FFFFFF;
+				margin-bottom: 20rpx;
+
+				.check_card_cls_info_left {
+					display: flex;
+					flex-wrap: nowrap;
+
+					.class_card_left {
+						width: 84rpx;
+						height: 84rpx;
+					}
+
+					.class_card_right {
+						margin-left: 12rpx;
+						display: flex;
+						flex-wrap: wrap;
+
+						.class_card_right_top {
+							width: 100%;
+							font-size: 32rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: bold;
+							color: #072F5A;
+						}
+
+						.class_card_right_bot {
+							margin-top: 8rpx;
+							background: #EBF3FF;
+							border-radius: 4rpx 4rpx 4rpx 4rpx;
+							padding: 10rpx 20rpx;
+							font-size: 20rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: 500;
+							color: #2D7CE6;
+						}
+					}
+				}
+
+				.check_card_cls_info_right {
+					width: 50%;
+					display: flex;
+					flex-wrap: nowrap;
+					align-items: center;
+					justify-content: space-between;
+
+					.class_info {
+						width: 110rpx;
+						display: flex;
+						flex-wrap: wrap;
+						justify-content: center;
+
+						.class_info_top {
+							font-size: 20rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: 500;
+							color: rgba(7, 47, 90, 0.5);
+						}
+
+						.class_info_bot {
+							margin-top: 12rpx;
+							font-size: 28rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: 800;
+							color: #2D7CE6;
+						}
+					}
+				}
+
+			}
+
+			.act1 {
+				border: 2rpx solid #2D7CE6;
+			}
+		}
+
+		.botbtn {
+			padding: 32rpx 32rpx 0 32rpx;
+			margin-left: -32rpx;
+			position: fixed;
+			bottom: 0;
+			width: 750rpx;
+			height: 200rpx;
 			background: #FFFFFF;
+			box-shadow: 0rpx -10rpx 16rpx 0rpx rgba(202, 202, 202, 0.25);
+			border-radius: 40rpx 40rpx 0rpx 0rpx;
+
+			.btn {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 28rpx;
+				font-family: 'PingFang', 'PingFang';
+				font-weight: 800;
+				color: #FFFFFF;
+				width: 686rpx;
+				height: 80rpx;
+				background: linear-gradient(180deg, #74AFFF 0%, #2D7CE6 100%);
+				border-radius: 104rpx 104rpx 104rpx 104rpx;
+			}
+		}
+	}
+
+	.pop-up {
+		padding: 30rpx 32rpx;
+
+		.caption {
+			font-size: 36rpx;
+			text-align: center;
+			font-weight: 800;
+			color: #2E4975;
+			padding-top: 20rpx;
+		}
+
+		.caption_top {
+			font-size: 28rpx;
+			font-family: 'PingFang';
+			color: #2E4975;
+			margin-top: 40rpx;
+		}
+
+		.dashboard {
+			position: absolute;
+			width: 40rpx;
+			height: 40rpx;
+			bottom: 0;
+			right: 0;
+		}
+
+		.caption_input {
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
 			border: 2rpx solid #DDE2EE;
-			margin-top: 17rpx;
-			.class_tp_image{
-			    position: absolute;
-			    top: 28rpx;
-			    right: 32rpx;
-				bottom: 0;
-				width: 
-28rpx;
-				height: 
-28rpx;
-			}
-			
+			margin-top: 16rpx;
+			padding: 0 20rpx;
 		}
+
+		.caption_top_links {
+			font-size: 20rpx;
+			font-family: 'PingFang';
+			font-weight: 500;
+			color: #2D7CE6;
+		}
+
+		.element.style {
+			background-color: red;
+		}
+
+		.u-list-item u-add-wrap {
+			width: 62rpx !important;
+		}
+
+		.caption_add {
+			width: 93.1%;
+			background: #2D7CE6;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+			text-align: center;
+			margin: 0 auto;
+			padding: 24rpx 0;
+			color: #fff;
+			margin-top: 40rpx;
+		}
+
+		.caption_class {
+			margin-top: 40rpx;
+		}
+
+		.class_body {
+			margin-top: 40rpx;
+
+			.caption_flex {
+				display: flex;
+				align-items: center;
+
+				.caption_boder_text2 {
+					font-size: 23rpx;
+					font-weight: 500;
+					color: #2D7CE6;
+				}
+			}
+
+			.caption_boder {
+				position: relative;
+				width: 96rpx;
+				height: 96rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				border: 2rpx solid #DDE2EE;
+				margin-top: 17rpx;
+
+				.class_tp_image {
+					position: absolute;
+					top: 28rpx;
+					right: 32rpx;
+					bottom: 0;
+					width:
+						28rpx;
+					height:
+						28rpx;
+				}
+
+			}
+		}
+
+
 	}
-	
-	
-}
-</style>
+</style>
\ No newline at end of file
diff --git a/pages/Mystudent/arrange_work.vue b/pages/Mystudent/arrange_work.vue
index 3f1a6f4..31dacfc 100644
--- a/pages/Mystudent/arrange_work.vue
+++ b/pages/Mystudent/arrange_work.vue
@@ -1,21 +1,15 @@
 <template>
 	<view class="pagebox">
-		<u-navbar title="作业安排"
-				  :border-bottom="false"
-				  :background="bgc"
-				  title-color='#2E4975'
-				  title-size='36'
-				  height='36'></u-navbar>
+		<u-navbar title="作业安排" :border-bottom="false" :background="bgc" title-color='#2E4975' title-size='36'
+			height='36'></u-navbar>
 		<view class="serchbox">
 			<view class="serchimg">
 				<image src="https://file.langsi.online/yasiimg/web/static/uVMACkynkipOxuTYDqm0">
 
 				</image>
 			</view>
-			<input type="text"
-				   placeholder="搜索相关内容..."
-				   class="input"
-				   placeholder-style="color:#C7CDD3 ">
+			<input type="text" v-model="searchKeyword" placeholder="搜索相关内容..." class="input"
+				placeholder-style="color:#C7CDD3" @input="search()">
 		</view>
 		<view class="checkbox">
 			<view class="chekcont">
@@ -33,38 +27,44 @@
 		</view>
 		<view class="card_bigbox">
 			<view class="work_card" v-for="(item,index ) in workinfo" :key="index"
-			:class="item.iswork === '1' ? 'act1' : (item.iswork === '2' ? 'act3' : 'default')">
+				:class="item.iswork === '1' ? 'act1' : (item.iswork === '2' ? 'act3' : 'default')">
 				<view class="work_card_top">
 					<view class="work_card_top_left">
 						<view class="work_card_top_left_img">
 							<image src="https://file.langsi.online/yasiimg/web/static/u07sCQb6mW6OSamVr1Va"></image>
 						</view>
-						{{item.name}}
+						<view class="txt" v-html="highlightSearch(item.name)">
+							
+						</view>
+						
 					</view>
-					<view class="work_card_top_right"
-						  :class="isalready == true ? 'act2' : ''">
+					<view class="work_card_top_right" :class="isalready == true ? 'act2' : ''">
 						进行中
 					</view>
 				</view>
 				<view class="work_card_cont_box">
-					<view class="work_card_cont"  v-for="(items,indexs ) in item.infos" :key="indexs" v-if="indexs<3">
+					<view class="work_card_cont" v-for="(items,indexs ) in item.infos" :key="indexs" v-if="indexs<3">
 						<view class="work_card_cont_point"></view>
 						<view class="work_card_cont_text" v-if="items.classify==1||items.classify==2">
 							{{items.paperName}}-{{items.testName}}
 						</view>
-						<view class="work_card_cont_tag" v-if="items.classify==1" style="background: rgba(27,225,178,0.1);color: #1BE1B2;">
+						<view class="work_card_cont_tag" v-if="items.classify==1"
+							style="background: rgba(27,225,178,0.1);color: #1BE1B2;">
 							听力
 						</view>
-						<view class="work_card_cont_tag" v-if="items.classify==2"  style="background: rgba(242,182,42,0.2);color: #F2AA02 ;">
+						<view class="work_card_cont_tag" v-if="items.classify==2"
+							style="background: rgba(242,182,42,0.2);color: #F2AA02 ;">
 							阅读
 						</view>
-						<view class="work_card_cont_tag" v-if="items.classify==3" style="background:rgba(63,122,242,0.2);color: #3F7AF2 ;">
+						<view class="work_card_cont_tag" v-if="items.classify==3"
+							style="background:rgba(63,122,242,0.2);color: #3F7AF2 ;">
 							写作
 						</view>
-						<view class="work_card_cont_tag" v-if="items.classify==4" style="background: rgba(242,63,235,0.1);color: #F23FEB  ;">
+						<view class="work_card_cont_tag" v-if="items.classify==4"
+							style="background: rgba(242,63,235,0.1);color: #F23FEB  ;">
 							口语
 						</view>
-						
+
 					</view>
 					<view class="work_card_cont" v-if="item.infos.length>3">
 						<view class="work_card_cont_point" style="margin-right: 10rpx;"></view>
@@ -95,7 +95,7 @@
 
 					<view class="work_card_info_bot">
 						{{item.doneTime}}
-						 <!-- {{ formatTimestamp(item.createTime) }} -->
+						<!-- {{ formatTimestamp(item.createTime) }} -->
 					</view>
 				</view>
 			</view>
@@ -109,288 +109,333 @@
 </template>
 
 <script>
-export default {
-	data() {
-		return {
-			bgc: {
-				backgroundColor: "#F0F6FF",
-			},
-			isalready: true,
-			work: [
-				{ "iswork": "0" },
-				{ "iswork": "1" },
-				{ "iswork": "2" },
-				{ "iswork": "0" }
-			],
-			classid:0,
-			workinfo:[]
-		}
-	},
-	onLoad(option) {
-		console.log(option);
-		this.classid=option.classId
-		// this.classid=15
-		this.getworklist()
-	},
-	methods: {
-		   formatTimestamp(timestamp) {
-		      const date = new Date(timestamp);
-		      const year = date.getFullYear();
-		      const month = (date.getMonth() + 1).toString().padStart(2, '0');
-		      const day = date.getDate().toString().padStart(2, '0');
-		      const hours = date.getHours().toString().padStart(2, '0');
-		      const minutes = date.getMinutes().toString().padStart(2, '0');
-		
-		      return `${year}-${month}-${day} ${hours}:${minutes}`;
-		    },
-		  
-		getworklist(){
-			this.$u.get(`/admin-api/classroom/work-record/list?classId=${this.classid}`).then(res => {
-			
-						
-				if (res.code == 0) {
-					this.workinfo=res.data
-					// this.classlist = res.data.list
-					// this.isloding = false
-						
+	export default {
+		data() {
+			return {
+				bgc: {
+					backgroundColor: "#F0F6FF",
+				},
+				isalready: true,
+				work: [{
+						"iswork": "0"
+					},
+					{
+						"iswork": "1"
+					},
+					{
+						"iswork": "2"
+					},
+					{
+						"iswork": "0"
+					}
+				],
+				classid: 0,
+				workinfo: [],
+				orgworkinfo: [],
+				searchKeyword: '',
+			}
+		},
+		onLoad(option) {
+			console.log(option);
+			this.classid = option.classId
+			// this.classid=15
+			this.getworklist()
+		},
+		methods: {
+			highlightSearch(name) {
+				// 使用正则表达式替换匹配到的 searchKeyword 为带有颜色的文字
+				if (this.searchKeyword) {
+					const regex = new RegExp(this.searchKeyword, 'gi');
+					return name.replace(regex, match => `<span style="color: #2D7CE6 ;">${match}</span>`);
 				}
-			})
+				return name;
+			},
+			formatTimestamp(timestamp) {
+				const date = new Date(timestamp);
+				const year = date.getFullYear();
+				const month = (date.getMonth() + 1).toString().padStart(2, '0');
+				const day = date.getDate().toString().padStart(2, '0');
+				const hours = date.getHours().toString().padStart(2, '0');
+				const minutes = date.getMinutes().toString().padStart(2, '0');
+
+				return `${year}-${month}-${day} ${hours}:${minutes}`;
+			},
+
+			getworklist() {
+				this.$u.get(`/admin-api/classroom/work-record/list?classId=${this.classid}`).then(res => {
+
+
+					if (res.code == 0) {
+						this.workinfo = res.data
+						this.orgworkinfo = JSON.parse(JSON.stringify(res.data));
+						// this.classlist = res.data.list
+						// this.isloding = false
+
+					}
+				})
+			},
+			search() {
+				// 根据关键字过滤 this.classlist
+				if (this.searchKeyword !== '') {
+					const filteredList = JSON.parse(JSON.stringify(this.orgworkinfo)).filter(item => {
+						// 匹配 nickName 或者 id
+						return item.name.includes(this.searchKeyword) || item.des.includes(this.searchKeyword);
+					});
+					// 更新 this.classlist 为过滤后的列表
+					this.workinfo = filteredList;
+				} else {
+					this.fuwei();
+				}
+			},
+			fuwei() {
+
+				this.workinfo = JSON.parse(JSON.stringify(this.orgworkinfo));
+			},
 		}
 	}
-}
 </script>
 
-<style lang="scss" >
-page {
-	background: linear-gradient(183deg, #F0F6FF 0%, #FAFAFA 100%);
-	padding-bottom: 170rpx;
-}
-
-.pagebox {
-	padding: 0 32rpx;
-
-	.serchbox {
-		padding: 0 32rpx;
-		display: flex;
-		flex-wrap: nowrap;
-		margin-top: 30rpx;
-		align-items: center;
-		width: 686rpx;
-		height: 88rpx;
-		background: #FFFFFF;
-		border-radius: 20rpx 20rpx 20rpx 20rpx;
-
-		.serchimg {
-			width: 30.51rpx;
-			height: 32rpx;
-			margin-right: 24rpx;
-		}
-
-		.input {
-			margin: 0 auto;
-			width: 568rpx;
-			height: 88rpx;
-			border-radius: 30rpx;
-			// background-color: #f5f8fc;
-			// display: flex;
-			// justify-content: center;
-			// align-items: center;
-			// text-align: center;
-			font-size: 28rpx;
-			font-family: Source Han Sans CN, Source Han Sans CN-Light;
-			font-weight: 300;
-			text-align: left;
-			color: #a7b9cd;
-			letter-spacing: 1.2rpx;
-			line-height: 36rpx;
-			// padding: 0 100rpx;
-			// padding-right: 135rpx;
-			box-sizing: border-box;
-
-		}
+<style lang="scss">
+	page {
+		background: linear-gradient(183deg, #F0F6FF 0%, #FAFAFA 100%);
+		padding-bottom: 170rpx;
 	}
 
-	.checkbox {
-		
-		margin-top: 32rpx;
-		padding: 0 34rpx;
-		display: flex;
-		flex-wrap: nowrap;
-		align-items: center;
-		justify-content: space-between;
+	.pagebox {
+		padding: 0 32rpx;
 
-		.chekcont {
+		.serchbox {
+			padding: 0 32rpx;
 			display: flex;
 			flex-wrap: nowrap;
+			margin-top: 30rpx;
 			align-items: center;
-			font-size: 24rpx;
-			font-family:'PingFang','PingFang';
-			font-weight: 500;
-			color: rgba(7, 47, 90, 0.6);
-
-			.icon-arow_down {
-				margin-left: 6rpx;
-				font-size: 16rpx;
-			}
-		}
-
-	}
-
-	.card_bigbox {
-		.work_card {
-			margin-top: 20rpx;
-			display: flex;
-			flex-wrap: wrap;
 			width: 686rpx;
-			padding: 32rpx;
+			height: 88rpx;
 			background: #FFFFFF;
 			border-radius: 20rpx 20rpx 20rpx 20rpx;
 
-			border-left: 8rpx solid #F18F21;
+			.serchimg {
+				width: 30.51rpx;
+				height: 32rpx;
+				margin-right: 24rpx;
+			}
 
-			.work_card_top {
-				width: 100%;
+			.input {
+				margin: 0 auto;
+				width: 568rpx;
+				height: 88rpx;
+				border-radius: 30rpx;
+				// background-color: #f5f8fc;
+				// display: flex;
+				// justify-content: center;
+				// align-items: center;
+				// text-align: center;
+				font-size: 28rpx;
+				font-family: Source Han Sans CN, Source Han Sans CN-Light;
+				font-weight: 300;
+				text-align: left;
+				color: #a7b9cd;
+				letter-spacing: 1.2rpx;
+				line-height: 36rpx;
+				// padding: 0 100rpx;
+				// padding-right: 135rpx;
+				box-sizing: border-box;
+
+			}
+		}
+
+		.checkbox {
+
+			margin-top: 32rpx;
+			padding: 0 34rpx;
+			display: flex;
+			flex-wrap: nowrap;
+			align-items: center;
+			justify-content: space-between;
+
+			.chekcont {
 				display: flex;
 				flex-wrap: nowrap;
 				align-items: center;
-				justify-content: space-between;
+				font-size: 24rpx;
+				font-family: 'PingFang', 'PingFang';
+				font-weight: 500;
+				color: rgba(7, 47, 90, 0.6);
 
-				.work_card_top_left {
-					display: flex;
-					flex-wrap: nowrap;
-					align-items: center;
-					font-size: 28rpx;
-					font-family:'PingFang','PingFang';
-					font-weight: 800;
-					color: #2E4975;
-
-					.work_card_top_left_img {
-						margin-right: 8rpx;
-						width: 38rpx;
-						height: 32rpx;
-					}
-				}
-
-				.work_card_top_right {
-					font-size: 24rpx;
-					font-family:'PingFang','PingFang';
-					font-weight: 500;
-					color: #F18F21;
-				}
-
-				.act2 {
-					color: #2D7CE6;
+				.icon-arow_down {
+					margin-left: 6rpx;
+					font-size: 16rpx;
 				}
 			}
 
-			.work_card_cont_box {
-				margin-top: 16rpx;
-				padding: 24rpx;
-				width: 100%;
-				background: #F9F9F9;
+		}
+
+		.card_bigbox {
+			.work_card {
+				margin-top: 20rpx;
+				display: flex;
+				flex-wrap: wrap;
+				width: 686rpx;
+				padding: 32rpx;
+				background: #FFFFFF;
 				border-radius: 20rpx 20rpx 20rpx 20rpx;
 
-				.work_card_cont:last-child {
-					margin-bottom: 0;
-				}
+				border-left: 8rpx solid #F18F21;
 
-				.work_card_cont {
-					margin-bottom: 24rpx;
+				.work_card_top {
+					width: 100%;
 					display: flex;
 					flex-wrap: nowrap;
 					align-items: center;
+					justify-content: space-between;
 
-					.work_card_cont_point {
-						width: 8rpx;
-						height: 8rpx;
-						background: #2E4975;
-						border-radius: 50%;
-					}
-
-					.work_card_cont_text {
-						margin-left: 20rpx;
-						font-size: 24rpx;
-						font-family:'PingFang','PingFang';
-						font-weight: 500;
+					.work_card_top_left {
+						display: flex;
+						flex-wrap: nowrap;
+						align-items: center;
+						font-size: 28rpx;
+						font-family: 'PingFang', 'PingFang';
+						font-weight: 800;
 						color: #2E4975;
+
+						.work_card_top_left_img {
+							margin-right: 8rpx;
+							width: 38rpx;
+							height: 32rpx;
+						}
+						.txt{
+							font-size: 28rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: 800;
+							color: #2E4975;
+						}
 					}
 
-					.work_card_cont_tag {
-						margin-left: 30rpx;
-						padding: 8rpx 18rpx;
-						background: #FFF2E4;
-						border-radius: 20rpx 20rpx 20rpx 20rpx;
-						font-size: 20rpx;
-						font-family:'PingFang','PingFang';
+					.work_card_top_right {
+						font-size: 24rpx;
+						font-family: 'PingFang', 'PingFang';
 						font-weight: 500;
 						color: #F18F21;
 					}
 
-				}
-			}
-
-			.work_card_info_box {
-				display: flex;
-				flex-wrap: wrap;
-				margin-top: 22rpx;
-				width: 100%;
-				.work_card_info_top {
-					display: flex;
-					flex-wrap: nowrap;
-					align-items: center;
-					width: 100%;
-					font-size: 20rpx;
-					font-family:'PingFang','PingFang';
-					font-weight: 500;
-					color: rgba(46, 73, 117, 0.6);
-
-					.work_card_info_topimg {
-						margin-right: 8rpx;
-						width: 18.74rpx;
-						height: 20rpx;
+					.act2 {
+						color: #2D7CE6;
 					}
 				}
 
-				.work_card_info_bot {
-					margin-top: 4rpx;
-					font-size: 24rpx;
-					font-family:'PingFang','PingFang';
-					font-weight: 500;
-					color: #2E4975;
+				.work_card_cont_box {
+					margin-top: 16rpx;
+					padding: 24rpx;
+					width: 100%;
+					background: #F9F9F9;
+					border-radius: 20rpx 20rpx 20rpx 20rpx;
+
+					.work_card_cont:last-child {
+						margin-bottom: 0;
+					}
+
+					.work_card_cont {
+						margin-bottom: 24rpx;
+						display: flex;
+						flex-wrap: nowrap;
+						align-items: center;
+
+						.work_card_cont_point {
+							width: 8rpx;
+							height: 8rpx;
+							background: #2E4975;
+							border-radius: 50%;
+						}
+
+						.work_card_cont_text {
+							margin-left: 20rpx;
+							font-size: 24rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: 500;
+							color: #2E4975;
+						}
+
+						.work_card_cont_tag {
+							margin-left: 30rpx;
+							padding: 8rpx 18rpx;
+							background: #FFF2E4;
+							border-radius: 20rpx 20rpx 20rpx 20rpx;
+							font-size: 20rpx;
+							font-family: 'PingFang', 'PingFang';
+							font-weight: 500;
+							color: #F18F21;
+						}
+
+					}
 				}
+
+				.work_card_info_box {
+					display: flex;
+					flex-wrap: wrap;
+					margin-top: 22rpx;
+					width: 100%;
+
+					.work_card_info_top {
+						display: flex;
+						flex-wrap: nowrap;
+						align-items: center;
+						width: 100%;
+						font-size: 20rpx;
+						font-family: 'PingFang', 'PingFang';
+						font-weight: 500;
+						color: rgba(46, 73, 117, 0.6);
+
+						.work_card_info_topimg {
+							margin-right: 8rpx;
+							width: 18.74rpx;
+							height: 20rpx;
+						}
+					}
+
+					.work_card_info_bot {
+						margin-top: 4rpx;
+						font-size: 24rpx;
+						font-family: 'PingFang', 'PingFang';
+						font-weight: 500;
+						color: #2E4975;
+					}
+				}
+			}
+
+			.act1 {
+				border-left: 8rpx solid #2D7CE6;
+			}
+
+			.act3 {
+				border-left: 8rpx solid #DFDFDF;
 			}
 		}
 
-		.act1 {
-			border-left: 8rpx solid #2D7CE6;
-		}
+		.botbtn {
+			padding: 32rpx 32rpx 0 32rpx;
+			margin-left: -32rpx;
+			position: fixed;
+			bottom: 0;
+			width: 750rpx;
+			height: 200rpx;
+			background: #FFFFFF;
+			box-shadow: 0rpx -10rpx 16rpx 0rpx rgba(202, 202, 202, 0.25);
+			border-radius: 40rpx 40rpx 0rpx 0rpx;
 
-		.act3 {
-			border-left: 8rpx solid #DFDFDF;
+			.btn {
+				display: flex;
+				align-items: center;
+				justify-content: center;
+				font-size: 28rpx;
+				font-family: 'PingFang', 'PingFang';
+				font-weight: 800;
+				color: #FFFFFF;
+				width: 686rpx;
+				height: 80rpx;
+				background: linear-gradient(180deg, #74AFFF 0%, #2D7CE6 100%);
+				border-radius: 104rpx 104rpx 104rpx 104rpx;
+			}
 		}
 	}
-	.botbtn{
-		padding: 32rpx 32rpx 0 32rpx;
-		margin-left: -32rpx;
-		position: fixed;
-		bottom: 0;
-		width: 750rpx;
-		height: 200rpx;
-		background: #FFFFFF;
-		box-shadow: 0rpx -10rpx 16rpx 0rpx rgba(202,202,202,0.25);
-		border-radius: 40rpx 40rpx 0rpx 0rpx;
-		.btn{
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			font-size: 28rpx;
-			font-family:'PingFang','PingFang';
-			font-weight: 800;
-			color: #FFFFFF;
-			width: 686rpx;
-			height: 80rpx;
-			background: linear-gradient(180deg, #74AFFF 0%, #2D7CE6 100%);
-			border-radius: 104rpx 104rpx 104rpx 104rpx;
-		}
-	}
-}</style>
+</style>
\ No newline at end of file
diff --git a/pages/Mystudent/student.vue b/pages/Mystudent/student.vue
index f7ccdf5..64cb0ce 100644
--- a/pages/Mystudent/student.vue
+++ b/pages/Mystudent/student.vue
@@ -1,14 +1,9 @@
 <template>
 	<view class="view_body">
-		<u-navbar :is-back="false"
-				  title='班级'
-				  title-color="#2E4975"
-				  :border-bottom="false"
-				  :background="bgc"
-				  id="navbar">
+		<u-navbar :is-back="false" title='班级' title-color="#2E4975" :border-bottom="false" :background="bgc"
+			id="navbar">
 		</u-navbar>
-		<view class="nocont"
-			  v-show="shownocont">
+		<view class="nocont" v-show="shownocont">
 			<view class="nocont_tip">
 				<view class="nocont_tip_img">
 					<image src="https://file.langsi.online/yasiimg/web/static/uVcz1RzZi6US2NKa0ssl"></image>
@@ -22,8 +17,7 @@
 
 		</view>
 
-		<view class="student_page"
-			  v-show="shownocont == false">
+		<view class="student_page" v-show="shownocont == false">
 			<view class="student_page_top">
 				<view class="search_box">
 					<view class="check_search">
@@ -33,21 +27,16 @@
 					<view class="serchbox">
 						<view class="serchimg">
 							<image src="https://file.langsi.online/yasiimg/web/static/uVMACkynkipOxuTYDqm0"
-								   mode="scaleToFill">
+								mode="scaleToFill">
 
 							</image>
 						</view>
-						<input type="text"
-      						 v-model="searchKeyword"
-      						 placeholder="搜索相关内容..."
-      						 class="input"
-      						 placeholder-style="color:#C7CDD3"
-      						 @input="search()">
+						<input type="text" v-model="searchKeyword" placeholder="搜索相关内容..." class="input"
+							placeholder-style="color:#C7CDD3" @input="search()">
 					</view>
 				</view>
 				<view class="info_box">
-					<view class="info_cont"
-						  style="width:80rpx ;">
+					<view class="info_cont" style="width:80rpx ;">
 						<view class="info_cont_top">
 							学生人数
 						</view>
@@ -73,71 +62,56 @@
 					</view>
 				</view>
 				<view class="chekbox">
-					<view class="check"
-						  :class="checkindex == 1 ? 'act1' : ''"
-						  @click="checkindex = 1">
+					<view class="check" :class="checkindex == 1 ? 'act1' : ''" @click="checkindex = 1">
 						班级
 					</view>
-					<view class="check"
-						  :class="checkindex == 0 ? 'act1' : ''"
-						  @click="checkindex = 0">
+					<view class="check" :class="checkindex == 0 ? 'act1' : ''" @click="checkindex = 0">
 						学生
 					</view>
 
-					<view class="add">
+					<view class="add" @click="addsmt()">
 						+ 添加
 					</view>
 				</view>
 
 			</view>
-			<view class="class_box"
-				  v-if="checkindex == 1">
+			<view class="class_box" v-if="checkindex == 1">
 				<view class="class_box_top">
 
-					<view @click="changeclass()"
-						  class="class_box_top_cont">
+					<view @click="changeclass()" class="class_box_top_cont">
 						班级人数
 						<view class="iconfont icon-arow_down"></view>
-						<view class="dropdown_box"
-							  v-show="classnum">
-							<view class="dropdown_item"
-								  :class="classnumindex == 0 ? 'act2' : ''"
-								  @click="chengclassnumindex(0)">
+						<view class="dropdown_box" v-show="classnum">
+							<view class="dropdown_item" :class="classnumindex == 0 ? 'act2' : ''"
+								@click="chengclassnumindex(0)">
 								降序
 							</view>
-							<view class="dropdown_item"
-								  :class="classnumindex == 1 ? 'act2' : ''"
-								  @click="chengclassnumindex(1)">
+							<view class="dropdown_item" :class="classnumindex == 1 ? 'act2' : ''"
+								@click="chengclassnumindex(1)">
 								升序
 							</view>
 
 						</view>
 					</view>
 
-					<view @click="changetext()"
-						  class="class_box_top_cont">
+					<view @click="changetext()" class="class_box_top_cont">
 						标签文字
 						<view class="iconfont icon-arow_down"></view>
-						<view class="dropdown_box"
-							  v-show="showtext">
-							<view class="dropdown_item"
-								  :class="textindex == 1 ? 'act2' : ''"
-								  @click="chengetextindex(1)">
+						<view class="dropdown_box" v-show="showtext">
+							<view class="dropdown_item" :class="textindex == 1 ? 'act2' : ''"
+								@click="chengetextindex(1)">
 								听力
 							</view>
-							<view class="dropdown_item"
-								  :class="textindex == 2 ? 'act2' : ''"
-								  @click="chengetextindex(2)">
+							<view class="dropdown_item" :class="textindex == 2 ? 'act2' : ''"
+								@click="chengetextindex(2)">
 								阅读
 							</view>
-							<view class="dropdown_item"
-								  :class="textindex == 3 ? 'act2' : ''"
-								  @click="chengetextindex(3)">
+							<view class="dropdown_item" :class="textindex == 3 ? 'act2' : ''"
+								@click="chengetextindex(3)">
 								写作
 							</view>
-							<view class="dropdown_item"
-								  :class="textindex == 4 ? 'act2' : ''"
-								  @click="chengetextindex(4)">
+							<view class="dropdown_item" :class="textindex == 4 ? 'act2' : ''"
+								@click="chengetextindex(4)">
 								口语
 							</view>
 						</view>
@@ -151,39 +125,32 @@
 
 				</view>
 
-				<view class="class_card"
-					  v-for="(item, index) in classlist"
-					  v-if="isloding == false"
-					  :key="index"  @click="toclassdetal(item)">
+				<view class="class_card" v-for="(item, index) in classlist" v-if="isloding == false" :key="index"
+					@click="toclassdetal(item)">
 					<view class="class_card_top">
 						<view class="class_card_left">
 							<image src=" https://file.langsi.online/yasiimg/web/static/udWNTRG6GulmTtgPRQ49"></image>
 						</view>
 						<view class="class_card_right">
-							<view class="class_card_right_top"  v-html="highlightSearch(item.name)">
+							<view class="class_card_right_top" v-html="highlightSearch(item.name)">
 								<!-- {{ item.name }} -->
 							</view>
-							<view class="class_card_right_bot"
-								  v-show="item.classify == 1">
+							<view class="class_card_right_bot" v-show="item.classify == 1">
 								听力
 							</view>
-							<view class="class_card_right_bot"
-								  v-show="item.classify == 2">
+							<view class="class_card_right_bot" v-show="item.classify == 2">
 								阅读
 							</view>
-							<view class="class_card_right_bot"
-								  v-show="item.classify == 3">
+							<view class="class_card_right_bot" v-show="item.classify == 3">
 								写作
 							</view>
-							<view class="class_card_right_bot"
-								  v-show="item.classify == 4">
+							<view class="class_card_right_bot" v-show="item.classify == 4">
 								口语
 							</view>
 						</view>
 					</view>
 					<view class="class_infobox">
-						<view class="class_info"
-							  style="width:80rpx ;">
+						<view class="class_info" style="width:80rpx ;">
 							<view class="class_info_top">
 								班级人数
 							</view>
@@ -215,10 +182,8 @@
 				</view>
 			</view>
 		</view>
-		<view class="overlay"
-			  v-if="false">
-			<view class="addstudent"
-				  v-show="false">
+		<view class="overlay" v-if="false">
+			<view class="addstudent" v-show="false">
 
 				<view class="close">
 					<image src="https://file.langsi.online/yasiimg/web/static/uSzPsPoFgoVwcsl7pJ89"></image>
@@ -232,10 +197,8 @@
 						学员名称
 					</view>
 					<view class="addstudent_input">
-						<input type="text"
-							   placeholder="搜索相关内容..."
-							   class="input"
-							   placeholder-style="color:#C7CDD3;font-size: 24rpx; ">
+						<input type="text" placeholder="搜索相关内容..." class="input"
+							placeholder-style="color:#C7CDD3;font-size: 24rpx; ">
 					</view>
 				</view>
 				<view class="addstudent_input_box">
@@ -243,18 +206,15 @@
 						学员ID
 					</view>
 					<view class="addstudent_input">
-						<input type="text"
-							   placeholder="搜索相关内容..."
-							   class="input"
-							   placeholder-style="color:#C7CDD3;font-size: 24rpx; ">
+						<input type="text" placeholder="搜索相关内容..." class="input"
+							placeholder-style="color:#C7CDD3;font-size: 24rpx; ">
 					</view>
 				</view>
 				<view class="addbtn">
 					添加
 				</view>
 			</view>
-			<view class="addtip"
-				  v-show="false">
+			<view class="addtip" v-show="false">
 				<view class="logo">
 					<image src="https://file.langsi.online/yasiimg/web/static/uxsaoHOpSUoxnX7lU3Fe"></image>
 				</view>
@@ -265,516 +225,661 @@
 			</view>
 		</view>
 		<indexlist v-show="checkindex == 0" />
+		<u-popup v-model="show" mode="bottom" length="75%" :safe-area-inset-bottom='true' :closeable="true"
+			:duration="300" border-radius="25">
+			<view class="pop-up">
+				<view class="caption">创建班级</view>
+				<!-- 班级图像 -->
+				<view style="margin-top: 16rpx;">
+					<view class="caption_top">班级头像</view>
+					<view
+						style="width: 112rpx; height: 112rpx; position: relative;border: 2rpx solid #DDE2EE;border-radius: 50%;"
+						@click="btn()">
+						<view class="imgbox" style="width: 112rpx; height: 112rpx;border-radius: 50%;">
+							<image :src="imgurl" mode="" style="width: 112rpx; height: 112rpx;border-radius: 50%;">
+							</image>
+						</view>
+
+						<view class="dashboard">
+							<image src="https://file.langsi.online/yasiimg/web/static/u03pE8b1O2DykSYUg2mp" mode="">
+							</image>
+						</view>
+					</view>
+				</view>
+				<!-- 班级名称 -->
+				<view>
+					<view class="caption_top">班级名称</view>
+					<view class="caption_input">
+						<u-input v-model="designation" :type="type" :border="border" placeholder="请输入班级名称" />
+					</view>
+				</view>
+				<!-- 班级标签 -->
+				<view>
+					<view class="caption_top">班级标签</view>
+					<!-- 弹出层 -->
+					<u-select v-model="show2" :list="list" @confirm="confirm"></u-select>
+
+					<view class="caption_input">
+						<u-input  v-model="form.name" @click="showPopup" placeholder="请输入班级标签" />
+					</view>
+
+
+
+
+				</view>
+				<!-- 班级学生 -->
+				<view class="class_body">
+					<view class="caption_flex">
+						<view>班级学生</view>
+						<view class="caption_boder_text2">点击头像选择班级学员</view>
+					</view>
+					<view class="select_box" style="display: flex;flex-wrap: wrap;">
+						<view class="class_ys" v-for="(item, index) in stuinfo" :key="index"
+							style="position: relative;">
+							<view class="close"
+								style="position: absolute;top: 0rpx;right: 8rpx;width: 20rpx;height: 20rpx;"
+								@click="delstu(item.id)">
+								<image src="https://file.langsi.online/yasiimg/web/static/ueH3qwYazyVXmiYoVPJE" mode="">
+								</image>
+							</view>
+							<view class="class_tp">
+								<image :src="item.avatar" mode=""
+									style="width: 56rpx;height: 56rpx;border-radius: 50%;"></image>
+							</view>
+							<view class="class_wz">{{ item.name }}</view>
+						</view>
+						<view class="caption_boder" @click="toaddstu()">
+
+							<view class="class_tp_image" >
+								<image src="https://file.langsi.online/yasiimg/web/static/utw2UbXetgo1FDQpvGKq" mode="">
+								</image>
+							</view>
+						</view>
+					</view>
+
+				</view>
+				<!-- 班级老师 -->
+				<view class="class_body">
+					<view class="caption_flex">
+						<view>班级老师</view>
+						<view class="caption_boder_text2">点击加号选择班级老师</view>
+					</view>
+					<view class="select_box" style="display: flex;flex-wrap: wrap;">
+						<view class="class_ys" v-for="(item, index) in teacherinfo" :key="index"
+							style="position: relative;">
+							<view class="close"
+								style="position: absolute;top: 0rpx;right: 8rpx;width: 20rpx;height: 20rpx;"
+								@click="delstu(item.id)">
+								<image src="https://file.langsi.online/yasiimg/web/static/ueH3qwYazyVXmiYoVPJE" mode="">
+								</image>
+							</view>
+							<view class="class_tp">
+								<image :src="item.avatar" mode=""
+									style="width: 56rpx;height: 56rpx;border-radius: 50%;"></image>
+							</view>
+							<view class="class_wz">{{ item.name }}</view>
+						</view>
+						<view class="caption_boder" @click="addteacher()">
+				
+							<view class="class_tp_image" >
+								<image src="https://file.langsi.online/yasiimg/web/static/utw2UbXetgo1FDQpvGKq" mode="">
+								</image>
+							</view>
+						</view>
+					</view>
+				
+				</view>
+				<view class="caption_add" @click="addclass()">添加</view>
+			</view>
+		</u-popup>
 	</view>
 </template>
 
 <script>
-import indexlist from "../compoents/indexList.vue"
-export default {
-	components: {
-		indexlist
-	},
-	data() {
-		return {
-			shownocont: false,
-			bgc: {
-				backgroundColor: "#F6F9FC",
-			},
-			checkindex: 1,
-			isDropdownOpen: true,
-			classlist: {},
-			isloding: true,
-			changeclasslist: {},
-			classnum: false,
-			classnumindex: -1,
-			showtext: false,
-			textindex: 0,
-			searchKeyword: '',
-			totalLastNum:'',
-			totalAvgScore:'',
-			totalWorkCompletionDegre:0,
-		}
-	},
-	onLoad(option) {
-		this.getclassList()
-	},
-
-	methods: {
-		highlightSearch(name) {
-		    // 使用正则表达式替换匹配到的 searchKeyword 为带有颜色的文字
-		    if (this.searchKeyword) {
-		      const regex = new RegExp(this.searchKeyword, 'gi');
-		      return name.replace(regex, match => `<span style="color: #2D7CE6 ;">${match}</span>`);
-		    }
-		    return name;
-		  },
-		toclassdetal(item) {
-		 
-		  uni.navigateTo({
-		    url: "/pages_teacher/teacher_class/class_detail?id=" + item.id
-		  }).then(res => {
-		   
-		  }).catch(err => { 
-		  
-		  });
+	import indexlist from "../compoents/indexList.vue"
+	export default {
+		components: {
+			indexlist
 		},
-		search() {
-   		 // 根据关键字过滤 this.classlist
-		 if(this.searchKeyword!=''){
-			const filteredList = JSON.parse(JSON.stringify(this.changeclasslist)).filter(item => item.name.includes(this.searchKeyword));
-  		  // 更新 this.classlist 为过滤后的列表
-  		  this.classlist = filteredList;
-		 }else{
-			this.fuwei()
-		 }
-  		 
-  		},
-		calculatePercentage(value1, value2) {
-			if (value2 === 0) {
+		data() {
+			return {
+				shownocont: false,
+				bgc: {
+					backgroundColor: "#F6F9FC",
+				},
+				checkindex: 1,
+				isDropdownOpen: true,
+				classlist: {},
+				isloding: true,
+				changeclasslist: {},
+				classnum: false,
+				classnumindex: -1,
+				showtext: false,
+				textindex: 0,
+				searchKeyword: '',
+				totalLastNum: '',
+				totalAvgScore: '',
+				totalWorkCompletionDegre: 0,
+				// 班级名称数据绑定
+				designation: '',
+				// 班级标签数据绑定
+				labels: '',
+				// 弹出层的变量
+				show: false,
+				// 下拉框
+				show2: false,
+				form:{
+					name: '',
+				},
 				
-				return '0%'; // 或者返回其他默认值
+				list: [{
+						value: '1',
+						label: '听力'
+					},
+					{
+						value: '2',
+						label: '阅读'
+					},
+					{
+						value: '3',
+						label: '写作'
+					},
+					{
+						value: '4',
+						label: '口语'
+					}
+				],
+				icons: 'arrow-down-fill',
+				icons_rigth: 'arrow-down-fill',
+				icons_top: 'arrow-up-fill',
+				imgurl: "",
+				token: '',
+				userImgs: '',
+				teacherinfo: [],
+				stuinfo: [],
 			}
+		},
+		onLoad(option) {
+			this.getclassList()
+			uni.removeStorageSync('selectedteacherinfo');
+			uni.removeStorageSync('selectedStuInfo');
+		},
+		onShow() {
+			const selectedteacherinfo = uni.getStorageSync('selectedteacherinfo');
 
-			return ((value1 / value2) * 100).toFixed(0) + '%';
-		},
-		changeclass() {
-			this.classnum = !this.classnum
-		},
-		chengclassnumindex(num) {
-			if (num == this.classnumindex) {
-				this.classnumindex = -1
-			} else {
-				this.classnumindex = num
-			}
-			if (this.classnumindex == 0) {
-				this.classlist.sort((a, b) => b.totalMembers - a.totalMembers);
-			}
-			if (this.classnumindex == 1) {
-				// 升序排列 classlist 数组，根据 totalMembers 属性
-				this.classlist.sort((a, b) => a.totalMembers - b.totalMembers);
-			}
-			if (this.classnumindex == -1) {
-				this.fuwei()
-			}
+			if (selectedteacherinfo && selectedteacherinfo.length > 0) {
+				this.teacherinfo = selectedteacherinfo
+				// Remove duplicates from this.classinfo
+				//     this.classinfo = this.classinfo.filter(item => !selectedClassInfo.some(selectedItem => selectedItem.id === item.id));
+
+				//     // Add non-duplicate items from selectedClassInfo to this.classinfo
+				//     this.classinfo = this.classinfo.concat(selectedClassInfo);
 
-		},
-		fuwei() {
-			
-			this.classlist = JSON.parse(JSON.stringify(this.changeclasslist));
-		},
-		changetext() {
-			this.showtext = !this.showtext
-		},
-		chengetextindex(num) {
-			if (num == this.textindex) {
-				this.textindex = 0
-			} else {
-				this.textindex = num
 			}
-			if (this.textindex !== 0 || this.classnumindex === 1) {
-				this.classlist.sort((a, b) => {
-					if (this.textindex !== 0 && a.classify === this.textindex) {
-						return -1; // 将匹配的项放在前面
-					}
-					if (this.textindex !== 0 && b.classify === this.textindex) {
-						return 1; // 将匹配的项放在前面
-					}
-					if (this.classnumindex === 0) {
-						return b.totalMembers - a.totalMembers; // 对 totalMembers 进行降序排列
-					}
-					if (this.classnumindex === 1) {
-						return a.totalMembers - b.totalMembers; // 对 totalMembers 进行升序排列
-					}
-					return 0; // 保持原有顺序
+			const selectedstuInfo = uni.getStorageSync('selectedStuInfo');
+
+			if (selectedstuInfo && selectedstuInfo.length > 0) {
+				this.stuinfo = selectedstuInfo
+				// Remove duplicates from this.classinfo
+				// this.stuinfo = this.stuinfo.filter(item => !selectedstuInfo.some(selectedItem => selectedItem.id === item.id));
+
+				// // Add non-duplicate items from selectedClassInfo to this.classinfo
+				// this.stuinfo = this.stuinfo.concat(selectedstuInfo);
+
+			}
+		},
+		methods: {
+			addclass(){
+				
+				let memberIds =[]
+				let teacherIds =[]
+				this.stuinfo.forEach(item => {
+					memberIds.push(item.id); // 将 id 添加到数组中
 				});
-			} else {
-				
-				this.fuwei();
-			}
-
-
-		},
-		getclassList() {
-			this.$u.get("https://api.admin-v2.langsi.online/admin-api/classroom/page").then(res => {
-				
-				if (res.code === 0) {
-					this.classlist = res.data.list;
-					this.changeclasslist = JSON.parse(JSON.stringify(this.classlist));
-					this.isloding = false;
-					const list = res.data.list;
+				this.teacherinfo.forEach(item => {
+					teacherIds.push(item.id); // 将 id 添加到数组中
+				});
+				let classif =''
+				if(this.form.name=='听力'){
+					classif=1
+				}else if(this.form.name=='阅读'){
+					classif=2
+				}else if(this.form.name=='写作'){
+					classif=3
+				}else if(this.form.name=='口语'){
+					classif=4
+				}
+				let data ={
+					name:this.designation,
+					avatar:this.imgurl,
+					classify:classif,
+					memberIds:memberIds,
+					teacherIds:teacherIds
 					
-					if (list.length > 0) {
-					  // 计算 totalMembers 总和
-					  const totalMembersSum = list.reduce((sum, item) => sum + item.totalMembers, 0);
-					
-					  // 计算 workCompletionDegree 平均值
-					  const workCompletionDegreeAvg = list.reduce((sum, item) => sum + item.workCompletionDegree, 0) / list.length;
+				} 
+				this.$u.post(`https://api.admin-v2.langsi.online/admin-api/classroom/create`, data).then(res => {
+					if (res.code === 0) {
+						this.$refs.uToast.show({
+							title: '添加成功',
+							type: 'success',
+							position:'top'
+						})
+						uni.removeStorageSync('selectedteacherinfo');
+						uni.removeStorageSync('selectedStuInfo');
+						this.getclassList()
+						this.stuinfo=[]
+						this.teacherinfo=[]
+						this.designation=''
+						this.form.name=''
+						this.imgurl=''
+						this.show=false
+					}else{
+						this.$refs.uToast.show({
+							title: '添加失败',
+							type: 'error',
+							position:'top'
+							
+						})
 						
-					  // 计算 avgScore 平均值
-					  const avgScoreAvg = list.reduce((sum, item) => sum + item.avgScore, 0) / list.length;
-					console.log(workCompletionDegreeAvg,'workCompletionDegreeworkCompletionDegree');
-					  // 将计算结果赋值给对应的变量
-					  this.totalLastNum = totalMembersSum;
-					  this.totalWorkCompletionDegre = workCompletionDegreeAvg;
-					  this.totalAvgScore = avgScoreAvg;
-					  // console.log(this.totalworkCompletionDegree,'totalworkCompletionDegreetotalworkCompletionDegree');
-					} else {
-					  // 处理空数组的情况，例如设置默认值或者给出提示
-					  this.totalLastNum = 0;
-					  this.totalWorkCompletionDegre = 0;
-					  this.totalAvgScore = 0;
 					}
-				}
-			});
-		},
-		getstuList() {
-			this.$u.get("https://api.admin-v2.langsi.online/admin-api/classroom/page").then(res => {
-			
+				});
+				console.log(data,'data');
+			},
+			delcls(id) {
+				this.teacherinfo = this.teacherinfo.filter(item => item.id !== id);
+			},
+			delstu(id) {
+				this.stuinfo = this.stuinfo.filter(item => item.id !== id);
+			},
+			toaddstu() {
+				uni.navigateTo({
+					url: "/pages_teacher/pages_add/add_studentsforwork?stuinfo=" + encodeURIComponent(JSON
+						.stringify(this.stuinfo))
 
-				if (res.code == 0) {
-					this.classlist = res.data.list
-					this.isloding = false
+				}).then(res => {
 
+				}).catch(err => {
+
+				});
+			},
+			addteacher() {
+				uni.navigateTo({
+					url: "/pages/Mystudent/addTeacher?teacherinfo=" + encodeURIComponent(JSON.stringify(this.teacherinfo))
+				}).then(res => {
+
+				}).catch(err => {
+
+				});
+			},
+			getQiniuToken() {
+				wx.request({
+					url: 'https://v2.ielts.langsi.online/file/getToken',
+					method: 'get', // Adjust the request method as needed
+					// data: yourData,
+					header: {
+						'Authorization': 'eyJhbGciOiJIUzUxMiJ9.eyJub3RfeWJzX3VzZXJfa2V5IjoiNWZiYzA4YmUtNDZlMi00NDUzLThmYjQtMjFlNzhjZDIxY2EyIn0.jw2fyMnlNEW-zx8cH6aPh_H-WqEAHDQdh4oCpYg3qBIJZEmw6L4oNWJPvKHM9edmRdLO0p2z7_vlCYoY00NqxA '
+					},
+					success: (res) => {
+						console.log(res);
+						this.token = res.data.data.token
+					},
+					fail: (err) => {
+						console.log(err);
+					}
+				});
+				// this.$u.get('https://v2.ielts.langsi.online/file/getToken').then(res => {
+				// 	console.log(res.data);
+				// 	this.token = res.data.token
+				// }).catch(err => {
+				// 	console.log(err)
+				// })
+
+			},
+			btn() {
+				this.getQiniuToken()
+				let _this = this
+				let math = 'static/' + _this.$u.guid(20)
+				uni.chooseImage({
+					success: (chooseImageRes) => {
+						let tempFilePaths = chooseImageRes.tempFilePaths;
+						console.log(tempFilePaths)
+						tempFilePaths.forEach(item => {
+							// 上传图片到七牛云
+							wx.uploadFile({
+								url: 'https://upload-cn-east-2.qiniup.com',
+								name: 'file',
+								filePath: item,
+								formData: {
+									token: _this.token, //后端返回的token
+									key: 'yasiimg/header/' + math
+								},
+								success: function(res) {
+
+									let str = JSON.parse(res.data)
+									// console.log(str.key)
+									_this.userImgs = 'https://file.langsi.online/' + str
+										.key
+									console.log(_this.userImgs)
+									_this.imgurl = _this.userImgs
+								}
+							});
+						})
+
+
+					}
+				});
+			},
+			addsmt() {
+				if (this.checkindex == 1) {
+					this.create()
 				}
-			})
+			},
+			create() {
+				this.show = !this.show
+			},
+			showPopup() {
+				this.show2 = !this.show2
+				this.icons = this.icons_top
+			},
+			confirm(e) {
+				this.icons = this.icons_rigth
+				e.forEach(item => {
+					this.form.name = item.label
+				})
+			},
+			highlightSearch(name) {
+				// 使用正则表达式替换匹配到的 searchKeyword 为带有颜色的文字
+				if (this.searchKeyword) {
+					const regex = new RegExp(this.searchKeyword, 'gi');
+					return name.replace(regex, match => `<span style="color: #2D7CE6 ;">${match}</span>`);
+				}
+				return name;
+			},
+			toclassdetal(item) {
+
+				uni.navigateTo({
+					url: "/pages_teacher/teacher_class/class_detail?id=" + item.id
+				}).then(res => {
+
+				}).catch(err => {
+
+				});
+			},
+			search() {
+				// 根据关键字过滤 this.classlist
+				if (this.searchKeyword != '') {
+					const filteredList = JSON.parse(JSON.stringify(this.changeclasslist)).filter(item => item.name
+						.includes(this.searchKeyword));
+					// 更新 this.classlist 为过滤后的列表
+					this.classlist = filteredList;
+				} else {
+					this.fuwei()
+				}
+
+			},
+			calculatePercentage(value1, value2) {
+				if (value2 === 0) {
+
+					return '0%'; // 或者返回其他默认值
+				}
+
+				return ((value1 / value2) * 100).toFixed(0) + '%';
+			},
+			changeclass() {
+				this.classnum = !this.classnum
+			},
+			chengclassnumindex(num) {
+				if (num == this.classnumindex) {
+					this.classnumindex = -1
+				} else {
+					this.classnumindex = num
+				}
+				if (this.classnumindex == 0) {
+					this.classlist.sort((a, b) => b.totalMembers - a.totalMembers);
+				}
+				if (this.classnumindex == 1) {
+					// 升序排列 classlist 数组，根据 totalMembers 属性
+					this.classlist.sort((a, b) => a.totalMembers - b.totalMembers);
+				}
+				if (this.classnumindex == -1) {
+					this.fuwei()
+				}
+
+			},
+			fuwei() {
+
+				this.classlist = JSON.parse(JSON.stringify(this.changeclasslist));
+			},
+			changetext() {
+				this.showtext = !this.showtext
+			},
+			chengetextindex(num) {
+				if (num == this.textindex) {
+					this.textindex = 0
+				} else {
+					this.textindex = num
+				}
+				if (this.textindex !== 0 || this.classnumindex === 1) {
+					this.classlist.sort((a, b) => {
+						if (this.textindex !== 0 && a.classify === this.textindex) {
+							return -1; // 将匹配的项放在前面
+						}
+						if (this.textindex !== 0 && b.classify === this.textindex) {
+							return 1; // 将匹配的项放在前面
+						}
+						if (this.classnumindex === 0) {
+							return b.totalMembers - a.totalMembers; // 对 totalMembers 进行降序排列
+						}
+						if (this.classnumindex === 1) {
+							return a.totalMembers - b.totalMembers; // 对 totalMembers 进行升序排列
+						}
+						return 0; // 保持原有顺序
+					});
+				} else {
+
+					this.fuwei();
+				}
+
+
+			},
+			getclassList() {
+				this.$u.get("https://api.admin-v2.langsi.online/admin-api/classroom/page").then(res => {
+
+					if (res.code === 0) {
+						this.classlist = res.data.list;
+						this.changeclasslist = JSON.parse(JSON.stringify(this.classlist));
+						this.isloding = false;
+						const list = res.data.list;
+
+						if (list.length > 0) {
+							// 计算 totalMembers 总和
+							const totalMembersSum = list.reduce((sum, item) => sum + item.totalMembers, 0);
+
+							// 计算 workCompletionDegree 平均值
+							const workCompletionDegreeAvg = list.reduce((sum, item) => sum + item
+								.workCompletionDegree, 0) / list.length;
+
+							// 计算 avgScore 平均值
+							const avgScoreAvg = list.reduce((sum, item) => sum + item.avgScore, 0) / list.length;
+							console.log(workCompletionDegreeAvg, 'workCompletionDegreeworkCompletionDegree');
+							// 将计算结果赋值给对应的变量
+							this.totalLastNum = totalMembersSum;
+							this.totalWorkCompletionDegre = workCompletionDegreeAvg;
+							this.totalAvgScore = avgScoreAvg;
+							// console.log(this.totalworkCompletionDegree,'totalworkCompletionDegreetotalworkCompletionDegree');
+						} else {
+							// 处理空数组的情况，例如设置默认值或者给出提示
+							this.totalLastNum = 0;
+							this.totalWorkCompletionDegre = 0;
+							this.totalAvgScore = 0;
+						}
+					}
+				});
+			},
+			getstuList() {
+				this.$u.get("https://api.admin-v2.langsi.online/admin-api/classroom/page").then(res => {
+
+
+					if (res.code == 0) {
+						this.classlist = res.data.list
+						this.isloding = false
+
+					}
+				})
+			}
 		}
 	}
-}
 </script>
 
-<style lang="scss" >
-.view_body {
-	width: 750rpx;
-	background: #F6F9FC;
+<style lang="scss">
+	.view_body {
+		width: 750rpx;
+		background: #F6F9FC;
 
-	.nocont {
-		margin-top: 340rpx;
-		margin-left: 216rpx;
+		.nocont {
+			margin-top: 340rpx;
+			margin-left: 216rpx;
 
-		.nocont_tip {
-			margin-left: 28rpx;
-			width: 264rpx;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: center;
-
-			.nocont_tip_img {
-				width: 213.36rpx;
-				height: 220rpx;
-			}
-
-			.nocont_tip_txt {
-				font-size: 24rpx;
-				font-family: Microsoft YaHei, Microsoft YaHei;
-				font-weight: 400;
-				color: #0E3B77
-			}
-		}
-
-		.nocont_button {
-			margin-top: 100rpx;
-			display: flex;
-			flex-wrap: wrap;
-			justify-content: center;
-			align-items: center;
-			width: 320rpx;
-			height: 80rpx;
-			background: #2E7CE6;
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
-			font-size: 24rpx;
-			font-family: 'PingFang', 'PingFang';
-			font-weight: 800;
-			color: #FFFFFF;
-		}
-	}
-
-	.student_page {
-		.student_page_top {
-			padding: 32rpx;
-
-			.search_box {
-				width: 686rpx;
-				height: 88rpx;
-				background: #FFFFFF;
-				border-radius: 20rpx 20rpx 20rpx 20rpx;
+			.nocont_tip {
+				margin-left: 28rpx;
+				width: 264rpx;
 				display: flex;
-				flex-wrap: nowrap;
+				flex-wrap: wrap;
+				justify-content: center;
 
-				.check_search {
-					display: flex;
-					flex-wrap: nowrap;
-					align-items: center;
-					justify-content: center;
-					width: 148rpx;
-					height: 88rpx;
-					background: #FFF2E4;
-					border-radius: 20rpx 0rpx 0rpx 20rpx;
-					font-size: 28rpx;
-					font-family: 'PingFang', 'PingFang';
-					font-weight: 500;
-					color: #F39852;
-
-					.icon-arow_down {
-						margin-left: 8rpx;
-						font-size: 20rpx;
-					}
+				.nocont_tip_img {
+					width: 213.36rpx;
+					height: 220rpx;
 				}
 
-				.serchbox {
-					// padding: 0 32rpx;
-					display: flex;
-					flex-wrap: nowrap;
-					// margin-top: 30rpx;
-					align-items: center;
-					justify-content: space-between;
-					width: 538rpx;
-					height: 88rpx;
-					background: #FFFFFF;
-					border-radius: 20rpx 20rpx 20rpx 20rpx;
-
-					.serchimg {
-						margin-left: 32rpx;
-
-						width: 32rpx;
-						height: 32rpx;
-
-					}
-
-					.input {
-						// margin-left: 24rpx;
-						width: 452rpx;
-						height: 88rpx;
-						// border-radius: 30rpx;
-						// background-color: #f5f8fc;
-						// display: flex;
-						// justify-content: center;
-						// align-items: center;
-						// text-align: center;
-						font-size: 28rpx;
-						font-family: Source Han Sans CN, Source Han Sans CN-Light;
-						font-weight: 300;
-						text-align: left;
-						color: #a7b9cd;
-						letter-spacing: 1.2rpx;
-						line-height: 36rpx;
-						// padding: 0 100rpx;
-						// padding-right: 135rpx;
-						box-sizing: border-box;
-
-					}
-				}
-			}
-
-			.info_box {
-				display: flex;
-				flex-wrap: nowrap;
-				align-items: center;
-				justify-content: space-around;
-				margin-top: 20rpx;
-				width: 686rpx;
-				height: 128rpx;
-				background: linear-gradient(179deg, rgba(255, 237, 223, 0.65) 0%, #FFFFFF 100%);
-				border-radius: 18rpx 18rpx 18rpx 18rpx;
-
-				.info_cont {
-					width: 110rpx;
-					display: flex;
-					justify-content: center;
-					flex-wrap: wrap;
-
-					.info_cont_top {
-						font-size: 20rpx;
-						font-family: 'PingFang', 'PingFang';
-						font-weight: 500;
-						color: rgba(7, 47, 90, 0.5);
-						line-height: 24rpx;
-					}
-
-					.info_cont_bot {
-						margin-top: 12rpx;
-						font-size: 28rpx;
-						font-family: 'PingFang', 'PingFang';
-						font-weight: 800;
-						color: #2D7CE6;
-					}
-				}
-			}
-
-			.chekbox {
-				margin-top: 32rpx;
-				display: flex;
-				flex-wrap: nowrap;
-				align-items: center;
-
-				.check {
-					margin-right: 84rpx;
-					font-size: 28rpx;
-					font-family: 'PingFang', 'PingFang';
-					font-weight: 500;
-					color: rgba(7, 47, 90, 0.6);
-				}
-
-				.act1 {
-					font-size: 32rpx;
-					font-family: 'PingFang', 'PingFang';
-					font-weight: 800;
-					color: #2D7CE6;
-				}
-
-				.add {
-					margin-left: auto;
-					display: flex;
-					align-items: center;
-					justify-content: center;
-					width: 138rpx;
-					height: 52rpx;
-					background: #FFF2E4;
-					border-radius: 26rpx 26rpx 26rpx 26rpx;
-
+				.nocont_tip_txt {
 					font-size: 24rpx;
-					font-family: 'PingFang', 'PingFang';
-					font-weight: 500;
-					color: #F18F21;
+					font-family: Microsoft YaHei, Microsoft YaHei;
+					font-weight: 400;
+					color: #0E3B77
 				}
 			}
 
+			.nocont_button {
+				margin-top: 100rpx;
+				display: flex;
+				flex-wrap: wrap;
+				justify-content: center;
+				align-items: center;
+				width: 320rpx;
+				height: 80rpx;
+				background: #2E7CE6;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				font-size: 24rpx;
+				font-family: 'PingFang', 'PingFang';
+				font-weight: 800;
+				color: #FFFFFF;
+			}
 		}
 
-		.class_box {
-			padding: 0 32rpx;
-			display: flex;
-			flex-wrap: wrap;
-
-			.class_box_top {
-				width: 100%;
-				display: flex;
-				flex-wrap: nowrap;
-				align-items: center;
-
-
-				// justify-content: space-around;
-				.class_box_top_cont {
-					position: relative;
-					margin-right: 12rpx;
-					display: flex;
-					flex-wrap: nowrap;
-					background: #FFFFFF;
-					border-radius: 20rpx 20rpx 20rpx 20rpx;
-					padding: 14rpx 30rpx;
-					font-size: 20rpx;
-					font-family: 'PingFang', 'PingFang';
-					font-weight: 500;
-					color: rgba(7, 47, 90, 0.6);
-
-					.icon-arow_down {
-						margin-left: 8rpx;
-						font-size: 18rpx;
-					}
-
-					.dropdown_box {
-						left: 0;
-						top: 100%;
-						position: absolute;
-						width: 160rpx;
-						// height: 204rpx;
-						background: #FFFFFF;
-						box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(0, 0, 0, 0.25);
-						border-radius: 20rpx 20rpx 20rpx 20rpx;
-
-						.dropdown_item:last-child {
-							border-bottom: 0rpx solid #FFFFFF;
-						}
-
-						.dropdown_item {
-							padding: 20rpx 40rpx;
-							font-size: 20rpx;
-							font-family: 'PingFang', 'PingFang';
-							font-weight: 500;
-							color: rgba(46, 73, 117, 0.6);
-							border-bottom: 2rpx solid #F3F3F3;
-						}
-
-						.act2 {
-							color: #2D7CE6;
-						}
-					}
-				}
-
-
-
-
-
-			}
-
-			.class_card {
-				margin-top: 20rpx;
-				width: 686rpx;
-				height: 296rpx;
-				background: #FFFFFF;
-				border-radius: 20rpx 20rpx 20rpx 20rpx;
+		.student_page {
+			.student_page_top {
 				padding: 32rpx;
 
-				.class_card_top {
+				.search_box {
+					width: 686rpx;
+					height: 88rpx;
+					background: #FFFFFF;
+					border-radius: 20rpx 20rpx 20rpx 20rpx;
 					display: flex;
 					flex-wrap: nowrap;
-					align-items: center;
 
-					.class_card_left {
-						width: 84rpx;
-						height: 84rpx;
+					.check_search {
+						display: flex;
+						flex-wrap: nowrap;
+						align-items: center;
+						justify-content: center;
+						width: 148rpx;
+						height: 88rpx;
+						background: #FFF2E4;
+						border-radius: 20rpx 0rpx 0rpx 20rpx;
+						font-size: 28rpx;
+						font-family: 'PingFang', 'PingFang';
+						font-weight: 500;
+						color: #F39852;
+
+						.icon-arow_down {
+							margin-left: 8rpx;
+							font-size: 20rpx;
+						}
 					}
 
-					.class_card_right {
-						margin-left: 12rpx;
+					.serchbox {
+						// padding: 0 32rpx;
 						display: flex;
-						flex-wrap: wrap;
+						flex-wrap: nowrap;
+						// margin-top: 30rpx;
+						align-items: center;
+						justify-content: space-between;
+						width: 538rpx;
+						height: 88rpx;
+						background: #FFFFFF;
+						border-radius: 20rpx 20rpx 20rpx 20rpx;
+
+						.serchimg {
+							margin-left: 32rpx;
+
+							width: 32rpx;
+							height: 32rpx;
 
-						.class_card_right_top {
-							width: 100%;
-							font-size: 32rpx;
-							font-family: 'PingFang', 'PingFang';
-							font-weight: bold;
-							color: #072F5A;
 						}
 
-						.class_card_right_bot {
-							margin-top: 8rpx;
-							background: #EBF3FF;
-							border-radius: 4rpx 4rpx 4rpx 4rpx;
-							padding: 10rpx 20rpx;
-							font-size: 20rpx;
-							font-family: 'PingFang', 'PingFang';
-							font-weight: 500;
-							color: #2D7CE6;
+						.input {
+							// margin-left: 24rpx;
+							width: 452rpx;
+							height: 88rpx;
+							// border-radius: 30rpx;
+							// background-color: #f5f8fc;
+							// display: flex;
+							// justify-content: center;
+							// align-items: center;
+							// text-align: center;
+							font-size: 28rpx;
+							font-family: Source Han Sans CN, Source Han Sans CN-Light;
+							font-weight: 300;
+							text-align: left;
+							color: #a7b9cd;
+							letter-spacing: 1.2rpx;
+							line-height: 36rpx;
+							// padding: 0 100rpx;
+							// padding-right: 135rpx;
+							box-sizing: border-box;
+
 						}
 					}
 				}
 
-				.class_infobox {
-					margin-top: 20rpx;
+				.info_box {
 					display: flex;
 					flex-wrap: nowrap;
 					align-items: center;
 					justify-content: space-around;
-					width: 622rpx;
+					margin-top: 20rpx;
+					width: 686rpx;
 					height: 128rpx;
-					background: #F9F9F9;
-					border-radius: 20rpx 20rpx 20rpx 20rpx;
+					background: linear-gradient(179deg, rgba(255, 237, 223, 0.65) 0%, #FFFFFF 100%);
+					border-radius: 18rpx 18rpx 18rpx 18rpx;
 
-					.class_info {
+					.info_cont {
 						width: 110rpx;
 						display: flex;
-						flex-wrap: wrap;
 						justify-content: center;
+						flex-wrap: wrap;
 
-						.class_info_top {
+						.info_cont_top {
 							font-size: 20rpx;
 							font-family: 'PingFang', 'PingFang';
 							font-weight: 500;
 							color: rgba(7, 47, 90, 0.5);
+							line-height: 24rpx;
 						}
 
-						.class_info_bot {
+						.info_cont_bot {
 							margin-top: 12rpx;
 							font-size: 28rpx;
 							font-family: 'PingFang', 'PingFang';
@@ -783,141 +888,478 @@ export default {
 						}
 					}
 				}
-			}
-		}
-	}
 
-	.overlay {
-		display: flex;
-		justify-content: center;
-		align-items: center;
+				.chekbox {
+					margin-top: 32rpx;
+					display: flex;
+					flex-wrap: nowrap;
+					align-items: center;
 
-		position: fixed;
-		top: 0;
-		left: 0;
-		width: 100%;
-		height: 100%;
-		background: rgba(0, 0, 0, 0.5);
-		z-index: 100; // 设置遮罩层在上方
+					.check {
+						margin-right: 84rpx;
+						font-size: 28rpx;
+						font-family: 'PingFang', 'PingFang';
+						font-weight: 500;
+						color: rgba(7, 47, 90, 0.6);
+					}
 
-		.addstudent {
-			position: relative;
-			padding: 40rpx;
-			width: 600rpx;
-			height: 632rpx;
-			background: #FFFFFF;
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
+					.act1 {
+						font-size: 32rpx;
+						font-family: 'PingFang', 'PingFang';
+						font-weight: 800;
+						color: #2D7CE6;
+					}
 
-			.close {
-				top: 20rpx;
-				right: 20rpx;
-				position: absolute;
-				width: 20rpx;
-				height: 20rpx;
-			}
+					.add {
+						margin-left: auto;
+						display: flex;
+						align-items: center;
+						justify-content: center;
+						width: 138rpx;
+						height: 52rpx;
+						background: #FFF2E4;
+						border-radius: 26rpx 26rpx 26rpx 26rpx;
 
-			.addstudent_tit {
-				width: 100%;
-				text-align: center;
-				font-size: 36rpx;
-				font-family: 'PingFang';
-				font-weight: 800;
-				color: #2E4975;
-				line-height: 36rpx;
-
-			}
-
-			.addstudent_input_box {
-				margin-top: 40rpx;
-
-				.addstudent_input_tit {
-					font-size: 28rpx;
-					font-family: 'PingFang';
-					font-weight: 500;
-					color: #2E4975;
+						font-size: 24rpx;
+						font-family: 'PingFang', 'PingFang';
+						font-weight: 500;
+						color: #F18F21;
+					}
 				}
 
-				.addstudent_input {
-					margin-top: 16rpx;
-					width: 520rpx;
-					height: 80rpx;
+			}
+
+			.class_box {
+				padding: 0 32rpx;
+				display: flex;
+				flex-wrap: wrap;
+
+				.class_box_top {
+					width: 100%;
+					display: flex;
+					flex-wrap: nowrap;
+					align-items: center;
+
+
+					// justify-content: space-around;
+					.class_box_top_cont {
+						position: relative;
+						margin-right: 12rpx;
+						display: flex;
+						flex-wrap: nowrap;
+						background: #FFFFFF;
+						border-radius: 20rpx 20rpx 20rpx 20rpx;
+						padding: 14rpx 30rpx;
+						font-size: 20rpx;
+						font-family: 'PingFang', 'PingFang';
+						font-weight: 500;
+						color: rgba(7, 47, 90, 0.6);
+
+						.icon-arow_down {
+							margin-left: 8rpx;
+							font-size: 18rpx;
+						}
+
+						.dropdown_box {
+							left: 0;
+							top: 100%;
+							position: absolute;
+							width: 160rpx;
+							// height: 204rpx;
+							background: #FFFFFF;
+							box-shadow: 0rpx 4rpx 10rpx 0rpx rgba(0, 0, 0, 0.25);
+							border-radius: 20rpx 20rpx 20rpx 20rpx;
+
+							.dropdown_item:last-child {
+								border-bottom: 0rpx solid #FFFFFF;
+							}
+
+							.dropdown_item {
+								padding: 20rpx 40rpx;
+								font-size: 20rpx;
+								font-family: 'PingFang', 'PingFang';
+								font-weight: 500;
+								color: rgba(46, 73, 117, 0.6);
+								border-bottom: 2rpx solid #F3F3F3;
+							}
+
+							.act2 {
+								color: #2D7CE6;
+							}
+						}
+					}
+
+
+
+
+
+				}
+
+				.class_card {
+					margin-top: 20rpx;
+					width: 686rpx;
+					height: 296rpx;
 					background: #FFFFFF;
 					border-radius: 20rpx 20rpx 20rpx 20rpx;
+					padding: 32rpx;
 
-					border: 2rpx solid #DDE2EE;
+					.class_card_top {
+						display: flex;
+						flex-wrap: nowrap;
+						align-items: center;
 
-					.input {
-						// margin-left: 24rpx;
-						width: 520rpx;
-						height: 80rpx;
-						// border-radius: 30rpx;
-						// background-color: #f5f8fc;
-						// display: flex;
-						// justify-content: center;
-						// align-items: center;
-						// text-align: center;
-						font-size: 28rpx;
-						font-family: Source Han Sans CN, Source Han Sans CN-Light;
-						font-weight: 300;
-						text-align: left;
-						color: #a7b9cd;
-						letter-spacing: 1.2rpx;
-						line-height: 36rpx;
-						padding-left: 32rpx;
-						box-sizing: border-box;
+						.class_card_left {
+							width: 84rpx;
+							height: 84rpx;
+						}
 
+						.class_card_right {
+							margin-left: 12rpx;
+							display: flex;
+							flex-wrap: wrap;
+
+							.class_card_right_top {
+								width: 100%;
+								font-size: 32rpx;
+								font-family: 'PingFang', 'PingFang';
+								font-weight: bold;
+								color: #072F5A;
+							}
+
+							.class_card_right_bot {
+								margin-top: 8rpx;
+								background: #EBF3FF;
+								border-radius: 4rpx 4rpx 4rpx 4rpx;
+								padding: 10rpx 20rpx;
+								font-size: 20rpx;
+								font-family: 'PingFang', 'PingFang';
+								font-weight: 500;
+								color: #2D7CE6;
+							}
+						}
+					}
+
+					.class_infobox {
+						margin-top: 20rpx;
+						display: flex;
+						flex-wrap: nowrap;
+						align-items: center;
+						justify-content: space-around;
+						width: 622rpx;
+						height: 128rpx;
+						background: #F9F9F9;
+						border-radius: 20rpx 20rpx 20rpx 20rpx;
+
+						.class_info {
+							width: 110rpx;
+							display: flex;
+							flex-wrap: wrap;
+							justify-content: center;
+
+							.class_info_top {
+								font-size: 20rpx;
+								font-family: 'PingFang', 'PingFang';
+								font-weight: 500;
+								color: rgba(7, 47, 90, 0.5);
+							}
+
+							.class_info_bot {
+								margin-top: 12rpx;
+								font-size: 28rpx;
+								font-family: 'PingFang', 'PingFang';
+								font-weight: 800;
+								color: #2D7CE6;
+							}
+						}
 					}
 				}
 			}
+		}
 
-			.addbtn {
+		.overlay {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+
+			position: fixed;
+			top: 0;
+			left: 0;
+			width: 100%;
+			height: 100%;
+			background: rgba(0, 0, 0, 0.5);
+			z-index: 100; // 设置遮罩层在上方
+
+			.addstudent {
+				position: relative;
+				padding: 40rpx;
+				width: 600rpx;
+				height: 632rpx;
+				background: #FFFFFF;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+
+				.close {
+					top: 20rpx;
+					right: 20rpx;
+					position: absolute;
+					width: 20rpx;
+					height: 20rpx;
+				}
+
+				.addstudent_tit {
+					width: 100%;
+					text-align: center;
+					font-size: 36rpx;
+					font-family: 'PingFang';
+					font-weight: 800;
+					color: #2E4975;
+					line-height: 36rpx;
+
+				}
+
+				.addstudent_input_box {
+					margin-top: 40rpx;
+
+					.addstudent_input_tit {
+						font-size: 28rpx;
+						font-family: 'PingFang';
+						font-weight: 500;
+						color: #2E4975;
+					}
+
+					.addstudent_input {
+						margin-top: 16rpx;
+						width: 520rpx;
+						height: 80rpx;
+						background: #FFFFFF;
+						border-radius: 20rpx 20rpx 20rpx 20rpx;
+
+						border: 2rpx solid #DDE2EE;
+
+						.input {
+							// margin-left: 24rpx;
+							width: 520rpx;
+							height: 80rpx;
+							// border-radius: 30rpx;
+							// background-color: #f5f8fc;
+							// display: flex;
+							// justify-content: center;
+							// align-items: center;
+							// text-align: center;
+							font-size: 28rpx;
+							font-family: Source Han Sans CN, Source Han Sans CN-Light;
+							font-weight: 300;
+							text-align: left;
+							color: #a7b9cd;
+							letter-spacing: 1.2rpx;
+							line-height: 36rpx;
+							padding-left: 32rpx;
+							box-sizing: border-box;
+
+						}
+					}
+				}
+
+				.addbtn {
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					margin-top: 76rpx;
+					width: 520rpx;
+					height: 88rpx;
+					background: #2D7CE6;
+					border-radius: 20rpx 20rpx 20rpx 20rpx;
+
+					font-size: 28rpx;
+					font-family: 'PingFang';
+					font-weight: 500;
+					color: #FFFFFF;
+				}
+
+			}
+
+			.addtip {
+				position: relative;
 				display: flex;
 				align-items: center;
 				justify-content: center;
-				margin-top: 76rpx;
-				width: 520rpx;
-				height: 88rpx;
-				background: #2D7CE6;
+				width: 440rpx;
+				height: 138rpx;
+				font-size: 32rpx;
+				font-family: 'PingFang', 'PingFang';
+				font-weight: 800;
+				color: #2D7CE6;
+				background: linear-gradient(180deg, #C2DCFF 0%, #FFFFFF 100%);
 				border-radius: 20rpx 20rpx 20rpx 20rpx;
 
+				.logo {
+					position: absolute;
+					width: 182rpx;
+					height: 244rpx;
+					top: -244rpx;
+					left: 130rpx;
+				}
+
+				.close {
+					position: absolute;
+					top: 10rpx;
+					right: 20rpx;
+
+					width: 20rpx;
+					height: 20rpx;
+				}
+			}
+		}
+
+		.pop-up {
+			padding: 30rpx 32rpx;
+			border-radius: 20rpx 20rpx 0rpx 0rpx;
+
+			.caption {
+				font-size: 36rpx;
+				text-align: center;
+				font-weight: 800;
+				color: #2E4975;
+				padding-top: 20rpx;
+			}
+
+			.caption_top {
 				font-size: 28rpx;
 				font-family: 'PingFang';
+				color: #2E4975;
+				margin-top: 40rpx;
+
+				.imgbox {
+					width: 112rpx;
+					height: 112rpx;
+					border: 2rpx solid #DDE2EE;
+					border-radius: 50%;
+				}
+			}
+
+			.dashboard {
+				position: absolute;
+				width: 40rpx;
+				height: 40rpx;
+				bottom: 0;
+				right: 0;
+			}
+
+			.caption_input {
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				border: 2rpx solid #DDE2EE;
+				margin-top: 16rpx;
+				padding: 0 20rpx;
+			}
+
+			.caption_top_links {
+				font-size: 20rpx;
+				font-family: 'PingFang';
 				font-weight: 500;
-				color: #FFFFFF;
+				color: #2D7CE6;
 			}
 
-		}
-
-		.addtip {
-			position: relative;
-			display: flex;
-			align-items: center;
-			justify-content: center;
-			width: 440rpx;
-			height: 138rpx;
-			font-size: 32rpx;
-			font-family: 'PingFang', 'PingFang';
-			font-weight: 800;
-			color: #2D7CE6;
-			background: linear-gradient(180deg, #C2DCFF 0%, #FFFFFF 100%);
-			border-radius: 20rpx 20rpx 20rpx 20rpx;
-
-			.logo {
-				position: absolute;
-				width: 182rpx;
-				height: 244rpx;
-				top: -244rpx;
-				left: 130rpx;
+			.element.style {
+				background-color: red;
 			}
 
-			.close {
-				position: absolute;
-				top: 10rpx;
-				right: 20rpx;
-
-				width: 20rpx;
-				height: 20rpx;
+			.u-list-item u-add-wrap {
+				width: 62rpx !important;
 			}
+
+			.caption_add {
+				width: 93.1%;
+				background: #2D7CE6;
+				border-radius: 20rpx 20rpx 20rpx 20rpx;
+				text-align: center;
+				margin: 0 auto;
+				padding: 24rpx 0;
+				color: #fff;
+				margin-top: 40rpx;
+			}
+
+			.caption_class {
+				margin-top: 40rpx;
+			}
+
+			.class_body {
+				margin-top: 40rpx;
+
+				.caption_flex {
+					display: flex;
+					align-items: center;
+
+					.caption_boder_text2 {
+						font-size: 23rpx;
+						font-weight: 500;
+						color: #2D7CE6;
+					}
+				}
+
+				.select_box {
+					.class_ys:nth-child(3n) {
+						margin-right: 0;
+					}
+
+					.class_ys {
+						margin-top: 20rpx;
+						margin-right: 20rpx;
+						width: 215rpx;
+						height: 96rpx;
+						display: flex;
+						justify-content: center;
+						align-items: center;
+						padding: 20rpx;
+						// width: 215rpx;
+						height: 96rpx;
+						background: #FFFFFF;
+						border-radius: 20rpx 20rpx 20rpx 20rpx;
+						border: 2rpx solid #F0F0F0;
+
+						.class_tp {
+							width: 56rpx;
+							height: 56rpx;
+							margin-right: 12rpx;
+						}
+
+						.class_wz {
+							width: 125rpx;
+							font-size: 28rpx;
+							font-family: 'PingFang';
+							font-weight: 500;
+							color: #072F5A;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+						}
+
+					}
+
+					.caption_boder {
+						position: relative;
+						width: 96rpx;
+						height: 96rpx;
+						background: #FFFFFF;
+						border-radius: 20rpx 20rpx 20rpx 20rpx;
+						border: 2rpx solid #DDE2EE;
+						margin-top: 17rpx;
+
+						.class_tp_image {
+							position: absolute;
+							top: 28rpx;
+							right: 32rpx;
+							bottom: 0;
+							width:
+								28rpx;
+							height:
+								28rpx;
+						}
+
+					}
+				}
+
+			}
+
+
 		}
 	}
-}</style>
+</style>
\ No newline at end of file
diff --git a/pages/compoents/pages_my.vue b/pages/compoents/pages_my.vue
deleted file mode 100644
index 9ccacc0..0000000
--- a/pages/compoents/pages_my.vue
+++ /dev/null
@@ -1,38 +0,0 @@
-<template>
-	<view class="view_body">
-		<u-navbar :is-back="false" title='学生' title-color="#000" :border-bottom="false" :background="true"
-			id="navbar">
-		</u-navbar>
-		<view class="nostudy">
-			<view>
-				<image src="http://tmp/HR4A5dtvNboB4502c7be9965e9ff4c184685e3fb36d9.png" mode=""></image>
-				<text>暂无学生，快去添加吧！</text>
-			</view>
-			<view>
-				<u-button type="primary">主要按钮</u-button>
-			</view>
-		</view>
-		
-	</view>
-</template>
-
-<script>
-	export default {
-		data() {
-			return {
-				
-			}
-		},
-		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	.view_body{
-		height: 1624rpx;
-		background: linear-gradient(180deg, #E1EEFF 0%, #FFFFFF 100%);
-	}
-
-</style>
diff --git a/pages/index/index.vue b/pages/index/index.vue
index bafc371..7882b02 100644
--- a/pages/index/index.vue
+++ b/pages/index/index.vue
@@ -1,55 +1,468 @@
 <template>
-	<view class="content">
-		<u-navbar title="雅思口语" :is-back="false" title-color="#ffffff" :border-bottom="false" 
-			id="navbar">
-		</u-navbar>
-		<image class="logo" src="/static/logo.png"></image>
-		<view class="text-area">
-			<text class="title">{{title}}</text>
+	<!-- 头部代码 -->
+	<view class="view_by">
+		<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="content_box">
+					<view class="view_text">32</view>
+					<view>已完成人数（人）</view>
+				</view>
+				<view class="content_box">
+					<view class="view_text">90%</view>
+					<view>已完成作业正确率</view>
+				</view>
+			</view>
+			<!-- 作业完成情况 -->
+			<view class="echarts_bar">
+				<view>
+					<text>作业完成情况</text>
+					<view class="echarts_text">
+						<view>本周</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>
+		
+				</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>
+			
+			<view class="box_rate">
+				<view class="rate_item">
+					<view class="number">
+						21
+					</view>
+					<view class="text">
+						完成人数
+					</view>
+				</view>
+				<view class="rate_item">
+					<view class="number">
+						6
+					</view>
+					<view class="text">
+						平均成绩/分
+					</view>
+				</view>
+				<view class="rate_item">
+					<view class="number">
+						80%
+					</view>
+					<view class="text">
+						作业正确率
+					</view>
+				</view>
+			</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>
+		
+			
 		</view>
 	</view>
+
 </template>
 
 <script>
+	import * as echarts from '@/uni_modules/lime-echart/static/echarts.min'
+	import LEchart from '@/uni_modules/lime-echart/components/l-echart/l-echart.vue';
 	export default {
+		components: {
+			LEchart
+		},
 		data() {
 			return {
-				title: 'Hello'
+				flag:false
 			}
-		},
-		onLoad() {
-
 		},
 		methods: {
+			async initChart() {
+				let _this = this
+
+				const option = {
+					xAxis: {
+						type: 'category',
+						data: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun']
+					},
+					yAxis: {
+						type: 'value',
+						boundaryGap: ['10%', '20%',]
+					},
+					series: [{
+						data: [120, 200, 150, 80, 70, 110, 130],
+						type: 'bar'
+					}]
+				}
+
+				const chart = await this.$refs.chart.init(echarts);
+				chart.setOption(option)
+				//return chart
+			},
 
 		}
 	}
 </script>
 
-<style>
-	.content {
-		display: flex;
-		flex-direction: column;
-		align-items: center;
-		justify-content: center;
-	}
+<style lang="scss" scoped>
+	.view_by {
+		background: linear-gradient(180deg, #E1EEFF 0%, #FFFFFF 100%);
+		padding: 32rpx;
+		
 
-	.logo {
-		height: 200rpx;
-		width: 200rpx;
-		margin-top: 200rpx;
-		margin-left: auto;
-		margin-right: auto;
-		margin-bottom: 50rpx;
-	}
+		.header_button {
+			display: flex;
+			justify-content: space-evenly;
+			align-items: center;
 
-	.text-area {
-		display: flex;
-		justify-content: center;
-	}
 
-	.title {
-		font-size: 36rpx;
-		color: #8f8f94;
+			.custom-style {
+				width: 180rpx;
+				height: 72rpx;
+
+
+			}
+
+			.active {
+				background: #2D7CE6;
+				color: #fff;
+				box-shadow: inset 0rpx 8rpx 16rpx 0rpx rgba(255, 255, 255, 0.35);
+			}
+
+		}
+
+		.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 {
+				display: flex;
+				flex-direction: column;
+				align-items: center;
+
+			}
+
+		}
+
+		.echarts_bar {
+			width: 686rpx;
+			height: 459rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+			opacity: 1;
+			margin-top: 32rpx;
+			padding: 32rpx;
+
+			view {
+				display: flex;
+				justify-content: space-between;
+
+				text {
+					font-size: 28rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 800;
+					color: #2E4975;
+				}
+
+			}
+
+
+
+		}
+
+
+
+		.box_rate {
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			padding: 30rpx;
+			background: linear-gradient(179deg, rgba(255, 237, 223, 0.65) 0%, #FFFFFF 100%);
+			border-radius: 18rpx 18rpx 18rpx 18rpx;
+
+			.rate_item {
+				flex: 1;
+				display: flex;
+				flex-direction: column;
+				justify-content: center;
+				align-items: center;
+
+			}
+
+			.number {
+				font-size: 28rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 800;
+				color: #2D7CE6;
+			}
+
+			.text {
+				font-size: 20rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				color: rgba(7, 47, 90, 0.5);
+			}
+		}
+
+		.date {
+			font-size: 24rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 800;
+			color: #2E4975;
+			padding: 30rpx;
+		}
+
+		.view_botton {
+			display: flex;
+			align-items: center;
+			justify-content: space-between;
+			height: 124rpx;
+			background: #fff;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+			margin: 20rpx 0rpx;
+			padding: 24rpx;
+
+			.view_spoken {
+				display: flex;
+				align-items: center;
+
+				.view_span {
+					display: flex;
+					flex-direction: column;
+					margin-left: 16rpx;
+				}
+
+				.view_span text:nth-child(1) {
+					font-size: 28rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: bold;
+					color: #072F5A;
+					margin-bottom: 7rpx;
+
+				}
+
+				.view_span text:nth-child(2) {
+					font-size: 20rpx;
+					font-family: PingFang SC, PingFang SC;
+					font-weight: 500;
+					color: rgba(46, 73, 117, 0.5);
+					margin-bottom: 7rpx;
+				}
+			}
+
+			.view_text2 {
+				display: flex;
+				flex-direction: column;
+				text-align: right;
+
+				view .text2 {
+					color: #F18F21;
+					font-size: 27rpx;
+					font-weight: 800;
+					margin-left: 7rpx;
+				}
+
+			}
+
+
+
+			.view_text2 view {
+				font-size: 20rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				color: #F18F21;
+			}
+
+
+			.view_text2 text {
+				font-size: 20rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 500;
+				color: rgba(7, 47, 90, 0.4);
+			}
+
+			image {
+				width: 76rpx;
+				height: 76rpx;
+			}
+			
+		}
+		.echarts{
+			width: 300rpx;
+			height: 600rpx;
+			margin-top: -100rpx;
+		}
+		.deer{
+			display: flex;
+			align-items: center;
+		}
+		.deer_images{
+			width: 145rpx;
+			height: 245rpx;
+			margin-left: 15rpx;
+		}
+		.r_image{
+			width: 16rpx;
+			height: 16rpx;
+			line-height: 16rpx;
+			margin-left: 8rpx;
+		}
+		.deer_button{
+			display: flex;
+			justify-content: center;
+			align-items: center;
+			margin-top: 19rpx;
+			width: 160rpx;
+			height: 56rpx;
+			font-size: 20rpx;
+			font-weight: 500;
+			color: #FFFFFF;
+		
+			background: #2D7CE6;
+			border-radius: 86rpx 86rpx 86rpx 86rpx;
+			
+		}
+		.deer_right{
+			margin-left: 20rpx;
+		}
+		.deer_text{
+			font-size: 28rpx;
+		
+			font-weight: 500;
+			color: #627698;
+		}
+		.operation{
+			height: 459rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+		}
+		.zu_image{
+			width: 172rpx;
+			height: 162rpx;
+			
+		}
+		.zu_text{
+			font-size: 24rpx;
+			font-weight: 400;
+			color: #0E3B77;
+			margin: 20rpx 0rpx 50rpx 0rpx;
+		}
+		.zu_footer{
+			// padding: 32rpx 0rpx;
+		}
+		.zu_zp{
+			display: flex;
+			flex-direction: column;
+			align-items: center;
+			padding: 72rpx;
+		}
+		
 	}
 </style>
diff --git a/pages/pages_index/teacher_index.vue b/pages/pages_index/teacher_index.vue
deleted file mode 100644
index a0dc876..0000000
--- a/pages/pages_index/teacher_index.vue
+++ /dev/null
@@ -1,105 +0,0 @@
-<template>
-	<view class="view_dingbu">
-		<view class="top_box">
-		
-			<view :class="thisTop==1?'top_box_active':'top_box_item'" @click="checkTop(1)">首页<view class="line"
-					v-if="thisTop==1"></view>
-			</view>
-			<view :class="thisTop==2?'top_box_active':'top_box_item'" @click="checkTop(2)">学生<view class="line"
-					v-if="thisTop==2"></view>
-			</view>
-			<view :class="thisTop==3?'top_box_active':'top_box_item'" @click="checkTop(3)">我的<view class="line"
-					v-if="thisTop==3"></view>
-			</view>
-		</view>
-		<view class="content">
-			<home v-if="thisTop==1"></home>
-			<my v-if="thisTop==2"></my>
-			<min v-if="thisTop==3"></min>
-		</view>
-	</view>
-</template>
-
-<script>
-	import home from '../compoents/pages_home.vue'
-	import min from '../compoents/pages_mine.vue'
-	import my from '../compoents/pages_my.vue'
-	export default {
-		components: {
-			home,
-			min,
-			my,
-		},
-		data() {
-			return {
-				thisTop: 1,
-				partId: 350,
-				infolist: '',
-			}
-		},
-
-		methods: {
-
-			checkTop(i) {
-				this.thisTop = i
-			},
-		}
-	}
-</script>
-
-<style scoped lang="scss">
-	* {
-		box-sizing: border-box;
-	}
-		
-
-	.top_box {
-	position: fixed;
-	bottom: 0;
-		width: 100%;
-		line-height: 84rpx;
-		background-color: #fff;
-		display: flex;
-		justify-content: space-around;
-
-		.top_box_item {
-			position: relative;
-			color: #3B5878;
-			font-weight: 800;
-			font-size: 28rpx;
-
-			.line {
-				position: absolute;
-				bottom: 0;
-				left: 50%;
-				transform: translateX(-50%);
-				width: 40rpx;
-				height: 4rpx;
-				background: #3996FD;
-				border-radius: 2rpx 2rpx 2rpx 2rpx;
-			}
-		}
-
-		.top_box_active {
-			position: relative;
-			color: #3996FD;
-			font-weight: 800;
-			font-size: 28rpx;
-
-			.line {
-				position: absolute;
-				bottom: 0;
-				left: 50%;
-				transform: translateX(-50%);
-				width: 40rpx;
-				height: 4rpx;
-				background: #3996FD;
-				border-radius: 2rpx 2rpx 2rpx 2rpx;
-			}
-		}
-	}
-
-	.content {
-		width: 100%;
-	}
-</style>
\ No newline at end of file
diff --git a/pages/user/user.vue b/pages/user/user.vue
new file mode 100644
index 0000000..6247059
--- /dev/null
+++ b/pages/user/user.vue
@@ -0,0 +1,279 @@
+<template>
+	<view class="view_body">
+		<view class="view_body_images">
+			<u-navbar :is-back="false" title='我的' title-color="#000" :border-bottom="false" :background="true" id="navbar">
+			</u-navbar>
+			<view class="view_header">
+				<view>
+					<view>
+						<image src="https://file.langsi.online/yasiimg/web/static/uxaCSTBJAo7SkGHtheRR" mode=""></image>
+					</view>
+					<view class="view_images">
+						<text>LUlY老师</text>
+						<u-button type="warning" size="mini">认证教师</u-button>
+					</view>
+				</view>
+				<view class="view_sniht">
+					
+				</view>
+			</view>
+			<view class="view_reative">
+				<view>
+					<text>学生人数</text>
+					<text>320</text>
+				</view>
+				<view>
+					<text>安排题数（道）</text>
+					<text>4300</text>
+				</view>
+				<view>
+					<text>总完成度</text>
+					<text>43</text>
+				</view>
+				<view>
+					<text>今日完成度</text>
+					<text>43</text>
+				</view>
+			</view>
+			<view class="view_centre">
+				<view>
+					<view class="view_centre_images">
+						<image src="https://file.langsi.online/yasiimg/web/static/uif1JIGCJXguCEO3Mdqx" mode=""></image>
+					</view>
+					<text>作业安排</text>
+				</view>
+				<view>
+					<view class="view_centre_images">
+						<image src="https://file.langsi.online/yasiimg/web/static/u4BHxtTvVDGUDFaKPHz2" mode=""></image>
+					</view>
+					<text>学生管理</text>
+				</view>
+				<view>
+					<view class="view_centre_images">
+						<image src="https://file.langsi.online/yasiimg/web/static/uPqAU9hXDLOa1zrX4xJX" mode=""></image>
+					</view>
+					<text>班级管理</text>
+				</view>
+				<view>
+					<view class="view_centre_images">
+						<image src="https://file.langsi.online/yasiimg/web/static/uWHKotvBvHfXxwFzHiMP" mode=""></image>
+					</view>
+					<text>切换题库</text>
+				</view>
+			</view>
+			<view class="view_footer">
+				<view>
+					<view class="view_icon">
+						<u-icon name="question-circle" color="#2D7CE6"></u-icon>
+					</view>
+					<view class="wz">
+						<view class="">
+							帮助中心
+						</view>
+						<u-icon name="arrow-right"></u-icon>
+					</view>
+				</view>
+				<view class="icon">
+					<view class="view_icon">
+						<u-icon name="question-circle" color="#2D7CE6"></u-icon>
+					</view>
+					<view class="wz">
+						<view class="">
+							关于我们
+						</view>
+						<u-icon name="arrow-right"></u-icon>
+					</view>
+				</view>
+				<view class="icon">
+					<view class="view_icon">
+						<u-icon name="question-circle" color="#2D7CE6"></u-icon>
+					</view>
+					<view class="wz">
+						<view class="">
+							退出登录
+						</view>
+						<u-icon name="arrow-right"></u-icon>
+					</view>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.view_body {
+
+		height: 100vh;
+		background: linear-gradient(180deg, #E1EEFF 0%, #FFFFFF 100%);
+		border-radius: 0rpx 0rpx 0rpx 0rpx;
+		padding: 96rpx 34rpx;
+
+		.view_body_images {
+			height: 347rpx;
+			background-image: url('https://file.langsi.online/yasiimg/web/static/u4sEWPTO8OQ8hzPMUdVX');
+			background-size: cover;
+			background-position: center;
+
+		}
+
+		.view_reative {
+			z-index: 100;
+			height: 154rpx;
+			display: flex;
+			justify-content: space-evenly;
+			align-items: center;
+			background: linear-gradient(180deg, #E1EEFF 0%, #FFFFFF 100%);
+			// background-color: #FFFFFF;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+			border: 2rpx solid #FFFFFF;
+			margin-top: 32rpx;
+
+			view {
+				display: flex;
+				justify-content: center;
+				align-items: center;
+				flex-direction: column;
+			}
+		}
+
+		.view_reative view text:nth-child(1) {
+			height: 32rpx;
+			font-size: 20rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 500;
+			color: #2E4975;
+			line-height: 32rpx;
+		}
+
+		.view_reative view text:nth-child(2) {
+			height: 46rpx;
+			font-size: 36rpx;
+			font-family: PingFang SC, PingFang SC;
+			font-weight: 800;
+			color: #2E4975;
+			line-height: 47rpx;
+		}
+
+		.view_header {
+			display: flex;
+			justify-content: space-between;
+			align-items: center;
+
+			view {
+				display: flex;
+			}
+
+			image {
+				display: flex;
+				justify-content: space-between;
+				width: 124rpx;
+				height: 124rpx;
+				border-radius: 803rpx 803rpx 803rpx 803rpx;
+
+			}
+		}
+
+		.view_images {
+			display: flex;
+			flex-direction: column;
+			margin-left: 20rpx;
+
+			text {
+				height: 58rpx;
+				font-size: 32rpx;
+				font-family: PingFang SC, PingFang SC;
+				font-weight: 800;
+				color: #2E4975;
+				line-height: 58rpx;
+			}
+		}
+
+		.view_centre {
+			display: flex;
+			justify-content: space-evenly;
+			align-items: center;
+			height: 150rpx;
+			background: #FFFFFF;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+			overflow: hidden;
+			margin-top: 50rpx;
+
+			view {
+				display: flex;
+				flex-direction: column;
+				// text-align: center;
+				justify-content: center;
+				align-items: center;
+			}
+
+			text {
+			font-size: 24rpx;
+			font-weight: 700;
+			color: #20314C;
+			}
+
+			.view_centre_images {
+				width: 40rpx;
+				height: 40rpx;
+				margin-bottom: 12rpx;
+
+			}
+		}
+
+		.view_footer {
+			width: 686rpx;
+			margin: 20rpx auto;
+			background: #fff;
+			border-radius: 20rpx 20rpx 20rpx 20rpx;
+			padding: 32rpx 40rpx;
+
+			view {
+				display: flex;
+
+			}
+
+			.wz {
+				width: 550rpx;
+				display: flex;
+				justify-content: space-between;
+				border-bottom: 2rpx solid #EEEEEE;
+				padding-bottom: 34rpx;
+
+			}
+
+			.view_icon {
+				width: 35rpx;
+				height: 40rpx;
+			}
+
+			.icon {
+				margin-top: 20rpx;
+			}
+			
+
+		}
+		.view_sniht{
+			width: 35rpx;
+			height: 75rpx;
+			// background-color: red;
+			background: url('https://file.langsi.online/yasiimg/web/static/uv2PZzLhKjm907ZBqqXn') no-repeat center;
+			background-size: 100% auto;
+		}
+	
+
+	}
+</style>
diff --git a/pages_teacher/teacher_teachers/teacher_addOperation.vue b/pages_teacher/teacher_teachers/teacher_addOperation.vue
index 140f900..e258d07 100644
--- a/pages_teacher/teacher_teachers/teacher_addOperation.vue
+++ b/pages_teacher/teacher_teachers/teacher_addOperation.vue
@@ -312,7 +312,7 @@
 		onLoad(option) {
 			uni.removeStorageSync('selectedClassInfo');
 			uni.removeStorageSync('selectedStuInfo');
-			// uni.removeStorageSync('selectforwork');
+			uni.removeStorageSync('selectforwork');
 			this.classinfo = JSON.parse(decodeURIComponent(option.classinfo))
 			// let classinofs = [{
 			// 	name: '阅读5班',
diff --git a/static/logo.png b/static/logo.png
deleted file mode 100644
index b5771e209bb677e2ebd5ff766ad5ee11790f305a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 4023
zcmaJ^c|25Y`#+XyC`+<S#)vkI!H8jOV;Mylds4<23}$I&ETd>5OUafkYqmlSEl)+V
zC53EJB$S<mhJ<A49X<8DzdxSedp>8m@9Vz4*Y&-Yb3W(3Y;(d~fM1#)0003Cv<Zgu
zL~mW7?Et_9`5e&&0Q@Kd3T0z~LV+n%vKPT04*<daId(zL$t&XeLo0Y8N8`Tv`|17{
z0f+(%)GX{$AbbtLUJ@2Dd=VML?<gv^I~(oL7~aE=&WRb#J6P#$bS36wtivhoFLHy$
zk3vJ(b8~C&)~ctnr`9_dokGmrB1%b<1-^g|CQ=X4CzoK2ZfvPxa*LsddBMVytqtDW
zUI4&64<k5?e$QZ?>n<7K1}HtM`$d{YenwQ;C^-S(Bw!dKGPRQ{5d$=<+Bb^=&62=9
zyT3g7ffNAnXPh^N0JjBz*>4v5+kn2(<Ut9buV8N}2#DhXG7g&W=Qex_xI0|LD0A00
z0C_A!h$?S=ITzFAvAQ`ovt}C*81I}YWathsGmMqn0I)VUfZDgGod;~mlc&~QH(Yv#
z5?P7n0_s~++tZJCYlv2+zLpO9IzK!rKic4b-xw=#NZ5;S9Fm=$rLYG*#bepA3jm~7
zyPj=o8zfFmj*m=wP5HCGy(rl9n<qo`<rjuFtFLnN0>URc+5KlGCVF`&O<eZ^>ikMw
zfqqB8XK2+;V}LL3B>(G>)mVo1y5YXue4A!H*}eQbcg`t#<kzT;#p?gm7$FbGhAnee
zHwQxIfwP&08D;f_5gTW*q`-1a{8THiF^se_rLfr)d0`{|P}ivD{Zq<fR~DQvSK2_V
znix+oNhb0wsiPv(7t|Nz(l+>#g9HFply&`y$2%Ui`qzhj;o^=JbnXrW48s;xu1fDr
z0))La)fp=QkX*N#V0eTJXiqO11AyvJlBY^iBrIQo0Kg>g;^BKnJ9a%2Wz`F2Ka;Jl
zm*B>3H!<9`zg|z+c>6eWFMqydnvs-!J))2I(LEmNyxo~2!VjOpv<0SyMNVCup-60Z
zm&|RDtd8R2HEIU!!OA0Ic6-G4K{`MZ8S%UjEL!s#vj{vLBWeqI(M&DkE;aT|aziV8
zRiTRN#GNwykvPx{R==`-rP>^pa`AyJ&s**Q!zU$j(pO&Q(YolGLT=2o0>3Wlhx?Gs
z#|6b*$3F$ofzT`QIA#}2(Cg}Z?5V5KrtX)WrInh*aTCsP#{@V|*7<0lm`r^xmJQm^
z9n0J^3p#yCxWPX>G11)F(iv5vIIHkbqzdH37jX&JZ~&5AV*OAtL}axw*aLAt(b<fp
z^hJK3e6Hf@1A=?bB%}8Wwp<%O!7s0vsBW>-!Vf)wRw=S8((e`~WLqlDBobRbj)NXB
zS>W`fibSDA>uYN*&&Ml75iep!E%^%eV~SElj=}K;6TCNXs2gYG-L`En&3y~H9fP=W
z(t?;5Xalv2F5ROUkg3?7C5~z>QYq|tok{Q}toT5u=~a9mBKDc4zfSM=`?O<vYC7Uu
z&@O=}fruuw$3ZDSsdG}rk`+?W49i>F-lS(V+pE1(m&x$HE_9vj;Cy)b@OiPMS0bs1
zRL9h?)T!I{4m1aY9>(pR_IDhF?wocEy=CU`m(5ry-&^rJJ*Bb^PfNARJ1{|*1e;FV
zGljKhHo|}41Rg|1n&m~I3+-_gFQww-#b2u97o3fIsg67|%6`|aJX{~F&RPa;TayWd
zp0l(=(QbROypp_fCeOBW3BJ5PJg@UU`&fs3hd{?U6&@7>mHWNEWnN`rWk>r%`fK|=
z=BRVxb2I(y07{Nwj&jZtf{0iN;H%QAvaO1&8VKn8tp5f#!<gn<dbK1t{h`ZziTJH>
zN#ZlRm)#|IR8144l_=#8)5guWCE`B$T_;p_&0iWR+1=_>mDK1{*kw_8pi=2ewD%Z1
zSVG^6Mc(Vd()@@Y^wYz75Yz{X8jD_x*B)w5@yqn8>U#Kw-qzNvJjm)}wamur^kn<x
zVr$=553I*U-ZagAaV%CVwkfSY?R@LDG^?}~)^$gHM~35)<2#l`@2MH(8Dg)Kzm1Gj
z)~+l>R_o)EvaGVkz%1gB=%{GIq3%OVcBFpT?D{PKZ079tIh|$fvf?svxl^`nuZV1~
zE?xILl^)O*=ufGhDH_pyUfNjteA>xd#yg*uvj~^Cbv&_EBt0-)!j4#crI>Uhq&0Oy
z`b$;!qc=;1Sx>VD%ia^;erQ9!2)(mrrJ5zv;`SWLHu^Td;yik`Z7ioatGHn?aSD1m
z@U+Y6wVHj_e`PD>_Noz^2O3?6Yg*5_BlMB@A05*?`Y-jlZ-m^4uDw+Y8A8@7g!P7H
zgzZ?*UDN&1x{>g`ZiMkweBs14cdln#6I?YHr7!-)<HsY%o56c?2Yg%Hwx`>nyY$73
zckv0h$WfEY^%7rYR&g4G-pZL>Vy{3sVkc#OsI@6s?(5whAJqvO5)LEZTD6>Rdkl&h
zHusOIlp{!GNUVm69y+XkTlKT;Lp%Ce`igQdYushcyC!}iq4eq#-2van)Ie{RuRq2g
zH=9+-th`-$F*y3W=|Z{)eb0Wrxy$2?eT~S=V>Iq5|4fbS@l5+PI<9<Tu;7Wr<a9@C
zZjhb}+$Hh6cI0)D^alnL5ny8*sHF8oG094H&(}*?k=CZQ1#tzo_bV!o>0O)5aZFv-
z{-7I*`r#90Z5HrSgU=dsgpnk5?TNyom7_`TM^@+iv+q@OQnFLB3o!zOw1-FDsZ|`T
zu=YA~Bw1jbF-d$SlN|kOWn5vEwm2Z>A8FZD_z+WWBPebOEjbeGD(M<riLODPe5*0!
zwfT8fVQ0Ab`I^LgHkJ4O>Z=TPSr~@YnLZU)h_#alQiZu;syu@U^WCAXKCKVZHf%<n
zF%DmS8G~QrF%jK2Z=#NbJ87ntrnIz@%D<g_f)m50dOEOu(|cSUFC3OgJ;S1~O3J_A
zGpn2&bvkjT=ll|b*x&#0SjDTk8T3ri42iYkQg`=QjjvJ9>!^8wGMR<A37Ip*V;|}H
zA-+rT?GM{uwe!HS@HyAE$E<;``C5g`AvqV^S{*ma?o`yiSL*Mr`w(<)Q7}SQO!p%@
zWw!d!kzgmk8q?4vQumke4++v9GF5exVIL~ZgREcVCY-x@ZpX4Id&ZYe_8+`kSNDLA
zh|!AMhel8)vY6!lthvmfN0gI?1sjYeo*fvvb^hF#&8Pg1=Y!ANhcYfyEP-awj3eEM
zx&W3+Au$h`U&H=%wJ=Baw5)k;#m_J{Yz!CB1W$0v&C5B6Tv#0sPaZ4wEY8h2VSs#_
zG00f4T+i@xvvsTSMs?;INYKAnR-9RBS^PMa;5J`P`370>7*MP@UWP13nuk#~M$mU%
z$uszs);TA=a{4!`8Qm`Sn+rdD>w9SLzQ0p-yTPboznqn+ASr#=Td7#J^gVESP9li^
zi{+qONJ8-4_1gZ8&pUnyeZKH;^FF?wIQ-qc-o5j=ix69oFFJQK<>#B|k#6%g^Bx5=
zg}8(qIXM{t>6)*e9mylb4~qA6z6x{v$(W(tnHt&{T|3_Cyxupzb2YZJuAEW2NM+wC
zy^Cm4Xp*b$U?3N6t(SESgt9ByRYOfRav2BL4L5BTyMExBieFo==ue&BT!*e)T3lo5
zDDLL`TT0PQo#}RDFM1G`iU*85$sTyH1rh6w$KbJ^jI%9xJpkZ2Ot5#RJ6l;IaAcw?
zc1uS!m`LHE0YJ|nn1aRm;pt!xyf=Y_gs`91LBIr0B*Y1BrDjDz;e80`5Gvj-<b*vg
z#1E(A2{F(I>jfh?28eh%7933UC(#hWNXRd{2+nv*426JysnGq9kiSVeTiJk7WGWsE
zSJhI%!8FvtM|D(Ta2<7RO=YmU8cYkSrU`}VsK7K3oKsT`{QH1#yiq;95Ev7)-@Z6A
zB*ceKry!uvpr9btAPrSA)tiIW(SfR|L)Fz)I2tN628oUhRw2<8{#Y=<({NM*g-#%o
zz*`ov9^?Qz62f8ncL+p^mDN9nNwnXI;-m~3jHN(fs%lUoaVxH0+B7-_|6dyas!g+J
zQ1DO;o<<I!;yCs2QuqVr<nDhv+EV1OL70$n0Yp5BZefCia3rdp1W$ySnUSXYQ5gKF
z2}%nFGu1XWGtxFeX`33OOf}(ZX0Sh43lfcvCE@UYu!R3&HUB3TfuiEEbTZYRO!og%
zJsTe~olNr~Q^1^^3#VFeRXF&d6&6PzZHW(UrT8~vJe3fL_cWuDiQr#3LJ<Cihp~~i
znUV2P6o&`=-(&b2>-jJ7|Hhj9zgQ@T40Nl&|EJ)8M4T?#8vfJ1oXI~g0G`C@dMc;A
zjqo=rI2*RN7A8ja!Tlbd0QX!*+E1x@K*^ZD{)%J_pe^QRp=+j?jCO1cZ<W;+n{Ip1
za2o_>N?ryPlN&29$7&Ac>xMM*DwQ*NxtIV%NlmI`lJr2JVZ!|SUM)s{m5-r-hrCim
zGEunpTX?76P{|0K32-Ym!wnJFjcNAROWZ-AL8+J1F_-(QHNzMCON{8s2|iO0D*vNr
zQhflINtwvCi<$Z|n(_I*HbSmD?h6-!bQZ5=hQ8L&m)|I~)%u)gyCW_QRg`w5P~OC1
z%uCbu%`2nB5zR=>{took!+yKEDi`b>pzAf)^KDGtUM8R*t#G@mH2=PKe4(Ipz-y*c
zc~Kzl;GA)s+53_RGg-}F1`$4QjX29!BLu$pn{&KmMu86HO}Y2@q{Jb7v=N}{+PQWx
zHF2LIb9qiO+DI~r+eb9ubK7oh6KFdUL6e;9wKv_RvXh$HuqHw)inh2kQGM>}%G4V%
zmjkEYsw}?{m%gW>#P7wTXwk}cZO--qydYul`!3w~l(JgX@=yG7|6z{6kO^>c^P;zI
zAmO}-iEA~6%U7@PbJN4EXW!v;|5owjl2$w4ZZqafWPCshmRxS}7Zwlg(*rDz;hg}s
SYs}WS&%*SCNx89m_<sQGK?UOg

diff --git a/static/tabbar/chuanti-act.png b/static/tabbar/chuanti-act.png
new file mode 100644
index 0000000000000000000000000000000000000000..7f69dcc0af3897b5ca7e9fa7f6b2e33858e4a964
GIT binary patch
literal 532
zcmV+v0_**WP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$&PhZ;R5(w)l)r0JQ545N=e`7=Nq-D!6)H+Wq!zTa)G9hTh>~{p4{&kNj%IT4
z$LL%fMQjH_1gE4>Iyuxqh$dr~N(;|GAx0C@<h^&~C0Jk6_L)ZLneM&Z^SR%9zvmv&
z<;e_w?GfrFI8um9EV+nlKbF}~l|QMX*|AO3J98w~ZnjmzI(bKK=ktGoxr^WN-BYav
z#aAeaQ0?jf6D#8-@5$Wf!hyh&dwPA|c~jl;&P}L_bOlw)2u(})X~#@PG^FrLeY*J2
zSse8-eO<x!ZPNF9fcg5B;sa-C6zC18`r-J1aRV2IV9=)J)cQ7T*Z%PkQ3|I<;6>VC
z#{=_WZ9~aqgHc380b>Tv4np6Fw!*C+P_F-n!k%1?QaC;gPj5*}VK{y@;Q6Xja1J;!
z3OLdacPE7YPT&r_D=3@0zc&Ov*0M<@AU!4wbSMm8wCE@wH`=DPdqGgx+3~Mv^Kvi`
z|CIA7n7=M0;)mO__DxyJL&FOLm#42G%wZ&%tEByB&XfDVfMsZ@3(DuPs5PP5=y=2M
z=9z`Yq$SphK&t1m2`AooxpN8PIaTec;Tqxfo}PE}mD)DU3jS4rh|BKR?<y4)^Y%9)
W%^Y>1=7v-N0000<MNUMnLSTY#hy33F

literal 0
HcmV?d00001

diff --git a/static/tabbar/chuanti.png b/static/tabbar/chuanti.png
new file mode 100644
index 0000000000000000000000000000000000000000..54c601543823bc1e784c2ff4fb97aaad37ea8820
GIT binary patch
literal 466
zcmV;@0WJQCP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$j7da6R5(w)l)+0IK@`S+ZzhS5EnVqNibW9HdlO18-g@t~Lcwc~^)KnEe@nrD
z_E5-z+ne{cBDM!}P{CxQJD((ylC4>FBXnR+^WJa1Z{ECTNs@jx_#nwqVVNOJ--bi?
zeto@tFiEwfyLSor3ar1OW(1GDX}@momH}nrIKb(BE^v;#R(G4NRx6nalyndj&b{+5
z0J{%#D&{hXt%7BVePG3mM-^e$;bz+fpuxUi1?B`o=YIkxPpB&H%M~`8P1c^TvarxV
z5{HLJ{66|~7yNe1zSh9}^%u=AG8DqYfOlojI4@V|yl45@GI9L4ke6jce*XAHHt5f~
z?{?tgVoal6y8%2oJtO3KHQ*d}M=9kB%{ihdqFyVX8~s7XpkJ^)2KIm_<Ib7t6z@Gt
zPnT#$(QL62z2n|^Ppyt6$=*8$8=w*KEChQyX}wWloGTfVf;{B^ex*)fq9n=p77AY<
z)XUR)yWRAqGwn#k^Att!rJyiP(>TxVBho8jmFA(D24J7A0518?oc1)~c>n+a07*qo
IM6N<$f^~`4fB*mh

literal 0
HcmV?d00001

diff --git a/static/tabbar/class-active.png b/static/tabbar/class-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..71bf564373c1e844d114c1c31431355d71159c90
GIT binary patch
literal 2538
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
A6#xJL

literal 0
HcmV?d00001

diff --git a/static/tabbar/class.png b/static/tabbar/class.png
new file mode 100644
index 0000000000000000000000000000000000000000..24cf9cd72a7720eac8d3917f44376316c873a24a
GIT binary patch
literal 1735
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

literal 0
HcmV?d00001

diff --git a/static/tabbar/course-active.png b/static/tabbar/course-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..71bf564373c1e844d114c1c31431355d71159c90
GIT binary patch
literal 2538
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
A6#xJL

literal 0
HcmV?d00001

diff --git a/static/tabbar/course.png b/static/tabbar/course.png
new file mode 100644
index 0000000000000000000000000000000000000000..24cf9cd72a7720eac8d3917f44376316c873a24a
GIT binary patch
literal 1735
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

literal 0
HcmV?d00001

diff --git a/static/tabbar/home-active.png b/static/tabbar/home-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..06bc184ef51574c00e48b02271b6cc6e0254ddc8
GIT binary patch
literal 4385
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
bZcYCW?#0IA>Di)^00000NkvXXu0mjf6n15=

literal 0
HcmV?d00001

diff --git a/static/tabbar/home.png b/static/tabbar/home.png
new file mode 100644
index 0000000000000000000000000000000000000000..2d6a5533b780b86fcf594aa8fafc7514af9ecee9
GIT binary patch
literal 3934
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

literal 0
HcmV?d00001

diff --git a/static/tabbar/memory-active.png b/static/tabbar/memory-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..192af6f52e6feefcf459ecff81cffc007b52abfa
GIT binary patch
literal 533
zcmV+w0_y#VP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px$&q+i<R5(w)l)r0JQ545N=e~qK(_cgU0WFq-NG;S-sXu5Z2Y-+{_YdgepdHQR
z;*Zf;97Svg5d^2CAWjbLAfzT^mlgxBfkKQXq{+)W@)E4CY5Png^i20&?)lvBz29?>
z=*m<Qukr}>VjL^PB@$c0wI9peTIo-!Xlm>`+890-YcJa>V4b=vcQTp3!1SeUJojvK
zLGcs{B9uEiz(k5zy$f>tYxYoJ!9BOJ=)5iG8zYmdA{{}MB2c#sKkbM~iUt&}SEq9i
zouyF^)7KH~z$X2$516T5%{_3IM}h8usvl1d7&UP5Gz{7_o!Z!eoytERB23|xA$XB6
z*iqknSlv{TDSs3aVZexi^MlaW(^8oK0mbTnDD2ARFool1;OQ-CDh$T28a)53WSv8f
z3<D1J!~CSs-wxb`_gN*s_j?226D^x~3=(6)K%2tgMRShwWwT{ks~7l%of`j!)-U_>
z;7_>_hs7Bo7CqXY)h%T?1GPpFxH5eM;T}eM)1`#>%z1Jj7_baYb$<CA6_q-aYi(~B
z+<fh2ZORhslR&)dvI!>6zS^CDXj)afYPd#tv#;mfe66+(bAoqWAmp+K^}9+*#k~6s
XvbP&`^OxNm00000NkvXXu0mjf%qH`0

literal 0
HcmV?d00001

diff --git a/static/tabbar/my-active.png b/static/tabbar/my-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..a972b7d87b18bcac33b0b403972dde2680757d4a
GIT binary patch
literal 653
zcmV;80&@L{P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px%M@d9MR5(wilubxfVHAen_q%gvrqO9eh)AKp(oI<qnPCQ!Bo>6yA}b*>Dr*x#
zEm}l$HzE|&A}F%L2qIFbMQABeWb{L1f|L=ow6apC8spA5bH5WxhCkzV%5Qmop7Wj`
zK4OL^ch>~q)unJ^b)en=s5q3T70PTv7Q0y3l}MG!R7SC&P`v6S9Qz0$S(9T_AI$Ix
zmcP87KCq)`7m|@CKzu11AS1|Y%VvIle5!w%LJ`Y@j$5zcBv#HejxoC#Y{#bVEhJ=O
z+;m|3+QmpldO(C-fxrM3hH|FPaysxy$r41r^Z*FW0vy7yH=EVHBkl@C474wQ2AwE!
z1uB0tH^132>kLN&<Y93IV&Conn3sAfsvrKm)!f+DpB@k(?iU<{j-3bKnViJ$Fg#VP
zc-NWs*^H@tRc8(kecc(2=~F+P%w>v1$cS{$_Xm!KpB8k|vUJ+Onj5mTZ&>dZVWFS)
z3NP(klK7=F-zLQDCFS|nMe54&Dn?yfKHMh0_n)vY8rP>mWVkJbz);w)_GDz@UQ0Ed
z@z}p-v%OhDp9gh=7Szg2%a~F@5d$9LY_3n8ySA6HQTG_Iwn_XS;&Ri`QVBrKa(|QD
z1Z<zF8XkQ_JuGTkmZ-<s`dHjSy#VIFz$Uc$GvHM<5B9T_<yR%gPB^z6&2|3+`;#LE
zr6m|N4zR2-xy??p1%NRJAQU-3XQYH>jm||oi9>UNjjLRcA(bq><n)X<aQ~{(tQIi!
n8Lq#OyzGek&85kMq4bO2>?+UCvnkpS00000NkvXXu0mjf7QiYW

literal 0
HcmV?d00001

diff --git a/static/tabbar/my.png b/static/tabbar/my.png
new file mode 100644
index 0000000000000000000000000000000000000000..244d8cc5deb34ac6da6628a64616fae7bf168dfe
GIT binary patch
literal 646
zcmV;10(t$3P)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00001b5ch_0Itp)
z=>Px%KuJVFR5(wqls#xuQ547j=f3w6ja5o2imi$ff=H3jHffV8N}wPH+%$qva1eFq
zB(;m1AUcSMpn{VwrNl*-=pafkAB|0d86twBf+(WUV3X9OdG8&0+DMvjYwvJ}|2^l&
z|9o%>O-?5BylXLMI?Sw0fG`TyOALA}px^nP&BlB_U#U?lH4+1XfMnab{hG$gX#ic-
zF$Df5Q}N1>`{0d^fvI@x+>$Qe1fVod;)0d*Uc1}9Q2Soz@NF<?p6|B4VUl(=Yloo=
zETvuU(E%djl@-)v&4t5zG|BuDz@}C}0P{VYyL;_+`-)!HIZVbvd&{uQb^`oa%=dY{
z-eOCKnM}r%&*f9hqQ7Oyq&;(ujEuD{*?=VC(c`MFOaqXc4CRNA7Y1FfvG;9<VgxWV
zC8OafRjj*O59A_4JL>Uxo_4%8MxZh6tkpW9v2+29t%gQ~4+5o0mwW$1BGNkshN7<q
z6sRWw8YIE}(0Lh19~pSfjCe`zx$7OaeQjBCI-TB-UsNY0=ogzUbrqnf>B<?iS)Fk@
zo#l%DcWok(^cEq?*8x63O@>kHhJgYgZdokyC5OXN_}v!c3WviRWyw4P;7CPlv((kk
zss`!y=TGm>`~7~6jE|si$L`A#cxn}}KVYIlNu{%g4h&6GC=|DuOwuC)@B0T=b)gIj
zGOr(}7m?JsBDDLfcDIaXAjeF@6p1DtNW{nf$6Y12q{*i!5>0-QNZ+;=Kvfs_Xf~R7
g0%EZiK!%w61^$)Lk?7+JegFUf07*qoM6N<$f>y6A4gdfE

literal 0
HcmV?d00001

diff --git a/static/tabbar/signup-active.png b/static/tabbar/signup-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..b4ecb6146a370190e365e1ffe9322d35ecf1b0fb
GIT binary patch
literal 3630
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

literal 0
HcmV?d00001

diff --git a/static/tabbar/signup.png b/static/tabbar/signup.png
new file mode 100644
index 0000000000000000000000000000000000000000..b10c4105bb148e474cc727b9d3a0445aba2a4b79
GIT binary patch
literal 3240
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
Smcgt44g_;6e2JNR^nU;u<fjV&

literal 0
HcmV?d00001

diff --git a/static/tabbar/tiku-act.png b/static/tabbar/tiku-act.png
new file mode 100644
index 0000000000000000000000000000000000000000..b9d9e922cac22c660ac1118ab3c32870ccbbb114
GIT binary patch
literal 4202
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
A;Q#;t

literal 0
HcmV?d00001

diff --git a/static/tabbar/tiku.png b/static/tabbar/tiku.png
new file mode 100644
index 0000000000000000000000000000000000000000..2dbb1a285415535e7532cf4d4824c627c27d51cb
GIT binary patch
literal 3388
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
S?-X|c0000<MNUMnLSTXyPixBn

literal 0
HcmV?d00001

diff --git a/static/tabbar/writing-active.png b/static/tabbar/writing-active.png
new file mode 100644
index 0000000000000000000000000000000000000000..763a2f8c4ebc66434a56f4cad760693ed65f3759
GIT binary patch
literal 3481
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
Hu0mjfd$yV)

literal 0
HcmV?d00001

diff --git a/static/tabbar/writing.png b/static/tabbar/writing.png
new file mode 100644
index 0000000000000000000000000000000000000000..2a57332c5d60fd24822640b70862e78c2c47d1e5
GIT binary patch
literal 2543
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
FV1i37_W}R_

literal 0
HcmV?d00001