Browse Source

bug 修复

lilei 2 years ago
parent
commit
c8007252bc
2 changed files with 16 additions and 15 deletions
  1. 12 1
      pages/login/login.vue
  2. 4 14
      pages/storeManage/editAdminAuth.vue

+ 12 - 1
pages/login/login.vue

@@ -63,12 +63,23 @@
 			const {
 				path,
 				lanuch,
-				q
+				q,
+				showModal
 			} = option;
 			this.lanuch = (lanuch + '') === 'true';
 			if (path) {
 				this.path = decodeURIComponent(path+"?q="+q);
 			}
+			if(showModal==1){
+				uni.showModal({
+					title: '提示',
+					content: '岗位设置成功,需要重新登录!',
+					showCancel: false,
+					confirmText: '好的',
+					success: (ret) => {
+					}
+				})
+			}
 		},
         methods: {
 			...mapMutations(['login']),

+ 4 - 14
pages/storeManage/editAdminAuth.vue

@@ -148,20 +148,10 @@
 				})
 			},
 			quitOut(){
-				let _this = this
-				uni.showModal({
-					title: '提示',
-					content: '设置成功,需要重新登录!',
-					showCancel: false,
-					success: (ret) => {
-					  if(ret.confirm){
-						  _this.$store.dispatch('userLogout');
-						  uni.redirectTo({
-						  	 url: '/pages/login/login'
-						  });
-					  }
-					}
-				})
+				this.$store.dispatch('userLogout');
+				uni.redirectTo({
+					 url: '/pages/login/login?showModal=1'
+				});
 			}
 		}
 	}