auto commit

pages/index/index.vue

@@ -237,15 +237,30 @@
 			uni.getStorage({
 				key:'beforeLoginPage',
 				success: (res) => {
-					console.log('beforeLoginPage',res.data)
-					uni.navigateTo({
-					    url: res.data,
-						success: () => {
-							uni.removeStorage({
-								key:'beforeLoginPage'
-							})
-						}
-					});
+					console.log('beforeLoginPage',res.data);
+					let switchTabList = ['/pages/use/use'];
+					// switchTabList.some(res.data);
+					// console.log('switchTabList.some(res.data)',switchTabList.includes(res.data));
+					if(switchTabList.includes(res.data)){
+						uni.switchTab({
+						    url: res.data,
+							success: () => {
+								uni.removeStorage({
+									key:'beforeLoginPage'
+								})
+							}
+						});
+					}else{
+						uni.navigateTo({
+						    url: res.data,
+							success: () => {
+								uni.removeStorage({
+									key:'beforeLoginPage'
+								})
+							}
+						});
+					}
+					
 				}
 			});
 			//产品跳转

pages/login/loginType.vue

@@ -62,11 +62,10 @@
 			if(prevPage.route!='pages/product/product'){
 				uni.setStorage({
 					key:'beforeLoginPage',
-					data:'/'+prevPage.route
+					data:prevPage.$page.fullPath
 				});
-				// console.log('prevPage',prevPage.route);
 			}
-			
+			// console.log('prevPage',prevPage.$page.fullPath);
 		},
 		onLoad(options) {
 			let self = this;

pages/use/use.vue

@@ -97,20 +97,20 @@ export default {
 	},
 	methods: {
 		lvyue() {
-			this.$api.msg('你没有权限使用该功能!');
+			this.checkReject();
 		},
 		zhonghe() {
-			this.$api.msg('你没有权限使用该功能!');
+			this.checkReject();
 		},
 		huodong() {
-			this.$api.msg('你没有权限使用该功能!');
+			this.checkReject();
 		},
 		useClick() {
 			this.$api.href('/pages/usercenter/question/question');
 			// this.$api.msg('稍后展示')
 		},
 		shangcheng(){
-			this.$api.msg('你没有权限使用该功能!');
+			this.checkReject();
 		},
 		tabChange(index) {
 			console.log(index);
@@ -131,6 +131,22 @@ export default {
 				default:
 					return;
 			}
+		},
+		checkReject(){
+			if(!this.$store.state.hasLogin){
+				this.$api.msg('请先登录');
+				setTimeout(i=>{
+					uni.navigateTo({
+						url: '/pages/login/loginType',
+						fail:function(err){
+							console.log(err)
+						}
+					});
+				},2000);
+				return;
+			}else{
+				this.$api.msg('你没有权限使用该功能!');
+			};
 		}
 	}
 };