api/request/config.js

@@ -30,6 +30,7 @@ const config = {
 	/************************************ 图片服务地址 ************************************/
 	//(imagesUrl.styl 文件内还需要配置一次css相关地址注意是否与imagesUrl.styl一致)
 	imagesUrl: 'https://zj-wechat.oss-cn-beijing.aliyuncs.com/xcx_images/xcx_v3/',
+	VERSION_DIFFERENCE_FIELD : 'xiBeiNongLinDaXue',
 	/************************************ 扫一扫 ************************************/
 	//1.MSDS说明书			2.安全制度			3.危险源详情 地址配置 
 	saoCodeTypeUrl: 'https://labcontrol.nwafu.edu.cn/#/codeHtml?',

main.js

@@ -7,6 +7,10 @@ Vue.config.productionTip = false
 Vue.prototype.imagesUrl = function(imgUrl){
 	return config.imagesUrl + imgUrl
 }
+/****** 全局版本字符返回 ******/
+Vue.prototype.versionField = function(imgUrl){
+  return config.VERSION_DIFFERENCE_FIELD
+}
 
 
 App.mpType = 'app'

pages_manage/views/accessQualification/accessQualificationInfo.vue

@@ -68,7 +68,7 @@
 			</view>
 		</view>
 		<view class="bottom-button-box" v-if="newData.labSecurityApply.auditStatus == 0">
-			<view @click="goReviewFailed">审核未通过</view>
+			<view @click="goReviewFailed">驳回</view>
 			<view @click="accessButtonClick">审核通过</view>
 		</view>
 	</view>

pages_student/views/accessApplication/newApplication.vue

@@ -57,12 +57,12 @@
 					<view>学号：</view>
 					<input v-model="sysUser.account" type="text" placeholder="学号">
 				</view>
-				<!-- <view class="user-info-box-min">
+				<view class="user-info-box-min" v-if="versionField() != 'xiBeiNongLinDaXue'">
 					<view>*</view>
 					<view>物理卡号：</view>
 					<input v-model="sysUser.cardNumSimple" type="text" placeholder="物理卡号">
-				</view> -->
-				<view class="user-info-box-min">
+				</view>
+				<view class="user-info-box-min" v-if="versionField() != 'xiBeiNongLinDaXue'">
 					<view>*</view>
 					<view>班级：</view>
 					<input v-model="sysUser.gradeName" type="text" placeholder="班级">
@@ -116,14 +116,18 @@
 		<!-- 实验室选择页面 -->
 		<view class="pageTwo" v-if="pageType == 2">
 			<view class="pageTwo-input-box">
-				<input type="text" placeholder="请输入实验室名称" v-model="subjectName">
+				<input type="text" placeholder="请输入实验室名称/房间号" v-model="subjectName">
 				<view @click="subjectList">查找</view>
 			</view>
 			<view class="for-max-box">
 				<view class="for-null-text" v-if="!searchList[0]">{{nullText}}</view>
 				<view class="for-box" v-for="(item,index) in searchList" :key="index">
-					<view>{{item.subName}}</view>
-					<view @click="checkClick(item)">选择</view>
+					<view class="button-text-view">{{item.subName}}{{item.roomNum?'('+item.roomNum+')':''}}</view>
+					<view class="button-big-view">
+						<view class="button-null-view"></view>
+						<view class="button-view" @click="checkClick(item)">选择</view>
+						<view class="button-null-view"></view>
+					</view>
 				</view>
 			</view>
 			<view class="out-button" @click="inputClick(1)">返回</view>
@@ -708,10 +712,19 @@
 			},
 			//查询实验室
 			async subjectList() {
+				if(!this.subjectName){
+					uni.showToast({
+						title: '请输入实验室名称/房间号',
+						icon: "none",
+						mask: true,
+						duration: 2000
+					});
+					return
+				}
 				const {
 					data
 				} = await systemMineGetListByPower({
-					subName: this.subjectName
+					searchValue: this.subjectName
 				})
 				if (data.code == 200) {
 					this.searchList = data.data;
@@ -739,10 +752,11 @@
 
 <style lang="stylus" scoped>
 	#newApplication {
-		height: auto;
+		height:100%;
 		width: 100%;
 		display flex;
 		flex-direction column;
+		overflow: hidden;
 
 		.user-info-box {
 			background #fff;
@@ -820,10 +834,12 @@
 		}
 
 		.newApplication-page {
+			flex:1;
 			background #fff;
 			margin: 20rpx 20rpx 160rpx;
 			padding-bottom: 20rpx;
 			border-radius: 20rpx;
+			overflow-y: scroll;
 
 			.picker-max-box {
 
@@ -1067,26 +1083,30 @@
 				}
 
 				.for-box {
-					width: 710rpx;
 					border-top: 1rpx solid #dedede;
-					line-height: 60rpx;
-					height: 60rpx;
-					padding: 20rpx;
 					display: flex;
-					overflow: hidden;
-					text-overflow: ellipsis;
-					white-space: nowrap;
 
-					view:nth-child(1) {
-						flex: 1;
+					.button-text-view {
+						padding: 35rpx 35rpx 35rpx 20rpx;
+						width:560rpx;
 					}
 
-					view:nth-child(2) {
+					.button-big-view {
+						padding: 20rpx 0 20rpx 0 ;
 						width: 100rpx;
-						text-align center;
-						border-radius: 10rpx;
-						background #007AFF;
-						color: #fff;
+						display: flex;
+						flex-direction: column;
+						.button-null-view{
+							flex:1;
+						}
+						.button-view{
+							line-height:60rpx;
+							width: 100rpx;
+							text-align center;
+							border-radius: 10rpx;
+							background #007AFF;
+							color: #fff;
+						}
 					}
 				}
 			}

pages_student/views/accessApplication/safeAccess.vue

@@ -17,6 +17,8 @@
 					</view>
 				</view>
 			</view>
+			<img v-if="!dataList[0]" :src="imagesUrl('commonality/chemicalsInfoNull.png')" style="width:300rpx;height:300rpx;margin:200rpx auto 0rpx;display: block;">
+			<view v-if="!dataList[0]" class="get-null-box">暂无数据</view>
 			<view class="get-null-box" v-if="getData.nullDataType">暂无更多数据</view>
 		</scroll-view>
 		<view class="bottom-button-box" @click="goChooseALaboratory">准入申请</view>

utils/index.js

@@ -47,7 +47,4 @@ export function itoOrVideoLimits(subAdminId) {
   }else{
     return false
   }
-
-
-
 }