1

@@ -208,4 +208,24 @@ export const scoreinternshipInfoUrl = (params) => http.get('/internship/v1/score
 })
 
 // 鉴定成绩鉴定
-export const putscoreappraisalApi = (params) => http.put('/internship/v1/score/appraisal', params)
\ No newline at end of file
+export const putscoreappraisalApi = (params) => http.put('/internship/v1/score/appraisal', params)
+
+// 实习生详情-实习课程-实习信息
+export const getforminternshipInfoApi = (params) => http.get('/internship/v1/form/internshipInfo', {
+	params: params
+})
+
+// 实习申请-列表
+export const getformApplyschoollistApi = (params) => http.get('/internship/v1/formApply/school/list', {
+	params: params
+})
+
+// 实习申请-详情
+export const getformApplyschooldetailApi = (id,params) => http.get('/internship/v1/formApply/'+id, {
+	params: params
+})
+
+// 实习申请-审核
+export const putformApplyApi = (id,params) => http.put('/internship/v1/formApply/audit/'+id, {
+	params: params
+})
\ No newline at end of file

@@ -155,6 +155,18 @@
 						"enablePullDownRefresh": false
 					}
 					
+				}, {
+					"path": "interapply/interapply",
+					"style": {
+						"navigationBarTitleText": "实习申请",
+						"enablePullDownRefresh": false
+					}
+				}, {
+					"path": "interapplydetail/interapplydetail",
+					"style": {
+						"navigationBarTitleText": "实习申请",
+						"enablePullDownRefresh": false
+					}
 				}
 			]
 		},
@@ -227,7 +239,14 @@
                     "enablePullDownRefresh": false
                 }
                 
-                }
+                },{
+					"path" : "traineeInterList/traineeInterList",
+					    "style" :                                                                                    
+					{
+					    "navigationBarTitleText": "实习信息",
+					    "enablePullDownRefresh": false
+					}
+				}
             ]
 		},
 		{
@@ -383,7 +402,7 @@
 				"pagePath": "pages/tabBar/internship/internship",
 				"iconPath": "/static/img/icon/internship.png",
 				"selectedIconPath": "/static/img/icon/internshipHL.png",
-				"text": "实习"
+				"text": "实习生"
 			},
 			{
 				"pagePath": "pages/tabBar/my/my",

@@ -36,7 +36,7 @@
 			<view class="gv" style="background-color: #fff; padding: 20px 16px 0;">
 				<view class="green"></view>
 				<view class="title">
-					学校评价
+					教师评价
 				</view>
 			</view>
 			<view style="background-color: #fff; padding: 20px 16px 0;">
@@ -623,7 +623,7 @@
 					display: flex;
 					flex-direction: column;
 					margin-left: 2px;
-					width: 85%;
+					width: 80%;
 				
 					.pdffj {
 						margin-bottom: 5px;

@@ -72,7 +72,7 @@
 					</view>
 					<view class="list">
 						<text class="item1">评分：</text>
-						<text class="item2">{{detailObj.reportAverageScore}}分</text>
+						<text class="item2">{{detailObj.reportAverageScore?`${detailObj.reportAverageScore}分`:'-'}}</text>
 					</view>
 				</view>
 				
@@ -90,6 +90,7 @@
 					<view class="list list_item_top">
 						<text class="item1">评语：</text>
 						<text class="item2">{{detailObj.studentComment}}</text>
+						<!-- <text class="item2">12321312390128390218309809sda890asd809s0a9d8a90sd8a90asd809asd89asd890as8d9</text> -->
 					</view>
 					<view class="listflex list_item_top">
 						<text class="item1">附件：</text>
@@ -140,7 +141,7 @@
 					<view class="t">
 						<view class="green"></view>
 						<view class="title">
-							学校评价
+							教师评价
 						</view>
 					</view>
 					<view class="list list_item_top">
@@ -597,6 +598,10 @@
 				}
 				
 				.item2 {
+					-webkit-box-orient: vertical;
+					overflow: hidden;
+					word-break: break-all;
+					word-wrap: break-word;
 					margin-left: 2px;
 					font-size: 12px;
 					font-family: PingFangSC-Light, PingFang SC;

+<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> -->
+			<view style="width: 148px;">
+				<u-subsection :list="['待处理','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'" @change="sectionChange"></u-subsection>
+			</view>
+			<view style="display: flex; justify-content: space-between; align-items: center;">
+				<u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
+				<view style="width: 16px;"></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="t1">
+					{{item.studentName}}提交的实习申请
+				</view>
+				<view class="t3">
+					{{item.projectName}}
+				</view>
+				<view class="t2 t2top14">
+					申请类型: {{getCategoryList(item.type)}}
+				</view>
+				<view class="t2">
+					开始时间: {{timeFormat(item.formStartTime, 'yyyy-mm-dd hh:MM')}}
+				</view>
+				<view class="t2">
+					结束时间: {{timeFormat(item.formEndTime, 'yyyy-mm-dd hh:MM')}}
+				</view>
+				<view v-if="item.status == 'wait'" class="status" style="color: #F49A23;">
+					待处理
+				</view>
+				<view v-else-if="item.status == 'passed'" class="status" style="color: #0CB17A;">
+					已通过
+				</view>
+				<view v-else-if="item.status == 'rejected'" class="status" style="color: red;">
+					已驳回
+				</view>
+				<view class="time">
+					{{timeFormat(item.createdTime, 'mm-dd')}}
+				</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="bottom" @close="close" :round="22">
+			<view class="popup">
+				<view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
+					<view class="title">
+						项目筛选
+					</view>
+					<image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
+				</view>
+				<view class="search">
+					<u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
+						bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
+					</u-search>
+				</view>
+				<scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
+					@scrolltolower="lower()">
+					<view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
+						<view style="display: flex; align-items: center; justify-content: space-between;">
+							<view class="item_title">
+								{{item.name}}
+							</view>
+							<image v-if="item.id == projectId" style="width: 20px; height: 20px;" src="/static/img/home/popselect.png" mode=""></image>
+						</view>
+					</view>
+				</scroll-view>
+				<view v-else class="no_data" @click="jumpVerified">
+					<view class="text_black_28">
+						暂未搜索到该项目
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		
+		<!-- <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 {
+		getformApplyschoollistApi,
+		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: '',
+
+				},
+				projectId: '',
+				switchValue: false,
+				categoryList: [{
+						label: '开始实习申请',
+						value: 'start'
+					},
+					{
+						label: '结束实习申请',
+						value: "end",
+					}
+				],
+				curNow: 1,
+				sxsearch: '',
+				works: [],
+				workspage: 1,
+				workstotal: 0,
+			}
+		},
+
+		onLoad(option) {
+			console.log(option)
+			// this.$store.dispatch(`home/getProjectList`, {
+			// 	pageSize: -1,
+			// })
+			
+			this.worksloadData()
+
+			// this.search.keySearch = '';
+
+			if (option && option.status) {
+				// this.search.status = 'wait';
+				this.curNow = 0;
+				// this.checkboxValue = ['待处理'];
+				// this.switchValue = true;
+			}
+
+		},
+
+		onShow() {
+			this.finished = false;
+			this.loading = "loadmore";
+			this.page = 0;
+			this.list = [];
+			this._getList();
+		},
+
+		computed: {
+			...mapState('home', {
+				// 箭头函数可使代码更简练
+				projectList: 'projectList',
+
+			}),
+
+		},
+
+		methods: {
+			
+			searchCli() {
+				this.$u.route('/pages/main/home/search/search?type=ask&searchkey=' + this.keyword);
+			},
+			
+			sectionChange(index) {
+				this.curNow = index;
+
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+			
+			getCategoryList(e) {
+				for (var i = 0; i < this.categoryList.length; i++) {
+					let item = this.categoryList[i]
+					if (e == item.value) {
+						return item.label
+					}
+				}
+			},
+
+			handelDetail(record) {
+				this.$u.route('/pages/main/home/interapplydetail/interapplydetail?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' : '';
+
+				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 (this.curNow == 0) {
+					params.status = 'wait';
+				}
+
+				if (this.keyword) {
+					params.keySearch = this.keyword
+				}
+
+				if (this.projectId) {
+					params.projectId = this.projectId
+				}
+
+				return await getformApplyschoollistApi(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' : '';
+
+			},
+
+			handelCancel() {
+				this.switchValue = false;
+				this.projectId = '';
+			},
+
+			hancelSubmit() {
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+
+				this.show = false;
+			},
+			
+			workSearch() {
+				uni.hideKeyboard();
+				this.works = []
+				this.worksloadData()
+			},
+			
+			lower() {
+				setTimeout(() => {
+					this.worksloadData(true);
+				}, 200)
+			},
+			
+			worksloadData(e) {
+				let params = {}
+				// this.loading = 'loading'
+			
+				if (e) {
+					if (this.total <= this.works.length) {
+						// this.loading = 'nomore'
+						return
+					}
+					this.workspage++
+				} else {
+					this.workspage = 1
+				}
+				params['pageNumber'] = this.workspage
+				if (this.sxsearch) {
+					params['keyWord'] = this.sxsearch
+				}
+				getProjectListApi(params).then(async res => {
+					if (res) {
+						this.total = res.total
+						// this.loading = 'loadmore'
+						this.works = this.works.concat(res.records)
+					}
+				})
+			},
+			popupSelItem(item) {
+				this.show = false
+				this.projectId = item.id;
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+
+		}
+	}
+</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;
+				margin: 8px 13px 0;
+				padding: 20px 17px;
+				border-radius: 8rpx;
+				background-color: #FFFFFF;
+				
+				.t1 {
+					font-size: 14px;
+					font-family: PingFangSC-Medium, PingFang SC;
+					font-weight: 500;
+					color: #000000;
+				}
+				
+				.t2 {
+					margin-top: 6px;
+					font-size: 12px;
+					font-family: PingFangSC-Light, PingFang SC;
+					font-weight: 300;
+					color: rgba(38,41,47,0.85);
+				}
+				
+				.t3 {
+					margin-top: 2px;
+					font-size: 12px;
+					font-family: PingFangSC-Light, PingFang SC;
+					font-weight: 300;
+					color: #000000;
+				}
+				
+				.t2top14 {
+					margin-top: 14px;
+				}
+				
+				.time {
+					position: absolute;
+					top: 17px;
+					right: 17px;
+					font-size: 12px;
+					font-family: PingFangSC-Light, PingFang SC;
+					font-weight: 300;
+					color: rgba(0,0,0,0.85);
+				}
+				
+				.status {
+					position: absolute;
+					bottom: 20px;
+					right: 17px;
+					font-size: 12px;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+				}
+			}
+		}
+
+		.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;
+				}
+			}
+		}
+		
+		.popup {
+			height: 500px;
+			padding: 19px 16px;
+			
+			.title {
+				font-size: 18px;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #000000;
+			}
+			
+			.close {
+				width: 22px;
+				height: 22px;
+			}
+		
+			.item_box {
+				border-radius: 4px;
+				margin: 0 0 48rpx;
+		
+				.item_title {
+					height: 20px;
+					font-size: 14px;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: rgba(0, 0, 0, 0.65);
+					line-height: 20px;
+				}
+		
+			}
+		
+			.no_data {
+				width: 100%;
+				margin-top: 310rpx;
+		
+				.text_black_28 {
+					font-size: 14px;
+					font-family: PingFangSC-Light, PingFang SC;
+					font-weight: 300;
+					color: rgba(0,0,0,0.65);
+					text-align: center;
+				}
+				
+			}
+			
+		}
+	}
+</style>

