From 913118d58e89474d86eba0fb342d96cccb06c5aa Mon Sep 17 00:00:00 2001
From: davy <davy@example.com>
Date: Fri, 4 Apr 2025 20:53:55 +0800
Subject: [PATCH] =?UTF-8?q?fix:=201.=20=E4=BF=AE=E5=A4=8D=E9=97=A8?=
 =?UTF-8?q?=E5=BA=97=E6=B3=A8=E5=86=8C=E8=A1=A8=E5=8D=95=E6=8F=90=E4=BA=A4?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E6=A0=BC=E5=BC=8F=202.=20=E6=B7=BB=E5=8A=A0?=
 =?UTF-8?q?=E5=93=81=E7=89=8C=E4=B8=BB=E9=A1=B5=E8=BF=94=E5=9B=9E=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=203.=20=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95=E5=BC=B9?=
 =?UTF-8?q?=E7=AA=97=E7=BB=93=E6=9E=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/index/brandHome.vue    |  64 +++++--
 pages/index/registration.vue |  16 ++
 pagesCoin/goodsDetail.vue    | 323 ++++++++++++++++++++++++-----------
 3 files changed, 293 insertions(+), 110 deletions(-)

diff --git a/pages/index/brandHome.vue b/pages/index/brandHome.vue
index 43f9dc2..82ae0be 100644
--- a/pages/index/brandHome.vue
+++ b/pages/index/brandHome.vue
@@ -1,5 +1,14 @@
 <template>
 	<view class="page-content">
+		<!-- 自定义导航栏 -->
+		<view class="custom-nav" :style="{ paddingTop: statusBarHeight + 'px' }">
+			<view class="nav-content">
+				<view class="back-btn" @click="goBack">
+					<text class="cuIcon-back"></text>
+				</view>
+			</view>
+		</view>
+		
 		<image class="banner" :src="breweryInfo.brandCover"></image>
 		<view class="brand-header">
 			<view style="padding:0 24rpx">
@@ -137,6 +146,7 @@
 				</scroll-view>
 			</view>
 		</view>
+		<!-- 登录弹窗组件 -->
 		<loginPopup ref="loginRef" @loginSuccess="loginSuccess"></loginPopup>
 	</view>
 
