feat(dealer/team): 实现经销商团队多层级查看功能
- 添加层级栈管理,支持返回上一层功能 - 增加加载状态显示 - 优化团队成员列表展示,增加可查看下级成员的提示 - 添加返回上一层按钮 - 修复了一些与团队成员数据相关的小问题
This commit is contained in:
@@ -27,7 +27,7 @@ export function useUniversalScanner(props: UniversalScannerProps = {}) {
|
||||
showToast = true
|
||||
} = props;
|
||||
|
||||
const { user, isLoggedIn, isAdmin, loginUser } = useUser();
|
||||
const { user, isLoggedIn, isAdmin } = useUser();
|
||||
|
||||
/**
|
||||
* 启动扫码
|
||||
@@ -95,7 +95,7 @@ export function useUniversalScanner(props: UniversalScannerProps = {}) {
|
||||
|
||||
} catch (error) {
|
||||
console.error('处理扫码结果失败:', error);
|
||||
const errorMsg = error.message || '处理扫码结果失败';
|
||||
const errorMsg = error instanceof Error ? error.message : '处理扫码结果失败';
|
||||
if (showToast) {
|
||||
Taro.showToast({
|
||||
title: errorMsg,
|
||||
@@ -157,7 +157,6 @@ export function useUniversalScanner(props: UniversalScannerProps = {}) {
|
||||
platform: 'miniprogram',
|
||||
wechatInfo: {
|
||||
openid: user?.openid,
|
||||
unionid: user?.unionid,
|
||||
nickname: user?.nickname || user?.realName,
|
||||
avatar: user?.avatar
|
||||
}
|
||||
@@ -194,12 +193,13 @@ export function useUniversalScanner(props: UniversalScannerProps = {}) {
|
||||
|
||||
// 根据错误类型显示不同的提示
|
||||
let errorMessage = '登录确认失败';
|
||||
if (error.message?.includes('过期')) {
|
||||
const errorMsg = error instanceof Error ? error.message : '';
|
||||
if (errorMsg?.includes('过期')) {
|
||||
errorMessage = '二维码已过期,请重新生成';
|
||||
} else if (error.message?.includes('无效')) {
|
||||
} else if (errorMsg?.includes('无效')) {
|
||||
errorMessage = '无效的登录二维码';
|
||||
} else if (error.message) {
|
||||
errorMessage = error.message;
|
||||
} else if (errorMsg) {
|
||||
errorMessage = errorMsg;
|
||||
}
|
||||
|
||||
if (showToast) {
|
||||
@@ -294,10 +294,12 @@ export function useUniversalScanner(props: UniversalScannerProps = {}) {
|
||||
*/
|
||||
const UniversalScanner: React.FC<UniversalScannerProps> = (props) => {
|
||||
const { startScan } = useUniversalScanner(props);
|
||||
|
||||
console.log(startScan,'startScan333')
|
||||
// 这个组件主要提供Hook,不渲染UI
|
||||
// 如果需要可以返回一个扫码按钮
|
||||
return null;
|
||||
};
|
||||
|
||||
|
||||
|
||||
export default UniversalScanner;
|
||||
|
||||
Reference in New Issue
Block a user