From 12858c6a3ea1d3bf81f74889e6750adfd1f66895 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E5=BF=A0=E6=9E=97?= <170083662@qq.com>
Date: Wed, 21 Jan 2026 17:13:37 +0800
Subject: [PATCH] =?UTF-8?q?feat(user):=20=E6=9B=B4=E6=96=B0=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80=E5=92=8C=E5=8A=9F?=
 =?UTF-8?q?=E8=83=BD=E9=85=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在用户页面添加导航栏并集成状态栏高度适配
- 修改用户卡片组件的高度设置和隐藏余额积分等显示项
- 更新用户中心菜单项标题和功能跳转逻辑
- 调整经销商申请表单中的邀请人ID输入框启用状态
- 修复登录验证跳转逻辑中的特定页面判断条件
- 更新项目配置文件中的微信小程序应用ID
- 移除首页头部的品牌标识和下拉箭头图标显示
---
 project.config.json                    |  2 +-
 src/dealer/apply/add.tsx               |  4 +--
 src/pages/index/Header.tsx             | 11 ++-----
 src/pages/user/components/UserCard.tsx | 44 +++++++++++++-------------
 src/pages/user/components/UserCell.tsx |  6 ++--
 src/pages/user/user.tsx                | 33 ++++++++++++++++++-
 src/utils/common.ts                    |  2 +-
 7 files changed, 63 insertions(+), 39 deletions(-)

diff --git a/project.config.json b/project.config.json
index 0838f2c..f086173 100644
--- a/project.config.json
+++ b/project.config.json
@@ -2,7 +2,7 @@
 	"miniprogramRoot": "dist/",
 	"projectname": "template-10582",
 	"description": "南南佐顿门窗",
