Merge branch 'VERSIONS-yinHuanQingDan2' into SCHOOL-XiBeiNongLin

pages_manage/views/accessQualification/accessQualificationInfo.vue

@@ -121,7 +121,7 @@
 			}
 		},
 		onShow() {
-
+			
 		},
 		methods: {
 			//审核按钮
@@ -154,9 +154,24 @@
 						mask: true,
 						duration: 2000
 					});
-					setTimeout(function() {
-						uni.navigateBack();
-					}, 2000);
+					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){
+						setTimeout(function() {
+							uni.navigateBack();
+						}, 2000);
+					}else{
+						setTimeout(function() {
+							uni.reLaunch({
+								url: '/pages/views/home/home',
+							});
+						}, 2000);
+					}
 				}
 
 			},

pages_manage/views/accessQualification/approve.vue

@@ -83,11 +83,26 @@
 						mask: true,
 						duration: 2000
 					});
-					setTimeout(function() {
-						uni.navigateBack({
-							delta: 2
-						});
-					}, 2000);
+					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){
+						setTimeout(function() {
+							uni.navigateBack({
+								delta: 2
+							});
+						}, 2000);
+					}else{
+						setTimeout(function() {
+							uni.reLaunch({
+								url: '/pages/views/home/home',
+							});
+						}, 2000);
+					}
 				}
 
 			},