zc

pages/views/pupilPage/pupilHome.vue

@@ -32,37 +32,47 @@
 			</view> -->
 		</view>
 		<view class="button-two-box">
-			<view class="button-big-box" @click="goPage('snapshotPupil')"
-				style="background-color: #DFF0FF;margin-right:20rpx;">
-				<img :src="imagesUrl('home/icon_sy_ssp@1x.png')">
+			<view class="button-big-box" @click="goPage('facilityReservationPupil')" 
+				style="background-color: #D6EBDA;margin-right:20rpx;">
+				<img :src="imagesUrl('home/icon_sy_ssyy@1x.png')">
 				<view class="button-min-box">
-					<view>随手拍</view>
-					<view>隐患上报</view>
+					<view>设施预约</view>
+					<view>实验室资源预约</view>
 				</view>
 			</view>
-			<view class="button-big-box" @click="goPage('leaveCheckPupil')" style="background-color: #D6EBDA;">
-				<img :src="imagesUrl('home/home_button_01.png')">
+			<view class="button-big-box" @click="goPage('cageSiteSubscribePupil')" 
+			style="background-color: rgba(201,159,255,0.2);">
+				<img :src="imagesUrl('home/home_button_03.png')">
 				<view class="button-min-box">
-					<view>离开检查</view>
-					<view>拍照上传</view>
+					<view>笼位预约</view>
+					<view>动物实验中心</view>
 				</view>
 			</view>
 		</view>
 		<view class="button-two-box">
+			<view class="button-big-box" @click="goPage('snapshotPupil')"
+				style="background-color: #DFF0FF;margin-right:20rpx;">
+				<img :src="imagesUrl('home/icon_sy_ssp@1x.png')">
+				<view class="button-min-box">
+					<view>随手拍</view>
+					<view>隐患上报</view>
+				</view>
+			</view>
 			<view class="button-big-box" @click="goPage('violationRecordPupil')"
-				style="background-color: #FFF0DD;margin-right:20rpx;">
+				style="background-color: #FFF0DD;">
 				<img :src="imagesUrl('home/home_button_02.png')">
 				<view class="button-min-box">
 					<view>违规记录</view>
 					<view>安全违规行为</view>
 				</view>
 			</view>
-			<view class="button-big-box" @click="goPage('cageSiteSubscribePupil')" 
-			style="background-color: #ced4f8;">
-				<img :src="imagesUrl('home/home_button_03.png')">
+		</view>
+		<view class="button-three-box">
+			<view class="button-big-box button-big-box-1" @click="goPage('leaveCheckPupil')">
+				<img :src="imagesUrl('home/img_lkjc@1_1x.png')">
 				<view class="button-min-box">
-					<view>笼位预约</view>
-					<view>动物实验中心</view>
+					<view>离开检查</view>
+					<view>拍照上传</view>
 				</view>
 			</view>
 		</view>
@@ -175,6 +185,11 @@
 					uni.navigateTo({
 						url: "/pages_student/views/meViolation/meViolation",
 					});
+				} else if (type == 'facilityReservationPupil'){
+					//设施预约
+					uni.navigateTo({
+						url: "/pages_basics/views/deviceCageSitePage?pageType=5",
+					});
 				}
 			},
 			/* 扫一扫*/
@@ -358,7 +373,7 @@
 
 				img {
 					display: block;
-					margin: 20rpx 31rpx 0 36rpx;
+					margin: 20rpx 25rpx 0 25rpx;
 					height: 80rpx;
 					width: 80rpx;
 				}
@@ -367,7 +382,7 @@
 					view:nth-child(1) {
 						line-height: 32rpx;
 						height: 32rpx;
-						font-size: 32rpx;
+						font-size: 30rpx;
 						color: #333;
 						margin: 20rpx 0 18rpx;
 					}
@@ -375,7 +390,7 @@
 					view:nth-child(2) {
 						line-height: 28rpx;
 						height: 28rpx;
-						font-size: 28rpx;
+						font-size: 26rpx;
 						color: #999;
 					}
 				}
