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

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

10
App.vue
View File

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

View File

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

View File

@ -4,13 +4,13 @@
<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>
<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 class="flex-direction flex">
<text class="text-bold text-xxl margin-bottom">{{ barInfo.nickName || barInfo.barContactPhone }}</text>
<text class="text-sm margin-bottom-sm" style="color:#A0A5BA">门店名称{{ barInfo.barName || '-'}}</text>
<text class="text-xl font-bold margin-bottom">{{ barInfo.nickName || barInfo.barContactPhone }}</text>
<text class="text-sm margin-bottom-sm text-gray">门店名称{{ barInfo.barName || '-'}}</text>
<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">
<text class="cuIcon-copy"></text>
</view>
@ -24,17 +24,17 @@
<view class="login-text flex align-center">
<view class="flex-col status-text">
<block v-if="userStatus === 'guest'">
<text>登录/认证</text>
<text class="text-xl font-bold">登录/认证</text>
</block>
<block v-else-if="userStatus === 'unverified'">
<text>请点击认证门店信息</text>
<text class="text-xl font-bold">请点击认证门店信息</text>
</block>
<block v-else-if="userStatus === 'verifying'">
<text>正在认证审核中</text>
<text style="font-size: 24rpx; color: #999;">请耐心等待</text>
<text class="text-xl font-bold">正在认证审核中</text>
<text class="text-xs text-gray">请耐心等待</text>
</block>
</view>
<text class="cuIcon-right" style="color: #999999; font-size: 32rpx;"></text>
<text class="cuIcon-right text-gray"></text>
</view>
</view>
<view v-if="barInfo" class="scan-box">
@ -120,6 +120,8 @@
} from '@/api/bar.js'
import { getMyScanData } from '@/api/user.js'
import loginPopup from '@/components/loginPopup.vue';
import { getToken, removeToken, getUserInfo as getUserInfoFromAuth, checkLogin, clearLoginStatus } from '@/utils/auth.js';
export default {
components: {
loginPopup
@ -130,27 +132,26 @@
loading: true,
barInfo: null,
myScanData: null,
isLoggedIn: false,
statusBaeHeight: 40
statusBaeHeight: 40,
isLoggedIn: false
};
},
computed: {
//
userStatus() {
//
console.log('计算用户状态:', {
console.log('登录状态检查:', {
isLoggedIn: this.isLoggedIn,
barInfo: this.barInfo,
authState: this.barInfo ? this.barInfo.authState : 'barInfo为空'
});
if (!this.isLoggedIn) return 'guest' //
if (!this.barInfo || this.barInfo.authState === 0) return 'unverified' //
if (this.barInfo.authState === 1) return 'verifying' //
return 'verified' //
if (!this.isLoggedIn) return 'guest';
if (!this.barInfo || this.barInfo.authState === 0) return 'unverified';
if (this.barInfo.authState === 1) return 'verifying';
return 'verified';
},
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');
}
},
@ -160,57 +161,55 @@
onShow() {
console.log('页面显示,检查登录状态');
this.checkLoginStatus();
if (this.isLoggedIn) {
console.log('已登录,获取酒吧信息和扫码数据');
this.getBarInfoFun();
this.getMyScanDataFun();
} else {
console.log('未登录,不获取数据');
}
},
methods: {
// token
generateTempToken() {
const tempToken = 'temp_' + Math.random().toString(36).substr(2, 9) + '_' + Date.now()
return tempToken
},
//
checkLoginStatus() {
const token = uni.getStorageSync('token')
const userInfo = uni.getStorageSync('userInfo')
async checkLoginStatus() {
try {
const token = uni.getStorageSync('token');
const userInfo = uni.getStorageSync('userInfo');
if (!token) {
// tokentoken
const tempToken = this.generateTempToken()
uni.setStorageSync('token', tempToken)
this.isLoggedIn = false
this.userInfo = null
} else if (token.startsWith('temp_')) {
// token
this.isLoggedIn = false
this.userInfo = null
} else {
// token
this.isLoggedIn = true
this.userInfo = userInfo
// tokenuserInfo
if (!token || token.startsWith('temp_') || !userInfo) {
this.isLoggedIn = false;
this.userInfo = null;
this.barInfo = null;
this.myScanData = null;
return false;
}
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() {
console.log('登录成功,开始更新页面数据');
//
this.userInfo = getUserInfoFromAuth();
this.isLoggedIn = true;
this.userInfo = uni.getStorageSync('userInfo');
// 使 Promise.all
Promise.all([
@ -237,42 +236,27 @@
//
getBarInfoFun() {
if (!this.isLoggedIn) {
console.log('用户未登录,不获取酒吧信息')
return
console.log('用户未登录,不获取酒吧信息');
return Promise.reject('未登录');
}
getBarInfo().then(res => {
console.log('获取酒吧信息成功:', res)
return getBarInfo().then(res => {
console.log('获取酒吧信息成功:', res);
if (res && 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.barInfo = res.data;
//
this.$forceUpdate()
this.$forceUpdate();
return this.barInfo;
} else {
console.log('获取酒吧信息成功,但数据为空')
this.barInfo = null
this.isVerified = false
this.isVerifying = false
console.log('获取酒吧信息成功,但数据为空');
this.barInfo = null;
return Promise.reject('数据为空');
}
}).catch(err => {
console.error('获取酒吧信息失败:', err)
this.barInfo = null
this.isVerified = false
this.isVerifying = false
})
console.error('获取酒吧信息失败:', err);
this.barInfo = null;
return Promise.reject(err);
});
},
//
getMyScanDataFun() {
@ -300,21 +284,21 @@
handleUserBoxClick() {
switch (this.userStatus) {
case 'guest':
this.$refs.loginRef.open()
break
this.$refs.loginRef.open();
break;
case 'unverified':
uni.navigateTo({
url: '/pages/index/registration'
})
break
});
break;
case 'verifying':
uni.showToast({
title: '您的门店正在认证中,请耐心等待',
icon: 'none'
})
break
});
break;
default:
break
break;
}
},
//
@ -323,22 +307,22 @@
if (index === 5) {
uni.navigateTo({
url: '/pagesMy/addAiad'
})
return
});
return;
}
//
if (!this.isLoggedIn) {
this.$refs.loginRef.open()
return
this.$refs.loginRef.open();
return;
}
//
if (this.userStatus === 'unverified') {
uni.navigateTo({
url: '/pages/index/registration'
})
return
});
return;
}
//
@ -346,14 +330,14 @@
if (index === 6) { //
uni.navigateTo({
url: '/pagesMy/feedback'
})
return
});
return;
}
uni.showToast({
title: '您的门店正在认证中,请耐心等待',
icon: 'none'
})
return
});
return;
}
// 访
@ -361,32 +345,32 @@
case 1: //
uni.switchTab({
url: '/pages/index/myJoin'
})
});
break;
case 2: //
uni.navigateTo({
url: '/pagesMy/myAttention'
})
});
break;
case 3: //
uni.navigateTo({
url: '/pagesMy/myWineReview'
})
});
break;
case 4: //
uni.navigateTo({
url: '/pagesMy/myAddress'
})
});
break;
case 6: //
uni.navigateTo({
url: '/pagesMy/feedback'
})
});
break;
case 7: //
uni.navigateTo({
url: '/pagesMy/setting'
})
});
break;
default:
break;
@ -400,27 +384,25 @@
success: (res) => {
if (res.confirm) {
//
uni.removeStorageSync('token')
uni.removeStorageSync('userInfo')
uni.removeStorageSync('barInfo')
clearLoginStatus();
//
uni.reLaunch({
url: '/pages/index/index'
})
});
}
}
})
});
},
//
closeLoginPopup() {
this.$refs.loginRef.close()
this.$refs.loginRef.close();
},
//
toLogin() {
uni.navigateTo({
url: '/pages/index/registration'
})
});
},
//
showChangeAvatar() {
@ -440,16 +422,36 @@
},
//
getUserInfo() {
const barInfo = uni.getStorageSync('barInfo');
const token = uni.getStorageSync('token');
this.isLoggedIn = !!token;
if (barInfo) {
this.barInfo = barInfo;
//
if (!this.barInfo.nickName) {
this.barInfo.nickName = this.barInfo.barName + '01';
async getUserInfo() {
try {
if (!this.isLoggedIn) {
console.log('未登录状态');
return;
}
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
@ -480,12 +482,12 @@
count: 1,
sizeType: ['compressed'],
sourceType: ['album', 'camera']
})
});
if (res.tempFilePaths && res.tempFilePaths.length > 0) {
uni.showLoading({
title: '上传中...'
})
});
//
const uploadRes = await uni.uploadFile({
@ -493,47 +495,47 @@
filePath: res.tempFilePaths[0],
name: 'barLogo', //
header: {
'Authorization': uni.getStorageSync('token')
'Authorization': getToken()
},
formData: {
//
barNumber: this.barInfo.barNumber
}
})
});
//
let result
let result;
try {
result = JSON.parse(uploadRes.data)
result = JSON.parse(uploadRes.data);
} catch (e) {
result = uploadRes.data
result = uploadRes.data;
}
if (result.code === 200 && result.data) {
//
const barInfo = uni.getStorageSync('barInfo')
barInfo.barLogo = result.data
uni.setStorageSync('barInfo', barInfo)
const barInfo = uni.getStorageSync('barInfo');
barInfo.barLogo = result.data;
uni.setStorageSync('barInfo', barInfo);
//
this.barInfo = barInfo
this.barInfo = barInfo;
uni.showToast({
title: '更新成功',
icon: 'success'
})
});
} else {
throw new Error(result.msg || '上传失败')
throw new Error(result.msg || '上传失败');
}
}
} catch (error) {
console.error('选择头像失败:', error)
console.error('选择头像失败:', error);
uni.showToast({
title: error.message || '选择头像失败',
icon: 'none'
})
});
} finally {
uni.hideLoading()
uni.hideLoading();
}
}
}
@ -619,10 +621,6 @@
margin-right: 12rpx;
text {
color: #0B0E26;
font-size: 32rpx;
line-height: 48rpx;
&:first-child {
margin-bottom: 8rpx;
}
@ -653,4 +651,8 @@
opacity: 0.7;
}
}
.text-gray {
color: #999999;
}
</style>