-	"appid": "wx51962d6ac21f2ed2",
+	"appid": "wx644669e2da8d6519",
 	"setting": {
 		"urlCheck": true,
 		"es6": false,
diff --git a/src/dealer/apply/add.tsx b/src/dealer/apply/add.tsx
index 674ed61..bd26cd5 100644
--- a/src/dealer/apply/add.tsx
+++ b/src/dealer/apply/add.tsx
@@ -135,7 +135,7 @@ const AddUserAddress = () => {
       console.log('正在提交中，请勿重复点击')
       return
     }
-    
+
     setSubmitting(true)
     try {
       // 验证必填字段
@@ -412,7 +412,7 @@ const AddUserAddress = () => {
         <View className={'bg-gray-100 h-3'}></View>
         <CellGroup style={{padding: '4px 0'}}>
           <Form.Item name="refereeId" label="邀请人ID" initialValue={FormData?.refereeId} required>
-            <Input placeholder="邀请人ID" disabled={true}/>
+            <Input placeholder="邀请人ID"/>
           </Form.Item>
           <Form.Item name="phone" label="手机号" initialValue={FormData?.phone} required>
             <View className="flex items-center justify-between">
diff --git a/src/pages/index/Header.tsx b/src/pages/index/Header.tsx
index 1fe1e3f..ac551e8 100644
--- a/src/pages/index/Header.tsx
+++ b/src/pages/index/Header.tsx
@@ -1,8 +1,7 @@
 import {useEffect, useState} from "react";
 import Taro from '@tarojs/taro';
 import {Space} from '@nutui/nutui-react-taro'
-import {TriangleDown} from '@nutui/icons-react-taro'
-import {Avatar, NavBar} from '@nutui/nutui-react-taro'
+import {NavBar} from '@nutui/nutui-react-taro'
 import {getWxOpenId} from "@/api/layout";
 // import {TenantId} from "@/config/app";
 import {getOrganization} from "@/api/system/organization";
@@ -20,7 +19,6 @@ import {getShopDealerRefereeByUserId} from "@/api/shop/shopDealerReferee";
 const Header = (props: any) => {
   // 使用新的useShopInfo Hook
   const {
-    getWebsiteLogo,
     getWebsiteName
   } = useShopInfo();
 
@@ -260,12 +258,7 @@ const Header = (props: any) => {
           </Space>
         ) : (
           <View style={{display: 'flex', alignItems: 'center'}}>
-            <Avatar
-              size="22"
-              src={getWebsiteLogo()}
-            />
-            <Text className={'text-xs'} style={{color: '#ffffff'}}>{getWebsiteName()}</Text>
-            <TriangleDown size={9} className={'text-white'}/>
+            <Text className={'text-lg'} style={{color: '#ffffff'}}>{getWebsiteName()}</Text>
           </View>
         )}
       </NavBar>
diff --git a/src/pages/user/components/UserCard.tsx b/src/pages/user/components/UserCard.tsx
index 5fefc6e..f337c19 100644
--- a/src/pages/user/components/UserCard.tsx
+++ b/src/pages/user/components/UserCard.tsx
@@ -162,7 +162,7 @@ function UserCard() {
             background: 'linear-gradient(to bottom, #ffffff, #ffffff)', // 这种情况建议使用类名来控制样式（引入外联样式）
             // width: '720rpx',
             // margin: '10px auto 0px auto',
-            height: '170px',
+            height: '120px',
             // borderRadius: '22px 22px 0 0',
           }}
         >
@@ -198,27 +198,27 @@ function UserCard() {
               </View>
             </View>
           </View>
-          <View className={'flex justify-around mt-1'}>
-            <View className={'item flex justify-center flex-col items-center'}
-                  onClick={() => navTo('/user/wallet/wallet', true)}>
-              <Text className={'text-sm text-gray-500'}>余额</Text>
-              <Text className={'text-xl'}>{data?.balance || '0.00'}</Text>
-            </View>
-            <View className={'item flex justify-center flex-col items-center'}>
-              <Text className={'text-sm text-gray-500'}>积分</Text>
-              <Text className={'text-xl'}>{data?.points || 0}</Text>
-            </View>
-            <View className={'item flex justify-center flex-col items-center'}
-                  onClick={() => navTo('/user/coupon/index', true)}>
-              <Text className={'text-sm text-gray-500'}>优惠券</Text>
-              <Text className={'text-xl'}>{data?.coupons || 0}</Text>
-            </View>
-            <View className={'item flex justify-center flex-col items-center'}
-                  onClick={() => navTo('/user/gift/index', true)}>
-              <Text className={'text-sm text-gray-500'}>礼品卡</Text>
-              <Text className={'text-xl'}>{data?.giftCards || 0}</Text>
-            </View>
-          </View>
+          {/*<View className={'flex justify-around mt-1'}>*/}
+          {/*  <View className={'item flex justify-center flex-col items-center'}*/}
+          {/*        onClick={() => navTo('/user/wallet/wallet', true)}>*/}
+          {/*    <Text className={'text-sm text-gray-500'}>余额</Text>*/}
+          {/*    <Text className={'text-xl'}>{data?.balance || '0.00'}</Text>*/}
+          {/*  </View>*/}
+          {/*  <View className={'item flex justify-center flex-col items-center'}>*/}
+          {/*    <Text className={'text-sm text-gray-500'}>积分</Text>*/}
+          {/*    <Text className={'text-xl'}>{data?.points || 0}</Text>*/}
+          {/*  </View>*/}
+          {/*  <View className={'item flex justify-center flex-col items-center'}*/}
+          {/*        onClick={() => navTo('/user/coupon/index', true)}>*/}
+          {/*    <Text className={'text-sm text-gray-500'}>优惠券</Text>*/}
+          {/*    <Text className={'text-xl'}>{data?.coupons || 0}</Text>*/}
+          {/*  </View>*/}
+          {/*  <View className={'item flex justify-center flex-col items-center'}*/}
+          {/*        onClick={() => navTo('/user/gift/index', true)}>*/}
+          {/*    <Text className={'text-sm text-gray-500'}>礼品卡</Text>*/}
+          {/*    <Text className={'text-xl'}>{data?.giftCards || 0}</Text>*/}
+          {/*  </View>*/}
+          {/*</View>*/}
         </View>
       </View>
     </View>
diff --git a/src/pages/user/components/UserCell.tsx b/src/pages/user/components/UserCell.tsx
index 7aa218d..3ca229c 100644
--- a/src/pages/user/components/UserCell.tsx
+++ b/src/pages/user/components/UserCell.tsx
@@ -117,17 +117,17 @@ const UserCell = () => {
         }>
           <Cell
             className="nutui-cell-clickable"
-            title="账号安全"
+            title="个人资料"
             align="center"
             extra={<ArrowRight color="#cccccc" size={18}/>}
             onClick={() => navTo('/user/profile/profile', true)}
           />
           <Cell
             className="nutui-cell-clickable"
-            title="切换主题"
+            title="返回首页"
             align="center"
             extra={<ArrowRight color="#cccccc" size={18}/>}
-            onClick={() => navTo('/user/theme/index', true)}
+            onClick={() => Taro.reLaunch({url: '/pages/index/index'})}
           />
           <Cell
             className="nutui-cell-clickable"
diff --git a/src/pages/user/user.tsx b/src/pages/user/user.tsx
index 4bf1d65..c19225d 100644
--- a/src/pages/user/user.tsx
+++ b/src/pages/user/user.tsx
@@ -1,18 +1,27 @@
-import {useEffect} from 'react'
+import {useEffect, useState} from 'react'
+import Taro from '@tarojs/taro';
 import UserCard from "./components/UserCard";
 import UserOrder from "./components/UserOrder";
 import UserCell from "./components/UserCell";
 import UserFooter from "./components/UserFooter";
 import {useUser} from "@/hooks/useUser";
+import {NavBar} from '@nutui/nutui-react-taro';
+import {Home} from '@nutui/icons-react-taro'
 import './user.scss'
 import IsDealer from "./components/IsDealer";
 
 function User() {
+  const [statusBarHeight, setStatusBarHeight] = useState<number>()
   const {
     isAdmin
   } = useUser();
 
   useEffect(() => {
+    Taro.getSystemInfo({
+      success: (res) => {
+        setStatusBarHeight(res.statusBarHeight)
+      },
+    })
   }, []);
 
   /**
@@ -34,6 +43,28 @@ function User() {
 
   return (
     <>
+      <NavBar
+        fixed={true}
+        style={{marginTop: `${statusBarHeight}px`, backgroundColor: 'transparent'}}
+        onBackClick={() => {
+        }}
+        left={
+          <div style={{
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'center',
+            width: '30px',
+            height: '30px',
+            backgroundColor: 'white',
+            textAlign: 'center',
+            borderRadius: '50%',
+          }}>
+            <Home size={15} onClick={() => Taro.reLaunch({url: '/pages/index/index'})} style={{color: 'black', marginBottom: '1px'}} />
+          </div>
+        }
+      >
+        <span>我的</span>
+      </NavBar>
       <div className={'w-full'} style={{
         background: 'linear-gradient(to bottom, #e9fff2, #f9fafb)'
       }}>
diff --git a/src/utils/common.ts b/src/utils/common.ts
index ef152e8..4938f63 100644
--- a/src/utils/common.ts
+++ b/src/utils/common.ts
@@ -1,7 +1,7 @@
 import Taro from '@tarojs/taro'
 
 export default function navTo(url: string, isLogin = false) {
-  if (isLogin) {
+  if (isLogin && url != '/pages/user/user') {
     if (!Taro.getStorageSync('access_token') || !Taro.getStorageSync('UserId')) {
       Taro.showToast({
         title: '请先登录',