From 4096897a055debc968b46fbaf51441ec4485d288 Mon Sep 17 00:00:00 2001
From: davy <davy@example.com>
Date: Mon, 7 Apr 2025 17:33:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E8=AF=84=E5=88=86?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=EF=BC=8C=E7=BB=9F=E4=B8=80?=
 =?UTF-8?q?=E4=BD=BF=E7=94=A8=E5=90=8E=E7=AB=AF=E6=95=B0=E6=8D=AE=EF=BC=8C?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E5=88=86=E6=95=B0=E4=BF=9D=E7=95=99=E4=B8=80?=
 =?UTF-8?q?=E4=BD=8D=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/loginPopup.vue        |   6 +-
 pages/index/brandHome.vue        |   2 +-
 pages/index/my.vue               |  10 +--
 pages/index/myJoin.vue           |   4 +-
 pages/index/registration.vue     |   2 +-
 pages/index/review.vue           | 113 +++++++++++++++++++------------
 pages/index/scan.vue             |   4 +-
 pagesActivity/activityDetail.vue |  77 +++++++++++++++------
 pagesActivity/winelist.vue       |  25 -------
 pagesMy/myAttention.vue          |   4 +-
 10 files changed, 143 insertions(+), 104 deletions(-)

diff --git a/components/loginPopup.vue b/components/loginPopup.vue
index db166f8..959144f 100644
--- a/components/loginPopup.vue
+++ b/components/loginPopup.vue
@@ -60,7 +60,8 @@
 					password: ''
 				},
 				showPassword: false,
-				isAgree: false
+				isAgree: false,
+				needRefresh: false
 			};
 		},
 		methods: {
@@ -156,7 +157,8 @@
 					if (res.user) {
 						this.userInfo = res.user
 						uni.setStorageSync('userInfo', res.user)
-						this.$emit('loginSuccess')
+						this.needRefresh = true
+						this.$emit('loginSuccess', { needRefresh: this.needRefresh })
 						
 						// 如果没有barId，提示去认证
 						if (!res.user.barId) {
diff --git a/pages/index/brandHome.vue b/pages/index/brandHome.vue
index e2ce2e7..85a5831 100644
--- a/pages/index/brandHome.vue
+++ b/pages/index/brandHome.vue
@@ -420,7 +420,7 @@
 						}
 					})
 					return
