pages/index/brandHome.vue

@@ -1,14 +1,5 @@
 <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">
@@ -146,7 +137,6 @@
 				</scroll-view>
 			</view>
 		</view>
-		<!-- 登录弹窗组件 -->
 		<loginPopup ref="loginRef" @loginSuccess="loginSuccess"></loginPopup>
 	</view>
 
@@ -170,7 +160,6 @@
 		},
 		data() {
 			return {
-				statusBarHeight: 0, // 状态栏高度
 				breweryId: '',
 				currentTab: 1,
 				breweryInfo: {}, // 品牌方详情
@@ -195,9 +184,6 @@
 		onLoad({
 			breweryId
 		}) {
-			// 获取状态栏高度
-			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
-			
 			this.breweryId = breweryId
 			this.queryForm.id = breweryId
 			this.getBreweryInfoFun()
@@ -209,10 +195,6 @@
 			this.getBreweryCoinBalanceFun() // 啤酒币余额
 		},
 		methods: {
-			// 返回上一页
-			goBack() {
-				uni.navigateBack()
-			},
 			changeTab(index) {
 				this.currentTab = index
 				this.queryForm.pageNum = 1
@@ -258,6 +240,10 @@
 			},
 			// 啤酒币余额
 			getBreweryCoinBalanceFun() {
+				if (!uni.getStorageSync('token')) {
+					this.$refs.loginRef.open()
+					return
+				}
 				getBreweryCoinBalance(this.breweryId).then(res => {
 					if (res.data) {
 						this.myCoin = res.data.balance
@@ -266,6 +252,10 @@
 			},
 			// 收藏品牌方状态
 			getBreweryFavorStatusFun() {
+				if (!uni.getStorageSync('token')) {
+					this.$refs.loginRef.open()
+					return
+				}
 				getBreweryFavorStatus(this.breweryId).then(res => {
 					if (res.data) {
 						this.isFavor = true
@@ -372,6 +362,10 @@
 			},
 			// 收藏品牌方
 			favorBreweryFun(status) {
+				if (!uni.getStorageSync('token')) {
+					this.$refs.loginRef.open()
+					return
+				}
 				let data = {
 					breweryId: this.breweryId,
 					status
@@ -387,8 +381,10 @@
 							title: '取消收藏',
 							icon: 'none'
 						})
+
 					}
 					this.getBreweryFavorStatusFun()
+
 				})
 			},
 			// 跳转详情
@@ -409,41 +405,9 @@
 
 <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 {

pages/index/registration.vue

@@ -543,22 +543,6 @@ 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: '提交中',

pagesCoin/goodsDetail.vue

@@ -1,15 +1,5 @@
 <template>
-	<view class="page">
+	<view class="page-content">
-		<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>
-			</view>
-			
 		<image class="banner" :src="breweryInfo.brandCover"></image>
 		<view class="info">
 			<view class="flex justify-between align-center" style="margin-bottom: 32rpx;" @click="goBreweryDetail">
@@ -64,7 +54,7 @@
 		<!-- </view> -->
 		<!-- 兑换按钮区 -->
 		<view class="bottom-box">
-				<view v-if="isLogin && coinBalance.balance < detail.redeemedNum" class="tip">
+			<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>
@@ -74,25 +64,27 @@
 						<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"
+					<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> -->
 				</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
@@ -103,63 +95,28 @@
 				breweryId:'', // 品牌方id
 				detail: {},
 				breweryInfo:{},
-				coinBalance:{},
+				coinBalance:{}
-				isLogin: false, // 登录状态
-				isVerified: false, // 认证状态
-				statusBarHeight: 0, // 状态栏高度
 			};
 		},
 		onLoad({id, breweryId}) {
-			// 获取状态栏高度
+			if (!uni.getStorageSync('token')) {
-			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight
+				this.$refs.loginRef.open()
-			
+				return
+			}
 			this.id = id
 			this.breweryId = breweryId
-			this.checkLoginStatus()
+			
 			this.getBreweryInfoFun()
-			this.getDetailFun()
 		},
 		onShow() {
-			this.checkLoginStatus()
+			this.getDetailFun()
-			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'
-					})
 				})
 			}, 
 			// 获取详情
@@ -174,12 +131,7 @@
 						this.detail = res.data
 					} 
 				}).catch(err => {
-					console.error('获取商品详情失败:', err)
 					uni.hideLoading()
-					uni.showToast({
-						title: '获取商品详情失败',
-						icon: 'none'
-					})
 				})
 			},
 			// 跳转品牌方详情
@@ -191,59 +143,12 @@
 			// 特定品牌啤酒币余额
 			getBreweryCoinBalanceFun() {
 				getBreweryCoinBalance(this.breweryId).then(res => {
+					console.log(res)
 					this.coinBalance = res.data
-				}).catch(err => {
-					console.error('获取币种余额失败:', err)
-					uni.showToast({
-						title: '获取币种余额失败',
-						icon: 'none'
-					})
 				})
 			},
 			// 兑换
-			async handleRedeem() {
+			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
 				})
@@ -253,46 +158,14 @@
 </script>
 
 <style lang="scss" scoped>
-	.page {
+	.page-content {
+		// background: linear-gradient(180deg, #FEE034 0%, #FDFDFD 50%, #FDFDFD 100%);
+		// padding-top: 300rpx;
 		min-height: 100vh;
-		
-		.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;
@@ -310,14 +183,18 @@
 				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;
@@ -331,9 +208,11 @@
 			}
 
 			.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;
@@ -368,19 +247,9 @@
 					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>

pagesMy/myAttention.vue

@@ -17,17 +17,12 @@
 			</view>
 		</view>
 		<template v-else>
-			<view v-if="!isVerified && !isVerifying" class="flex align-center justify-center" style="height: calc(100vh - 100rpx);">
+			<view v-if="!isVerified" 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">
@@ -102,7 +97,6 @@
 			return {
 				isLogin: false,
 				isVerified: false,
-				isVerifying: false,
 				tabCur: 0,
 				favoriteBeerList: [], // 收藏的酒款列表
 				favoriteBreweryList: [], // 收藏的酒厂列表
@@ -136,49 +130,15 @@
 			checkLoginStatus() {
 				const token = uni.getStorageSync('token')
 				const userInfo = uni.getStorageSync('userInfo')
-				const barInfo = uni.getStorageSync('barInfo')
+				this.isLogin = !!token
-				
-				// 重置状态
-				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.isLogin && this.isVerified) {
-				if (this.isVerified || this.isVerifying) {
 					this.getFavoriteBeerList()
 					this.getFavoriteBreweryList()
+				} else {
+					this.favoriteBeerList = []
+					this.favoriteBreweryList = []
 				}
 			},
 			// 去登录
@@ -193,8 +153,18 @@
 			},
 			// 登录成功
 			loginSuccess() {
-				// 重新检查登录状态
+				this.isLogin = true
-				this.checkLoginStatus()
+				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()
+				}
 			},
 			tabSelect(e) {
 				console.log(e)