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

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

 <template>
 <template>
 	<view class="u-button">
 	<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">
 			:custom-style="getCustomStyle" @click="click">
 		</u-button>
 		</u-button>
 	</view>
 	</view>
@@ -38,51 +38,70 @@
 				default: ''
 				default: ''
 			},
 			},
 
 
+
 		},
 		},
 		data() {
 		data() {
 			return {}
 			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) {
 				switch (this.type) {
 					case 'confirm':
 					case 'confirm':
-						this.color = "#0CB17A";
+						color = "#0CB17A";
+						break;
+
+					case 'cancel':
+						color = "rgba(0, 0, 0, 0.0600)";
 						break;
 						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: {
 		methods: {
 			// 按钮点击
 			// 按钮点击
 			click(e) {
 			click(e) {
@@ -97,5 +116,8 @@
 </script>
 </script>
 
 
 <style lang="scss">
 <style lang="scss">
-
+	.u-button /deep/ .u-button {
+		border: nones;
+		border-radius: 8rpx;
+	}
 </style>
 </style>

 <template>
 <template>
 	<view class="m-loading">
 	<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>
 	</view>
 </template>
 </template>
 
 
@@ -10,21 +10,7 @@
 			loading: {
 			loading: {
 				type: String,
 				type: String,
 				default: 'loadmore'
 				default: 'loadmore'
-			},
-			icon: {
-				type: Boolean,
-				default: true
-			},
-			loadText: {
-				type: Object,
-				default () {
-					return {
-						loadmore: '点击或上拉加载更多',
-						loading: '正在加载',
-						nomore: '没有更多了'
-					}
-				}	
-			}
+			},
 		},
 		},
 		data() {
 		data() {
 			return {};
 			return {};

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

 const http = uni.$u.http
 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
 // 获取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 为默认全局配置*/
 
 
 		// 测试环境
 		// 测试环境
-		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";
 		// config.baseURL = "https://api-isx.workai.com.cn";
 
 
@@ -68,15 +70,17 @@ module.exports = (vm) => {
 
 
 	// 响应拦截
 	// 响应拦截
 	uni.$u.http.interceptors.response.use((response) => {
 	uni.$u.http.interceptors.response.use((response) => {
+
 		/* 对响应成功做点什么 可使用async await 做异步操作*/
 		/* 对响应成功做点什么 可使用async await 做异步操作*/
 		const data = response.data
 		const data = response.data
 
 
 		// 自定义参数
 		// 自定义参数
 		const custom = response.config?.custom
 		const custom = response.config?.custom
 		if (data.code !== 200) {
 		if (data.code !== 200) {
+
 			// 如果没有显式定义custom的toast参数为false的话，默认对报错进行toast弹出提示
 			// 如果没有显式定义custom的toast参数为false的话，默认对报错进行toast弹出提示
 			if (custom.toast !== false) {
 			if (custom.toast !== false) {
-				uni.$u.toast(data.message)
+				uni.$u.toast(data.msg)
 			}
 			}
 
 
 			// 如果需要catch返回，则进行reject
 			// 如果需要catch返回，则进行reject
@@ -88,8 +92,26 @@ module.exports = (vm) => {
 			}
 			}
 		}
 		}
 		return data.data === undefined ? {} : data.data
 		return data.data === undefined ? {} : data.data
+
 	}, (response) => {
 	}, (response) => {
 		// 对响应错误做点什么 （statusCode !== 200）
 		// 对响应错误做点什么 （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)
 		return Promise.reject(response)
 	})
 	})
 }
 }

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

@@ -7,23 +7,23 @@
 		"current": 0, //当前激活的模式(list 的索引项)
 		"current": 0, //当前激活的模式(list 的索引项)
 		"list": [{
 		"list": [{
 			"name": "defult", //模式名称
 			"name": "defult", //模式名称
-			"path": "pages/main/my/mobileLogin/mobileLogin",
-			"query": ""
+			"path": "pages/main/internship/signInList/signInList",
+			"query": "studentId=1555434161240838146"
 		}]
 		}]
 	},
 	},
 	"pages": [{
 	"pages": [{
 			"path": "pages/tabBar/home/home",
 			"path": "pages/tabBar/home/home",
-			"style": {
-				"navigationBarTitleText": "人人推",
-				"navigationBarTextStyle": "black",
-				"enablePullDownRefresh": false
+			"style": {
+				"navigationStyle": "custom",
+				"navigationBarTitleText": ""
 			}
 			}
 		},
 		},
 		{
 		{
 			"path": "pages/tabBar/internship/internship",
 			"path": "pages/tabBar/internship/internship",
 			"style": {
 			"style": {
-				"navigationStyle": "custom",
-				"navigationBarTitleText": ""
+				"navigationBarTitleText": "我的实习生",
+				"navigationBarTextStyle": "black",
+				"enablePullDownRefresh": false
 			}
 			}
 		},
 		},
 		{
 		{
@@ -34,26 +34,268 @@
 			}
 			}
 		}
 		}
 	],
 	],
+
 	"subPackages": [{
 	"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": {
 				"style": {
-					"navigationBarTitleText": "登录",
+					"navigationBarTitleText": "实习生列表",
 					"enablePullDownRefresh": false
 					"enablePullDownRefresh": false
 				}
 				}
 
 
-			},
-			{
-				"path": "mobileLogin/mobileLogin",
+			}, {
+				"path": "traineeDetail/traineeDetail",
 				"style": {
 				"style": {
-					"navigationBarTitleText": "手机登录",
+					"navigationBarTitleText": "学生信息",
 					"enablePullDownRefresh": false
 					"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": {
 	"preloadRule": {
 
 
@@ -69,7 +311,7 @@
 
 
 	"tabBar": {
 	"tabBar": {
 		"color": "#000000",
 		"color": "#000000",
-		"selectedColor": "#F64114",
+		"selectedColor": "#06B079",
 		"backgroundColor": "#FFFFFF",
 		"backgroundColor": "#FFFFFF",
 		"borderStyle": "black",
 		"borderStyle": "black",
 		"height": "100rpx",
 		"height": "100rpx",
@@ -82,8 +324,8 @@
 			},
 			},
 			{
 			{
 				"pagePath": "pages/tabBar/internship/internship",
 				"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": "实习"
 				"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>