+<template>
+	<view class="page">
+		<view class="top">
+			<view class="title">
+				{{detailObj.studentName}}提交的请假申请
+			</view>
+			<view class="t1">
+				{{detailObj.projectName}}
+			</view>
+			<!-- <view class="t2">
+				{{detailObj.courseName}}
+			</view> -->
+			<view v-if="detailObj.status == 'wait'" class="status" style="color: #FFC200;">
+				待处理
+			</view>
+			<view v-else-if="detailObj.status == 'passed'" class="status" style="color: #0CB17A;">
+				已通过
+			</view>
+			<view v-else-if="detailObj.status == 'rejected'" class="status" style="color: red;">
+				已驳回
+			</view>
+		</view>
+		<view class="content">
+			<view class="c1">
+				申请类型
+			</view>
+			<view class="c2">
+				{{getCategoryList(detailObj.type)}}
+			</view>
+			<view class="grayV">
+				<view class="g1">
+					实习时间
+				</view>
+				<image class="timeline" src="/static/img/home/timeline.png"></image>
+				<view class="start">
+					{{timeFormat(detailObj.formStartTime,'yyyy-mm-dd hh:MM')}}
+				</view>
+				<view class="end">
+					{{timeFormat(detailObj.formEndTime,'yyyy-mm-dd hh:MM')}}
+				</view>
+			</view>
+			<!-- <view class="c1" style="margin-top: 16rpx;">
+				请假原因
+			</view>
+			<view class="c2" style="margin-top: 16rpx;">
+				{{detailObj.reason}}
+			</view> -->
+			<!-- <view class="c1" style="margin-top: 32rpx;">
+				附件
+			</view> -->
+			<!-- <view v-if="picList.length>0" class="fj_content">
+				<view class="item">
+					<view class="p_item" v-for="(item, index) in picList" :key="index" @click="openImage(item)">
+						<u-image :height="120" :width="120" :border-radius="16" :src="item"></u-image>
+					</view>
+				</view>
+			</view> -->
+		</view>
+		<view class="timeb">
+			<view class="title">
+				审批信息
+			</view>
+			<view style="padding: 10rpx;">
+				<view>
+					<view v-for="(item,index) in questions" :key="index">
+						<view class="nodef">
+							<!-- <<!-- template v-slot:node> -->
+							<view class="node1">
+								<view class="u-node"></view>
+							</view>
+							<!-- </template> -->
+							<!-- <template v-slot:content> -->
+								<view class="node2">
+									<view style="display: flex; align-self: center; justify-content:space-between;">
+										<view class='u-order-title'>{{item.title}}</view>
+										<view class='u-order-time'>{{timeFormat(item.time,'mm-dd hh:MM')}}</view>
+									</view>
+									<view class='u-order-desc'>{{item.desc}}{{item.peo?item.peo:''}}</view>
+									<view v-if="item.reply" class='u-order-reply'>{{item.reply}}</view>
+								</view>
+							<!-- </template> -->
+						</view>
+					</view>
+				</view>
+			</view>
+		</view>
+		<view style="height: 100px;">
+			
+		</view>
+		<view class="footer" v-if="detailObj.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 {
+		getformApplyschooldetailApi,
+		putformApplyApi,
+		getImgUrlApi,
+	} from '@/config/api.js';
+
+	export default {
+		data() {
+			return {
+				id: '',
+				picList: [],
+				detailObj: {},
+				attachments: [],
+				questions: [],
+				categoryList: [{
+						label: '开始实习申请',
+						value: 'start'
+					},
+					{
+						label: '结束实习申请',
+						value: "end",
+					}
+				],
+			}
+		},
+		
+		onLoad(e) {
+			this.id = e.id
+			this.loadData()
+		},
+
+		methods: {
+			
+			loadData() {
+				getformApplyschooldetailApi(this.id).then(res => {
+					if (res) {
+						this.detailObj = res;
+						this.handleDatas()
+						
+						let q1 = {
+							title: '发起申请',
+							desc: this.detailObj.studentName,
+							time: this.detailObj.createdTime
+						}
+						
+						let s = ''
+						if (this.detailObj.status == 'wait') {
+							s = '（待处理）'
+						}else if (this.detailObj.status == 'passed') {
+							s = '（已通过）'
+						}else if (this.detailObj.status == 'rejected') {
+							s = '（已驳回）'
+						}
+						let q2 = {
+							title: '学校审批',
+							desc: this.detailObj.auditTeacher ? this.detailObj.auditTeacher : '-',
+							time: this.detailObj.auditTime,
+							// reply: this.detailObj.reply,
+							peo: s,
+						}
+						this.questions.push(q1)
+						if (this.detailObj.status != 'wait') {
+							this.questions.push(q2)
+						}
+					}
+				})
+			},
+			
+			handelCancel() {
+				putformApplyApi(this.id,{status: 'reject'}).then(res => {
+					if (res) {
+						uni.navigateBack({
+							delta: 1
+						});
+					}
+				})
+			},
+			
+			hancelSubmit() {
+				putformApplyApi(this.id,{status: 'pass'}).then(res => {
+					if (res) {
+						uni.navigateBack({
+							delta: 1
+						});
+					}
+				})
+			},
+			
+			getCategoryList(e) {
+				for (var i = 0; i < this.categoryList.length; i++) {
+					let item = this.categoryList[i]
+					if (e == item.value) {
+						return item.label
+					}
+				}
+			},
+			
+			timeFormat(timestamp, format = 'yyyy-mm-dd') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+			
+			handleDatas() { //处理获取的网络图片
+				if (this.detailObj.attachments) {
+					this.createdTime = this.$u.timeFormat(this.detailObj.createdTime / 1000, 'yyyy/mm/dd');
+					var originInfo = JSON.parse(this.detailObj.attachments);
+					this.attachments = this.attachments.concat(originInfo)
+					console.log("1---", originInfo, "2---", this.attachments)
+					if (originInfo && originInfo.length > 0) {
+						for (var i = 0; i < originInfo.length; i++) {
+							getImgUrlApi({
+								bucket: originInfo[i].bucket,
+								filePath: originInfo[i].object
+							}).then(res => {
+								this.picList.push(res.url)
+								console.log('picList...', this.picList)
+							})
+						}
+					}
+				}
+			},
+			
+			openLink(e) {
+				var _this = this
+			
+				uni.showLoading({
+					title: '努力加载中~',
+					mask: true
+				})
+			
+				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,
+							success: function(res) {
+								var filePath = res.tempFilePath;
+								uni.openDocument({
+									filePath: filePath,
+									showMenu: true,
+									success: function(res) {
+										console.log('打开文档成功');
+									},
+									complete: function() {
+										uni.hideLoading();
+									}
+								});
+							}
+						});
+					}
+				})
+			},
+			openImage(imgPath) {
+				let array = new Array(1).fill(imgPath);
+				uni.previewImage({
+					urls: array,
+					success(res) {
+						uni.hideLoading();
+						console.log('openImage success');
+					},
+					fail(res) {
+						uni.hideLoading();
+						console.log('openImage fail:', res);
+					}
+				});
+			},
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F7F7F7;
+	}
+</style>
+
+<style lang="scss" scoped>
+	.page {
+		padding: 16rpx 32rpx;
+		
+		.top {
+			padding: 40rpx 32rpx;
+			background-color: #fff;
+			border-radius: 10px;
+			
+			.title {
+				font-size: 20px;
+				font-family: PingFangSC-Semibold, PingFang SC;
+				font-weight: 600;
+				color: #000000;
+			}
+			
+			.t1 {
+				margin-top: 32rpx;
+				font-size: 13px;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: rgba(0,0,0,0.6500);
+			}
+			
+			.t2 {
+				margin-top: 16rpx;
+				font-size: 13px;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: rgba(0,0,0,0.6500);
+			}
+			
+			.status {
+				margin-top: 32rpx;
+				font-size: 13px;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: #FFC200;
+			}
+		}	
+		
+		.content {
+			padding: 40rpx 32rpx;
+			background-color: #fff;
+			border-radius: 10px;
+			margin-top: 16rpx;
+			
+			.c1 {
+				font-size: 16px;
+				font-family: PingFangSC-Semibold, PingFang SC;
+				font-weight: 600;
+				color: #000000;
+			}
+			
+			.c2 {
+				margin-top: 16rpx;
+				font-size: 14px;
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				color: rgba(0,0,0,0.6500);
+			}
+			
+			.grayV {
+				margin-top: 24rpx;
+				height: 98px;
+				background: #F7F7F7;
+				border-radius: 24px;
+				padding: 8rpx 16rpx;
+				position: relative;
+				
+				.g1 {
+					font-size: 16px;
+					font-family: PingFangSC-Semibold, PingFang SC;
+					font-weight: 600;
+					color: #000000;
+				}
+				
+				.timeline {
+					position: absolute;
+					left: 2rpx;
+					top: 72rpx;
+					width: 40rpx;
+					height: 100rpx;
+				}
+				
+				.start {
+					position: absolute;
+					left: 88rpx;
+					top: 68rpx;
+					font-size: 14px;
+					font-family: DINAlternate-Bold, DINAlternate;
+					font-weight: bold;
+					color: rgba(0,0,0,0.6500);
+				}
+				
+				.end {
+					position: absolute;
+					left: 88rpx;
+					top: 134rpx;
+					font-size: 14px;
+					font-family: DINAlternate-Bold, DINAlternate;
+					font-weight: bold;
+					color: rgba(0,0,0,0.6500);
+				}
+			}
+			
+			.fj_content {
+				margin-top: 8px;
+				background-color: #fff;
+			
+				.item {
+					width: 100%;
+					display: flex;
+					flex-direction: row;
+					flex-wrap: wrap;
+			
+					.p_item {
+						position: relative;
+						width: 120rpx;
+						height: 120rpx;
+						margin-right: 13px;
+						margin-bottom: 13px;
+			
+						.delete {
+							position: absolute;
+							width: 24rpx;
+							height: 24rpx;
+							top: -12rpx;
+							right: -12rpx;
+							z-index: 199;
+						}
+					}
+			
+				}
+			
+			}
+		}
+		
+		.timeb {
+			padding: 40rpx 36rpx;
+			background-color: #fff;
+			border-radius: 10px;
+			margin-top: 16rpx;
+			position: relative;
+		
+			.title {
+				font-size: 16px;
+				font-family: PingFangSC-Semibold, PingFang SC;
+				font-weight: 600;
+				color: #000000;
+				margin-bottom: 20rpx;
+			}
+			
+			.nodef {
+				display: flex;
+				justify-content: start;
+				margin-bottom: 30rpx;
+				
+				.node1 {
+					position: relative;
+					margin-top: 4px;
+					
+					.line {
+						position: absolute;
+						left: 5px;
+						width: 1px;
+						height: 100%;
+						background-color: #f7f7f7;
+					}
+				}
+				
+				.node2 {
+					margin-left: 10px;
+				}
+			}
+		
+			.u-node {
+				width: 8px;
+				height: 8px;
+				border-radius: 8rpx;
+				background: #E5E5E6;
+			}
+		
+			.u-order-title {
+				color: rgba(0,0,0,0.4500);
+				font-family: PingFangSC-Regular, PingFang SC;
+				font-weight: 400;
+				font-size: 24rpx;
+			}
+		
+			.u-order-desc {
+				font-size: 14px;
+				font-weight: bold;
+				color: rgba(0,0,0,1);
+			}
+			
+			.u-order-kf {
+				margin-top: 20px;
+				font-size: 14px;
+				font-weight: 400;
+				color: #8C8E91;
+			}
+		
+			.u-order-time {
+				font-size: 12px;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: rgba(0,0,0,0.6500);
+				margin-left: 10px;
+			}
+			
+			.u-order-reply {
+				width: 245px;
+				padding: 10rpx 14rpx;
+				background: #F7F7F7;
+				border-radius: 24px;
+				margin-top: 14rpx;
+			}
+			
+		}
+		
+		.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>
\ No newline at end of file

 <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 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> -->
+			<view style="width: 148px;">
+				<u-subsection :list="['未阅','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'" @change="sectionChange"></u-subsection>
+			</view>
+			<view style="display: flex; justify-content: space-between; align-items: center;">
+				<u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
+				<view style="width: 16px;"></view>
+				<u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
+			</view>
 		</view>
 
 		<u-sticky bgColor="#fff">
@@ -68,8 +74,40 @@
 		<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">
+
+		<u-popup :show="show" mode="bottom" @close="close" :round="22">
+			<view class="popup">
+				<view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
+					<view class="title">
+						项目筛选
+					</view>
+					<image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
+				</view>
+				<view class="search">
+					<u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
+						bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
+					</u-search>
+				</view>
+				<scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
+					@scrolltolower="lower()">
+					<view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
+						<view style="display: flex; align-items: center; justify-content: space-between;">
+							<view class="item_title">
+								{{item.name}}
+							</view>
+							<image v-if="item.id == projectId" style="width: 20px; height: 20px;" src="/static/img/home/popselect.png" mode=""></image>
+						</view>
+					</view>
+				</scroll-view>
+				<view v-else class="no_data" @click="jumpVerified">
+					<view class="text_black_28">
+						暂未搜索到该项目
+					</view>
+				</view>
+			</view>
+		</u-popup>
+
+		<!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
 			<view class="popup_search">
 				<view class="content">
 					<view class="title">按项目筛选</view>
@@ -101,7 +139,7 @@
 					</view>
 				</view>
 			</view>
-		</u-popup>
+		</u-popup> -->
 	</view>
 </template>
 
@@ -151,8 +189,13 @@
 				projectId: '',
 				showTime: false,
 				timeValue: '',
-				switchValue: false,
-
+				switchValue: false,
+				
+				curNow: 1,
+				sxsearch: '',
+				works: [],
+				workspage: 1,
+				workstotal: 0,
 			}
 		},
 
