wangguoyu 1 month ago
parent
commit
317bc96df4
5 changed files with 56 additions and 13 deletions
  1. 9 3
      App.vue
  2. 1 3
      pages/chanpinXuanze/banben.vue
  3. 2 2
      pages/chanpinneirong/index.vue
  4. 30 0
      pages/index/index.vue
  5. 14 5
      pages/login/login.vue

+ 9 - 3
App.vue

@@ -27,15 +27,21 @@
 							if (cacheManager.get('xuexi-shuxue')) {
 							if (cacheManager.get('xuexi-shuxue')) {
 								cacheManager.remove("xuexi-shuxue")
 								cacheManager.remove("xuexi-shuxue")
 							}
 							}
-							uni.reLaunch({
-								url: `/pages/chanpinneirong/index?banbenId=${res.data.banbenId}&danyuanId=${res.data.danyuanId}&chanpinId=${res.data.chanpinId}&dengjiId=${res.data.dengjiId}&customType=1`,
+							cacheManager.updateObject("auth",{
+								banbenId:res.data.banbenId,
+								chanpinId:res.data.chanpinId,
+								danyuanId:res.data.danyuanId,
+								dengjiId:res.data.dengjiId,
+							})
+							uni.switchTab({
+								url: `/pages/chanpinneirong/index`,
 								success() {
 								success() {
 									plus.navigator.closeSplashscreen();
 									plus.navigator.closeSplashscreen();
 								}
 								}
 							})
 							})
 						} else {
 						} else {
 							// 没学过
 							// 没学过
-							uni.reLaunch({
+							uni.switchTab({
 								url: `/pages/chanpinXuanze/index`,
 								url: `/pages/chanpinXuanze/index`,
 								success() {
 								success() {
 									plus.navigator.closeSplashscreen();
 									plus.navigator.closeSplashscreen();

+ 1 - 3
pages/chanpinXuanze/banben.vue

@@ -49,7 +49,7 @@
 	}
 	}
 
 
 	function handleBack() {
 	function handleBack() {
-		uni.redirectTo({
+		uni.switchTab({
 		  url: `/pages/chanpinXuanze/index`
 		  url: `/pages/chanpinXuanze/index`
 		})
 		})
 	}
 	}
@@ -71,8 +71,6 @@
 	uni.switchTab({
 	uni.switchTab({
 		url: "/pages/chanpinneirong/index"
 		url: "/pages/chanpinneirong/index"
 	})
 	})
-
-
   }
   }
 
 
 	onLoad((options) => {
 	onLoad((options) => {

+ 2 - 2
pages/chanpinneirong/index.vue

@@ -110,7 +110,6 @@
 			danyuanInfoVue
 			danyuanInfoVue
 		},
 		},
 		onShow() {
 		onShow() {
-			uni.$emit('pageShown');
 			console.log('学习页面显示,使用缓存数据')
 			console.log('学习页面显示,使用缓存数据')
 			console.log('this.needRefresh',this.needRefresh)
 			console.log('this.needRefresh',this.needRefresh)
 			console.log('this.hasCache',this.hasCache)
 			console.log('this.hasCache',this.hasCache)
@@ -143,7 +142,8 @@
 				// 没有缓存或参数不同,重新请求
 				// 没有缓存或参数不同,重新请求
 				console.log('重新请求数据');
 				console.log('重新请求数据');
 				this.hasCache = false;
 				this.hasCache = false;
-				this.initFromOptions(options);
+					const cacheDataAuth = cacheManager.get('auth');
+				this.initFromOptions(cacheDataAuth);
 				this.loadDataFromApi();
 				this.loadDataFromApi();
 			}
 			}
 		},
 		},

+ 30 - 0
pages/index/index.vue

@@ -0,0 +1,30 @@
+<template>
+	<view>
+	
+	</view>
+</template>
+
+<script>
+		import cacheManager from "@/utils/cacheManager.js";
+	export default {
+		onLoad() {
+			// 检查登录状态
+			const token = cacheManager.get('auth');
+			const isLoggedIn = !!token;
+			
+			if (isLoggedIn) {
+				console.log('已登录,跳转到主tab页面');	
+				// 已登录,跳转到主tab页面
+				uni.switchTab({
+					url: '/pages/chanpinXuanze/index'
+				});
+			} else {
+				// 未登录,跳转到登录页
+					console.log('未登录,跳转到登录页');	
+				uni.redirectTo({
+					url: '/pages/login/index'
+				});
+			}
+		}
+	}
+</script>

+ 14 - 5
pages/login/login.vue

@@ -59,7 +59,8 @@
 				},
 				},
 				banbenId: '',
 				banbenId: '',
 				chanpinId: '',
 				chanpinId: '',
-				danyuanId:''
+				danyuanId:'',
+				dengjiId:''
 
 
 			}
 			}
 		},
 		},
@@ -123,13 +124,21 @@
 						cacheManager.set('auth', res.data)
 						cacheManager.set('auth', res.data)
 						setTimeout(() => {
 						setTimeout(() => {
 							banbenImpinfo({}).then(res => {
 							banbenImpinfo({}).then(res => {
-								if (res.code == 0) {
+								if (res.code == 0) {
+									console.log('banbenImpinfores',res);
 									this.banbenId = res.data.banbenId
 									this.banbenId = res.data.banbenId
 									this.chanpinId = res.data.chanpinId
 									this.chanpinId = res.data.chanpinId
 									this.danyuanId = res.data.danyuanId
 									this.danyuanId = res.data.danyuanId
+									this.dengjiId = res.data.dengjiId
+									cacheManager.updateObject("auth",{
+										banbenId:res.data.banbenId,
+										chanpinId:res.data.chanpinId,
+										danyuanId:res.data.danyuanId,
+										dengjiId:res.data.dengjiId,
+									})
 									if(this.chanpinId ==0){
 									if(this.chanpinId ==0){
 										// 没学过
 										// 没学过
-										uni.redirectTo({
+										uni.switchTab({
 											url: `/pages/chanpinXuanze/index`
 											url: `/pages/chanpinXuanze/index`
 										})
 										})
 									}else{
 									}else{
@@ -137,8 +146,8 @@
 											cacheManager.remove("xuexi-shuxue")
 											cacheManager.remove("xuexi-shuxue")
 										}
 										}
 										// 学过直接到学习页面
 										// 学过直接到学习页面
-										uni.redirectTo({
-											url: `/pages/chanpinneirong/index?banbenId=${res.data.banbenId}&danyuanId=${res.data.danyuanId}&chanpinId=${res.data.chanpinId}&dengjiId=${res.data.dengjiId}&customType=2`,
+										uni.switchTab({
+											url: `/pages/chanpinneirong/index`,
 										})
 										})
 									}
 									}
 								}
 								}