@@ -387,10 +402,20 @@
 			width: 690rpx;
 			height: 150rpx;
 			margin: 20rpx 30rpx 0;
-
+			.button-big-box-1{
+				background: #CDE7FF;
+				.button-min-box{
+					view:nth-child(1){
+						color: #0183FA;
+					}
+					view:nth-child(2){
+						color: #666666;
+					}
+				}
+			}
 			.button-big-box {
+				height:130rpx;
 				border-radius: 20rpx;
-				background-color: #FFF0DD;
 				display: flex;
 
 				img {
@@ -405,15 +430,13 @@
 						line-height: 30rpx;
 						height: 30rpx;
 						font-size: 30rpx;
-						color: #FF8C00;
-						margin: 27rpx 0 15rpx;
+						margin: 30rpx 0 15rpx;
 					}
 
 					view:nth-child(2) {
 						line-height: 26rpx;
 						height: 26rpx;
 						font-size: 26rpx;
-						color: #666666;
 					}
 				}
 			}

pages/views/teacherPage/teacherHome.vue

@@ -70,7 +70,7 @@
 					</view>
 				</view>
 				<view class="button-big-box" @click="goPage('cageSiteManagement')" 
-					style="background-color: #ced4f8;">
+					style="background-color: rgba(201,159,255,0.2);">
 					<img :src="imagesUrl('home/home_button_03.png')">
 					<view class="button-min-box">
 						<view>笼位管理</view>
@@ -78,6 +78,15 @@
 					</view>
 				</view>
 			</view>
+			<view class="button-three-box">
+				<view class="button-big-box button-big-box-1" @click="goPage('facilityReservation')">
+					<img :src="imagesUrl('home/img_ssyy@1x.png')">
+					<view class="button-min-box">
+						<view>设施预约</view>
+						<view>预约审批 | 设施确认 | 费用结算</view>
+					</view>
+				</view>
+			</view>
 			<!-- <view class="button-three-box-1">
 				<view class="button-big-box" @click="goPage('leaveCheckPupilTeacher')">
 					<img :src="imagesUrl('home/img_lkjc@1x.png')">
@@ -279,6 +288,11 @@
 				} else if (type == 'chemicalsManagement') {
 					//化学品管控
 
+				} else if (type == 'facilityReservation'){
+					//设施预约
+					uni.navigateTo({
+						url: "/pages_basics/views/deviceCageSitePage?pageType=5",
+					});
 				}
 			}, 
 			/* 扫一扫*/
@@ -474,7 +488,7 @@
 
 					img {
 						display: block;
-						margin: 20rpx 31rpx 0 36rpx;
+						margin: 20rpx 25rpx 0 25rpx;
 						height: 80rpx;
 						width: 80rpx;
 					}
@@ -483,7 +497,7 @@
 						view:nth-child(1) {
 							line-height: 32rpx;
 							height: 32rpx;
-							font-size: 32rpx;
+							font-size: 30rpx;
 							color: #333;
 							margin: 20rpx 0 18rpx;
 						}
@@ -491,7 +505,7 @@
 						view:nth-child(2) {
 							line-height: 28rpx;
 							height: 28rpx;
-							font-size: 28rpx;
+							font-size: 26rpx;
 							color: #999;
 						}
 					}
@@ -540,10 +554,20 @@
 				width: 690rpx;
 				height: 130rpx;
 				margin: 20rpx 30rpx 0;