@@ -161,11 +204,13 @@
 			this.studentId = option.studentId;
 			this.projectId = option.projectId;
 
-			this.$store.dispatch(`home/getProjectList`, {
-				pageSize: -1,
-			})
+			// this.$store.dispatch(`home/getProjectList`, {
+			// 	pageSize: -1,
+			// })
 
-			this.search.keySearch = '';
+			// this.search.keySearch = '';
+			
+			this.worksloadData()
 
 			if (option && option.category) {
 				this.search.category = option.category;
@@ -176,10 +221,17 @@
 					'';
 			}
 			
+			// if (option && option.status) {
+			// 	this.search.status = 'unread';
+			// 	this.checkboxValue = ['未阅'];
+			// 	this.switchValue = true;
+			// }
+			
 			if (option && option.status) {
-				this.search.status = 'unread';
-				this.checkboxValue = ['未阅'];
-				this.switchValue = true;
+				// this.search.status = 'wait';
+				this.curNow = 0;
+				// this.checkboxValue = ['待处理'];
+				// this.switchValue = true;
 			}
 
 			this.finished = false;
@@ -189,6 +241,10 @@
 		},
 
 		onShow() {
+			this.finished = false;
+			this.loading = "loadmore";
+			this.page = 0;
+			this.list = [];
 			this._getList();
 		},
 
@@ -201,6 +257,20 @@
 
 		methods: {
 			
+			searchCli() {
+				this.$u.route('/pages/main/home/search/search?type=log&searchkey=' + this.keyword);
+			},
+			
+			sectionChange(index) {
+				this.curNow = index;
+			
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+			
 			getCreatedTime(e) {
 				let time = this.$u.timeFormat(e.logTime / 1000, 'yyyy/mm/dd');
 				if (e.category == "weekly") {
@@ -313,8 +383,12 @@
 				params.pageNumber = requestParams.page + 1;
 				params.pageSize = 5;
 
-				if (search.status) {
-					params.status = search.status;
+				// if (search.status) {
+				// 	params.status = search.status;
+				// }
+				
+				if (this.curNow == 0) {
+					params.status = 'unread';
 				}
 
 				if (search.category) {
@@ -391,7 +465,53 @@
 
 				this.show = false;
 			},
-
+			
+			workSearch() {
+				uni.hideKeyboard();
+				this.works = []
+				this.worksloadData()
+			},
+			
+			lower() {
+				setTimeout(() => {
+					this.worksloadData(true);
+				}, 200)
+			},
+			
+			worksloadData(e) {
+				let params = {}
+				// this.loading = 'loading'
+			
+				if (e) {
+					if (this.total <= this.works.length) {
+						// this.loading = 'nomore'
+						return
+					}
+					this.workspage++
+				} else {
+					this.workspage = 1
+				}
+				params['pageNumber'] = this.workspage
+				if (this.sxsearch) {
+					params['keyWord'] = this.sxsearch
+				}
+				getProjectListApi(params).then(async res => {
+					if (res) {
+						this.total = res.total
+						// this.loading = 'loadmore'
+						this.works = this.works.concat(res.records)
+					}
+				})
+			},
+			popupSelItem(item) {
+				this.show = false
+				this.projectId = item.id;
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
 		}
 	}
 </script>
@@ -610,6 +730,53 @@
 					width: 346rpx;
 				}
 			}
+		}
+		
+		.popup {
+			height: 500px;
+			padding: 19px 16px;
+			
+			.title {
+				font-size: 18px;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #000000;
+			}
+			
+			.close {
+				width: 22px;
+				height: 22px;
+			}
+		
+			.item_box {
+				border-radius: 4px;
+				margin: 0 0 48rpx;
+		
+				.item_title {
+					height: 20px;
+					font-size: 14px;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: rgba(0, 0, 0, 0.65);
+					line-height: 20px;
+				}
+		
+			}
+		
+			.no_data {
+				width: 100%;
+				margin-top: 310rpx;
+		
+				.text_black_28 {
+					font-size: 14px;
+					font-family: PingFangSC-Light, PingFang SC;
+					font-weight: 300;
+					color: rgba(0,0,0,0.65);
+					text-align: center;
+				}
+				
+			}
+			
 		}
 	}
 </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 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> -->
