Merge branch 'VERSIONS-yinHuanQingDan2' into SCHOOL-XiBeiNongLin

pages/views/login/accountLogin.vue

@@ -133,11 +133,19 @@
 									url: '/pages/views/saoCode/saoCode',
 								});
 							} else if (uni.getStorageSync('warningId')) {
-								uni.redirectTo({
+								uni.reLaunch({
 									url: '/pages_basics/views/earlyWarningManage/earlyWarningDetail',
 								});
+							} else if (uni.getStorageSync('manageCation')) {
+								uni.reLaunch({
+									url: '/pages_manage/views/accessQualification/accessQualificationInfo?item=' + uni.getStorageSync('manageCation')
+								})
+							} else if (uni.getStorageSync('studentCation')) {
+								uni.reLaunch({
+									url: '/pages_student/views/accessApplication/applicationDetails?item=' + uni.getStorageSync('studentCation')
+								})
 							} else {
-								uni.redirectTo({
+								uni.reLaunch({
 									url: '/pages/views/home/home',
 								});
 							}

pages/views/login/ssoCertification.vue

@@ -79,11 +79,19 @@
 								url: '/pages/views/saoCode/saoCode',
 							});
 						} else if (uni.getStorageSync('warningId')) {
-							uni.redirectTo({
+							uni.reLaunch({
 								url: '/pages_basics/views/earlyWarningManage/earlyWarningDetail',
 							});
+						} else if (uni.getStorageSync('manageCation')) {
+							uni.reLaunch({
+								url: '/pages_manage/views/accessQualification/accessQualificationInfo?item=' + uni.getStorageSync('manageCation')
+							})
+						} else if (uni.getStorageSync('studentCation')) {
+							uni.reLaunch({
+								url: '/pages_student/views/accessApplication/applicationDetails?item=' + uni.getStorageSync('studentCation')
+							})
 						} else {
-							uni.redirectTo({
+							uni.reLaunch({
 								url: '/pages/views/home/home',
 							});
 						}

pages_manage/views/accessQualification/accessQualificationInfo.vue

@@ -100,14 +100,25 @@
 			}
 		},
 		onLoad(option) {
-			this.infoData = JSON.parse(decodeURIComponent(option.item));
-			this.applyId = JSON.parse(decodeURIComponent(option.item)).applyId;
-			this.laboratoryAppletGetApplyDetails();
-			//修改页面title
-			uni.setNavigationBarTitle({
-				title: this.infoData.auditStatus == 0 ? '待审核' : (this.infoData.auditStatus == 1 ? '未通过' : (this
-					.infoData.auditStatus == 2 ? '已通过' : ''))
-			});
+			let self = this;
+			if (!uni.getStorageSync('token')) {
+				uni.setStorageSync('manageCation', option.item)
+				uni.redirectTo({
+					url: '/pages/views/login/login',
+				});
+			}else{
+				if(uni.getStorageSync('manageCation')){
+					uni.removeStorageSync('manageCation');
+				}
+				this.infoData = JSON.parse(decodeURIComponent(option.item));
+				this.applyId = JSON.parse(decodeURIComponent(option.item)).applyId;
+				this.laboratoryAppletGetApplyDetails();
+				//修改页面title
+				uni.setNavigationBarTitle({
+					title: this.infoData.auditStatus == 0 ? '待审核' : (this.infoData.auditStatus == 1 ? '未通过' : (this
+						.infoData.auditStatus == 2 ? '已通过' : ''))
+				});
+			}
 		},
 		onShow() {
 

pages_student/views/accessApplication/applicationDetails.vue

@@ -89,12 +89,23 @@
 			}
 		},
 		onLoad(option) {
-			this.infoData = JSON.parse(decodeURIComponent(option.item));
-			//修改页面title
-			uni.setNavigationBarTitle({
-				title: this.infoData.auditStatus == 0 ? '待审核' : (this.infoData.auditStatus == 1 ? '未通过' : (this
-					.infoData.auditStatus == 2 ? '已通过' : ''))
-			});
+			let self = this;
+			if (!uni.getStorageSync('token')) {
+				uni.setStorageSync('studentCation', option.item)
+				uni.redirectTo({
+					url: '/pages/views/login/login',
+				});
+			}else{
+				if(uni.getStorageSync('studentCation')){
+					uni.removeStorageSync('studentCation');
+				}
+				this.infoData = JSON.parse(decodeURIComponent(option.item));
+				//修改页面title
+				uni.setNavigationBarTitle({
+					title: this.infoData.auditStatus == 0 ? '待审核' : (this.infoData.auditStatus == 1 ? '未通过' : (this
+						.infoData.auditStatus == 2 ? '已通过' : ''))
+				});
+			}
 		},
 		onShow() {
 			this.getDetails();