From 7c565ff4adb710d09998d2d3849f66185e662a64 Mon Sep 17 00:00:00 2001
From: davy <davy@example.com>
Date: Sat, 5 Apr 2025 10:01:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8DmyAttention=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=EF=BC=9A1.=20=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E5=92=8C=E8=AE=A4=E8=AF=81=E7=8A=B6=E6=80=81?=
 =?UTF-8?q?=E7=9A=84=E6=A3=80=E6=9F=A5=E9=80=BB=E8=BE=91=202.=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=A0=B8=E4=B8=AD=E7=8A=B6=E6=80=81=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98=203.=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=A8=A1=E6=9D=BF=E7=BB=93=E6=9E=84=EF=BC=8C?=
 =?UTF-8?q?=E7=A1=AE=E4=BF=9D=E7=8A=B6=E6=80=81=E6=98=BE=E7=A4=BA=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pagesMy/myAttention.vue | 68 +++++++++++++++++++++++++++++------------
 1 file changed, 49 insertions(+), 19 deletions(-)

diff --git a/pagesMy/myAttention.vue b/pagesMy/myAttention.vue
index 7336efc..c197eba 100644
--- a/pagesMy/myAttention.vue
+++ b/pagesMy/myAttention.vue
@@ -17,12 +17,17 @@
 			</view>
 		</view>
 		<template v-else>
-			<view v-if="!isVerified" class="flex align-center justify-center" style="height: calc(100vh - 100rpx);">
+			<view v-if="!isVerified && !isVerifying" class="flex align-center justify-center" style="height: calc(100vh - 100rpx);">
 				<view class="flex flex-col align-center">
 					<text style="color: #747783;font-size: 28rpx;margin-bottom: 30rpx;">请先完成门店认证</text>
 					<button class="cu-btn" style="color: #FFFFFF; background-color: #4E63E0;" @click="toVerify">去认证</button>
 				</view>
 			</view>
+			<view v-else-if="isVerifying" class="flex align-center justify-center" style="height: calc(100vh - 100rpx);">
+				<view class="flex flex-col align-center">
+					<text style="color: #747783;font-size: 28rpx;margin-bottom: 30rpx;">您的门店正在认证中，请耐心等待</text>
+				</view>
+			</view>
 			<template v-else>
 				<view v-if="tabCur == 0" class="my-container">
 					<template v-if="favoriteBeerList.length > 0">
@@ -97,6 +102,7 @@
 			return {
 				isLogin: false,
 				isVerified: false,
+				isVerifying: false,
 				tabCur: 0,
 				favoriteBeerList: [], // 收藏的酒款列表
 				favoriteBreweryList: [], // 收藏的酒厂列表
@@ -130,15 +136,49 @@
 			checkLoginStatus() {
 				const token = uni.getStorageSync('token')
 				const userInfo = uni.getStorageSync('userInfo')
-				this.isLogin = !!token
-				this.isVerified = userInfo?.isVerified === 1
+				const barInfo = uni.getStorageSync('barInfo')
 				
-				if (this.isLogin && this.isVerified) {
+				// 重置状态
+				this.isLogin = false
+				this.isVerified = false
+				this.isVerifying = false
+				this.favoriteBeerList = []
+				this.favoriteBreweryList = []
+				this.beerQuery.pageNum = 1
+				this.breweryQuery.pageNum = 1
+				
+				// 检查登录状态
+				if (!token) {
+					return
+				}
+				
+				this.isLogin = true
+				
+				// 检查认证状态
+				if (barInfo) {
+					if (barInfo.authState === 2) {
+						// 已认证
+						this.isVerified = true
+						this.isVerifying = false
+					} else if (barInfo.authState === 1) {
+						// 认证中
+						this.isVerified = false
+						this.isVerifying = true
+					} else {
+						// 未认证
+						this.isVerified = false
+						this.isVerifying = false
+					}
+				} else {
+					// 兼容旧版本，使用userInfo中的isVerified
+					this.isVerified = userInfo?.isVerified === 1
+					this.isVerifying = false
+				}
+				
+				// 如果已登录且已认证或正在认证中，获取关注列表
+				if (this.isVerified || this.isVerifying) {
 					this.getFavoriteBeerList()
 					this.getFavoriteBreweryList()
-				} else {
-					this.favoriteBeerList = []
-					this.favoriteBreweryList = []
 				}
 			},
 			// 去登录
@@ -153,18 +193,8 @@
 			},
 			// 登录成功
 			loginSuccess() {
-				this.isLogin = true
-				const userInfo = uni.getStorageSync('userInfo')
-				this.isVerified = userInfo?.isVerified === 1
-				
-				if (this.isVerified) {
-					this.favoriteBeerList = []
-					this.favoriteBreweryList = []
-					this.beerQuery.pageNum = 1
-					this.breweryQuery.pageNum = 1
-					this.getFavoriteBeerList()
-					this.getFavoriteBreweryList()
-				}
+				// 重新检查登录状态
+				this.checkLoginStatus()
 			},
 			tabSelect(e) {
 				console.log(e)