developer/template-10560
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
- 优先从 query.scene 中解析邀请信息
- 增加对 uid_xxxxx 格式参数的处理
- 优化 key=value&key=value格式参数的解析
-兼容旧版本 scene 参数解析- 更新邀请关系建立 API调用
This commit is contained in:
赵忠林
2025-09-05 12:04:07 +08:00
parent b233407020
commit 0494fd01d0
8 changed files with 176 additions and 109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
config/env.ts
View File

@@ -2,7 +2,7 @@
export const ENV_CONFIG = {
// 开发环境
development: {
API_BASE_URL: 'http://127.0.0.1:9200/api',
API_BASE_URL: 'https://cms-api.websoft.top/api',
APP_NAME: '开发环境',
DEBUG: 'true',
},

3
src/api/system/file/index.ts
View File

@@ -1,6 +1,7 @@
import request from '@/utils/request';
import Taro from '@tarojs/taro'
import dayjs from 'dayjs';
// @ts-ignore
import crypto from 'crypto-js';
import {Base64} from 'js-base64';
import {FileRecord} from "@/api/system/file/model";
@@ -49,7 +50,7 @@ export async function uploadOssByPath(filePath: string) {
})
}
const computeSignature = (accessKeySecret, canonicalString) => {
const computeSignature = (accessKeySecret: string, canonicalString: string) => {
return crypto.enc.Base64.stringify(crypto.HmacSHA1(canonicalString, accessKeySecret));
}

16
src/app.ts
View File

@@ -70,14 +70,14 @@ function App(props: { children: any; }) {
// 统计邀请来源
trackInviteSource(inviteParams.source || 'unknown', parseInt(inviteParams.inviter || '0'))
// 显示邀请提示
setTimeout(() => {
Taro.showToast({
title: '检测到邀请信息',
icon: 'success',
duration: 2000
})
}, 1000)
// 检测到邀请信息
// setTimeout(() => {
// Taro.showToast({
// title: '检测到邀请信息',
// icon: 'success',
// duration: 2000
// })
// }, 1000)
}
} catch (error) {
console.error('处理启动参数失败:', error)

2
src/components/UserProfile.tsx
View File

@@ -1,5 +1,5 @@
import React from 'react';
import { View, Text, Image } from '@tarojs/components';
import { View, Text } from '@tarojs/components';
import { Button, Avatar } from '@nutui/nutui-react-taro';
import { useUser } from '@/hooks/useUser';
import navTo from '@/utils/common';

35
src/pages/index/Header.tsx
View File

@@ -12,6 +12,8 @@ import {handleInviteRelation} from "@/utils/invite";
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,7 +37,7 @@ const Header = (props: any) => {
})
// 注意：商店信息现在通过useShopInfo自动管理，不需要手动获取
// 获取用户信息
getUserInfo().then((data) => {
const data = await getUserInfo();
if (data) {
setIsLogin(true);
console.log('用户信息>>>', data.phone)
@@ -72,17 +78,14 @@ const Header = (props: any) => {
Taro.setStorageSync('RoleCode', 'user')
return false;
}
}
}).catch(() => {
setIsLogin(false);
console.log('未登录')
});
// 认证信息
myUserVerify({status: 1}).then(data => {
if (data?.realName) {
Taro.setStorageSync('RealName', data.realName)
}
})
setUserInfo(data)
}
}
/* 获取用户手机号 */
@@ -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>
</>

8
src/pages/index/HeaderWithHook.tsx
View File

@@ -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('获取认证信息失败')

87
src/utils/invite.ts
View File

@@ -1,5 +1,5 @@
import Taro from '@tarojs/taro'
import { createInviteRelation } from '@/api/invite'
import {bindRefereeRelation} from "@/api/invite";
/**
* 邀请参数接口
@@ -15,11 +15,27 @@ export interface InviteParams {
*/
export function parseInviteParams(options: any): InviteParams | null {
try {
// 从 scene 参数中解析邀请信息
if (options.scene) {
// 确保 scene 是字符串类型
const sceneStr = typeof options.scene === 'string' ? options.scene : String(options.scene)
console.log('解析邀请参数:', options)
// 优先从 query.scene 中解析邀请信息
if (options.query && options.query.scene) {
const sceneStr = typeof options.query.scene === 'string' ? options.query.scene : String(options.query.scene)
console.log('从 query.scene 解析:', sceneStr)
// 处理 uid_xxxxx 格式的参数
if (sceneStr.startsWith('uid_')) {
const uid = sceneStr.replace('uid_', '')
if (uid) {
return {
inviter: uid,
source: 'qrcode',
t: String(Date.now())
}
}
}
// 处理 key=value&key=value 格式的参数
if (sceneStr.includes('=')) {
const params: InviteParams = {}
const pairs = sceneStr.split('&')
@@ -28,6 +44,7 @@ export function parseInviteParams(options: any): InviteParams | null {
if (key && value) {
switch (key) {
case 'inviter':
case 'uid':
params.inviter = decodeURIComponent(value)
break
case 'source':
@@ -40,7 +57,56 @@ export function parseInviteParams(options: any): InviteParams | null {
}
})
return params.inviter ? params : null
if (params.inviter) {
return params
}
}
}
// 从 scene 参数中解析邀请信息（兼容旧版本）
if (options.scene) {
const sceneStr = typeof options.scene === 'string' ? options.scene : String(options.scene)
console.log('从 scene 解析:', sceneStr)
// 处理 uid_xxxxx 格式的参数
if (sceneStr.startsWith('uid_')) {
const uid = sceneStr.replace('uid_', '')
if (uid) {
return {
inviter: uid,
source: 'qrcode',
t: String(Date.now())
}
}
}
// 处理 key=value&key=value 格式的参数
if (sceneStr.includes('=')) {
const params: InviteParams = {}
const pairs = sceneStr.split('&')
pairs.forEach((pair: string) => {
const [key, value] = pair.split('=')
if (key && value) {
switch (key) {
case 'inviter':
case 'uid':
params.inviter = decodeURIComponent(value)
break
case 'source':
params.source = decodeURIComponent(value)
break
case 't':
params.t = decodeURIComponent(value)
break
}
}
})
if (params.inviter) {
return params
}
}
}
// 从 query 参数中解析邀请信息（兼容旧版本）
@@ -132,12 +198,11 @@ export async function handleInviteRelation(userId: number): Promise<boolean> {
}
// 建立邀请关系
await createInviteRelation({
inviterId: inviterId,
inviteeId: userId,
await bindRefereeRelation({
dealerId: inviterId,
userId: userId,
source: inviteParams.source || 'unknown',
scene: `inviter=${inviterId}&source=${inviteParams.source}&t=${inviteParams.t}`,
inviteTime: new Date().toISOString()
scene: `inviter=${inviterId}&source=${inviteParams.source}&t=${inviteParams.t}`
})
// 清除本地存储的邀请参数

6
src/utils/request.ts
View File

@@ -172,9 +172,9 @@ const handleAuthError = () => {
duration: 2000
});
setTimeout(() => {
Taro.reLaunch({ url: '/passport/login' });
}, 2000);
// setTimeout(() => {
// Taro.reLaunch({ url: '/passport/login' });
// }, 2000);
};
// 错误处理