davy/zdtap-uniapp-main
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复登录判定和刷新逻辑，取消登录错误重置

Browse Source
This commit is contained in:
davy 2025-04-06 14:25:59 +08:00
parent c4c140bd07
commit e09db16283
5 changed files with 207 additions and 166 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
App.vue
View File

@ -115,7 +115,15 @@
} }
</script> </script>
<style> <style lang="scss">
/* 引入字体变量 */
@import '@/uni.scss';
/* 全局字体样式 */
page {
font-family: $font-family-base;
}
@import "colorui/main.css"; @import "colorui/main.css";
@import "colorui/icon.css"; @import "colorui/icon.css";
.flex-col { .flex-col {

2
pages/index/index.vue
View File

@ -424,7 +424,7 @@
min-height: 100vh; min-height: 100vh;
display: flex; display: flex;
flex-direction: column; flex-direction: column;
font-family: Roboto; font-family: -apple-system, BlinkMacSystemFont, "PingFang SC", "Helvetica Neue", Roboto, "Segoe UI", "Microsoft YaHei", sans-serif;
} }
.search-box { .search-box {

296
pages/index/my.vue
View File

@ -4,13 +4,13 @@
<image v-if="userInfo.avatar" :src="userInfo.avatar" class="avatar-img"></image> <image v-if="userInfo.avatar" :src="userInfo.avatar" class="avatar-img"></image>
<image v-else-if="barInfo.barLogo" :src="barInfo.barLogo" class="avatar-img"></image> <image v-else-if="barInfo.barLogo" :src="barInfo.barLogo" class="avatar-img"></image>
<view v-else class="avatar-placeholder flex align-center justify-center"> <view v-else class="avatar-placeholder flex align-center justify-center">
<text class="cuIcon-people" style="font-size: 60rpx; color: #FFFFFF;"></text> <text class="cuIcon-people text-xl"></text>
</view> </view>
<view class="flex-direction flex"> <view class="flex-direction flex">
<text class="text-bold text-xxl margin-bottom">{{ barInfo.nickName || barInfo.barContactPhone }}</text> <text class="text-xl font-bold margin-bottom">{{ barInfo.nickName || barInfo.barContactPhone }}</text>
<text class="text-sm margin-bottom-sm" style="color:#A0A5BA">门店名称：{{ barInfo.barName || '-'}}</text> <text class="text-sm margin-bottom-sm text-gray">门店名称：{{ barInfo.barName || '-'}}</text>
<view class="flex align-center"> <view class="flex align-center">
<text class="text-sm" style="color:#A0A5BA">门店ID：{{ barInfo.barNumber || '-' }}</text> <text class="text-sm text-gray">门店ID：{{ barInfo.barNumber || '-' }}</text>
<view class="copy-btn" @click.stop="copyBarNumber"> <view class="copy-btn" @click.stop="copyBarNumber">
<text class="cuIcon-copy"></text> <text class="cuIcon-copy"></text>
</view> </view>
@ -24,17 +24,17 @@
<view class="login-text flex align-center"> <view class="login-text flex align-center">
<view class="flex-col status-text"> <view class="flex-col status-text">
<block v-if="userStatus === 'guest'"> <block v-if="userStatus === 'guest'">
<text>登录/认证</text> <text class="text-xl font-bold">登录/认证</text>
</block> </block>
<block v-else-if="userStatus === 'unverified'"> <block v-else-if="userStatus === 'unverified'">
<text>请点击认证门店信息</text> <text class="text-xl font-bold">请点击认证门店信息</text>
</block> </block>
<block v-else-if="userStatus === 'verifying'"> <block v-else-if="userStatus === 'verifying'">
<text>正在认证审核中</text> <text class="text-xl font-bold">正在认证审核中</text>
<text style="font-size: 24rpx; color: #999;">请耐心等待</text> <text class="text-xs text-gray">请耐心等待</text>
</block> </block>
</view> </view>
<text class="cuIcon-right" style="color: #999999; font-size: 32rpx;"></text> <text class="cuIcon-right text-gray"></text>
</view> </view>
</view> </view>
<view v-if="barInfo" class="scan-box"> <view v-if="barInfo" class="scan-box">
@ -120,6 +120,8 @@
} from '@/api/bar.js' } from '@/api/bar.js'
import { getMyScanData } from '@/api/user.js' import { getMyScanData } from '@/api/user.js'
import loginPopup from '@/components/loginPopup.vue'; import loginPopup from '@/components/loginPopup.vue';
import { getToken, removeToken, getUserInfo as getUserInfoFromAuth, checkLogin, clearLoginStatus } from '@/utils/auth.js';
export default { export default {
components: { components: {
loginPopup loginPopup
@ -130,27 +132,26 @@
loading: true, loading: true,
barInfo: null, barInfo: null,
myScanData: null, myScanData: null,
isLoggedIn: false, statusBaeHeight: 40,
statusBaeHeight: 40 isLoggedIn: false
}; };
}, },
computed: { computed: {
// 用户状态 // 用户状态
userStatus() { userStatus() {
// 添加调试日志 console.log('登录状态检查:', {
console.log('计算用户状态:', {
isLoggedIn: this.isLoggedIn, isLoggedIn: this.isLoggedIn,
barInfo: this.barInfo, barInfo: this.barInfo,
authState: this.barInfo ? this.barInfo.authState : 'barInfo为空' authState: this.barInfo ? this.barInfo.authState : 'barInfo为空'
}); });
if (!this.isLoggedIn) return 'guest' // 游客 if (!this.isLoggedIn) return 'guest';
if (!this.barInfo || this.barInfo.authState === 0) return 'unverified' // 未认证 if (!this.barInfo || this.barInfo.authState === 0) return 'unverified';
if (this.barInfo.authState === 1) return 'verifying' // 认证中 if (this.barInfo.authState === 1) return 'verifying';
return 'verified' // 认证通过 return 'verified';
}, },
maskedPhone() { maskedPhone() {
if (!this.barInfo.barContactPhone) return ''; if (!this.barInfo || !this.barInfo.barContactPhone) return '';
return this.barInfo.barContactPhone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2'); return this.barInfo.barContactPhone.replace(/(\d{3})\d{4}(\d{4})/, '$1****$2');
} }
}, },
@ -160,57 +161,55 @@
onShow() { onShow() {
console.log('页面显示，检查登录状态'); console.log('页面显示，检查登录状态');
this.checkLoginStatus(); this.checkLoginStatus();
if (this.isLoggedIn) {
console.log('已登录，获取酒吧信息和扫码数据');
this.getBarInfoFun();
this.getMyScanDataFun();
} else {
console.log('未登录，不获取数据');
}
}, },
methods: { methods: {
// 生成临时token
generateTempToken() {
const tempToken = 'temp_' + Math.random().toString(36).substr(2, 9) + '_' + Date.now()
return tempToken
},
// 检查登录状态 // 检查登录状态
checkLoginStatus() { async checkLoginStatus() {
const token = uni.getStorageSync('token') try {
const userInfo = uni.getStorageSync('userInfo') const token = uni.getStorageSync('token');
const userInfo = uni.getStorageSync('userInfo');
if (!token) { // 检查token和userInfo是否有效
// 如果没有token，生成临时token if (!token || token.startsWith('temp_') || !userInfo) {
const tempToken = this.generateTempToken() this.isLoggedIn = false;
uni.setStorageSync('token', tempToken) this.userInfo = null;
this.isLoggedIn = false this.barInfo = null;
this.userInfo = null this.myScanData = null;
} else if (token.startsWith('temp_')) { return false;
// 如果是临时token，说明是游客 }
this.isLoggedIn = false
this.userInfo = null this.isLoggedIn = true;
} else { this.userInfo = userInfo;
// 正式token，说明已登录
this.isLoggedIn = true // 获取酒吧信息和扫码数据
this.userInfo = userInfo try {
await Promise.all([
this.getBarInfoFun(),
this.getMyScanDataFun()
]);
console.log('所有数据更新完成');
} catch (err) {
console.error('数据更新失败:', err);
// 不重置登录状态，只显示错误提示
uni.showToast({
title: '数据更新失败',
icon: 'none'
});
}
return true;
} catch (error) {
console.error('检查登录状态失败:', error);
return false;
} finally {
this.loading = false;
} }
// 添加调试日志
console.log('登录状态检查:', {
token: token,
isLoggedIn: this.isLoggedIn,
userInfo: this.userInfo
})
this.loading = false
}, },
loginSuccess() { loginSuccess() {
console.log('登录成功，开始更新页面数据'); console.log('登录成功，开始更新页面数据');
// 更新登录状态 // 更新登录状态
this.userInfo = getUserInfoFromAuth();
this.isLoggedIn = true; this.isLoggedIn = true;
this.userInfo = uni.getStorageSync('userInfo');
// 使用 Promise.all 同时获取所有需要的数据 // 使用 Promise.all 同时获取所有需要的数据
Promise.all([ Promise.all([
@ -237,42 +236,27 @@
// 获取酒吧信息 // 获取酒吧信息
getBarInfoFun() { getBarInfoFun() {
if (!this.isLoggedIn) { if (!this.isLoggedIn) {
console.log('用户未登录，不获取酒吧信息') console.log('用户未登录，不获取酒吧信息');
return return Promise.reject('未登录');
} }
getBarInfo().then(res => { return getBarInfo().then(res => {
console.log('获取酒吧信息成功:', res) console.log('获取酒吧信息成功:', res);
if (res && res.data) { if (res && res.data) {
this.barInfo = res.data this.barInfo = res.data;
// 更新认证状态
if (this.barInfo.authState === 2) {
// 已认证
this.isVerified = true
this.isVerifying = false
} else if (this.barInfo.authState === 1) {
// 认证中
this.isVerified = false
this.isVerifying = true
} else {
// 未认证
this.isVerified = false
this.isVerifying = false
}
// 强制更新视图 // 强制更新视图
this.$forceUpdate() this.$forceUpdate();
return this.barInfo;
} else { } else {
console.log('获取酒吧信息成功，但数据为空') console.log('获取酒吧信息成功，但数据为空');
this.barInfo = null this.barInfo = null;
this.isVerified = false return Promise.reject('数据为空');
this.isVerifying = false
} }
}).catch(err => { }).catch(err => {
console.error('获取酒吧信息失败:', err) console.error('获取酒吧信息失败:', err);
this.barInfo = null this.barInfo = null;
this.isVerified = false return Promise.reject(err);
this.isVerifying = false });
})
}, },
// 获取我的扫码数据 // 获取我的扫码数据
getMyScanDataFun() { getMyScanDataFun() {
@ -300,21 +284,21 @@
handleUserBoxClick() { handleUserBoxClick() {
switch (this.userStatus) { switch (this.userStatus) {
case 'guest': case 'guest':
this.$refs.loginRef.open() this.$refs.loginRef.open();
break break;
case 'unverified': case 'unverified':
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/registration' url: '/pages/index/registration'
}) });
break break;
case 'verifying': case 'verifying':
uni.showToast({ uni.showToast({
title: '您的门店正在认证中，请耐心等待', title: '您的门店正在认证中，请耐心等待',
icon: 'none' icon: 'none'
}) });
break break;
default: default:
break break;
} }
}, },
// 页面跳转 // 页面跳转
@ -323,22 +307,22 @@
if (index === 5) { if (index === 5) {
uni.navigateTo({ uni.navigateTo({
url: '/pagesMy/addAiad' url: '/pagesMy/addAiad'
}) });
return return;
} }
// 检查登录状态 // 检查登录状态
if (!this.isLoggedIn) { if (!this.isLoggedIn) {
this.$refs.loginRef.open() this.$refs.loginRef.open();
return return;
} }
// 检查认证状态 // 检查认证状态
if (this.userStatus === 'unverified') { if (this.userStatus === 'unverified') {
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/registration' url: '/pages/index/registration'
}) });
return return;
} }
// 认证中状态只能查看部分功能 // 认证中状态只能查看部分功能
@ -346,14 +330,14 @@
if (index === 6) { // 意见反馈 if (index === 6) { // 意见反馈
uni.navigateTo({ uni.navigateTo({
url: '/pagesMy/feedback' url: '/pagesMy/feedback'
}) });
return return;
} }
uni.showToast({ uni.showToast({
title: '您的门店正在认证中，请耐心等待', title: '您的门店正在认证中，请耐心等待',
icon: 'none' icon: 'none'
}) });
return return;
} }
// 已认证状态可以访问所有功能 // 已认证状态可以访问所有功能
@ -361,32 +345,32 @@
case 1: // 我参与的 case 1: // 我参与的
uni.switchTab({ uni.switchTab({
url: '/pages/index/myJoin' url: '/pages/index/myJoin'
}) });
break; break;
case 2: // 我的关注 case 2: // 我的关注
uni.navigateTo({ uni.navigateTo({
url: '/pagesMy/myAttention' url: '/pagesMy/myAttention'
}) });
break; break;
case 3: // 我的酒评 case 3: // 我的酒评
uni.navigateTo({ uni.navigateTo({
url: '/pagesMy/myWineReview' url: '/pagesMy/myWineReview'
}) });
break; break;
case 4: // 我的地址 case 4: // 我的地址
uni.navigateTo({ uni.navigateTo({
url: '/pagesMy/myAddress' url: '/pagesMy/myAddress'
}) });
break; break;
case 6: // 意见反馈 case 6: // 意见反馈
uni.navigateTo({ uni.navigateTo({
url: '/pagesMy/feedback' url: '/pagesMy/feedback'
}) });
break; break;
case 7: // 设置 case 7: // 设置
uni.navigateTo({ uni.navigateTo({
url: '/pagesMy/setting' url: '/pagesMy/setting'
}) });
break; break;
default: default:
break; break;
@ -400,27 +384,25 @@
success: (res) => { success: (res) => {
if (res.confirm) { if (res.confirm) {
// 清除本地存储的用户信息 // 清除本地存储的用户信息
uni.removeStorageSync('token') clearLoginStatus();
uni.removeStorageSync('userInfo')
uni.removeStorageSync('barInfo')
// 跳转到首页 // 跳转到首页
uni.reLaunch({ uni.reLaunch({
url: '/pages/index/index' url: '/pages/index/index'
}) });
} }
} }
}) });
}, },
// 关闭登录弹窗 // 关闭登录弹窗
closeLoginPopup() { closeLoginPopup() {
this.$refs.loginRef.close() this.$refs.loginRef.close();
}, },
// 去登录 // 去登录
toLogin() { toLogin() {
uni.navigateTo({ uni.navigateTo({
url: '/pages/index/registration' url: '/pages/index/registration'
}) });
}, },
// 显示修改头像提示 // 显示修改头像提示
showChangeAvatar() { showChangeAvatar() {
@ -440,16 +422,36 @@
}, },
// 获取用户信息 // 获取用户信息
getUserInfo() { async getUserInfo() {
const barInfo = uni.getStorageSync('barInfo'); try {
const token = uni.getStorageSync('token'); if (!this.isLoggedIn) {
this.isLoggedIn = !!token; console.log('未登录状态');
if (barInfo) { return;
this.barInfo = barInfo;
// 如果没有昵称，设置默认昵称
if (!this.barInfo.nickName) {
this.barInfo.nickName = this.barInfo.barName + '01';
} }
const result = await getUserInfoFromAuth();
console.log('获取用户信息结果:', result);
if (result && result.barId) {
this.barInfo = result;
// 如果用户没有昵称，设置默认昵称
if (!this.barInfo.nickName) {
this.barInfo.nickName = this.barInfo.barName + '01';
}
} else {
console.error('获取用户信息失败:', result);
// 不重置登录状态，只显示错误提示
uni.showToast({
title: '获取用户信息失败',
icon: 'none'
});
}
} catch (error) {
console.error('获取用户信息出错:', error);
uni.showToast({
title: '获取用户信息失败',
icon: 'none'
});
} }
}, },
// 复制门店ID // 复制门店ID
@ -480,12 +482,12 @@
count: 1, count: 1,
sizeType: ['compressed'], sizeType: ['compressed'],
sourceType: ['album', 'camera'] sourceType: ['album', 'camera']
}) });
if (res.tempFilePaths && res.tempFilePaths.length > 0) { if (res.tempFilePaths && res.tempFilePaths.length > 0) {
uni.showLoading({ uni.showLoading({
title: '上传中...' title: '上传中...'
}) });
// 上传头像 // 上传头像
const uploadRes = await uni.uploadFile({ const uploadRes = await uni.uploadFile({
@ -493,47 +495,47 @@
filePath: res.tempFilePaths[0], filePath: res.tempFilePaths[0],
name: 'barLogo', // 修改为正确的参数名 name: 'barLogo', // 修改为正确的参数名
header: { header: {
'Authorization': uni.getStorageSync('token') 'Authorization': getToken()
}, },
formData: { formData: {
// 添加其他必要的参数 // 添加其他必要的参数
barNumber: this.barInfo.barNumber barNumber: this.barInfo.barNumber
} }
}) });
// 解析响应数据 // 解析响应数据
let result let result;
try { try {
result = JSON.parse(uploadRes.data) result = JSON.parse(uploadRes.data);
} catch (e) { } catch (e) {
result = uploadRes.data result = uploadRes.data;
} }
if (result.code === 200 && result.data) { if (result.code === 200 && result.data) {
// 更新本地存储的门店信息 // 更新本地存储的门店信息
const barInfo = uni.getStorageSync('barInfo') const barInfo = uni.getStorageSync('barInfo');
barInfo.barLogo = result.data barInfo.barLogo = result.data;
uni.setStorageSync('barInfo', barInfo) uni.setStorageSync('barInfo', barInfo);
// 更新页面显示 // 更新页面显示
this.barInfo = barInfo this.barInfo = barInfo;
uni.showToast({ uni.showToast({
title: '更新成功', title: '更新成功',
icon: 'success' icon: 'success'
}) });
} else { } else {
throw new Error(result.msg || '上传失败') throw new Error(result.msg || '上传失败');
} }
} }
} catch (error) { } catch (error) {
console.error('选择头像失败:', error) console.error('选择头像失败:', error);
uni.showToast({ uni.showToast({
title: error.message || '选择头像失败', title: error.message || '选择头像失败',
icon: 'none' icon: 'none'
}) });
} finally { } finally {
uni.hideLoading() uni.hideLoading();
} }
} }
} }
@ -619,10 +621,6 @@
margin-right: 12rpx; margin-right: 12rpx;
text { text {
color: #0B0E26;
font-size: 32rpx;
line-height: 48rpx;
&:first-child { &:first-child {
margin-bottom: 8rpx; margin-bottom: 8rpx;
} }
@ -653,4 +651,8 @@
opacity: 0.7; opacity: 0.7;
} }
} }
.text-gray {
color: #999999;
}
</style> </style>

