refactor(invite): 重构邀请参数解析逻辑

- 优先从 query.scene 中解析邀请信息 - 增加对 uid_xxxxx 格式参数的处理 - 优化 key=value&key=value格式参数的解析 -兼容旧版本 scene 参数解析- 更新邀请关系建立 API调用
2025-09-05 12:04:07 +08:00
parent b233407020
commit 0494fd01d0
8 changed files with 176 additions and 109 deletions
--- a/src/pages/index/Header.tsx
+++ b/src/pages/index/Header.tsx
@@ -7,11 +7,13 @@ import {getUserInfo, getWxOpenId} from "@/api/layout";
 import {TenantId} from "@/config/app";
 import {getOrganization} from "@/api/system/organization";
 import {myUserVerify} from "@/api/system/userVerify";
-import { useShopInfo } from '@/hooks/useShopInfo';
+import {useShopInfo} from '@/hooks/useShopInfo';
 import {handleInviteRelation} from "@/utils/invite";
-import {View,Text} from '@tarojs/components'
+import {View, Text} from '@tarojs/components'
 import MySearch from "./MySearch";
 import './Header.scss';
+import navTo from "@/utils/common";
+import {User} from "@/api/system/user/model";

 const Header = (props: any) => {
  // 使用新的useShopInfo Hook
@@ -22,6 +24,10 @@ const Header = (props: any) => {

  const [IsLogin, setIsLogin] = useState<boolean>(true)
  const [statusBarHeight, setStatusBarHeight] = useState<number>()
+  const [userInfo, setUserInfo] = useState<User>({
+    avatar: '',
+    mobile: '未登录'
+  })

  const reload = async () => {
    Taro.getSystemInfo({
@@ -31,62 +37,59 @@ const Header = (props: any) => {
    })
    // 注意：商店信息现在通过useShopInfo自动管理，不需要手动获取
    // 获取用户信息
-    getUserInfo().then((data) => {
-      if (data) {
-        setIsLogin(true);
-        console.log('用户信息>>>', data.phone)
-        // 保存userId
-        Taro.setStorageSync('UserId', data.userId)
-        // 获取openId
-        if (!data.openid) {
-          Taro.login({
-            success: (res) => {
-              getWxOpenId({code: res.code}).then(() => {
-              })
-            }
-          })
-        }
-        // 是否已认证
-        if (data.certification) {
-          Taro.setStorageSync('Certification', '1')
-        }
-        // 机构ID
-        Taro.setStorageSync('OrganizationId', data.organizationId)
-        // 父级机构ID
-        if (Number(data.organizationId) > 0) {
-          getOrganization(Number(data.organizationId)).then(res => {
-            Taro.setStorageSync('OrganizationParentId', res.parentId)
-          })
-        }
-        // 管理员
-        const isKdy = data.roles?.findIndex(item => item.roleCode == 'admin')
-        if (isKdy != -1) {
-          Taro.setStorageSync('RoleName', '管理')
-          Taro.setStorageSync('RoleCode', 'admin')
-          return false;
-        }
-        // 注册用户
-        const isUser = data.roles?.findIndex(item => item.roleCode == 'user')
-        if (isUser != -1) {
-          Taro.setStorageSync('RoleName', '注册用户')
-          Taro.setStorageSync('RoleCode', 'user')
-          return false;
-        }
+    const data = await getUserInfo();
+    if (data) {
+      setIsLogin(true);
+      console.log('用户信息>>>', data.phone)
+      // 保存userId
+      Taro.setStorageSync('UserId', data.userId)
+      // 获取openId
+      if (!data.openid) {
+        Taro.login({
+          success: (res) => {
+            getWxOpenId({code: res.code}).then(() => {
+            })
+          }
+        })
      }
-    }).catch(() => {
-      setIsLogin(false);
-      console.log('未登录')
-    });
-    // 认证信息
-    myUserVerify({status: 1}).then(data => {
-      if (data?.realName) {
-        Taro.setStorageSync('RealName', data.realName)
+      // 是否已认证
+      if (data.certification) {
+        Taro.setStorageSync('Certification', '1')
      }
-    })
+      // 机构ID
+      Taro.setStorageSync('OrganizationId', data.organizationId)
+      // 父级机构ID
+      if (Number(data.organizationId) > 0) {
+        getOrganization(Number(data.organizationId)).then(res => {
+          Taro.setStorageSync('OrganizationParentId', res.parentId)
+        })
+      }
+      // 管理员
+      const isKdy = data.roles?.findIndex(item => item.roleCode == 'admin')
+      if (isKdy != -1) {
+        Taro.setStorageSync('RoleName', '管理')
+        Taro.setStorageSync('RoleCode', 'admin')
+        return false;
+      }
+      // 注册用户
+      const isUser = data.roles?.findIndex(item => item.roleCode == 'user')
+      if (isUser != -1) {
+        Taro.setStorageSync('RoleName', '注册用户')
+        Taro.setStorageSync('RoleCode', 'user')
+        return false;
+      }
+      // 认证信息
+      myUserVerify({status: 1}).then(data => {
+        if (data?.realName) {
+          Taro.setStorageSync('RealName', data.realName)
+        }
+      })
+      setUserInfo(data)
+    }
  }

  /* 获取用户手机号 */
-  const handleGetPhoneNumber = ({detail}: {detail: {code?: string, encryptedData?: string, iv?: string}}) => {
+  const handleGetPhoneNumber = ({detail}: { detail: { code?: string, encryptedData?: string, iv?: string } }) => {
    const {code, encryptedData, iv} = detail
    Taro.login({
      success: function () {
@@ -167,7 +170,16 @@ const Header = (props: any) => {
        onBackClick={() => {
        }}
        left={
-          !IsLogin ? (
+          IsLogin ? (
+            <View style={{display: 'flex', alignItems: 'center', gap: '8px'}} onClick={() => navTo(`/user/profile/profile`,true)}>
+              <Avatar
+                size="22"
+                src={userInfo?.avatar}
+              />
+              <Text className={'text-white'}>{userInfo?.mobile}</Text>
+              <TriangleDown className={'text-white'} size={9}/>
+            </View>
+          ) : (
            <View style={{display: 'flex', alignItems: 'center'}}>
              <Button style={{color: '#ffffff'}} open-type="getPhoneNumber" onGetPhoneNumber={handleGetPhoneNumber}>
                <Space>
@@ -180,15 +192,6 @@ const Header = (props: any) => {
                </Space>
              </Button>
            </View>
-          ) : (
-            <View style={{display: 'flex', alignItems: 'center', gap: '8px'}}>
-              <Avatar
-                size="22"
-                src={getWebsiteLogo()}
-              />
-              <Text className={'text-white'}>{getWebsiteName()}</Text>
-              <TriangleDown className={'text-white'} size={9}/>
-            </View>
          )}>
      </NavBar>
    </>
--- a/src/pages/index/HeaderWithHook.tsx
+++ b/src/pages/index/HeaderWithHook.tsx
@@ -3,11 +3,10 @@ import Taro from '@tarojs/taro';
 import {Button, Space} from '@nutui/nutui-react-taro'
 import {TriangleDown} from '@nutui/icons-react-taro'
 import {Popup, Avatar, NavBar} from '@nutui/nutui-react-taro'
-import {getUserInfo, getWxOpenId} from "@/api/layout";
+import {getWxOpenId} from "@/api/layout";
 import {TenantId} from "@/config/app";
 import {getOrganization} from "@/api/system/organization";
 import {myUserVerify} from "@/api/system/userVerify";
-import {User} from "@/api/system/user/model";
 import { useShopInfo } from '@/hooks/useShopInfo';
 import { useUser } from '@/hooks/useUser';
 import {handleInviteRelation} from "@/utils/invite";
@@ -17,7 +16,6 @@ import './Header.scss';
 const Header = (props: any) => {
  // 使用新的hooks
  const {
-    shopInfo,
    loading: shopLoading,
    getWebsiteName,
    getWebsiteLogo
@@ -56,14 +54,14 @@ const Header = (props: any) => {
    // 检查用户认证状态
    if (user?.userId) {
      // 获取组织信息
-      getOrganization({userId: user.userId}).then((data) => {
+      getOrganization(user.userId).then((data) => {
        console.log('组织信息>>>', data)
      }).catch(() => {
        console.log('获取组织信息失败')
      });

      // 检查用户认证
-      myUserVerify({userId: user.userId}).then((data) => {
+      myUserVerify({id: user.userId}).then((data) => {
        console.log('认证信息>>>', data)
      }).catch(() => {
        console.log('获取认证信息失败')