+			<view style="width: 148px;">
+				<u-subsection :list="['待审核','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'" @change="sectionChange"></u-subsection>
+			</view>
+			<view style="display: flex; justify-content: space-between; align-items: center;">
+				<u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
+				<view style="width: 16px;"></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">
@@ -59,9 +65,41 @@
 		</view>
 		<view v-else class="no_data">
 			<c-no-data></c-no-data>
-		</view>
+		</view>
+		
+		<u-popup :show="show" mode="bottom" @close="close" :round="22">
+			<view class="popup">
+				<view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
+					<view class="title">
+						项目筛选
+					</view>
+					<image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
+				</view>
+				<view class="search">
+					<u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
+						bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
+					</u-search>
+				</view>
+				<scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
+					@scrolltolower="lower()">
+					<view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
+						<view style="display: flex; align-items: center; justify-content: space-between;">
+							<view class="item_title">
+								{{item.name}}
+							</view>
+							<image v-if="item.id == projectId" style="width: 20px; height: 20px;" src="/static/img/home/popselect.png" mode=""></image>
+						</view>
+					</view>
+				</scroll-view>
+				<view v-else class="no_data" @click="jumpVerified">
+					<view class="text_black_28">
+						暂未搜索到该项目
+					</view>
+				</view>
+			</view>
+		</u-popup>
 
-		<u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
+		<!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
 			<view class="popup_search">
 				<view class="content">
 					<view class="title">按项目筛选</view>
@@ -94,7 +132,7 @@
 				</view>
 
 			</view>
-		</u-popup>
+		</u-popup> -->
 
 	</view>
 </template>
@@ -132,32 +170,44 @@
 
 				},
 				projectId: '',
-				switchValue: false,
+				switchValue: false,
+				curNow: 1,
+				sxsearch: '',
+				works: [],
+				workspage: 1,
+				workstotal: 0,
 			}
 		},
 
 		onLoad(option) {
 			console.log(option)
-			this.$store.dispatch(`home/getProjectList`, {
-				pageSize: -1,
-			})
-
-			this.search.keySearch = '';
-
+			// this.$store.dispatch(`home/getProjectList`, {
+			// 	pageSize: -1,
+			// })
+
+			// this.search.keySearch = '';
+			
+			this.worksloadData()
+			
 			if (option && option.status) {
-				this.search.status = 'wait';
-				this.checkboxValue = ['待审核'];
-				this.switchValue = true;
+				// this.search.status = 'wait';
+				// this.checkboxValue = ['待审核'];
+				// this.switchValue = true;
+				this.curNow = 0;
 			}
 
-			this.finished = false;
-			this.loading = "loadmore";
-			this.page = 0;
-			this.list = [];
+			// this.finished = false;
+			// this.loading = "loadmore";
+			// this.page = 0;
+			// this.list = [];
 
 		},
 
 		onShow() {
+			this.finished = false;
+			this.loading = "loadmore";
+			this.page = 0;
+			this.list = [];
 			this._getList();
 		},
 
@@ -170,7 +220,21 @@
 
 		},
 
-		methods: {
+		methods: {
+			
+			searchCli() {
+				this.$u.route('/pages/main/home/search/search?type=reg&searchkey=' + this.keyword);
+			},
+			
+			sectionChange(index) {
+				this.curNow = index;
+			
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
 
 			handelDetail(record) {
 				this.$u.route({
@@ -228,8 +292,14 @@
 				params.pageNumber = requestParams.page + 1;
 				params.pageSize = 5;
 
-				if (search.status) {
-					params.status = search.status;
+				// if (search.status) {
+				// 	params.status = search.status;
+				// }
+				
+				if (this.curNow == 0) {
+					params.status = 'wait';
+				}else {
+					params.status = 'wait,pass,reject';
 				}
 
 				if (this.keyword) {
@@ -300,7 +370,53 @@
 
 				this.show = false;
 			},
-
+			
+			workSearch() {
+				uni.hideKeyboard();
+				this.works = []
+				this.worksloadData()
+			},
+			
+			lower() {
+				setTimeout(() => {
+					this.worksloadData(true);
+				}, 200)
+			},
+			
+			worksloadData(e) {
+				let params = {}
+				// this.loading = 'loading'
+			
+				if (e) {
+					if (this.total <= this.works.length) {
+						// this.loading = 'nomore'
+						return
+					}
+					this.workspage++
+				} else {
+					this.workspage = 1
+				}
+				params['pageNumber'] = this.workspage
+				if (this.sxsearch) {
+					params['keyWord'] = this.sxsearch
+				}
+				getProjectListApi(params).then(async res => {
+					if (res) {
+						this.total = res.total
+						// this.loading = 'loadmore'
+						this.works = this.works.concat(res.records)
+					}
+				})
+			},
+			popupSelItem(item) {
+				this.show = false
+				this.projectId = item.id;
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
 		}
 	}
 </script>
@@ -480,6 +596,53 @@
 					width: 346rpx;
 				}
 			}
+		}
+		
+		.popup {
+			height: 500px;
+			padding: 19px 16px;
+		
+			.title {
+				font-size: 18px;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #000000;
+			}
+		
+			.close {
+				width: 22px;
+				height: 22px;
+			}
+		
+			.item_box {
+				border-radius: 4px;
+				margin: 0 0 48rpx;
+		
+				.item_title {
+					height: 20px;
+					font-size: 14px;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: rgba(0, 0, 0, 0.65);
+					line-height: 20px;
+				}
+		
+			}
+		
+			.no_data {
+				width: 100%;
+				margin-top: 310rpx;
+		
+				.text_black_28 {
+					font-size: 14px;
+					font-family: PingFangSC-Light, PingFang SC;
+					font-weight: 300;
+					color: rgba(0, 0, 0, 0.65);
+					text-align: center;
+				}
+		
+			}
+		
 		}
 	}
 </style>

@@ -216,106 +216,54 @@
 				})
 			},
 
-			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);
-					}
-				});
+			openLink(e) {
+				var _this = this
+			
+				uni.showLoading({
+					title: '努力加载中~',
+					mask: true
+				})
+			
+				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,
+							success: function(res) {
+								var filePath = res.tempFilePath;
+								uni.openDocument({
+									filePath: filePath,
+									showMenu: true,
+									success: function(res) {
+										console.log('打开文档成功');
+									},
+									complete: function() {
+										uni.hideLoading();
+									}
+								});
+							}
+						});
+					}
+				})
+			},
+			openImage(imgPath) {
+				let array = new Array(1).fill(imgPath);
+				uni.previewImage({
+					urls: array,
+					success(res) {
+						uni.hideLoading();
+						console.log('openImage success');
+					},
+					fail(res) {
+						uni.hideLoading();
+						console.log('openImage fail:', res);
+					}
+				});
 			},
 
 			deletePic(index) {

 <template>
 	<view class="registration_review">
-		<view class="search_box" v-if="!studentId">
-			<view class="top">
-				<view class="check">
-					<u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
-						<u-checkbox :customStyle="{marginBottom: '8px'}" shape="circle"
-							v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name"
-							activeColor="#06B079" size="28rpx" labelSize="28rpx" labelColor="#202131">
-						</u-checkbox>
-					</u-checkbox-group>
-				</view>
-
-				<view class="search">
-					<u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
-						bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
-					</u-search>
-				</view>
-
-				<u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
-			</view>
+		<view 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> -->
+			<view style="width: 148px;">
+				<u-subsection :list="['待审核','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'"
+					@change="sectionChange"></u-subsection>
+			</view>
+			<view style="display: flex; justify-content: space-between; align-items: center;">
+				<u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
+				<view style="width: 16px;"></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">
@@ -60,8 +65,41 @@
 		<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">
+		
+		<u-popup :show="show" mode="bottom" @close="close" :round="22">
+			<view class="popup">
+				<view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
+					<view class="title">
+						项目筛选
+					</view>
+					<image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
+				</view>
+				<view class="search">
+					<u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
+						bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
+					</u-search>
+				</view>
+				<scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
+					@scrolltolower="lower()">
+					<view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
+						<view style="display: flex; align-items: center; justify-content: space-between;">
+							<view class="item_title">
+								{{item.name}}
+							</view>
+							<image v-if="item.id == projectId" style="width: 20px; height: 20px;"
+								src="/static/img/home/popselect.png" mode=""></image>
+						</view>
+					</view>
+				</scroll-view>
+				<view v-else class="no_data" @click="jumpVerified">
+					<view class="text_black_28">
+						暂未搜索到该项目
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		
+		<!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
 			<view class="popup_search">
 				<view class="content">
 					<view class="title">按项目筛选</view>
@@ -94,7 +132,7 @@
 				</view>
 
 			</view>
-		</u-popup>
+		</u-popup> -->
 
 	</view>
 </template>
@@ -144,7 +182,11 @@
 				list: [], //列表必须为key list的数组
 				projectId: '',
 				switchValue: false,
-
+				curNow: 1,
+				sxsearch: '',
+				works: [],
+				workspage: 1,
+				workstotal: 0,
 			}
 		},
 