-
+				.button-big-box-1{
+					background: #CDE7FF;
+					.button-min-box{
+						view:nth-child(1){
+							color: #0183FA;
+						}
+						view:nth-child(2){
+							color: #666666;
+						}
+					}
+				}
 				.button-big-box {
+					height:130rpx;
 					border-radius: 20rpx;
-					background-color: #FFF0DD;
 					display: flex;
 
 					img {
@@ -558,15 +582,13 @@
 							line-height: 30rpx;
 							height: 30rpx;
 							font-size: 30rpx;
-							color: #FF8C00;
-							margin: 27rpx 0 15rpx;
+							margin: 30rpx 0 15rpx;
 						}
 
 						view:nth-child(2) {
 							line-height: 26rpx;
 							height: 26rpx;
 							font-size: 26rpx;
-							color: #666666;
 						}
 					}
 				}

pages_basics/api/index.js

@@ -139,6 +139,14 @@ export const systemMineLinkGetEducationExamDetail = (data) => {
 		data: { ...data }
 	})
 };
+//设施预约
+export const systemMineLinkGetExamH5 = (data) => {
+	return apiResquest({
+		url: `/system/mine/link/getExamH5`,
+		method: 'get',
+		data: { ...data }
+	})
+};
 //设备资产管理/笼位管理获取跳转参数
 export const menuLinkPost  = (url,data) => {
     return apiResquestOutside({

pages_basics/views/deviceCageSitePage.vue

@@ -9,6 +9,8 @@
 		<web-view v-if="pageType==3&&openType" :src="'https://labcontrol.nwafu.edu.cn/studay/wx/#/zjznaiLogin?access_token='+access_token"></web-view>
 		<!-- 安全责任 -->
 		<web-view v-if="pageType==4&&openType" :src="'https://labcontrol.nwafu.edu.cn/duty/app/#/?userId='+userId"></web-view>
+		<!-- 设施预约 -->
+		<web-view v-if="pageType==5&&openType" :src="'https://labcontrol.nwafu.edu.cn/reserve/app/#/pages/login?token='+token"></web-view>
 		</view>
 </template>
 
@@ -20,6 +22,7 @@
 		systemMineLinkGetEquipmentDetail,
 		systemMineLinkGetCagePositionDetail,
 		systemMineLinkGetEducationExamDetail,
+		systemMineLinkGetExamH5,
 		systemMineLinkGetSafetyDetail,
 		menuLinkPost,
 	} from '@/pages_basics/api/index.js'
@@ -32,6 +35,7 @@
 				userId: '',
 				ticket: '',
 				access_token:'',
+				token:'',
 				openType:false,
 			}
 		},
@@ -55,10 +59,20 @@
 				this.userId=uni.getStorageSync('userId');
 				this.$set(this,'openType',true);
 				// this.systemMineLinkGetSafetyDetail();
+			}else if(this.pageType==5){
+				//设施预约
+				// let item = {
+				// 	reqApi:'labcontrol.nwafu.edu.cn/reserve/api/user/labLogin',
+				// };
+				// let obj = {
+				// 	appId:'1962714012644597761',
+				// 	secret:'c2789f8a360a4709a054a2e9f102d1b4',
+				// 	timeStamp:Date.parse(new Date()),
+				// 	userId:uni.getStorageSync('userId'),
+				// };
+				// this.menuLinkPost(item,obj);
+				this.systemMineLinkGetExamH5();
 			}
-			
-
-
 		},
 
 		methods: {
@@ -89,6 +103,15 @@
 					this.getParams(data.data)
 				}
 			},
+			//设施预约
+			async systemMineLinkGetExamH5() {
+				const {
+					data
+				} = await systemMineLinkGetExamH5();
+				if (data.code == 200) {
+					this.getParams(data.data)
+				}
+			},
 			getParams(item) {
 				let params = JSON.parse(item.params)
 				let obj = {};
@@ -121,8 +144,10 @@
 						if(response.data.code==200){
 							self.$set(self,'ticket',response.data.data.ticket);
 						}
-					}if(self.pageType==3){
+					}else if(self.pageType==3){
 						self.$set(self,'access_token',response.data.data.access_token);
+					}else if(self.pageType==5){
+						self.$set(self,'token',response.data.data.access_token);
 					}
 					self.$set(self,'openType',true);
 				})