View File

@ -29,7 +29,7 @@ $uni-text-color-disable:#c0c0c0;
/* 背景颜色 */
$uni-bg-color:#ffffff;
$uni-bg-color-grey:#f8f8f8;
$uni-bg-color-grey:#f9f9f9;
$uni-bg-color-hover:#f1f1f1;//点击状态颜色
$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-base:14px;
$uni-font-size-lg:16px;
$uni-font-size-sm:12rpx;
$uni-font-size-base:14rpx;
$uni-font-size-lg:16rpx;
/* 图片尺寸 */
$uni-img-size-sm:20px;
$uni-img-size-base:26px;
$uni-img-size-lg:40px;
$uni-img-size-sm:20rpx;
$uni-img-size-base:26rpx;
$uni-img-size-lg:40rpx;
/* Border Radius */
$uni-border-radius-sm: 2px;
$uni-border-radius-base: 3px;
$uni-border-radius-lg: 6px;
$uni-border-radius-sm: 2rpx;
$uni-border-radius-base: 3rpx;
$uni-border-radius-lg: 6rpx;
$uni-border-radius-circle: 50%;
/* 水平间距 */
$uni-spacing-row-sm: 5px;
$uni-spacing-row-base: 10px;
$uni-spacing-row-lg: 15px;
$uni-spacing-row-sm: 5rpx;
$uni-spacing-row-base: 10rpx;
$uni-spacing-row-lg: 15rpx;
/* 垂直间距 */
$uni-spacing-col-sm: 4px;
$uni-spacing-col-base: 8px;
$uni-spacing-col-lg: 12px;
$uni-spacing-col-sm: 4rpx;
$uni-spacing-col-base: 8rpx;
$uni-spacing-col-lg: 12rpx;
/* 透明度 */
$uni-opacity-disabled: 0.3; // 组件禁用态的透明度
@ -74,3 +74,24 @@ $uni-color-subtitle: #555555; // 二级标题颜色
$uni-font-size-subtitle:26px;
$uni-color-paragraph: #3F536E; // 文章段落颜色
$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;

View File

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