Merge branch 'demo' into dev

# Conflicts:
#	src/pages/user/components/UserCard.tsx

src/pages/index/BestSellers.tsx

@@ -51,30 +51,8 @@ const BestSellers = () => {
     reload()
   }, [])
 
-  // 分享给好友
-  useShareAppMessage(() => {
-    return {
-      title: goods?.name || '精选商品',
-      path: `/shop/goodsDetail/index?id=${goods?.goodsId}`,
-      imageUrl: goods?.image, // 分享图片
-      success: function (res: any) {
-        console.log('分享成功', res);
-        Taro.showToast({
-          title: '分享成功',
-          icon: 'success',
-          duration: 2000
-        });
-      },
-      fail: function (res: any) {
-        console.log('分享失败', res);
-        Taro.showToast({
-          title: '分享失败',
-          icon: 'none',
-          duration: 2000
-        });
-      }
-    };
-  });
+  // 注意：不在这里配置分享，避免与首页分享冲突
+  // 商品分享应该在商品详情页处理，首页分享应该分享首页本身
 
   return (
     <>

src/pages/index/Header.tsx

@@ -173,9 +173,10 @@ const Header = (props: any) => {
   return (
     <>
       <View className={'fixed top-0 header-bg'} style={{
-        height: !props.stickyStatus ? '180px' : '148px',
+        height: !props.stickyStatus ? '180px' : 'auto',
+        paddingBottom: '12px'
       }}>
-        <MySearch/>
+        <MySearch statusBarHeight={statusBarHeight} />
         {/*{!props.stickyStatus && <MySearch done={reload}/>}*/}
       </View>
       <NavBar

src/pages/index/MySearch.tsx

@@ -4,7 +4,7 @@ import {useState} from "react";
 import Taro from '@tarojs/taro';
 import { goTo } from '@/utils/navigation';
 
-function MySearch() {
+function MySearch(props: any) {
   const [keywords, setKeywords] = useState<string>('')
 
   const onKeywords = (keywords: string) => {
@@ -39,7 +39,7 @@ function MySearch() {
             background: '#ffffff',
             padding: '0 5px',
             borderRadius: '20px',
-            marginTop: '100px',
+            marginTop: `${props.statusBarHeight + 50}px`,
           }}
         >
           <Search size={18} className={'ml-2 text-gray-400'}/>

src/pages/index/index.tsx

@@ -47,14 +47,27 @@ function Home() {
   }
 
   useShareAppMessage(() => {
+    // 获取当前用户ID，用于生成邀请链接
+    const userId = Taro.getStorageSync('UserId');
+
     return {
-      title: '网宿小店 - 网宿软件',
-      path: `/pages/index/index`,
+      title: '时里院子市集',
+      path: userId ? `/pages/index/index?inviter=${userId}&source=share&t=${Date.now()}` : `/pages/index/index`,
       success: function () {
-        console.log('分享成功');
+        console.log('首页分享成功');
+        Taro.showToast({
+          title: '分享成功',
+          icon: 'success',
+          duration: 2000
+        });
       },
       fail: function () {
-        console.log('分享失败');
+        console.log('首页分享失败');
+        Taro.showToast({
+          title: '分享失败',
+          icon: 'none',
+          duration: 2000
+        });
       }
     };
   });
@@ -185,18 +198,32 @@ function Home() {
       });
     });
 
-    // 检查是否有待处理的邀请关系
+    // 检查是否有待处理的邀请关系 - 异步处理，不阻塞页面加载
     if (hasPendingInvite()) {
       console.log('检测到待处理的邀请关系')
-      // 延迟处理，确保用户信息已加载
+      // 延迟处理，确保用户信息已加载，并设置超时保护
       setTimeout(async () => {
         try {
-          const success = await checkAndHandleInviteRelation()
+          // 设置超时保护，避免长时间等待
+          const timeoutPromise = new Promise((_, reject) =>
+            setTimeout(() => reject(new Error('邀请关系处理超时')), 8000)
+          );
+
+          const invitePromise = checkAndHandleInviteRelation();
+
+          const success = await Promise.race([invitePromise, timeoutPromise]);
           if (success) {
             console.log('首页邀请关系处理成功')
           }
         } catch (error) {
           console.error('首页邀请关系处理失败:', error)
+          // 邀请关系处理失败不应该影响页面正常显示
+          // 可以选择清除邀请参数，避免重复尝试
+          const errorMessage = error instanceof Error ? error.message : String(error)
+          if (errorMessage?.includes('超时')) {
+            console.log('邀请关系处理超时，清除邀请参数')
+            // 可以选择清除邀请参数或稍后重试
+          }
         }
       }, 2000)
     }