@@ -160,6 +170,7 @@
 		},
 		data() {
 			return {
+				statusBarHeight: 0, // 状态栏高度
 				breweryId: '',
 				currentTab: 1,
 				breweryInfo: {}, // 品牌方详情
@@ -184,6 +195,9 @@
 		onLoad({
 			breweryId
 		}) {
+			// 获取状态栏高度
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
+			
 			this.breweryId = breweryId
 			this.queryForm.id = breweryId
 			this.getBreweryInfoFun()
@@ -195,6 +209,10 @@
 			this.getBreweryCoinBalanceFun() // 啤酒币余额
 		},
 		methods: {
+			// 返回上一页
+			goBack() {
+				uni.navigateBack()
+			},
 			changeTab(index) {
 				this.currentTab = index
 				this.queryForm.pageNum = 1
@@ -240,10 +258,6 @@
 			},
 			// 啤酒币余额
 			getBreweryCoinBalanceFun() {
-				if (!uni.getStorageSync('token')) {
-					this.$refs.loginRef.open()
-					return
-				}
 				getBreweryCoinBalance(this.breweryId).then(res => {
 					if (res.data) {
 						this.myCoin = res.data.balance
@@ -252,10 +266,6 @@
 			},
 			// 收藏品牌方状态
 			getBreweryFavorStatusFun() {
-				if (!uni.getStorageSync('token')) {
-					this.$refs.loginRef.open()
-					return
-				}
 				getBreweryFavorStatus(this.breweryId).then(res => {
 					if (res.data) {
 						this.isFavor = true
@@ -362,10 +372,6 @@
 			},
 			// 收藏品牌方
 			favorBreweryFun(status) {
-				if (!uni.getStorageSync('token')) {
-					this.$refs.loginRef.open()
-					return
-				}
 				let data = {
 					breweryId: this.breweryId,
 					status
@@ -381,10 +387,8 @@
 							title: '取消收藏',
 							icon: 'none'
 						})
-
 					}
 					this.getBreweryFavorStatusFun()
-
 				})
 			},
 			// 跳转详情
@@ -405,9 +409,41 @@
 
 <style lang="scss" scoped>
 	.page-content {
+		.custom-nav {
+			position: fixed;
+			top: 0;
+			left: 0;
+			right: 0;
+			z-index: 999;
+			background: transparent;
+			
+			.nav-content {
+				height: 44px;
+				display: flex;
+				align-items: center;
+				padding: 0 32rpx;
+				
+				.back-btn {
+					width: 64rpx;
+					height: 64rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					background: rgba(255, 255, 255, 0.8);
+					border-radius: 50%;
+					
+					.cuIcon-back {
+						font-size: 36rpx;
+						color: #000;
+					}
+				}
+			}
+		}
+		
 		.banner {
 			width: 100%;
 			height: 724rpx;
+			margin-top: v-bind('statusBarHeight + 44 + "px"');
 		}
 
 		.brand-header {
diff --git a/pages/index/registration.vue b/pages/index/registration.vue
index 0c99eb9..53d7c4a 100644
--- a/pages/index/registration.vue
+++ b/pages/index/registration.vue
@@ -543,6 +543,22 @@ export default {
 				return;
 			}
 
+			// 添加调试日志
+			console.log('提交的表单数据:', {
+				完整表单: this.form,
+				酒吧名称: this.form.bar_name,
+				联系电话: this.form.bar_contact_phone,
+				省份: this.form.province,
+				城市: this.form.city,
+				区域: this.form.district,
+				地址: this.form.address,
+				营业执照: this.form.business_license,
+				门头照片: this.form.storefront_photo,
+				纬度: this.form.latitude,
+				经度: this.form.longitude,
+				openId: this.form.openId
+			});
+
 			// 显示加载提示
 			uni.showLoading({
 				title: '提交中',
diff --git a/pagesCoin/goodsDetail.vue b/pagesCoin/goodsDetail.vue
index 0b96bce..e8af0e3 100644
--- a/pagesCoin/goodsDetail.vue
+++ b/pagesCoin/goodsDetail.vue
@@ -1,90 +1,98 @@
 <template>
-	<view class="page-content">
-		<image class="banner" :src="breweryInfo.brandCover"></image>
-		<view class="info">
-			<view class="flex justify-between align-center" style="margin-bottom: 32rpx;" @click="goBreweryDetail">
-				<view class="flex align-center">
-					<image :src="breweryInfo.brandLogo" class="cover"></image>
-					<view>
-						<view>服务商家</view>
-						<view style="font-size: 32rpx;color: #303048">{{ breweryInfo.brandName}}</view>
+	<view class="page">
+		<view class="content">
+			<!-- 自定义导航栏 -->
+			<view class="custom-nav" :style="{ paddingTop: statusBarHeight + 'px' }">
+				<view class="nav-content">
+					<view class="back-btn" @click="goBack">
+						<text class="cuIcon-back"></text>
 					</view>
 				</view>
-				<text class="cuIcon-right lg"></text>
-			</view>
-			<view class="flex align-start" style="margin-bottom: 28rpx;">
-				<view class="flex solids-right justify-between padding-right"
-					style="flex-direction: column;min-height: 136rpx;">
-					<text style="color: #000;font-size: 36rpx;width: 468rpx;">{{ detail.goodsName}}</text>
-					<text style="color: #5E5F60;font-size: 24rpx;">限量{{ detail.stockNum}}套，兑完即止</text>
-				</view>
-				<view class="text-center" style="width: 206rpx;font-size: 24rpx;">
-					已兑<text style="color: #39E5B1;font-size: 36rpx;margin-left: 8rpx;font-weight: 700;">{{ detail.salesCount }}份</text>
-				</view>
-			</view>
-			<view class="flex align-center">
-				<image src="@/static/info-circle.png" style="width: 48rpx;height: 48rpx;margin-right: 16rpx;"></image>
-				<text style="color: #5E5F60;font-size: 24rpx;">限购说明：此商品每人限兑1件</text>
-			</view>
-		</view>
-		<!-- <view class="container"> -->
-			<!-- 这里是好礼介绍 -->
-			<!-- <view class="text-center" style="font-size: 28rpx;color: #000;">
-				好礼介绍
-			</view>
-			<view>
-				
-				<image :src="detail.goodsCover" style="width: 260rpx;height: 300rpx;"></image>
-			</view> -->
-			<!-- 这里是兑换须知 -->
-			<!-- <view class="text-center" style="font-size: 28rpx;color：#000;">	
-				——兑换须知——
 			</view>
 			
-			<view>
-				<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">1.兑换时间：2022年12月1日-2022年12月31日</view>
-				<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">2.兑换地点：大九酿造·Mahanine</view>
-				<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">3.兑换方式：线下兑换</view>
-				<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">4.兑换数量：每人限兑1件</view>
-				<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">5.兑换后，请到兑换地点领取</view>
-				<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">6.兑换后，请到兑换地点领取</view>
-				<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">7.兑换后，请到兑换地点领取</view>
-				<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">8.兑换后，请到兑换地点领取</view>
-			</view> -->
-		<!-- </view> -->
-		<!-- 兑换按钮区 -->
-		<view class="bottom-box">
-			<view v-if="!coinBalance.balance || coinBalance.balance < detail.redeemedNum" class="tip">
-				<image src="@/static/warning.png" style="margin-right: 24rpx;width: 25rpx;height: 25rpx;"></image>
-				<text>您的{{breweryInfo.brandName}}品牌币数量不足哦</text>
-			</view>
-			<view class="fun-box">
-				<view class="left">
-					<view style="margin-bottom: 20rpx;">{{ detail.redeemedNum}}
-						<image src="@/static/beerCoin.png" style="width: 30rpx;height: 30rpx;margin-left: 20rpx;">
-						</image>
+			<image class="banner" :src="breweryInfo.brandCover"></image>
+			<view class="info">
+				<view class="flex justify-between align-center" style="margin-bottom: 32rpx;" @click="goBreweryDetail">
+					<view class="flex align-center">
+						<image :src="breweryInfo.brandLogo" class="cover"></image>
+						<view>
+							<view>服务商家</view>
+							<view style="font-size: 32rpx;color: #303048">{{ breweryInfo.brandName}}</view>
+						</view>
 					</view>
-					<view class="flex align-center">当前可用品牌币：{{ coinBalance.balance}}<image src="@/static/beerCoin.png"
-							style="width: 30rpx;height: 30rpx;margin-left: 20rpx;">
-						</image>
-					</view>
-					<!-- <view class="flex align-center">当前可用通用币：0<image src="@/static/beerCoin.png"
-							style="width: 30rpx;height: 30rpx;margin-left: 20rpx;">
-						</image>
-					</view> -->
+					<text class="cuIcon-right lg"></text>
 				</view>
-				<view class="btn" @click="handleRedeem">
-					立即兑换
+				<view class="flex align-start" style="margin-bottom: 28rpx;">
+					<view class="flex solids-right justify-between padding-right"
+						style="flex-direction: column;min-height: 136rpx;">
+						<text style="color: #000;font-size: 36rpx;width: 468rpx;">{{ detail.goodsName}}</text>
+						<text style="color: #5E5F60;font-size: 24rpx;">限量{{ detail.stockNum}}套，兑完即止</text>
+					</view>
+					<view class="text-center" style="width: 206rpx;font-size: 24rpx;">
+						已兑<text style="color: #39E5B1;font-size: 36rpx;margin-left: 8rpx;font-weight: 700;">{{ detail.salesCount }}份</text>
+					</view>
+				</view>
+				<view class="flex align-center">
+					<image src="@/static/info-circle.png" style="width: 48rpx;height: 48rpx;margin-right: 16rpx;"></image>
+					<text style="color: #5E5F60;font-size: 24rpx;">限购说明：此商品每人限兑1件</text>
+				</view>
+			</view>
+			<!-- <view class="container"> -->
+				<!-- 这里是好礼介绍 -->
+				<!-- <view class="text-center" style="font-size: 28rpx;color: #000;">
+					好礼介绍
+				</view>
+				<view>
+					
+					<image :src="detail.goodsCover" style="width: 260rpx;height: 300rpx;"></image>
+				</view> -->
+				<!-- 这里是兑换须知 -->
+				<!-- <view class="text-center" style="font-size: 28rpx;color：#000;">	
+					——兑换须知——
+				</view>
+				
+				<view>
+					<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">1.兑换时间：2022年12月1日-2022年12月31日</view>
+					<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">2.兑换地点：大九酿造·Mahanine</view>
+					<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">3.兑换方式：线下兑换</view>
+					<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">4.兑换数量：每人限兑1件</view>
+					<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">5.兑换后，请到兑换地点领取</view>
+					<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">6.兑换后，请到兑换地点领取</view>
+					<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">7.兑换后，请到兑换地点领取</view>
+					<view style="font-size: 24rpx;color: #5E5F60;margin-bottom: 20rpx;">8.兑换后，请到兑换地点领取</view>
+				</view> -->
+			<!-- </view> -->
+			<!-- 兑换按钮区 -->
+			<view class="bottom-box">
+				<view v-if="isLogin && coinBalance.balance < detail.redeemedNum" class="tip">
+					<image src="@/static/warning.png" style="margin-right: 24rpx;width: 25rpx;height: 25rpx;"></image>
+					<text>您的{{breweryInfo.brandName}}品牌币数量不足哦</text>
+				</view>
+				<view class="fun-box">
+					<view class="left">
+						<view style="margin-bottom: 20rpx;">{{ detail.redeemedNum}}
+							<image src="@/static/beerCoin.png" style="width: 30rpx;height: 30rpx;margin-left: 20rpx;">
+							</image>
+						</view>
+						<view class="flex align-center">当前可用品牌币：{{ isLogin ? (coinBalance.balance || 0) : '登录后可见' }}<image src="@/static/beerCoin.png"
+								style="width: 30rpx;height: 30rpx;margin-left: 20rpx;">
+							</image>
+						</view>
+					</view>
+					<view class="btn" @click="handleRedeem">
+						立即兑换
+					</view>
 				</view>
 			</view>
 		</view>
+		<!-- 登录弹窗 -->
 		<loginPopup ref="loginRef"></loginPopup>
 	</view>
 </template>
 
 <script>
 	import loginPopup from '@/components/loginPopup.vue';
-	import { getGoodsInfo, getBreweryInfo,getBreweryCoinBalance } from '@/api/bar.js'
+	import { getGoodsInfo, getBreweryInfo, getBreweryCoinBalance } from '@/api/bar.js'
 	export default {
 		components: {
 			loginPopup
@@ -95,28 +103,63 @@
 				breweryId:'', // 品牌方id
 				detail: {},
 				breweryInfo:{},
-				coinBalance:{}
+				coinBalance:{},
+				isLogin: false, // 登录状态
+				isVerified: false, // 认证状态
+				statusBarHeight: 0, // 状态栏高度
 			};
 		},
 		onLoad({id, breweryId}) {
-			if (!uni.getStorageSync('token')) {
-				this.$refs.loginRef.open()
-				return
-			}
+			// 获取状态栏高度
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
+			
 			this.id = id
 			this.breweryId = breweryId
-			
+			this.checkLoginStatus()
 			this.getBreweryInfoFun()
+			this.getDetailFun()
 		},
 		onShow() {
-			this.getDetailFun()
-			this.getBreweryCoinBalanceFun()
+			this.checkLoginStatus()
+			if(this.isLogin) {
+				this.getBreweryCoinBalanceFun()
+			}
 		},
 		methods: {
+			// 返回上一页
+			goBack() {
+				uni.navigateBack()
+			},
+			// 检查登录状态
+			checkLoginStatus() {
+				try {
+					const token = uni.getStorageSync('token')
+					const userInfo = uni.getStorageSync('userInfo')
+					this.isLogin = !!token && !!userInfo
+					this.isVerified = userInfo?.isVerified === 1
+					
+					// 如果登录了但没有用户信息，说明登录状态异常
+					if(token && !userInfo) {
+						uni.removeStorageSync('token')
+						this.isLogin = false
+						this.isVerified = false
+					}
+				} catch(e) {
+					console.error('检查登录状态失败:', e)
+					this.isLogin = false
+					this.isVerified = false
+				}
+			},
 			// 品牌方详情
 			getBreweryInfoFun() {
 				getBreweryInfo(this.breweryId).then(res => {
 					this.breweryInfo = res.data
+				}).catch(err => {
+					console.error('获取品牌信息失败:', err)
+					uni.showToast({
+						title: '获取品牌信息失败',
+						icon: 'none'
+					})
 				})
 			}, 
 			// 获取详情
@@ -131,7 +174,12 @@
 						this.detail = res.data
 					} 
 				}).catch(err => {
+					console.error('获取商品详情失败:', err)
 					uni.hideLoading()
+					uni.showToast({
+						title: '获取商品详情失败',
+						icon: 'none'
+					})
 				})
 			},
 			// 跳转品牌方详情
@@ -143,12 +191,59 @@
 			// 特定品牌啤酒币余额
 			getBreweryCoinBalanceFun() {
 				getBreweryCoinBalance(this.breweryId).then(res => {
-					console.log(res)
 					this.coinBalance = res.data
+				}).catch(err => {
+					console.error('获取币种余额失败:', err)
+					uni.showToast({
+						title: '获取币种余额失败',
+						icon: 'none'
+					})
 				})
 			},
 			// 兑换
-			handleRedeem() {
+			async handleRedeem() {
+				// 重新检查登录状态
+				this.checkLoginStatus()
+				
+				if(!this.isLogin) {
+					// 使用 nextTick 确保组件已加载
+					await this.$nextTick()
+					if(this.$refs.loginRef) {
+						this.$refs.loginRef.open()
+					} else {
+						uni.showToast({
+							title: '请稍后再试',
+							icon: 'none'
+						})
+					}
+					return
+				}
+				
+				if(!this.isVerified) {
+					uni.showModal({
+						title: '提示',
+						content: '请先完成实名认证',
+						confirmText: '去认证',
+						success: (res) => {
+							if(res.confirm) {
+								uni.navigateTo({
+									url: '/pagesMy/verify'
+								})
+							}
+						}
+					})
+					return
+				}
+				
+				if(!this.coinBalance.balance || this.coinBalance.balance < this.detail.redeemedNum) {
+					uni.showToast({
+						title: '品牌币余额不足',
+						icon: 'none',
+						duration: 2000
+					})
+					return
+				}
+				
 				uni.navigateTo({
 					url: '/pagesCoin/redeemOrder?goodsId=' + this.id
 				})
@@ -158,14 +253,46 @@
 </script>
 
 <style lang="scss" scoped>
-	.page-content {
-		// background: linear-gradient(180deg, #FEE034 0%, #FDFDFD 50%, #FDFDFD 100%);
-		// padding-top: 300rpx;
+	.page {
 		min-height: 100vh;
-		.banner {
-					width: 100%;
-					height: 724rpx;
+		
+		.custom-nav {
+			position: fixed;
+			top: 0;
+			left: 0;
+			right: 0;
+			z-index: 999;
+			background: transparent;
+			
+			.nav-content {
+				height: 44px;
+				display: flex;
+				align-items: center;
+				padding: 0 32rpx;
+				
+				.back-btn {
+					width: 64rpx;
+					height: 64rpx;
+					display: flex;
+					align-items: center;
+					justify-content: center;
+					background: rgba(255, 255, 255, 0.8);
+					border-radius: 50%;
+					
+					.cuIcon-back {
+						font-size: 36rpx;
+						color: #000;
+					}
 				}
+			}
+		}
+		
+		.banner {
+			width: 100%;
+			height: 724rpx;
+			margin-top: v-bind('statusBarHeight + 44 + "px"');
+		}
+		
 		.info {
 			position: relative;
 			border-radius: 30rpx;
@@ -183,18 +310,14 @@
 				border-radius: 50%;
 			}
 		}
-		.container {
-			padding: 0 32rpx;
-			margin-top: 20rpx;
-			padding-bottom: 300rpx;
-			background: #FFFFFF;
-		}
+		
 		.bottom-box {
 			position: fixed;
 			left: 0;
 			width: 100%;
 			bottom: 0;
 			background: #FFFFFF;
+			z-index: 99;
 
 			.tip {
 				height: 52rpx;
@@ -208,11 +331,9 @@
 			}
 
 			.fun-box {
-
 				height: 224rpx;
 				background: #FFFFFF;
 				box-shadow: 0px -4px 8px 0px rgba(0, 0, 0, 0.1);
-				// border-radius: 30rpx 30rpx 0px 0px;
 				display: flex;
 				justify-content: space-between;
 				align-items: center;
@@ -247,9 +368,19 @@
 					color: #000;
 					text-align: center;
 					line-height: 82rpx;
+					transition: all 0.3s;
+					
+					&:active {
+						transform: scale(0.98);
+						opacity: 0.9;
+					}
 				}
 			}
 		}
-
+	}
+	
+	// 确保登录弹窗在最顶层
+	:deep(.uni-popup) {
+		z-index: 9999;
 	}
 </style>
\ No newline at end of file