dedsudiyu 20 órája%!(EXTRA string=)
szülő
commit
847bf4db64

+ 1 - 1
pages/views/information/notPassInfo.vue

@@ -16,7 +16,7 @@
 			</view>
 		</view>
 		<view class="user-info-box">
-			<view class="user-info-box_title"><view style="color: red;">*</view>身份信息:(关联学生信息材料)</view>
+			<view class="user-info-box_title"><view style="color: red;">*</view>身份信息:</view>
 			<view class="user-info-box-min">
 				<view>申请人:</view>
 				<view>{{subjectData.sysUser.nickName}}</view>

+ 39 - 1
pages_manage/views/accessQualification/accessQualification.vue

@@ -36,7 +36,10 @@
 			</view>
 			<view class="get-null-box" v-if="getData.nullDataType">暂无更多数据</view>
 		</scroll-view>
-		<view class="tip">请联系管理员开通<text>白名单</text>来获取实验室准入资格</view>
+		<view class="bottom-button-max-box">
+			<view @click="goPage(1)">我的准入</view>
+			<view @click="goPage(2)">准入申请</view>
+		</view>
 	</view>
 </template>
 <script>
@@ -103,6 +106,18 @@
 				this.dataList = [];
 				this.queryParams.page = 1;
 			},
+			//去准入列表/申请
+			goPage(type){
+				if(type == 1){
+					uni.navigateTo({
+						url: '/pages_student/views/accessApplication/safeAccess'
+					})
+				}else if(type == 2){
+					uni.navigateTo({
+						url: '/pages_student/views/accessApplication/newApplication'
+					})
+				}
+			},
 			//去详情页
 			goPageInfo(item) {
 				uni.navigateTo({
@@ -424,5 +439,28 @@
 				color: red;
 			}
 		}
+		.bottom-button-max-box{
+			padding-top: 30rpx;
+			display: flex;
+			view{
+				text-align: center;
+				line-height:80rpx;
+			}
+			view:nth-child(1){
+				width:220rpx;
+				margin:0 40rpx 40rpx 80rpx;
+				border:1rpx solid #0183fa;
+				color:#0183fa;
+				border-radius:10rpx;
+			}
+			view:nth-child(2){
+				flex:1;
+				margin:0 80rpx 40rpx 0;
+				border:1rpx solid #0183fa;
+				background-color: #0183fa;
+				color:#fff;
+				border-radius:16rpx;
+			}
+		}
 	}
 </style>

+ 1 - 1
pages_manage/views/accessQualification/accessQualificationInfo.vue

@@ -21,7 +21,7 @@
 		</view>
 		<view class="user-info-box" style="margin-bottom:20rpx;">
 			<view class="user-info-box_title">
-				<view style="color: red;">*</view>身份信息:(关联学生信息材料)
+				<view style="color: red;">*</view>身份信息:
 			</view>
 			<view class="user-info-box-min">
 				<view>申请人:</view>

+ 1 - 1
pages_student/views/accessApplication/applicationDetails.vue

@@ -18,7 +18,7 @@
 		</view>
 		<view class="user-info-box">
 			<view class="user-info-box_title">
-				<view style="color: red;">*</view>身份信息:(关联学生信息材料)
+				<view style="color: red;">*</view>身份信息:
 			</view>
 			<view class="user-info-box-min">
 				<view>申请人:</view>

A különbségek nem kerülnek megjelenítésre, a fájl túl nagy
+ 127 - 54
pages_student/views/accessApplication/newApplication.vue


+ 2 - 1
pages_student/views/accessApplication/safeAccess.vue

@@ -21,7 +21,7 @@
 			<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>
+		<view class="bottom-button-box" @click="goChooseALaboratory" v-if="userType == 2">准入申请</view>
 	</view>
 </template>
 
@@ -42,6 +42,7 @@
 				},
 				total: 0,
 				dataList: [],
+				userType:uni.getStorageSync('userType'),
 			}
 		},
 		onLoad() {