@@ -153,16 +195,19 @@
 			this.studentId = option.studentId;
 			this.projectId = option.projectId;
 
-			this.$store.dispatch(`home/getProjectList`, {
-				pageSize: -1,
-			})
+			// this.$store.dispatch(`home/getProjectList`, {
+			// 	pageSize: -1,
+			// })
+			
+			this.worksloadData()
 
-			this.search.keySearch = '';
+			// this.search.keySearch = '';
 			
 			if (option && option.status) {
-				this.search.status = 'stay_examine';
-				this.checkboxValue = ['待批阅'];
-				this.switchValue = true;
+				// this.search.status = 'stay_examine';
+				// this.checkboxValue = ['待批阅'];
+				// this.switchValue = true;
+				this.curNow = 0;
 			}
 
 			this.finished = false;
@@ -172,6 +217,10 @@
 		},
 
 		onShow() {
+			this.finished = false;
+			this.loading = "loadmore";
+			this.page = 0;
+			this.list = [];
 			this._getList();
 		},
 
@@ -184,7 +233,22 @@
 
 		},
 
-		methods: {
+		methods: {
+			
+			searchCli() {
+				this.$u.route('/pages/main/home/search/search?type=report&searchkey=' + this.keyword);
+			},
+			
+			sectionChange(index) {
+				this.curNow = index;
+			
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+			
 			getNameLastTwo(value) {
 				if (value && value.length > 3) {
 					return value.substring(value.length - 3)
@@ -262,8 +326,12 @@
 				params.pageNumber = requestParams.page + 1;
 				params.pageSize = 5;
 
-				if (search.status) {
-					params.status = search.status;
+				// if (search.status) {
+				// 	params.status = search.status;
+				// }
+				
+				if (this.curNow == 0) {
+					params.status = 'stay_examine';
 				}
 
 				if (this.keyword) {
@@ -338,7 +406,53 @@
 
 				this.show = false;
 			},
-
+			
+			workSearch() {
+				uni.hideKeyboard();
+				this.works = []
+				this.worksloadData()
+			},
+			
+			lower() {
+				setTimeout(() => {
+					this.worksloadData(true);
+				}, 200)
+			},
+			
+			worksloadData(e) {
+				let params = {}
+				// this.loading = 'loading'
+			
+				if (e) {
+					if (this.total <= this.works.length) {
+						// this.loading = 'nomore'
+						return
+					}
+					this.workspage++
+				} else {
+					this.workspage = 1
+				}
+				params['pageNumber'] = this.workspage
+				if (this.sxsearch) {
+					params['keyWord'] = this.sxsearch
+				}
+				getProjectListApi(params).then(async res => {
+					if (res) {
+						this.total = res.total
+						// this.loading = 'loadmore'
+						this.works = this.works.concat(res.records)
+					}
+				})
+			},
+			popupSelItem(item) {
+				this.show = false
+				this.projectId = item.id;
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
 		}
 	}
 </script>
@@ -350,32 +464,20 @@
 		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;
-				}
-			}
-
-
+		.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 {
@@ -545,6 +647,53 @@
 					width: 346rpx;
 				}
 			}
+		}
+		
+		.popup {
+			height: 500px;
+			padding: 19px 16px;
+		
+			.title {
+				font-size: 18px;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #000000;
+			}
+		
+			.close {
+				width: 22px;
+				height: 22px;
+			}
+		
+			.item_box {
+				border-radius: 4px;
+				margin: 0 0 48rpx;
+		
+				.item_title {
+					height: 20px;
+					font-size: 14px;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: rgba(0, 0, 0, 0.65);
+					line-height: 20px;
+				}
+		
+			}
+		
+			.no_data {
+				width: 100%;
+				margin-top: 310rpx;
+		
+				.text_black_28 {
+					font-size: 14px;
+					font-family: PingFangSC-Light, PingFang SC;
+					font-weight: 300;
+					color: rgba(0, 0, 0, 0.65);
+					text-align: center;
+				}
+		
+			}
+		
 		}
 	}
 </style>

 <template>
 	<view class="registration_review">
-		<view class="search_box">
-			<view class="top">
-				<view class="check">
-					<u-checkbox-group v-model="checkboxValue" placement="column" @change="checkboxChange">
-						<u-checkbox :customStyle="{marginBottom: '8px'}" shape="circle"
-							v-for="(item, index) in checkboxList" :key="index" :label="item.name" :name="item.name"
-							activeColor="#06B079" size="28rpx" labelSize="28rpx" labelColor="#202131">
-						</u-checkbox>
-					</u-checkbox-group>
-				</view>
-
-				<view class="search">
-					<u-search placeholder="请输入学生姓名/学号/手机号" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
-						bgColor="#F4F4F4" :showAction="false" shape="square" v-model="keyword" @search="handelSearch">
-					</u-search>
-				</view>
-
-				<view class="icon">
-					<view :style="{position:'relative', top:'14rpx', right:'18rpx'}">
-						<u-icon slot="icon" size="40" :name="'/static/img/home/dateIcon.png'" @click="showTime = true">
-						</u-icon>
-					</view>
-					<u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true">
-					</u-icon>
-				</view>
-
 
+		<view class="search_box">
+			<view style="width: 148px;">
+				<u-subsection :list="['未签到','全部']" :current="curNow" :fontSize="26" :activeColor="'#000'"
+					@change="sectionChange"></u-subsection>
 			</view>
-			<view class="bottom" :style="{padding:'0 0 20rpx 0'}">
-				<u-calendar :minDate="minDate" :maxDate="maxDate" :monthNum="25" :show="showTime"
-					:defaultDate="defaultDateMultiple" @close="showTime = false" :showSubtitle="false" color="#06B079"
-					@confirm="confirm">
-				</u-calendar>
-				<!-- <view class="time">{{timeValue}}</view> -->
+			<view style="display: flex; justify-content: space-between; align-items: center;">
+				<u-icon slot="icon" size="40" :name="'/static/img/home/dateIcon.png'" @click="showTime = true"></u-icon>
+				<view style="width: 16px;"></view>
+				<u-icon slot="icon" size="40" :name="'/static/img/home/search.png'" @click="searchCli"></u-icon>
+				<view style="width: 16px;"></view>
+				<u-icon slot="icon" size="40" :name="'/static/img/home/selectIcon.png'" @click="show = true"></u-icon>
 			</view>
 		</view>
 
+		<u-calendar :minDate="minDate" :maxDate="maxDate" :monthNum="25" :show="showTime" :defaultDate="defaultDateMultiple"
+			@close="showTime = false" :showSubtitle="false" color="#06B079" @confirm="confirm">
+		</u-calendar>
+
 		<view class="list_box" v-if="list.length > 0">
 			<view class="item" v-for="(item, i) in list" :key="i">
 
@@ -54,10 +36,10 @@
 					<view class="avatar">{{getNameLastTwo(item.studentName)}}</view>
 					<view class="name">{{overflowHide(item.studentName)}}</view>
 					<view class="number">{{item.studentNumber}}</view>
-				</view>
-				<view class="company">
-					<text>实习项目</text>
-					<text>{{item.projectName || '--'}}</text>
+				</view>
+				<view class="company">
+					<text>实习项目</text>
+					<text>{{item.projectName || '--'}}</text>
 				</view>
 				<view class="company">
 					<text>班级</text>
@@ -79,8 +61,41 @@
 		<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">
+		
+		<u-popup :show="show" mode="bottom" @close="close" :round="22">
+			<view class="popup">
+				<view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
+					<view class="title">
+						项目筛选
+					</view>
+					<image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
+				</view>
+				<view class="search">
+					<u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
+						bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
+					</u-search>
+				</view>
+				<scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
+					@scrolltolower="lower()">
+					<view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
+						<view style="display: flex; align-items: center; justify-content: space-between;">
+							<view class="item_title">
+								{{item.name}}
+							</view>
+							<image v-if="item.id == projectId" style="width: 20px; height: 20px;"
+								src="/static/img/home/popselect.png" mode=""></image>
+						</view>
+					</view>
+				</scroll-view>
+				<view v-else class="no_data" @click="jumpVerified">
+					<view class="text_black_28">
+						暂未搜索到该项目
+					</view>
+				</view>
+			</view>
+		</u-popup>
+		
+		<!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
 			<view class="popup_search">
 				<view class="content">
 					<view class="title">按项目筛选</view>
@@ -113,7 +128,7 @@
 				</view>
 
 			</view>
-		</u-popup>
+		</u-popup> -->
 
 	</view>
 </template>
@@ -165,29 +180,46 @@
 				defaultDateMultiple: [`${year}-${month}-${date}`],
 				list: [], //列表必须为key list的数组
 				projectId: '',