-				} else if (barInfo.authState === 1) {
+				} else if (barInfo.authState === 2) {
 					uni.showToast({
 						title: '您的门店正在认证中，请耐心等待',
 						icon: 'none'
diff --git a/pages/index/my.vue b/pages/index/my.vue
index 76858b8..fec46ce 100644
--- a/pages/index/my.vue
+++ b/pages/index/my.vue
@@ -39,7 +39,7 @@
 		</view>
 		<view v-if="barInfo" class="scan-box">
 			<view v-if="barInfo.authState == 0" class="exprieTime">未认证</view>
-			<view v-else-if="barInfo.authState == 1" class="exprieTime">认证中</view>
+			<view v-else-if="barInfo.authState == 2" class="exprieTime">认证中</view>
 			<view v-else class="exprieTime">{{ barInfo.authEndTime }}认证到期</view>
 			<text>本月累计扫码酒款数量</text>
 			<view class="margin-top">
@@ -147,7 +147,7 @@
 				
 				if (!this.isLoggedIn) return 'guest';
 				if (!this.barInfo || this.barInfo.authState === 0) return 'unverified';
-				if (this.barInfo.authState === 1) return 'verifying';
+				if (this.barInfo.authState === 2) return 'verifying';
 				return 'verified';
 			},
 			maskedPhone() {
@@ -186,7 +186,7 @@
 						if (res && res.data) {
 							this.barInfo = res.data;
 							// 如果是认证中状态，设置默认的扫码数据
-							if (this.barInfo.authState === 1) {
+							if (this.barInfo.authState === 2) {
 								this.myScanData = { scanCount: 0, percent: 0 };
 							}
 						}
@@ -194,7 +194,7 @@
 						console.error('获取酒吧信息失败:', err);
 						if (err.code === 500 && err.msg.includes('门店未认证')) {
 							this.barInfo = {
-								authState: 1,
+								authState: 2,
 								barName: '',
 								barNumber: '',
 								barContactPhone: ''
@@ -206,7 +206,7 @@
 					});
 					
 					// 如果不是认证中状态，获取扫码数据
-					if (this.barInfo && this.barInfo.authState !== 1) {
+					if (this.barInfo && this.barInfo.authState !== 2) {
 						await getMyScanData().then(res => {
 							if (res.code === 200) {
 								this.myScanData = res.data;
diff --git a/pages/index/myJoin.vue b/pages/index/myJoin.vue
index a28aeaa..288f9db 100644
--- a/pages/index/myJoin.vue
+++ b/pages/index/myJoin.vue
@@ -205,7 +205,7 @@
 			userStatus() {
 				if (!this.isLoggedIn) return 'guest' // 游客
 				if (!this.barInfo || this.barInfo.authState === 0) return 'unverified' // 未认证
-				if (this.barInfo.authState === 1) return 'verifying' // 认证中
+				if (this.barInfo.authState === 2) return 'verifying' // 认证中
 				return 'verified' // 认证通过
 			}
 		},
@@ -265,7 +265,7 @@
 						console.log('【getBarInfoFun】认证状态(authState):', res.data.authState)
 						
 						this.barInfo = res.data
-						this.isVerified = res.data.authState === 2 // 2表示认证通过
+						this.isVerified = res.data.authState === 1 // 1表示认证通过
 						console.log('【getBarInfoFun】更新后的认证状态(isVerified):', this.isVerified)
 						
 						uni.setStorageSync('barInfo', res.data)
diff --git a/pages/index/registration.vue b/pages/index/registration.vue
index 2a8b9d7..ccdd252 100644
--- a/pages/index/registration.vue
+++ b/pages/index/registration.vue
@@ -201,7 +201,7 @@ export default {
 				latitude: '', // 纬度
 				longitude: '', // 经度
 				openId: '', // 用户openId
-				auth_state: 0, // 认证状态（0：待审核）
+				auth_state: 2, // 认证状态（2：待审核）
 			},
 			// 用于显示的完整地区文本
 			displayArea: '',
diff --git a/pages/index/review.vue b/pages/index/review.vue
index a4283f0..0ec137d 100644
--- a/pages/index/review.vue
+++ b/pages/index/review.vue
@@ -13,7 +13,7 @@
 					</view>
 					<text class="product-subtitle">{{beerInfo.beerStyles || '--'}}</text>
 					<view class="rating">
-						<text class="rating-score">{{reviewScoreList.avgOverallRating || 0}}/5.0</text>
+						<text class="rating-score">{{reviewScoreList.avgOverallRating ? Number(reviewScoreList.avgOverallRating).toFixed(1) : '0.0'}}/5.0</text>
 						<uni-rate :value="reviewScoreList.avgOverallRating || 0" :readonly="true" :touchable="false" size="18" />
 					</view>
 					<view v-if="beerInfo.breweryId" class="brand" @click="toBrand">
@@ -52,7 +52,7 @@
 			
 			<!-- 评分总览 -->
 			<view class="rating-overview">
-				<text class="rating-score-large">{{currentTab === 2 ? (reviewScoreList.avgOverallRating || '-') : (myReviewInfo ? myReviewInfo.overallRating : '-')}}</text>
+				<text class="rating-score-large">{{currentTab === 2 ? (reviewScoreList.avgOverallRating ? Number(reviewScoreList.avgOverallRating).toFixed(1) : '-') : (myReviewInfo ? Number(myReviewInfo.overallRating).toFixed(1) : '-')}}</text>
 				<view class="rating-right">
 					<uni-rate 
 						:value="currentTab === 2 ? (reviewScoreList.avgOverallRating || 0) : (myReviewInfo ? myReviewInfo.overallRating : 0)" 
@@ -100,7 +100,7 @@
 				]" :key="index">
 					<view class="bar-header">
 						<text class="bar-label">{{item.label}} ({{item.weight}})</text>
-						<text class="bar-value">{{item.value ? item.value.toFixed(1) : '0.0'}}</text>
+						<text class="bar-value">{{item.value ? Number(item.value).toFixed(1) : '0.0'}}</text>
 					</view>
 					<view class="bar">
 						<view class="bar-filled" :style="{width: item.value ? (item.value/5*100 + '%') : '0%'}"></view>
@@ -154,14 +154,14 @@
 							<!-- 评分和点赞 -->
 							<view class="review-footer">
 								<uni-rate 
-									:value="item.compositeScore" 
+									:value="item.overallRating" 
 									:readonly="true"
 									:size="16"
 									:touchable="false"
 									color="#ECECEC"
 									active-color="#FEE034"
 								/>
-								<text class="score-text">{{item.compositeScore}}分</text>
+								<text class="score-text">{{item.overallRating ? Number(item.overallRating).toFixed(1) : '0.0'}}分</text>
 								<view class="like-btn" :class="{ active: item.reviewLike }" @tap.stop="handleLike(item)">
 									<image class="like-icon" src="/static/like.png" mode="aspectFit"></image>
 									<text class="like-count">{{item.likeCount || 0}}</text>
@@ -266,7 +266,7 @@
 				
 				if (this.isLoggedIn) {
 					const barInfo = uni.getStorageSync('barInfo')
-					this.isBarAuthenticated = barInfo && barInfo.authState === 2
+					this.isBarAuthenticated = barInfo && barInfo.authState === 1 // 1表示认证通过
 				}
 			},
 			
@@ -332,13 +332,17 @@
 						console.log('获取评论列表数据:', res.rows.length)
 						let arr = res.rows.map(it => ({
 							...it,
-							compositeScore: this.getScore(it.aromaRating, it.tasteRating, it.colorRating),
 							isExpanded: false,
 							needExpand: it.reviewContent && it.reviewContent.length > 50
 						}))
 						if (arr.length > 0) {
 							console.log('更新评论列表')
-							this.reviewList = [...this.reviewList, ...arr]
+							// 如果是第一页，直接替换列表；否则追加到列表末尾
+							if (this.queryForm.pageNum === 1) {
+								this.reviewList = arr
+							} else {
+								this.reviewList = [...this.reviewList, ...arr]
+							}
 						}
 					}
 					this.reviewTotal = res.total
@@ -379,10 +383,10 @@
 				if (!this.isBarAuthenticated) {
 					const barInfo = uni.getStorageSync('barInfo')
 					
-					if (!barInfo || barInfo.authState === 0) {
+					if (!barInfo || barInfo.authState === 2) {
 						uni.showModal({
 							title: '提示',
-							content: '请先认证门店',
+							content: '请先完成门店认证',
 							showCancel: true,
 							success: (res) => {
 								if (res.confirm) {
@@ -396,9 +400,9 @@
 					}
 					
 					if (barInfo.authState === 1) {
-						uni.showToast({
-							title: '您的门店正在认证中，请耐心等待',
-							icon: 'none'
+						// 已认证，允许写酒评
+						uni.navigateTo({
+							url: '/pages/index/writeReview?beerId=' + this.beerId
 						})
 						return
 					}
@@ -448,10 +452,10 @@
 				}
 				
 				// 处理不同的认证状态
-				if (barInfo.authState === 0) {
+				if (barInfo.authState === 2) {
 					uni.showModal({
 						title: '提示',
-						content: '请先认证门店',
+						content: '请先完成门店认证',
 						showCancel: true,
 						success: (res) => {
 							if (res.confirm) {
@@ -462,12 +466,6 @@
 						}
 					})
 					return
-				} else if (barInfo.authState === 1) {
-					uni.showToast({
-						title: '您的门店正在认证中，请耐心等待',
-						icon: 'none'
-					})
-					return
 				}
 				
 				try {
@@ -489,34 +487,49 @@
 					})
 				}
 			},
-			// 点赞
-			handleLike(item) {
-				const token = uni.getStorageSync('token')
-				if (!token) {
+			// 处理点赞
+			async handleLike(item) {
+				if (!this.isLoggedIn) {
 					this.$refs.loginRef.open()
 					return
 				}
-				let data = {
-					reviewId: item.id,
-					status: item.reviewLike ? 2 : 1
-				}
-				likeReview(data).then(res => {
-					if (data.status == 1) {
+				
+				try {
+					// 发送点赞请求前，先确定当前的点赞状态
+					const nextStatus = item.reviewLike ? 2 : 1 // 如果当前是已点赞，则发送取消点赞(2)；否则发送点赞(1)
+					
+					const res = await likeReview({
+						reviewId: item.id,
+						status: nextStatus
+					})
+					
+					if (res.code === 200) {
+						// 根据发送的状态更新UI
+						if (nextStatus === 1) { // 点赞操作
+							item.reviewLike = true
+							item.likeCount = (item.likeCount || 0) + 1
+						} else { // 取消点赞操作
+							item.reviewLike = false
+							item.likeCount = Math.max(0, (item.likeCount || 1) - 1)
+						}
+						
 						uni.showToast({
-							title: '点赞成功',
+							title: nextStatus === 1 ? '点赞成功' : '取消点赞',
 							icon: 'none'
 						})
-						item.reviewLike = true
-						item.likeCount = (item.likeCount || 0) + 1
 					} else {
 						uni.showToast({
-							title: '取消点赞',
+							title: '操作失败，请重试',
 							icon: 'none'
 						})
-						item.reviewLike = false
-						item.likeCount = Math.max(0, (item.likeCount || 1) - 1)
 					}
-				})
+				} catch (error) {
+					console.error('点赞操作失败:', error)
+					uni.showToast({
+						title: '操作失败，请重试',
+						icon: 'none'
+					})
+				}
 			},
 			// 生成酒单
 			toWinelist() {
@@ -545,10 +558,10 @@
 				}
 				
 				// 处理不同的认证状态
-				if (barInfo.authState === 0) {
+				if (barInfo.authState === 2) {
 					uni.showModal({
 						title: '提示',
-						content: '请先认证门店',
+						content: '您的门店正在认证中，请耐心等待',
 						showCancel: true,
 						success: (res) => {
 							if (res.confirm) {
@@ -560,15 +573,25 @@
 					})
 					return
 				} else if (barInfo.authState === 1) {
-					uni.showToast({
-						title: '您的门店正在认证中，请耐心等待',
-						icon: 'none'
+					// 已认证，允许生成酒单
+					uni.navigateTo({
+						url: "/pagesActivity/winelist?beerId=" + this.beerId
 					})
 					return
 				}
 				
-				uni.navigateTo({
-					url: "/pagesActivity/winelist?beerId=" + this.beerId
+				// 未认证状态
+				uni.showModal({
+					title: '提示',
+					content: '请先认证门店',
+					showCancel: true,
+					success: (res) => {
+						if (res.confirm) {
+							uni.navigateTo({
+								url: '/pages/index/registration'
+							})
+						}
+					}
 				})
 			},
 			// 分享
diff --git a/pages/index/scan.vue b/pages/index/scan.vue
index 2fe7031..e1edca5 100644
--- a/pages/index/scan.vue
+++ b/pages/index/scan.vue
@@ -165,11 +165,11 @@
 				
 				// 检查认证状态
 				if (barInfo) {
-					if (barInfo.authState === 2) {
+					if (barInfo.authState === 1) {
 						// 已认证
 						this.isVerified = true
 						this.isVerifying = false
-					} else if (barInfo.authState === 1) {
+					} else if (barInfo.authState === 2) {
 						// 认证中
 						this.isVerified = false
 						this.isVerifying = true
diff --git a/pagesActivity/activityDetail.vue b/pagesActivity/activityDetail.vue
index 5386315..ffe9e3b 100644
--- a/pagesActivity/activityDetail.vue
+++ b/pagesActivity/activityDetail.vue
@@ -341,7 +341,7 @@
 				const barInfo = uni.getStorageSync('barInfo');
 				
 				this.isLoggedIn = !!token;
-				this.isVerified = barInfo && barInfo.authState === 2;
+				this.isVerified = barInfo && barInfo.authState === 1;
 			},
 			handleButtonClick() {
 				const token = uni.getStorageSync('token');
@@ -369,10 +369,10 @@
 				}
 				
 				// 处理不同的认证状态
-				if (barInfo.authState === 0) {
+				if (barInfo.authState === 2) {
 					uni.showModal({
 						title: '提示',
-						content: '请先认证门店',
+						content: '您的门店正在认证中，请耐心等待',
 						showCancel: true,
 						success: (res) => {
 							if (res.confirm) {
@@ -384,23 +384,38 @@
 					});
 					return;
 				} else if (barInfo.authState === 1) {
-					uni.showToast({
-						title: '您的门店正在认证中，请耐心等待',
-						icon: 'none'
-					});
+					// 已认证，允许操作
+					this.handleScan();
 					return;
 				}
 				
-				// 都通过后执行扫码
-				this.handleScan();
+				// 未认证状态
+				uni.showModal({
+					title: '提示',
+					content: '请先认证门店',
+					showCancel: true,
+					success: (res) => {
+						if (res.confirm) {
+							uni.navigateTo({
+								url: '/pages/index/registration'
+							});
+						}
+					}
+				});
 			},
-			onLoginSuccess() {
+			onLoginSuccess(data) {
 				// 登录成功后重新检查状态
 				this.checkLoginStatus();
 				
+				// 如果需要刷新页面
+				if (data && data.needRefresh) {
+					// 重新初始化页面数据
+					this.init();
+				}
+				
 				// 检查认证状态
 				const barInfo = uni.getStorageSync('barInfo');
-				if (!barInfo || barInfo.authState === 0) {
+				if (!barInfo) {
 					uni.showModal({
 						title: '提示',
 						content: '请先认证门店',
@@ -414,18 +429,42 @@
 						}
 					});
 					return;
-				} else if (barInfo.authState === 1) {
-					uni.showToast({
-						title: '您的门店正在认证中，请耐心等待',
-						icon: 'none'
+				}
+				
+				// 处理不同的认证状态
+				if (barInfo.authState === 2) {
+					uni.showModal({
+						title: '提示',
+						content: '您的门店正在认证中，请耐心等待',
+						showCancel: true,
+						success: (res) => {
+							if (res.confirm) {
+								uni.navigateTo({
+									url: '/pages/index/registration'
+								});
+							}
+						}
 					});
 					return;
+				} else if (barInfo.authState === 1) {
+					// 已认证，允许操作
+					this.handleScan();
+					return;
 				}
 				
-				// 如果已认证，直接执行扫码
-				if (this.isVerified) {
-					this.handleScan();
-				}
+				// 未认证状态
+				uni.showModal({
+					title: '提示',
+					content: '请先认证门店',
+					showCancel: true,
+					success: (res) => {
+						if (res.confirm) {
+							uni.navigateTo({
+								url: '/pages/index/registration'
+							});
+						}
+					}
+				});
 			}
 		},
 		onUnload() {
diff --git a/pagesActivity/winelist.vue b/pagesActivity/winelist.vue
index 0f2c07d..e67ab33 100644
--- a/pagesActivity/winelist.vue
+++ b/pagesActivity/winelist.vue
@@ -216,31 +216,6 @@
 					return
 				}
 				
-				// 检查登录和认证状态
-				const token = uni.getStorageSync('token')
-				const isAuth = uni.getStorageSync('isAuth')
-				
-				if (!token) {
-					this.$refs.loginRef.open()
-					return
-				}
-				
-				if (!isAuth) {
-					uni.showModal({
-						title: '提示',
-						content: '您还未认证门店，请先完成认证',
-						confirmText: '去认证',
-						success: (res) => {
-							if (res.confirm) {
-								uni.navigateTo({
-									url: '/pagesActivity/barAuth'
-								})
-							}
-						}
-					})
-					return
-				}
-				
 				if (this.currentStep < 3) {
 					this.currentStep++
 				}
diff --git a/pagesMy/myAttention.vue b/pagesMy/myAttention.vue
index ecf3bd3..d4de8ac 100644
--- a/pagesMy/myAttention.vue
+++ b/pagesMy/myAttention.vue
@@ -204,11 +204,11 @@
 				
 				// 检查认证状态
 				if (barInfo) {
-					if (barInfo.authState === 2) {
+					if (barInfo.authState === 1) {
 						// 已认证
 						this.isVerified = true
 						this.isVerifying = false
-					} else if (barInfo.authState === 1) {
+					} else if (barInfo.authState === 2) {
 						// 认证中
 						this.isVerified = false
 						this.isVerifying = true