53
uni.scss
View File

@ -29,7 +29,7 @@ $uni-text-color-disable:#c0c0c0;
/* 背景颜色 */ /* 背景颜色 */
$uni-bg-color:#ffffff; $uni-bg-color:#ffffff;
$uni-bg-color-grey:#f8f8f8; $uni-bg-color-grey:#f9f9f9;
$uni-bg-color-hover:#f1f1f1;//点击状态颜色 $uni-bg-color-hover:#f1f1f1;//点击状态颜色
$uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色 $uni-bg-color-mask:rgba(0, 0, 0, 0.4);//遮罩颜色
@ -39,30 +39,30 @@ $uni-border-color:#c8c7cc;
/* 尺寸变量 */ /* 尺寸变量 */
/* 文字尺寸 */ /* 文字尺寸 */
$uni-font-size-sm:12px; $uni-font-size-sm:12rpx;
$uni-font-size-base:14px; $uni-font-size-base:14rpx;
$uni-font-size-lg:16px; $uni-font-size-lg:16rpx;
/* 图片尺寸 */ /* 图片尺寸 */
$uni-img-size-sm:20px; $uni-img-size-sm:20rpx;
$uni-img-size-base:26px; $uni-img-size-base:26rpx;
$uni-img-size-lg:40px; $uni-img-size-lg:40rpx;
/* Border Radius */ /* Border Radius */
$uni-border-radius-sm: 2px; $uni-border-radius-sm: 2rpx;
$uni-border-radius-base: 3px; $uni-border-radius-base: 3rpx;
$uni-border-radius-lg: 6px; $uni-border-radius-lg: 6rpx;
$uni-border-radius-circle: 50%; $uni-border-radius-circle: 50%;
/* 水平间距 */ /* 水平间距 */
$uni-spacing-row-sm: 5px; $uni-spacing-row-sm: 5rpx;
$uni-spacing-row-base: 10px; $uni-spacing-row-base: 10rpx;
$uni-spacing-row-lg: 15px; $uni-spacing-row-lg: 15rpx;
/* 垂直间距 */ /* 垂直间距 */
$uni-spacing-col-sm: 4px; $uni-spacing-col-sm: 4rpx;
$uni-spacing-col-base: 8px; $uni-spacing-col-base: 8rpx;
$uni-spacing-col-lg: 12px; $uni-spacing-col-lg: 12rpx;
/* 透明度 */ /* 透明度 */
$uni-opacity-disabled: 0.3; // 组件禁用态的透明度 $uni-opacity-disabled: 0.3; // 组件禁用态的透明度
@ -74,3 +74,24 @@ $uni-color-subtitle: #555555; // 二级标题颜色
$uni-font-size-subtitle:26px; $uni-font-size-subtitle:26px;
$uni-color-paragraph: #3F536E; // 文章段落颜色 $uni-color-paragraph: #3F536E; // 文章段落颜色
$uni-font-size-paragraph:15px; $uni-font-size-paragraph:15px;
/* 全局字体变量 */
$font-family-base: -apple-system, BlinkMacSystemFont, "PingFang SC", "Helvetica Neue", Roboto, "Segoe UI", "Microsoft YaHei", sans-serif;
// 字体大小变量
$font-size-xs: 24rpx;
$font-size-sm: 28rpx;
$font-size-base: 32rpx;
$font-size-lg: 36rpx;
$font-size-xl: 40rpx;
$font-size-xxl: 48rpx;
// 字体粗细变量
$font-weight-normal: 400;
$font-weight-medium: 500;
$font-weight-bold: 600;
// 行高变量
$line-height-base: 1.5;
$line-height-lg: 1.8;
$line-height-sm: 1.2;

10
utils/auth.js
View File

@ -217,3 +217,13 @@ export function checkPageNeedAuth(url) {
export function checkApiNeedAuth(url) { export function checkApiNeedAuth(url) {
return apiConfig.needAuthApis.some(api => url.includes(api)) return apiConfig.needAuthApis.some(api => url.includes(api))
} }
// 获取token
export const getToken = () => {
return uni.getStorageSync('token')
}
// 移除token
export const removeToken = () => {
uni.removeStorageSync('token')
}