-				switchValue: false,
-
+				switchValue: false,
+				
+				curNow: 1,
+				sxsearch: '',
+				works: [],
+				workspage: 1,
+				workstotal: 0,
 			}
 		},
 
 		onLoad(option) {
-			this.$store.dispatch(`home/getProjectList`, {
-				pageSize: -1,
-			})
-
-			this.search.keySearch = '';
-
-			this.finished = false;
-			this.loading = "loadmore";
-			this.page = 0;
-			this.list = [];
-
-
+			// this.$store.dispatch(`home/getProjectList`, {
+			// 	pageSize: -1,
+			// })
+
+			// this.search.keySearch = '';
+
+			// this.finished = false;
+			// this.loading = "loadmore";
+			// this.page = 0;
+			// this.list = [];
+
+			this.worksloadData()
+			
+			if (option && option.status) {
+				// this.search.status = 'wait';
+				this.curNow = 0;
+				// this.checkboxValue = ['待处理'];
+				// this.switchValue = true;
+			}
+			
 
 		},
 
-		onShow() {
-			this._getList();
+		onShow() {
+			this.finished = false;
+			this.loading = "loadmore";
+			this.page = 0;
+			this.list = [];
+			this._getList();
 		},
 
 		computed: {
@@ -199,7 +231,22 @@
 
 		},
 
-		methods: {
+		methods: {
+			
+			searchCli() {
+				this.$u.route('/pages/main/home/search/search?type=student&searchkey=' + this.keyword);
+			},
+			
+			sectionChange(index) {
+				this.curNow = index;
+			
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+			
 
 			getNameLastTwo(value) {
 				if (value && value.length > 3) {
@@ -286,8 +333,12 @@
 				params.pageNumber = requestParams.page + 1;
 				params.pageSize = 5;
 
-				if (search.waitAttendance) {
-					params.waitAttendance = search.waitAttendance;
+				// if (search.waitAttendance) {
+				// 	params.waitAttendance = search.waitAttendance;
+				// }
+				
+				if (this.curNow == 0) {
+					params.waitAttendance = 'not_attendance';
 				}
 
 				if (this.keyword) {
@@ -361,7 +412,54 @@
 
 				this.show = false;
 			},
-
+			
+			workSearch() {
+				uni.hideKeyboard();
+				this.works = []
+				this.worksloadData()
+			},
+			
+			lower() {
+				setTimeout(() => {
+					this.worksloadData(true);
+				}, 200)
+			},
+			
+			worksloadData(e) {
+				let params = {}
+				// this.loading = 'loading'
+			
+				if (e) {
+					if (this.total <= this.works.length) {
+						// this.loading = 'nomore'
+						return
+					}
+					this.workspage++
+				} else {
+					this.workspage = 1
+				}
+				params['pageNumber'] = this.workspage
+				if (this.sxsearch) {
+					params['keyWord'] = this.sxsearch
+				}
+				getProjectListApi(params).then(async res => {
+					if (res) {
+						this.total = res.total
+						// this.loading = 'loadmore'
+						this.works = this.works.concat(res.records)
+					}
+				})
+			},
+			popupSelItem(item) {
+				this.show = false
+				this.projectId = item.id;
+				this.finished = false;
+				this.loading = "loadmore";
+				this.page = 0;
+				this.list = [];
+				this._getList();
+			},
+			
 		}
 	}
 </script>
@@ -373,36 +471,52 @@
 		height: auto;
 		background-color: #F7F7F7;
 
-		.search_box {
-			padding: 36rpx 30rpx 0;
-			background-color: #FFFFFF;
-
-			.top {
-				display: flex;
-				flex-flow: row nowrap;
-				justify-content: space-between;
-
-				.check {
-					padding: 20rpx 0 0 0;
-				}
-
-				.search {
-					width: 410rpx;
-				}
-
-				.icon {
-					display: flex;
-					flex-flow: row nowrap;
-				}
-			}
-
-			.bottom {
-				.time {
-					padding: 30rpx 0 30rpx 40rpx;
-				}
-			}
-
-
+		// .search_box {
+		// 	padding: 36rpx 30rpx 0;
+		// 	background-color: #FFFFFF;
+
+		// 	.top {
+		// 		display: flex;
+		// 		flex-flow: row nowrap;
+		// 		justify-content: space-between;
+
+		// 		.check {
+		// 			padding: 20rpx 0 0 0;
+		// 		}
+
+		// 		.search {
+		// 			width: 410rpx;
+		// 		}
+
+		// 		.icon {
+		// 			display: flex;
+		// 			flex-flow: row nowrap;
+		// 		}
+		// 	}
+
+		// 	.bottom {
+		// 		.time {
+		// 			padding: 30rpx 0 30rpx 40rpx;
+		// 		}
+		// 	}
+
+
+		// }
+		
+		.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 {
@@ -469,20 +583,20 @@
 					flex-flow: row nowrap;
 					margin: 0 0 30rpx 0;
 
-					text {
+					text {
 						width: 130rpx;
 						font-size: 28rpx;
 						line-height: 32rpx;
 						color: #909097;
 						margin: 0 0 0 16rpx;
-					}
-					
-					text:first-child {
-						text-align: justify;
-						text-align-last: justify;
 					}
 
-					text:last-child {
+					text:first-child {
+						text-align: justify;
+						text-align-last: justify;
+					}
+
+					text:last-child {
 						width: 400rpx;
 						color: #202131;
 						margin: 0 0 0 30rpx;
@@ -521,32 +635,32 @@
 					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;
-						}
-					}
+				.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 {
@@ -593,6 +707,53 @@
 					width: 346rpx;
 				}
 			}
+		}
+		
+		.popup {
+			height: 500px;
+			padding: 19px 16px;
+		
+			.title {
+				font-size: 18px;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #000000;
+			}
+		
+			.close {
+				width: 22px;
+				height: 22px;
+			}
+		
+			.item_box {
+				border-radius: 4px;
+				margin: 0 0 48rpx;
+		
+				.item_title {
+					height: 20px;
+					font-size: 14px;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: rgba(0, 0, 0, 0.65);
+					line-height: 20px;
+				}
+		
+			}
+		
+			.no_data {
+				width: 100%;
+				margin-top: 310rpx;
+		
+				.text_black_28 {
+					font-size: 14px;
+					font-family: PingFangSC-Light, PingFang SC;
+					font-weight: 300;
+					color: rgba(0, 0, 0, 0.65);
+					text-align: center;
+				}
+		
+			}
+		
 		}
 	}
 </style>

@@ -99,8 +99,12 @@
 			
 			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)
+			
+				uni.showLoading({
+					title: '努力加载中~',
+					mask: true
+				})
+			
 				getImgUrlApi({
 					bucket: e.bucket,
 					filePath: e.object
@@ -111,89 +115,34 @@
 					} 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()
-										}
-									})
-								}
+							success: function(res) {
+								var filePath = res.tempFilePath;
+								uni.openDocument({
+									filePath: filePath,
+									showMenu: true,
+									success: function(res) {
+										console.log('打开文档成功');
+									},
+									complete: function() {
+										uni.hideLoading();
+									}
+								});
 							}
 						});
 					}
 				})
 			},
 			
-			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) {
+						uni.hideLoading();
 						console.log('openImage success');
 					},
 					fail(res) {
+						uni.hideLoading();
 						console.log('openImage fail:', res);
 					}
 				});

@@ -48,7 +48,7 @@
 					<text>实践课程</text>
 					<text class="value_type">{{interDetail.courseName}}</text>
 				</view>
-				<view style="margin-top: 32rpx;">
+				<!-- <view style="margin-top: 32rpx;">
 					<text>实习成绩</text>
 					<text v-if="grades" class="value_type">{{grades}}</text>
 					<text v-else class="value_type">--</text>
@@ -57,7 +57,7 @@
 					<text>实习评价</text>
 					<text v-if="interDetail.teacherView" class="value_type">{{interDetail.teacherView}}</text>
 					<text v-else class="value_type">--</text>
-				</view>
+				</view> -->
 			</view>
 			<!-- 项目信息 -->
 			<text class="text_title">项目信息</text>

@@ -129,7 +129,7 @@
 						<text class="credit">学分：{{item.credit}}分</text>
 					</view>
 
-					<view class="projiect_item" v-for="(ele, index) in item.achievementDataList" :key="index">
+					<view class="projiect_item" v-for="(ele, index) in item.entryDataList" :key="index" @click="projiectSel(ele)">
 
 						<view class="projiect">
 							<text>项目名称</text>
@@ -140,33 +140,67 @@
 							<text>{{ ele.internshipStartTime>0 ? `${timeFormat(ele.internshipStartTime)}至${timeFormat(ele.internshipEndTime)}` : '--'}}</text>
 						</view>
 						<view class="projiect">
-							<text>实习单号</text>
-							<text @click="handelDetail(ele, 'internship')"
-								:style="{color:'#06B079',textDecoration:'underline'}">{{ele.formNumber|| '--'}}</text>
+							<text>实习形式</text>
+							<!-- <text @click="handelDetail(ele, 'internship')"
+								:style="{color:'#06B079',textDecoration:'underline'}">{{ele.formNumber|| '--'}}</text> -->
+							<text>{{ele.practiceForm=='oneself'?'自主实习':'集中实习'}}</text>
 						</view>
 						<view class="projiect">
-							<text>成绩</text>
-							<text>{{ele.level|| '--'}}</text>
+							<text>总成绩</text>
+							<text>{{ele.totalScore|| '--'}}</text>
 						</view>
 
