Merge branch 'developer/yxly-teacher-genglw-20220713' into develop

@@ -66,10 +66,10 @@ export default {
 			this.page++;
 			
 			await this._getList();
-			
-			
+			
+			console.log(this.total, this.list.length)
 			// 判断是否全部加载完成
-			if (this.total == 0) {
+			if (this.total == this.list.length) {
 				this.finished = true;
 				this.loading = 'nomore';
 			} else {

 <template>
 	<view class="u-button">
-		<u-button :text="text" color="#0CB17A" :plain="false" :hairline="false" :disabled="disabled" :throttleTime="1500"
-			type="info" shape="circle" :open-type="openType" @getphonenumber="getPhoneNumber"
+		<u-button :text="text" :color="reversedColor" :plain="false" :hairline="false" :disabled="disabled"
+			:throttleTime="1500" type="default" :open-type="openType" @getphonenumber="getPhoneNumber"
 			:custom-style="getCustomStyle" @click="click">
 		</u-button>
 	</view>
@@ -38,51 +38,70 @@
 				default: ''
 			},
 
+
 		},
 		data() {
 			return {}
 		},
 
-		watch: {
-			buttonType: function(newVal, oldVal) {
+		computed: {
+			getCustomStyle() {
+
+				const {
+					type = ''
+				} = this;
+
+				let style = {};
+
+				switch (type) {
+					case 'confirm':
+						return Object.assign({}, {
+							border: 'none',
+							color: '#FFFFFF',
+						}, this.customStyle);
+						break;
+
+					case 'cancel':
+						return Object.assign({}, {
+							border: 'none',
+							color: 'rgba(0, 0, 0, 0.4500)',
+						}, this.customStyle);
+						break;
+				}
+			},
+
+			reversedColor() {
+
+				let color = '#0CB17A';
+
 				switch (this.type) {
 					case 'confirm':
-						this.color = "#0CB17A";
+						color = "#0CB17A";
+						break;
+
+					case 'cancel':
+						color = "rgba(0, 0, 0, 0.0600)";
 						break;
 				}
+
+				return color;
 			}
 		},
 
-		computed: {
-			// getCustomStyle() {
-
-			// 	const {
-			// 		type = ''
-			// 	} = this;
-
-			// 	let style = {};
-
-			// 	switch (type) {
-			// 		case 'confirm':
-			// 			return Object.assign({}, {
-			// 				backgroundColor: '#FF001A',
-			// 				borderRadius: '8rpx',
-			// 			}, this.customStyle);
-			// 			break;
-
-			// 		case 'cancel':
-			// 			return Object.assign({}, {
-			// 				backgroundColor: "rgba(0,0,0,0.15)",
-			// 				borderRadius: '8rpx',
-			// 			}, this.customStyle);
-			// 			break;
-
-			// 		case 'custom':
-			// 			return Object.assign({}, this.customStyle);
-			// 			break;
-			// 	}
-			// }
-		},
+		// watch: {
+		// 	buttonType: function(newVal, oldVal) {
+		// 		switch (this.type) {
+		// 			case 'confirm':
+		// 				this.color = "#0CB17A";
+		// 				break;
+
+		// 			case 'cancel':
+		// 				this.color = "#0CB17A";
+		// 				break;
+		// 		}
+		// 	}
+		// },
+
 		methods: {
 			// 按钮点击
 			click(e) {
@@ -97,5 +116,8 @@
 </script>
 
 <style lang="scss">
-
+	.u-button /deep/ .u-button {
+		border: nones;
+		border-radius: 8rpx;
+	}
 </style>

 <template>
 	<view class="m-loading">
-		<u-loadmore :status="loading" :icon="icon" :loadText="loadText" bgColor="#F7F7F7" marginTop='12rpx' marginBottom='12rpx'></u-loadmore>
+		<u-loadmore :status="loading" :line="true" bgColor="#F7F7F7" fontSize="28rpx" iconSize="34rpx"></u-loadmore>
 	</view>
 </template>
 
@@ -10,21 +10,7 @@
 			loading: {
 				type: String,
 				default: 'loadmore'
-			},
-			icon: {
-				type: Boolean,
-				default: true
-			},
-			loadText: {
-				type: Object,
-				default () {
-					return {
-						loadmore: '点击或上拉加载更多',
-						loading: '正在加载',
-						nomore: '没有更多了'
-					}
-				}	
-			}
+			},
 		},
 		data() {
 			return {};

 <template>
-	<view class="c-no-data" :style="[wrapStyle]" >
+	<view class="c-no-data" :style="[wrapStyle]">
 		<view class="image">
-			<u-image :src="vuex_baseImgUrl+'/nodata.png'" width="260rpx" height="200rpx"></u-image>
+			<u-image :src="vuex_baseImgUrl+'/no_data.png'" width="480rpx" height="480rpx"></u-image>
 		</view>
-		<view class="title">{{ title }}</view>
+		<view class="title" :style="[topStyle]">{{ title }}</view>
 	</view>
 </template>
 
@@ -19,10 +19,10 @@
 			title: {
 				type: String,
 				default: '暂无数据'
-			},
-			paddingTop: {
-				type: String,
-				default: "180rpx"
+			},
+			paddingTop: {
+				type: String,
+				default: "180"
 			},
 		},
 		data() {
@@ -34,14 +34,21 @@
 
 		},
 		computed: {
-			wrapStyle() {
-				let style = {};  
-				style.paddingTop = this.paddingTop
-				return style;
+			wrapStyle() {
+				let style = {};
+				style.paddingTop = this.paddingTop + 'rpx';
+				return style;
+			},
+
+			topStyle() {
+				let style = {};
+				style.top = (Number(this.paddingTop) + 360) + 'rpx';
+				return style;
 			},
+
 		},
 		methods: {
-
+			
 
 		}
 	};
@@ -50,18 +57,22 @@
 <style scoped lang="scss">
 	.c-no-data {
 		width: 100%;
+		position: relative;
 
 		.image {
-			width: 260rpx;
+			width: 480rpx;
 			margin: 0 auto;
 		}
 
 		.title {
-			margin: 48rpx 0 0 0;
+			width: 100%;
+			position: absolute;
+			top: 560rpx;
+			left: 0rpx;
 			text-align: center;
-			font-size: 28rpx;
-			line-height: 40rpx;
-			color: #000000;
+			font-size: 24rpx;
+			line-height: 52rpx;
+			color: #909097;
 		}
 	}
 </style>

 const http = uni.$u.http
 
+// 获取oss对应的图片地址
+export const getImgUrlApi = (params) => http.get('/basic/v1/oss/sign_url', {
+	params: params
+})
+
+// OssInit初始化
+export const getOssInitApi = (params) => http.get('/basic/v1/oss/policy', {
+	params: params
+})
+
 // 获取token
-export const postTokenApi = (params, config = {}) => http.post('/auth/v1/login', params, config)
+export const postTokenApi = (params, config = {}) => http.post('/auth/v1/login', params, config).then(res => {
+	console.log(res)
+	
+	return res;
+})
 
 // 获取用户信息
-export const getUserInfoApi = (data) => http.get('/user/v1/detail', {
-	params: data
+export const getUserInfoApi = (params) => http.get('/user/v1/detail', {
+	params: params
 })
 
 // 获取短信验证码
-export const getSmsCodeApi = (data) => http.get('/basic/v1/sms_code/get', {
-	params: data
+export const getSmsCodeApi = (params) => http.get('/basic/v1/sms_code/get', {
+	params: params
+})
+
+// 更新用户信息
+export const updateUserInfoApi = (params) => http.put('/user/v1/update', params);
+
+//注销账户
+export const delAccountApi = (params) => http.delete('/user/v1/annuluser', params);
+
+//撤销注销账户
+export const cancelDelAccountApi = (params) => http.put('/user/v1/annulusercancel', params);
+
+// 更新老师头像
+export const updateAvatarUrlApi = (params) => http.put('/user/v1/teacher/update_avatar_url', params);
+
+// 学校列表
+export const getSchoolListApi = (params) => http.get('/user/v1/schoolList', {
+	params: params
+})
+
+// 切换老师身份
+export const putTeacherRolesApi = (id, params) => http.put(`/user/v1/teacher/${id}/change_role`, params);
+
+// 待办事项统计
+export const getTodoListStatisticsApi = (params) => http.get('/internship/v1/index/applet/waitHandleList', {
+	params: params
+})
+
+// 实习项目列表
+export const getProjectListApi = (params) => http.get('/internship/v1/project/simpleList', {
+	params: params
+})
+
+// 报名审核列表
+export const getRegistrationReviewApi = (params) => http.get('/internship/v1/entry/list', {
+	params: params
+})
+
+//报名审核详情
+export const getRegistrationDetailApi = (id, params) => http.get(`/internship/v1/entry/detail/${id}`, {
+	params: params
+})
+
+// 报名审核
+export const putRegistrationReviewApi = (params) => http.put(`/internship/v1/entry/audit`, params);
+
+// 学生签到列表
+export const getStudentSignInListApi = (params) => http.get('/internship/v1/attendance/applet/list', {
+	params: params
+})
+
+// 日志批阅列表
+export const getLogReviewListApi = (params) => http.get('/internship/v1/form_log/school/list', {
+	params: params
+})
+
+// 实习日志详情
+export const getLogDetailApi = (id, params) => http.get(`/internship/v1/form_log/detail/${id}`, {
+	params: params
+})
+
+// 日志批阅
+export const putLogReviewApi = (params) => http.put(`/internship/v1/form_log/approve`, params);
+
+// 日志回复列表
+export const getLogReplyListApi = (params) => http.get('/internship/v1/form_log_review/list', {
+	params: params
+})
+
+// 创建日志回复
+export const postLogReplyApi = (params) => http.post(`/internship/v1/form_log_review/save`, params);
+
+// 报告批阅列表
+export const getReportReviewListApi = (params) => http.get('/internship/v1/report/list', {
+	params: params
+})
+
+// 实习报告详情
+export const getReportDetailApi = (id, params) => http.get(`/internship/v1/report/detail_by_student/${id}`, {
+	params: params
+})
+
+//报告批阅
+export const putReportReviewApi = (id, params) => http.put(`/internship/v1/report/examine/${id}`, params);
+
+//审批记录
+export const getReportApprovalListApi = (formId, params) => http.get(`/internship/v1/report/examine_list/${formId}`, {
+	params: params
+})
+
+// 成绩鉴定列表
+export const getAchievementAppraisalListApi = (params) => http.get('/internship/v1/form/achievementAppraisalList', {
+	params: params
+})
+
+// 成绩鉴定详情
+export const getAchievementDetailApi = (id, params) => http.get(
+	`/internship/v1/form/achievementAppraisalDetail/${id}`, {
+		params: params
+	})
+
+//成绩鉴定
+export const putAchievementAppraisalApi = (params) => http.post(`/internship/v1/form/evaluate`, params);
+
+// 班级列表
+export const getClassListApi = (params) => http.get('/internship/v1/form/listByTeacherApplet', {
+	params: params
+})
+
+// 学生列表
+export const getStudentListApi = (params) => http.get('/internship/v1/form/traineeList', {
+	params: params
+})
+
+//实习过程详情
+export const getInternshipProcessDetailApi = (params) => http.get(`/internship/v1/form/internshipProcess`, {
+	params: params
+})
+
+// 三方协议列表
+export const getAgreementListApi = (params) => http.get('/internship/v1/treaty/list_by_school', {
+	params: params
+})
+
+//三方协议详情
+export const getAgreementDetailApi = (id, params) => http.get(`/internship/v1/treaty/detail/${id}`, {
+	params: params
+})
+
+//签到列表
+export const getsignInListApi = (params) => http.get('/internship/v1/attendance/applet/monthAttendanceList', {
+	params: params
+})
+
+// 实习岗位列表
+export const getInternshipJobListApi = (params) => http.get('/internship/v1/form/internshipJob', {
+	params: params
+})
+
+// 实践课程列表
+export const getPracticalCoursesListApi = (params) => http.get('/internship/v1/form/internshipCourse', {
+	params: params
+})
+
+//实习单详情
+export const getInternshipDetailApi = (id, params) => http.get(`/internship/v1/form/detail/${id}`, {
+	params: params
 })
+
+
+

@@ -5,9 +5,11 @@ module.exports = (vm) => {
 		/* config 为默认全局配置*/
 
 		// 测试环境
-		config.baseURL = "http://39.104.52.206:8000";
+		config.baseURL = "http://47.110.250.177:8000";
+		
 		// 预生产环境
-		// config.baseURL = "https://api-isxpre.workai.com.cn";
+		// config.baseURL = "https://api-isxpre.workai.com.cn";
+		
 		// 线上环境
 		// config.baseURL = "https://api-isx.workai.com.cn";
 
@@ -68,15 +70,17 @@ module.exports = (vm) => {
 
 	// 响应拦截
 	uni.$u.http.interceptors.response.use((response) => {
+
 		/* 对响应成功做点什么 可使用async await 做异步操作*/
 		const data = response.data
 
 		// 自定义参数
 		const custom = response.config?.custom
 		if (data.code !== 200) {
+
 			// 如果没有显式定义custom的toast参数为false的话，默认对报错进行toast弹出提示
 			if (custom.toast !== false) {
-				uni.$u.toast(data.message)
+				uni.$u.toast(data.msg)
 			}
 
 			// 如果需要catch返回，则进行reject
@@ -88,8 +92,26 @@ module.exports = (vm) => {
 			}
 		}
 		return data.data === undefined ? {} : data.data
+
 	}, (response) => {
 		// 对响应错误做点什么 （statusCode !== 200）
+		console.log(response)
+
+		if (response.statusCode == 401) {
+			// 假设401为token失效，这里跳转登录
+			vm.$u.toast('登录失效，请重新登录！');
+			setTimeout(() => {
+				// 此为uView的方法，详见路由相关文档
+				// vm.$u.route('/pages/main/my/login/login');
+				
+				vm.$u.vuex('hasLogin', false);
+				vm.$u.vuex('vuex_token', '');
+				
+			}, 1500)
+			return false;
+
+		} 
+
 		return Promise.reject(response)
 	})
 }

 {
-    "name" : "job-sharing",
+    "name" : "yxly-teacher",
     "appid" : "__UNI__C6035C1",
     "description" : "多平台快速开发的UI框架",
     "versionName" : "1.8.5",
@@ -102,7 +102,7 @@
     },
     "quickapp" : {},
     "mp-weixin" : {
-        "appid" : "wx84b71301436652ce",
+        "appid" : "wx6cd2152282abd34c",
         "setting" : {
             "urlCheck" : false,
             "es6" : true,

@@ -7,23 +7,23 @@
 		"current": 0, //当前激活的模式(list 的索引项)
 		"list": [{
 			"name": "defult", //模式名称
-			"path": "pages/main/my/mobileLogin/mobileLogin",
-			"query": ""
+			"path": "pages/main/internship/signInList/signInList",
+			"query": "studentId=1555434161240838146"
 		}]
 	},
 	"pages": [{
 			"path": "pages/tabBar/home/home",
-			"style": {
-				"navigationBarTitleText": "人人推",
-				"navigationBarTextStyle": "black",
-				"enablePullDownRefresh": false
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
 			}
 		},
 		{
 			"path": "pages/tabBar/internship/internship",
 			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "我的实习生",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
 			}
 		},
 		{
@@ -34,26 +34,268 @@
 			}
 		}
 	],
+
 	"subPackages": [{
-		"root": "pages/main/my",
-		"pages": [{
-				"path": "login/login",
+			"root": "pages/main/home",
+			"pages": [
+
+				{
+					"path": "registrationReview/registrationReview",
+					"style": {
+						"navigationBarTitleText": "报名审核",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "registrationDetail/registrationDetail",
+					"style": {
+						"navigationBarTitleText": "报名详情",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "studentSignIn/studentSignIn",
+					"style": {
+						"navigationBarTitleText": "学生签到",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "logReview/logReview",
+					"style": {
+						"navigationBarTitleText": "日志批阅",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "logDetail/logDetail",
+					"style": {
+						"navigationBarTitleText": "日志详情",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "reportReview/reportReview",
+					"style": {
+						"navigationBarTitleText": "报告批阅",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "reportDetail/reportDetail",
+					"style": {
+						"navigationBarTitleText": "报告详情",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "approvalRecord/approvalRecord",
+					"style": {
+						"navigationBarTitleText": "审批记录",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "achievementAppraisal/achievementAppraisal",
+					"style": {
+						"navigationBarTitleText": "成绩鉴定",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "achievementDetail/achievementDetail",
+					"style": {
+						"navigationBarTitleText": "鉴定详情",
+						"enablePullDownRefresh": false
+					}
+
+				}
+			]
+		},
+		{
+			"root": "pages/main/internship",
+			"pages": [{
+				"path": "studentList/studentList",
 				"style": {
-					"navigationBarTitleText": "登录",
+					"navigationBarTitleText": "实习生列表",
 					"enablePullDownRefresh": false
 				}
 
-			},
-			{
-				"path": "mobileLogin/mobileLogin",
+			}, {
+				"path": "traineeDetail/traineeDetail",
 				"style": {
-					"navigationBarTitleText": "手机登录",
+					"navigationBarTitleText": "学生信息",
 					"enablePullDownRefresh": false
 				}
 
-			}
-		]
-	}],
+			}    ,{
+                    "path" : "agreementList/agreementList",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "三方协议",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+                ,{
+                    "path" : "agreementDetail/agreementDetail",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "协议详情",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+                ,{
+                    "path" : "signInList/signInList",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "签到",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+                ,{
+                    "path" : "intershipInfo/intershipInfo",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "实习单详情",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+                ,{
+                    "path" : "achievementDetail/achievementDetail",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "成绩详情",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+                ,{
+                    "path" : "studentLogReview/studentLogReview",
+                    "style" :                                                                                    
+                {
+                    "navigationBarTitleText": "",
+                    "enablePullDownRefresh": false
+                }
+                
+                }
+            ]
+		},
+		{
+			"root": "pages/main/my",
+			"pages": [{
+					"path": "login/login",
+					"style": {
+						"navigationBarTitleText": "登录",
+						"enablePullDownRefresh": false
+					}
+
+				},
+				{
+					"path": "mobileLogin/mobileLogin",
+					"style": {
+						"navigationBarTitleText": "手机登录",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "accountSafe/accountSafe",
+					"style": {
+						"navigationBarTitleText": "账号与安全",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "editAccount/editAccount",
+					"style": {
+						"navigationBarTitleText": "修改账号",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "editMobile/editMobile",
+					"style": {
+						"navigationBarTitleText": "修改手机号",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "editPassword/editPassword",
+					"style": {
+						"navigationBarTitleText": "修改密码",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "removeAccount/removeAccount",
+					"style": {
+						"navigationBarTitleText": "注销账户",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "againRemove/againRemove",
+					"style": {
+						"navigationBarTitleText": "注销账户",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "freezing/freezing",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "writtenOff/writtenOff",
+					"style": {
+						"navigationBarTitleText": "",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "policiesAgreement/policiesAgreement",
+					"style": {
+						"navigationBarTitleText": "政策与协议",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "agreement/agreement",
+					"style": {
+						"navigationBarTitleText": "隐私协议",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "userPolicy/userPolicy",
+					"style": {
+						"navigationBarTitleText": "用户政策",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "versionInfo/versionInfo",
+					"style": {
+						"navigationBarTitleText": "版本信息",
+						"enablePullDownRefresh": false
+					}
+
+				}, {
+					"path": "personInfo/personInfo",
+					"style": {
+						"navigationBarTitleText": "个人信息",
+						"enablePullDownRefresh": false
+					}
+
+				}
+			]
+		}
+	],
 
 	"preloadRule": {
 
@@ -69,7 +311,7 @@
 
 	"tabBar": {
 		"color": "#000000",
-		"selectedColor": "#F64114",
+		"selectedColor": "#06B079",
 		"backgroundColor": "#FFFFFF",
 		"borderStyle": "black",
 		"height": "100rpx",
@@ -82,8 +324,8 @@
 			},
 			{
 				"pagePath": "pages/tabBar/internship/internship",
-				"iconPath": "/static/img/icon/position.png",
-				"selectedIconPath": "/static/img/icon/positionHL.png",
+				"iconPath": "/static/img/icon/internship.png",
+				"selectedIconPath": "/static/img/icon/internshipHL.png",
 				"text": "实习"
 			},
 			{

+<template>
+	<view class="registration_review">
+		<view class="search_box">
+			<view class="top">
+				<view class="check">
+					<u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
+						<u-checkbox :customStyle="{marginBottom: '8px'}" shape="circle"
+							v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name"
+							activeColor="#06B079" size="28rpx" labelSize="28rpx" labelColor="#202131">
+						</u-checkbox>
+					</u-checkbox-group>
+				</view>
+
+				<view class="search">
+					<u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
+						bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
+					</u-search>
+				</view>
+
+				<u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
+			</view>
+		</view>
+
+		<view class="list_box" v-if="list.length > 0">
+			<view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
+
+				<view class="bg_image" v-if="item.appraisalStatus == 'no_appraisal'">
+					<u-image src="/static/img/home/labelBgGreen.png" width="142rpx" height="48rpx"></u-image>
+					<text>待鉴定</text>
+				</view>
+
+				<view class="bg_image" v-else>
+					<u-image src="/static/img/home/labelBgGrey.png" width="142rpx" height="48rpx"></u-image>
+					<text>已鉴定</text>
+				</view>
+
+				<view class="info">
+					<view class="avatar">{{getNameLastTwo(item.studentName)}}</view>
+					<view class="name">{{overflowHide(item.studentName, 6)}}</view>
+					<view class="number">NO.{{item.studentNumber}}</view>
+				</view>
+				<view class="company">
+					<text>实习单号</text>
+					<text>{{item.number || '--'}}</text>
+				</view>
+				<view class="company position">
+					<text>实习项目</text>
+					<text>{{item.projectName|| '--'}}</text>
+				</view>
+
+				<view class="statistics">
+					<view>
+						<text>{{item.uploadCount|| 0}}</text>
+						<text>三方协议</text>
+					</view>
+					<view class="line"></view>
+					<view>
+						<text>{{item.weekLogCount|| 0}}</text>
+						<text>周日志</text>
+					</view>
+					<view class="line"></view>
+					<view>
+						<text>{{item.internshipReportCount|| 0}}</text>
+						<text>实习报告</text>
+					</view>
+					<view class="line"></view>
+					<view>
+						<text>{{item.attendanceCount|| 0}}</text>
+						<text>签到</text>
+					</view>
+				</view>
+
+			</view>
+			<c-loading :loading="loading"></c-loading>
+		</view>
+		<view v-else class="no_data">
+			<c-no-data></c-no-data>
+		</view>
+
+		<u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
+			<view class="popup_search">
+				<view class="content">
+					<view class="title">按项目筛选</view>
+					<scroll-view class="scroll" scroll-y="true">
+						<view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
+							<view class="selectItem" v-if="item.id == projectId">
+								<text>{{item.name}}</text>
+							</view>
+							<view v-else>
+								<text>{{item.name}}</text>
+							</view>
+						</view>
+					</scroll-view>
+					<view class="switch">
+						<text>待鉴定</text>
+						<u-switch v-model="switchValue" size="48" activeColor="#06B079" @change="handelChange">
+						</u-switch>
+					</view>
+				</view>
+
+				<view class="footer">
+					<view class="left_btn">
+						<c-button type="cancel" text="重置" @click="handelCancel">
+						</c-button>
+					</view>
+					<view class="right_btn">
+						<c-button type="confirm" text="确定" @click="hancelSubmit">
+						</c-button>
+					</view>
+				</view>
+
+			</view>
+		</u-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+	import listMixin from "@/common/mixins/list-mixin.js";
+
+	import {
+		getAchievementAppraisalListApi,
+		getProjectListApi,
+	} from '@/config/api.js';
+
+	export default {
+		mixins: [listMixin],
+		data() {
+
+			const d = new Date();
+			const year = d.getFullYear();
+			let month = d.getMonth() + 1;
+			month = month < 10 ? `0${month}` : month;
+			const date = d.getDate();
+
+			return {
+				checkboxValue: [],
+				// 基本案列数据
+				checkboxList: [{
+					name: '待鉴定',
+					disabled: false
+				}],
+				keyword: '',
+				show: false,
+				search: {
+					//搜索对象必须为key search的对象
+					keySearch: "",
+					appraisalStatus: '',
+
+				},
+				showTime: false,
+				timeValue: `${year}-${month}-${date}`,
+				defaultDateMultiple: [`${year}-${month}-${date}`],
+				list: [], //列表必须为key list的数组
+				projectId: '',
+				switchValue: false,
+
+			}
+		},
+
+		onLoad(option) {
+			this.$store.dispatch(`home/getProjectList`, {
+				pageSize: -1,
+			})
+
+			this.search.keySearch = '';
+
+			if (option && option.appraisalStatus) {
+				this.search.appraisalStatus = 'no_appraisal';
+				this.checkboxValue = ['待鉴定'];
+				this.switchValue = true;
+			}
+
+			this.finished = false;
+			this.loading = "loadmore";
+			this.page = 0;
+			this.list = [];
+		},
+
+		onShow() {
+			this._getList();
+		},
+
+		computed: {
+			...mapState('home', {
+				// 箭头函数可使代码更简练
+				projectList: 'projectList',
+
+			}),
+
+		},
+
+		methods: {
+
+			getNameLastTwo(value) {
+				if (value && value.length > 3) {
+					return value.substring(value.length - 3)
+				} else {
+					return value;
+				}
+			},
+
+			overflowHide(value, num = 4) {
+				if (value && value.length > num) {
+					return `${value.slice(0, num)}...`
+				} else {
+					return value;
+				}
+			},
+
+			confirm(e) {
+				this.timeValue = e[0];
+				this.showTime = false;
+			},
+
+			handelDetail(record) {
+				this.$u.route({
+					url: `pages/main/home/achievementDetail/achievementDetail?&id=${record.id}`
+				})
+			},
+
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+
+			checkboxChange(n) {
+				console.log('change', n);
+
+				this.search.appraisalStatus = n.length > 0 ? 'no_appraisal' : '';
+
+				this.switchValue = n.length > 0 ? true : false;
+
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+			handelSearch(value) {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+			open() {
+				// console.log('open');
+			},
+			close() {
+				this.show = false
+				// console.log('close');
+			},
+			// scroll-view到底部加载更多
+			onreachBottom() {},
+			// 搜索
+			searchSubmit() {
+				// 调用混合搜索
+				this._searchData();
+			},
+			// 模拟后端分页
+			async getData(requestParams) {
+				const {
+					search = {}
+				} = requestParams;
+
+				let params = {};
+				params.pageNumber = requestParams.page + 1;
+				params.pageSize = 5;
+
+				if (search.appraisalStatus) {
+					params.appraisalStatus = search.appraisalStatus;
+				}
+
+				if (this.keyword) {
+					params.keySearch = this.keyword
+				}
+
+				if (this.projectId) {
+					params.projectId = this.projectId
+				}
+
+				return await getAchievementAppraisalListApi(params);
+			},
+			// 数据请求(没错就是这么少的代码)
+			async _getList() {
+				if (this.page == 0) {
+					this.list = [];
+				}
+
+				// 根据实际情况修改自己修改key
+				let result = await this.getData({
+					page: this.page, // 传入页码
+					size: this.size, // 传入每页条数
+					search: this.search, // 传入搜索的对象
+				});
+
+				this.total = result.total;
+
+				if (this.list.length == 0 && result.records.length == 0) {
+					this.shownoData = false
+				} else {
+					this.shownoData = true
+				}
+
+				this.list = this.list.concat(result.records)
+
+				// 判断是否全部加载完成
+				if (this.total == this.list.length) {
+					this.finished = true;
+					this.loading = 'nomore';
+				} else {
+					this.loading = 'loadmore';
+				}
+			},
+
+			handelClick(values) {
+				console.log(values);
+				this.projectId = values.id;
+			},
+
+			handelChange(e) {
+				console.log(e)
+				this.checkboxValue = e ? ['待鉴定'] : [];
+				this.search.appraisalStatus = e ? 'no_appraisal' : '';
+
+			},
+
+			handelCancel() {
+				this.switchValue = false;
+				this.projectId = '';
+			},
+
+			hancelSubmit() {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+
+				this.show = false;
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.registration_review {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+
+		.search_box {
+			padding: 36rpx 30rpx 0;
+			background-color: #FFFFFF;
+
+			.top {
+				display: flex;
+				flex-flow: row nowrap;
+				justify-content: space-between;
+				padding: 0 0 30rpx 0;
+
+				.check {
+					padding: 20rpx 0 0 0;
+				}
+
+				.search {
+					width: 468rpx;
+				}
+			}
+
+			.bottom {
+				.time {
+					padding: 30rpx 0 30rpx 40rpx;
+				}
+			}
+
+
+		}
+
+		.list_box {
+			padding: 0 0 50rpx 0;
+
+			.item {
+				position: relative;
+				width: 630rpx;
+				margin: 30rpx auto;
+				padding: 30rpx;
+				border-radius: 12rpx;
+				background-color: #FFFFFF;
+
+				.bg_image {
+					position: absolute;
+					top: 0;
+					right: 0;
+
+					text {
+						position: absolute;
+						top: 12rpx;
+						right: 30rpx;
+						font-size: 24rpx;
+						line-height: 24rpx;
+						color: #FFFFFF;
+					}
+				}
+
+				.info {
+					display: flex;
+					flex-flow: row nowrap;
+					align-items: center;
+					margin: 0 0 30rpx 0;
+
+					.avatar {
+						width: 94rpx;
+						height: 94rpx;
+						padding: 0 8rpx;
+						border-radius: 4rpx;
+						background-color: #06B079;
+						font-size: 24rpx;
+						line-height: 94rpx;
+						color: #FFFFFF;
+						text-align: center;
+					}
+
+					.name {
+						font-size: 32rpx;
+						line-height: 44rpx;
+						color: #202131;
+						font-weight: 500;
+						margin: 0 20rpx;
+					}
+
+					.number {
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #909097;
+					}
+				}
+
+				.company {
+					display: flex;
+					flex-flow: row nowrap;
+					margin: 0 0 30rpx 0;
+
+					text {
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #909097;
+						margin: 0 0 0 16rpx;
+					}
+
+					text:last-child {
+						color: #202131;
+						margin: 0 0 0 30rpx;
+					}
+				}
+
+				.statistics {
+					border-top: 2rpx solid #E2E2E8;
+					padding: 28rpx 0 0 0;
+					display: flex;
+					flex-flow: row nowrap;
+					justify-content: space-around;
+
+					view {
+						text-align: center;
+
+						text {
+							font-size: 32rpx;
+							line-height: 32rpx;
+							color: #06B079;
+						}
+
+						text:last-child {
+							display: block;
+							font-size: 24rpx;
+							color: #909097;
+							margin: 16rpx 0 0 0;
+						}
+					}
+
+					.line {
+						height: 32rpx;
+						border-right: 2rpx solid #E2E2E8;
+						position: relative;
+						top: 30rpx;
+					}
+
+
+				}
+			}
+		}
+
+		.popup_search {
+			width: 640rpx;
+			position: relative;
+
+			.content {
+				padding: 0 40rpx;
+
+				.title {
+					padding: 24rpx 0;
+					font-size: 28rpx;
+					line-height: 36rpx;
+					color: #202131;
+				}
+
+				.scroll {
+					max-height: 60vh;
+
+					.item {
+
+						view {
+							display: flex;
+							flex-flow: row wrap;
+							align-items: center;
+							width: 500rpx;
+							height: 74rpx;
+							border-radius: 4rpx;
+							border: 2rpx solid #C1C1C9;
+							margin: 0 10rpx 20rpx;
+							font-size: 24rpx;
+							line-height: 32rpx;
+							color: #C0C0C9;
+							padding: 16rpx 20rpx;
+						}
+
+						.selectItem {
+							background-color: #06B079;
+							color: #FFFFFF;
+							border: 2rpx solid #06B079;
+						}
+					}
+				}
+
+				.time {
+					padding: 40rpx 0 0 0;
+				}
+
+				.switch {
+					display: flex;
+					flex-flow: row nowrap;
+					justify-content: space-between;
+					padding: 40rpx 0 0 0;
+
+					text {
+						font-size: 28rpx;
+						line-height: 36rpx;
+						color: #202131;
+					}
+				}
+
+
+			}
+
+			.footer {
+				width: 560rpx;
+				height: 96rpx;
+				padding: 28rpx 40rpx;
+				background: #FFFFFF;
+				position: fixed;
+				bottom: 0;
+				right: 0;
+				z-index: 99;
+				border-top: 2rpx solid #E2E2E8;
+
+				view {
+					display: inline-block;
+				}
+
+				.left_btn {
+					width: 194rpx;
+					margin: 0 20rpx 0 0;
+				}
+
+				.right_btn {
+					width: 346rpx;
+				}
+			}
+		}
+	}
+</style>

+<template>
+	<view class="report_detail">
+		<view class="box form_info">
+			<view class="info">
+				<view class="avatar">{{getNameLastTwo(detail.studentName)}}</view>
+				<view class="name">{{overflowHide(detail.studentName, 6)}}</view>
+				<view class="number">NO.{{detail.studentNumber}}</view>
+			</view>
+			<view class="company">
+				<text>实习单号</text>
+				<text>{{detail.number || '--'}}</text>
+			</view>
+			<view class="company">
+				<text>实习项目</text>
+				<text>{{detail.projectName|| '--'}}</text>
+			</view>
+		</view>
+
+		<view class="box attendance">
+			<view class="title">考勤</view>
+			<view class="item_icon">
+				<text>考勤天数</text>
+				<view @click="handelRecord('signin')">
+					<text>{{detail.attendanceCount || 0}}天</text>
+					<u-icon :style="{margin:'0 0 0 8rpx'}" name="arrow-right" color="#909097" size="28"></u-icon>
+				</view>
+			</view>
+		</view>
+
+		<view class="box attendance">
+			<view class="title">提交材料</view>
+			<view class="item_icon">
+				<text>三方协议</text>
+				<view @click="handelRecord('aggrent')">
+					<text>查看</text>
+					<u-icon :style="{margin:'0 0 0 8rpx'}" name="arrow-right" color="#909097" size="28"></u-icon>
+				</view>
+			</view>
+			<view class="item_icon">
+				<text>日志</text>
+				<view @click="handelRecord('daily')">
+					<text>{{detail.dailyLogCount || 0}}篇</text>
+					<u-icon :style="{margin:'0 0 0 8rpx'}" name="arrow-right" color="#909097" size="28"></u-icon>
+				</view>
+			</view>
+			<view class="item_icon">
+				<text>周志</text>
+				<view @click="handelRecord('weekly')">
+					<text>{{detail.weekLogCount || 0}}篇</text>
+					<u-icon :style="{margin:'0 0 0 8rpx'}" name="arrow-right" color="#909097" size="28"></u-icon>
+				</view>
+			</view>
+			<view class="item_icon">
+				<text>月志</text>
+				<view @click="handelRecord('monthly')">
+					<text>{{detail.monthlyLogCount || 0}}篇</text>
+					<u-icon :style="{margin:'0 0 0 8rpx'}" name="arrow-right" color="#909097" size="28"></u-icon>
+				</view>
+			</view>
+			<view class="item_icon">
+				<text>实习报告</text>
+				<view @click="handelRecord('report')">
+					<text>{{detail.internshipReportCount || 0}}次</text>
+					<u-icon :style="{margin:'0 0 0 8rpx'}" name="arrow-right" color="#909097" size="28"></u-icon>
+				</view>
+			</view>
+		</view>
+
+		<view class="footer" v-if="detail.appraisalStatus == 'no_appraisal'">
+			<view class="right_btn">
+				<c-button type="confirm" text="成绩鉴定" @click="showModal = true">
+				</c-button>
+			</view>
+		</view>
+
+		<u-overlay :show="showModal">
+			<view class="modal" v-show="showModal">
+				<view class="title">成绩鉴定</view>
+				<u-form labelPosition="top" :model="form" :rules="rules" :errorType="errorType" ref="uForm">
+
+					<u-form-item label="成绩" labelWidth="100rpx" borderBottom prop="score"
+						v-if="detail.markWay == 'centesimal'">
+						<u-input v-model="form.score" border="none" type="number" :placeholderStyle="{color: 'C1C1C9'}"
+							placeholder="请输入" />
+					</u-form-item>
+
+					<u-form-item label="成绩" @click="showSex = true" labelWidth="100rpx" borderBottom prop="level"
+						v-else>
+						<u-radio-group v-model="form.level" placement="row">
+							<u-radio :customStyle="{marginRight: '24rpx'}" size="28rpx" labelSize="28rpx"
+								v-for="(item, index) in radiolist" :key="index" :label="item.name" :name="item.name"
+								activeColor="#06B079">
+							</u-radio>
+						</u-radio-group>
+
+
+					</u-form-item>
+
+					<u-form-item label="学分" labelWidth="100rpx" borderBottom prop="credit">
+						<u-input v-model="form.credit" type="number" border="none" :placeholderStyle="{color: 'C1C1C9'}"
+							placeholder="请输入" />
+					</u-form-item>
+
+					<u-form-item label="评价" labelWidth="100rpx" borderBottom prop="teacherView">
+						<u-textarea v-model="form.teacherView" count border="none" :placeholderStyle="{color: 'C1C1C9'}"
+							placeholder="请输入评价"></u-textarea>
+					</u-form-item>
+
+				</u-form>
+
+				<view class="moda_footer">
+					<view class="left_btn">
+						<c-button type="cancel" text="取消" @click="handelCancel">
+						</c-button>
+					</view>
+					<view class="right_btn">
+						<c-button type="confirm" text="确定" @click="hancelSubmit">
+						</c-button>
+					</view>
+				</view>
+
+
+			</view>
+		</u-overlay>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+	import listMixin from "@/common/mixins/list-mixin.js";
+
+	import {
+		getAchievementDetailApi,
+		putAchievementAppraisalApi,
+	} from '@/config/api.js';
+
+	export default {
+		data() {
+			return {
+				id: '',
+				detail: {},
+				showModal: false,
+				errorType: 'toast',
+				radiolist: [{
+						name: '优秀',
+						disabled: false
+					},
+					{
+						name: '良好',
+						disabled: false
+					},
+					{
+						name: '及格',
+						disabled: false
+					}, {
+						name: '不及格',
+						disabled: false
+					}
+				],
+				form: {
+					score: '',
+					level: '',
+					credit: '',
+					teacherView: '',
+
+				},
+				rules: {
+					score: [{
+						required: true,
+						message: '请输入成绩',
+						trigger: ['blur', 'change'],
+					}, {
+						validator: (rule, value, callback) => {
+							return this.$u.test.range(value, [0, 100]);
+						},
+						message: '手机号码不正确',
+						trigger: ['change', 'blur'],
+					}],
+					level: [{
+						required: true,
+						message: '请选择成绩',
+						trigger: ['blur', 'change'],
+					}, ],
+					credit: [{
+						required: true,
+						message: '请输入学分',
+						trigger: ['blur', 'change'],
+					}],
+					teacherView: [],
+				},
+			}
+		},
+
+		onLoad(option) {
+			this.id = option.id;
+			getAchievementDetailApi(option.id).then(data => {
+				if (data) {
+					this.detail = data;
+					this.form.credit = String(data.courseFaceDTO.credit);
+				}
+			})
+		},
+
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+		},
+
+		methods: {
+
+			getNameLastTwo(value) {
+				if (value && value.length > 3) {
+					return value.substring(value.length - 3)
+				} else {
+					return value;
+				}
+			},
+
+			overflowHide(value, num = 4) {
+				if (value && value.length > num) {
+					return `${value.slice(0, num)}...`
+				} else {
+					return value;
+				}
+			},
+
+			handelRecord(type) {
+
+				switch (type) {
+					
+					case 'signin':
+						this.$u.route({
+							url: `pages/main/internship/signInList/signInList?studentId=${this.detail.studentId}&projectId=${this.detail.projectId}`
+						})
+						break;
+						
+					case 'aggrent':
+						this.$u.route({
+							url: `pages/main/internship/agreementDetail/agreementDetail?&id=${this.detail.treatyId ? this.detail.treatyId : ''}`
+						})
+						break;
+
+					case 'daily':
+						this.$u.route({
+							url: `pages/main/internship/studentLogReview/studentLogReview?category=daily&formId=${this.detail.id}`
+						})
+						break;
+
+					case 'weekly':
+						this.$u.route({
+							url: `pages/main/internship/studentLogReview/studentLogReview?category=weekly&formId=${this.detail.id}`
+						})
+						break;
+
+					case 'monthly':
+						this.$u.route({
+							url: `pages/main/internship/studentLogReview/studentLogReview?category=monthly&formId=${this.detail.id}`
+						})
+						break;
+
+					case 'report':
+						this.$u.route({
+							url: `pages/main/home/reportDetail/reportDetail?id=${this.detail.reportId ? this.detail.reportId : ''}`
+						})
+						break;
+				}
+
+			},
+
+			handelCancel() {
+				this.showModal = false;
+			},
+
+			hancelSubmit() {
+				let {
+					credit = ''
+				} = this.form;
+
+				console.log(this.form)
+
+				if (String(credit) && credit > this.detail.courseFaceDTO.credit) {
+					this.$u.toast('学分不正确');
+					return;
+				}
+
+				this.$refs.uForm.validate().then(res => {
+					uni.$u.toast('校验通过');
+
+					putAchievementAppraisalApi({
+						items: [{
+							id: this.detail.id,
+							...this.form
+						}]
+					}).then(data => {
+						if (data) {
+							this.showModal = false;
+							
+							uni.navigateBack({
+								delta: 1
+							});
+						}
+					})
+
+
+				}).catch(errors => {
+					console.log(errors)
+				})
+
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.report_detail {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+		padding: 20rpx 0 0 0;
+
+		.box {
+			width: 630rpx;
+			margin: 20rpx auto;
+			padding: 30rpx 30rpx 12rpx 30rpx;
+			border-radius: 12rpx;
+			background-color: #FFFFFF;
+
+			.title {
+				font-size: 32rpx;
+				line-height: 32rpx;
+				color: #202131;
+				margin: 0 0 30rpx 0;
+			}
+
+			.title::before {
+				content: "";
+				display: inline-block;
+				width: 6rpx;
+				height: 32rpx;
+				background-color: #06B079;
+				margin: 0 12rpx 0 0;
+				position: relative;
+				top: 4rpx;
+				border-radius: 8rpx;
+			}
+
+			.item {
+				margin: 0 0 24rpx 0;
+
+				text:first-child {
+					display: inline-block;
+					width: 112rpx;
+					text-align: justify;
+					text-align-last: justify;
+					font-size: 28rpx;
+					line-height: 48rpx;
+					color: #909097;
+					vertical-align: top;
+				}
+
+				text:last-child {
+					display: inline-block;
+					width: 440rpx;
+					font-size: 28rpx;
+					line-height: 48rpx;
+					color: #202131;
+					margin: 0 0 0 78rpx;
+				}
+			}
+
+			.item_icon {
+				margin: 0 0 24rpx 0;
+				display: flex;
+				flex-flow: row nowrap;
+				justify-content: space-between;
+
+				text {
+					display: inline-block;
+					width: 112rpx;
+					text-align: justify;
+					text-align-last: justify;
+					font-size: 28rpx;
+					line-height: 48rpx;
+					color: #909097;
+					vertical-align: top;
+				}
+
+				view {
+					display: flex;
+					flex-flow: row nowrap;
+
+					text {
+						display: inline-block;
+						width: auto;
+						font-size: 28rpx;
+						line-height: 48rpx;
+						color: #202131;
+						margin: 0 0 0 78rpx;
+					}
+				}
+			}
+		}
+
+		.form_info {
+			.info {
+				display: flex;
+				flex-flow: row nowrap;
+				align-items: center;
+				margin: 0 0 30rpx 0;
+
+				.avatar {
+					width: 94rpx;
+					height: 94rpx;
+					padding: 0 8rpx;
+					border-radius: 4rpx;
+					background-color: #06B079;
+					font-size: 24rpx;
+					line-height: 94rpx;
+					color: #FFFFFF;
+					text-align: center;
+				}
+
+				.name {
+					font-size: 32rpx;
+					line-height: 44rpx;
+					color: #202131;
+					font-weight: 500;
+					margin: 0 20rpx;
+				}
+
+				.number {
+					font-size: 28rpx;
+					line-height: 32rpx;
+					color: #909097;
+				}
+			}
+
+			.company {
+				display: flex;
+				flex-flow: row nowrap;
+				margin: 0 0 30rpx 0;
+
+				text {
+					font-size: 28rpx;
+					line-height: 32rpx;
+					color: #909097;
+					margin: 0 0 0 16rpx;
+				}
+
+				text:last-child {
+					color: #202131;
+					margin: 0 0 0 30rpx;
+				}
+			}
+		}
+
+		.footer {
+			width: 100%;
+			height: 96rpx;
+			padding: 28rpx 30rpx;
+			background: #FFFFFF;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			z-index: 99;
+			border-top: 2rpx solid #E2E2E8;
+
+			view {
+				display: inline-block;
+			}
+
+			.right_btn {
+				width: 690rpx;
+			}
+		}
+
+		.modal {
+			width: 570rpx;
+			position: relative;
+			display: flex;
+			flex-direction: column;
+			margin: 200rpx auto;
+			padding: 40rpx;
+			border-radius: 20rpx;
+			background-color: #fff;
+
+			.title {
+				text-align: center;
+				font-size: 36rpx;
+				line-height: 48rpx;
+				color: #202131;
+				margin: 0 0 66rpx 0;
+			}
+
+			.moda_footer {
+				width: 590rpx;
+				height: 96rpx;
+				padding: 40rpx 0 0 0;
+
+				view {
+					display: inline-block;
+					width: 260rpx;
+				}
+
+				.left_btn {
+					margin: 0 48rpx 0 0;
+				}
+
+				.right_btn {}
+			}
+
+
+		}
+	}
+</style>

+<template>
+	<view class="report_detail">
+		<view class="list_box" v-if="list.length > 0">
+			<view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
+				
+				<view class="bg_image" v-if="item.status == 'stay_examine'">
+					<u-image src="/static/img/home/labelBgGreen.png" width="142rpx" height="48rpx"></u-image>
+					<text>待审核</text>
+				</view>
+				
+				<view class="bg_image" v-else-if="item.status == 'adopt'">
+					<u-image src="/static/img/home/labelBgGrey.png" width="142rpx" height="48rpx"></u-image>
+					<text>已通过</text>
+				</view>
+				
+				<view class="bg_image" v-else>
+					<u-image src="/static/img/home/labelBgGrey.png" width="142rpx" height="48rpx"></u-image>
+					<text>已退回</text>
+				</view>
+
+				<view class="info">
+					<u-image src="/static/img/home/approvalRecordBg.png" width="94rpx" height="94rpx" />
+					<view class="title_name">
+						<view class="title">
+							{{item.title}}
+						</view>
+						<view class="time">
+							
+							<text>创建时间</text>
+							<text>
+								{{timeFormat(item.createdTime, 'yyyy-mm-dd hh:MM')}}
+							</text>
+						</view>
+					</view>
+				</view>
+
+			</view>
+			<c-loading :loading="loading"></c-loading>
+		</view>
+		<view v-else class="no_data">
+			<c-no-data></c-no-data>
+		</view>
+
+		<view class="report_info">
+
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+	import listMixin from "@/common/mixins/list-mixin.js";
+
+	import {
+		getReportApprovalListApi,
+	} from '@/config/api.js';
+
+	export default {
+		data() {
+			return {
+				formId: '',
+				list: [],
+			}
+		},
+
+		onLoad(option) {
+			this.formId = option.formId;
+			getReportApprovalListApi(option.formId).then(data => {
+				if (data) {
+					this.list = data
+				}
+			})
+		},
+
+		methods: {
+			
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+			
+			handelDetail(record) {
+				this.$u.route({
+					url: `pages/main/home/reportDetail/reportDetail?id=${record.id}&formId=${record.formId}`
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.report_detail {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+		padding: 20rpx 0 0 0;
+
+		.list_box {
+			padding: 0 0 50rpx 0;
+
+			.item {
+				position: relative;
+				width: 630rpx;
+				margin: 30rpx auto;
+				padding: 30rpx;
+				border-radius: 12rpx;
+				background-color: #FFFFFF;
+
+				.bg_image {
+					position: absolute;
+					top: 0;
+					right: 0;
+
+					text {
+						position: absolute;
+						top: 12rpx;
+						right: 30rpx;
+						font-size: 24rpx;
+						line-height: 24rpx;
+						color: #FFFFFF;
+					}
+				}
+
+				.info {
+					display: flex;
+					flex-flow: row nowrap;
+					align-items: center;
+					margin: 0 0 30rpx 0;
+
+					.title_name {
+						.title {
+							font-size: 32rpx;
+							line-height: 44rpx;
+							color: #202131;
+							font-weight: 500;
+							margin: 0 20rpx;
+						}
+
+						.time {
+							padding: 8rpx 0 0 20rpx;
+							font-size: 28rpx;
+							line-height: 32rpx;
+							color: #909097;
+
+							text:last-child {
+								padding: 0 0 0 30rpx;
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+</style>

+<template>
+	<view class="log_detail">
+
+		<scroll-view scroll-y="true" style="height: 100vh;" :scroll-with-animation="true">
+			<view class="header_box">
+				<view class="header">
+					<view class="avatar">{{getNameLastTwo(detail.studentName)}}</view>
+					<view class="form_name">
+						<view class="name">{{overflowHide(detail.studentName, 4)}}</view>
+						<view class="week">
+							<!-- <text>{{timeFormat(detail.logTime, 'yyyy年')}}</text> -->
+							<!-- <text>{{getWeek(detail.logTime)}}</text> -->
+							<text>{{getCreatedTime(detail)}}</text>
+						</view>
+					</view>
+					<view class="status" :style="{color:'#909097', backgroundColor:'#EAEAEC'}"
+						v-if="detail.status == 'read'">
+						<text>已阅</text>
+					</view>
+
+					<view class="status" v-else @click="putLog">
+						<text>未阅</text>
+					</view>
+				</view>
+			</view>
+
+			<view class="content">
+				<view class="name_time">
+					<view class="title">{{detail.title}}</view>
+					<view class="time">创建时间：{{timeFormat(detail.createdTime)}}</view>
+				</view>
+
+				<view class="u-parse">
+					<u-parse :content="detail.content"></u-parse>
+				</view>
+
+				<view v-if="commentList.length>0" class="reply">
+					<view class="title">评论</view>
+					<view v-for="(item,index) in commentList" :key="index">
+						<view v-if="index!=0" class="divide_line_padding"></view>
+						<view class="list">
+							<view style="margin-top: 8rpx;" class="userInfo">
+								<text> {{item.name?item.name:"佚名"}}</text>
+								<text>（{{userType[item.userType]}}）</text>
+							</view>
+							<view class="replyTime" style="margin-top: 8rpx;">{{timeFormat(item.createdTime)}}</view>
+							<view class="describe" style="margin-top: 8rpx;">{{item.content}}</view>
+							<view v-if="false" class="" v-for="(item1,index) in item.replies">
+								<view class="reply_bg">
+									{{item1}}
+								</view>
+							</view>
+						</view>
+					</view>
+				</view>
+			</view>
+		</scroll-view>
+
+
+
+		<view class="nextPage">
+			<u-icon name="arrow-down" size="36"></u-icon>
+		</view>
+
+		<view class="footer">
+			<view class="divide_line"></view>
+			<input class="uni-input" placeholder="这么精彩，不说点什么吗？" :value="reply" confirm-type="send" @confirm="goReply" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+
+	import {
+		getLogDetailApi,
+		putLogReviewApi,
+		getLogReplyListApi,
+		postLogReplyApi,
+	} from '@/config/api.js';
+	export default {
+		data() {
+			return {
+				id: "",
+				formLogId: "",
+				show: false,
+				reply: '',
+				content: "",
+				style: {
+					// 字符串的形式
+					p: 'color: red;font-size:32rpx',
+					span: 'font-size: 30rpx'
+				},
+				detail: {},
+				userType: {
+					"student": "学生",
+					"teacher": "学校",
+					"company": "企业"
+				},
+				commentList: [],
+			}
+		},
+
+		onLoad(option) {
+
+			this.id = option.id;
+			getLogDetailApi(option.id).then(data => {
+				if (data) {
+					this.detail = data
+				}
+			})
+
+			this.getCommentList()
+
+		},
+
+		methods: {
+			getCreatedTime(e) {
+				console.log(e)
+				let time = this.$u.timeFormat(e.logTime / 1000, 'yyyy/mm/dd');
+				if (e.category == "weekly") {
+					time = new Date(e.logTime).getFullYear() + "年第" + (this.getWeek(e.logTime) + 1) + "周";
+				} else if (e.category == "monthly") {
+					time = this.$u.timeFormat(e.logTime / 1000, 'yyyy年mm月');
+				}
+				return time
+			},
+
+			getWeek(dt) {
+				if (dt > 0) {
+					let d1 = new Date(dt);
+					let d2 = new Date(dt);
+					d2.setMonth(0);
+					d2.setDate(1);
+					let rq = d1 - d2;
+					let days = Math.ceil(rq / (24 * 60 * 60 * 1000));
+					let num = Math.ceil(days / 7);
+					return num;
+				} else {
+					return '';
+				}
+			},
+
+			getNameLastTwo(value) {
+
+				if (value && value.length > 3) {
+					return value.substring(value.length - 3)
+				} else {
+					return value;
+				}
+			},
+
+			overflowHide(value, num = 4) {
+				if (value && value.length > num) {
+					return `${value.slice(0, num)}...`
+				} else {
+					return value;
+				}
+			},
+
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+
+			putLog() {
+				putLogReviewApi({
+					ids: [this.id]
+				}).then(data => {
+					if (data) {
+						getLogDetailApi(this.id).then(result => {
+							if (result) {
+								this.detail = result
+							}
+						})
+					}
+				})
+			},
+
+			getCommentList() {
+				getLogReplyListApi({
+					formLogId: this.id
+				}).then(data => {
+					if (data) {
+						this.commentList = data.records;
+					}
+				})
+			},
+
+			goReply(e) { //回复评论
+				console.log(e)
+				this.reply = e.target.value
+				postLogReplyApi({
+					formLogId: this.id,
+					content: e.target.value
+				}).then(data => {
+					this.reply = ''
+					this.getCommentList()
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.log_detail {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+
+		.nextPage {
+			position: fixed;
+			bottom: 20vh;
+			right: 30rpx;
+			background-color: #FFFFFF;
+			padding: 12rpx;
+			border-radius: 8rpx;
+		}
+
+		.header_box {
+			background-color: #FFFFFF;
+
+			.header {
+				display: flex;
+				flex-flow: row nowrap;
+				align-items: center;
+				padding: 52rpx 0;
+				margin: 0 30rpx;
+				position: relative;
+				border-bottom: 2rpx solid #E2E2E8;
+				background-color: #FFFFFF;
+
+				.avatar {
+					width: 94rpx;
+					height: 94rpx;
+					border-radius: 4rpx;
+					background-color: #06B079;
+					font-size: 24rpx;
+					line-height: 94rpx;
+					color: #FFFFFF;
+					text-align: center;
+				}
+
+				.form_name {
+					.name {
+						font-size: 32rpx;
+						line-height: 44rpx;
+						color: #202131;
+						font-weight: 500;
+						margin: 0 20rpx;
+					}
+
+					.week {
+						padding: 8rpx 0 0 0;
+						font-size: 24rpx;
+						line-height: 32rpx;
+						color: #909097;
+
+						text {
+							padding: 8rpx 0 0 20rpx;
+						}
+					}
+				}
+
+				.status {
+					font-size: 24rpx;
+					line-height: 34rpx;
+					color: #FFFFFF;
+					width: 112rpx;
+					height: 48rpx;
+					line-height: 48rpx;
+					text-align: center;
+					border-radius: 200rpx;
+					background-color: #06B079;
+					position: absolute;
+					top: 74rpx;
+					right: 0;
+				}
+			}
+		}
+
+		.content {
+
+			padding: 16rpx 0 150rpx;
+
+			.name_time {
+				background-color: #FFFFFF;
+				padding: 26rpx 30rpx;
+
+				.title {
+					font-size: 36rpx;
+					line-height: 50rpx;
+					color: #06B079;
+				}
+
+				.time {
+					padding: 6rpx 0 0 0;
+					font-size: 24rpx;
+					line-height: 32rpx;
+					color: #909097;
+					padding: 0 0 26rpx 0;
+				}
+			}
+
+			.u-parse {
+				background-color: #FFFFFF;
+				padding: 0 30rpx 50rpx;
+				font-size: 28rpx;
+				line-height: 36rpx;
+				color: #4A4A53;
+			}
+
+			.reply {
+				background-color: #fff;
+				padding: 50rpx 30rpx 150rpx;
+				margin: 16rpx 0 0 0;
+
+				.title {
+					font-size: 34rpx;
+					line-height: 48rpx;
+					color: #202131;
+				}
+
+				.list {
+					padding: 32rpx;
+					border-bottom: 2rpx solid #E2E2E8;
+
+					.userInfo {
+						color: rgba(0, 0, 0, 0.4500);
+						font-size: 28rpx;
+						line-height: 40rpx;
+					}
+
+					.replyTime {
+						color: rgba(0, 0, 0, 0.4500);
+						font-size: 26rpx;
+						line-height: 36rpx;
+					}
+
+
+				}
+
+				.reply_bg {
+					background: rgba(0, 0, 0, 0.03);
+					border-radius: 8rpx;
+					padding: 20rpx 32rpx;
+					margin-top: 16rpx;
+				}
+			}
+		}
+
+	}
+
+	.footer {
+		width: 100%;
+		height: 130rpx;
+		background: #fff;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		z-index: 99;
+
+		.uni-input {
+			height: 96rpx;
+			background: rgba(0, 0, 0, 0.04);
+			border-radius: 8rpx;
+			margin: 10rpx 32rpx 32rpx 32rpx;
+			padding: 0 20rpx;
+		}
+	}
+</style>

+<template>
+	<view class="registration_review">
+		<view class="search_box">
+			<view class="check">
+				<u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
+					<u-checkbox :customStyle="{marginBottom: '8px'}" shape="circle"
+						v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name"
+						activeColor="#06B079" size="28rpx" labelSize="28rpx" labelColor="#202131">
+					</u-checkbox>
+				</u-checkbox-group>
+			</view>
+
+			<view class="search">
+				<u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
+					bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
+				</u-search>
+			</view>
+
+			<u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
+		</view>
+
+		<u-sticky bgColor="#fff">
+			<u-tabs :list="tabs" :scrollable="false" lineWidth="30rpx" lineHeight="4rpx" lineColor="#06B079"
+				:inactiveStyle="{fontSize:'28rpx', color:'#4A4A53'}" :activeStyle="{fontSize:'36rpx', color:'#06B079'}"
+				@change="handelTab" :current="current">
+			</u-tabs>
+		</u-sticky>
+
+		<view class="list_box" v-if="list.length > 0">
+			<view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
+
+				<view class="bg_image" v-if="item.status == 'unread'">
+					<u-image src="/static/img/home/labelBgGreen.png" width="142rpx" height="48rpx"></u-image>
+					<text>未阅</text>
+				</view>
+
+				<view class="bg_image" v-else>
+					<u-image src="/static/img/home/labelBgGrey.png" width="142rpx" height="48rpx"></u-image>
+					<text>已阅</text>
+				</view>
+
+				<view class="info">
+					<view class="avatar">{{getNameLastTwo(item.studentName)}}</view>
+					<view class="form_name">
+						<view class="name">{{overflowHide(item.title, 10)}}</view>
+						<view class="week">
+							<!-- <text>{{timeFormat(item.logTime, 'yyyy年')}}</text> -->
+							<!-- <text>{{getWeek(item.logTime)}}</text> -->
+							<text>{{getCreatedTime(item)}}</text>
+							
+						</view>
+					</view>
+				</view>
+				<view class="u-content">
+					<u-parse :content="item.content"></u-parse>
+				</view>
+				<view class="name_time">
+					<view class="name">
+						<text>学生姓名</text>
+						<text>{{item.studentName}}</text>
+					</view>
+					<view class="time">{{timeFormat(item.createdTime)}}</view>
+				</view>
+
+			</view>
+			<c-loading :loading="loading"></c-loading>
+		</view>
+		<view v-else class="no_data">
+			<c-no-data></c-no-data>
+		</view>
+
+		<u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
+			<view class="popup_search">
+				<view class="content">
+					<view class="title">按项目筛选</view>
+					<scroll-view class="scroll" scroll-y="true">
+						<view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
+							<view class="selectItem" v-if="item.id == projectId">
+								<text>{{item.name}}</text>
+							</view>
+							<view v-else>
+								<text>{{item.name}}</text>
+							</view>
+						</view>
+					</scroll-view>
+					<view class="switch">
+						<text>未阅</text>
+						<u-switch v-model="switchValue" size="48" activeColor="#06B079" @change="handelChange">
+						</u-switch>
+					</view>
+				</view>
+
+				<view class="footer">
+					<view class="left_btn">
+						<c-button type="cancel" text="重置" @click="handelCancel">
+						</c-button>
+					</view>
+					<view class="right_btn">
+						<c-button type="confirm" text="确定" @click="hancelSubmit">
+						</c-button>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+	import listMixin from "@/common/mixins/list-mixin.js";
+
+	import {
+		getLogReviewListApi,
+		getProjectListApi,
+	} from '@/config/api.js';
+
+	export default {
+		mixins: [listMixin],
+		data() {
+			return {
+				studentId: '',
+				checkboxValue: [],
+				checkboxList: [{
+					name: '未阅',
+					disabled: false
+				}],
+				keyword: '',
+				search: {
+					//搜索对象必须为key search的对象
+					keySearch: "",
+					status: '',
+					category: 'daily',
+
+				},
+				show: false, //筛选
+				current: 0,
+				tabs: [{
+					name: '日志',
+				}, {
+					name: '周志',
+				}, {
+					name: '月志'
+				}],
+
+				list: [], //列表必须为key list的数组
+
+				projectId: '',
+				showTime: false,
+				timeValue: '',
+				switchValue: false,
+
+			}
+		},
+
+		onLoad(option) {
+			console.log(option)
+			this.studentId = option.studentId;
+			this.projectId = option.projectId;
+
+			this.$store.dispatch(`home/getProjectList`, {
+				pageSize: -1,
+			})
+
+			this.search.keySearch = '';
+
+			if (option && option.category) {
+				this.search.category = option.category;
+				this.current =
+					option.category == 'daily' ? 0 :
+					option.category == 'weekly' ? 1 :
+					option.category == 'monthly' ? 2 :
+					'';
+			}
+			
+			if (option && option.status) {
+				this.search.status = 'unread';
+				this.checkboxValue = ['未阅'];
+				this.switchValue = true;
+			}
+
+			this.finished = false;
+			this.loading = "loadmore";
+			this.page = 0;
+			this.list = [];
+		},
+
+		onShow() {
+			this._getList();
+		},
+
+		computed: {
+			...mapState('home', {
+				// 箭头函数可使代码更简练
+				projectList: 'projectList',
+			}),
+		},
+
+		methods: {
+			
+			getCreatedTime(e) {
+				let time = this.$u.timeFormat(e.logTime / 1000, 'yyyy/mm/dd');
+				if (e.category == "weekly") {
+					time = new Date(e.logTime).getFullYear() + "年第" + (this.getWeek(e.logTime) + 1) + "周";
+				} else if (e.category == "monthly") {
+					time = this.$u.timeFormat(e.logTime / 1000, 'yyyy年mm月');
+				}
+				return time
+			},
+
+			getWeek(dt) {
+				if (dt > 0) {
+					let d1 = new Date(dt);
+					let d2 = new Date(dt);
+					d2.setMonth(0);
+					d2.setDate(1);
+					let rq = d1 - d2;
+					let days = Math.ceil(rq / (24 * 60 * 60 * 1000));
+					let num = Math.ceil(days / 7);
+					return num;
+				} else {
+					return '';
+				}
+			},
+
+			getNameLastTwo(value) {
+				if (value && value.length > 3) {
+					return value.substring(value.length - 3)
+				} else {
+					return value;
+				}
+			},
+
+			overflowHide(value, num = 4) {
+				if (value && value.length > num) {
+					return `${value.slice(0, num)}...`
+				} else {
+					return value;
+				}
+			},
+
+			handelTab(item) {
+				let category = item.index === 0 ? 'daily' : item.index === 1 ? 'weekly' : item.index === 2 ? 'monthly' :
+					'';
+
+				this.search.category = category;
+
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+
+			},
+
+			handelDetail(record) {
+				this.$u.route({
+					url: `pages/main/home/logDetail/logDetail?id=${record.id}&formId=${record.formId}`
+				})
+			},
+
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+
+			checkboxChange(n) {
+				console.log('change', n);
+
+				this.search.status = n.length > 0 ? 'unread' : '';
+
+				this.switchValue = n.length > 0 ? true : false;
+
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+			handelSearch(value) {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+			open() {
+
+			},
+
+			close() {
+				this.show = false
+			},
+
+			// scroll-view到底部加载更多
+			onreachBottom() {},
+			// 搜索
+			searchSubmit() {
+				// 调用混合搜索
+				this._searchData();
+			},
+			// 模拟后端分页
+			async getData(requestParams) {
+				const {
+					search = {}
+				} = requestParams;
+
+				let params = {};
+				params.pageNumber = requestParams.page + 1;
+				params.pageSize = 5;
+
+				if (search.status) {
+					params.status = search.status;
+				}
+
+				if (search.category) {
+					params.category = search.category;
+				}
+
+				if (this.keyword) {
+					params.keySearch = this.keyword
+				}
+				
+				if (this.studentId) {
+					params.studentId = this.studentId
+				}
+
+				if (this.projectId) {
+					params.projectId = this.projectId
+				}
+
+				return await getLogReviewListApi(params);
+			},
+			// 数据请求(没错就是这么少的代码)
+			async _getList() {
+				if (this.page == 0) {
+					this.list = [];
+				}
+
+				// 根据实际情况修改自己修改key
+				let result = await this.getData({
+					page: this.page, // 传入页码
+					size: this.size, // 传入每页条数
+					search: this.search, // 传入搜索的对象
+				});
+
+				this.total = result.total;
+
+				if (this.list.length == 0 && result.records.length == 0) {
+					this.shownoData = false
+				} else {
+					this.shownoData = true
+				}
+
+				this.list = this.list.concat(result.records)
+				
+				// 判断是否全部加载完成
+				if (this.total == this.list.length) {
+					this.finished = true;
+					this.loading = 'nomore';
+				} else {
+					this.loading = 'loadmore';
+				}
+			},
+
+			handelClick(values) {
+				this.projectId = values.id;
+			},
+
+			handelChange(e) {
+				this.checkboxValue = e ? ['未阅'] : [];
+				this.search.status = e ? 'unread' : '';
+
+			},
+
+			handelCancel() {
+				this.switchValue = false;
+				this.projectId = '';
+			},
+
+			hancelSubmit() {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+
+				this.show = false;
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.registration_review {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+
+		.search_box {
+			padding: 36rpx 30rpx 12rpx;
+			background-color: #FFFFFF;
+			display: flex;
+			flex-flow: row nowrap;
+			justify-content: space-between;
+
+			.check {
+				padding: 20rpx 0 0 0;
+			}
+
+			.search {
+				width: 468rpx;
+			}
+		}
+
+		.list_box {
+			padding: 0 0 50rpx 0;
+
+			.item {
+				position: relative;
+				width: 630rpx;
+				margin: 30rpx auto;
+				padding: 30rpx;
+				border-radius: 12rpx;
+				background-color: #FFFFFF;
+
+				.bg_image {
+					position: absolute;
+					top: 0;
+					right: 0;
+
+					text {
+						position: absolute;
+						top: 12rpx;
+						right: 30rpx;
+						font-size: 24rpx;
+						line-height: 24rpx;
+						color: #FFFFFF;
+					}
+				}
+
+				.info {
+					display: flex;
+					flex-flow: row nowrap;
+					align-items: center;
+					margin: 0 0 30rpx 0;
+
+					.avatar {
+						width: 94rpx;
+						height: 94rpx;
+						border-radius: 4rpx;
+						background-color: #06B079;
+						font-size: 24rpx;
+						line-height: 94rpx;
+						color: #FFFFFF;
+						text-align: center;
+					}
+
+					.form_name {
+						.name {
+							font-size: 32rpx;
+							line-height: 44rpx;
+							color: #202131;
+							font-weight: 500;
+							margin: 0 20rpx;
+						}
+
+						.week {
+							padding: 8rpx 0 0 0;
+							font-size: 20rpx;
+							line-height: 32rpx;
+							color: #909097;
+
+							// padding: 0 0 0 20rpx;
+							text {
+								padding: 8rpx 0 0 20rpx;
+							}
+						}
+					}
+				}
+
+				.u-content {
+					font-size: 24rpx;
+					line-height: 32rpx;
+					color: #909097;
+					margin: 32rpx 0 30rpx 0;
+					max-height: 100rpx;
+					overflow: hidden;
+				}
+
+				.name_time {
+					border-top: 2rpx solid #E2E2E8;
+					padding: 28rpx 0 0 0;
+					display: flex;
+					flex-flow: row nowrap;
+					justify-content: space-between;
+
+
+					.name {
+						text {
+							font-size: 28rpx;
+							line-height: 32rpx;
+							color: #909097;
+						}
+
+						text:last-child {
+							color: #202131;
+							margin: 0 0 0 30rpx;
+						}
+					}
+
+					.time {
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #909097;
+					}
+				}
+			}
+		}
+
+		.popup_search {
+			width: 640rpx;
+			position: relative;
+
+			.content {
+				padding: 0 40rpx;
+
+				.title {
+					padding: 24rpx 0;
+					font-size: 28rpx;
+					line-height: 36rpx;
+					color: #202131;
+				}
+
+				.scroll {
+					max-height: 60vh;
+				
+					.item {
+						
+						view {
+							display: flex;
+							flex-flow: row wrap;
+							align-items: center;
+							width: 500rpx;
+							height: 74rpx;
+							border-radius: 4rpx;
+							border: 2rpx solid #C1C1C9;
+							margin: 0 10rpx 20rpx;
+							font-size: 24rpx;
+							line-height: 32rpx;
+							color: #C0C0C9;
+							padding: 16rpx 20rpx;
+						}
+						
+						.selectItem {
+							background-color: #06B079;
+							color: #FFFFFF;
+							border: 2rpx solid #06B079;
+						}
+					}
+				}
+
+				.time {
+					padding: 40rpx 0 0 0;
+				}
+
+				.switch {
+					display: flex;
+					flex-flow: row nowrap;
+					justify-content: space-between;
+					padding: 40rpx 0 0 0;
+
+					text {
+						font-size: 28rpx;
+						line-height: 36rpx;
+						color: #202131;
+					}
+				}
+
+
+			}
+
+			.footer {
+				width: 560rpx;
+				height: 96rpx;
+				padding: 28rpx 40rpx;
+				background: #FFFFFF;
+				position: fixed;
+				bottom: 0;
+				right: 0;
+				z-index: 99;
+				border-top: 2rpx solid #E2E2E8;
+
+				view {
+					display: inline-block;
+				}
+
+				.left_btn {
+					width: 194rpx;
+					margin: 0 20rpx 0 0;
+				}
+
+				.right_btn {
+					width: 346rpx;
+				}
+			}
+		}
+	}
+</style>

+<template>
+	<view class="registration_detail">
+
+		<view class="box student_info">
+			<view class="title">学生信息</view>
+			<view class="item">
+				<text>学生姓名</text>
+				<text>{{registrationDetail.studentName}}</text>
+			</view>
+			<view class="item">
+				<text>手机号</text>
+				<text>{{registrationDetail.studentPhone}}</text>
+			</view>
+			<view class="item">
+				<text>学号</text>
+				<text>{{registrationDetail.studentNumber}}</text>
+			</view>
+			<view class="item">
+				<text>班级</text>
+				<text>{{registrationDetail.classInfo}}</text>
+			</view>
+
+			<view class="icon_item">
+				<u-icon size="32rpx" label="实习项目" labelSize="28rpx" labelColor="#909097"
+					name="/static/img/home/internshipProgramIcon.png"></u-icon>
+				<text>{{registrationDetail.projectName}}</text>
+			</view>
+
+			<view class="border_top item">
+				<text>申请时间</text>
+				<text>{{timeFormat(registrationDetail.applyTime, 'yyyy-mm-dd hh:MM')}}</text>
+			</view>
+		</view>
+
+		<view class="box company_info">
+			<view class="title">单位信息</view>
+			<view class="icon_item">
+				<u-icon size="32rpx" label="实习单位" labelSize="28rpx" labelColor="#909097"
+					name="/static/img/home/internshipUnitIcon.png"></u-icon>
+				<text>{{registrationDetail.companyName}}</text>
+			</view>
+			<view class="icon_item">
+				<u-icon size="32rpx" label="实习岗位" labelSize="28rpx" labelColor="#909097"
+					name="/static/img/home/internshipJobIcon.png"></u-icon>
+				<text>{{registrationDetail.jobName}}</text>
+			</view>
+			<view class="border_top item">
+				<text>联系人</text>
+				<text>{{jobDetail.contactName}}</text>
+			</view>
+			<view class="item">
+				<text>联系电话</text>
+				<text>{{jobDetail.contactPhone}}</text>
+			</view>
+			<view class="item">
+				<text>所在地区</text>
+				<text>{{address}}</text>
+			</view>
+			<view class="item">
+				<text>详细地址</text>
+				<text>{{jobDetail.workSite}}</text>
+			</view>
+		</view>
+
+		<view class="box status">
+			<view class="title">状态</view>
+			<view class="item">
+				<text>审核状态</text>
+				<text>{{reviewStatus}}</text>
+			</view>
+			<view class="item">
+				<text>审核人</text>
+				<text>{{registrationDetail.auditTeacherName}}</text>
+			</view>
+			<view class="item">
+				<text>接受状态</text>
+				<text>{{receiveStatus}}</text>
+			</view>
+		</view>
+
+		<view class="footer" v-if="registrationDetail.status == 'wait'">
+			<view class="left_btn">
+				<c-button type="cancel" text="审核拒绝" @click="handelCancel">
+				</c-button>
+			</view>
+			<view class="right_btn">
+				<c-button type="confirm" text="审核通过" @click="hancelSubmit">
+				</c-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getRegistrationDetailApi,
+		putRegistrationReviewApi,
+	} from '@/config/api.js';
+
+	export default {
+		data() {
+			return {
+				registrationDetail: {},
+			}
+		},
+
+		onLoad(option) {
+			getRegistrationDetailApi(option.id).then(data => {
+				if (data) {
+					console.log(data)
+					this.registrationDetail = data
+				}
+			})
+
+		},
+
+		onShow(options) {
+
+		},
+
+		computed: {
+			jobDetail: function() {
+				let {
+					jobDetail = {}
+				} = this.registrationDetail
+				return jobDetail;
+			},
+
+			address: function() {
+				return this.jobDetail && this.jobDetail.province ?
+					`${this.jobDetail.province}/${this.jobDetail.city}/${this.jobDetail.district}` : '';
+
+			},
+
+			reviewStatus: function() {
+				return this.registrationDetail.status == 'apply' ? '待报名' :
+					this.registrationDetail.status == 'wait' ? '待审核' :
+					this.registrationDetail.status == 'pass' ? '已审核' :
+					this.registrationDetail.status == 'reject' ? '已拒绝' : '';
+			},
+
+			receiveStatus: function() {
+				return this.registrationDetail.receiveStatus == 'received' ? '已接收' :
+					this.registrationDetail.receiveStatus == 'wait' ? '待处理' :
+					this.registrationDetail.receiveStatus == 'reject' ? '已拒绝' :
+					'';
+			},
+		},
+
+		methods: {
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+
+			handelCancel() {
+				putRegistrationReviewApi({
+					formIds: [this.registrationDetail.id],
+					status: 'reject',
+				}).then(data => {
+					if (data) {
+						uni.navigateBack({
+							delta: 1
+						});
+					}
+				})
+			},
+
+			hancelSubmit() {
+				putRegistrationReviewApi({
+					formIds: [this.registrationDetail.id],
+					status: 'pass',
+				}).then(data => {
+					if (data) {
+						uni.navigateBack({
+							delta: 1
+						});
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.registration_detail {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		padding: 20rpx 0 194rpx 0;
+		background-color: #F7F7F7;
+
+		.box {
+			width: 630rpx;
+			margin: 0 auto 20rpx;
+			padding: 30rpx 30rpx 12rpx 30rpx;
+			border-radius: 12rpx;
+			background-color: #FFFFFF;
+
+			.title {
+				font-size: 32rpx;
+				line-height: 32rpx;
+				color: #202131;
+				margin: 0 0 30rpx 0;
+			}
+
+			.title::before {
+				content: "";
+				display: inline-block;
+				width: 6rpx;
+				height: 32rpx;
+				background-color: #06B079;
+				margin: 0 12rpx 0 0;
+				position: relative;
+				top: 4rpx;
+				border-radius: 8rpx;
+			}
+
+			.icon_item {
+				display: flex;
+				flex-flow: row nowrap;
+				margin: 0 0 24rpx 0;
+
+				text {
+					display: inline-block;
+					width: 460rpx;
+					font-size: 28rpx;
+					line-height: 48rpx;
+					color: #202131;
+					margin: 0 0 0 40rpx;
+				}
+			}
+
+			.item {
+				margin: 0 0 24rpx 0;
+
+				text:first-child {
+					display: inline-block;
+					width: 112rpx;
+					text-align: justify;
+					text-align-last: justify;
+					font-size: 28rpx;
+					line-height: 48rpx;
+					color: #909097;
+					vertical-align: top;
+				}
+
+				text:last-child {
+					display: inline-block;
+					width: 440rpx;
+					font-size: 28rpx;
+					line-height: 48rpx;
+					color: #202131;
+					margin: 0 0 0 78rpx;
+				}
+			}
+
+			.border_top {
+				border-top: 2rpx solid #E2E2E8;
+				padding: 28rpx 0 0 0;
+			}
+		}
+
+		.footer {
+			width: 100%;
+			height: 96rpx;
+			padding: 28rpx 30rpx;
+			background: #FFFFFF;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			z-index: 99;
+			border-top: 2rpx solid #E2E2E8;
+
+			view {
+				display: inline-block;
+			}
+
+			.left_btn {
+				width: 330rpx;
+				margin: 0 30rpx 0 0;
+			}
+
+			.right_btn {
+				width: 330rpx;
+			}
+		}
+
+	}
+</style>

+<template>
+	<view class="registration_review">
+		<view class="search_box">
+			<view class="check">
+				<u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
+					<u-checkbox :customStyle="{marginBottom: '8px'}" shape="circle"
+						v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name"
+						activeColor="#06B079" size="28rpx" labelSize="28rpx" labelColor="#202131">
+					</u-checkbox>
+				</u-checkbox-group>
+			</view>
+
+			<view class="search">
+				<u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
+					bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
+				</u-search>
+			</view>
+
+			<u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
+		</view>
+
+		<view class="list_box" v-if="list.length > 0">
+			<view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
+
+				<view class="bg_image" v-if="item.status == 'wait'">
+					<u-image src="/static/img/home/labelBgGreen.png" width="142rpx" height="48rpx"></u-image>
+					<text>待审核</text>
+				</view>
+
+				<view class="bg_image" v-if="item.status == 'pass'">
+					<u-image src="/static/img/home/labelBgGrey.png" width="142rpx" height="48rpx"></u-image>
+					<text>已通过</text>
+				</view>
+
+				<view class="bg_image" v-if="item.status == 'reject'">
+					<u-image src="/static/img/home/labelBgGrey.png" width="142rpx" height="48rpx"></u-image>
+					<text>已拒绝</text>
+				</view>
+
+				<view class="name">{{item.studentName}}</view>
+				<view class="company">
+					<u-icon size="32rpx" name="/static/img/home/internshipUnitIcon.png"></u-icon>
+					<text>实习单位</text>
+					<text>{{item.companyName || '--'}}</text>
+				</view>
+				<view class="company position">
+					<u-icon size="32rpx" name="/static/img/home/internshipJobIcon.png"></u-icon>
+					<text>实习岗位</text>
+					<text>{{item.jobName|| '--'}}</text>
+				</view>
+
+				<view class="time">
+					<text>申请时间</text>
+					<text>{{timeFormat(item.applyTime, 'yyyy-mm-dd hh:MM')}}</text>
+				</view>
+
+			</view>
+			<c-loading :loading="loading"></c-loading>
+		</view>
+		<view v-else class="no_data">
+			<c-no-data></c-no-data>
+		</view>
+
+		<u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
+			<view class="popup_search">
+				<view class="content">
+					<view class="title">按项目筛选</view>
+					<scroll-view class="scroll" scroll-y="true">
+						<view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
+							<view class="selectItem" v-if="item.id == projectId">
+								<text>{{item.name}}</text>
+							</view>
+							<view v-else>
+								<text>{{item.name}}</text>
+							</view>
+						</view>
+					</scroll-view>
+					<view class="switch">
+						<text>待审核</text>
+						<u-switch v-model="switchValue" size="48" activeColor="#06B079" @change="handelChange">
+						</u-switch>
+					</view>
+				</view>
+
+				<view class="footer">
+					<view class="left_btn">
+						<c-button type="cancel" text="重置" @click="handelCancel">
+						</c-button>
+					</view>
+					<view class="right_btn">
+						<c-button type="confirm" text="确定" @click="hancelSubmit">
+						</c-button>
+					</view>
+				</view>
+
+			</view>
+		</u-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+	import listMixin from "@/common/mixins/list-mixin.js";
+
+	import {
+		getRegistrationReviewApi,
+		getProjectListApi,
+	} from '@/config/api.js';
+
+	export default {
+		mixins: [listMixin],
+		data() {
+			return {
+				checkboxValue: [],
+				// 基本案列数据
+				checkboxList: [{
+					name: '待审核',
+					disabled: false
+				}],
+				keyword: '',
+				show: false,
+				list: [], //列表必须为key list的数组
+				search: {
+					//搜索对象必须为key search的对象
+					keySearch: "",
+					status: 'wait,pass,reject',
+
+				},
+				projectId: '',
+				switchValue: false,
+			}
+		},
+
+		onLoad(option) {
+			console.log(option)
+			this.$store.dispatch(`home/getProjectList`, {
+				pageSize: -1,
+			})
+
+			this.search.keySearch = '';
+
+			if (option && option.status) {
+				this.search.status = 'wait';
+				this.checkboxValue = ['待审核'];
+				this.switchValue = true;
+			}
+
+			this.finished = false;
+			this.loading = "loadmore";
+			this.page = 0;
+			this.list = [];
+
+		},
+
+		onShow() {
+			this._getList();
+		},
+
+		computed: {
+			...mapState('home', {
+				// 箭头函数可使代码更简练
+				projectList: 'projectList',
+
+			}),
+
+		},
+
+		methods: {
+
+			handelDetail(record) {
+				this.$u.route({
+					url: `pages/main/home/registrationDetail/registrationDetail?&id=${record.id}`
+				})
+			},
+
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+
+			checkboxChange(n) {
+				console.log('change', n);
+
+				this.search.status = n.length > 0 ? 'wait' : 'wait,pass,reject';
+
+				this.switchValue = n.length > 0 ? true : false;
+
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+			handelSearch(value) {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+			open() {
+				// console.log('open');
+			},
+			close() {
+				this.show = false
+				// console.log('close');
+			},
+			// scroll-view到底部加载更多
+			onreachBottom() {},
+			// 搜索
+			searchSubmit() {
+				// 调用混合搜索
+				this._searchData();
+			},
+			// 模拟后端分页
+			async getData(requestParams) {
+				const {
+					search = {}
+				} = requestParams;
+
+				let params = {};
+				params.pageNumber = requestParams.page + 1;
+				params.pageSize = 5;
+
+				if (search.status) {
+					params.status = search.status;
+				}
+
+				if (this.keyword) {
+					params.keySearch = this.keyword
+				}
+
+				if (this.projectId) {
+					params.projectId = this.projectId
+				}
+
+				return await getRegistrationReviewApi(params);
+			},
+			// 数据请求(没错就是这么少的代码)
+			async _getList() {
+				if (this.page == 0) {
+					this.list = [];
+				}
+
+				// 根据实际情况修改自己修改key
+				let result = await this.getData({
+					page: this.page, // 传入页码
+					size: this.size, // 传入每页条数
+					search: this.search, // 传入搜索的对象
+				});
+
+				this.total = result.total;
+
+				if (this.list.length == 0 && result.records.length == 0) {
+					this.shownoData = false
+				} else {
+					this.shownoData = true
+				}
+
+				this.list = this.list.concat(result.records)
+
+				// 判断是否全部加载完成
+				if (this.total == this.list.length) {
+					this.finished = true;
+					this.loading = 'nomore';
+				} else {
+					this.loading = 'loadmore';
+				}
+			},
+
+			handelClick(values) {
+				console.log(values);
+				this.projectId = values.id;
+			},
+
+			handelChange(e) {
+				console.log(e)
+				this.checkboxValue = e ? ['待审核'] : [];
+				this.search.status = e ? 'wait' : 'wait,pass,reject';
+
+			},
+
+			handelCancel() {
+				this.switchValue = false;
+				this.projectId = '';
+			},
+
+			hancelSubmit() {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+
+				this.show = false;
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.registration_review {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+
+		.search_box {
+			padding: 36rpx 30rpx 12rpx;
+			background-color: #FFFFFF;
+			display: flex;
+			flex-flow: row nowrap;
+			justify-content: space-between;
+
+			.check {
+				padding: 20rpx 0 0 0;
+			}
+
+			.search {
+				width: 468rpx;
+			}
+		}
+
+		.list_box {
+			padding: 0 0 50rpx 0;
+
+			.item {
+				position: relative;
+				width: 630rpx;
+				margin: 30rpx auto;
+				padding: 30rpx;
+				border-radius: 12rpx;
+				background-color: #FFFFFF;
+
+				.bg_image {
+					position: absolute;
+					top: 0;
+					right: 0;
+
+					text {
+						position: absolute;
+						top: 12rpx;
+						right: 30rpx;
+						font-size: 24rpx;
+						line-height: 24rpx;
+						color: #FFFFFF;
+					}
+				}
+
+				.name {
+					font-size: 32rpx;
+					line-height: 44rpx;
+					color: #202131;
+					font-weight: 500;
+					margin: 0 0 30rpx 0;
+				}
+
+				.company {
+					display: flex;
+					flex-flow: row nowrap;
+					margin: 0 0 30rpx 0;
+
+					text {
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #909097;
+						margin: 0 0 0 16rpx;
+					}
+
+					text:last-child {
+						color: #202131;
+						margin: 0 0 0 30rpx;
+					}
+				}
+
+				.time {
+					border-top: 2rpx solid #E2E2E8;
+					padding: 28rpx 0 0 0;
+
+					text {
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #909097;
+					}
+
+					text:last-child {
+						color: #202131;
+						margin: 0 0 0 78rpx;
+					}
+				}
+			}
+		}
+
+		.popup_search {
+			width: 640rpx;
+			position: relative;
+
+			.content {
+				padding: 0 40rpx;
+
+				.title {
+					padding: 24rpx 0;
+					font-size: 28rpx;
+					line-height: 36rpx;
+					color: #202131;
+				}
+
+				.scroll {
+					max-height: 60vh;
+
+					.item {
+						
+						view {
+							display: flex;
+							flex-flow: row wrap;
+							align-items: center;
+							width: 500rpx;
+							height: 74rpx;
+							border-radius: 4rpx;
+							border: 2rpx solid #C1C1C9;
+							margin: 0 10rpx 20rpx;
+							font-size: 24rpx;
+							line-height: 32rpx;
+							color: #C0C0C9;
+							padding: 16rpx 20rpx;
+						}
+						
+						.selectItem {
+							background-color: #06B079;
+							color: #FFFFFF;
+							border: 2rpx solid #06B079;
+						}
+					}
+				}
+
+				.switch {
+					display: flex;
+					flex-flow: row nowrap;
+					justify-content: space-between;
+					padding: 40rpx 0 0 0;
+
+					text {
+						font-size: 28rpx;
+						line-height: 36rpx;
+						color: #202131;
+					}
+				}
+
+
+			}
+
+			.footer {
+				width: 560rpx;
+				height: 96rpx;
+				padding: 28rpx 40rpx;
+				background: #FFFFFF;
+				position: fixed;
+				bottom: 0;
+				right: 0;
+				z-index: 99;
+				border-top: 2rpx solid #E2E2E8;
+
+				view {
+					display: inline-block;
+				}
+
+				.left_btn {
+					width: 194rpx;
+					margin: 0 20rpx 0 0;
+				}
+
+				.right_btn {
+					width: 346rpx;
+				}
+			}
+		}
+	}
+</style>

+<template>
+	<view class="report_detail">
+		<view v-if="id">
+			<view class="report_info">
+			
+				<view class="bg_image" v-if="detail.status == 'stay_examine'">
+					<u-image src="/static/img/home/labelBgGreen.png" width="142rpx" height="48rpx"></u-image>
+					<text>待审核</text>
+				</view>
+			
+				<view class="bg_image" v-else-if="detail.status == 'adopt'">
+					<u-image src="/static/img/home/labelBgGrey.png" width="142rpx" height="48rpx"></u-image>
+					<text>已通过</text>
+				</view>
+			
+				<view class="bg_image" v-else>
+					<u-image src="/static/img/home/labelBgGrey.png" width="142rpx" height="48rpx"></u-image>
+					<text>已退回</text>
+				</view>
+			
+				<view class="info">
+					<view class="avatar">{{getNameLastTwo(detail.studentName)}}</view>
+					<view class="title_name">
+						<view class="title">{{detail.title}}</view>
+						<view class="name">
+							<text>学生姓名</text>
+							<text>{{detail.studentName}}</text>
+						</view>
+					</view>
+				</view>
+			
+				<view class="time_record">
+					<text>
+						{{timeFormat(detail.createdTime, 'yyyy-mm-dd hh:MM')}}
+					</text>
+					<view class="record" @click="handelRecord">
+						<text>审批记录</text>
+						<u-icon :style="{margin:'0 0 0 8rpx'}" name="arrow-right" color="#06B079" size="28"></u-icon>
+					</view>
+				</view>
+			</view>
+			
+			<view class="box">
+				<view class="title">附件</view>
+				<view class="item" v-for="(item,index) in reportAttachments">
+					<text>报告附件</text>
+					<text :style="{color:'#06B079'}" @click="openLink(item)">{{item.filename}}</text>
+				</view>
+			</view>
+			
+			<view>
+				<view class="box file" v-if="detail.status == 'stay_examine'">
+					<view class="title">反馈附件</view>
+					<view class="icon_item" v-for="(item,index) in attachments">
+						<text @click="openLink(item)">{{item.filename}}</text>
+						<u-icon name="close" @click="deletePic(index)" width="28rpx" color="red" size="28"></u-icon>
+					</view>
+					<view class="icon_box" @click="handelFile">
+						<u-icon name="plus" width="28rpx" label="添加" labelPos="bottom" labelColor="#06B079" color="#06B079"
+							size="28"></u-icon>
+					</view>
+				</view>
+			
+				<view class="box file" v-else>
+					<view class="title">反馈附件</view>
+					<view class="icon_item" v-for="(item,index) in reviewAttachments">
+						<text @click="openLink(item)">{{item.filename}}</text>
+					</view>
+				</view>
+			</view>
+			
+			<view>
+				<view class="box" :style="{padding:'30rpx'}" v-if="detail.status == 'stay_examine'">
+					<view class="title">反馈信息</view>
+					<u-textarea v-model="textarea" placeholder="请输入内容" count></u-textarea>
+				</view>
+				<view class="box" :style="{padding:'30rpx'}" v-else>
+					<view class="title">反馈信息</view>
+					<u-textarea v-model="textarea" :disabled="true" placeholder="请输入内容" count></u-textarea>
+				</view>
+			</view>
+			
+			<view class="footer" v-if="detail.status == 'stay_examine'">
+				<view class="left_btn">
+					<c-button type="cancel" text="退回" @click="handelCancel">
+					</c-button>
+				</view>
+				<view class="right_btn">
+					<c-button type="confirm" text="通过" @click="hancelSubmit">
+					</c-button>
+				</view>
+			</view>
+		</view>
+		
+		<view v-else class="no_data">
+			<c-no-data></c-no-data>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+	import listMixin from "@/common/mixins/list-mixin.js";
+
+	import {
+		getOssInitApi,
+		getImgUrlApi,
+		getReportDetailApi,
+		putReportReviewApi,
+	} from '@/config/api.js';
+
+	export default {
+		data() {
+			return {
+				id: '',
+				formId: '',
+				detail: {},
+				reportAttachments: [],
+				reviewAttachments: [],
+				ossInit: {},
+				mFileDir: "yxly",
+				mFileType: ".doc",
+				fileList: [],
+				attachments: [],
+				show: false,
+				selector: ["上传微信文件", "上传电脑文件"],
+				maxCount: 9,
+				textarea: '',
+			}
+		},
+
+		onLoad(option) {
+			this.id = option.id;
+			this.formId = option.formId;
+			
+			if(!option.id) {
+				return;
+			}
+
+			getOssInitApi({
+				"uploadFileType": "report"
+			}).then(res => {
+				this.ossInit = res
+			})
+
+			getReportDetailApi(option.id).then(data => {
+				if (data) {
+					this.detail = data;
+					if (data.reportAttachments) {
+						this.reportAttachments = data.reportAttachments ? JSON.parse(data.reportAttachments) : [];
+						this.reviewAttachments = data.reviewAttachments ? JSON.parse(data.reviewAttachments) : [];
+						this.textarea = data.review;
+					}
+				}
+			})
+		},
+
+		methods: {
+			getNameLastTwo(value) {
+				if (value && value.length > 3) {
+					return value.substring(value.length - 3)
+				} else {
+					return value;
+				}
+			},
+
+			overflowHide(value) {
+				if (value && value.length > 4) {
+					return `${value.slice(0, 4)}...`
+				} else {
+					return value;
+				}
+			},
+
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+
+			handelRecord() {
+				this.$u.route({
+					url: `pages/main/home/approvalRecord/approvalRecord?formId=${this.detail.formId}`
+				})
+			},
+
+			openLink(e) {
+				var _this = this
+				this.mFileDir = e.filename.substring(0, e.filename.lastIndexOf('.'))
+				this.mFileType = e.filename.substring(e.filename.lastIndexOf('.'), e.filename.length)
+				getImgUrlApi({
+					bucket: e.bucket,
+					filePath: e.object
+				}).then(data => {
+					console.log("data...", data)
+					if (e.mime_type.indexOf("image") != -1) {
+						_this.openImage(data.url)
+					} else {
+						uni.downloadFile({
+							url: data.url,
+							filePath: wx.env.USER_DATA_PATH + '/' + _this.mFileDir + this.mFileType,
+							success: (res) => {
+								if (res.statusCode === 200) {
+									uni.showLoading();
+									console.log('download succ', res)
+									let fileMgr = wx.getFileSystemManager();
+									let filePath = res.filePath
+									uni.saveFile({
+										tempFilePath: filePath,
+										success: function(res) {
+											var savedFilePath = res.savedFilePath;
+											/* 删除缓存 */
+											fileMgr.unlink({
+												filePath: wx.env.USER_DATA_PATH +
+													'/' +
+													_this.mFileDir + _this
+													.mFileType,
+												success: function(res) {
+													console.log(
+														'unlink success:',
+														res);
+												}
+											})
+											_this.openDoc()
+										},
+										fail: function(res) {
+											console.log('save fail', res);
+											_this.createFile()
+										}
+									})
+								}
+							}
+						});
+					}
+				})
+			},
+
+			createFile() {
+				let fileMgr = wx.getFileSystemManager();
+				var _this = this
+				//利用access方法判断文件是否可用
+				fileMgr.access({
+					path: wx.env.USER_DATA_PATH + '/' + _this.mFileDir,
+					success: (res) => {
+						console.log('check success:', res);
+						_this.openDoc()
+					},
+					fail: (res) => {
+						console.log('check fail.', res);
+						fileMgr.mkdir({
+							dirPath: wx.env.USER_DATA_PATH + '/' + _this.mFileDir,
+							success: (res) => {
+								console.log('mk dir success:', res);
+								_this.openDoc()
+							},
+							fail: (res) => {
+								console.log('mk dir fail:', res);
+								uni.hideLoading();
+							}
+						});
+					}
+				});
+			},
+
+			openDoc() {
+				uni.openDocument({
+					filePath: wx.env.USER_DATA_PATH + '/' + this.mFileDir + this.mFileType,
+					showMenu: true,
+					success: function(res) {
+						uni.hideLoading();
+						console.log('openDoc succ');
+					}
+				});
+			},
+
+			openImage(imgPath) {
+				let array = new Array(1).fill(imgPath);
+				uni.previewImage({
+					urls: array,
+					success(res) {
+						console.log('openImage success');
+					},
+					fail(res) {
+						console.log('openImage fail:', res);
+					}
+				});
+			},
+
+			deletePic(index) {
+				this.attachments.splice(index, 1)
+			},
+
+			handelFile() {
+				let _this = this;
+
+				wx.chooseMessageFile({
+					count: 9,
+					extension: ['.doc', '.pdf', '.docx', '.png', 'jpg', 'xlsx', 'xls', '.pptx'],
+					success(res) {
+						console.log(res.tempFiles);
+
+						let files = res.tempFiles;
+
+						for (var i = 0; i < files.length; i++) {
+							uni.uploadFile({
+								url: _this.vuex_ossUrl,
+								filePath: files[i].path,
+								name: "file",
+								formData: {
+									'key': `${_this.ossInit.dir}${new Date().getTime()}/` + files[i].name,
+									'action': `${_this.ossInit.host}`,
+									'OSSAccessKeyId': _this.ossInit.accessId,
+									'policy': _this.ossInit.policy,
+									'signature': _this.ossInit.signature,
+									'callback': _this.ossInit.callback,
+								},
+								success: (uploadFileRes) => {
+									console.log('uploadFileRes...', uploadFileRes)
+									_this.attachments.push(JSON.parse(uploadFileRes.data))
+
+								},
+								complete: (res) => {
+									console.log('res...', res)
+								}
+							});
+						}
+
+
+					}
+				});
+			},
+
+			handelCancel() {
+				putReportReviewApi(this.id, {
+					status: 'return',
+					reviewAttachments: JSON.stringify(this.attachments),
+					review: this.textarea,
+				}).then(data => {
+					if (data) {
+						uni.navigateBack({
+							delta: 1
+						});
+					}
+				})
+			},
+
+			hancelSubmit() {
+				putReportReviewApi(this.id, {
+					status: 'adopt',
+					reviewAttachments: JSON.stringify(this.attachments),
+					review: this.textarea,
+				}).then(data => {
+					if (data) {
+						uni.navigateBack({
+							delta: 1
+						});
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.report_detail {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+		padding: 20rpx 0 150rpx 0;
+
+		.report_info {
+			position: relative;
+			width: 630rpx;
+			margin: 0 auto;
+			padding: 30rpx;
+			border-radius: 12rpx;
+			background-color: #FFFFFF;
+
+			.bg_image {
+				position: absolute;
+				top: 0;
+				right: 0;
+
+				text {
+					position: absolute;
+					top: 12rpx;
+					right: 30rpx;
+					font-size: 24rpx;
+					line-height: 24rpx;
+					color: #FFFFFF;
+				}
+			}
+
+			.info {
+				display: flex;
+				flex-flow: row nowrap;
+				align-items: center;
+				margin: 0 0 30rpx 0;
+
+				.avatar {
+					width: 78rpx;
+					height: 94rpx;
+					padding: 0 8rpx;
+					border-radius: 4rpx;
+					background-color: #06B079;
+					font-size: 24rpx;
+					line-height: 94rpx;
+					color: #FFFFFF;
+					text-align: center;
+				}
+
+				.title_name {
+					.title {
+						font-size: 32rpx;
+						line-height: 44rpx;
+						color: #202131;
+						font-weight: 500;
+						margin: 0 20rpx;
+					}
+
+					.name {
+						padding: 8rpx 0 0 20rpx;
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #909097;
+
+						text:last-child {
+							padding: 0 0 0 30rpx;
+							color: #202131;
+						}
+					}
+				}
+
+			}
+
+			.time_record {
+				border-top: 2rpx solid #E2E2E8;
+				padding: 28rpx 0 0 0;
+				display: flex;
+				flex-flow: row nowrap;
+				justify-content: space-between;
+
+				text {
+					font-size: 28rpx;
+					line-height: 32rpx;
+					color: #909097;
+				}
+
+				.record {
+					display: flex;
+					flex-flow: row nowrap;
+
+					text {
+						font-size: 24rpx;
+						line-height: 32rpx;
+						color: #06B079;
+					}
+				}
+			}
+		}
+
+		.box {
+			width: 630rpx;
+			margin: 20rpx auto;
+			padding: 30rpx 30rpx 12rpx 30rpx;
+			border-radius: 12rpx;
+			background-color: #FFFFFF;
+
+			.title {
+				font-size: 32rpx;
+				line-height: 32rpx;
+				color: #202131;
+				margin: 0 0 30rpx 0;
+			}
+
+			.title::before {
+				content: "";
+				display: inline-block;
+				width: 6rpx;
+				height: 32rpx;
+				background-color: #06B079;
+				margin: 0 12rpx 0 0;
+				position: relative;
+				top: 4rpx;
+				border-radius: 8rpx;
+			}
+
+
+
+			.item {
+				margin: 0 0 24rpx 0;
+
+				text:first-child {
+					display: inline-block;
+					width: 112rpx;
+					text-align: justify;
+					text-align-last: justify;
+					font-size: 28rpx;
+					line-height: 48rpx;
+					color: #909097;
+					vertical-align: top;
+				}
+
+				text:last-child {
+					display: inline-block;
+					width: 440rpx;
+					word-break: break-word;
+					font-size: 28rpx;
+					line-height: 48rpx;
+					color: #202131;
+					margin: 0 0 0 78rpx;
+				}
+			}
+
+			.border_top {
+				border-top: 2rpx solid #E2E2E8;
+				padding: 28rpx 0 0 0;
+			}
+		}
+
+		.file {
+
+			.icon_item {
+				display: flex;
+				flex-flow: row wrap;
+				margin: 0 0 12rpx 0;
+
+				text {
+					display: inline-block;
+					font-size: 28rpx;
+					line-height: 36rpx;
+					margin: 0 8rpx 12rpx 0;
+					color: #06B079;
+				}
+
+			}
+
+			.icon_box {
+				width: 70rpx;
+				border: 2rpx solid #06B079;
+				text-align: center;
+				margin: 0 auto 20rpx;
+				padding: 20rpx;
+
+				text {
+					font-size: 34rpx;
+
+				}
+			}
+		}
+
+		.footer {
+			width: 100%;
+			height: 96rpx;
+			padding: 28rpx 30rpx;
+			background: #FFFFFF;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			z-index: 99;
+			border-top: 2rpx solid #E2E2E8;
+
+			view {
+				display: inline-block;
+			}
+
+			.left_btn {
+				width: 330rpx;
+				margin: 0 30rpx 0 0;
+			}
+
+			.right_btn {
+				width: 330rpx;
+			}
+		}
+	}
+</style>

+<template>
+	<view class="registration_review">
+		<view class="search_box" v-if="!studentId">
+			<view class="top">
+				<view class="check">
+					<u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
+						<u-checkbox :customStyle="{marginBottom: '8px'}" shape="circle"
+							v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name"
+							activeColor="#06B079" size="28rpx" labelSize="28rpx" labelColor="#202131">
+						</u-checkbox>
+					</u-checkbox-group>
+				</view>
+
+				<view class="search">
+					<u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
+						bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
+					</u-search>
+				</view>
+
+				<u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
+			</view>
+		</view>
+
+		<view class="list_box" v-if="list.length > 0">
+			<view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
+
+				<view class="bg_image" v-if="item.status == 'stay_examine'">
+					<u-image src="/static/img/home/labelBgGreen.png" width="142rpx" height="48rpx"></u-image>
+					<text>待审核</text>
+				</view>
+
+				<view class="bg_image" v-else-if="item.status == 'adopt'">
+					<u-image src="/static/img/home/labelBgGrey.png" width="142rpx" height="48rpx"></u-image>
+					<text>已通过</text>
+				</view>
+
+				<view class="bg_image" v-else>
+					<u-image src="/static/img/home/labelBgGrey.png" width="142rpx" height="48rpx"></u-image>
+					<text>已退回</text>
+				</view>
+
+				<view class="info">
+					<view class="avatar">{{getNameLastTwo(item.form.studentName)}}</view>
+					<view class="title_name">
+						<view class="title">{{item.title}}</view>
+						<view class="name">
+							<text>学生姓名</text>
+							<text>{{item.form.studentName}}</text>
+						</view>
+					</view>
+				</view>
+
+				<view class="time">
+					<text>{{timeFormat(item.createdTime, 'yyyy-mm-dd hh:MM')}}</text>
+				</view>
+
+			</view>
+			<c-loading :loading="loading"></c-loading>
+		</view>
+		<view v-else class="no_data">
+			<c-no-data></c-no-data>
+		</view>
+
+		<u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
+			<view class="popup_search">
+				<view class="content">
+					<view class="title">按项目筛选</view>
+					<scroll-view class="scroll" scroll-y="true">
+						<view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
+							<view class="selectItem" v-if="item.id == projectId">
+								<text>{{item.name}}</text>
+							</view>
+							<view v-else>
+								<text>{{item.name}}</text>
+							</view>
+						</view>
+					</scroll-view>
+					<view class="switch">
+						<text>待批阅</text>
+						<u-switch v-model="switchValue" size="48" activeColor="#06B079" @change="handelChange">
+						</u-switch>
+					</view>
+				</view>
+
+				<view class="footer">
+					<view class="left_btn">
+						<c-button type="cancel" text="重置" @click="handelCancel">
+						</c-button>
+					</view>
+					<view class="right_btn">
+						<c-button type="confirm" text="确定" @click="hancelSubmit">
+						</c-button>
+					</view>
+				</view>
+
+			</view>
+		</u-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+	import listMixin from "@/common/mixins/list-mixin.js";
+
+	import {
+		getReportReviewListApi,
+		getProjectListApi,
+	} from '@/config/api.js';
+
+	export default {
+		mixins: [listMixin],
+		data() {
+
+			const d = new Date();
+			const year = d.getFullYear();
+			let month = d.getMonth() + 1;
+			month = month < 10 ? `0${month}` : month;
+			const date = d.getDate();
+
+			return {
+				studentId: '',
+				checkboxValue: [],
+				// 基本案列数据
+				checkboxList: [{
+					name: '待批阅',
+					disabled: false
+				}],
+				keyword: '',
+				show: false,
+				search: {
+					//搜索对象必须为key search的对象
+					keySearch: "",
+					status: '',
+
+				},
+				showTime: false,
+				timeValue: `${year}-${month}-${date}`,
+				defaultDateMultiple: [`${year}-${month}-${date}`],
+				list: [], //列表必须为key list的数组
+				projectId: '',
+				switchValue: false,
+
+			}
+		},
+
+		onLoad(option) {
+			console.log(option)
+			this.studentId = option.studentId;
+			this.projectId = option.projectId;
+
+			this.$store.dispatch(`home/getProjectList`, {
+				pageSize: -1,
+			})
+
+			this.search.keySearch = '';
+			
+			if (option && option.status) {
+				this.search.status = 'stay_examine';
+				this.checkboxValue = ['待批阅'];
+				this.switchValue = true;
+			}
+
+			this.finished = false;
+			this.loading = "loadmore";
+			this.page = 0;
+			this.list = [];
+		},
+
+		onShow() {
+			this._getList();
+		},
+
+		computed: {
+			...mapState('home', {
+				// 箭头函数可使代码更简练
+				projectList: 'projectList',
+
+			}),
+
+		},
+
+		methods: {
+			getNameLastTwo(value) {
+				if (value && value.length > 3) {
+					return value.substring(value.length - 3)
+				} else {
+					return value;
+				}
+			},
+
+			overflowHide(value) {
+				if (value && value.length > 4) {
+					return `${value.slice(0, 4)}...`
+				} else {
+					return value;
+				}
+			},
+
+			confirm(e) {
+				this.timeValue = e[0];
+				this.showTime = false;
+			},
+
+			handelDetail(record) {
+				this.$u.route({
+					url: `pages/main/home/reportDetail/reportDetail?id=${record.id}&formId=${record.formId}`
+				})
+			},
+
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+
+			checkboxChange(n) {
+				console.log('change', n);
+
+				this.search.status = n.length > 0 ? 'stay_examine' : '';
+
+				this.switchValue = n.length > 0 ? true : false;
+
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+			handelSearch(value) {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+			open() {
+				// console.log('open');
+			},
+			close() {
+				this.show = false
+				// console.log('close');
+			},
+			// scroll-view到底部加载更多
+			onreachBottom() {},
+			// 搜索
+			searchSubmit() {
+				// 调用混合搜索
+				this._searchData();
+			},
+			// 模拟后端分页
+			async getData(requestParams) {
+				const {
+					search = {}
+				} = requestParams;
+
+				let params = {};
+				params.pageNumber = requestParams.page + 1;
+				params.pageSize = 5;
+
+				if (search.status) {
+					params.status = search.status;
+				}
+
+				if (this.keyword) {
+					params.keySearch = this.keyword
+				}
+				
+				if (this.studentId) {
+					params.studentId = this.studentId
+				}
+
+				if (this.projectId) {
+					params.projectId = this.projectId
+				}
+
+				return await getReportReviewListApi(params);
+			},
+			// 数据请求(没错就是这么少的代码)
+			async _getList() {
+				if (this.page == 0) {
+					this.list = [];
+				}
+
+				// 根据实际情况修改自己修改key
+				let result = await this.getData({
+					page: this.page, // 传入页码
+					size: this.size, // 传入每页条数
+					search: this.search, // 传入搜索的对象
+				});
+
+				this.total = result.total;
+
+				if (this.list.length == 0 && result.records.length == 0) {
+					this.shownoData = false
+				} else {
+					this.shownoData = true
+				}
+
+				this.list = this.list.concat(result.records)
+				
+				// 判断是否全部加载完成
+				if (this.total == this.list.length) {
+					this.finished = true;
+					this.loading = 'nomore';
+				} else {
+					this.loading = 'loadmore';
+				}
+			},
+
+			handelClick(values) {
+				console.log(values);
+				this.projectId = values.id;
+			},
+
+			handelChange(e) {
+				console.log(e)
+				this.checkboxValue = e ? ['待批阅'] : [];
+				this.search.status = e ? 'stay_examine' : '';
+
+			},
+
+			handelCancel() {
+				this.switchValue = false;
+				this.projectId = '';
+			},
+
+			hancelSubmit() {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+
+				this.show = false;
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.registration_review {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+
+		.search_box {
+			padding: 36rpx 30rpx 0;
+			background-color: #FFFFFF;
+
+			.top {
+				display: flex;
+				flex-flow: row nowrap;
+				justify-content: space-between;
+				padding: 0 0 30rpx 0;
+
+				.check {
+					padding: 20rpx 0 0 0;
+				}
+
+				.search {
+					width: 468rpx;
+				}
+			}
+
+			.bottom {
+				.time {
+					padding: 30rpx 0 30rpx 40rpx;
+				}
+			}
+
+
+		}
+
+		.list_box {
+			padding: 30rpx 0 50rpx 0;
+
+			.item {
+				position: relative;
+				width: 630rpx;
+				margin: 0 auto 30rpx;
+				padding: 30rpx;
+				border-radius: 12rpx;
+				background-color: #FFFFFF;
+
+				.bg_image {
+					position: absolute;
+					top: 0;
+					right: 0;
+
+					text {
+						position: absolute;
+						top: 12rpx;
+						right: 30rpx;
+						font-size: 24rpx;
+						line-height: 24rpx;
+						color: #FFFFFF;
+					}
+				}
+
+				.info {
+					display: flex;
+					flex-flow: row nowrap;
+					align-items: center;
+					margin: 0 0 30rpx 0;
+
+					.avatar {
+						width: 78rpx;
+						height: 94rpx;
+						padding: 0 8rpx;
+						border-radius: 4rpx;
+						background-color: #06B079;
+						font-size: 24rpx;
+						line-height: 94rpx;
+						color: #FFFFFF;
+						text-align: center;
+					}
+
+					.title_name {
+						.title {
+							font-size: 32rpx;
+							line-height: 44rpx;
+							color: #202131;
+							font-weight: 500;
+							margin: 0 20rpx;
+						}
+
+						.name {
+							padding: 8rpx 0 0 20rpx;
+							font-size: 28rpx;
+							line-height: 32rpx;
+							color: #909097;
+
+							text:last-child {
+								padding: 0 0 0 30rpx;
+								color: #202131;
+							}
+						}
+					}
+
+				}
+
+				.time {
+					border-top: 2rpx solid #E2E2E8;
+					padding: 28rpx 0 0 0;
+
+					text {
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #909097;
+					}
+				}
+			}
+		}
+
+		.popup_search {
+			width: 640rpx;
+			position: relative;
+
+			.content {
+				padding: 0 40rpx;
+
+				.title {
+					padding: 24rpx 0;
+					font-size: 28rpx;
+					line-height: 36rpx;
+					color: #202131;
+				}
+
+				.scroll {
+					max-height: 60vh;
+				
+					.item {
+						
+						view {
+							display: flex;
+							flex-flow: row wrap;
+							align-items: center;
+							width: 500rpx;
+							height: 74rpx;
+							border-radius: 4rpx;
+							border: 2rpx solid #C1C1C9;
+							margin: 0 10rpx 20rpx;
+							font-size: 24rpx;
+							line-height: 32rpx;
+							color: #C0C0C9;
+							padding: 16rpx 20rpx;
+						}
+						
+						.selectItem {
+							background-color: #06B079;
+							color: #FFFFFF;
+							border: 2rpx solid #06B079;
+						}
+					}
+				}
+
+				.time {
+					padding: 40rpx 0 0 0;
+				}
+
+				.switch {
+					display: flex;
+					flex-flow: row nowrap;
+					justify-content: space-between;
+					padding: 40rpx 0 0 0;
+
+					text {
+						font-size: 28rpx;
+						line-height: 36rpx;
+						color: #202131;
+					}
+				}
+
+
+			}
+
+			.footer {
+				width: 560rpx;
+				height: 96rpx;
+				padding: 28rpx 40rpx;
+				background: #FFFFFF;
+				position: fixed;
+				bottom: 0;
+				right: 0;
+				z-index: 99;
+				border-top: 2rpx solid #E2E2E8;
+
+				view {
+					display: inline-block;
+				}
+
+				.left_btn {
+					width: 194rpx;
+					margin: 0 20rpx 0 0;
+				}
+
+				.right_btn {
+					width: 346rpx;
+				}
+			}
+		}
+	}
+</style>

+<template>
+	<view class="registration_review">
+		<view class="search_box">
+			<view class="top">
+				<view class="check">
+					<u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
+						<u-checkbox :customStyle="{marginBottom: '8px'}" shape="circle"
+							v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name"
+							activeColor="#06B079" size="28rpx" labelSize="28rpx" labelColor="#202131">
+						</u-checkbox>
+					</u-checkbox-group>
+				</view>
+
+				<view class="search">
+					<u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
+						bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
+					</u-search>
+				</view>
+
+				<view class="icon">
+					<view :style="{position:'relative', top:'14rpx', right:'18rpx'}">
+						<u-icon slot="icon" size="40" :name="'/static/img/home/dateIcon.png'" @click="showTime = true">
+						</u-icon>
+					</view>
+					<u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true">
+					</u-icon>
+				</view>
+
+
+			</view>
+			<view class="bottom" :style="{padding:'0 0 20rpx 0'}">
+				<u-calendar :minDate="minDate" :maxDate="maxDate" :monthNum="25" :show="showTime"
+					:defaultDate="defaultDateMultiple" @close="showTime = false" :showSubtitle="false" color="#06B079"
+					@confirm="confirm">
+				</u-calendar>
+				<!-- <view class="time">{{timeValue}}</view> -->
+			</view>
+		</view>
+
+		<view class="list_box" v-if="list.length > 0">
+			<view class="item" v-for="(item, i) in list" :key="i">
+
+				<view class="bg_image" v-if="item.waitAttendance == 'not_attendance'">
+					<u-image src="/static/img/home/labelBgGreen.png" width="142rpx" height="48rpx"></u-image>
+					<text>未签到</text>
+				</view>
+
+				<view class="bg_image" v-else>
+					<u-image src="/static/img/home/labelBgGrey.png" width="142rpx" height="48rpx"></u-image>
+					<text>已签到</text>
+				</view>
+
+				<view class="info">
+					<view class="avatar">{{getNameLastTwo(item.studentName)}}</view>
+					<view class="name">{{overflowHide(item.studentName)}}</view>
+					<view class="number">{{item.studentNumber}}</view>
+				</view>
+				<view class="company">
+					<text>实习项目</text>
+					<text>{{item.projectName || '--'}}</text>
+				</view>
+				<view class="company">
+					<text>班级</text>
+					<text>{{item.className || '--'}}</text>
+				</view>
+				<view class="company position">
+					<text>手机号</text>
+					<text>{{item.studentPhone|| '--'}}</text>
+				</view>
+
+				<view class="time">
+					<text>签到时间</text>
+					<text>{{timeFormat(item.signIn, 'yyyy-mm-dd hh:MM')}}</text>
+				</view>
+
+			</view>
+			<c-loading :loading="loading"></c-loading>
+		</view>
+		<view v-else class="no_data">
+			<c-no-data></c-no-data>
+		</view>
+
+		<u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
+			<view class="popup_search">
+				<view class="content">
+					<view class="title">按项目筛选</view>
+					<scroll-view class="scroll" scroll-y="true">
+						<view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
+							<view class="selectItem" v-if="item.id == projectId">
+								<text>{{item.name}}</text>
+							</view>
+							<view v-else>
+								<text>{{item.name}}</text>
+							</view>
+						</view>
+					</scroll-view>
+					<view class="switch">
+						<text>未签到</text>
+						<u-switch v-model="switchValue" size="48" activeColor="#06B079" @change="handelChange">
+						</u-switch>
+					</view>
+				</view>
+
+				<view class="footer">
+					<view class="left_btn">
+						<c-button type="cancel" text="重置" @click="handelCancel">
+						</c-button>
+					</view>
+					<view class="right_btn">
+						<c-button type="confirm" text="确定" @click="hancelSubmit">
+						</c-button>
+					</view>
+				</view>
+
+			</view>
+		</u-popup>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+	import listMixin from "@/common/mixins/list-mixin.js";
+	import miment from 'miment'
+
+	import {
+		getStudentSignInListApi,
+		getProjectListApi,
+	} from '@/config/api.js';
+
+	export default {
+		mixins: [listMixin],
+		data() {
+
+			const d = new Date();
+			const year = d.getFullYear();
+			let month = d.getMonth() + 1;
+			month = month < 10 ? `0${month}` : month;
+			const date = d.getDate();
+
+			return {
+				checkboxValue: [],
+				// 基本案列数据
+				checkboxList: [{
+					name: '未签到',
+					disabled: false
+				}],
+				keyword: '',
+				show: false,
+				search: {
+					//搜索对象必须为key search的对象
+					keySearch: "",
+					waitAttendance: '',
+					time: '',
+
+				},
+				showTime: false,
+				minDate: `${year-2}-${month}-${date+1}`,
+				maxDate: `${year}-${month}-${date+1}`,
+				timeValue: `${year}-${month}-${date}`,
+				defaultDateMultiple: [`${year}-${month}-${date}`],
+				list: [], //列表必须为key list的数组
+				projectId: '',
+				switchValue: false,
+
+			}
+		},
+
+		onLoad(option) {
+			this.$store.dispatch(`home/getProjectList`, {
+				pageSize: -1,
+			})
+
+			this.search.keySearch = '';
+
+			this.finished = false;
+			this.loading = "loadmore";
+			this.page = 0;
+			this.list = [];
+
+
+
+		},
+
+		onShow() {
+			this._getList();
+		},
+
+		computed: {
+			...mapState('home', {
+				// 箭头函数可使代码更简练
+				projectList: 'projectList',
+
+			}),
+
+		},
+
+		methods: {
+
+			getNameLastTwo(value) {
+				if (value && value.length > 3) {
+					return value.substring(value.length - 3)
+				} else {
+					return value;
+				}
+			},
+
+			overflowHide(value, num = 4) {
+				if (value && value.length > num) {
+					return `${value.slice(0, num)}...`
+				} else {
+					return value;
+				}
+			},
+
+			confirm(e) {
+				this.timeValue = e[0];
+				this.time = miment(e[0]).valueOf();
+
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+
+				this.showTime = false;
+			},
+
+			handelDetail(record) {
+				this.$u.route({
+					url: `pages/main/home/registrationDetail/registrationDetail?&id=${record.id}`
+				})
+			},
+
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+
+			checkboxChange(n) {
+				console.log('change', n);
+
+				this.search.waitAttendance = n.length > 0 ? 'not_attendance' : '';
+
+				this.switchValue = n.length > 0 ? true : false;
+
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+			handelSearch(value) {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+			open() {
+				// console.log('open');
+			},
+			close() {
+				this.show = false
+				// console.log('close');
+			},
+			// scroll-view到底部加载更多
+			onreachBottom() {},
+			// 搜索
+			searchSubmit() {
+				// 调用混合搜索
+				this._searchData();
+			},
+			// 模拟后端分页
+			async getData(requestParams) {
+				const {
+					search = {}
+				} = requestParams;
+
+				let params = {};
+				params.pageNumber = requestParams.page + 1;
+				params.pageSize = 5;
+
+				if (search.waitAttendance) {
+					params.waitAttendance = search.waitAttendance;
+				}
+
+				if (this.keyword) {
+					params.keySearch = this.keyword
+				}
+
+				if (this.projectId) {
+					params.projectId = this.projectId
+				}
+
+				if (this.time) {
+					params.time = this.time
+				}
+
+				return await getStudentSignInListApi(params);
+			},
+			// 数据请求(没错就是这么少的代码)
+			async _getList() {
+				if (this.page == 0) {
+					this.list = [];
+				}
+
+				// 根据实际情况修改自己修改key
+				let result = await this.getData({
+					page: this.page, // 传入页码
+					size: this.size, // 传入每页条数
+					search: this.search, // 传入搜索的对象
+				});
+
+				this.total = result.total;
+
+				if (this.list.length == 0 && result.records.length == 0) {
+					this.shownoData = false
+				} else {
+					this.shownoData = true
+				}
+
+				this.list = this.list.concat(result.records)
+
+				// 判断是否全部加载完成
+				if (this.total == this.list.length) {
+					this.finished = true;
+					this.loading = 'nomore';
+				} else {
+					this.loading = 'loadmore';
+				}
+			},
+
+			handelClick(values) {
+				console.log(values);
+				this.projectId = values.id;
+			},
+
+			handelChange(e) {
+				console.log(e)
+				this.checkboxValue = e ? ['未签到'] : [];
+				this.search.waitAttendance = e ? 'not_attendance' : '';
+			},
+
+			handelCancel() {
+				this.switchValue = false;
+				this.projectId = '';
+			},
+
+			hancelSubmit() {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+
+				this.show = false;
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.registration_review {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+
+		.search_box {
+			padding: 36rpx 30rpx 0;
+			background-color: #FFFFFF;
+
+			.top {
+				display: flex;
+				flex-flow: row nowrap;
+				justify-content: space-between;
+
+				.check {
+					padding: 20rpx 0 0 0;
+				}
+
+				.search {
+					width: 410rpx;
+				}
+
+				.icon {
+					display: flex;
+					flex-flow: row nowrap;
+				}
+			}
+
+			.bottom {
+				.time {
+					padding: 30rpx 0 30rpx 40rpx;
+				}
+			}
+
+
+		}
+
+		.list_box {
+			padding: 0 0 50rpx 0;
+
+			.item {
+				position: relative;
+				width: 630rpx;
+				margin: 30rpx auto;
+				padding: 30rpx;
+				border-radius: 12rpx;
+				background-color: #FFFFFF;
+
+				.bg_image {
+					position: absolute;
+					top: 0;
+					right: 0;
+
+					text {
+						position: absolute;
+						top: 12rpx;
+						right: 30rpx;
+						font-size: 24rpx;
+						line-height: 24rpx;
+						color: #FFFFFF;
+					}
+				}
+
+				.info {
+					display: flex;
+					flex-flow: row nowrap;
+					align-items: center;
+					margin: 0 0 30rpx 0;
+
+					.avatar {
+						width: 78rpx;
+						height: 94rpx;
+						padding: 0 8rpx;
+						border-radius: 4rpx;
+						background-color: #06B079;
+						font-size: 24rpx;
+						line-height: 94rpx;
+						color: #FFFFFF;
+						text-align: center;
+					}
+
+					.name {
+						font-size: 32rpx;
+						line-height: 44rpx;
+						color: #202131;
+						font-weight: 500;
+						margin: 0 20rpx;
+					}
+
+					.number {
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #909097;
+					}
+				}
+
+				.company {
+					display: flex;
+					flex-flow: row nowrap;
+					margin: 0 0 30rpx 0;
+
+					text {
+						width: 130rpx;
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #909097;
+						margin: 0 0 0 16rpx;
+					}
+					
+					text:first-child {
+						text-align: justify;
+						text-align-last: justify;
+					}
+
+					text:last-child {
+						width: 400rpx;
+						color: #202131;
+						margin: 0 0 0 30rpx;
+					}
+				}
+
+				.time {
+					border-top: 2rpx solid #E2E2E8;
+					padding: 28rpx 0 0 0;
+
+					text {
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #909097;
+					}
+
+					text:last-child {
+						color: #202131;
+						margin: 0 0 0 78rpx;
+					}
+				}
+			}
+		}
+
+		.popup_search {
+			width: 640rpx;
+			position: relative;
+
+			.content {
+				padding: 0 40rpx;
+
+				.title {
+					padding: 24rpx 0;
+					font-size: 28rpx;
+					line-height: 36rpx;
+					color: #202131;
+				}
+
+				.scroll {
+					max-height: 60vh;
+				
+					.item {
+						
+						view {
+							display: flex;
+							flex-flow: row wrap;
+							align-items: center;
+							width: 500rpx;
+							height: 74rpx;
+							border-radius: 4rpx;
+							border: 2rpx solid #C1C1C9;
+							margin: 0 10rpx 20rpx;
+							font-size: 24rpx;
+							line-height: 32rpx;
+							color: #C0C0C9;
+							padding: 16rpx 20rpx;
+						}
+						
+						.selectItem {
+							background-color: #06B079;
+							color: #FFFFFF;
+							border: 2rpx solid #06B079;
+						}
+					}
+				}
+
+				.time {
+					padding: 40rpx 0 0 0;
+				}
+
+				.switch {
+					display: flex;
+					flex-flow: row nowrap;
+					justify-content: space-between;
+					padding: 40rpx 0 0 0;
+
+					text {
+						font-size: 28rpx;
+						line-height: 36rpx;
+						color: #202131;
+					}
+				}
+
+
+			}
+
+			.footer {
+				width: 560rpx;
+				height: 96rpx;
+				padding: 28rpx 40rpx;
+				background: #FFFFFF;
+				position: fixed;
+				bottom: 0;
+				right: 0;
+				z-index: 99;
+				border-top: 2rpx solid #E2E2E8;
+
+				view {
+					display: inline-block;
+				}
+
+				.left_btn {
+					width: 194rpx;
+					margin: 0 20rpx 0 0;
+				}
+
+				.right_btn {
+					width: 346rpx;
+				}
+			}
+		}
+	}
+</style>

+<template>
+	<view class="info">
+		<view style="display: flex;">
+			<image class="header_bg" :src="vuex_baseImgUrl+'/intership_header_bg.png'"></image>
+			<view style="position: absolute;display: flex;">
+				<image class="header_img" src="/static/img/internship/intership_header.png" mode=""></image>
+				<text class="text_white">成绩详情</text>
+			</view>
+		</view>
+		<view class="content">
+			<view class="content_box">
+				<view>
+					<text>成绩</text>
+					<text class="value_type">{{interDetail.level ? interDetail.level : interDetail.score}}</text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>学分</text>
+					<text class="value_type">{{interDetail.credit}}</text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>考评人</text>
+					<text class="value_type">{{interDetail.assessorName ? interDetail.assessorName : '--'}}</text>
+				</view>
+				
+				<view style="margin-top: 32rpx;">
+					<text>评价</text>
+					<text class="value_type">{{interDetail.teacherView ? interDetail.teacherView : '--'}}</text>
+				</view>
+				
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getInternshipDetailApi,
+	} from '@/config/api.js';
+	
+	export default {
+		data() {
+			return {
+				id: '',
+				interDetail: {},
+				projectDetail: {},
+				jobDetail: {},
+				levels: {
+					'excellence': '优秀',
+					'good': '良好',
+					'pass': '及格',
+					'fail': '不及格'
+				},
+				grades: '',
+			}
+		},
+		onLoad(e) {
+			this.id = e.id;
+
+			getInternshipDetailApi(this.id).then(res => {
+				this.interDetail = res;
+				this.projectDetail = res.projectDetail;
+				this.jobDetail = res.jobDetail;
+				this.grades = (res.markWay == "hierarchy" ? (res.level ? this.levels[res.level] : "--") : res
+					.score + 0 + "/100")
+			})
+		},
+		methods: {
+
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.info {
+		width: 690rpx;
+		background-color: #F7F7F7;
+		display: flex;
+		flex-direction: column;
+		padding: 30rpx;
+		height: 100%;
+	}
+
+	.header_bg {
+		width: 100%;
+		height: 100rpx;
+	}
+
+	.header_img {
+		width: 36rpx;
+		height: 36rpx;
+		margin-left: 32rpx;
+		margin-right: 10rpx;
+		margin-top: 26rpx;
+	}
+
+	.text_white {
+		font-size: 32rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 84rpx;
+	}
+
+	.content {
+		width: 100%;
+		background-color: #fff;
+		border-bottom-left-radius: 12rpx;
+		border-bottom-right-radius: 12rpx;
+
+		.text_title {
+			font-size: 32rpx;
+			font-family: PingFangSC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #000000;
+			margin: 32rpx;
+		}
+
+		.divide_line {
+			height: 1px;
+			border: 1px solid rgba(0, 0, 0, 0.06);
+			margin-top: 30rpx;
+		}
+
+		.content_box {
+			padding: 32rpx;
+			margin-bottom: 48rpx;
+		}
+
+		.value_type {
+			font-size: 28rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			float: right;
+			color: #000000;
+			text-align: right;
+			width: 400rpx;
+		}
+	}
+</style>

+<template>
+	<view class="agreemen_detail">
+		
+		<view v-if="id">
+			<view class="box">
+				<view class="title">{{detail.title}}</view>
+				<view class="item">
+					<text>创建时间</text>
+					<text>{{timeFormat(detail.createdTime)}}</text>
+				</view>
+			</view>
+			
+			<view class="list_box">
+				<view class="item">
+					<view class="company">
+						<text>实习单号</text>
+						<text @click="handelDetail" :style="{color:'#06B079'}">{{detail.formNumber || '--'}}</text>
+					</view>
+					<view class="company">
+						<text>学生姓名</text>
+						<text>{{detail.studentName|| '--'}}</text>
+					</view>
+					<view class="company">
+						<text>课程名称</text>
+						<text>{{detail.courseName|| '--'}}</text>
+					</view>
+					<view class="company">
+						<text>项目名称</text>
+						<text>{{detail.projectName|| '--'}}</text>
+					</view>
+					<view class="company">
+						<text>三方协议</text>
+						<view class="item_box">
+							<text :style="{color:'#06B079'}" v-for="(item,index) in attachments" :key="index"
+								@click="openLink(item)">{{item.filename}}</text>
+						</view>
+			
+					</view>
+			
+				</view>
+			</view>
+		</view>
+		
+		<view v-else class="no_data">
+			<c-no-data></c-no-data>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+	import listMixin from "@/common/mixins/list-mixin.js";
+
+	import {
+		getImgUrlApi,
+		getAgreementDetailApi,
+	} from '@/config/api.js';
+
+	export default {
+		data() {
+			return {
+				id: '',
+				detail: {},
+				attachments: [],
+			}
+		},
+
+		onLoad(option) {
+			
+			this.id = option.id;
+			
+			if(!option.id) {
+				return;
+			}
+
+			getAgreementDetailApi(option.id).then(data => {
+				if (data) {
+					this.detail = data;
+					this.attachments = data.attachments ? JSON.parse(data.attachments) : [];
+				}
+			})
+		},
+
+		methods: {
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+			
+			handelDetail(record) {
+				this.$u.route({
+					url: `pages/main/internship/intershipInfo/intershipInfo?id=${this.detail.formId}`
+				})
+			},
+			
+			openLink(e) {
+				var _this = this
+				this.mFileDir = e.filename.substring(0, e.filename.lastIndexOf('.'))
+				this.mFileType = e.filename.substring(e.filename.lastIndexOf('.'), e.filename.length)
+				getImgUrlApi({
+					bucket: e.bucket,
+					filePath: e.object
+				}).then(data => {
+					console.log("data...", data)
+					if (e.mime_type.indexOf("image") != -1) {
+						_this.openImage(data.url)
+					} else {
+						uni.downloadFile({
+							url: data.url,
+							filePath: wx.env.USER_DATA_PATH + '/' + _this.mFileDir + this.mFileType,
+							success: (res) => {
+								if (res.statusCode === 200) {
+									uni.showLoading();
+									console.log('download succ', res)
+									let fileMgr = wx.getFileSystemManager();
+									let filePath = res.filePath
+									uni.saveFile({
+										tempFilePath: filePath,
+										success: function(res) {
+											var savedFilePath = res.savedFilePath;
+											/* 删除缓存 */
+											fileMgr.unlink({
+												filePath: wx.env.USER_DATA_PATH +
+													'/' +
+													_this.mFileDir + _this
+													.mFileType,
+												success: function(res) {
+													console.log(
+														'unlink success:',
+														res);
+												}
+											})
+											_this.openDoc()
+										},
+										fail: function(res) {
+											console.log('save fail', res);
+											_this.createFile()
+										}
+									})
+								}
+							}
+						});
+					}
+				})
+			},
+			
+			createFile() {
+				let fileMgr = wx.getFileSystemManager();
+				var _this = this
+				//利用access方法判断文件是否可用
+				fileMgr.access({
+					path: wx.env.USER_DATA_PATH + '/' + _this.mFileDir,
+					success: (res) => {
+						console.log('check success:', res);
+						_this.openDoc()
+					},
+					fail: (res) => {
+						console.log('check fail.', res);
+						fileMgr.mkdir({
+							dirPath: wx.env.USER_DATA_PATH + '/' + _this.mFileDir,
+							success: (res) => {
+								console.log('mk dir success:', res);
+								_this.openDoc()
+							},
+							fail: (res) => {
+								console.log('mk dir fail:', res);
+								uni.hideLoading();
+							}
+						});
+					}
+				});
+			},
+			
+			openDoc() {
+				uni.openDocument({
+					filePath: wx.env.USER_DATA_PATH + '/' + this.mFileDir + this.mFileType,
+					showMenu: true,
+					success: function(res) {
+						uni.hideLoading();
+						console.log('openDoc succ');
+					}
+				});
+			},
+			
+			openImage(imgPath) {
+				let array = new Array(1).fill(imgPath);
+				uni.previewImage({
+					urls: array,
+					success(res) {
+						console.log('openImage success');
+					},
+					fail(res) {
+						console.log('openImage fail:', res);
+					}
+				});
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.agreemen_detail {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+		padding: 20rpx 0 0 0;
+
+		.box {
+			width: 630rpx;
+			margin: 0 auto 20rpx;
+			padding: 30rpx 30rpx 12rpx 30rpx;
+			border-radius: 12rpx;
+			background-color: #FFFFFF;
+
+			.title {
+				font-size: 32rpx;
+				line-height: 32rpx;
+				color: #202131;
+				margin: 0 0 30rpx 0;
+			}
+
+			.title::before {
+				content: "";
+				display: inline-block;
+				width: 6rpx;
+				height: 32rpx;
+				background-color: #06B079;
+				margin: 0 12rpx 0 0;
+				position: relative;
+				top: 4rpx;
+				border-radius: 8rpx;
+			}
+
+
+
+			.item {
+				margin: 0 0 24rpx 0;
+
+				text:first-child {
+					display: inline-block;
+					width: 112rpx;
+					text-align: justify;
+					text-align-last: justify;
+					font-size: 28rpx;
+					line-height: 48rpx;
+					color: #909097;
+					vertical-align: top;
+				}
+
+				text:last-child {
+					display: inline-block;
+					width: 440rpx;
+					word-break: break-word;
+					font-size: 28rpx;
+					line-height: 48rpx;
+					color: #202131;
+					margin: 0 0 0 30rpx;
+				}
+			}
+		}
+
+		.list_box {
+			padding: 0 0 50rpx 0;
+
+			.item {
+				position: relative;
+				width: 630rpx;
+				margin: 30rpx auto;
+				padding: 30rpx;
+				border-radius: 12rpx;
+				background-color: #FFFFFF;
+
+				.company {
+					display: flex;
+					flex-flow: row nowrap;
+					margin: 0 0 30rpx 0;
+
+					text {
+						width: 120rpx;
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #909097;
+						margin: 0 0 0 16rpx;
+					}
+
+					text:last-child {
+						width: 450rpx;
+						color: #202131;
+						margin: 0 0 0 30rpx;
+					}
+
+					.item_box {
+						width: 450rpx;
+						margin: 0 0 0 30rpx;
+						text {
+							display: inline-block;
+							width: 450rpx;
+							overflow: hidden;
+							white-space: nowrap;
+							text-overflow: ellipsis;
+							margin: 0;
+
+						}
+					}
+				}
+
+			}
+		}
+	}
+</style>

+<template>
+	<view class="registration_review">
+
+		<view class="list_box" v-if="list.length > 0">
+			<view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
+
+				<view class="company">
+					<text>实践课程</text>
+					<text>{{item.courseName || '--'}}</text>
+				</view>
+				<view class="company">
+					<text>实习计划</text>
+					<text>{{item.planName|| '--'}}</text>
+				</view>
+				<view class="company">
+					<text>实习项目</text>
+					<text>{{item.projectName|| '--'}}</text>
+				</view>
+				<view class="company">
+					<text>学生名称</text>
+					<text>{{item.studentName|| '--'}}</text>
+				</view>
+
+				<view class="time">
+					<text>上传时间</text>
+					<text>{{timeFormat(item.createdTime, 'yyyy-mm-dd hh:MM')}}</text>
+				</view>
+
+			</view>
+			<c-loading :loading="loading"></c-loading>
+		</view>
+		<view v-else class="no_data">
+			<c-no-data></c-no-data>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+	import listMixin from "@/common/mixins/list-mixin.js";
+
+	import {
+		getAgreementListApi,
+	} from '@/config/api.js';
+
+	export default {
+		mixins: [listMixin],
+		data() {
+			return {
+
+				list: [], //列表必须为key list的数组
+				search: {
+					//搜索对象必须为key search的对象
+					status: 'wait,pass,reject',
+
+				},
+			}
+		},
+
+		onLoad(option) {
+			this.studentId = option.studentId;
+			this.projectId = option.projectId;
+
+			this.finished = false;
+			this.loading = "loadmore";
+			this.page = 0;
+			this.list = [];
+			this._getList();
+		},
+
+		onShow() {
+
+		},
+
+		computed: {
+
+
+		},
+
+		methods: {
+
+			handelDetail(record) {
+				this.$u.route({
+					url: `pages/main/internship/agreementDetail/agreementDetail?&id=${record.id}`
+				})
+			},
+
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+
+			// scroll-view到底部加载更多
+			onreachBottom() {},
+			// 搜索
+			searchSubmit() {
+				// 调用混合搜索
+				this._searchData();
+			},
+			// 模拟后端分页
+			async getData(requestParams) {
+				const {
+					search = {}
+				} = requestParams;
+
+				let params = {};
+				params.pageNumber = requestParams.page + 1;
+				params.pageSize = 5;
+
+				if (this.studentId) {
+					params.studentId = this.studentId
+				}
+				
+				if (this.projectId) {
+					params.projectId = this.projectId
+				}
+
+				return await getAgreementListApi(params);
+			},
+			// 数据请求(没错就是这么少的代码)
+			async _getList() {
+				if (this.page == 0) {
+					this.list = [];
+				}
+
+				// 根据实际情况修改自己修改key
+				let result = await this.getData({
+					page: this.page, // 传入页码
+					size: this.size, // 传入每页条数
+					search: this.search, // 传入搜索的对象
+				});
+
+				this.total = result.total;
+
+				if (this.list.length == 0 && result.records.length == 0) {
+					this.shownoData = false
+				} else {
+					this.shownoData = true
+				}
+
+				this.list = this.list.concat(result.records)
+				
+				// 判断是否全部加载完成
+				if (this.total == this.list.length) {
+					this.finished = true;
+					this.loading = 'nomore';
+				} else {
+					this.loading = 'loadmore';
+				}
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.registration_review {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+
+		.list_box {
+			padding: 30rpx 0 50rpx 0;
+
+			.item {
+				position: relative;
+				width: 630rpx;
+				margin: 0 auto 30rpx ;
+				padding: 30rpx;
+				border-radius: 12rpx;
+				background-color: #FFFFFF;
+
+				.company {
+					display: flex;
+					flex-flow: row nowrap;
+					margin: 0 0 30rpx 0;
+
+					text {
+						width: 120rpx;
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #909097;
+						margin: 0 0 0 16rpx;
+					}
+
+					text:last-child {
+						width: 450rpx;
+						color: #202131;
+						margin: 0 0 0 30rpx;
+					}
+				}
+
+				.time {
+					border-top: 2rpx solid #E2E2E8;
+					padding: 28rpx 0 0 0;
+
+					text {
+						width: 120rpx;
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #909097;
+					}
+
+					text:last-child {
+						width: 450rpx;
+						color: #202131;
+						margin: 0 0 0 78rpx;
+					}
+				}
+			}
+		}
+
+	}
+</style>

+<template>
+	<view class="info">
+		<view style="display: flex;">
+			<image class="header_bg" :src="vuex_baseImgUrl+'/intership_header_bg.png'"></image>
+			<view style="position: absolute;display: flex;">
+				<image class="header_img" src="/static/img/internship/intership_header.png" mode=""></image>
+				<text class="text_white">实习单详情</text>
+			</view>
+		</view>
+		<view class="content">
+			<!-- 基本信息 -->
+			<text class="text_title">基本信息</text>
+			<view class="divide_line"></view>
+			<view class="content_box">
+				<view>
+					<text>实习单号</text>
+					<text class="value_type">{{interDetail.number}}</text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>状态</text>
+					<text v-if="interDetail.status == 'wait'" class="value_type">未开始</text>
+					<text v-else-if="interDetail.status == 'running'" class="value_type">进行中</text>
+					<text v-else-if="interDetail.status == 'done'" class="value_type">已结束</text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>学生姓名</text>
+					<text class="value_type">{{interDetail.studentName}}</text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>是否到岗</text>
+					<text v-if="interDetail.dutyStatus == 'wait'" class="value_type">未到岗</text>
+					<text v-else-if="interDetail.dutyStatus == 'online'" class="value_type">已到岗</text>
+					<text v-else-if="interDetail.dutyStatus == 'offline'" class="value_type">已离岗</text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>学号</text>
+					<text class="value_type">{{interDetail.studentNumber}}</text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>学生手机号</text>
+					<text class="value_type">{{interDetail.studentPhone}}</text>
+				</view>
+				<view class="item">
+					<text>班级</text>
+					<text class="value_type">{{interDetail.classInfo}}</text>
+				</view>
+				<view class="item">
+					<text>实践课程</text>
+					<text class="value_type">{{interDetail.courseName}}</text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>实习成绩</text>
+					<text v-if="grades" class="value_type">{{grades}}</text>
+					<text v-else class="value_type">--</text>
+				</view>
+				<view class="item">
+					<text>实习评价</text>
+					<text v-if="interDetail.teacherView" class="value_type">{{interDetail.teacherView}}</text>
+					<text v-else class="value_type">--</text>
+				</view>
+			</view>
+			<!-- 项目信息 -->
+			<text class="text_title">项目信息</text>
+			<view class="divide_line"></view>
+			<view class="content_box">
+				<view class="item"  :style="{margin:'0rpx'}">
+					<text>开设院系</text>
+					<text class="value_type">{{interDetail.departmentName}}</text>
+				</view>
+				<view class="item">
+					<text>开设学期</text>
+					<text class="value_type">{{interDetail.schoolTerm}}</text>
+				</view>
+				<view class="item">
+					<text>实习计划</text>
+					<text class="value_type"><text class="value_type">{{interDetail.planName}}</text></text>
+				</view>
+				<view class="item">
+					<text>实习项目</text>
+					<text class="value_type">{{interDetail.projectName}}</text></text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>实习形式</text>
+					<text v-if="projectDetail.practiceForm == 'oneself'" class="value_type">自主</text>
+					<text v-else-if="projectDetail.practiceForm == 'centralize'" class="value_type">集中</text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>实习开始时间</text>
+					<text class="value_type">{{timeFormat(projectDetail.startTime)}}</text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>实习结束时间</text>
+					<text class="value_type">{{timeFormat(projectDetail.endTime)}}</text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>实习指导老师</text>
+					<text v-if="interDetail.teacherName" class="value_type">{{interDetail.teacherName}}</text>
+					<text v-else class="value_type">--</text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>老师手机号</text>
+					<text v-if="interDetail.teacherPhone" class="value_type">{{interDetail.teacherPhone}}</text>
+					<text v-else class="value_type">--</text>
+				</view>
+			</view>
+
+			<!-- 单位信息 -->
+			<text class="text_title">单位信息</text>
+			<view class="divide_line"></view>
+			<view class="content_box">
+				<view  class="item" :style="{margin:'0rpx'}">
+					<text>实习企业</text>
+					<text v-if="jobDetail.company" class="value_type">{{jobDetail.company}}</text>
+					<text v-else class="value_type">--</text>
+				</view>
+				<view class="item">
+					<text>实习岗位</text>
+					<text class="value_type">{{jobDetail.name}}</text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>联系人</text>
+					<text v-if="jobDetail.contactName" class="value_type">{{jobDetail.contactName}}</text>
+					<text v-else class="value_type">--</text>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<text>联系电话</text>
+					<text v-if="jobDetail.contactPhone" class="value_type">{{jobDetail.contactPhone}}</text>
+					<text v-else class="value_type">--</text>
+				</view>
+				<view class="item">
+					<text>实习地址</text>
+					<text v-if="jobDetail.workSite" class="value_type">{{jobDetail.workSite}}</text>
+					<text v-else class="value_type">--</text>
+				</view>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getInternshipDetailApi,
+	} from '@/config/api.js';
+
+	export default {
+		data() {
+			return {
+				id: '',
+				interDetail: {},
+				projectDetail: {},
+				jobDetail: {},
+				levels: {
+					'excellence': '优秀',
+					'good': '良好',
+					'pass': '及格',
+					'fail': '不及格'
+				},
+				grades: '',
+			}
+		},
+		onLoad(e) {
+			this.id = e.id;
+
+			getInternshipDetailApi(this.id).then(res => {
+				this.interDetail = res;
+				this.projectDetail = res.projectDetail;
+				this.jobDetail = res.jobDetail;
+				this.grades = (res.markWay == "hierarchy" ? (res.level ? res.level : "--") : res
+					.score + 0 + "/100")
+			})
+		},
+		methods: {
+
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.info {
+		width: 690rpx;
+		background-color: #F7F7F7;
+		display: flex;
+		flex-direction: column;
+		padding: 30rpx;
+	}
+
+	.header_bg {
+		width: 100%;
+		height: 100rpx;
+	}
+
+	.header_img {
+		width: 36rpx;
+		height: 36rpx;
+		margin-left: 32rpx;
+		margin-right: 10rpx;
+		margin-top: 26rpx;
+	}
+
+	.text_white {
+		font-size: 32rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #FFFFFF;
+		line-height: 84rpx;
+	}
+
+	.content {
+		width: 100%;
+		background-color: #fff;
+
+		.item {
+			display: flex;
+			flex-flow: row nowrap;
+			justify-content: space-between;
+			margin: 32rpx 0 0 0;
+
+			text {
+				display: block;
+			}
+		}
+
+		.text_title {
+			font-size: 32rpx;
+			font-family: PingFangSC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #000000;
+			margin: 32rpx;
+		}
+
+		.divide_line {
+			height: 1px;
+			border: 1px solid rgba(0, 0, 0, 0.06);
+			margin-top: 30rpx;
+		}
+
+		.content_box {
+			padding: 32rpx;
+			margin-bottom: 48rpx;
+		}
+
+		.value_type {
+			font-size: 28rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			float: right;
+			color: #000000;
+			text-align: right;
+			width: 400rpx;
+		}
+	}
+</style>

+<template>
+	<view class="signin_list">
+		<mi-calendar :suspensionDateList="suspensionDateList" @change="change" @changeMonth="changeMonth"></mi-calendar>
+
+		<view class="steps">
+			<u-steps current="1" direction="column" v-if="signList.length> 0">
+
+				<view v-for="(item, i) in signList" :key="i">
+					<u-steps-item :title="timeFormat(item.createdTime, 'yyyy-mm-dd hh:MM')" :desc="item.location"
+						v-if="i == 0">
+						<u-icon slot="icon" size="38rpx" name="/static/img/internship/currentTime.png"></u-icon>
+					</u-steps-item>
+					<u-steps-item :title="timeFormat(item.createdTime, 'yyyy-mm-dd hh:MM')" :desc="item.location"
+						v-else>
+						<u-icon slot="icon" size="16rpx" name="/static/img/internship/beforeTime.png"></u-icon>
+					</u-steps-item>
+				</view>
+			</u-steps>
+
+			<view v-else class="no_data">
+				<c-no-data paddingTop="30"></c-no-data>
+			</view>
+
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+	import listMixin from "@/common/mixins/list-mixin.js";
+
+	import {
+		getsignInListApi,
+	} from '@/config/api.js';
+
+
+	export default {
+		data() {
+
+			const d = new Date();
+			const year = d.getFullYear();
+			let month = d.getMonth() + 1;
+			month = month < 10 ? `0${month}` : month;
+			const date = d.getDate();
+
+			return {
+				initList: [],
+				nowTime: `${year}-${month}-${date}`,
+				suspensionDateList: [],
+				signList: [],
+			}
+		},
+
+		onLoad(option) {
+			this.studentId = option.studentId;
+			this.projectId = option.projectId;
+
+			getsignInListApi({
+				studentId: option.studentId,
+				projectId: option.projectId,
+			}).then(data => {
+				this.initList = data;
+				if (data && data.length > 0) {
+
+					let suspensionDateList = [];
+					data.map((item, index) => {
+						let suspensionDate = this.timeFormat(item.signIn)
+						console.log(suspensionDate, this.nowTime)
+						suspensionDateList.push(suspensionDate);
+					})
+					this.suspensionDateList = suspensionDateList;
+
+					this.filterData(data, this.nowTime);
+
+
+				}
+			})
+
+		},
+
+		methods: {
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+
+			filterData(data, time) {
+				let signListArr = data.filter(item => this.timeFormat(item.signIn) == time);
+				this.signList = signListArr.length > 0 ? signListArr[0].attendanceList : [];
+			},
+
+			change(date) {
+				console.log(date); // 日期 eg：'2022-01-01'
+				this.filterData(this.initList, date);
+			},
+
+			changeMonth(year, month) {
+				console.log(year, month); // 日期 eg：2022, 6
+
+				let monthTime = new Date(year, month - 1);
+				console.log(monthTime.getTime())
+
+				getsignInListApi({
+					studentId: this.studentId,
+					time: monthTime.getTime(),
+				}).then(data => {
+					this.initList = data;
+					if (data && data.length > 0) {
+
+						let suspensionDateList = [];
+						data.map((item, index) => {
+							let suspensionDate = this.timeFormat(item.signIn)
+							console.log(suspensionDate, this.nowTime)
+							suspensionDateList.push(suspensionDate);
+						})
+						this.suspensionDateList = suspensionDateList;
+
+						// let monthFormat = month < 10 ? `${year}-0${month}` : `${year}-${month}`;
+						// if (this.nowTime.indexOf(monthFormat) != -1) {
+						// 	this.filterData(data, this.nowTime);
+
+						// }
+
+					}
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.signin_list {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+		padding: 5rpx 0 20rpx 0;
+
+		.steps {
+			width: 630rpx;
+			min-height: 550rpx;
+			padding: 30rpx;
+			margin: 20rpx auto 0;
+			background-color: #fff;
+			border-radius: 12rpx;
+			box-shadow: 0 3rpx 32rpx 0rpx rgba(0, 0, 0, 0.1);
+		}
+
+		.steps /deep/ .u-steps-item {
+			padding-bottom: 40rpx;
+
+			.u-steps-item__content {
+				.u-text {
+
+					.u-text__value {
+						font-size: 28rpx !important;
+					}
+
+					.u-text__value--content {
+
+						color: #202131 !important;
+					}
+
+					.u-text__value--tips {
+						color: #909097 !important;
+					}
+				}
+			}
+		}
+
+	}
+</style>

+<template>
+	<view class="internship_box">
+		<view class="internship" v-if="hasLogin">
+
+			<view class="search_box">
+				<view class="search">
+					<u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
+						bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
+					</u-search>
+				</view>
+			</view>
+
+			<view class="list_box" v-if="list.length > 0">
+				<view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
+
+					<view class="info">
+						<view class="avatar">{{getNameLastTwo(item.studentName)}}</view>
+						<view class="student_info">
+							<view class="name">
+								<text>{{overflowHide(item.studentName, 4)}}</text>
+								<text>({{item.studentNumber}})</text>
+							</view>
+							<view class="mobile">
+								<text>{{item.studentPhone}}</text>
+							</view>
+						</view>
+					</view>
+
+				</view>
+				<c-loading :loading="loading"></c-loading>
+			</view>
+			<view v-else class="no_data">
+				<c-no-data></c-no-data>
+			</view>
+
+		</view>
+		<view class="no_login" v-else>
+			<view class="image">
+				<u-image :style="{margin:'0 auto'}" :src="vuex_baseImgUrl+'/internship_bg.png'" width="480rpx"
+					height="480rpx"></u-image>
+			</view>
+			<view class="btn">
+				<text>登录后可查看待办事项</text>
+				<u-button type="primary" text="登录" color="#06B079" :customStyle="{width:'340rpx'}" @click="handelLOgin">
+				</u-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+
+	import listMixin from "@/common/mixins/list-mixin.js";
+
+	import {
+		getStudentListApi,
+	} from '@/config/api.js';
+
+	export default {
+		mixins: [listMixin],
+		data() {
+			return {
+				classInfoId: '',
+				keyword: '',
+				list: [],
+				search: {
+					keySearch: "",
+				},
+			}
+		},
+
+		onLoad(option) {
+			this.classInfoId = option.classInfoId
+
+			this.search.keySearch = '';
+
+			this.finished = false;
+			this.loading = "loadmore";
+			this.page = 0;
+			this.list = [];
+			this._getList();
+		},
+
+		onShow() {
+
+		},
+
+		computed: {
+			...mapState({
+				hasLogin: 'hasLogin',
+				vuex_user: 'vuex_user',
+				teacher: (state) => state.vuex_user.teacher,
+			}),
+
+
+		},
+
+		methods: {
+			getNameLastTwo(value) {
+				if (value && value.length > 3) {
+					return value.substring(value.length - 3)
+				} else {
+					return value;
+				}
+			},
+
+			overflowHide(value, num = 4) {
+				if (value && value.length > num) {
+					return `${value.slice(0, num)}...`
+				} else {
+					return value;
+				}
+			},
+
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+
+			handelSearch(value) {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+			// scroll-view到底部加载更多
+			onreachBottom() {},
+			// 搜索
+			searchSubmit() {
+				// 调用混合搜索
+				this._searchData();
+			},
+			// 模拟后端分页
+			async getData(requestParams) {
+				const {
+					search = {}
+				} = requestParams;
+
+				let params = {};
+				params.pageNumber = requestParams.page + 1;
+				params.pageSize = 5;
+
+				if (this.classInfoId) {
+					params.classInfoId = this.classInfoId
+				}
+
+				if (this.keyword) {
+					params.keySearch = this.keyword
+				}
+
+				return await getStudentListApi(params);
+			},
+			// 数据请求(没错就是这么少的代码)
+			async _getList() {
+				if (this.page == 0) {
+					this.list = [];
+				}
+
+				// 根据实际情况修改自己修改key
+				let result = await this.getData({
+					page: this.page, // 传入页码
+					size: this.size, // 传入每页条数
+					search: this.search, // 传入搜索的对象
+				});
+
+				this.total = result.total;
+				this.list = this.list.concat(result.records)
+				
+				// 判断是否全部加载完成
+				if (this.total == this.list.length) {
+					this.finished = true;
+					this.loading = 'nomore';
+				} else {
+					this.loading = 'loadmore';
+				}
+			},
+			
+			handelDetail(record) {
+				this.$u.route({
+					url: `pages/main/internship/traineeDetail/traineeDetail?studentId=${record.studentId}`
+				})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.internship_box {
+		background-color: #F7F7F7;
+		min-height: 100%;
+		height: auto;
+
+		.internship {
+			width: 100%;
+			margin: 0 auto;
+
+			.search_box {
+				padding: 36rpx 0;
+				background-color: #FFFFFF;
+
+				.search {
+					width: 690rpx;
+					margin: 0 auto;
+				}
+
+			}
+
+			.list_box {
+				padding: 0 0 50rpx 0;
+
+				.item {
+					position: relative;
+					width: 630rpx;
+					margin: 30rpx auto;
+					padding: 30rpx;
+					border-radius: 12rpx;
+					background-color: #FFFFFF;
+
+					.info {
+						display: flex;
+						flex-flow: row nowrap;
+						align-items: center;
+						margin: 0 0 30rpx 0;
+
+						.avatar {
+							width: 94rpx;
+							height: 94rpx;
+							border-radius: 4rpx;
+							background-color: #06B079;
+							font-size: 24rpx;
+							line-height: 94rpx;
+							color: #FFFFFF;
+							text-align: center;
+						}
+
+						.student_info {
+							.name {
+								font-size: 32rpx;
+								line-height: 32rpx;
+								color: #121212;
+								font-weight: 500;
+								margin: 0 20rpx;
+
+								text:last-child {
+									font-size: 26rpx;
+									color: #26292F;
+									padding: 0 0 0 20rpx;
+								}
+							}
+
+							.mobile {
+								padding: 20rpx 0 0 20rpx;
+								font-size: 26rpx;
+								line-height: 36rpx;
+								color: #26292F;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		.no_login {
+			padding: 180rpx 0 0 0;
+			text-align: center;
+
+			.image {
+				width: 480rpx;
+				margin: 0 auto;
+			}
+
+			.btn {
+				position: relative;
+				top: -80rpx;
+
+				text {
+					font-size: 24rpx;
+					line-height: 52rpx;
+					color: #909097;
+
+				}
+			}
+		}
+
+	}
+</style>

+<template>
+	<view class="registration_review">
+
+		<u-sticky bgColor="#fff">
+			<u-tabs :list="tabs" :scrollable="false" lineWidth="30rpx" lineHeight="4rpx" lineColor="#06B079"
+				:inactiveStyle="{fontSize:'28rpx', color:'#4A4A53'}" :activeStyle="{fontSize:'36rpx', color:'#06B079'}"
+				@change="handelTab" :current="current">
+			</u-tabs>
+		</u-sticky>
+
+		<view class="list_box" v-if="list.length > 0">
+			<view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
+
+				<view class="bg_image" v-if="item.status == 'unread'">
+					<u-image src="/static/img/home/labelBgGreen.png" width="142rpx" height="48rpx"></u-image>
+					<text>未阅</text>
+				</view>
+
+				<view class="bg_image" v-else>
+					<u-image src="/static/img/home/labelBgGrey.png" width="142rpx" height="48rpx"></u-image>
+					<text>已阅</text>
+				</view>
+
+				<view class="info">
+					<view class="avatar">{{getNameLastTwo(item.studentName)}}</view>
+					<view class="form_name">
+						<view class="name">{{overflowHide(item.title, 10)}}</view>
+						<view class="week">
+							<!-- <text>{{timeFormat(item.logTime, 'yyyy年')}}</text> -->
+							<!-- <text>{{getWeek(item.logTime)}}</text> -->
+							<text>{{getCreatedTime(item)}}</text>
+							
+						</view>
+					</view>
+				</view>
+				<view class="u-content">
+					<u-parse :content="item.content"></u-parse>
+				</view>
+				<view class="name_time">
+					<view class="name">
+						<text>学生姓名</text>
+						<text>{{item.studentName}}</text>
+					</view>
+					<view class="time">{{timeFormat(item.createdTime)}}</view>
+				</view>
+
+			</view>
+			<c-loading :loading="loading"></c-loading>
+		</view>
+		<view v-else class="no_data">
+			<c-no-data></c-no-data>
+		</view>
+
+		<u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
+			<view class="popup_search">
+				<view class="content">
+					<view class="title">按项目筛选</view>
+					<scroll-view class="scroll" scroll-y="true">
+						<view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
+							<view class="selectItem" v-if="item.id == projectId">
+								<text>{{item.name}}</text>
+							</view>
+							<view v-else>
+								<text>{{item.name}}</text>
+							</view>
+						</view>
+					</scroll-view>
+					<view class="switch">
+						<text>未阅</text>
+						<u-switch v-model="switchValue" size="48" activeColor="#06B079" @change="handelChange">
+						</u-switch>
+					</view>
+				</view>
+
+				<view class="footer">
+					<view class="left_btn">
+						<c-button type="cancel" text="重置" @click="handelCancel">
+						</c-button>
+					</view>
+					<view class="right_btn">
+						<c-button type="confirm" text="确定" @click="hancelSubmit">
+						</c-button>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+	import listMixin from "@/common/mixins/list-mixin.js";
+
+	import {
+		getLogReviewListApi,
+		getProjectListApi,
+	} from '@/config/api.js';
+
+	export default {
+		mixins: [listMixin],
+		data() {
+			return {
+				studentId: '',
+				formId: '',
+				checkboxValue: [],
+				checkboxList: [{
+					name: '未阅',
+					disabled: false
+				}],
+				keyword: '',
+				search: {
+					//搜索对象必须为key search的对象
+					keySearch: "",
+					status: '',
+					category: 'daily',
+
+				},
+				show: false, //筛选
+				current: 0,
+				tabs: [{
+					name: '日志',
+				}, {
+					name: '周志',
+				}, {
+					name: '月志'
+				}],
+
+				list: [], //列表必须为key list的数组
+
+				projectId: '',
+				showTime: false,
+				timeValue: '',
+				switchValue: false,
+
+			}
+		},
+
+		onLoad(option) {
+			console.log(option)
+			this.studentId = option.studentId;
+			this.projectId = option.projectId;
+			this.formId = option.formId;
+
+			this.$store.dispatch(`home/getProjectList`, {
+				pageSize: -1,
+			})
+
+			this.search.keySearch = '';
+
+			if (option && option.category) {
+				this.search.category = option.category;
+				this.current =
+					option.category == 'daily' ? 0 :
+					option.category == 'weekly' ? 1 :
+					option.category == 'monthly' ? 2 :
+					'';
+			}
+			
+			if (option && option.status) {
+				this.search.status = 'unread';
+				this.checkboxValue = ['未阅'];
+				this.switchValue = true;
+			}
+
+			this.finished = false;
+			this.loading = "loadmore";
+			this.page = 0;
+			this.list = [];
+			this._getList();
+		},
+
+		onShow() {
+
+		},
+
+		computed: {
+			...mapState('home', {
+				// 箭头函数可使代码更简练
+				projectList: 'projectList',
+			}),
+		},
+
+		methods: {
+			
+			getCreatedTime(e) {
+				let time = this.$u.timeFormat(e.logTime / 1000, 'yyyy/mm/dd');
+				if (e.category == "weekly") {
+					time = new Date(e.logTime).getFullYear() + "年第" + (this.getWeek(e.logTime) + 1) + "周";
+				} else if (e.category == "monthly") {
+					time = this.$u.timeFormat(e.logTime / 1000, 'yyyy年mm月');
+				}
+				return time
+			},
+
+			getWeek(dt) {
+				if (dt > 0) {
+					let d1 = new Date(dt);
+					let d2 = new Date(dt);
+					d2.setMonth(0);
+					d2.setDate(1);
+					let rq = d1 - d2;
+					let days = Math.ceil(rq / (24 * 60 * 60 * 1000));
+					let num = Math.ceil(days / 7);
+					return num;
+				} else {
+					return '';
+				}
+			},
+
+			getNameLastTwo(value) {
+				if (value && value.length > 3) {
+					return value.substring(value.length - 3)
+				} else {
+					return value;
+				}
+			},
+
+			overflowHide(value, num = 4) {
+				if (value && value.length > num) {
+					return `${value.slice(0, num)}...`
+				} else {
+					return value;
+				}
+			},
+
+			handelTab(item) {
+				let category = item.index === 0 ? 'daily' : item.index === 1 ? 'weekly' : item.index === 2 ? 'monthly' :
+					'';
+
+				this.search.category = category;
+
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+
+			},
+
+			handelDetail(record) {
+				this.$u.route({
+					url: `pages/main/home/logDetail/logDetail?id=${record.id}&formId=${record.formId}`
+				})
+			},
+
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+
+			checkboxChange(n) {
+				console.log('change', n);
+
+				this.search.status = n.length > 0 ? 'unread' : '';
+
+				this.switchValue = n.length > 0 ? true : false;
+
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+			handelSearch(value) {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+			open() {
+
+			},
+
+			close() {
+				this.show = false
+			},
+
+			// scroll-view到底部加载更多
+			onreachBottom() {},
+			// 搜索
+			searchSubmit() {
+				// 调用混合搜索
+				this._searchData();
+			},
+			// 模拟后端分页
+			async getData(requestParams) {
+				const {
+					search = {}
+				} = requestParams;
+
+				let params = {};
+				params.pageNumber = requestParams.page + 1;
+				params.pageSize = 5;
+
+				if (search.status) {
+					params.status = search.status;
+				}
+
+				if (search.category) {
+					params.category = search.category;
+				}
+
+				if (this.keyword) {
+					params.keySearch = this.keyword
+				}
+				
+				if (this.studentId) {
+					params.studentId = this.studentId
+				}
+
+				if (this.projectId) {
+					params.projectId = this.projectId
+				}
+				
+				if (this.formId) {
+					params.formId = this.formId
+				}
+
+				return await getLogReviewListApi(params);
+			},
+			// 数据请求(没错就是这么少的代码)
+			async _getList() {
+				if (this.page == 0) {
+					this.list = [];
+				}
+
+				// 根据实际情况修改自己修改key
+				let result = await this.getData({
+					page: this.page, // 传入页码
+					size: this.size, // 传入每页条数
+					search: this.search, // 传入搜索的对象
+				});
+
+				this.total = result.total;
+
+				if (this.list.length == 0 && result.records.length == 0) {
+					this.shownoData = false
+				} else {
+					this.shownoData = true
+				}
+
+				this.list = this.list.concat(result.records)
+				
+				// 判断是否全部加载完成
+				if (this.total == this.list.length) {
+					this.finished = true;
+					this.loading = 'nomore';
+				} else {
+					this.loading = 'loadmore';
+				}
+			},
+
+			handelClick(values) {
+				this.projectId = values.id;
+			},
+
+			handelChange(e) {
+				this.checkboxValue = e ? ['未阅'] : [];
+				this.search.status = e ? 'unread' : '';
+
+			},
+
+			handelCancel() {
+				this.switchValue = false;
+				this.projectId = '';
+			},
+
+			hancelSubmit() {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+
+				this.show = false;
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.registration_review {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+
+		.search_box {
+			padding: 36rpx 30rpx 12rpx;
+			background-color: #FFFFFF;
+			display: flex;
+			flex-flow: row nowrap;
+			justify-content: space-between;
+
+			.check {
+				padding: 20rpx 0 0 0;
+			}
+
+			.search {
+				width: 468rpx;
+			}
+		}
+
+		.list_box {
+			padding: 0 0 50rpx 0;
+
+			.item {
+				position: relative;
+				width: 630rpx;
+				margin: 30rpx auto;
+				padding: 30rpx;
+				border-radius: 12rpx;
+				background-color: #FFFFFF;
+
+				.bg_image {
+					position: absolute;
+					top: 0;
+					right: 0;
+
+					text {
+						position: absolute;
+						top: 12rpx;
+						right: 30rpx;
+						font-size: 24rpx;
+						line-height: 24rpx;
+						color: #FFFFFF;
+					}
+				}
+
+				.info {
+					display: flex;
+					flex-flow: row nowrap;
+					align-items: center;
+					margin: 0 0 30rpx 0;
+
+					.avatar {
+						width: 94rpx;
+						height: 94rpx;
+						border-radius: 4rpx;
+						background-color: #06B079;
+						font-size: 24rpx;
+						line-height: 94rpx;
+						color: #FFFFFF;
+						text-align: center;
+					}
+
+					.form_name {
+						.name {
+							font-size: 32rpx;
+							line-height: 44rpx;
+							color: #202131;
+							font-weight: 500;
+							margin: 0 20rpx;
+						}
+
+						.week {
+							padding: 8rpx 0 0 0;
+							font-size: 20rpx;
+							line-height: 32rpx;
+							color: #909097;
+
+							// padding: 0 0 0 20rpx;
+							text {
+								padding: 8rpx 0 0 20rpx;
+							}
+						}
+					}
+				}
+
+				.u-content {
+					font-size: 24rpx;
+					line-height: 32rpx;
+					color: #909097;
+					margin: 32rpx 0 30rpx 0;
+				}
+
+				.name_time {
+					border-top: 2rpx solid #E2E2E8;
+					padding: 28rpx 0 0 0;
+					display: flex;
+					flex-flow: row nowrap;
+					justify-content: space-between;
+
+
+					.name {
+						text {
+							font-size: 28rpx;
+							line-height: 32rpx;
+							color: #909097;
+						}
+
+						text:last-child {
+							color: #202131;
+							margin: 0 0 0 30rpx;
+						}
+					}
+
+					.time {
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #909097;
+					}
+				}
+			}
+		}
+
+		.popup_search {
+			width: 640rpx;
+			position: relative;
+
+			.content {
+				padding: 0 40rpx;
+
+				.title {
+					padding: 24rpx 0;
+					font-size: 28rpx;
+					line-height: 36rpx;
+					color: #202131;
+				}
+
+				.scroll {
+					max-height: 60vh;
+				
+					.item {
+						
+						view {
+							display: flex;
+							flex-flow: row wrap;
+							align-items: center;
+							width: 500rpx;
+							height: 74rpx;
+							border-radius: 4rpx;
+							border: 2rpx solid #C1C1C9;
+							margin: 0 10rpx 20rpx;
+							font-size: 24rpx;
+							line-height: 32rpx;
+							color: #C0C0C9;
+							padding: 16rpx 20rpx;
+						}
+						
+						.selectItem {
+							background-color: #06B079;
+							color: #FFFFFF;
+							border: 2rpx solid #06B079;
+						}
+					}
+				}
+
+				.time {
+					padding: 40rpx 0 0 0;
+				}
+
+				.switch {
+					display: flex;
+					flex-flow: row nowrap;
+					justify-content: space-between;
+					padding: 40rpx 0 0 0;
+
+					text {
+						font-size: 28rpx;
+						line-height: 36rpx;
+						color: #202131;
+					}
+				}
+
+
+			}
+
+			.footer {
+				width: 560rpx;
+				height: 96rpx;
+				padding: 28rpx 40rpx;
+				background: #FFFFFF;
+				position: fixed;
+				bottom: 0;
+				right: 0;
+				z-index: 99;
+				border-top: 2rpx solid #E2E2E8;
+
+				view {
+					display: inline-block;
+				}
+
+				.left_btn {
+					width: 194rpx;
+					margin: 0 20rpx 0 0;
+				}
+
+				.right_btn {
+					width: 346rpx;
+				}
+			}
+		}
+	}
+</style>

+<template>
+	<view class="report_detail">
+		<view class="box form_info">
+			<view class="info">
+				<view class="avatar">{{getNameLastTwo(detail.studentName)}}</view>
+				<view class="name">{{overflowHide(detail.studentName, 6)}}</view>
+				<view class="number">NO.{{detail.studentNumber}}</view>
+			</view>
+			<view class="company">
+				<text>联系电话</text>
+				<text>{{detail.studentPhone || '--'}}</text>
+			</view>
+			<view class="company">
+				<text>班级信息</text>
+				<text>{{detail.departmentName}} {{detail.classInfo}}</text>
+			</view>
+		</view>
+
+		<view class="tab_box">
+			<view class="tab">
+				<u-tabs :list="tabs" :scrollable="false" lineWidth="30rpx" lineHeight="4rpx" lineColor="#06B079"
+					:inactiveStyle="{fontSize:'28rpx', color:'#4A4A53'}"
+					:activeStyle="{fontSize:'36rpx', color:'#06B079'}" @change="handelTab" :current="current">
+				</u-tabs>
+			</view>
+			<view class="u-icon" v-if="current == 0">
+				<u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
+			</view>
+		</view>
+
+		<view v-if="current == 0">
+			<view class="box attendance">
+				<view class="title">考勤</view>
+				<view class="item_icon">
+					<text>考勤天数</text>
+					<view @click="handelRecord('signin')">
+						<text>{{detail.attendanceCount || 0}}天</text>
+						<u-icon :style="{margin:'0 0 0 8rpx'}" name="arrow-right" color="#909097" size="28"></u-icon>
+					</view>
+				</view>
+			</view>
+
+			<view class="box attendance">
+				<view class="title">提交材料</view>
+				<view class="item_icon">
+					<text>三方协议</text>
+					<view @click="handelRecord('aggrent')">
+						<text>查看</text>
+						<u-icon :style="{margin:'0 0 0 8rpx'}" name="arrow-right" color="#909097" size="28"></u-icon>
+					</view>
+				</view>
+				<view class="item_icon">
+					<text>日志</text>
+					<view @click="handelRecord('daily')">
+						<text>{{detail.dailyLogCount || 0}}篇</text>
+						<u-icon :style="{margin:'0 0 0 8rpx'}" name="arrow-right" color="#909097" size="28"></u-icon>
+					</view>
+				</view>
+				<view class="item_icon">
+					<text>周志</text>
+					<view @click="handelRecord('weekly')">
+						<text>{{detail.weekLogCount || 0}}篇</text>
+						<u-icon :style="{margin:'0 0 0 8rpx'}" name="arrow-right" color="#909097" size="28"></u-icon>
+					</view>
+				</view>
+				<view class="item_icon">
+					<text>月志</text>
+					<view @click="handelRecord('monthly')">
+						<text>{{detail.monthlyLogCount || 0}}篇</text>
+						<u-icon :style="{margin:'0 0 0 8rpx'}" name="arrow-right" color="#909097" size="28"></u-icon>
+					</view>
+				</view>
+				<view class="item_icon">
+					<text>实习报告</text>
+					<view @click="handelRecord('report')">
+						<text>{{detail.internshipReportCount || 0}}次</text>
+						<u-icon :style="{margin:'0 0 0 8rpx'}" name="arrow-right" color="#909097" size="28"></u-icon>
+					</view>
+				</view>
+			</view>
+		</view>
+
+		<view class="practical_courses" v-if="current == 1">
+			<view class="list_box" v-if="list.length > 0">
+				<view class="item" v-for="(item, i) in list" :key="i">
+
+					<view class="company_box">
+						<view class="company">
+							<u-icon size="32rpx" name="/static/img/home/internshipUnitIcon.png"></u-icon>
+							<text>{{item.companyName}}</text>
+						</view>
+						<view class="address">
+							<u-icon size="32rpx" name="/static/img/internship/addressIcon.png"></u-icon>
+							<text>{{item.province}}/{{item.city}}/{{item.district}}</text>
+						</view>
+					</view>
+
+					<view class="projiect_item" v-for="(ele, index) in item.jobResultList" :key="index">
+
+						<view class="projiect">
+							<text>实习岗位</text>
+							<text>{{ele.jobName || '--'}}</text>
+						</view>
+						<view class="projiect">
+							<text>实习时间</text>
+							<text>{{ ele.startTime>0 ? `${timeFormat(ele.startTime)}至${timeFormat(ele.endTime)}` : '--'}}</text>
+						</view>
+						<view class="projiect">
+							<text>联系人</text>
+							<text>{{ele.contactName|| '--'}}</text>
+						</view>
+						<view class="projiect">
+							<text>联系电话</text>
+							<text>{{ele.contactPhone|| ''}}</text>
+						</view>
+					</view>
+				</view>
+				<c-loading :loading="loading"></c-loading>
+			</view>
+
+		</view>
+
+		<view class="practical_courses" v-if="current == 2">
+			<view class="list_box" v-if="list.length > 0">
+				<view class="item" v-for="(item, i) in list" :key="i">
+
+					<view class="title_box">
+						<view class="title">{{item.courseName}}</view>
+						<text class="credit">学分：{{item.credit}}分</text>
+					</view>
+
+					<view class="projiect_item" v-for="(ele, index) in item.achievementDataList" :key="index">
+
+						<view class="projiect">
+							<text>项目名称</text>
+							<text>{{ele.projectName || '--'}}</text>
+						</view>
+						<view class="projiect">
+							<text>实习时间</text>
+							<text>{{ ele.internshipStartTime>0 ? `${timeFormat(ele.internshipStartTime)}至${timeFormat(ele.internshipEndTime)}` : '--'}}</text>
+						</view>
+						<view class="projiect">
+							<text>实习单号</text>
+							<text @click="handelDetail(ele, 'internship')"
+								:style="{color:'#06B079',textDecoration:'underline'}">{{ele.formNumber|| '--'}}</text>
+						</view>
+						<view class="projiect">
+							<text>成绩</text>
+							<text>{{ele.level|| '--'}}</text>
+						</view>
+
+						<view class="projiect" v-if="ele.credit">
+							<text>学分</text>
+							<text @click="handelDetail(ele, 'credit')"
+								:style="{color:'#06B079'}">{{ele.credit}}</text>
+						</view>
+						
+						<view class="projiect" v-else>
+							<text>学分</text>
+							<text>{{'--'}}</text>
+						</view>
+					</view>
+				</view>
+				<c-loading :loading="loading"></c-loading>
+			</view>
+
+		</view>
+
+		<u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
+			<view class="popup_search">
+				<view class="content">
+					<view class="title">按项目筛选</view>
+					<scroll-view class="scroll" scroll-y="true">
+						<view class="item" v-for="(item, i) in projectList" :key="i" @click="handelClick(item)">
+							<view class="selectItem" v-if="item.id == projectId">
+								<text>{{item.name}}</text>
+							</view>
+							<view v-else>
+								<text>{{item.name}}</text>
+							</view>
+						</view>
+					</scroll-view>
+				</view>
+
+				<view class="footer">
+					<view class="left_btn">
+						<c-button type="cancel" text="重置" @click="handelCancel">
+						</c-button>
+					</view>
+					<view class="right_btn">
+						<c-button type="confirm" text="确定" @click="hancelSubmit">
+						</c-button>
+					</view>
+				</view>
+			</view>
+		</u-popup>
+	</view>
+</template>
+
+<script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+	import listMixin from "@/common/mixins/list-mixin.js";
+
+	import {
+		getInternshipProcessDetailApi,
+		getInternshipJobListApi,
+		getPracticalCoursesListApi,
+	} from '@/config/api.js';
+
+	export default {
+		data() {
+			return {
+				studentId: '',
+				detail: {},
+				current: 0,
+				tabs: [{
+					name: '实习过程',
+				}, {
+					name: '实习岗位',
+				}, {
+					name: '实践课程'
+				}],
+				show: false,
+				projectId: '',
+				list: [],
+				search: {
+					//搜索对象必须为key search的对象
+					status: 'wait,pass,reject',
+
+				},
+			}
+		},
+
+		onLoad(option) {
+			this.$store.dispatch(`home/getProjectList`, {
+				pageSize: -1,
+			})
+
+			this.studentId = option.studentId;
+			getInternshipProcessDetailApi({
+				studentId: option.studentId,
+			}).then(data => {
+				if (data) {
+					this.detail = data
+				}
+			})
+		},
+
+		computed: {
+			...mapState('home', {
+				// 箭头函数可使代码更简练
+				projectList: 'projectList',
+			}),
+		},
+
+		methods: {
+
+			getNameLastTwo(value) {
+				if (value && value.length > 3) {
+					return value.substring(value.length - 3)
+				} else {
+					return value;
+				}
+			},
+
+			overflowHide(value, num = 4) {
+				if (value && value.length > num) {
+					return `${value.slice(0, num)}...`
+				} else {
+					return value;
+				}
+			},
+
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+
+			handelTab(item) {
+				this.current = item.index;
+
+				switch (item.index) {
+
+					case 1:
+						this.finished = false;
+						this.loading = "loadmore";
+						this.page = 0;
+						this.list = [];
+						this._getList();
+						break;
+
+					case 2:
+						this.finished = false;
+						this.loading = "loadmore";
+						this.page = 0;
+						this.list = [];
+						this._getList();
+						break;
+				}
+			},
+
+			handelRecord(type) {
+
+				switch (type) {
+					
+					case 'signin':
+						if(!this.projectId) {
+							this.$u.toast('请先选择实习项目');
+							return;
+						}
+						this.$u.route({
+							url: `pages/main/internship/signInList/signInList?studentId=${this.detail.studentId}&projectId=${this.projectId}`
+						})
+						break;
+						
+					case 'aggrent':
+						this.$u.route({
+							url: `pages/main/internship/agreementList/agreementList?studentId=${this.detail.studentId}&projectId=${this.projectId}`
+						})
+						break;
+
+					case 'daily':
+						this.$u.route({
+							url: `pages/main/internship/studentLogReview/studentLogReview?category=daily&studentId=${this.detail.studentId}&projectId=${this.projectId}`
+						})
+						break;
+
+					case 'weekly':
+						this.$u.route({
+							url: `pages/main/internship/studentLogReview/studentLogReview?category=weekly&studentId=${this.detail.studentId}&projectId=${this.projectId}`
+						})
+						break;
+
+					case 'monthly':
+						this.$u.route({
+							url: `pages/main/internship/studentLogReview/studentLogReview?category=monthly&studentId=${this.detail.studentId}&projectId=${this.projectId}`
+						})
+						break;
+
+					case 'report':
+						this.$u.route({
+							url: `pages/main/home/reportReview/reportReview?studentId=${this.detail.studentId}&projectId=${this.projectId}`
+						})
+						break;
+				}
+
+			},
+
+			open() {
+
+			},
+
+			close() {
+				this.show = false
+			},
+
+			handelClick(values) {
+				this.projectId = values.id;
+			},
+
+			handelCancel() {
+				this.switchValue = false;
+				this.projectId = '';
+			},
+
+			hancelSubmit() {
+				this.finished = false;
+
+				getInternshipProcessDetailApi({
+					studentId: this.studentId,
+					projectId: this.projectId,
+				}).then(data => {
+					if (data) {
+						this.detail = data;
+						this.show = false
+					}
+				})
+			},
+
+			// scroll-view到底部加载更多
+			onreachBottom() {},
+			// 搜索
+			searchSubmit() {
+				// 调用混合搜索
+				this._searchData();
+			},
+			// 模拟后端分页
+			async getData(requestParams) {
+				const {
+					search = {}
+				} = requestParams;
+
+				let params = {};
+				params.pageNumber = requestParams.page + 1;
+				params.pageSize = 5;
+
+				if (this.studentId) {
+					params.studentId = this.studentId
+				}
+
+				if (this.current == 1) {
+					return await getInternshipJobListApi(params);
+				} else {
+					return await getPracticalCoursesListApi(params);
+				}
+
+
+			},
+			// 数据请求(没错就是这么少的代码)
+			async _getList() {
+				if (this.page == 0) {
+					this.list = [];
+				}
+
+				// 根据实际情况修改自己修改key
+				let result = await this.getData({
+					page: this.page, // 传入页码
+					size: this.size, // 传入每页条数
+					search: this.search, // 传入搜索的对象
+				});
+
+				console.log(this.list, result)
+
+				this.total = result.total;
+
+				if (this.list.length == 0 && result.length == 0) {
+					this.shownoData = false
+				} else {
+					this.shownoData = true
+				}
+
+				this.list = this.list.concat(result)
+				
+				// 判断是否全部加载完成
+				if (this.total == this.list.length) {
+					this.finished = true;
+					this.loading = 'nomore';
+				} else {
+					this.loading = 'loadmore';
+				}
+			},
+
+			handelDetail(record, type) {
+				switch (type) {
+					case 'internship':
+						this.$u.route({
+							url: `pages/main/internship/intershipInfo/intershipInfo?id=${record.formId}`
+						})
+						break;
+
+					case 'credit':
+						this.$u.route({
+							url: `pages/main/internship/achievementDetail/achievementDetail?id=${record.formId}`
+						})
+						break;
+				}
+			}
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.report_detail {
+		width: 100%;
+		min-height: 100%;
+		height: auto;
+		background-color: #F7F7F7;
+		padding: 20rpx 0 0 0;
+
+		.box {
+			width: 630rpx;
+			margin: 20rpx auto;
+			padding: 30rpx 30rpx 12rpx 30rpx;
+			border-radius: 12rpx;
+			background-color: #FFFFFF;
+
+			.title {
+				font-size: 32rpx;
+				line-height: 32rpx;
+				color: #202131;
+				margin: 0 0 30rpx 0;
+			}
+
+			.title::before {
+				content: "";
+				display: inline-block;
+				width: 6rpx;
+				height: 32rpx;
+				background-color: #06B079;
+				margin: 0 12rpx 0 0;
+				position: relative;
+				top: 4rpx;
+				border-radius: 8rpx;
+			}
+
+			.item {
+				margin: 0 0 24rpx 0;
+
+				text:first-child {
+					display: inline-block;
+					width: 112rpx;
+					text-align: justify;
+					text-align-last: justify;
+					font-size: 28rpx;
+					line-height: 48rpx;
+					color: #909097;
+					vertical-align: top;
+				}
+
+				text:last-child {
+					display: inline-block;
+					width: 440rpx;
+					font-size: 28rpx;
+					line-height: 48rpx;
+					color: #202131;
+					margin: 0 0 0 78rpx;
+				}
+			}
+
+			.item_icon {
+				margin: 0 0 24rpx 0;
+				display: flex;
+				flex-flow: row nowrap;
+				justify-content: space-between;
+				margin: 0 0 50rpx 0;
+
+				text {
+					display: inline-block;
+					width: 112rpx;
+					text-align: justify;
+					text-align-last: justify;
+					font-size: 28rpx;
+					line-height: 32rpx;
+					color: #909097;
+					vertical-align: top;
+				}
+
+				view {
+					display: flex;
+					flex-flow: row nowrap;
+
+					text {
+						display: inline-block;
+						width: auto;
+						font-size: 28rpx;
+						line-height: 32rpx;
+						color: #202131;
+						margin: 0 0 0 78rpx;
+					}
+				}
+			}
+		}
+
+		.form_info {
+			.info {
+				display: flex;
+				flex-flow: row nowrap;
+				align-items: center;
+				margin: 0 0 30rpx 0;
+
+				.avatar {
+					width: 94rpx;
+					height: 94rpx;
+					padding: 0 8rpx;
+					border-radius: 4rpx;
+					background-color: #06B079;
+					font-size: 24rpx;
+					line-height: 94rpx;
+					color: #FFFFFF;
+					text-align: center;
+				}
+
+				.name {
+					font-size: 32rpx;
+					line-height: 44rpx;
+					color: #202131;
+					font-weight: 500;
+					margin: 0 20rpx;
+				}
+
+				.number {
+					font-size: 28rpx;
+					line-height: 32rpx;
+					color: #909097;
+				}
+			}
+
+			.company {
+				display: flex;
+				flex-flow: row nowrap;
+				margin: 0 0 30rpx 0;
+
+				text {
+					width: 120rpx;
+					font-size: 28rpx;
+					line-height: 32rpx;
+					color: #909097;
+				}
+
+				text:last-child {
+					width: 470rpx;
+					color: #202131;
+					margin: 0 0 0 30rpx;
+				}
+			}
+		}
+
+		.tab_box {
+			position: relative;
+
+			.tab {
+				width: 600rpx;
+			}
+
+			.u-icon {
+				width: 32rpx;
+				position: absolute;
+				top: 30rpx;
+				right: 30rpx;
+			}
+		}
+
+		.practical_courses {
+
+			.list_box {
+				padding: 30rpx 0 50rpx 0;
+
+				.item {
+					position: relative;
+					width: 630rpx;
+					margin: 0 auto 30rpx;
+					padding: 30rpx;
+					border-radius: 12rpx;
+					background-color: #FFFFFF;
+
+					.title_box {
+						display: flex;
+						flex-flow: row nowrap;
+
+						.title {
+							font-size: 32rpx;
+							line-height: 44rpx;
+							color: #202131;
+							margin: 0 0 30rpx 0;
+							font-weight: 500;
+						}
+
+						.title::before {
+							content: "";
+							display: inline-block;
+							width: 6rpx;
+							height: 32rpx;
+							background-color: #06B079;
+							margin: 0 12rpx 0 0;
+							position: relative;
+							top: 4rpx;
+							border-radius: 8rpx;
+						}
+
+						.credit {
+							font-size: 28rpx;
+							line-height: 44rpx;
+							color: #909097;
+							margin: 0 0 0 32rpx;
+						}
+					}
+
+					.company_box {
+						.company {
+							display: flex;
+							flex-flow: row nowrap;
+							font-size: 32rpx;
+							line-height: 44rpx;
+							color: #202131;
+							margin: 0 0 20rpx 0;
+							font-weight: 500;
+							
+							text {
+								margin: 0 0 0 8rpx;
+							}
+						}
+
+						.address {
+							display: flex;
+							flex-flow: row nowrap;
+							font-size: 28rpx;
+							line-height: 32rpx;
+							color: #909097;
+							margin: 0 0 20rpx 0;
+							
+							text {
+								margin: 0 0 0 8rpx;
+							}
+						}
+					}
+
+					.projiect_item {
+						width: 570rpx;
+						border-radius: 12rpx;
+						background-color: #F8F8FB;
+						margin: 0 0 20rpx 0;
+						padding: 30rpx;
+
+						.projiect {
+							display: flex;
+							flex-flow: row nowrap;
+							margin: 0 0 30rpx 0;
+
+							text {
+								width: 120rpx;
+								font-size: 28rpx;
+								line-height: 32rpx;
+								color: #909097;
+								text-align: justify;
+								text-align-last: justify;
+							}
+
+							text:last-child {
+								width: 420rpx;
+								color: #202131;
+								margin: 0 0 0 30rpx;
+								text-align: start;
+								text-align-last: start;
+							}
+						}
+					}
+
+
+
+				}
+			}
+		}
+
+		.popup_search {
+			width: 640rpx;
+			position: relative;
+
+			.content {
+				padding: 0 40rpx;
+
+				.title {
+					padding: 24rpx 0;
+					font-size: 28rpx;
+					line-height: 36rpx;
+					color: #202131;
+				}
+
+				.scroll {
+					max-height: 60vh;
+				
+					.item {
+						
+						view {
+							display: flex;
+							flex-flow: row wrap;
+							align-items: center;
+							width: 500rpx;
+							height: 74rpx;
+							border-radius: 4rpx;
+							border: 2rpx solid #C1C1C9;
+							margin: 0 10rpx 20rpx;
+							font-size: 24rpx;
+							line-height: 32rpx;
+							color: #C0C0C9;
+							padding: 16rpx 20rpx;
+						}
+						
+						.selectItem {
+							background-color: #06B079;
+							color: #FFFFFF;
+							border: 2rpx solid #06B079;
+						}
+					}
+				}
+
+				.time {
+					padding: 40rpx 0 0 0;
+				}
+
+				.switch {
+					display: flex;
+					flex-flow: row nowrap;
+					justify-content: space-between;
+					padding: 40rpx 0 0 0;
+
+					text {
+						font-size: 28rpx;
+						line-height: 36rpx;
+						color: #202131;
+					}
+				}
+
+
+			}
+
+			.footer {
+				width: 560rpx;
+				height: 96rpx;
+				padding: 28rpx 40rpx;
+				background: #FFFFFF;
+				position: fixed;
+				bottom: 0;
+				right: 0;
+				z-index: 99;
+				border-top: 2rpx solid #E2E2E8;
+
+				view {
+					display: inline-block;
+				}
+
+				.left_btn {
+					width: 194rpx;
+					margin: 0 20rpx 0 0;
+				}
+
+				.right_btn {
+					width: 346rpx;
+				}
+			}
+		}
+	}
+</style>

+<template>
+	<view class="account_safe">
+		<view class="cell top">
+			<u-cell-group>
+				<u-cell title="登录账号" :isLink="true" url="/pages/main/my/editAccount/editAccount" arrow-direction="right"
+					:rightIconStyle="{fontSize:'26rpx'}" :title-style="{color:'#909097', fontSize:'28rpx'}">
+					<text slot="value" class="u-slot-value">{{accountName}}</text>
+				</u-cell>
+				<u-cell title="修改登录密码" :isLink="true" url="/pages/main/my/editPassword/editPassword"
+					arrow-direction="right" :rightIconStyle="{fontSize:'26rpx'}"
+					:title-style="{color:'#909097', fontSize:'28rpx'}">
+					<text slot="value" class="u-slot-value">******</text>
+				</u-cell>
+			</u-cell-group>
+		</view>
+
+		<view class="cell bottom">
+			<u-cell-group :border="false">
+				<u-cell title="手机号" :isLink="true" url="/pages/main/my/editMobile/editMobile" arrow-direction="right"
+					:rightIconStyle="{fontSize:'26rpx'}" :title-style="{color:'#909097', fontSize:'28rpx'}">
+					<text slot="value" class="u-slot-value">{{getPhone}}</text>
+				</u-cell>
+				<u-cell title="注销账户" :isLink="true" url="/pages/main/my/removeAccount/removeAccount" arrow-direction="right"
+					:rightIconStyle="{fontSize:'26rpx'}" :title-style="{color:'#909097', fontSize:'28rpx'}">
+				</u-cell>
+			</u-cell-group>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex'
+	import {
+		replaceTextToStar
+	} from '@/common/commonUtil.js'
+
+	export default {
+		data() {
+			return {
+
+			}
+		},
+
+		computed: {
+			...mapState({
+				accountName: (state) => state.vuex_user.username ? state.vuex_user.username : '',
+				
+				getPhone(state) {
+					let phone = state.vuex_user.phone;
+					return phone ? replaceTextToStar(phone) : '';
+				},
+				
+			}),
+		},
+
+		methods: {
+			link(type) {
+
+				switch (type) {
+					case 'account':
+						this.$u.route('/pages/student/my/edit-account/edit-account');
+						break;
+
+					case 'password':
+						this.$u.route('/pages/student/my/edit-password/edit-password');
+						break;
+				}
+
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.account_safe {
+		width: 100%;
+		height: 100%;
+		background-color: #F7F7F7;
+		padding: 20rpx 0 0 0;
+
+		.top {
+			margin: 0 0 20rpx 0;
+		}
+
+		.cell {
+			background-color: #FFFFFF;
+
+			.u-slot-value {
+				font-size: 28rpx;
+				line-height: 40rpx;
+				color: #202131;
+			}
+		}
+
+		.cell /deep/ .u-cell {
+			padding: 12rpx 0;
+
+			.u-cell__value {
+				font-size: 34rpx;
+				color: rgba(0, 0, 0, 0.5);
+			}
+		}
+	}
+</style>

+<template>
+	<view>
+		<view style="width: 100%;height: 100%;">
+			<view class="title" style="margin: 32rpx;">账户注销协议</view>
+			<view class="content">
+				<text class="text" :user-select="true">
+					【特别说明】亲爱的用户，在您正式开始下一步账号注销流程前，我们先为您做出如下特别说明：注销账号后，您将无法再以此账号登录和使用一起教育科技（以下简称“我们”或者“一起教育科技”）的产品与服务以及产品及服务中与第三方合作的服务内容（以下简称为“产品与服务”），这同时也可能会给您的售后维权带来不便。且账号一旦注销完成，将无法恢复。请您在注销前慎重考虑。
+
+
+
+					若您经过慎重考虑后仍执意决定注销账号的，请您务必先行仔细阅读和充分理解本《账号注销协议》，在同意全部内容、且在账号符合全部注销条件后，按照我们的注销操作指引点击进行下一步操作，您勾选本注销协议并点击下一步操作的，即视为您已经同意并签署和遵守本协议全部内容。如您在注销后需要再次使用我们的服务的，欢迎您使用手机号码或我们允许的其他方式重新注册。
+
+
+
+					（如您执意决定注销账号的，请继续向下阅读）
+
+
+
+					一、您知悉并同意：您的账号注销后，将（可能）产生包括但不限于如下结果需要您自行承担。
+				</text>
+			</view>
+			<view style="position: fixed;bottom: 0;width: 100%;">
+				<view class="divide_line"></view>
+				<view class="bottom">
+					<view class="bd1">
+						<text class="text1" @click="giveUp">放弃注销</text>
+					</view>
+					<view class="bd2">
+						<text class="text2" @click="getCode">同意注销</text>
+					</view>
+				</view>
+			</view>
+		</view>
+		
+		<u-overlay :show="showModal">
+			<view class="modal" v-show="showModal">
+				<image src="/static/img/my/delete.png" class="close" @click="closeModal"></image>
+				<view class="text0" style="margin-top:64rpx">请输入验证码</view>
+				<view class="text1" style="margin: 32rpx;">已发送至手机号：{{getPhone}}</view>
+				<view style="margin: 32rpx auto;width:'200rpx'">
+					<u-code-input :maxlength="4" v-model="currentCode" size="48" :focus="false" :dot="true" :width="76"
+						@change="change" @finish="goNext"></u-code-input>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<u-code ref="uCode" @change="codeChange">
+					</u-code>
+					<view class="text2" @click="getCode">{{tips}}</view>
+				</view>
+			</view>
+		</u-overlay>
+
+	</view>
+</template>
+
+<script>
+	import {
+		replaceTextToStar
+	} from '@/common/commonUtil.js'
+	import {
+		mapState,
+		mapActions
+	} from 'vuex'
+	
+	import {
+		getSmsCodeApi,
+		delAccountApi,
+	} from '@/config/api.js';
+
+	export default {
+		data() {
+			return {
+				showModal: false,
+				title_style: {
+					"font-size": "34rpx",
+					"font-family": "PingFangSC-Medium, PingFang SC",
+					"font-weight": 500,
+					"color": "#000000"
+				},
+				tips: '',
+				currentCode: ""
+			}
+		},
+
+		computed: {
+			...mapState({
+				// phone: (state) => state.vuex_user.phone,
+				getPhone(state) {
+					let phone = state.vuex_user.phone;
+					return replaceTextToStar(phone);
+				},
+			}),
+		},
+
+		methods: {
+			giveUp() {
+				uni.navigateBack({
+					delta: 2
+				});
+			},
+
+			getCode() { //获取验证码
+				this.showModal = true;
+				if (this.$refs.uCode.canGetCode) {
+					// 模拟向后端请求验证码
+					uni.showLoading({
+						title: '正在获取验证码'
+					})
+
+					getSmsCodeApi({
+						phone: this.vuex_phone
+					}).then(data => {
+						console.log(data)
+
+						uni.hideLoading();
+						// 这里此提示会被this.start()方法中的提示覆盖
+						this.$u.toast('验证码已发送');
+						// 通知验证码组件内部开始倒计时
+						this.$refs.uCode.start();
+
+					})
+				} else {
+					this.$u.toast('倒计时结束后再发送');
+				}
+			},
+
+			closeModal() {
+				if (this.showModal) {
+					this.showModal = false;
+					this.$refs.uCode.reset();
+					this.currentCode = "";
+				}
+			},
+
+			change(e) {
+				this.currentCode = e;
+			},
+
+			codeChange(text) {
+				this.tips = text;
+			},
+
+			goNext(e) {
+				console.log('输入结束，当前值为：' + e);
+
+				delAccountApi({
+					phone: this.vuex_phone,
+					code: e,
+				}).then(async data => {
+					if (data && data.code == 200) {
+						uni.showToast({
+							title: '注销成功'
+						});
+						this.closeModal();
+						
+						await uni.$u.vuex('vuex_user', {});
+						await uni.$u.vuex('vuex_token', {});
+						await uni.setStorageSync('lifeData', {})
+						
+						this.$u.route({
+							url: '/pages/main/my/freezing/freezing',
+							type: 'reLaunch',
+						});
+					}
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.title {
+		font-size: 48rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #26292F;
+		margin-top: 66rpx;
+	}
+
+	.content {
+		width: 690rpx;
+		padding: 12rpx 30rpx;
+		margin-bottom: 180rpx;
+
+		.text {
+			font-size: 28rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: #26292F;
+			line-height: 40rpx;
+		}
+	}
+
+	.divide_line {
+		width: 100%;
+		height: 2rpx;
+		border: 2rpx solid #F0F0F1;
+	}
+
+	.bottom {
+		height: 144rpx;
+		background-color: #fff;
+		display: flex;
+		flex-direction: row;
+
+		.bd1 {
+			height: 96rpx;
+			border-radius: 8rpx;
+			background-color: rgba(0, 0, 0, 0.03);
+			margin: auto 30rpx;
+			width: 30%;
+			display: flex;
+		}
+
+		.bd2 {
+			height: 96rpx;
+			border-radius: 8rpx;
+			background-color: rgba(12, 177, 122, 1);
+			margin: auto 30rpx;
+			width: 60%;
+			display: flex;
+		}
+
+		.text1 {
+			color: rgba(0, 0, 0, 0.45);
+			font-size: 34rpx;
+			font-family: PingFangSC-Medium;
+			line-height: 48rpx;
+			margin: auto;
+		}
+
+		.text2 {
+			color: #ffff;
+			font-size: 34rpx;
+			line-height: 48rpx;
+			margin: auto;
+		}
+	}
+
+	.modal {
+		width: 88%;
+		position: relative;
+		display: flex;
+		flex-direction: column;
+		margin: 200rpx auto;
+		padding-bottom: 64rpx;
+		border-radius: 12rpx;
+		background-color: #fff;
+
+		.close {
+			width: 48rpx;
+			height: 48rpx;
+			padding: 12rpx;
+			position: fixed;
+			right: 40rpx;
+		}
+
+		.text0 {
+			font-size: 34rpx;
+			font-family: PingFangSC-Medium, PingFang SC;
+			font-weight: 500;
+			color: #000000;
+			text-align: center;
+		}
+
+		.text1 {
+			font-size: 34rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: rgba(0, 0, 0, 0.45);
+			text-align: center;
+		}
+
+		.text2 {
+			font-size: 30rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: rgba(0, 0, 0, 0.5);
+			line-height: 48rpx;
+			text-align: center;
+		}
+	}
+</style>

+<template>
+	<view class="app">
+		<view class="content">
+			<view class="title">{{title}}</view>
+			<!-- <view class="desc">{{desc}}</view> -->
+			<text class="paragraph1">
+			      隐私政策
+			      \n
+			      本应用尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，本应用会按照本隐私权政策的规定使用和披露您的个人信息。但本应用将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，本应用不会将这些信息对外披露或向第三方提供。本应用会不时更新本隐私权政策。&nbsp;您在同意本应用服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本应用服务使用协议不可分割的一部分。
+			      \n
+			      1.&nbsp;适用范围
+			      \n
+			      a)&nbsp;在您注册本应用帐号时，您根据本应用要求提供的个人注册信息；
+			      \n
+			      b)&nbsp;在您使用本应用网络服务，或访问本应用平台网页时，本应用自动接收并记录的您的浏览器和计算机上的信息，包括但不限于您的IP地址、浏览器的类型、使用的语言、访问日期和时间、软硬件特征信息及您需求的网页记录等数据；
+			      \n
+			      c)&nbsp;本应用通过合法途径从商业伙伴处取得的用户个人数据。
+			      \n
+			      您了解并同意，以下信息不适用本隐私权政策：
+			      \n
+			      a)&nbsp;您在使用本应用平台提供的搜索服务时输入的关键字信息；
+			      \n
+			      b)&nbsp;本应用收集到的您在本应用发布的有关信息数据，包括但不限于参与活动、成交信息及评价详情；
+			      \n
+			      c)&nbsp;违反法律规定或违反本应用规则行为及本应用已对您采取的措施。
+			    </text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				type: '0',
+				title: '',
+				desc: ''
+			}
+		},
+		onReady() {
+			if (this.type == '0') {
+				this.title = '隐私协议';
+				this.desc = '隐私政策本应用尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，本应用会按照本隐私权政策的规定使用和披露您的个人信息。但本应用将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，本应用不会将这些信息对外披露或向第三方提供。本应用会不时更新本隐私权政策。 您在同意本应用服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本应用服务使用协议不可分割的一部分。';
+			}else {
+				this.title = '用户政策';
+				this.desc = '用户政策本应用尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，本应用会按照本隐私权政策的规定使用和披露您的个人信息。但本应用将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，本应用不会将这些信息对外披露或向第三方提供。本应用会不时更新本隐私权政策。 您在同意本应用服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本应用服务使用协议不可分割的一部分。';
+			}
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.app {
+		.content {
+			.title {
+				margin: 24px 16px 0;
+				font-size: 24px;
+				font-weight: 400;
+				color: #26292F;
+			}
+		
+			.paragraph1 {
+			  margin: 24px 16px 0;
+			  padding: 0 0 150rpx 0;
+			  display: block;
+			  overflow-wrap: break-word;
+			  color: rgba(38, 41, 47, 1);
+			  font-size: 14px;
+			  line-height: 20px;
+			  overflow: hidden;
+			  text-overflow: ellipsis;
+			}
+
+		}
+	}
+</style>

+<template>
+	<view class="edit-account">
+		<view class="account_name">
+			<view class="img_bg">
+				<u-image src="/static/img/my/LOGO@2x.png" width="200rpx" height="96rpx" />
+			</view>
+			<view class="name">
+				<text>账号名：</text>
+				<text>{{oldAccount}}</text>
+			</view>
+			<view class="describe">账号名是用户唯一凭证</view>
+		</view>
+		<view class="form input_warp">
+
+			<u-form labelPosition="left" :model="form" :rules="rules" :errorType="errorType" ref="uForm">
+				<u-form-item label="新账号名" labelWidth="150rpx" prop="username" borderBottom>
+					<u-input v-model="form.username" @input="handleInput" border="none" :placeholderStyle="{color: 'C1C1C9'}"  placeholder="请输入新的账号名">
+					</u-input>
+				</u-form-item>
+			</u-form>
+
+			<view class="tips">*变更成功后需重新登录</view>
+			<view class="button_warp">
+				<c-button type="confirm" shape="circle" @click="submit" :disabled="disabled" text="确认修改"></c-button>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex'
+
+	import {
+		updateUserInfoApi,
+	} from '@/config/api.js';
+
+	export default {
+		data() {
+
+			return {
+				errorType: 'toast',
+				disabled: true,
+				form: {
+					username: '',
+
+				},
+				rules: {
+					username: [{
+							required: true,
+							message: '请输入新账号',
+							trigger: ['blur', 'change'],
+						},
+						{
+							pattern: /^[a-zA-Z][a-zA-Z0-9_-]{5,19}$/g,
+							// 正则检验前先将值转为字符串
+							transform(value) {
+								return String(value);
+							},
+							message: '支持6-20个字母、数字、下划线或减号，以字母开头'
+						},
+					],
+				}
+			}
+		},
+
+		onLoad(option) {
+
+		},
+
+		onShow() {
+
+		},
+
+		// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+		},
+
+		computed: {
+			...mapState({
+
+				oldAccount: (state) => state.vuex_user.username ? state.vuex_user.username : '',
+			}),
+		},
+
+		methods: {
+
+			handleInput(value) {
+				if (value) {
+					this.disabled = false;
+				} else {
+					this.disabled = true;
+				}
+			},
+
+			submit() {
+				console.log(this.form)
+
+				this.$refs.uForm.validate().then(res => {
+					// uni.$u.toast('校验通过');
+
+					updateUserInfoApi({
+						...this.form,
+						type: 'username',
+					}).then(async res => {
+						if (res) {
+							this.$u.toast('修改密码成功');
+							await this.$store.dispatch(`user/loginOut`);
+						}
+
+					})
+
+				}).catch(errors => {
+					console.log(errors)
+				})
+
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.edit-account /deep/ .u-input__input {
+		font-size: 34rpx;
+	}
+
+	.edit-account {
+		padding: 0 28rpx;
+
+		.account_name {
+			.img_bg {
+				width: 200rpx;
+				padding: 100rpx 0 0 0;
+				margin: 0 auto;
+			}
+
+			.name {
+				text-align: center;
+				padding: 64rpx 0 0 0;
+
+				text {
+					font-size: 28rpx;
+					line-height: 40rpx;
+					color: #909097;
+				}
+
+				text:last-child {
+					font-size: 48rpx;
+					line-height: 68rpx;
+					color: #202131;
+					font-weight: 500;
+				}
+			}
+
+			.describe {
+				text-align: center;
+				font-size: 28rpx;
+				line-height: 40rpx;
+				color: #909097;
+				padding: 0 0 170rpx;
+			}
+		}
+
+		.form {
+			.tips {
+				font-size: 26rpx;
+				color: #909097;
+				margin: 12rpx 0 78rpx 0;
+			}
+		}
+	}
+</style>

+<template>
+	<view class="edit-mobile">
+		<view class="form input_warp">
+			<u-form labelPosition="left" :model="form" :rules="rules" :errorType="errorType" ref="uForm">
+				<u-form-item label="新手机号" labelWidth="150rpx" borderBottom prop="phone">
+					<u-input v-model="form.phone" @input="handleInput" border="none"
+						:placeholderStyle="{color: 'C1C1C9'}" placeholder="请输入手机号码" />
+				</u-form-item>
+				<u-form-item label="验证码" labelWidth="150rpx" borderBottom prop="code">
+					<u-input v-model="form.code" @input="handleInput" border="none"
+						:placeholderStyle="{color: 'C1C1C9'}" placeholder="请输入验证码" />
+					<u-button type="default" size="mini" slot="right" :hair-line="false"
+						:custom-style="{color:'#202131', border:'none',fontSize:'32rpx'}" @click="getCode">{{codeText}}
+					</u-button>
+					<u-code ref="uCode" @change="codeChange"></u-code>
+				</u-form-item>
+			</u-form>
+			<view class="tips">*变更成功后需重新登录</view>
+			<view class="button_warp">
+				<c-button type="confirm" shape="circle" @click="submit" :disabled="disabled" text="提交"></c-button>
+			</view>
+		</view>
+
+		<view>
+			<u-toast ref="uToast" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getSmsCodeApi,
+		updateUserInfoApi,
+	} from '@/config/api.js';
+	
+	export default {
+		data() {
+			return {
+				errorType: 'toast',
+				disabled: true,
+				codeText: '发送验证码',
+				form: {
+					phone: '',
+					code: '',
+
+				},
+				rules: {
+					phone: [{
+							required: true,
+							message: '请输入手机号',
+							trigger: ['blur', 'change'],
+						},
+						{
+							validator: (rule, value, callback) => {
+								return this.$u.test.mobile(value);
+							},
+							message: '请输入正确的手机号'
+						},
+					],
+					code: [{
+						required: true,
+						message: '请输入验证码',
+						trigger: ['blur', 'change'],
+					}, {
+						validator: (rule, value, callback) => {
+							return this.$u.test.code(value, '4');
+						},
+						message: '请输入正确的验证码'
+					}, ],
+				},
+			}
+		},
+
+		onLoad(option) {
+
+		},
+
+		onShow() {
+
+		},
+
+		// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+		},
+
+		methods: {
+
+			handleInput(value) {
+				const {
+					phone = '', code = ''
+				} = this.form;
+
+				if (phone && code) {
+					this.disabled = false;
+				} else {
+					this.disabled = true;
+				}
+			},
+
+			codeChange(text) {
+				this.codeText = text;
+			},
+
+			getCode() {
+				const {
+					phone = ''
+				} = this.form;
+
+				if (!(phone && /^1[0-9]{10}$/.test(phone))) {
+					this.$refs.uToast.show({
+						title: '请填写正确手机号',
+						type: 'error',
+						duration: 1500,
+					})
+
+				} else {
+					if (this.$refs.uCode.canGetCode) {
+						// 模拟向后端请求验证码
+						uni.showLoading({
+							title: '正在获取验证码'
+						})
+						setTimeout(() => {
+							uni.hideLoading();
+							// 通知验证码组件内部开始倒计时
+							this.$refs.uCode.start();
+
+							getSmsCodeApi({
+								phone: phone
+							})
+
+						}, 1000);
+					} else {
+						this.$u.toast('倒计时结束后再发送');
+					}
+				}
+			},
+
+			submit() {
+				
+				this.$refs.uForm.validate().then(res => {
+					uni.$u.toast('校验通过');
+					
+					updateUserInfoApi({
+						...this.form,
+						type: 'phone',
+						userType: 'teacher'
+					}).then(async res => {
+						if (res) {
+					
+							this.$u.toast('修改手机号码成功');
+							await this.$store.dispatch(`user/loginOut`);
+						}
+					})
+									
+				}).catch(errors => {
+					console.log(errors)
+				})
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.edit-mobile /deep/ .u-input__input {
+		font-size: 34rpx;
+	}
+
+	.edit-mobile {
+		padding: 0 28rpx;
+
+		.form {
+			.tips {
+				font-size: 24rpx;
+				color: #FA6400;
+				margin: 36rpx 0 78rpx 0;
+			}
+		}
+	}
+</style>

+<template>
+	<view class="edit-password">
+		<view class="form input_warp">
+			<u-form labelPosition="left" :model="form" :rules="rules" :errorType="errorType" ref="uForm">
+
+				<u-form-item label="密码" labelWidth="150rpx" borderBottom prop="newPwd">
+					<u-input v-model="form.newPwd" @input="handleInput" border="none" :placeholderStyle="{color: 'C1C1C9'}" 
+						placeholder="请输入密码" />
+				</u-form-item>
+				<u-form-item label="再次确认" labelWidth="150rpx" borderBottom prop="secondPwd">
+					<u-input v-model="form.secondPwd" @input="handleInput" border="none" :placeholderStyle="{color: 'C1C1C9'}" 
+						placeholder="再次确认" />
+				</u-form-item>
+
+			</u-form>
+			<view class="tips">*变更成功后需重新登录</view>
+			<view class="button_warp">
+				<c-button type="confirm" shape="circle" @click="getCode" :disabled="disabled" text="提交"></c-button>
+			</view>
+		</view>
+
+		<u-overlay :show="showModal">
+			<view class="modal" v-show="showModal">
+				<image src="/static/img/my/delete.png" class="close" @click="closeModal"></image>
+				<view class="text0" style="margin-top:64rpx">请输入验证码</view>
+				<view class="text1" style="margin: 32rpx;">已发送至手机号：{{getPhone}}</view>
+				<view style="margin: 32rpx auto;width:'200rpx'">
+					<u-code-input :maxlength="4" v-model="currentCode" size="48" :focus="false" :dot="true" :width="76"
+						@change="change" @finish="goNext"></u-code-input>
+				</view>
+				<view style="margin-top: 32rpx;">
+					<u-code ref="uCode" @change="codeChange">
+					</u-code>
+					<view class="text2" @click="getCode">{{tips}}</view>
+				</view>
+			</view>
+		</u-overlay>
+
+	</view>
+</template>
+
+<script>
+	import {
+		replaceTextToStar
+	} from '@/common/commonUtil.js'
+
+	import {
+		mapState,
+		mapActions
+	} from 'vuex'
+	
+	import {
+		getSmsCodeApi,
+		updateUserInfoApi,
+	} from '@/config/api.js';
+
+	import md5 from '@/common/md5';
+
+	export default {
+		data() {
+
+			return {
+				errorType: 'toast',
+				disabled: true,
+				form: {
+					newPwd: '',
+					secondPwd: '',
+
+				},
+				rules: {
+					newPwd: [{
+							required: true,
+							message: '请输入密码',
+							trigger: ['blur', 'change'],
+						},
+						{
+							min: 6,
+							max: 20,
+							message: '长度在6-20个字符之间'
+						},
+						{
+							pattern: /^[a-zA-Z0-9_]*$/g,
+							transform(value) {
+								return String(value);
+							},
+							message: '只能包含字母或数字或下划线'
+						},
+					],
+					secondPwd: [{
+							required: true,
+							message: '请输入密码',
+							trigger: ['blur', 'change'],
+						},
+						{
+							min: 6,
+							max: 20,
+							message: '长度在6-20个字符之间'
+						},
+						{
+							pattern: /^[a-zA-Z0-9_]*$/g,
+							transform(value) {
+								return String(value);
+							},
+							message: '只能包含字母或数字或下划线'
+						},
+					],
+				},
+				showModal: false,
+				tips: '',
+				currentCode: ""
+			}
+		},
+
+		onLoad(option) {
+			let title = this.vuex_user.password ? '修改密码' : '设置密码'
+			uni.setNavigationBarTitle({
+				title: title
+			})
+		},
+
+		onShow() {
+
+		},
+
+		// 必须要在onReady生命周期，因为onLoad生命周期组件可能尚未创建完毕
+		onReady() {
+			this.$refs.uForm.setRules(this.rules);
+		},
+
+		computed: {
+			...mapState({
+				phone: (state) => state.vuex_user.phone,
+				getPhone(state) {
+					let phone = state.vuex_user.phone;
+					return replaceTextToStar(phone);
+				},
+			}),
+		},
+
+		methods: {
+
+			handleInput(value) {
+				const {
+					newPwd = '', secondPwd = ''
+				} = this.form;
+
+				if (newPwd && secondPwd) {
+					this.disabled = false;
+				} else {
+					this.disabled = true;
+				}
+			},
+
+			getCode() { //获取验证码
+
+				const {
+					newPwd = '', secondPwd = ''
+				} = this.form;
+
+				if (newPwd != secondPwd) {
+					this.$u.toast('两次输入密码不一致');
+					return;
+				}
+				
+				this.$refs.uForm.validate().then(res => {
+					uni.$u.toast('校验通过');
+				
+					this.showModal = true;
+					if (this.$refs.uCode.canGetCode) {
+						// 模拟向后端请求验证码
+						uni.showLoading({
+							title: '正在获取验证码'
+						})
+					
+						getSmsCodeApi({
+							phone: this.phone
+						}).then(data => {
+							console.log(data)
+					
+							uni.hideLoading();
+							// 这里此提示会被this.start()方法中的提示覆盖
+							this.$u.toast('验证码已发送');
+							// 通知验证码组件内部开始倒计时
+							this.$refs.uCode.start();
+					
+						})
+					} else {
+						this.$u.toast('倒计时结束后再发送');
+					}
+				
+				}).catch(errors => {
+					console.log(errors)
+				})
+			},
+
+			closeModal() {
+				if (this.showModal) {
+					this.showModal = false;
+					this.$refs.uCode.reset();
+					this.currentCode = "";
+				}
+			},
+
+			change(e) {
+				this.currentCode = e;
+			},
+
+			codeChange(text) {
+				this.tips = text;
+			},
+
+			goNext(e) {
+				console.log('输入结束，当前值为：' + e);
+
+				updateUserInfoApi({
+					// ...this.form,
+					newPwd: md5.hex_md5(this.form.newPwd),
+					secondPwd: md5.hex_md5(this.form.secondPwd),
+					phone: this.phone,
+					type: 'password',
+					code: e,
+				}).then(async res => {
+					if (res) {
+						this.$u.toast('修改密码成功');
+						await this.$store.dispatch(`user/loginOut`);
+					}
+				})
+			},
+
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.edit-password /deep/ .u-input__input {
+		font-size: 34rpx;
+	}
+
+	.edit-password {
+		padding: 0 28rpx;
+
+		.form {
+			.tips {
+				font-size: 24rpx;
+				color: #FA6400;
+				margin: 36rpx 0 78rpx 0;
+			}
+		}
+
+		.modal {
+			width: 88%;
+			position: relative;
+			display: flex;
+			flex-direction: column;
+			margin: 200rpx auto;
+			padding-bottom: 64rpx;
+			border-radius: 12rpx;
+			background-color: #fff;
+
+			.close {
+				width: 48rpx;
+				height: 48rpx;
+				padding: 12rpx;
+				position: fixed;
+				right: 40rpx;
+			}
+
+			.text0 {
+				font-size: 34rpx;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #000000;
+				text-align: center;
+			}
+
+			.text1 {
+				font-size: 34rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: rgba(0, 0, 0, 0.45);
+				text-align: center;
+			}
+
+			.text2 {
+				font-size: 30rpx;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: rgba(0, 0, 0, 0.5);
+				line-height: 48rpx;
+				text-align: center;
+			}
+		}
+	}
+</style>

+<template>
+	<view class="freezing">
+		<view class="box">
+			<view class="icon">
+				<icon type="waiting" size="53"></icon>
+			</view>
+			<view class="text">
+				<view class="title">冻结中</view>
+				<view class="describe">您已经提交账号注销申请，此账号已被冻结， 工作人员会在15个工作日内处理您的请求</view>
+			</view>
+		</view>
+
+		<view class="btn fixed_bottom_btn">
+			<view class="left_btn">
+				<c-button type="cancel" text="撤销注销" @click="giveUp">
+				</c-button>
+			</view>
+			<view class="right_btn">
+				<c-button type="confirm" text="联系客服" @click="contactCustomer">
+				</c-button>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex'
+
+	import {
+		cancelDelAccountApi,
+	} from '@/config/api.js';
+
+	export default {
+		data() {
+			return {
+
+			}
+		},
+
+		onLoad(option) {
+
+		},
+
+		computed: {
+			...mapState({
+				// vuex_phone: (state) => state.vuex_phone,
+			}),
+		},
+
+		methods: {
+			giveUp() {
+				cancelDelAccountApi({
+					phone: this.vuex_phone,
+				}).then(async data => {
+					console.log(data)
+					uni.showToast({
+						title: '撤销成功'
+					});
+					
+					this.$u.route('/pages/main/my/login/login');
+				})
+			},
+
+			contactCustomer() {
+				uni.makePhoneCall({
+					phoneNumber: "150-7142-1900"
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.freezing {
+		width: 100%;
+		height: 100%;
+		position: relative;
+
+		.box {
+			.icon {
+				padding: 308rpx 0 0 0;
+				text-align: center;
+			}
+
+			.text {
+				text-align: center;
+
+				.title {
+					font-size: 34rpx;
+					color: #000000;
+					line-height: 48rpx;
+					margin: 44rpx 0 32rpx 0;
+				}
+
+				.describe {
+					width: 560rpx;
+					margin: 0 auto;
+					font-size: 28rpx;
+					color: rgba(0, 0, 0, 0.5);
+					line-height: 40rpx;
+				}
+			}
+		}
+
+		.fixed_bottom_btn {
+			width: 100%;
+			height: 144rpx;
+			padding: 24rpx 32rpx;
+			background: #FFFFFF;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			z-index: 99;
+			border-top: 1rpx solid #F0F0F1;
+
+			view {
+				display: inline-block;
+			}
+
+			.left_btn {
+				width: 212rpx;
+				margin: 0 40rpx 0 0;
+			}
+
+			.right_btn {
+				width: 434rpx;
+			}
+		}
+	}
+</style>

@@ -9,10 +9,8 @@
 			</view>
 
 			<view class="btn button_warp">
-				<c-button type="confirm" shape="circle"
-					:customStyle="{borderRadius:'48rpx',fontSize:'34rpx',color:'#fff',fontWeight:'400'}" text="微信一键登录"
-					:disabled="isDisable" openType="getPhoneNumber" @getPhoneNumber="getPhoneNumber"
-					@click="getUserProfile"></c-button>
+				<c-button type="confirm" text="微信一键登录" :disabled="isDisable" openType="getPhoneNumber"
+					@getPhoneNumber="getPhoneNumber" @click="getUserProfile"></c-button>
 			</view>
 
 			<view class="changeLogin" @click="handelMobileLogin">
@@ -45,7 +43,7 @@
 
 	export default {
 		data() {
-			return {
+			return {
 				isDisable: true,
 				checked: [],
 				service: "https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/agreement/%E3%80%8A%E4%BC%98%E5%AD%A6%E4%B9%90%E4%B8%9A%E7%94%A8%E6%88%B7%E6%9C%8D%E5%8A%A1%E5%8D%8F%E8%AE%AE%E3%80%8B.htm",
@@ -66,13 +64,13 @@
 
 		onShow() {
 
-		},
-		
-		watch: {
-			checked: function(newVal, oldVal) {
-				this.isDisable = newVal.length != 0 ? false : true;
-				
-			}
+		},
+
+		watch: {
+			checked: function(newVal, oldVal) {
+				this.isDisable = newVal.length != 0 ? false : true;
+
+			}
 		},
 
 		computed: {
@@ -98,7 +96,7 @@
 				})
 			},
 
-			checkboxChange(n) {
+			checkboxChange(n) {
 				console.log(n)
 
 			},
@@ -123,11 +121,9 @@
 					success: (res) => {
 						console.log(res);
 
-						// this.getUserProfile();
-
 						this.$store.dispatch(`user/login`, {
 							way: 'wechat_code',
-							type: 'student',
+							type: 'teacher',
 							jsCode: res.code,
 							code: e.detail.code,
 						})
@@ -135,15 +131,6 @@
 				})
 			},
 
-			phoneLogin() {
-				this.$store.dispatch(`user/login`, {
-					way: 'name',
-					type: 'student',
-					username: this.form.mobile,
-					password: this.form.password,
-				})
-			},
-
 			handelMobileLogin() {
 				this.$u.route({
 					url: "/pages/main/my/mobileLogin/mobileLogin",
@@ -179,8 +166,9 @@
 				text-align: center;
 				margin: 48rpx 0 0 0;
 				font-size: 15px;
-				font-weight: 400;
-				color: rgba(0, 0, 0, 0.65);
+				font-weight: 400;
+				color: #06B079;
+				
 			}
 
 			.agreement {

@@ -82,7 +82,7 @@
 	export default {
 		data() {
 			return {
-				errorType: ['toast'],
+				errorType: 'toast',
 				isDisable: true,
 				checked: [],
 				service: "https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/agreement/%E3%80%8A%E4%BC%98%E5%AD%A6%E4%B9%90%E4%B8%9A%E7%94%A8%E6%88%B7%E6%9C%8D%E5%8A%A1%E5%8D%8F%E8%AE%AE%E3%80%8B.htm",
@@ -204,11 +204,10 @@
 			},
 
 			phoneLogin() {
-				// this.getUserProfile();
 				if (this.changeLogin == '账号密码登录') {
 					this.$store.dispatch(`user/login`, {
 						way: 'code',
-						type: 'student',
+						type: 'teacher',
 						phone: this.form.mobile,
 						code: this.form.password,
 					})
@@ -216,7 +215,7 @@
 					console.log(md5.hex_md5(this.form.password));
 					this.$store.dispatch(`user/login`, {
 						way: 'name',
-						type: 'student',
+						type: 'teacher',
 						username: this.form.mobile,
 						password: md5.hex_md5(this.form.password),
 					})

+<template>
+	<view class="account_safe">
+
+		<view class="avatar">
+			<u-image @click="show = true" width="190rpx" height="190rpx" shape="circle"
+				:src="avatarUrl? `${vuex_ossUrlPubilc}/${avatarUrl}`:wxAvatarUrl" />
+		</view>
+
+		<view class="cell top">
+			<u-cell-group>
+				<u-cell title="登录账号" :isLink="true" url="/pages/main/my/editAccount/editAccount" arrow-direction="right"
+					:rightIconStyle="{fontSize:'26rpx'}" :title-style="{color:'#909097', fontSize:'28rpx'}">
+					<text slot="value" class="u-slot-value">{{accountName}}</text>
+				</u-cell>
+				<u-cell title="姓名" arrow-direction="right" :rightIconStyle="{fontSize:'26rpx'}"
+					:title-style="{color:'#909097', fontSize:'28rpx'}">
+					<text slot="value" class="u-slot-value">{{teacherName}}</text>
+				</u-cell>
+				<u-cell title="手机号" :isLink="true" url="/pages/main/my/editMobile/editMobile" arrow-direction="right"
+					:rightIconStyle="{fontSize:'26rpx'}" :title-style="{color:'#909097', fontSize:'28rpx'}">
+					<text slot="value" class="u-slot-value">{{getPhone}}</text>
+				</u-cell>
+				<u-cell title="工号" arrow-direction="right" :rightIconStyle="{fontSize:'26rpx'}"
+					:title-style="{color:'#909097', fontSize:'28rpx'}">
+					<text slot="value" class="u-slot-value">{{jobNumber}}</text>
+				</u-cell>
+				<u-cell title="院系专业" arrow-direction="right" :rightIconStyle="{fontSize:'26rpx'}"
+					:title-style="{color:'#909097', fontSize:'28rpx'}">
+					<text slot="value" class="u-slot-value">{{departmentName}}</text>
+				</u-cell>
+			</u-cell-group>
+		</view>
+
+		<u-action-sheet :actions="list" @select="chooseImg" :show="show"></u-action-sheet>
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex'
+
+	import {
+		getOssInitApi,
+		updateAvatarUrlApi,
+	} from '@/config/api.js';
+
+	import {
+		replaceTextToStar
+	} from '@/common/commonUtil.js'
+
+	export default {
+		data() {
+			return {
+				show: false,
+				list: [{
+					name: '拍照'
+				}, {
+					name: '从手机相册选择'
+				}],
+				ossInit: {},
+				picList: [],
+			}
+		},
+
+		onLoad() {
+			getOssInitApi({
+				"uploadFileType": "other"
+			}).then(res => {
+				this.ossInit = res
+			})
+		},
+
+
+
+		computed: {
+			...mapState({
+				wxAvatarUrl: (state) => state.vuex_weixinUserInfo.avatarUrl ? state.vuex_weixinUserInfo.avatarUrl : '',
+				avatarUrl: (state) => state.vuex_user.teacher.avatarUrl ? state.vuex_user.teacher.avatarUrl : '',
+				accountName: (state) => state.vuex_user.username ? state.vuex_user.username : '',
+				teacherName: (state) => state.vuex_user.teacher.name ? state.vuex_user.teacher.name : '',
+				jobNumber: (state) => state.vuex_user.teacher.number ? state.vuex_user.teacher.number : '',
+				departmentName: (state) => state.vuex_user.teacher.departments && state.vuex_user.teacher.departments
+					.length > 0 && state.vuex_user.teacher.departments[0].name ? state.vuex_user.teacher
+					.departments[0].name : '',
+
+				getPhone(state) {
+					let phone = state.vuex_user.phone;
+					return phone ? replaceTextToStar(phone) : '';
+				},
+
+			}),
+		},
+
+		methods: {
+			
+			...mapActions('user', {
+				getUserInfo: 'getUserInfo',
+			}),
+			
+			chooseImg(item) {
+				var _this = this
+				console.log(item)
+				if (item.name == '拍照') { //拍照
+					uni.chooseImage({
+						count: 1,
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: ['camera'], //从相机选择
+						success: function(res) {
+							console.log("chooseImage...", JSON.stringify(res.tempFilePaths));
+							_this.picList = res.tempFilePaths
+							_this.uploadImages()
+						}
+					});
+				} else if (item.name == '从手机相册选择') { //相册
+					uni.chooseImage({
+						count: 1,
+						sizeType: ['original', 'compressed'], //可以指定是原图还是压缩图，默认二者都有
+						sourceType: ['album'], //从相册选择
+						success: function(res) {
+							console.log("chooseImage...", JSON.stringify(res.tempFilePaths));
+							_this.picList = res.tempFilePaths
+							_this.uploadImages()
+						}
+					});
+				}
+			},
+
+			uploadImages() { //上传图片
+				var _this = this
+				console.log('begin', this.picList)
+				for (var i = 0; i < this.picList.length; i++) {
+					uni.uploadFile({
+						url: _this.ossInit.host,
+						filePath: _this.picList[i],
+						name: 'file',
+						formData: {
+							'key': `${_this.ossInit.dir}${new Date().getTime()}/` + '${filename}',
+							'action': `${_this.ossInit.host}`,
+							'OSSAccessKeyId': _this.ossInit.accessId,
+							'policy': _this.ossInit.policy,
+							'signature': _this.ossInit.signature,
+							'callback': _this.ossInit.callback,
+						},
+						success: (uploadFileRes) => {
+							console.log("--", uploadFileRes)
+
+							let avatarObj = JSON.parse(uploadFileRes.data)
+							_this.avatarUrl = avatarObj.object;
+
+							updateAvatarUrlApi({
+								id: this.vuex_user.teacher.id,
+								avatarUrl: avatarObj.object,
+							}).then(data => {
+								if (data) {
+									_this.getUserInfo()
+								}
+							})
+
+						},
+						fail: (error) => {
+							console.log("-error-", error)
+						},
+						
+						complete: (res) => {
+							this.show = false;
+						}
+						
+					});
+				}
+			},
+
+			link(type) {
+
+				switch (type) {
+					case 'account':
+						this.$u.route('/pages/student/my/edit-account/edit-account');
+						break;
+
+					case 'password':
+						this.$u.route('/pages/student/my/edit-password/edit-password');
+						break;
+				}
+
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.account_safe {
+		width: 100%;
+		height: 100%;
+		background-color: #F7F7F7;
+		padding: 20rpx 0 0 0;
+
+		.avatar {
+			width: 190rpx;
+			margin: 0 auto;
+			padding: 50rpx 0;
+		}
+
+		.top {
+			margin: 0 0 20rpx 0;
+		}
+
+		.cell {
+			background-color: #FFFFFF;
+
+			.u-slot-value {
+				font-size: 28rpx;
+				line-height: 40rpx;
+				color: #202131;
+			}
+		}
+
+		.cell /deep/ .u-cell {
+			padding: 12rpx 0;
+
+			.u-cell__value {
+				font-size: 34rpx;
+				color: rgba(0, 0, 0, 0.5);
+			}
+		}
+	}
+</style>

+<template>
+	<view class="account_safe">
+		<view class="cell top">
+			<u-cell-group>
+				<u-cell title="用户政策" :isLink="true" url="/pages/main/my/userPolicy/userPolicy" arrow-direction="right"
+					:rightIconStyle="{fontSize:'26rpx'}" :title-style="{color:'#909097', fontSize:'28rpx'}">
+				</u-cell>
+				<u-cell title="隐私协议" :isLink="true" url="/pages/main/my/agreement/agreement"
+					arrow-direction="right" :rightIconStyle="{fontSize:'26rpx'}"
+					:title-style="{color:'#909097', fontSize:'28rpx'}">
+				</u-cell>
+			</u-cell-group>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex'
+	import {
+		replaceTextToStar
+	} from '@/common/commonUtil.js'
+
+	export default {
+		data() {
+			return {
+
+			}
+		},
+
+		computed: {
+			...mapState({
+				accountName: (state) => state.vuex_user.username ? state.vuex_user.username : '',
+
+				getPhone(state) {
+					let phone = state.vuex_user.phone;
+					return phone ? replaceTextToStar(phone) : '';
+				},
+
+			}),
+		},
+
+		methods: {
+			link(type) {
+
+				switch (type) {
+					case 'account':
+						this.$u.route('/pages/student/my/edit-account/edit-account');
+						break;
+
+					case 'password':
+						this.$u.route('/pages/student/my/edit-password/edit-password');
+						break;
+				}
+
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.account_safe {
+		width: 100%;
+		height: 100%;
+		background-color: #F7F7F7;
+		padding: 20rpx 0 0 0;
+
+		.top {
+			margin: 0 0 20rpx 0;
+		}
+
+		.cell {
+			background-color: #FFFFFF;
+
+			.u-slot-value {
+				font-size: 28rpx;
+				line-height: 40rpx;
+				color: #202131;
+			}
+		}
+
+		.cell /deep/ .u-cell {
+			padding: 12rpx 0;
+
+			.u-cell__value {
+				font-size: 34rpx;
+				color: rgba(0, 0, 0, 0.5);
+			}
+		}
+	}
+</style>

+<template>
+	<view class="remove_account">
+		<view class="title">注销账户</view>
+		<view class="sub_title" style="margin-top: 20rpx;">账号主体:{{getPhone}}</view>
+		<view class="content">
+			<text class="text">
+				如您注销优学乐业服务，则当前服务在APP
+				小程序、等留存的信息均将被清空且无法被
+				找回。具体包括一下信息：
+
+				· 优学乐业学生注册账号及状态信息
+
+				· 优学乐业保存的学生个人信息
+
+				· 优学乐业保存的学生学籍信息
+
+				· 学生所有实习及相关活动记录
+
+				· 学生实习成绩信息
+
+				· 订阅消息、短信等通知不再进行推送
+			</text>
+		</view>
+		<view class="footer">
+			<view class="left_btn">
+				<c-button type="confirm" shape="circle" @click="removeAccount" :disabled="false" text="注销申请"></c-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		replaceTextToStar
+	} from '@/common/commonUtil.js'
+	import {
+		mapState,
+		mapActions
+	} from 'vuex'
+
+	export default {
+		data() {
+			return {
+
+			}
+		},
+
+		computed: {
+			...mapState({
+				getPhone(state) {
+					let phone = state.vuex_user.phone;
+					return replaceTextToStar(phone);
+				},
+			}),
+		},
+
+		methods: {
+			removeAccount() {
+				this.$u.route('/pages/main/my/againRemove/againRemove');
+			}
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.remove_account {
+		background-color: #FFFFFF;
+	}
+
+	.title {
+		font-size: 44rpx;
+		font-family: PingFangSC-Medium, PingFang SC;
+		font-weight: 500;
+		color: #000000;
+		margin-top: 48rpx;
+		text-align: center;
+	}
+
+	.sub_title {
+		font-size: 17px;
+		font-family: PingFangSC-Regular, PingFang SC;
+		font-weight: 400;
+		color: rgba(0, 0, 0, 0.65);
+		line-height: 24px;
+		text-align: center;
+	}
+
+	.content {
+		width: 594rpx;
+		background: rgba(0, 0, 0, 0.03);
+		padding: 48rpx;
+		margin: 48rpx auto;
+
+		.text {
+			font-size: 30rpx;
+			font-family: PingFangSC-Regular, PingFang SC;
+			font-weight: 400;
+			color: rgba(0, 0, 0, 0.65);
+			line-height: 42rpx;
+		}
+	}
+
+	.footer {
+		width: 100%;
+		height: 96rpx;
+		padding: 28rpx 30rpx;
+		background: #FFFFFF;
+		position: fixed;
+		bottom: 0;
+		left: 0;
+		z-index: 99;
+		border-top: 2rpx solid #E2E2E8;
+	
+		view {
+			display: inline-block;
+		}
+	
+		.left_btn {
+			width: 690rpx;
+			margin: 0 30rpx 0 0;
+		}
+	}
+</style>

+<template>
+	<view class="app">
+		<view class="content">
+			<view class="title">{{title}}</view>
+			<!-- <view class="desc">{{desc}}</view> -->
+			<text class="paragraph1">
+			      用户政策
+			      \n
+			      本应用尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，本应用会按照本隐私权政策的规定使用和披露您的个人信息。但本应用将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，本应用不会将这些信息对外披露或向第三方提供。本应用会不时更新本隐私权政策。&nbsp;您在同意本应用服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本应用服务使用协议不可分割的一部分。
+			      \n
+			      1.&nbsp;适用范围
+			      \n
+			      a)&nbsp;在您注册本应用帐号时，您根据本应用要求提供的个人注册信息；
+			      \n
+			      b)&nbsp;在您使用本应用网络服务，或访问本应用平台网页时，本应用自动接收并记录的您的浏览器和计算机上的信息，包括但不限于您的IP地址、浏览器的类型、使用的语言、访问日期和时间、软硬件特征信息及您需求的网页记录等数据；
+			      \n
+			      c)&nbsp;本应用通过合法途径从商业伙伴处取得的用户个人数据。
+			      \n
+			      您了解并同意，以下信息不适用本隐私权政策：
+			      \n
+			      a)&nbsp;您在使用本应用平台提供的搜索服务时输入的关键字信息；
+			      \n
+			      b)&nbsp;本应用收集到的您在本应用发布的有关信息数据，包括但不限于参与活动、成交信息及评价详情；
+			      \n
+			      c)&nbsp;违反法律规定或违反本应用规则行为及本应用已对您采取的措施。
+			    </text>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+				title: '',
+				desc: ''
+			}
+		},
+		onReady() {
+			this.title = '用户政策';
+			this.desc = '隐私政策本应用尊重并保护所有使用服务用户的个人隐私权。为了给您提供更准确、更有个性化的服务，本应用会按照本隐私权政策的规定使用和披露您的个人信息。但本应用将以高度的勤勉、审慎义务对待这些信息。除本隐私权政策另有规定外，在未征得您事先许可的情况下，本应用不会将这些信息对外披露或向第三方提供。本应用会不时更新本隐私权政策。 您在同意本应用服务使用协议之时，即视为您已经同意本隐私权政策全部内容。本隐私权政策属于本应用服务使用协议不可分割的一部分。';
+		},
+		methods: {
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.app {
+		.content {
+			.title {
+				margin: 24px 16px 0;
+				font-size: 24px;
+				font-weight: 400;
+				color: #26292F;
+			}
+			
+			.paragraph1 {
+			  margin: 24px 16px 0;
+			  padding: 0 0 150rpx 0;
+			  display: block;
+			  overflow-wrap: break-word;
+			  color: rgba(38, 41, 47, 1);
+			  font-size: 14px;
+			  line-height: 20px;
+			  overflow: hidden;
+			  text-overflow: ellipsis;
+			}
+
+		}
+	}
+</style>

+<template>
+	<view class="edit-account">
+		<view class="account_name">
+			<view class="img_bg">
+				<u-image src="/static/img/my/LOGO@2x.png" width="200rpx" height="96rpx" />
+			</view>
+			<view class="describe">版本号v1.3.3</view>
+		</view>
+		
+
+	</view>
+</template>
+
+<script>
+
+
+	export default {
+		data() {
+
+			return {
+				
+			}
+		},
+
+		onLoad(option) {
+
+		},
+
+		onShow() {
+
+		},
+
+		
+		
+
+		methods: {
+
+			
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.edit-account /deep/ .u-input__input {
+		font-size: 34rpx;
+	}
+
+	.edit-account {
+		padding: 0 28rpx;
+
+		.account_name {
+			.img_bg {
+				width: 200rpx;
+				padding: 100rpx 0 0 0;
+				margin: 0 auto;
+			}
+
+			.describe {
+				text-align: center;
+				font-size: 24rpx;
+				line-height: 48rpx;
+				color: #202131;
+				padding: 40rpx 0 0 0;
+			}
+		}
+	}
+</style>

+<template>
+	<view class="written-off">
+		<view class="box">
+			<view class="icon">
+				<icon type="warn" size="53"></icon>
+			</view>
+			<view class="text">
+				<view class="title">已注销</view>
+				<view class="describe">您的账号已注销，请更换账号登录</view>
+			</view>
+		</view>
+		
+		<view class="footer">
+			<view class="left_btn">
+				<c-button type="confirm" shape="circle" @click="popPhoneNumber" text="联系客服"></c-button>
+			</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	export default {
+		data() {
+			return {
+
+			}
+		},
+		methods: {
+			popPhoneNumber(){
+				uni.makePhoneCall({
+					phoneNumber:"150-7142-1900"
+				})
+			},
+		}
+	}
+</script>
+
+<style lang="scss" scoped>
+	.written-off {
+		width: 100%;
+		height: 100%;
+		position: relative;
+
+		.box {
+			.icon {
+				padding: 308rpx 0 0 0;
+				text-align: center;
+			}
+
+			.text {
+				text-align: center;
+
+				.title {
+					font-size: 34rpx;
+					color: #000000;
+					line-height: 48rpx;
+					margin: 44rpx 0 32rpx 0;
+				}
+
+				.describe {
+					font-size: 28rpx;
+					color: rgba(0, 0, 0, 0.5);
+					line-height: 40rpx;
+				}
+			}
+		}
+
+		.footer {
+			width: 100%;
+			height: 96rpx;
+			padding: 28rpx 30rpx;
+			background: #FFFFFF;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			z-index: 99;
+			border-top: 2rpx solid #E2E2E8;
+		
+			view {
+				display: inline-block;
+			}
+		
+			.left_btn {
+				width: 690rpx;
+				margin: 0 30rpx 0 0;
+			}
+		}
+	}
+</style>

 <template>
-	<view style="height: 100%;">
+	<view class="home_box">
+		<view class="home">
+
+			<view class="school_box" v-if="hasLogin">
+				<u-image :src="vuex_baseImgUrl+'/schoolBg.png'" width="750rpx" height="496rpx" />
+				<view class="school" :style="{top:top}">
+					<u-icon size="32rpx" name="/static/img/home/changeSchool.png" @click="show = true"></u-icon>
+					<text>{{doneSchoolName}}</text>
+				</view>
+			</view>
+
+			<view class="school_box" v-else>
+				<u-image :src="vuex_baseImgUrl+'/schoolBg.png'" width="750rpx" height="496rpx" />
+				<view class="school" :style="{top:top}">
+					<u-icon size="32rpx" name="/static/img/home/changeSchool.png"></u-icon>
+					<text>校职通</text>
+				</view>
+			</view>
+
+			<view class="info" v-if="hasLogin">
+				<u-row justify="space-between" customStyle="margin-bottom: 24rpx">
+					<u-col span="5">
+						<view class="name">
+							<text>{{teacher.name}}</text>
+							<text>老师您好！</text>
+						</view>
+					</u-col>
+					<u-col span="3" v-if="doneRolesLength > 1">
+						<view class="identity" @click="handelChange">
+							<u-icon size="36rpx" :label="doneRolesName" labelPos="right" labelSize="24rpx"
+								labelColor="#202131" name="/static/img/home/changeAuth.png"></u-icon>
+						</view>
+					</u-col>
+				</u-row>
+			</view>
+
+			<view class="info" v-else>
+				<u-row justify="space-between" customStyle="margin-bottom: 24rpx">
+					<u-col span="5">
+						<view class="name" @click="handelLOgin">
+							<text>未登录</text>
+							<text>您还没有登录</text>
+						</view>
+					</u-col>
+				</u-row>
+			</view>
+
+			<view class="gate">
+				<u-row justify="space-between" gutter="16rpx" customStyle="margin-bottom: 10px">
+					<u-col span="4">
+						<view class="box">
+							<view class="item review" data-type="review" @click="handelGate">
+								<u-image src="/static/img/home/registrationReviewBg.png" width="220rpx"
+									height="256rpx" />
+								<view class="copywriting">
+									<text>报名审核</text>
+									<text>审核学生实习报名</text>
+								</view>
+							</view>
+						</view>
+					</u-col>
+					<u-col span="4">
+						<view class="box">
+							<view class="item signIn" :style="{marginBottom:'16rpx'}" data-type="signin"
+								@click="handelGate">
+								<u-image src="/static/img/home/studentSignInBg.png" width="220rpx" height="120rpx" />
+								<view>
+									<u-icon size="48rpx" label="学生签到" labelPos="right" labelSize="28rpx"
+										labelColor="#1F71DE" name="/static/img/home/iconStudentSignIn.png"></u-icon>
+									<text>查看学生签到数据</text>
+								</view>
+							</view>
+							<view class="item report" data-type="report" @click="handelGate">
+								<u-image src="/static/img/home/reportReviewBg.png" width="220rpx" height="120rpx" />
+								<view>
+									<u-icon size="48rpx" label="报告批阅" labelPos="right" labelSize="28rpx"
+										labelColor="#FD9A03" name="/static/img/home/iconReportReview.png"></u-icon>
+									<text>批阅学生实习报告</text>
+								</view>
+							</view>
+						</view>
+					</u-col>
+					<u-col span="4">
+						<view class="box">
+							<view class="item signIn" :style="{marginBottom:'16rpx'}" data-type="log"
+								@click="handelGate">
+								<u-image src="/static/img/home/logReviewBg.png" width="220rpx" height="120rpx" />
+								<view>
+									<u-icon size="48rpx" label="日志批阅" labelPos="right" labelSize="28rpx"
+										labelColor="#7A7EF9" name="/static/img/home/iconLogReview.png"></u-icon>
+									<text>批阅学生周日志</text>
+								</view>
+							</view>
+							<view class="item report" data-type="achievement" @click="handelGate">
+								<u-image src="/static/img/home/achievementAppraisalBg.png" width="220rpx"
+									height="120rpx" />
+								<view>
+									<u-icon size="48rpx" label="成绩鉴定" labelPos="right" labelSize="28rpx"
+										labelColor="#FF6363" name="/static/img/home/iconAchievementAppraisal.png">
+									</u-icon>
+									<text>鉴定学生实习成绩</text>
+								</view>
+							</view>
+						</view>
+					</u-col>
+				</u-row>
+
+			</view>
+
+			<view class="todoList">
+				<view class="title">待办事项</view>
+				<view v-if="hasLogin">
+					<view
+						v-if="statistics && (statistics.internshipApply > 0 || statistics.formLogWaitReview > 0 || statistics.reportWaitReview > 0 || statistics.achievementWaitAppraisal > 0 )">
+						<view class="cell">
+							<u-cell-group :border="false">
+								<u-cell
+									v-if="statistics && statistics.internshipApply && statistics.internshipApply > 0"
+									:isLink="true"
+									url="/pages/main/home/registrationReview/registrationReview?status=wait"
+									arrow-direction="right" :rightIconStyle="{fontSize:'24rpx'}" :border="false">
+									<view slot="title" class="u-slot-title">
+										<view class="u-cell-title">实习申请</view>
+										<view class="u-cell-text">
+											您有<text>{{statistics.internshipApply}}</text>条<text>实习申请</text>待处理！</view>
+									</view>
+									<text slot="value" class="u-slot-value">立即处理</text>
+								</u-cell>
+
+								<u-cell
+									v-if="statistics && statistics.formLogWaitReview && statistics.formLogWaitReview > 0"
+									:isLink="true" url="/pages/main/home/logReview/logReview?status=unread"
+									arrow-direction="right" :rightIconStyle="{fontSize:'24rpx'}" :border="false">
+									<view slot="title" class="u-slot-title">
+										<view class="u-cell-title">日志批阅</view>
+										<view class="u-cell-text">
+											您有<text>{{statistics.formLogWaitReview}}</text>篇<text>日志</text>待批阅！</view>
+									</view>
+									<text slot="value" class="u-slot-value">立即批阅</text>
+								</u-cell>
+
+								<u-cell
+									v-if="statistics && statistics.reportWaitReview && statistics.reportWaitReview > 0"
+									:isLink="true" url="/pages/main/home/reportReview/reportReview?status=stay_examine"
+									arrow-direction="right" :rightIconStyle="{fontSize:'24rpx'}" :border="false">
+									<view slot="title" class="u-slot-title">
+										<view class="u-cell-title">报告批阅</view>
+										<view class="u-cell-text">
+											您有<text>{{statistics.reportWaitReview}}</text>篇<text>实习报告</text>待批阅！</view>
+									</view>
+									<text slot="value" class="u-slot-value">立即批阅</text>
+								</u-cell>
+
+								<u-cell
+									v-if="statistics && statistics.achievementWaitAppraisal && statistics.achievementWaitAppraisal > 0"
+									:isLink="true"
+									url="/pages/main/home/achievementAppraisal/achievementAppraisal?appraisalStatus=no_appraisal"
+									arrow-direction="right" :rightIconStyle="{fontSize:'24rpx'}" :border="false">
+									<view slot="title" class="u-slot-title">
+										<view class="u-cell-title">成绩评定</view>
+										<view class="u-cell-text">
+											您有<text>{{statistics.achievementWaitAppraisal}}</text>个<text>成绩</text>待评定！
+										</view>
+									</view>
+									<text slot="value" class="u-slot-value">立即评定</text>
+								</u-cell>
+
+							</u-cell-group>
+						</view>
+					</view>
+					<view v-else>
+						<c-no-data paddingTop="30" title="当前无待办事项"></c-no-data>
+					</view>
+				</view>
+				<view class="no_login" v-else>
+					<text>登录后可查看待办事项</text>
+					<u-button type="primary" text="登录" color="#06B079" :customStyle="{width:'340rpx'}"
+						@click="handelLOgin"></u-button>
+				</view>
+			</view>
+		</view>
+
+		<u-popup :show="show" mode="left" @close="close" @open="open">
+			<view class="popup_search">
+				<view class="content">
+					<view class="title">
+						<text>选择学校</text>
+						<text>请选择您想登录管理的学校</text>
+					</view>
+					<scroll-view class="scroll" scroll-y="true">
+						<view class="item" v-for="(item, i) in schoolList" :key="i" @click="handelClick(item)">
+							<view v-if="item.id == schoolId">
+								<u-image src="/static/img/home/schoolAvatar.png" width="104rpx" height="104rpx" />
+								<text class="fullName">{{item.fullName}}</text>
+							</view>
+							<view v-else>
+								<u-image src="/static/img/home/schoolAvatar.png" width="104rpx" height="104rpx" />
+								<text class="fullName">{{item.fullName}}</text>
+							</view>
+						</view>
+					</scroll-view>
+
+				</view>
+
+			</view>
+		</u-popup>
 
 	</view>
 </template>
 
 <script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+
+
+	import {
+		putTeacherRolesApi,
+		getTodoListStatisticsApi,
+	} from '@/config/api.js';
 
 	export default {
 		data() {
 			return {
-
+				top: '0rpx',
+				show: false,
+				schoolId: '',
+				statistics: {}
 			}
 		},
 
 		onLoad() {
-			
+
 		},
 
 		onShow() {
+			uni.getSystemInfo({
+				success: (res) => {
+
+					let menuButtonInfo = uni.getMenuButtonBoundingClientRect();
+					let menuTop = menuButtonInfo.top
+
+					// 状态栏高度
+					let winWidth = res.windowWidth;
+					let proportion = 750 / winWidth;
+
+					this.top = ((menuTop * proportion) + 16) + 'rpx';
+				},
+				complete: function(res) {},
+			});
+
+			if (this.hasLogin) {
+				this.$store.dispatch(`home/getSchoolList`, {
+					pageSize: -1,
+				})
+				getTodoListStatisticsApi().then(data => {
+					if (data) {
+						this.statistics = data;
+					}
+				})
+			}
+		},
+
+		computed: {
+			...mapGetters([
+				'doneRolesLength',
+				'doneRolesName',
+				'doneSchoolName',
+			]),
+
+			...mapState({
+				hasLogin: 'hasLogin',
+				vuex_user: 'vuex_user',
+				refresh_token: 'refresh_token',
+				teacher: (state) => state.vuex_user.teacher,
+			}),
+			...mapState('home', {
+				// 箭头函数可使代码更简练
+				schoolList: 'schoolList',
+
+			}),
+			...mapState('user', {
+				// 箭头函数可使代码更简练
+				loginInfo: 'loginInfo',
+
+			}),
+
+
+
 
 		},
 
 		methods: {
 
+			handelClick(values) {
+				this.schoolId = values.id;
+
+				this.$store.dispatch(`user/login`, {
+					way: 'refresh_token',
+					refreshToken: this.refresh_token,
+					schoolId: values.id,
+				}).then(data => {
+					console.log(data)
+					if (data) {
+						
+						getTodoListStatisticsApi().then(data => {
+							if (data) {
+								this.statistics = data;
+							}
+						})
+						
+						this.show = false;
+					}
+				})
+			},
+
+			open() {
+
+			},
+
+			close() {
+				this.show = false
+			},
+
+			handelLOgin() {
+				this.$u.route('/pages/main/my/login/login');
+			},
+
+			handelChange() {
+				let {
+					roles = []
+				} = this.teacher;
+
+				if (roles.length < 2) {
+					this.$u.toast('暂无可切换权限')
+				} else {
+
+					let selectRoles = roles.filter(item => item.id != this.teacher.roleId);
+
+					putTeacherRolesApi(this.teacher.id, {
+						roleId: selectRoles[0].id
+					}).then(data => {
+						if (data) {
+							console.log(data)
+							this.$store.dispatch(`user/getUserInfo`);
+
+							getTodoListStatisticsApi().then(data => {
+								if (data) {
+									this.statistics = data;
+								}
+							})
+						}
+					})
+				}
+			},
+
+
+
+			handelGate(even) {
+				if (!this.hasLogin) {
+					this.$u.route('/pages/main/my/login/login');
+					return;
+				}
+
+				let {
+					type = ''
+				} = even.currentTarget.dataset;
+
+				switch (type) {
+					case 'review':
+						this.$u.route('/pages/main/home/registrationReview/registrationReview');
+						break;
+
+					case 'signin':
+						this.$u.route('/pages/main/home/studentSignIn/studentSignIn');
+						break;
+
+					case 'log':
+						this.$u.route('/pages/main/home/logReview/logReview');
+						break;
+
+					case 'report':
+						this.$u.route('/pages/main/home/reportReview/reportReview');
+						break;
+
+					case 'achievement':
+						this.$u.route('/pages/main/home/achievementAppraisal/achievementAppraisal');
+						break;
+
+
+
+
+
+
+				}
+
+			},
+
 		}
 	}
 </script>
 
 <style lang="scss" scoped>
+	.cell /deep/ .u-cell {
+		background-color: #FFFFFF;
+		border-radius: 12rpx;
+		margin: 0 0 20rpx 0;
+	}
+
+	.home_box {
+		background-color: #F7F7F7;
+		min-height: 100%;
+		height: auto;
+
+		.home {
+			width: 100%;
+
+			.school_box {
+				width: 100%;
+				height: 496rpx;
+				margin: 0 0 34rpx 0;
+				position: relative;
+
+				.school {
+					position: absolute;
+					top: 0rpx;
+					left: 40rpx;
+					display: flex;
+					flex-flow: row nowrap;
+
+					text {
+						font-size: 32rpx;
+						line-height: 32rpx;
+						color: #202131;
+						font-weight: 500;
+						width: 600rpx;
+						text-align: center;
+					}
+				}
+
+			}
+
+			.info {
+				width: 690rpx;
+				margin: 0 auto;
+
+				.name {
+					text {
+						display: inline-block;
+						font-size: 24rpx;
+						line-height: 36rpx;
+						color: #909097;
+						margin: 0 0 0 12rpx;
+					}
+
+					text:first-child {
+
+						font-size: 36rpx;
+						line-height: 52rpx;
+						color: #202131;
+						width: 150rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						margin: 0;
+					}
 
+					text:last-child {
+						vertical-align: super;
+					}
+				}
+
+				.identity {
+					margin: 0 0 0 10rpx;
+				}
+			}
+
+			.gate {
+				width: 690rpx;
+				margin: 0 auto 50rpx;
+
+				.box {
+					width: 220rpx;
+					height: 256rpx;
+
+					.item {
+						position: relative;
+						width: 220rpx;
+						height: 120rpx;
+
+						view {
+							position: absolute;
+							top: 20rpx;
+							left: 20rpx;
+
+							text {
+								display: block;
+								margin: 8rpx 0 0 6rpx;
+								font-size: 20rpx;
+								line-height: 20rpx;
+								color: #909097;
+							}
+						}
+					}
+
+					.review {
+
+
+						.copywriting {
+							position: absolute;
+							top: 56rpx;
+							right: 32rpx;
+
+							text {
+								display: block;
+								font-size: 28rpx;
+								line-height: 36rpx;
+								color: #06B079;
+								margin: 0;
+							}
+
+							text:last-child {
+								font-size: 20rpx;
+								line-height: 52rpx;
+								color: #909097;
+							}
+
+						}
+					}
+				}
+			}
+
+			.todoList {
+				width: 690rpx;
+				margin: 0 auto;
+
+				.no_login {
+					padding: 150rpx 0 0 0;
+					text-align: center;
+
+					text {
+						font-size: 24rpx;
+						line-height: 52rpx;
+						color: #909097;
+					}
+				}
+
+				.title {
+					font-size: 32rpx;
+					line-height: 32rpx;
+					color: #202131;
+				}
+
+				.title::before {
+					content: "";
+					display: inline-block;
+					width: 6rpx;
+					height: 32rpx;
+					background-color: #06B079;
+					margin: 0 12rpx 0 0;
+					position: relative;
+					top: 4rpx;
+					border-radius: 8rpx;
+				}
+
+				.cell {
+					margin: 20rpx 0 0 0;
+
+					.u-slot-title {
+						.u-cell-title {
+							font-size: 24rpx;
+							line-height: 54rpx;
+							color: #909097;
+						}
+
+						.u-cell-text {
+							font-size: 28rpx;
+							line-height: 60rpx;
+							color: #202131;
+
+							text {
+								color: #06B079;
+							}
+						}
+					}
+
+					.u-slot-value {
+						font-size: 24rpx;
+						line-height: 36rpx;
+						color: #909097;
+					}
+				}
+
+			}
+		}
+
+		.popup_search {
+			width: 540rpx;
+			height: 100%;
+			background-color: #F7F7F7;
+			position: relative;
+
+			.content {
+				padding: 100rpx 40rpx 0;
+
+				.title {
+					font-size: 48rpx;
+					line-height: 60rpx;
+					color: #202131;
+
+					text:last-child {
+						display: block;
+						font-size: 24rpx;
+						line-height: 32rpx;
+						color: #909097;
+						margin: 30rpx 0 70rpx 0;
+					}
+				}
+
+				.scroll {
+					max-height: 60vh;
+
+					.item {
+						width: 380rpx;
+						height: 100rpx;
+						box-shadow: 0rpx 4rpx 48rpx 0rpx rgba(175, 174, 174, 0.1500);
+						border-radius: 20rpx;
+						margin: 0 0 20rpx 0;
+						padding: 40rpx;
+						background-color: #FFFFFF;
+
+
+						view {
+							display: flex;
+							flex-flow: row wrap;
+							align-items: center;
+
+							text {
+								width: 240rpx;
+								font-size: 40rpx;
+								line-height: 48rpx;
+								color: #202131;
+								margin: 0 0 0 34rpx;
+							}
+						}
+
+					}
+				}
+			}
+
+		}
+	}
 </style>

 <template>
-	<view class="internship">
-		
+	<view class="internship_box">
+		<view class="internship" v-if="hasLogin">
+
+			<view class="search_box">
+				<view class="search">
+					<u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
+						bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
+					</u-search>
+				</view>
+			</view>
+
+			<view class="list_box" v-if="list.length > 0">
+				<view class="item" v-for="(item, i) in list" :key="i" @click="handelDetail(item)">
+
+					<view class="info">
+						<u-image src="/static/img/internship/classIcon.png" width="88rpx" height="88rpx" />
+						<view class="title_name">
+							<view class="title">
+								{{item.startSchoolYear}}
+							</view>
+							<view class="time">
+								<text>{{item.classInfoName}}</text>
+							</view>
+						</view>
+						<view class="num">
+							<text>{{item.internedTotal || 0}}/{{item.classInfoTotal || 0}}</text>
+							<u-icon :style="{margin:'0 0 0 8rpx'}" name="arrow-right" color="#909097" size="24">
+							</u-icon>
+						</view>
+					</view>
+
+				</view>
+				<c-loading :loading="loading"></c-loading>
+			</view>
+			<view v-else class="no_data">
+				<c-no-data></c-no-data>
+			</view>
+
+		</view>
+		<view class="no_login" v-else>
+			<view class="image">
+				<u-image :style="{margin:'0 auto'}" :src="vuex_baseImgUrl+'/internship_bg.png'" width="480rpx"
+					height="480rpx"></u-image>
+			</view>
+			<view class="btn">
+				<text>登录后可查看待办事项</text>
+				<u-button type="primary" text="登录" color="#06B079" :customStyle="{width:'340rpx'}" @click="handelLOgin">
+				</u-button>
+			</view>
+		</view>
 	</view>
 </template>
 
 <script>
+	import {
+		mapGetters,
+		mapState,
+		mapActions
+	} from 'vuex'
+
+	import listMixin from "@/common/mixins/list-mixin.js";
+
+	import {
+		getClassListApi,
+	} from '@/config/api.js';
 
 	export default {
+		mixins: [listMixin],
 		data() {
 			return {
-				
-			};
+				keyword: '',
+				list: [],
+				search: {
+					keySearch: "",
+				},
+			}
 		},
 
-		onLoad() {},
+		onLoad() {
 
-		async onShow() {
-			
 		},
 
-		methods: {
-			
+		onShow() {
+			if (this.hasLogin) {
+				this.search.keySearch = '';
+
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			}
+		},
+
+		computed: {
+			...mapState({
+				hasLogin: 'hasLogin',
+				vuex_user: 'vuex_user',
+				teacher: (state) => state.vuex_user.teacher,
+			}),
+
+
 		},
-	};
-</script>
+
+		methods: {
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+
+			handelLOgin() {
+				this.$u.route('/pages/main/my/login/login');
+			},
+
+			handelSearch(value) {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+			handelDetail(record) {
+				this.$u.route({
+					url: `pages/main/internship/studentList/studentList?classInfoId=${record.classInfoId}`
+				})
+			},
+
+			// scroll-view到底部加载更多
+			onreachBottom() {},
+			// 搜索
+			searchSubmit() {
+				// 调用混合搜索
+				this._searchData();
+			},
+			// 模拟后端分页
+			async getData(requestParams) {
+				const {
+					search = {}
+				} = requestParams;
+
+				let params = {};
+				params.pageNumber = requestParams.page + 1;
+				params.pageSize = 5;
+
+				if (this.keyword) {
+					params.keySearch = this.keyword
+				}
+
+				return await getClassListApi(params);
+			},
+			// 数据请求(没错就是这么少的代码)
+			async _getList() {
+				if (this.page == 0) {
+					this.list = [];
+				}
+
+				// 根据实际情况修改自己修改key
+				let result = await this.getData({
+					page: this.page, // 传入页码
+					size: this.size, // 传入每页条数
+					search: this.search, // 传入搜索的对象
+				});
+
+				this.total = result.total;
+
+				if (this.list.length == 0 && result.records.length == 0) {
+					this.shownoData = false
+				} else {
+					this.shownoData = true
+				}
+
+				this.list = this.list.concat(result.records)
+				
+				// 判断是否全部加载完成
+				if (this.total == this.list.length) {
+					this.finished = true;
+					this.loading = 'nomore';
+				} else {
+					this.loading = 'loadmore';
+				}
+			},
+
+		}
+	}
+</script>
 
 <style lang="scss" scoped>
+	.internship_box {
+		background-color: #F7F7F7;
+		min-height: 100%;
+		height: auto;
+
+		.internship {
+			width: 100%;
+			margin: 0 auto;
+
+			.search_box {
+				padding: 36rpx 0;
+				background-color: #FFFFFF;
+
+				.search {
+					width: 690rpx;
+					margin: 0 auto;
+				}
+
+			}
+
+			.list_box {
+				padding: 0 0 50rpx 0;
+
+				.item {
+					position: relative;
+					width: 630rpx;
+					margin: 30rpx auto;
+					padding: 30rpx;
+					border-radius: 12rpx;
+					background-color: #FFFFFF;
+
+					.info {
+						display: flex;
+						flex-flow: row nowrap;
+						align-items: center;
+						position: relative;
+
+						.title_name {
+							.title {
+								font-size: 24rpx;
+								line-height: 36rpx;
+								color: #06B079;
+								margin: 0 12rpx;
+							}
+
+							.time {
+								padding: 12rpx 0 0 12rpx;
+								font-size: 28rpx;
+								line-height: 40rpx;
+								color: #202131;
+							}
+						}
+
+						.num {
+							display: flex;
+							flex-flow: row nowrap;
+							position: absolute;
+							top: 26rpx;
+							right: 0rpx;
+
+							text {
+								font-size: 24rpx;
+								line-height: 36rpx;
+								color: #909097;
+							}
+						}
+					}
+				}
+			}
+		}
+
+		.no_login {
+			padding: 180rpx 0 0 0;
+			text-align: center;
+
+			.image {
+				width: 480rpx;
+				margin: 0 auto;
+			}
+
+			.btn {
+				position: relative;
+				top: -80rpx;
+
+				text {
+					font-size: 24rpx;
+					line-height: 52rpx;
+					color: #909097;
+
+				}
+			}
+		}
 
-	
+	}
 </style>

-<template>
-	<view>
-		
-	</view>
-</template>
-
-<script>	
-	
-	export default {
-		data() {
-			return {
-				
+<template>
+	<view class="my_box">
+		<view class="my" v-if="hasLogin">
+			<view class="box-bg">
+				<u-image width="100%" height="500rpx" :src="vuex_baseImgUrl+'/myBg.png'" />
+			</view>
+			<view class="container">
+				<view class="avatar">
+					<u-image :src="reversedAvatarUrl" shape="circle" width="190rpx" height="190rpx" />
+				</view>
+				<view class="top">
+
+					<view class="title">
+						<text class="name">{{reversedName}}</text>
+						<view class="info" @click="link('person')">
+							<text class="edit-name">{{"个人资料"}}</text>
+							<u-icon class="arrowRight" width="20rpx" name="arrow-right" color="#B2B2B2" size="28">
+							</u-icon>
+						</view>
+					</view>
+
+					<view class="cell">
+						<u-cell-group :border="false">
+							<u-cell title="账号与安全" :isLink="true" url="/pages/main/my/accountSafe/accountSafe"
+								arrow-direction="right" :rightIconStyle="{fontSize:'28rpx'}" :border="false"
+								:title-style="{padding:'0 0 0 14rpx', color:'#333', fontSize:'28rpx'}">
+								<u-icon slot="icon" size="48" :name="'/static/img/my/accountSafe.png'"></u-icon>
+							</u-cell>
+							<u-cell title="政策与协议" :isLink="true"
+								url="/pages/main/my/policiesAgreement/policiesAgreement" arrow-direction="right"
+								:rightIconStyle="{fontSize:'28rpx'}" :border="false"
+								:title-style="{padding:'0 0 0 14rpx', color:'#333', fontSize:'28rpx'}">
+								<u-icon slot="icon" size="48" :name="'/static/img/my/policiesAgreement.png'"></u-icon>
+							</u-cell>
+						</u-cell-group>
+					</view>
+				</view>
+
+				<view class="bottom">
+					<view class="cell">
+						<u-cell-group :border="false">
+							<u-cell title="版本信息" :isLink="true" url="/pages/main/my/versionInfo/versionInfo"
+								arrow-direction="right" :rightIconStyle="{fontSize:'28rpx'}" :border="false"
+								:title-style="{padding:'0 0 0 14rpx', color:'#333', fontSize:'28rpx'}">
+								<u-icon slot="icon" size="48" :name="'/static/img/my/versionInfo.png'"></u-icon>
+							</u-cell>
+						</u-cell-group>
+					</view>
+				</view>
+
+				<view class="btn loginOut">
+					<c-button type="cancel" @click="link('loginOut')" text="退出登录">
+					</c-button>
+				</view>
+			</view>
+		</view>
+
+		<view class="my" v-else>
+			<view class="box-bg">
+				<u-image width="100%" height="500rpx" :src="vuex_baseImgUrl+'/myBg.png'" />
+			</view>
+			<view class="container">
+				<view class="avatar">
+					<u-image src="/static/img/my/default_avatar.png" shape="circle" width="190rpx" height="190rpx" />
+				</view>
+				<view class="top">
+
+					<view class="title">
+						<text class="name" @click="handelLOgin">{{`未登录/注册`}}</text>
+						<view class="info" @click="handelLOgin">
+							<text class="edit-name">{{"个人资料"}}</text>
+							<u-icon class="arrowRight" width="20rpx" name="arrow-right" color="#B2B2B2" size="28">
+							</u-icon>
+						</view>
+					</view>
+
+					<view class="cell">
+						<u-cell-group :border="false">
+							<u-cell icon="/static/img/my/school_authen.png" title="账号与安全" :isLink="true"
+								url="/pages/main/my/login/login" arrow-direction="right"
+								:rightIconStyle="{fontSize:'36rpx'}" :border="false"
+								:title-style="{padding:'0 0 0 14rpx', color:'#333', fontSize:'36rpx'}">
+								<u-icon slot="icon" size="64" :name="'/static/img/my/school_authen.png'"></u-icon>
+							</u-cell>
+							<u-cell icon="/static/img/my/school_authen.png" title="政策与协议" :isLink="true"
+								url="/pages/main/my/login/login" arrow-direction="right"
+								:rightIconStyle="{fontSize:'36rpx'}" :border="false"
+								:title-style="{padding:'0 0 0 14rpx', color:'#333', fontSize:'36rpx'}">
+								<u-icon slot="icon" size="64" :name="'/static/img/my/school_authen.png'"></u-icon>
+							</u-cell>
+						</u-cell-group>
+					</view>
+				</view>
+
+				<view class="cell bottom">
+					<u-cell-group :border="false">
+						<u-cell icon="/static/img/my/school_authen.png" title="版本信息" :isLink="true"
+							url="/pages/main/my/login/login" arrow-direction="right"
+							:rightIconStyle="{fontSize:'36rpx'}" :border="false"
+							:title-style="{padding:'0 0 0 14rpx', color:'#333', fontSize:'36rpx'}">
+							<u-icon slot="icon" size="64" :name="'/static/img/my/school_authen.png'"></u-icon>
+						</u-cell>
+					</u-cell-group>
+				</view>
+			</view>
+		</view>
+
+	</view>
+</template>
+
+<script>
+	import {
+		mapState,
+		mapActions
+	} from 'vuex'
+
+	export default {
+		data() {
+			return {
+				avatarUrl: '',
+			}
+		},
+
+		onLoad() {
+
+		},
+
+		onShow() {
+			if (this.hasLogin) {
+				this.getUserInfo()
+			}
+		},
+
+		computed: {
+			...mapState({
+				hasLogin: 'hasLogin',
+				vuex_user: 'vuex_user',
+				vuex_weixinUserInfo: 'vuex_weixinUserInfo',
+				teacher: (state) => state.vuex_user.teacher,
+				vuex_weixinUserInfo: (state) => state.vuex_weixinUserInfo,
+			}),
+
+			//name
+			reversedName() {
+				return (this.teacher && this.teacher.name) ? this.teacher.name : this.vuex_user.username;
+			},
+
+			//avatar
+			reversedAvatarUrl() {
+				if (this.teacher && this.teacher.avatarUrl) {
+					return this.vuex_ossUrlPubilc + '/' + this.teacher.avatarUrl
+				}
+				return (this.vuex_weixinUserInfo && this.vuex_weixinUserInfo.avatarUrl) ? this.vuex_weixinUserInfo
+					.avatarUrl : '/static/img/my/default_avatar.png';
+			}
+		},
+
+		methods: {
+
+			...mapActions('user', {
+				getUserInfo: 'getUserInfo',
+			}),
+
+			handelLOgin() {
+				this.$u.route('/pages/main/my/login/login');
+			},
+
+			link(type) {
+				const {
+					dispatch
+				} = this.$store;
+
+				switch (type) {
+
+					case 'person':
+						this.$u.route('/pages/main/my/personInfo/personInfo');
+						break;
+
+					case 'loginOut':
+						dispatch(`user/loginOut`);
+						break;
+
+
+				}
+
+			},
+
+		}
+
+
+	}
+</script>
+
+<style lang="scss" scoped>
+	.my_box {
+		width: 100%;
+		height: 100%;
+	}
+
+	.my {
+		width: 100%;
+		height: 100%;
+		position: relative;
+		background-color: #F7F7F7;
+
+		.box-bg {}
+
+		.container {
+			width: 100%;
+			position: absolute;
+			top: 320rpx;
+			left: 0;
+			background-color: #F7F7F7;
+			padding: 0 0 100rpx 0;
+
+
+
+			.avatar {
+				position: absolute;
+				top: -95rpx;
+				left: 32rpx;
 			}
-		},
-		
-		onShow() {
 			
-		},
-
-		methods: {
-			
-		}
-	}
-</script>
-
-<style lang="scss" scoped>
-	
+			.cell /deep/ .u-cell {
+				padding: 16rpx 2rpx;
+			}
+
+			.top {
+				background: #FFFFFF;
+				box-shadow: 0px 0px 20px 0px rgba(0, 0, 0, 0.03);
+				border-top-left-radius: 20px;
+				border-top-right-radius: 20px;
+
+				.title {
+					padding: 32rpx 0 40rpx 234rpx;
+					display: flex;
+					flex-flow: row nowrap;
+					justify-content: space-between;
+
+
+					.name {
+						display: inline-block;
+						width: 300rpx;
+						overflow: hidden;
+						text-overflow: ellipsis;
+						white-space: nowrap;
+						font-size: 44rpx;
+						line-height: 60rpx;
+						font-size: 500;
+					}
+
+					.info {
+						display: flex;
+						flex-flow: row nowrap;
+						padding: 0 30rpx 0 0;
+
+						.edit-name {
+							float: right;
+							font-size: 26rpx;
+							line-height: 36rpx;
+							padding: 12rpx 6rpx 0 0;
+							color: rgba(0, 0, 0, 0.65);
+						}
+
+						.arrowRight {
+							float: right;
+							padding: 18rpx 32rpx 0 130rpx;
+						}
+					}
+				}
+
+			}
+
+			.bottom {
+				margin: 16rpx 0 0 0;
+				background-color: #FFFFFF;
+			}
+
+			.loginOut {
+				width: 634rpx;
+				margin: 48rpx auto 0;
+			}
+
+
+
+
+		}
+
+		.fixed_bottom_btn {
+			width: 100%;
+			height: 144rpx;
+			padding: 24rpx 32rpx;
+			background: #FFFFFF;
+			position: fixed;
+			bottom: 0;
+			left: 0;
+			z-index: 99;
+			border-top: 1rpx solid #F0F0F1;
+
+			view {
+				display: inline-block;
+			}
+
+			.left_btn {
+				width: 212rpx;
+				margin: 0 40rpx 0 0;
+			}
+
+			.right_btn {
+				width: 434rpx;
+			}
+		}
+	}
 </style>

 {
-  "projectname": "job-sharing",
+  "projectname": "yxly-teacher",
   "setting": {
     "compileHotReLoad": true
   },

 import Vue from 'vue'
 import Vuex from 'vuex'
 import user from './modules/user'
-import position from './modules/position'
+import home from './modules/home'
 Vue.use(Vuex)
 
 let lifeData = {};
@@ -14,7 +14,7 @@ try {
 }
 
 // 需要永久存储，且下次APP启动需要取出的，在state中的变量名
-let saveStateKeys = ['vuex_user', 'vuex_token', 'vuex_phone', 'vuex_weixinUserInfo' ];
+let saveStateKeys = ['hasLogin', 'vuex_user', 'vuex_token', 'refresh_token', 'vuex_phone', 'vuex_weixinUserInfo'];
 
 // 保存变量到本地存储中
 const saveLifeData = function(key, value) {
@@ -31,29 +31,31 @@ const saveLifeData = function(key, value) {
 }
 const store = new Vuex.Store({
 	modules: {
-		user,
-		position,
+		user,
+		home,
 	},
 	state: {
-		vuex_appId: 'wx84b71301436652ce',
-		vuex_corpId: 'ww4300c59cb9537f9e',//企业ID
+		hasLogin: lifeData.hasLogin ? lifeData.hasLogin : false,
+		vuex_appId: 'wx6cd2152282abd34c',
+		vuex_corpId: 'ww4300c59cb9537f9e', //企业ID
 		// 如果上面从本地获取的lifeData对象下有对应的属性，就赋值给state中对应的变量
 		// 加上vuex_前缀，是防止变量名冲突，也让人一目了然
 		vuex_user: lifeData.vuex_user ? lifeData.vuex_user : '',
 		vuex_weixinUserInfo: lifeData.vuex_weixinUserInfo ? lifeData.vuex_weixinUserInfo : '',
 		vuex_token: lifeData.vuex_token ? lifeData.vuex_token : '',
+		refresh_token: lifeData.refresh_token ? lifeData.refresh_token : '',
 		vuex_phone: lifeData.vuex_phone ? lifeData.vuex_phone : '',
 		// 如果vuex_version无需保存到本地永久存储，无需lifeData.vuex_version方式
 		vuex_version: '1.0.1',
 		vuex_demo: '绛紫',
 		vuex_baseImgUrl: "https://yxlypublic.oss-cn-beijing.aliyuncs.com/WeChat/yxly-teacher",
 		vuex_ossUrl: "https://yxly.oss-cn-beijing.aliyuncs.com",
-		vuex_ossUrlPubilc: "https://yxlypublic.oss-cn-beijing.aliyuncs.com",
-		vuex_customer_chatUrl:"https://work.weixin.qq.com/kfid/kfc04063cd2d1081221",//企业微信客服
-		vuex_customer_phone:"",
-		vuex_applyUrl:"",
-		vuex_homeUrl:"",
-		vuex_internshipDetailUrl:"",
+		vuex_ossUrlPubilc: "https://yxlypublic.oss-cn-beijing.aliyuncs.com",
+		vuex_customer_chatUrl: "https://work.weixin.qq.com/kfid/kfc04063cd2d1081221", //企业微信客服
+		vuex_customer_phone: "",
+		vuex_applyUrl: "",
+		vuex_homeUrl: "",
+		vuex_internshipDetailUrl: "",
 		// vuex_ossUrl: "https://oss.workai.com.cn",
 		vuex_OssInit: {},
 		vuex_area: {},
@@ -63,6 +65,48 @@ const store = new Vuex.Store({
 		],
 
 	},
+	getters: {
+		doneRolesLength: state => {
+			if (state && state.vuex_user && state.vuex_user.teacher) {
+				let {
+					teacher = {}
+				} = state.vuex_user;
+				if (teacher && teacher.roles && teacher.roles.length > 0) {
+
+					return teacher.roles.length
+				} else {
+					return 0
+				}
+			} else {
+				return 0
+			}
+		},
+
+		doneRolesName: state => {
+
+			if (state && state.vuex_user && state.vuex_user.teacher) {
+				let {
+					teacher = {}
+				} = state.vuex_user;
+				if (teacher && teacher.roles && teacher.roles.length > 0) {
+					let selectRoles = teacher.roles.filter(item => item.id == teacher.roleId);
+					return selectRoles[0].name
+				} else {
+					return ''
+				}
+			} else {
+				return ''
+			}
+		},
+
+		doneSchoolName: state => {
+			if (state && state.vuex_user && state.vuex_user.teacher) {
+				return state.vuex_user.teacher.schoolName;
+			} else {
+				return '';
+			}
+		},
+	},
 	mutations: {
 		$uStore(state, payload) {
 			// 判断是否多层级调用，state中为对象存在的情况，诸如user.info.score = 1
@@ -86,7 +130,7 @@ const store = new Vuex.Store({
 		},
 
 		setWenxinUserInfo(state, result) {
-			state.vuex_weixinUserInfo = result.userInfo;
+			state.vuex_weixinUserInfo = result.userInfo;
 			uni.$u.vuex('vuex_weixinUserInfo', result.userInfo);
 		},
 	}

+import {
+	getSchoolListApi,
+	getProjectListApi,
+} from '@/config/api.js';
+
+const state = () => ({
+	schoolList: [],
+	projectList: [],
+})
+
+const getters = {
+
+}
+
+const actions = {
+
+
+
+	async getSchoolList({
+		commit,
+		dispatch,
+		state
+	}, params) {
+		const result = await getSchoolListApi(params);
+		if (result && result.records) {
+			commit('setSchoolList', result);
+			return result;
+		}
+	},
+
+	async getProjectList({
+		commit,
+		dispatch,
+		state
+	}, params) {
+		const result = await getProjectListApi(params);
+		if (result && result.records) {
+			commit('setProjectList', result);
+			return result;
+		}
+	},
+
+}
+
+const mutations = {
+
+	setSchoolList(state, result) {
+		state.schoolList = result.records;
+	},
+
+	setProjectList(state, result) {
+		state.projectList = result.records;
+	},
+
+}
+
+export default {
+	namespaced: true,
+	state,
+	getters,
+	actions,
+	mutations
+}

-const state = () => ({
-	positionDetail: {},
-	reason: '',
-})
-
-const getters = {
-	doneReleaseTime: state => {
-		let {
-			publishTime = 0
-		} = state.positionDetail;
-
-		return publishTime > 0 ? uni.$u.timeFormat(publishTime, 'mm/dd') : '';
-	},
-
-	doneSalary: state => {
-		let {
-			wageType = '', wageLower = '', wageUpper = '',
-		} = state.positionDetail;
-
-		let wageTypeOption = {
-			"monthly": "月",
-			"daily": "日",
-			"hourly": "时",
-			"annual": "年"
-		};
-
-		let salary = '';
-
-		switch (wageType) {
-
-			case 'negotiable':
-				salary = '薪资面议'
-				break;
-
-			default:
-				if (wageLower == wageUpper) {
-					salary = `${wageLower}元/${wageTypeOption[wageType]}`
-				} else {
-					salary = `${wageLower}~${wageUpper}元/${wageTypeOption[wageType]}`
-				}
-				break;
-		}
-
-		return salary;
-	},
-
-	doneAddress: state => {
-		let {
-			province = '', district = '',
-		} = state.positionDetail;
-
-		return `${province}/${district}`;
-	},
-
-	doneWorkHour: state => {
-		let {
-			attendanceType = '', attendanceDay = '',
-		} = state.positionDetail;
-
-		let attendanceTypeOption = {
-			"week": "周",
-			"month": "月",
-			"year": "年"
-		};
-
-		return attendanceType && attendanceDay ? `${attendanceDay}天/${attendanceTypeOption[attendanceType]}` :
-			"";
-	},
-
-	doneProperty: state => {
-		let {
-			property = '',
-		} = state.positionDetail;
-
-		let propertyOptions = {
-			"part_time": "兼职",
-			"internship": "实习",
-			"full_time": "全职",
-			"other": "其他"
-		}
-
-		return propertyOptions[property];
-	},
-
-	doneCategory: state => {
-		let {
-			category = '',
-		} = state.positionDetail;
-
-		let categoryOptions = {
-			"0": "不限",
-			"manufacture": "智能制造",
-			"preschool": "学前教育",
-			"healthy": "智慧康养",
-			"software": "大数据与软件",
-			"other": "其他",
-		}
-
-		return categoryOptions[category];
-	},
-
-	doneDegree: state => {
-		let {
-			degreeRequires = '',
-		} = state.positionDetail;
-
-		let degreeOptions = {
-			"0": "不限",
-			"1": "初中",
-			"2": "高中",
-			"3": "中专/技校",
-			"4": "大专",
-			"5": "本科",
-			"6": "硕士",
-			"7": "博士",
-			"8": "MBA/EMBA"
-		}
-
-		return degreeRequires ? degreeOptions[degreeRequires] : "";
-	},
-
-	doneWorkExp: state => {
-		let {
-			workExp = '',
-		} = state.positionDetail;
-
-		let workExpOptions = {
-			"0": "不限",
-			"1": "在校生",
-			"2": "应届生",
-			"3": "1年以内",
-			"4": "1-3年",
-			"5": "3-5年",
-			"6": "5-10年",
-			"7": "10年以上",
-		}
-
-		return workExpOptions[workExp];
-	},
-	
-	doneFlag: state => {
-		let {
-			flag = '',
-		} = state.positionDetail;
-		
-		
-		if(flag) {
-			return flag.split(',');
-		} else {
-			return [];
-		}
-	},
-
-}
-
-const actions = {
-
-	async getPositionDetail({
-		commit,
-		dispatch,
-		state
-	}, params) {
-		const result = await uni.$u.api.getJobDetailApi(params);
-		if (result) {
-			commit('setPositionDetail', result);
-			return result;
-		}
-	},
-
-}
-
-const mutations = {
-
-	setPositionDetail(state, result) {
-		state.positionDetail = result;
-	},
-
-	setPositionReason(state, result) {
-		state.reason = result;
-	},
-
-}
-
-export default {
-	namespaced: true,
-	state,
-	getters,
-	actions,
-	mutations
-}

 import {
-		postTokenApi,
-		getUserInfoApi,
-	} from '@/config/api.js';
-
-	const state = () => ({
-		openid: '',
-		isReg: '',
-		id: '',
-		name: '',
-		number: '',
-		password: '',
-		phone: '',
-		status: '',
-		type: '',
-		username: '',
-		userBasicInfo: {},
-
-	})
-
-	const getters = {
-		// doneOpenid: (state, getters, rootState) => {
-		// 	return state.openid
-		// },
-	}
-
-	// actions
-	const actions = {
-
-		async login({
-			commit,
-			dispatch,
-			state
-		}, params) {
-			const login_result = await postTokenApi({
-				...params
-			}, {
-				custom: {
-					auth: false
-				}
-			});
-			
-			console.log(login_result)
-
-			if (login_result) {
-
-				let vuex_token = `Bearer ${login_result.access_token}`
-				await uni.$u.vuex('vuex_token', vuex_token);
-				await uni.$u.vuex('vuex_phone', login_result.phone);
-
-				switch (login_result.status) {
-
-					case 'not_reg': //未注册
+	postTokenApi,
+	getUserInfoApi,
+} from '@/config/api.js';
+
+const state = () => ({
+	loginInfo: {},
+	userInfo: {},
+	userBasicInfo: {},
+})
+
+const getters = {
+	
+}
+
+// actions
+const actions = {
+
+	async login({
+		commit,
+		dispatch,
+		state
+	}, params) {
+		const login_result = await postTokenApi({
+			...params
+		}, {
+			custom: {
+				auth: false
+			}
+		});
+		
+		console.log(login_result)
+
+		if (login_result) {
+
+			await commit('setLogin', login_result);
+
+			switch (login_result.status) {
+
+				case 'not_reg': //未注册
+					uni.$u.route({
+						url: '/pages/student/my/login/login',
+						type: 'reLaunch',
+					});
+					break;
+
+				case 'annulled': //已注销
+					uni.$u.route({
+						url: '/pages/student/my/written-off/written-off',
+						type: 'navigateTo',
+					});
+					break;
+
+				case 'annulling': //注销中
+					uni.$u.route({
+						url: '/pages/student/my/freezing/freezing',
+						type: 'navigateTo',
+					});
+					break;
+
+				case 'active': //已注册
+					const userInfo = await dispatch(`getUserInfo`);
+					if (userInfo?.teacher) {
 						uni.$u.route({
-							url: '/pages/student/my/login/login',
-							type: 'reLaunch',
-						});
-						break;
+							url: 'pages/tabBar/home/home',
+							type: 'switchTab',
+							params: {
 
-					case 'annulled': //已注销
-						uni.$u.route({
-							url: '/pages/student/my/written-off/written-off',
-							type: 'navigateTo',
-						});
-						break;
+							}
+						})
+					}
 
-					case 'annulling': //注销中
-						uni.$u.route({
-							url: '/pages/student/my/freezing/freezing',
-							type: 'navigateTo',
-						});
-						break;
-
-					case 'active': //已注册
-						const userInfo = await dispatch(`getUserInfo`);
-
-						// if (userInfo) {
-						// 	const {
-						// 		student = {}
-						// 	} = userInfo;
-						// 	if (student && JSON.stringify(student) != '{}' && student.status == 'verified') {
-						// 		uni.$u.route({
-						// 			url: 'pages/student/tabBar/internship/internship',
-						// 			type: 'switchTab',
-						// 			params: {
-
-						// 			}
-						// 		})
-
-						// 	} else {
-						// 		uni.$u.route({
-						// 			url: `/pages/student/my/student-status-certification/student-status-certification`,
-						// 			type: 'reLaunch',
-						// 			params: {
-
-						// 			}
-						// 		})
-						// 	}
-						// }
-
-						break;
-				}
-
-				return login_result;
+					break;
 			}
 
+			return login_result;
+		}
+
+
+
+
+	},
+
+	async loginOut({
+		commit,
+		dispatch,
+		state
+	}, params) {
+
+		await commit('setLoginOut', {});
+		uni.$u.route('/pages/main/my/login/login');
+	},
+
+	async getUserInfo({
+		commit,
+		dispatch,
+		state
+	}, params) {
+
+		const result = await getUserInfoApi();
+
+		commit('setUserInfo', result);
+
+		uni.$u.vuex('vuex_user', result);
+
+		return result;
+	},
+}
+
+// mutations
+const mutations = {
+
+	setLogin(state, result) {
+		let vuex_token = `Bearer ${result.access_token}`
+		uni.$u.vuex('vuex_token', vuex_token);
+		uni.$u.vuex('refresh_token', result.refresh_token);
+		uni.$u.vuex('vuex_phone', result.phone);
+		uni.$u.vuex('hasLogin', true);
+	},
+
+	setLoginOut(state, result) {
+		uni.$u.vuex('vuex_token', '');
+		uni.$u.vuex('vuex_phone', '');
+		uni.$u.vuex('vuex_user', {});
+		uni.$u.vuex('hasLogin', false);
+	},
+
+	setUserInfo(state, result) {
+		state.userInfo = result;
+	},
+
+
+
+}
 
-		},
-
-		async loginOut({
-			commit,
-			dispatch,
-			state
-		}, params) {
-
-			await uni.$u.vuex('vuex_user', {});
-			await uni.$u.vuex('vuex_token', {});
-			await uni.setStorageSync('lifeData', {});
-
-			uni.$u.route('/pages/student/my/login/login');
-		},
-
-		async getUserInfo({
-			commit,
-			dispatch,
-			state
-		}, params) {
-
-			const userInfo = await getUserInfoApi();
-			
-			uni.$u.vuex('vuex_user', userInfo);
-
-			return userInfo;
-		},
-	}
-
-	// mutations
-	const mutations = {
-
-		setUserInfo(state, userInfo) {
-			state.id = userInfo.id;
-			state.name = userInfo.name;
-			state.phone = userInfo.phone;
-			state.username = userInfo.username;
-			state.userBasicInfo = userInfo.userBasicInfo;
-		},
-	}
-
-	export default {
-		namespaced: true,
-		state,
-		getters,
-		actions,
-		mutations
-	}
+export default {
+	namespaced: true,
+	state,
+	getters,
+	actions,
+	mutations
+}

+<template>
+	<view>
+		<view class="mi_calendar">
+			<view class="top-bar">
+				<i class="top-change-month" @click="changeMonth('prev')" />
+				<view class="top-bar-ym">{{ y }}.{{ m < 10 ? `0${m}` : m }}</view>
+				<i v-show="m == new Date().getMonth() + 1" :style="{ opacity: '0.3' }"
+					class="top-change-month next-month" />
+				<i v-show="m != new Date().getMonth() + 1" class="top-change-month next-month"
+					@click="changeMonth('next')" />
+			</view>
+			<view class="week">
+				<view class="week-day" v-for="(item, index) in weekDay" :key="index">{{ item }}</view>
+			</view>
+			<view :class="{ hide: !monthOpen }" class="content" :style="{ height: height }">
+				<view :style="{ top: positionTop + 'rpx' }" class="days">
+					<view :class="['item', { nolm: !item.lm }]" v-for="(item, index) in dates" :key="index">
+						<view class="day" :key="`${item.year}-${item.month + 1}-${item.date}`"
+							@click="selectOne(item, $event)"
+							:class="{ choose: choose == `${item.year}-${item.month}-${item.date}` }">
+							{{ item.date }}
+						</view>
+						<view class="flag_icon late" v-if="filterType('LEAVE', item.year, item.month, item.date)">
+						</view>
+						<view class="flag_icon truancy"
+							v-if="filterType('SUSPENSION', item.year, item.month, item.date)"></view>
+						<view class="flag_icon normal" v-if="filterType('NORMAL', item.year, item.month, item.date)">
+						</view>
+						<!-- <view class="today-text" v-if="isToday(item.year, item.month, item.date)">{{ text.today }}</view> -->
+					</view>
+				</view>
+			</view>
+		</view>
+		<!-- <view class="type-check">
+			<view class="label" v-for="(item, index) in statusText" :key="index"><i></i><text>{{ item }}</text></view>
+		</view> -->
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'mi-calendar',
+		props: {
+			// 第一列星期几
+			weekstart: {
+				type: Number,
+				default: 1
+			},
+			// 请假日期
+			leaveDateList: {
+				type: Array,
+				default: () => []
+			},
+			// 停课日期
+			suspensionDateList: {
+				type: Array,
+				default: () => []
+			},
+			// 正常考勤日期
+			normalDateList: {
+				type: Array,
+				default: () => []
+			},
+			// 是否展开 暂未实现
+			open: {
+				type: Boolean,
+				default: true
+			}
+		},
+		data() {
+			return {
+				statusText: ['出勤', '请假', '停课'],
+				text: {
+					year: '年',
+					month: '月',
+					week: ['一', '二', '三', '四', '五', '六', '日'],
+					today: '今'
+				},
+				y: new Date().getFullYear(), // 年
+				// m: new Date().getMonth() >= 10 ? new Date().getMonth() + 1 : `0${new Date().getMonth() + 1}`, // 月
+				m: new Date().getMonth() + 1,
+				dates: [], // 当前月日期集合
+				positionTop: 0,
+				monthOpen: true,
+				choose: ''
+			};
+		},
+		created() {
+			this.dates = this.monthDay(this.y, this.m);
+			// console.log(this.y, this.m);
+			// !this.open && this.trgWeek();
+		},
+		mounted() {
+			const date = new Date();
+			const y = date.getFullYear();
+			const m = date.getMonth() + 1;
+			const d = date.getDate();
+			this.choose = `${y}-${m}-${d}`;
+		},
+		computed: {
+			// 顶部星期栏目
+			weekDay() {
+				return this.text.week.slice(this.weekstart - 1).concat(this.text.week.slice(0, this.weekstart - 1));
+			},
+			height() {
+				return (this.dates.length / 7) * 80 + 'rpx';
+			}
+		},
+		methods: {
+			// 获取当前月份天数
+			monthDay(y, m) {
+				let firstDayOfMonth = new Date(y, m - 1, 1).getDay(); // 当月第一天星期几
+				let lastDateOfMonth = new Date(y, m, 0).getDate(); // 当月最后一天
+				let lastDayOfLastMonth = new Date(y, m - 1, 0).getDate(); // 上一月的最后一天
+				let dates = []; // 所有渲染日历
+				let weekstart = this.weekstart == 7 ? 0 : this.weekstart; // 方便进行日期计算，默认星期从0开始
+				let startDay = (() => {
+					// 周初有几天是上个月的
+					if (firstDayOfMonth == weekstart) {
+						return 0;
+					} else if (firstDayOfMonth > weekstart) {
+						return firstDayOfMonth - weekstart;
+					} else {
+						return 7 - weekstart + firstDayOfMonth;
+					}
+				})();
+				let endDay = 7 - ((startDay + lastDateOfMonth) % 7); // 结束还有几天是下个月的
+				for (let i = 1; i <= startDay; i++) {
+					const date = lastDayOfLastMonth - startDay + i;
+					dates.push({
+						date,
+						day: weekstart + i - 1 || 7,
+						month: m - 1 >= 0 ? m - 1 : 12,
+						year: m - 1 >= 0 ? y : y - 1
+					});
+				}
+				for (let j = 1; j <= lastDateOfMonth; j++) {
+					dates.push({
+						date: j,
+						day: (j % 7) + firstDayOfMonth - 1 || 7,
+						month: m,
+						year: y,
+						lm: true
+					});
+				}
+				for (let k = 1; k <= endDay; k++) {
+					dates.push({
+						date: k,
+						day: (lastDateOfMonth + startDay + weekstart + k - 1) % 7 || 7,
+						month: m + 1 <= 11 ? m + 1 : 0,
+						year: m + 1 <= 11 ? y : y + 1
+					});
+				}
+				return dates;
+			},
+			getFormatString(m) {
+				return m >= 10 ? m : `0${m}`;
+			},
+			filterType(type, y, m, d) {
+				const opt = {
+					LEAVE: 'leaveDateList', // 请假
+					SUSPENSION: 'suspensionDateList', // 停课
+					NORMAL: 'normalDateList' // 出勤
+				};
+				const list = opt[type];
+				const dataList = this[list];
+				let flag = false;
+				for (let i = 0; i < dataList.length; i++) {
+					const M = this.getFormatString(m);
+					const D = this.getFormatString(d);
+					const dy = `${y}-${M}-${D}`;
+					if (dataList[i] == dy) {
+						flag = true;
+						break;
+					}
+				}
+				return flag;
+			},
+			isToday(y, m, d) {
+				let date = new Date();
+				return y == date.getFullYear() && m == date.getMonth() + 1 && d == date.getDate();
+			},
+			// 切换成周模式
+			trgWeek() {
+				this.monthOpen = !this.monthOpen;
+				if (this.monthOpen) {
+					this.positionTop = 0;
+				} else {
+					let index = -1;
+					this.dates.forEach((i, x) => {
+						this.isToday(i.year, i.month, i.date) && (index = x);
+					});
+					this.positionTop = -((Math.ceil((index + 1) / 7) || 1) - 1) * 80;
+				}
+			},
+			// 点击回调
+			selectOne({
+				year,
+				month,
+				date
+			}, event) {
+				let date_time = `${year}-${this.getFormatString(month)}-${this.getFormatString(date)}`;
+				if (month != this.m) {
+					console.log('不在可选范围内');
+					return false;
+				}
+				this.choose = `${year}-${month}-${date}`;
+				this.$emit('change', date_time);
+			},
+			// 月份切换
+			changeMonth(action) {
+				if (action === 'next') {
+					if (this.m == 12) {
+						this.m = 1;
+						this.y++;
+					} else {
+						this.m++;
+					}
+				} else {
+					if (this.m == 1) {
+						this.m = 12;
+						this.y--;
+					} else {
+						this.m--;
+					}
+				}
+				this.dates = this.monthDay(this.y, this.m);
+				this.$emit(`changeMonth`, this.y, this.m);
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	$working: #80b2ff;
+	$leave: #ffcd3c;
+	$suspend: #f46864;
+
+	.mi_calendar {
+		color: #1a1a1a;
+		font-size: 28rpx;
+		text-align: center;
+		padding: 30rpx 10rpx;
+		margin: 20rpx 30rpx;
+		background-color: #fff;
+		border-radius: 12rpx;
+		box-shadow: 0 3rpx 32rpx 0rpx rgba(0, 0, 0, 0.1);
+		overflow: hidden;
+
+		.top-bar {
+			display: flex;
+			height: 80rpx;
+			align-items: center;
+			justify-content: center;
+
+			.top-bar-ym {
+				font-size: 32rpx;
+				height: 80rpx;
+				width: 120rpx;
+				line-height: 80rpx;
+			}
+
+			.top-change-month {
+				width: 23rpx;
+				height: 13rpx;
+				background: url('data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAC4AAAAaCAYAAADIUm6MAAAAAXNSR0IArs4c6QAAA95JREFUWEfN1ktsG0UYB/D/Z+9sQlWgvCVOHDhEtpeGRogDr0OqtLQU75YaRIsgBwpUIEBFaSsVqkKpeBQQiPdLBESLwDTeJS0vNQdAFQIpEGltKwcOnJBKBLRVSeOdtT80Jo2cYI8fcVrmZu1/vu/n2dnZpVQK0XDc2M5M/QDOI+JvOWo85I5N/Yr/wbC7Oy+jYvgSM10P4C8iHjS6wt1kx80nQPzYLCPxb1FEevf7wfiZtN9imV1FlEbAdOksB9MushNiAsCFVYBHiiXqHc4HuTOBd64wE1ziQwAuqdJ/QsH/BrCoBm4CJfS5eTl2OvF2THQjgq8BXFSj7yTZcbEXhPUa2J8g9Lm+HD0deNsSPeAy+vya/Rj7yOnCBWyIEQBLNbCjXMJKLy9/WEh8Miaupgi+BLBE02eMQrmcVGAar/7lMs2E4xHmVUO58PBC4J24cS0THQRwjqb+TxTKvsw4/ijD1bC7sQShUPirNBNPEPFNGT/8pp14xzJuYKYDABZr6v4IQ65wx3BUZWbg6keqB+cGBXGQgGs0BSaZOOn5oXri5z2SlrGcmDzNAQEGDpsdcnV6FMdONZwFL+NjWCxJfA7CdRrVSWJem8mFaj+2PJy4sZKJhgCcpXkQvxMsV6XzOFGZ+Q9cXVzTg0XRKfEZCL0aVcAcWeflCsOtyJPxjjVEpU8BmBr0SLFT3jw8ism5marwGXzBHAJ4hQ5PoNsz2UCtWsPDSZhrGfyRFg36SpwdOOnvcbJa4ZpwFb7xcnSYneZ+Aq/WqEKANrjZ4JNG5HbCvBXgvQCM2nk6UJgK1n3xCwq1Mlr49J43ZcT4GCBbAysC1O9mgw91eDth3gHwIIBo7Ry7ohTels4j0NWqC1eT7+mB+L0g1CqldHgmbPR8+V61jG2JfjDe0aORvrhDbnhrFLLe3WsIXl75FKIyLz6o83nATNjk+fLNysZJS9xLjNfnHr+zcIx9IibvTKdRrIdW1xuGz+DHxbtg3KUpziA86PryFZVx4uJ+JrxcBz0oYvLuRtFNw9WEnUDkZ0u8QYyNWjx4gAjMTM/p0Ex4+0pf3rcTKDWy0qcyTa14RWH1OfwqgE3NNKuSfc3NygcA9XJsbrQKL98t2xIvgPFwcy2n04QXXV9ubgXd0laZi0wmzGcJPNAMnkF7vGywpZk5c7PzWfGZWsmE+SSBtzcCYdBuLxs82khWl2kLvHx6WMYOZnpcCyLe4frhrvmi27JVKhGOZWxjpqeqwZh4m+eHz7QD3Xa4KmgnjEcA2lNxBDLAA242fL5d6AWBl/H/vt6fLjdgbM3k5PvtRKta/wD9BFRsxb0ftAAAAABJRU5ErkJggg==') no-repeat bottom center;
+				background-size: 23rpx 13rpx;
+				transform: rotate(90deg);
+				margin: 0 30rpx;
+			}
+
+			.next-month {
+				transform: rotate(-90deg);
+			}
+		}
+
+		.week {
+			display: flex;
+			align-items: center;
+			height: 80rpx;
+			line-height: 80rpx;
+
+			view {
+				flex: 1;
+			}
+
+			.week-day {
+				font-size: 26rpx;
+				color: #1a1a1a;
+			}
+		}
+
+		.content {
+			position: relative;
+			overflow: hidden;
+			transition: height 0.4s ease;
+
+			.days {
+				transition: top 0.3s;
+				display: flex;
+				align-items: center;
+				flex-wrap: wrap;
+				position: relative;
+
+				.item {
+					position: relative;
+					display: block;
+					height: 80rpx;
+					line-height: 80rpx;
+					width: calc(100% / 7);
+
+					.day {
+						font-style: normal;
+						display: inline-block;
+						vertical-align: middle;
+						width: 60rpx;
+						height: 60rpx;
+						line-height: 60rpx;
+						overflow: hidden;
+						border-radius: 50%;
+
+						&.choose {
+							background: #06B079;
+							color: #FFF;
+						}
+					}
+
+					&.nolm {
+						color: #999;
+						opacity: 0.3;
+					}
+
+					.flag_icon {
+						bottom: 0;
+						left: 50%;
+						font-style: normal;
+						width: 12rpx;
+						height: 12rpx;
+						border-radius: 6rpx;
+						position: absolute;
+						margin-left: -6rpx;
+						pointer-events: none;
+					}
+
+					.late {
+						background: #ffcd3c;
+					}
+
+					.truancy {
+						background: #06B079;
+					}
+
+					.normal {
+						background: #80b2ff;
+					}
+
+					.today-text {
+						position: absolute;
+						font-size: 20rpx;
+						font-weight: normal;
+						width: 20rpx;
+						height: 20rpx;
+						line-height: 20rpx;
+						right: 0;
+						top: 10rpx;
+						color: #fff;
+					}
+				}
+			}
+		}
+
+		.hide {
+			height: 80rpx !important;
+		}
+
+		.weektoggel {
+			width: 80rpx;
+			height: 40rpx;
+			margin: 10rpx auto 0;
+
+			&.down {
+				transform: rotate(180deg);
+			}
+		}
+	}
+
+	.type-check {
+		overflow: hidden;
+		margin: 0 24rpx;
+		text-align: right;
+
+		.label {
+			display: inline-block;
+			margin-right: 24rpx;
+
+			i {
+				display: inline-block;
+				width: 10rpx;
+				height: 10rpx;
+				border-radius: 50%;
+				vertical-align: middle;
+				margin-right: 10rpx;
+			}
+
+			text {
+				color: #1a1a1a;
+				font-size: 26rpx;
+			}
+
+			&:nth-child(1) {
+				i {
+					background-color: $working;
+				}
+			}
+
+			&:nth-child(2) {
+				i {
+					background-color: $leave;
+				}
+			}
+
+			&:nth-child(3) {
+				i {
+					background-color: $suspend;
+				}
+			}
+		}
+	}
+</style>

+
+## mi-calendar 使用帮助
+
+### 快速开始
+使用 uni_modules 安装 (目前仅支持 uni_modules)
+
+下载该文件后，放到uni_modules文件下，然后直接页面使用。
+
+<mi-calendar :leaveDateList="[`2022-1-2`,`2022-1-4`]" :suspensionDateList="[`2022-01-05`]" :normalDateList="[`2022-1-3`]"></mi-calendar>
+
+## leaveDateList
+请假日期
+## suspensionDateList
+停课日期
+## normalDateList
+正常考勤日期
+
+## change 切换日期
+`@change="change"`
+```
+change(date){
+    console.log(date); // 日期 eg：'2022-01-01'
+}
+```
+
+## changeMonth 切换月份
+`@change="change"`
+```
+changeMonth(year, month){
+    console.log(year, month); // 日期 eg：2022, 6
+}
+```
+
+

+{
+  "id": "mi-calendar",
+  "displayName": "考勤日历",
+  "version": "1.0.0",
+  "description": "考勤日历",
+  "repository": "https://github.com/quyapeng/mi-calendar",
+  "keywords": [
+    "考勤",
+    "日历",
+    "教学"
+  ],
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ]
+  }
+}

@@ -253,6 +253,8 @@ export default {
 				this.monthNum,
 				this.getMonths(minDate, maxDate)
 			)
+			
+			console.log('months...',months)
 			// 先清空数组
 			this.months = []
 			for (let i = 0; i < months; i++) {

@@ -194,7 +194,8 @@
 						const formItemProps = this.children.map(
 							(item) => item.prop
 						);
-						this.validateField(formItemProps, (errors) => {
+						this.validateField(formItemProps, (errors) => {
+							
 							if(errors.length) {
 								// 如果错误提示方式为toast，则进行提示
 								this.errorType === 'toast' && uni.$u.toast(errors[0].message)

@@ -34,7 +34,7 @@
                 'background-color': disabled ? 'transparent' : '#fff',
             }"
             v-if="count"
-            >{{ innerValue.length }}/{{ maxlength }}</text
+            >{{ innerValue.length || 0 }}/{{ maxlength }}</text
         >
     </view>
 </template>