From cce48e5297e20622c4c01da63ebe68c38f3c6d41 Mon Sep 17 00:00:00 2001
From: linfeng <2445465217@qq.com>
Date: Wed, 10 Apr 2024 15:59:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=9C=BA=E9=A1=B5=E9=9D=A2=E8=B7=B3?=
 =?UTF-8?q?=E8=BD=AC=E6=8E=A5=E5=8F=A3=E5=9B=9E=E6=98=BE=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/AppUserInfoController.java |  2 +-
 .../pages/login/login.vue                     |  1 +
 .../pages/login/weixin.vue                    |  1 +
 .../pages/square/square.vue                   | 25 ++++++++++++++++++-
 4 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/linfeng/modules/app/controller/AppUserInfoController.java b/src/main/java/io/linfeng/modules/app/controller/AppUserInfoController.java
index 9e0a44e..b8a5b1f 100644
--- a/src/main/java/io/linfeng/modules/app/controller/AppUserInfoController.java
+++ b/src/main/java/io/linfeng/modules/app/controller/AppUserInfoController.java
@@ -177,7 +177,7 @@ public class AppUserInfoController {
     }
 
 
-    @Login
+
     @PostMapping("/userRank")
     @ApiOperation("发帖达人列表")
     public R userRank() {
diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/login/login.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/login/login.vue
index 8c84c7b..2106637 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/login/login.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/login/login.vue
@@ -40,6 +40,7 @@
 					if (res.code == 0) {
 						uni.setStorageSync("hasLogin", true);
 						uni.setStorageSync("token", res.token);
+						uni.setStorageSync("linfeng", "lf");
 						uni.switchTab({
 							url: '/pages/index/index'
 						});
diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/login/weixin.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/login/weixin.vue
index 831e156..106d8f3 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/login/weixin.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/login/weixin.vue
@@ -49,6 +49,7 @@
 					if (res.code === 0) {
 						uni.setStorageSync("hasLogin", true);
 						uni.setStorageSync("token", res.token);
+						uni.setStorageSync("linfeng", "lf");
 						that.getUserInfo();
 						uni.switchTab({
 							url: '/pages/index/index'
diff --git a/src/main/resources/static/linfeng-community-uniapp-ky/pages/square/square.vue b/src/main/resources/static/linfeng-community-uniapp-ky/pages/square/square.vue
index 638edeb..f30b8a4 100644
--- a/src/main/resources/static/linfeng-community-uniapp-ky/pages/square/square.vue
+++ b/src/main/resources/static/linfeng-community-uniapp-ky/pages/square/square.vue
@@ -81,7 +81,16 @@
 			this.getBannerList();
 			this.getClassList();
 			this.getUserRanking();
-			this.getPostList();
+			if (uni.getStorageSync("hasLogin")) {
+				this.getPostList();
+			} else {
+				this.goLogin()
+			}
+		},
+		onShow() {
+			if (uni.getStorageSync("linfeng")) {
+				this.getPostList();
+			}
 		},
 		onReachBottom() {
 			if (this.pageCurrent == 0) {
@@ -121,6 +130,19 @@
 					url: '/pages/post/add'
 				})
 			},
+			goLogin() {
+				// #ifdef MP-WEIXIN
+				uni.navigateTo({
+					url: "/pages/login/weixin"
+				})
+				// #endif
+
+				// #ifdef H5
+				uni.navigateTo({
+					url: "/pages/login/login"
+				})
+				// #endif
+			},
 			pageTabChange(index) {
 				this.pageCurrent = index
 			},
@@ -145,6 +167,7 @@
 			},
 			// 根据分页和分类展示帖子列表
 			getPostList() {
+				uni.removeStorageSync("linfeng");
 				this.loadPostStatus = 'loading';
 				this.$H
 					.post('post/list', {