-						<view class="projiect" v-if="ele.credit">
+						<!-- <view class="projiect" v-if="ele.credit">
 							<text>学分</text>
 							<text @click="handelDetail(ele, 'credit')"
 								:style="{color:'#06B079'}">{{ele.credit}}</text>
-						</view>
+						</view> -->
 						
-						<view class="projiect" v-else>
+						<!-- <view class="projiect" v-else>
 							<text>学分</text>
 							<text>{{'--'}}</text>
-						</view>
+						</view> -->
 					</view>
 				</view>
 				<c-loading :loading="loading"></c-loading>
 			</view>
 
-		</view>
+		</view>
+		
+		<u-popup :show="show" mode="bottom" @close="close" :round="22">
+			<view class="popup">
+				<view style="display: flex; justify-content: space-between; align-items: center; margin-bottom: 28px;">
+					<view class="title">
+						项目筛选
+					</view>
+					<image class="close" src="/static/img/home/closepop.png" @click="close" mode=""></image>
+				</view>
+				<view class="search">
+					<u-search placeholder="请输入项目关键词搜索" placeholderColor="#C1C1C9" searchIconSize="36" height="64rpx"
+						bgColor="#F4F4F4" :showAction="true" shape="round" v-model="sxsearch" @custom="workSearch()" @search="workSearch()">
+					</u-search>
+				</view>
+				<scroll-view v-if="works.length>0" scroll-y="true" style="height: 80%; margin-top: 40rpx;"
+					@scrolltolower="lower()">
+					<view class="item_box" v-for="(item,index) in works" :key="index" @click="popupSelItem(item)">
+						<view style="display: flex; align-items: center; justify-content: space-between;">
+							<view class="item_title">
+								{{item.name}}
+							</view>
+							<image v-if="item.id == projectId" style="width: 20px; height: 20px;"
+								src="/static/img/home/popselect.png" mode=""></image>
+						</view>
+					</view>
+				</scroll-view>
+				<view v-else class="no_data" @click="jumpVerified">
+					<view class="text_black_28">
+						暂未搜索到该项目
+					</view>
+				</view>
+			</view>
+		</u-popup>
 
-		<u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
+		<!-- <u-popup :show="show" mode="right" @close="close" @open="open" :closeOnClickOverlay="false">
 			<view class="popup_search">
 				<view class="content">
 					<view class="title">按项目筛选</view>
@@ -193,7 +227,7 @@
 					</view>
 				</view>
 			</view>
-		</u-popup>
+		</u-popup> -->
 	</view>
 </template>
 
@@ -208,7 +242,8 @@
 	import {
 		getInternshipProcessDetailApi,
 		getInternshipJobListApi,
-		getPracticalCoursesListApi,
+		getPracticalCoursesListApi,
+		getProjectListApi,
 	} from '@/config/api.js';
 
 	export default {
@@ -231,14 +266,18 @@
 					//搜索对象必须为key search的对象
 					status: 'wait,pass,reject',
 
-				},
+				},
+				works: [],
+				workspage: 1,
+				workstotal: 0,
 			}
 		},
 
 		onLoad(option) {
-			this.$store.dispatch(`home/getProjectList`, {
-				pageSize: -1,
-			})
+			// this.$store.dispatch(`home/getProjectList`, {
+			// 	pageSize: -1,
+			// })
+			this.worksloadData()
 
 			this.studentId = option.studentId;
 			getInternshipProcessDetailApi({
@@ -257,7 +296,13 @@
 			}),
 		},
 
-		methods: {
+		methods: {
+			
+			projiectSel(e) {
+				this.$u.route({
+					url: `pages/main/internship/traineeInterList/traineeInterList?&id=${e.entryId}`
+				})
+			},
 
 			getNameLastTwo(value) {
 				if (value && value.length > 3) {
@@ -457,7 +502,59 @@
 						})
 						break;
 				}
-			}
+			},
+			
+			workSearch() {
+				uni.hideKeyboard();
+				this.works = []
+				this.worksloadData()
+			},
+			
+			lower() {
+				setTimeout(() => {
+					this.worksloadData(true);
+				}, 200)
+			},
+			
+			worksloadData(e) {
+				let params = {}
+				// this.loading = 'loading'
+			
+				if (e) {
+					if (this.total <= this.works.length) {
+						// this.loading = 'nomore'
+						return
+					}
+					this.workspage++
+				} else {
+					this.workspage = 1
+				}
+				params['pageNumber'] = this.workspage
+				if (this.sxsearch) {
+					params['keyWord'] = this.sxsearch
+				}
+				getProjectListApi(params).then(async res => {
+					if (res) {
+						this.total = res.total
+						// this.loading = 'loadmore'
+						this.works = this.works.concat(res.records)
+					}
+				})
+			},
+			popupSelItem(item) {
+				this.projectId = item.id;
+				this.finished = false;
+				
+				getInternshipProcessDetailApi({
+					studentId: this.studentId,
+					projectId: this.projectId,
+				}).then(data => {
+					if (data) {
+						this.detail = data;
+						this.show = false
+					}
+				})
+			},
 
 		}
 	}
@@ -645,7 +742,7 @@
 							font-size: 32rpx;
 							line-height: 44rpx;
 							color: #202131;
-							margin: 0 0 30rpx 0;
+							margin: 0 0 20rpx 0;
 							font-weight: 500;
 						}
 
@@ -821,6 +918,53 @@
 					width: 346rpx;
 				}
 			}
+		}
+		
+		.popup {
+			height: 500px;
+			padding: 19px 16px;
+		
+			.title {
+				font-size: 18px;
+				font-family: PingFangSC-Medium, PingFang SC;
+				font-weight: 500;
+				color: #000000;
+			}
+		
+			.close {
+				width: 22px;
+				height: 22px;
+			}
+		
+			.item_box {
+				border-radius: 4px;
+				margin: 0 0 48rpx;
+		
+				.item_title {
+					height: 20px;
+					font-size: 14px;
+					font-family: PingFangSC-Regular, PingFang SC;
+					font-weight: 400;
+					color: rgba(0, 0, 0, 0.65);
+					line-height: 20px;
+				}
+		
+			}
+		
+			.no_data {
+				width: 100%;
+				margin-top: 310rpx;
+		
+				.text_black_28 {
+					font-size: 14px;
+					font-family: PingFangSC-Light, PingFang SC;
+					font-weight: 300;
+					color: rgba(0, 0, 0, 0.65);
+					text-align: center;
+				}
+		
+			}
+		
 		}
 	}
 </style>

+<template>
+	<view class="current2">
+		<view v-if="list.length > 0" >
+			<view class="list">
+				<view v-for="(item,index) in list" :key="index" @click="handelClick(item)">
+					<view class="list-item">
+						<view style="display: flex; align-items: center;">
+							<text>实习单号:</text>
+							<text class="green">{{item.number}}</text>
+						</view>
+						<view style="display: flex; align-items: center; margin-top: 15rpx;">
+							<text>实习时间: {{`${timeFormat(item.startTime,'yyyy/mm/dd')} - ${timeFormat(item.endTime,'yyyy/mm/dd')}`}}</text>
+						</view>
+						<view style="display: flex; align-items: center; margin-top: 15rpx;">
+							<text>实习企业: {{item.companyName}}</text>
+						</view>
+						<view style="display: flex; align-items: center; margin-top: 15rpx;">
+							<text>实习岗位: {{item.jobName}}</text>
+						</view>
+					</view>
+				</view>
+			</view>
+			<view style="height: 40rpx;"></view>
+			<c-loading :loading="loading"></c-loading>
+			<view style="height: 40rpx;"></view>
+		</view>
+		<view v-else style="width: 100%; height: 100%;">
+			<view style="margin: 150px auto 0; width: 187px;height: 110px;">
+				<image style="width: 187px;height: 110px;" :src="'/static/img/home/nodata.png'"></image>
+			</view>
+			<view style="width: 100%; margin-top: 10px; text-align: center; font-size: 13px; color: #121212;">暂无数据</view>
+		</view>
+	</view>
+</template>
+
+<script>
+	import {
+		getforminternshipInfoApi
+	} from '@/config/api.js';
+	import listMixin from "@/common/mixins/list-mixin.js";
+	
+	export default {
+		mixins: [listMixin],
+		data() {
+			return {
+				id: '',
+				list: []
+			}
+		},
+	
+		onLoad(e) {
+			console.log(e)
+			this.id = e.id
+			
+			this.finished = false;
+			this.loading = "loadmore";
+			this.page = 0;
+			this.list = [];
+			this._getList();
+		},
+	
+		methods: {
+			loadData() {
+				scoredetailUrl(this.id).then(res => {
+					if (res) {
+						this.detailObj = res;
+						this.detailObj.form.endTime = this.timeFormat(this.detailObj.form.endTime,'yyyy-mm-dd')
+						this.stuhandleDataspdf()
+						this.comhandleDataspdf()
+						this.schhandleDataspdf()
+					}
+				})
+			},
+			
+			timeFormat(timestamp, format = 'yyyy-mm-dd hh:MM') {
+				return timestamp > 0 ? uni.$u.timeFormat(timestamp, format) : '--'
+			},
+			
+			handelClick(e) {
+				// this.$u.route({
+				// 	url: `pages/main/home/achievementDetail/achievementDetail?&id=${e.id}`
+				// })
+				this.$u.route({
+					url: `pages/main/internship/intershipInfo/intershipInfo?id=${e.id}`
+				})
+			},
+			
+			// 模拟后端分页
+			async getData(requestParams) {
+				const {
+					search = {}
+				} = requestParams;
+			
+				let params = {};
+				params.pageNumber = requestParams.page + 1;
+				params.pageSize = 10;
+				params.entryId = this.id;
+				
+				console.log(12312312,params)
+				return await getforminternshipInfoApi(params);
+			},
+			
+			// 数据请求(没错就是这么少的代码)
+			async _getList() {
+				if (this.page == 0) {
+					this.list = [];
+				}
+			
+				uni.showLoading({
+					title: '数据加载中~',
+					mask: true
+				})
+			
+				// 根据实际情况修改自己修改key
+				let result = await this.getData({
+					page: this.page, // 传入页码
+					size: this.size, // 传入每页条数
+					search: this.search, // 传入搜索的对象
+				});
+			
+				// console.log(result.records)
+			
+				this.total = result.total;
+			
+				result.records.map((item) => {
+					this.list.push(item);
+				});
+				
+				if (this.list.length == this.total) {
+					this.finished = true;
+					this.loading = 'nomore';
+				}
+			
+				uni.hideLoading();
+			},
+		}
+	}
+</script>
+
+<style>
+	page {
+		background-color: #F7F7F7;
+	}
+</style>
+
+<style lang="scss" scoped>	
+	.current2 {
+		padding: 20rpx 20rpx 0;
+		
+		.list-item {
+			// width: 100%;
+			// height: 150px;
+			padding: 36rpx 40rpx;
+			background: #FFFFFF;
+			margin-bottom: 10px;
+			
+			text {
+				font-size: 14px;
+				font-family: PingFangSC-Light, PingFang SC;
+				font-weight: 300;
+				color: rgba(0,0,0,0.65);
+				max-width: 90%;
+				overflow: hidden;
+				text-overflow: ellipsis;
+				display: -webkit-box;
+				-webkit-line-clamp: 2;
+				-webkit-box-orient: vertical;
+			}
+			
+			.green {
+				margin-left: 5px;
+				color: #0CB17A;
+			}
+		}
+	}
+</style>
\ No newline at end of file

