fix(index): 修复小程序加载中问题
- 完善 reload函数逻辑,添加用户登录流程- 引入加载状态管理,优化异步操作流程 -增加网络诊断工具,帮助排查加载问题 - 改进错误处理,提升用户体验 -详细文档记录解决方案,便于后续支持
This commit is contained in:
@@ -3,11 +3,15 @@ import BestSellers from './BestSellers';
|
||||
import Taro from '@tarojs/taro';
|
||||
import {useShareAppMessage} from "@tarojs/taro"
|
||||
import {useEffect, useState} from "react";
|
||||
import {getShopInfo} from "@/api/layout";
|
||||
import {getShopInfo, loginByOpenId} from "@/api/layout";
|
||||
import {TenantId} from "@/config/app";
|
||||
import {saveStorageByLoginUser} from "@/utils/server";
|
||||
import {Sticky} from '@nutui/nutui-react-taro'
|
||||
import Menu from "./Menu";
|
||||
import Banner from "./Banner";
|
||||
import {checkAndHandleInviteRelation, hasPendingInvite} from "@/utils/invite";
|
||||
import {showNetworkDiagnosis} from "@/utils/networkCheck";
|
||||
import {BaseUrl} from "@/config/app";
|
||||
import './index.scss'
|
||||
|
||||
// import GoodsList from "./GoodsList";
|
||||
@@ -15,6 +19,31 @@ import './index.scss'
|
||||
function Home() {
|
||||
// 吸顶状态
|
||||
const [stickyStatus, setStickyStatus] = useState<boolean>(false)
|
||||
// 页面加载状态
|
||||
const [pageLoading, setPageLoading] = useState<boolean>(true)
|
||||
// 初始化状态
|
||||
const [initStatus, setInitStatus] = useState<{
|
||||
shopInfo: boolean;
|
||||
userAuth: boolean;
|
||||
userLogin: boolean;
|
||||
}>({
|
||||
shopInfo: false,
|
||||
userAuth: false,
|
||||
userLogin: false
|
||||
})
|
||||
|
||||
// 检查是否所有初始化都完成
|
||||
const checkInitComplete = (newStatus: Partial<typeof initStatus>) => {
|
||||
const updatedStatus = { ...initStatus, ...newStatus };
|
||||
setInitStatus(updatedStatus);
|
||||
|
||||
const allComplete = Object.values(updatedStatus).every(status => status === true);
|
||||
if (allComplete && pageLoading) {
|
||||
console.log('✅ 所有初始化完成,隐藏加载状态');
|
||||
setPageLoading(false);
|
||||
Taro.hideLoading();
|
||||
}
|
||||
}
|
||||
|
||||
useShareAppMessage(() => {
|
||||
return {
|
||||
@@ -54,14 +83,21 @@ function Home() {
|
||||
success: (res) => {
|
||||
if (res.authSetting['scope.userInfo']) {
|
||||
// 用户授权成功,可以获取用户信息
|
||||
console.log('用户重新授权成功');
|
||||
reload();
|
||||
} else {
|
||||
// 用户拒绝授权,提示授权失败
|
||||
console.log('用户拒绝授权');
|
||||
checkInitComplete({ userLogin: true });
|
||||
Taro.showToast({
|
||||
title: '授权失败',
|
||||
icon: 'none'
|
||||
});
|
||||
}
|
||||
},
|
||||
fail: (error) => {
|
||||
console.error('打开设置页面失败:', error);
|
||||
checkInitComplete({ userLogin: true });
|
||||
}
|
||||
});
|
||||
};
|
||||
@@ -73,14 +109,80 @@ function Home() {
|
||||
}
|
||||
|
||||
const reload = () => {
|
||||
console.log('开始执行登录流程...');
|
||||
Taro.login({
|
||||
success: (res) => {
|
||||
console.log('微信登录成功,code:', res.code);
|
||||
|
||||
// 调用后端登录接口
|
||||
loginByOpenId({
|
||||
code: res.code,
|
||||
tenantId: TenantId
|
||||
}).then(async data => {
|
||||
console.log('后端登录成功:', data);
|
||||
if (data) {
|
||||
// 保存用户信息到本地存储
|
||||
saveStorageByLoginUser(data.access_token, data.user);
|
||||
|
||||
// 标记登录完成
|
||||
checkInitComplete({ userLogin: true });
|
||||
|
||||
Taro.showToast({
|
||||
title: '登录成功',
|
||||
icon: 'success',
|
||||
duration: 2000
|
||||
});
|
||||
console.log('✅ 用户登录完成');
|
||||
} else {
|
||||
throw new Error('登录返回数据为空');
|
||||
}
|
||||
}).catch(error => {
|
||||
console.error('后端登录失败:', error);
|
||||
// 即使登录失败也标记为完成,避免一直加载
|
||||
checkInitComplete({ userLogin: true });
|
||||
Taro.showToast({
|
||||
title: '登录失败,请重试',
|
||||
icon: 'error',
|
||||
duration: 3000
|
||||
});
|
||||
});
|
||||
},
|
||||
fail: (error) => {
|
||||
console.error('微信登录失败:', error);
|
||||
Taro.showToast({
|
||||
title: '微信登录失败',
|
||||
icon: 'error',
|
||||
duration: 3000
|
||||
});
|
||||
}
|
||||
});
|
||||
};
|
||||
|
||||
useEffect(() => {
|
||||
// 获取站点信息
|
||||
getShopInfo().then(() => {
|
||||
console.log('=== 首页初始化开始 ===');
|
||||
|
||||
})
|
||||
// 显示加载提示
|
||||
Taro.showLoading({
|
||||
title: '加载中...',
|
||||
mask: true
|
||||
});
|
||||
|
||||
// 获取站点信息
|
||||
console.log('开始获取站点信息...');
|
||||
getShopInfo().then((data) => {
|
||||
console.log('站点信息获取成功:', data);
|
||||
checkInitComplete({ shopInfo: true });
|
||||
}).catch((error) => {
|
||||
console.error('站点信息获取失败:', error);
|
||||
// 即使失败也标记为完成,避免一直加载
|
||||
checkInitComplete({ shopInfo: true });
|
||||
// 显示错误提示
|
||||
Taro.showToast({
|
||||
title: '获取站点信息失败',
|
||||
icon: 'error',
|
||||
duration: 3000
|
||||
});
|
||||
});
|
||||
|
||||
// 检查是否有待处理的邀请关系
|
||||
if (hasPendingInvite()) {
|
||||
@@ -99,17 +201,33 @@ function Home() {
|
||||
}
|
||||
|
||||
// Taro.getSetting:获取用户的当前设置。返回值中只会出现小程序已经向用户请求过的权限。
|
||||
console.log('开始检查用户授权状态...');
|
||||
Taro.getSetting({
|
||||
success: (res) => {
|
||||
console.log('授权状态检查结果:', res.authSetting);
|
||||
checkInitComplete({ userAuth: true });
|
||||
|
||||
if (res.authSetting['scope.userInfo']) {
|
||||
// 用户已经授权过,可以直接获取用户信息
|
||||
console.log('用户已经授权过,可以直接获取用户信息')
|
||||
console.log('✅ 用户已经授权过,开始登录流程');
|
||||
reload();
|
||||
} else {
|
||||
// 用户未授权,需要弹出授权窗口
|
||||
console.log('用户未授权,需要弹出授权窗口')
|
||||
console.log('❌ 用户未授权,显示授权弹窗');
|
||||
showAuthModal();
|
||||
// 即使未授权也标记登录为完成,避免一直加载
|
||||
checkInitComplete({ userLogin: true });
|
||||
}
|
||||
},
|
||||
fail: (error) => {
|
||||
console.error('获取授权状态失败:', error);
|
||||
// 标记为完成,避免一直加载
|
||||
checkInitComplete({ userAuth: true, userLogin: true });
|
||||
Taro.showToast({
|
||||
title: '获取授权状态失败',
|
||||
icon: 'error',
|
||||
duration: 3000
|
||||
});
|
||||
}
|
||||
});
|
||||
// 获取用户信息
|
||||
@@ -121,6 +239,38 @@ function Home() {
|
||||
});
|
||||
}, []);
|
||||
|
||||
// 如果还在加载中,显示加载页面
|
||||
if (pageLoading) {
|
||||
return (
|
||||
<div className="flex flex-col items-center justify-center min-h-screen bg-gray-50 p-4">
|
||||
<div className="text-center">
|
||||
<div className="mb-6">
|
||||
<div className="animate-spin rounded-full h-16 w-16 border-b-2 border-blue-500 mx-auto"></div>
|
||||
</div>
|
||||
<div className="text-lg text-gray-700 mb-4">加载中...</div>
|
||||
<div className="text-sm text-gray-500 mb-6 space-y-1">
|
||||
<div>站点信息: {initStatus.shopInfo ? '✅ 完成' : '⏳ 加载中'}</div>
|
||||
<div>用户授权: {initStatus.userAuth ? '✅ 完成' : '⏳ 检查中'}</div>
|
||||
<div>用户登录: {initStatus.userLogin ? '✅ 完成' : '⏳ 登录中'}</div>
|
||||
</div>
|
||||
|
||||
{/* 如果加载时间过长,显示帮助按钮 */}
|
||||
<div className="space-y-3">
|
||||
<button
|
||||
className="px-4 py-2 bg-blue-500 text-white rounded-lg text-sm"
|
||||
onClick={() => showNetworkDiagnosis(BaseUrl)}
|
||||
>
|
||||
网络诊断
|
||||
</button>
|
||||
<div className="text-xs text-gray-400">
|
||||
如果长时间无响应,请点击网络诊断
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
);
|
||||
}
|
||||
|
||||
return (
|
||||
<>
|
||||
<Sticky threshold={0} onChange={() => onSticky(arguments)}>
|
||||
|
||||
155
src/utils/networkCheck.ts
Normal file
155
src/utils/networkCheck.ts
Normal file
@@ -0,0 +1,155 @@
|
||||
import Taro from '@tarojs/taro';
|
||||
|
||||
/**
|
||||
* 网络连接检测工具
|
||||
*/
|
||||
export class NetworkChecker {
|
||||
/**
|
||||
* 检查网络连接状态
|
||||
*/
|
||||
static async checkNetworkStatus(): Promise<{
|
||||
isConnected: boolean;
|
||||
networkType: string;
|
||||
message: string;
|
||||
}> {
|
||||
try {
|
||||
const networkInfo = await Taro.getNetworkType();
|
||||
const isConnected = networkInfo.networkType !== 'none';
|
||||
|
||||
return {
|
||||
isConnected,
|
||||
networkType: networkInfo.networkType,
|
||||
message: isConnected
|
||||
? `网络连接正常 (${networkInfo.networkType})`
|
||||
: '网络连接异常'
|
||||
};
|
||||
} catch (error) {
|
||||
console.error('检查网络状态失败:', error);
|
||||
return {
|
||||
isConnected: false,
|
||||
networkType: 'unknown',
|
||||
message: '无法检测网络状态'
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 测试API连接
|
||||
*/
|
||||
static async testAPIConnection(baseUrl: string): Promise<{
|
||||
success: boolean;
|
||||
responseTime: number;
|
||||
message: string;
|
||||
}> {
|
||||
const startTime = Date.now();
|
||||
|
||||
try {
|
||||
const response = await Taro.request({
|
||||
url: `${baseUrl}/health`,
|
||||
method: 'GET',
|
||||
timeout: 5000
|
||||
});
|
||||
|
||||
const responseTime = Date.now() - startTime;
|
||||
|
||||
return {
|
||||
success: response.statusCode === 200,
|
||||
responseTime,
|
||||
message: `API连接${response.statusCode === 200 ? '正常' : '异常'} (${responseTime}ms)`
|
||||
};
|
||||
} catch (error) {
|
||||
const responseTime = Date.now() - startTime;
|
||||
console.error('API连接测试失败:', error);
|
||||
|
||||
return {
|
||||
success: false,
|
||||
responseTime,
|
||||
message: `API连接失败 (${responseTime}ms): ${error}`
|
||||
};
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 综合网络诊断
|
||||
*/
|
||||
static async diagnoseNetwork(baseUrl: string): Promise<{
|
||||
network: any;
|
||||
api: any;
|
||||
suggestions: string[];
|
||||
}> {
|
||||
console.log('🔍 开始网络诊断...');
|
||||
|
||||
const network = await this.checkNetworkStatus();
|
||||
const api = await this.testAPIConnection(baseUrl);
|
||||
|
||||
const suggestions: string[] = [];
|
||||
|
||||
if (!network.isConnected) {
|
||||
suggestions.push('请检查网络连接');
|
||||
suggestions.push('尝试切换网络环境(WiFi/移动数据)');
|
||||
}
|
||||
|
||||
if (!api.success) {
|
||||
suggestions.push('服务器可能暂时不可用');
|
||||
suggestions.push('请稍后重试');
|
||||
if (api.responseTime > 10000) {
|
||||
suggestions.push('网络响应较慢,建议检查网络质量');
|
||||
}
|
||||
}
|
||||
|
||||
if (network.networkType === 'wifi') {
|
||||
suggestions.push('WiFi连接正常,如仍有问题请检查路由器');
|
||||
} else if (network.networkType === '4g' || network.networkType === '5g') {
|
||||
suggestions.push('移动网络连接,请确保有足够的流量');
|
||||
}
|
||||
|
||||
console.log('📊 网络诊断结果:', { network, api, suggestions });
|
||||
|
||||
return { network, api, suggestions };
|
||||
}
|
||||
|
||||
/**
|
||||
* 显示网络诊断结果
|
||||
*/
|
||||
static async showNetworkDiagnosis(baseUrl: string) {
|
||||
Taro.showLoading({ title: '诊断网络中...', mask: true });
|
||||
|
||||
try {
|
||||
const diagnosis = await this.diagnoseNetwork(baseUrl);
|
||||
Taro.hideLoading();
|
||||
|
||||
const content = [
|
||||
`网络状态: ${diagnosis.network.message}`,
|
||||
`API连接: ${diagnosis.api.message}`,
|
||||
'',
|
||||
'建议:',
|
||||
...diagnosis.suggestions.map(s => `• ${s}`)
|
||||
].join('\n');
|
||||
|
||||
Taro.showModal({
|
||||
title: '网络诊断结果',
|
||||
content,
|
||||
showCancel: false,
|
||||
confirmText: '知道了'
|
||||
});
|
||||
} catch (error) {
|
||||
Taro.hideLoading();
|
||||
console.error('网络诊断失败:', error);
|
||||
|
||||
Taro.showModal({
|
||||
title: '诊断失败',
|
||||
content: '无法完成网络诊断,请检查网络连接后重试',
|
||||
showCancel: false,
|
||||
confirmText: '知道了'
|
||||
});
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 便捷方法
|
||||
*/
|
||||
export const checkNetwork = () => NetworkChecker.checkNetworkStatus();
|
||||
export const testAPI = (baseUrl: string) => NetworkChecker.testAPIConnection(baseUrl);
|
||||
export const diagnoseNetwork = (baseUrl: string) => NetworkChecker.diagnoseNetwork(baseUrl);
|
||||
export const showNetworkDiagnosis = (baseUrl: string) => NetworkChecker.showNetworkDiagnosis(baseUrl);
|
||||
Reference in New Issue
Block a user