Merge branch 'VERSIONS-yinHuanQingDan2' into SCHOOL-XiBeiNongLin

pages_manage/views/accessQualification/accessQualificationInfo.vue

@@ -168,7 +168,7 @@
 					}else{
 						setTimeout(function() {
 							uni.reLaunch({
-								url: '/pages/views/home/home',
+								url: '/pages_manage/views/accessQualification/accessQualification',
 							});
 						}, 2000);
 					}
@@ -270,6 +270,31 @@
 				})
 				if (data.code == 200) {
 					let self = this;
+					
+					//判断链接跳转逻辑
+					let homeType = false;
+					let list = getCurrentPages();
+					for(let i=0;i<list.length;i++){
+						if(list[i].route.indexOf('home') != -1){
+							homeType = true;
+						}
+					}
+					if(!homeType){
+						if(data.data.labSecurityApply.auditStatus != 0){
+							uni.showToast({
+								title: '该申请已审核!',
+								icon: "none",
+								mask: true,
+								duration: 2000
+							});
+							setTimeout(function() {
+								uni.reLaunch({
+									url: '/pages_manage/views/accessQualification/accessQualification',
+								});
+							}, 2000);
+							return
+						}
+					}
 					let dataList = [];
 					for (let i = 0; i < data.data.listTemp.length; i++) {
 						if (data.data.listTemp[i].materialType == 2 && data.data.listTemp[i].materialType == 2) {

pages_manage/views/accessQualification/approve.vue

@@ -99,12 +99,11 @@
 					}else{
 						setTimeout(function() {
 							uni.reLaunch({
-								url: '/pages/views/home/home',
+								url: '/pages_manage/views/accessQualification/accessQualification',
 							});
 						}, 2000);
 					}
 				}
-
 			},
 			checkItem(item) {
 				item.type = !item.type;