@@ -60,7 +60,7 @@
 				<view class="twoCell">
 					<view class="item" @click="handelGate(1)">
 						<view>
-							<image src="/static/img/home/newhome1.png"></image>
+							<image src="/static/img/home/bmsh_sel.png"></image>
 						</view>
 						<view style="display: flex; flex-direction: column;">
 							<view class="t1">
@@ -71,51 +71,76 @@
 							</view>
 						</view>
 					</view>
-					<view class="item" @click="handelGate(2)">
+					<view class="item" @click="handelGate(8)">
 						<view>
-							<image src="/static/img/home/newhome2.png"></image>
+							<image src="/static/img/home/newhome1.png"></image>
 						</view>
 						<view style="display: flex; flex-direction: column;">
 							<view class="t1">
-								请假审批
+								实习申请
 							</view>
 							<view class="t2">
-								实习中的请假申请
+								实习开始&结束审批
 							</view>
 						</view>
 					</view>
 				</view>
-				<view class="fiveCell">
-					<view class="item" @click="handelGate(3)">
-						<image src="/static/img/home/newhome3.png"></image>
-						<view class="t1">
-							实习变更
-						</view>
-					</view>
-					<view class="item" @click="handelGate(4)">
-						<image src="/static/img/home/newhome4.png"></image>
-						<view class="t1">
-							日志批阅
-						</view>
-					</view>
-					<view class="item" @click="handelGate(5)">
-						<image src="/static/img/home/newhome5.png"></image>
-						<view class="t1">
-							报告批阅
-						</view>
-					</view>
-					<view class="item" @click="handelGate(6)">
-						<image src="/static/img/home/newhome6.png"></image>
-						<view class="t1">
-							学生签到
-						</view>
-					</view>
-					<view class="item" @click="handelGate(7)">
-						<image src="/static/img/home/newhome7.png"></image>
-						<view class="t1">
-							成绩鉴定
-						</view>
-					</view>
+				<!-- <view class="fiveCell"> -->
+					<scroll-view class="fiveCell" scroll-x="true" @scroll="scrollx">
+						<view class="item" @click="handelGate(2)">
+							<view class="item-flex">
+								<image src="/static/img/home/newhome2.png"></image>
+								<view class="t1">
+									请假审批
+								</view>
+							</view>
+						</view>
+						<view class="item" @click="handelGate(3)">
+							<view class="item-flex">
+								<image src="/static/img/home/newhome3.png"></image>
+								<view class="t1">
+									实习变更
+								</view>
+							</view>
+						</view>
+						<view class="item" @click="handelGate(4)">
+							<view class="item-flex">
+								<image src="/static/img/home/newhome4.png"></image>
+								<view class="t1">
+									日志批阅
+								</view>
+							</view>
+						</view>
+						<view class="item" @click="handelGate(5)">
+							<view class="item-flex">
+								<image src="/static/img/home/newhome5.png"></image>
+								<view class="t1">
+									报告批阅
+								</view>
+							</view>
+						</view>
+						<view class="item" @click="handelGate(6)">
+							<view class="item-flex">
+								<image src="/static/img/home/newhome6.png"></image>
+								<view class="t1">
+									学生签到
+								</view>
+							</view>
+						</view>
+						<view class="item" @click="handelGate(7)">
+							<view class="item-flex">
+								<image src="/static/img/home/newhome7.png"></image>
+								<view class="t1">
+									成绩鉴定
+								</view>
+							</view>
+						</view>
+					</scroll-view>
+				<!-- </view> -->
+				<view class="pro">
+					<view class="pro_top" :style="{left: processNum+'px'}">
+						
+					</view>
 				</view>
 			</view>
 
@@ -199,9 +224,22 @@
 				</view>
 				<view v-if="hasLogin">
 					<view
-						v-if="statistics && (statistics.formChangeApplyReview > 0 || statistics.leaveRecordReview > 0 || statistics.internshipApply > 0 || statistics.formLogWaitReview > 0 || statistics.reportWaitReview > 0 || statistics.achievementWaitAppraisal > 0 )">
+						v-if="statistics && (statistics.formApplyReview > 0 || statistics.formChangeApplyReview > 0 || statistics.leaveRecordReview > 0 || statistics.internshipApply > 0 || statistics.formLogWaitReview > 0 || statistics.reportWaitReview > 0 || statistics.achievementWaitAppraisal > 0 )">
 						<view class="cell">
-							<u-cell-group :border="false">
+							<u-cell-group :border="false">
+								<u-cell
+									v-if="statistics && statistics.formApplyReview && statistics.formApplyReview > 0"
+									:isLink="true" url="/pages/main/home/interapply/interapply?status=wait"
+									arrow-direction="right" :rightIconStyle="{fontSize:'24rpx'}" :border="false">
+									<view slot="title" class="u-slot-title">
+										<view class="u-cell-title">实习申请</view>
+										<view class="u-cell-text">
+											您有<text>{{statistics.formApplyReview}}</text>个<text>实习申请</text>待审批！</view>
+									</view>
+									<text slot="value" class="u-slot-value">立即审批</text>
+								
+								</u-cell>
+								<view class="line"></view>
 								<u-cell
 									v-if="statistics && statistics.leaveRecordReview && statistics.leaveRecordReview > 0"
 									:isLink="true" url="/pages/main/home/asklist/asklist?status=wait"
@@ -320,7 +358,6 @@
 						</view> -->
 					</view>
 				</scroll-view>
-
 				<!-- <view class="content">
 					<view class="title">
 						<text>选择学校</text>
@@ -371,7 +408,8 @@
 				menuHeight: 32,
 				menuTop: 32,
 				margin: 92,
-				isNav: false
+				isNav: false,
+				processNum: 0,
 			}
 		},
 
@@ -447,6 +485,15 @@
 
 		methods: {
 			
+			scrollx(e) {
+				// console.log(e)
+				if (e.detail.scrollLeft < 20) {
+					this.processNum = 0
+				}else {
+					this.processNum = 30
+				}
+			},
+			
 			getSystemInfo() {
 				uni.getSystemInfo({
 					success: (res) => {
@@ -585,9 +632,10 @@
 					case 7:
 						this.$u.route('/pages/main/home/achievementAppraisal/achievementAppraisal');
 						break;
-
-
-
+
+					case 8:
+						this.$u.route('/pages/main/home/interapply/interapply');
+						break;
 
 				}
 
@@ -767,17 +815,50 @@
 							color: rgba(0, 0, 0, 0.65);
 						}
 					}
+				}
+				
+				.pro {
+					width: 60px;
+					height: 5px;
+					border-radius: 2.5px;
+					background-color: #F4F4F4;
+					margin: 0 auto;
+					margin-top: 10px;
+					position: relative;
+					
+					.pro_top {
+						width: 30px;
+						height: 5px;
+						border-radius: 2.5px;
+						background-color: #06B079;
+						position: absolute;
+						top: 0px;
+						left: 0px;
+					}
 				}
 
 				.fiveCell {
-					margin-top: 30px;
-					display: flex;
-
-					.item {
-						flex: 1;
-						display: flex;
-						flex-direction: column;
-						align-items: center;
+					margin-top: 30px;
+					width: 100%;
+					height: 60px;
+					white-space: nowrap;
+					// display: flex;
+					// display: inline-block;
+					
+					.item {
+						// width: 100px;
+						// flex: 1;
+						display: inline-block;
+						margin-right: 16px;
+						// display: flex;
+						// flex-direction: column;
+						// align-items: center;
+						
+						.item-flex {
+							display: flex;
+							flex-direction: column;
+							align-items: center;
+						}
 
 						image {
 							width: 24px;