修复用户未/授权购买套餐价格计算 & 发布v1.6.0版本

.env.example

@@ -0,0 +1,4 @@
+# 开发环境配置
+API_BASE_URL=http://192.168.3.42:8080
+CLIENT_ID=web
+CLIENT_SECRET=web

.github/copilot-instructions.md

@@ -122,7 +122,7 @@ type UserProfile = ExtraResp<typeof getProfile>
 ## 环境变量
 
 需要配置:
-- `NEXT_PUBLIC_API_BASE_URL` - 后端 API 地址
+- `API_BASE_URL` - 后端 API 地址
 - `CLIENT_ID`, `CLIENT_SECRET` - OAuth2 设备认证凭据
 
 ## 部署

.gitignore

@@ -31,7 +31,7 @@ yarn-error.log*
 .pnpm-debug.log*
 
 # env files (can opt-in for committing if needed)
-.env*
+.env
 
 # vercel
 .vercel

.vscode/settings.json

@@ -7,4 +7,7 @@
     "[json]": {
         "editor.defaultFormatter": "vscode.json-language-features"
     },
+    "[typescriptreact]": {
+        "editor.defaultFormatter": "dbaeumer.vscode-eslint"
+    },
 }

Dockerfile

@@ -16,6 +16,7 @@ COPY . .
 
 ENV NEXT_TELEMETRY_DISABLED=1
 
+RUN mv .env.example .env
 RUN bun run build
 
 # 生产阶段
@@ -31,6 +32,7 @@ RUN adduser --system --uid 1001 nextjs
 COPY --from=builder /app/public ./public
 COPY --from=builder --chown=nextjs:nodejs /app/.next/standalone ./
 COPY --from=builder --chown=nextjs:nodejs /app/.next/static ./.next/static
+RUN rm .env
 
 USER nextjs
 

README.md

@@ -6,41 +6,108 @@
 
 购买页固定套餐
 
-优惠问题
-
-### 禁止直接依赖 form
-
-`\[(.*,)?form(,.*)?\]`
-
-### 次要
-
-业务定制页面每月需求用量，可选项需要确认是否合理
-
-页头高度降低
-
-帮助中心文档优化
-
-考虑重新组织导航栏
-- 产品购买
-- 提取 IP
-- 业务场景
-- 帮助中心
-- 大客户定制
-
-购买与提取手机端优化，尽量一页展示全部
-
-全部替换封装时间范围组件，检查结束时间字段手机端适配问题（需要尾部对齐）
-
-迁移到 tanstack form
-
-页尾链接完善跳转地址
-
 树组件优化
 
-### 架构改进
+## 目录结构
 
-考虑使用 swr 或 react query 来代替直接的服务端 react cache 缓存以及客户端 zustand 缓存，以将服务端请求的数据能够水合到客户端，避免重复请求
+```
+├── node_modules/       # 项目依赖包
+├── public/             # 静态资源（如 favicon、图片等，可直接通过根路径访问）
+├── src/                # 源代码目录
+│   ├── actions/        # 服务端操作或 API 逻辑（如 Server Actions）
+│   ├── app/            # Next.js 13+ App Router 目录，存放页面、布局、路由等
+|   |  ├── (api)/       # API 路由目录
+|   |  ├── (auth)/      # 认证相关页面
+|   |  ├── (home)/      # 首页模块
+|   |  ├── admin/       # 管理后台模块
+|   |       ├── effects.tsx           # 全局副作用/状态管理（如 Redux、SWR 初始化）
+|   |       ├── favicon.ico           # 网站图标
+|   |       ├── globals.css           # 全局样式
+|   |       └── layout.tsx            # 根布局组件（所有页面共享的布局结构）
+|   | 
+│   ├── assets/         # 项目资源文件（如图片、字体、样式等）
+│   ├── components/     # 可复用的 React 组件
+│   ├── lib/            # 工具函数、配置、服务等
+│   ├── mdx-components.tsx # MDX 组件配置
+│   └── proxy.ts        # 代理配置（如 API 代理）
+├── .dockerignore       # Docker 忽略文件
+├── .env                # 环境变量文件
+├── .gitignore          # Git 忽略文件
+├── .npmrc              # npm 配置
+├── bun.lock            # Bun 包管理器锁文件
+├── components.json     # 组件库配置（如 shadcn/ui）
+├── Dockerfile          # Docker 构建配置
+├── eslint.config.mjs   # ESLint 代码检查配置
+├── next-env.d.ts       # Next.js 类型声明
+├── next.config.ts      # Next.js 配置文件
+├── package.json        # 项目依赖和脚本
+├── postcss.config.mjs  # PostCSS 配置
+├── publish.ps1         # PowerShell 发布脚本
+├── README.md           # 项目说明文档
+└── tsconfig.json       # TypeScript 配置
+```
 
-### 需要确认
+## 技术栈
+| 类别 | 场景/库名 | 推荐方案/用途 |
+| :--- | :--- | :--- |
+| **状态管理** | 简单跨组件通信 | React Context |
+| | 复杂全局状态 | Zustand + persist |
+| | 服务端状态 | TanStack Query |
+| | 表单状态 | React Hook Form |
+| | 路由状态 | Next.js 内置 (useSearchParams, useParams) |
+| **核心框架** | Next.js | 服务框架 (React 全栈框架) |
+| **UI / 样式体系** | shadcn/ui | UI 组件库 |
+| | Radix UI | 无样式基础 UI 组件原语 |
+| | Tailwind CSS | CSS 框架 (原子化 CSS) |
+| | lucide-react | 图标库 |
+| **表单与数据验证** | React Hook Form | 表单状态管理及验证 |
+| | Zod | 数据验证与类型推断 |
+| **数据管理与通信** | Zustand | 全局状态管理库 |
+| | TanStack Query | 服务端状态管理 (数据请求、缓存) |
+| | TanStack Table | 无头 UI 表格库 |
+| **图表可视化** | Recharts | 图表库 |
+| **工具库** | date-fns | 日期时间处理库 |
+| | qrcode | QR 码生成库 |
 
-页面内操作是否需要关联到 url 上，以在使用后退功能时返回到上一次操作
+## 搭建开发环境
+
+项目基于 bun 运行，bun 是一个 typescript 原生的运行时环境，用于代替 nodejs，可以带来更高的性能提升。
+
+1. 拉取项目：`git clone https://43.226.58.254:53000/lanhu/web`
+2. 安装依赖包：`bun install`
+3. 创建环境变量文件 .env，复制 .env.example 中的内容到 .env，并根据实际情况修改
+4. 运行项目 `bun run dev`
+
+## 构建项目 & 版本管理
+
+1. 在 package.json 文件中修改版本号
+2. 构建并上传镜像, 终端运行 `./publish.ps1 <版本号>`
+3. 终端执行成功后在 `https://43.226.58.254:53000/lanhu/web` 发布最新版本
+
+生产环境的项目部署通过单独的部署脚本进行管理，前端开发上线只需要构建以及发布版本，无需考虑部署问题。
+
+## 开发规范 & 主要业务逻辑
+
+原型图：https://lanhuapp.com/link/#/invite?sid=lxgnSyga    
+
+### 快速创建前台新页面
+
+wrap.tsx ：新页面间距复用组件
+page.tsx：新页面统一布局
+stores：共享状态组件
+
+### 数据流与状态管理： 组件间通信方式
+
+- 通信方式：Props 父传子 / 回调函数 子传父 / Context 跨组件 useContext() / Zustand Store 全局状态管理useStore() / URL 参数 页面间状态共享 useSearchParams()
+路由与导航: 路由使用的Next.js App Router 架构 Server Actions  实现。
+
+### 认证与权限控制：登录流程-路由守卫(中间件)
+
+### 支付流程实现： 支付二维码生成
+
+### SSE 支付状态监听
+
+## 注意事项
+
+- 图片使用 Next.js Image 组件自动优化
+- 动态导入 (next/dynamic) 实现纯客户端组件

bun.lock

@@ -45,6 +45,7 @@
         "sonner": "^2.0.7",
         "tailwind-merge": "^3.4.0",
         "tailwindcss-animate": "^1.0.7",
+        "vaul": "^1.1.2",
         "zod": "^3.25.76",
         "zustand": "^5.0.9",
       },
@@ -1399,6 +1400,8 @@
 
     "util-deprecate": ["util-deprecate@1.0.2", "https://registry.npmmirror.com/util-deprecate/-/util-deprecate-1.0.2.tgz", {}, "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="],
 
+    "vaul": ["vaul@1.1.2", "https://registry.npmmirror.com/vaul/-/vaul-1.1.2.tgz", { "dependencies": { "@radix-ui/react-dialog": "^1.1.1" }, "peerDependencies": { "react": "^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc", "react-dom": "^16.8 || ^17.0 || ^18.0 || ^19.0.0 || ^19.0.0-rc" } }, "sha512-ZFkClGpWyI2WUQjdLJ/BaGuV6AVQiJ3uELGk3OYtP+B6yCO7Cmn9vPFXVJkRaGkOJu3m8bQMgtyzNHixULceQA=="],
+
     "vfile": ["vfile@6.0.3", "https://registry.npmmirror.com/vfile/-/vfile-6.0.3.tgz", { "dependencies": { "@types/unist": "^3.0.0", "vfile-message": "^4.0.0" } }, "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q=="],
 
     "vfile-message": ["vfile-message@4.0.3", "https://registry.npmmirror.com/vfile-message/-/vfile-message-4.0.3.tgz", { "dependencies": { "@types/unist": "^3.0.0", "unist-util-stringify-position": "^4.0.0" } }, "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw=="],

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lanhu-web",
-  "version": "1.1.0",
+  "version": "1.6.0",
   "private": true,
   "scripts": {
     "dev": "next dev -H 0.0.0.0 --turbopack",
@@ -51,6 +51,7 @@
     "sonner": "^2.0.7",
     "tailwind-merge": "^3.4.0",
     "tailwindcss-animate": "^1.0.7",
+    "vaul": "^1.1.2",
     "zod": "^3.25.76",
     "zustand": "^5.0.9"
   },

publish.ps1

@@ -0,0 +1,16 @@
+if (-not $args) {
+    Write-Error "需要指定版本号"
+    exit 1
+}
+
+$confrim = Read-Host "构建版本为 [web:$($args[0])]，是否继续？(y/n)"
+if ($confrim -ne "y") {
+    Write-Host "已取消构建"
+    exit 0
+}
+
+docker build -t repo.lanhuip.com:8554/lanhu/web:latest .
+docker build -t repo.lanhuip.com:8554/lanhu/web:$($args[0]) .
+
+docker push repo.lanhuip.com:8554/lanhu/web:latest
+docker push repo.lanhuip.com:8554/lanhu/web:$($args[0])

src/actions/auth.ts

@@ -2,15 +2,7 @@
 import {cookies} from 'next/headers'
 import {ApiResponse, UnauthorizedError} from '@/lib/api'
 import {User} from '@/lib/models'
-import {callByDevice, callByUser} from '@/actions/base'
+import {callByDevice, callByUser, TokenResp} from '@/actions/base'
-
-type TokenResp = {
-  access_token: string
-  refresh_token: string
-  expires_in: number
-  token_type: string
-  scope?: string
-}
 
 export type LoginMode = 'phone_code' | 'password'
 

src/actions/base.ts

@@ -1,8 +1,23 @@
 'use server'
 import {API_BASE_URL, ApiResponse, CLIENT_ID, CLIENT_SECRET} from '@/lib/api'
+import {add, isBefore} from 'date-fns'
 import {cookies, headers} from 'next/headers'
 import {cache} from 'react'
-import {redirect} from 'next/navigation'
+
+export type TokenResp = {
+  access_token: string
+  refresh_token: string
+  expires_in: number
+  token_type: string
+  scope?: string
+}
+
+export async function getApiUrl() {
+  return {
+    success: true,
+    data: API_BASE_URL,
+  } satisfies ApiResponse<string>
+}
 
 // ======================
 // public
@@ -26,6 +41,9 @@ const _callPublic = cache(async <R = undefined>(
 // device
 // ======================
 
+let token: string | null = null
+let token_expire: Date | null = null
+
 async function callByDevice<R = undefined>(
   endpoint: string,
   data: unknown,
@@ -37,18 +55,20 @@ const _callByDevice = cache(async <R = undefined>(
   endpoint: string,
   data?: string,
 ): Promise<ApiResponse<R>> => {
-  // 获取设备令牌
+  if (!token || !token_expire || isBefore(token_expire, new Date())) {
-  if (!CLIENT_ID || !CLIENT_SECRET) {
+    const basic = Buffer.from(`${CLIENT_ID}:${CLIENT_SECRET}`).toString('base64url')
-    return {
+    const resp = await call<TokenResp>(`${API_BASE_URL}/api/auth/token`, JSON.stringify({
-      success: false,
+      grant_type: 'client_credentials',
-      status: 401,
+    }), `Basic ${basic}`)
-      message: '未配置 CLIENT_ID 或 CLIENT_SECRET',
+    if (!resp.success) {
+      return resp
     }
+    token = resp.data.access_token
+    token_expire = add(new Date(), {seconds: resp.data.expires_in})
   }
-  const token = Buffer.from(`${CLIENT_ID}:${CLIENT_SECRET}`).toString('base64url')
 
   // 发起请求
-  return call(`${API_BASE_URL}${endpoint}`, data, `Basic ${token}`)
+  return call(`${API_BASE_URL}${endpoint}`, data, `Bearer ${token}`)
 })
 
 // ======================
@@ -149,24 +169,6 @@ async function call<R = undefined>(url: string, body: RequestInit['body'], auth?
   throw new Error(`无法解析响应数据，未处理的 Content-Type: ${type}`)
 }
 
-async function postCall<R = undefined>(rawResp: Promise<ApiResponse<R>>) {
-  const header = await headers()
-  const pathname = header.get('x-pathname') || '/'
-  const resp = await rawResp
-
-  // 重定向到登录页
-  const match = [
-    RegExp(`^/admin.*`),
-  ].some(item => item.test(pathname))
-
-  if (match && !resp.success && resp.status === 401) {
-    console.log('🚗🚗🚗🚗🚗 非正常重定向 🚗🚗🚗🚗🚗')
-    redirect('/login?force=true')
-  }
-
-  return resp
-}
-
 // 导出
 export {
   callPublic,

src/actions/channel.ts

@@ -32,5 +32,5 @@ export async function createChannels(params: {
   city?: string
   isp?: number
 }) {
-  return callPublic<CreateChannelsResp[]>('/api/channel/create', params)
+  return callByUser<CreateChannelsResp[]>('/api/channel/create', params)
 }

src/actions/product.ts

@@ -0,0 +1,12 @@
+import {callByUser, callPublic} from './base'
+import {Product} from '@/lib/models/product'
+
+export type ProductItem = Product
+
+export async function listProduct(props: {}) {
+  return callByUser<Product[]>('/api/product/list', props)
+}
+
+export async function listProductHome(props: {}) {
+  return callPublic<Product[]>('/api/product/list', props)
+}

src/actions/resource.ts

@@ -24,6 +24,7 @@ export async function listResourceShort(props: {
   size: number
   resource_no?: string
   type?: number
+  status?: number
   create_after?: Date
   create_before?: Date
   expire_after?: Date
@@ -37,6 +38,7 @@ export async function listResourceLong(props: {
   size: number
   resource_no?: string
   type?: number
+  status?: number
   create_after?: Date
   create_before?: Date
   expire_after?: Date
@@ -87,9 +89,17 @@ export async function payClose(props: {
 }
 
 export async function getPrice(props: CreateResourceReq) {
-  return callByDevice<{
+  return callByUser<{
     price: string
-    discounted_price?: string
+    actual?: string
-    discounted?: number
+    discounted?: string
+  }>('/api/resource/price', props)
+}
+
+export async function getPriceHome(props: CreateResourceReq) {
+  return callByDevice<{
+    price: string
+    actual?: string
+    discounted?: string
   }>('/api/resource/price', props)
 }

src/actions/user.ts

@@ -38,16 +38,16 @@ export async function Identify(props: {
 }
 
 export async function update(props: {
-  username: string
+  username?: string
-  email: string
+  email?: string
-  contact_qq: string
+  contact_qq?: string
-  contact_wechat: string
+  contact_wechat?: string
 }) {
   return await callByUser('/api/user/update', props)
 }
 
 export async function updatePassword(props: {
-  phone: string
+  // phone: string
   code: string
   password: string
 }) {

src/actions/verify.ts

@@ -1,6 +1,6 @@
 'use server'
 import {ApiResponse} from '@/lib/api'
-import {callByDevice} from '@/actions/base'
+import {callByDevice, callByUser} from '@/actions/base'
 import {getCap} from '@/lib/cap'
 
 export async function sendSMS(props: {
@@ -28,7 +28,7 @@ export async function sendSMS(props: {
     }
 
     // 请求发送短信
-    return await callByDevice('/api/auth/verify/sms', {
+    return await callByDevice('/api/verify/sms', {
       phone: props.phone,
       purpose: 0,
     })
@@ -38,3 +38,35 @@ export async function sendSMS(props: {
     throw new Error('验证码验证失败', {cause: error})
   }
 }
+
+export async function updateSendSMS(props: {
+  captcha: string
+}): Promise<ApiResponse> {
+  try {
+    // 人机验证
+    if (!props.captcha?.length) {
+      return {
+        success: false,
+        status: 400,
+        message: '请输入验证码',
+      }
+    }
+
+    const cap = await getCap()
+    const valid = await cap.validateToken(props.captcha)
+    if (!valid) {
+      return {
+        success: false,
+        status: 400,
+        message: '验证码错误或已过期',
+      }
+    }
+
+    // 请求发送短信
+    return await callByUser('/api/verify/sms/password', {})
+  }
+  catch (error) {
+    console.error('验证码验证失败:', error)
+    throw new Error('验证码验证失败', {cause: error})
+  }
+}

src/app/(auth)/login/login-card.tsx

@@ -34,20 +34,12 @@ export type LoginSchema = zod.infer<typeof smsSchema | typeof pwdSchema>
 export default function LoginCard() {
   const router = useRouter()
   const refreshProfile = useProfileStore(store => store.refreshProfile)
-  const [mode, setMode] = useState<LoginMode>('phone_code')
+  const [mode, setMode] = useState<LoginMode>('password')
   const [submitting, setSubmitting] = useState(false)
 
   const updateLoginMode = (mode: LoginMode) => {
     sessionStorage.setItem('login_mode', mode)
   }
-
-  useEffect(() => {
-    const mode = sessionStorage.getItem('login_mode')
-    if (mode) {
-      setMode(mode as LoginMode)
-    }
-  }, [])
-
   const form = useForm<LoginSchema>({
     resolver: zodResolver(mode === 'phone_code' ? smsSchema : pwdSchema),
     defaultValues: {
@@ -55,7 +47,16 @@ export default function LoginCard() {
       password: '',
       remember: false,
     },
+    mode: 'onChange',
   })
+
+  useEffect(() => {
+    const savedMode = sessionStorage.getItem('login_mode') as LoginMode
+    if (savedMode && savedMode === 'phone_code') {
+      setMode(savedMode)
+    }
+  }, [])
+
   const handler = form.handleSubmit(async (data) => {
     setSubmitting(true)
     try {
@@ -93,13 +94,14 @@ export default function LoginCard() {
         <Tabs
           value={mode}
           onValueChange={(val) => {
-            setMode(val as typeof mode)
+            setMode(val as LoginMode)
-            form.reset({username: form.getValues('username'), password: '', remember: false})
+            form.reset({username: '', password: '', remember: false})
+            form.clearErrors()
           }}
           className="mb-6">
           <TabsList className="w-full p-0 bg-white">
             <Tab value="password">密码登录</Tab>
-            <Tab value="phone_code">验证码登录</Tab>
+            <Tab value="phone_code">验证码登录/注册</Tab>
           </TabsList>
         </Tabs>
         <Form<LoginSchema> className="space-y-6" form={form} handler={handler}>
@@ -124,6 +126,7 @@ export default function LoginCard() {
                     className="h-10"
                     placeholder="请输入验证码"
                     autoComplete="one-time-code"
+                    disabled={submitting}
                   />
                   <SendMsgByUsername/>
                 </div>
@@ -137,11 +140,12 @@ export default function LoginCard() {
                     placeholder="至少6位密码，需包含字母和数字"
                     autoComplete="current-password"
                     minLength={6}
+                    disabled={submitting}
                   />
                   <button
                     type="button"
                     tabIndex={-1}
-                    className="absolute right-2 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600"
+                    className="absolute right-2 top-1/2 -translate-y-1/2 text-gray-400 hover:text-gray-600 cursor-pointer"
                     onClick={() => setShowPwd(v => !v)}
                     aria-label={showPwd ? '隐藏密码' : '显示密码'}
                   >
@@ -162,6 +166,7 @@ export default function LoginCard() {
                   id={id}
                   checked={field.value}
                   onCheckedChange={field.onChange}
+                  disabled={submitting}
                 />
                 <div className="space-y-1 leading-none">
                   <Label>保持登录</Label>

src/app/(home)/(index)/articles-section.tsx

@@ -11,21 +11,21 @@ export function ArticlesSection() {
           icon={<BookOpen className="w-12 h-12"/>}
           title="浏览器设置代理教程"
           description="快速上手，5分钟学会在浏览器中配置代理服务器"
-          href="/docs/client/browser-proxy"
+          href="/docs/browser-proxy"
         />
 
         <ArticleCard
           icon={<Smartphone className="w-12 h-12"/>}
           title="Windows10 代理配置"
           description="详细图文教程，帮助你在 Windows 系统中设置代理"
-          href="/docs/client/windows10-proxy"
+          href="/docs/windows10-proxy"
         />
 
         <ArticleCard
           icon={<HelpCircle className="w-12 h-12"/>}
           title="常见问题总览"
           description="解决使用过程中遇到的各类问题，快速找到答案"
-          href="/docs/faqs/faq-general"
+          href="/docs/faq-general"
         />
       </div>
     </PageSection>

src/app/(home)/(index)/hero-section.tsx

@@ -28,8 +28,8 @@ export function HeroSection() {
         </div>
 
         <FreeTrial className={[
-          `mt-32 max-md:mt-20 w-96 max-md:w-full h-16 md:h-24 rounded-lg shadow-lg`,
+          `mt-32 max-md:mt-20 w-96 max-md:w-full h-16 md:h-24 rounded-lg shadow-lg cursor-pointer`,
-          `bg-linear-to-r from-blue-500 to-cyan-400 text-white text-xl lg:text-4xl`,
+          `bg-linear-to-r from-blue-500 to-cyan-400 text-white text-xl lg:text-4xl cursor-pointer`,
         ].join(' ')}/>
       </Wrap>
     </section>

src/app/(home)/_components/header/menu-help.tsx

@@ -17,26 +17,26 @@ export default function HelpMenu() {
         icon={h01}
         title="提取 IP"
         items={[
-          {lead: '短效 IP 提取', href: '/collect?type=short'},
+          {lead: '短效/长效 IP 提取', href: '/collect?type=short'},
-          {lead: '长效 IP 提取', href: '/collect?type=long'},
+          // {lead: '长效 IP 提取', href: '/collect?type=long'},
         ]}
       />
       <Column
         icon={h02}
         title="操作指南"
         items={[
-          {lead: '修改信息', href: '/docs/operation/profile-settings'},
+          {lead: '修改信息', href: '/docs/profile-settings'},
-          {lead: '提取链接', href: '/docs/operation/extract-link'},
+          {lead: '提取链接', href: '/docs/extract-link'},
-          {lead: '查看记录', href: '/docs/operation/payment-records'},
+          {lead: '查看记录', href: '/docs/payment-records'},
         ]}
       />
       <Column
         icon={h03}
         title="平台教程"
         items={[
-          {lead: 'iOS 设置', href: '/docs/client/ios-proxy'},
+          {lead: 'iOS 设置', href: '/docs/ios-proxy'},
-          {lead: 'Android 设置', href: '/docs/client/android-proxy'},
+          {lead: 'Android 设置', href: '/docs/android-proxy'},
-          {lead: 'Windows 设置', href: '/docs/client/windows10-proxy'},
+          {lead: 'Windows 设置', href: '/docs/windows10-proxy'},
         ]}
       />
       <Image src={banner} alt="banner" className="hidden lg:block"/>

src/app/(home)/_components/header/menu-mobile.tsx

@@ -1,31 +1,313 @@
-import ProductMenu from './menu-product'
+'use client'
-import HelpMenu from './menu-help'
+
-import SolutionMenu from './menu-solution'
+import {useContext, useEffect, useState} from 'react'
+import {useRouter} from 'next/navigation'
+import {X} from 'lucide-react'
+import {HeaderContext} from './common'
+import Image, {StaticImageData} from 'next/image'
+import prod from '@/assets/header/product/prod.svg'
+import custom from '@/assets/header/product/custom.svg'
+import s01 from '@/assets/header/solution/01.svg'
+import s02 from '@/assets/header/solution/02.svg'
+import s03 from '@/assets/header/solution/03.svg'
+import s04 from '@/assets/header/solution/04.svg'
+import s05 from '@/assets/header/solution/05.svg'
+import s06 from '@/assets/header/solution/06.svg'
+import s07 from '@/assets/header/solution/07.svg'
+import s08 from '@/assets/header/solution/08.svg'
+import h01 from '@/assets/header/help/01.svg'
+import h02 from '@/assets/header/help/02.svg'
+import h03 from '@/assets/header/help/03.svg'
+import {merge} from '@/lib/utils'
+import Link from 'next/link'
+import logo from '@/assets/logo.webp'
+import {Product} from '@/lib/models/product'
+import {listProductHome} from '@/actions/product'
 
 export type MobileMenuProps = {}
 
 export default function MobileMenu(props: MobileMenuProps) {
+  const ctx = useContext(HeaderContext)
+  const router = useRouter()
+  const [productTab, setProductTab] = useState<'domestic' | 'oversea'>('domestic')
+
+  if (!ctx) {
+    throw new Error(`HeaderContext not found`)
+  }
+
+  const navigate = (href: string) => {
+    ctx.setMenu(false)
+    router.push(href)
+  }
+  const [productList, setProductList] = useState<Product[]>([])
+  useEffect(() => {
+    const fetchProducts = async () => {
+      const res = await listProductHome({})
+      if (res.success) {
+        setProductList(res.data)
+      }
+    }
+    fetchProducts()
+  }, [])
+  const shortProduct = productList.find(p => p.name?.includes('短效') || p.code === 'short')
+  const longProduct = productList.find(p => p.name?.includes('长效') || p.code === 'long')
   return (
-    <div className="flex flex-col gap-8">
+    <div className="h-full flex flex-col bg-white">
-      <div className="flex flex-col gap-4">
+      <div className="flex items-center justify-between px-4 h-16 border-b border-gray-100">
-        <ProductMenu/>
+        {/* logo */}
+        <Link href="/" className="flex items-center">
+          <Image src={logo} alt="logo" height={40} className="translate-y-0.5"/>
+        </Link>
+        <button
+          type="button"
+          className="rounded-md p-2 text-gray-400 hover:text-gray-600 hover:bg-gray-50 transition-colors"
+          onClick={() => ctx.setMenu(false)}
+          aria-label="关闭菜单"
+        >
+          <X className="h-5 w-5"/>
+        </button>
       </div>
-      <div className="flex flex-col gap-4">
+
-        <MenuTitle title="帮助中心"/>
+      <div className="flex-1 overflow-y-auto px-4 py-6 space-y-8">
-        <HelpMenu/>
+        <div className="space-y-3">
-      </div>
+          <h3 className="text-sm font-semibold text-gray-500 tracking-wide">
-      <div className="flex flex-col gap-4">
+            产品订购
-        <MenuTitle title="业务场景"/>
+          </h3>
-        <SolutionMenu/>
+          <div className="flex rounded-lg bg-gray-100">
+            <button
+              className={merge(
+                'flex-1 py-2.5 text-sm font-medium rounded-md transition-all',
+                productTab === 'domestic'
+                  ? 'bg-white text-blue-600 shadow-sm'
+                  : 'text-gray-600 hover:text-gray-900',
+              )}
+              onClick={() => setProductTab('domestic')}
+            >
+              国内代理
+            </button>
+            <button
+              className={merge(
+                'flex-1 py-2.5 text-sm font-medium rounded-md transition-all',
+                productTab === 'oversea'
+                  ? 'bg-white text-blue-600 shadow-sm'
+                  : 'text-gray-600 hover:text-gray-900',
+              )}
+              onClick={() => setProductTab('oversea')}
+            >
+              海外代理
+            </button>
+          </div>
+
+          {productTab === 'domestic' && (
+            <div className="space-y-2">
+              {shortProduct && (
+                <ProductItem
+                  icon={prod}
+                  label="短效动态IP"
+                  badge="最低4.5折"
+                  href={`/product?type=${shortProduct.code}`}
+                  onNavigate={navigate}
+                />
+              )}
+              {longProduct && (
+                <ProductItem
+                  icon={prod}
+                  label="长效静态IP"
+                  badge="最低4.5折"
+                  href={`/product?type=${longProduct.code}`}
+                  onNavigate={navigate}
+                />
+              )}
+              <ProductItem
+                icon={custom}
+                label="优质/企业/精选IP"
+                badge="专属定制"
+                href="/custom"
+                onNavigate={navigate}
+              />
+            </div>
+          )}
+
+          {productTab === 'oversea' && (
+            <div className="mt-4 p-4 bg-blue-50 rounded-lg">
+              <p className="text-sm text-blue-600 text-center">
+                更多海外节点即将上线，敬请期待～
+              </p>
+            </div>
+          )}
+        </div>
+
+        <MenuSection title="业务场景">
+          <div className="grid grid-cols-2 gap-3">
+            <SolutionItem
+              icon={s01}
+              label="数据采集"
+              href="/data-capture"
+              onNavigate={navigate}
+            />
+            <SolutionItem
+              icon={s02}
+              label="电商运营"
+              href="/e-commerce"
+              onNavigate={navigate}
+            />
+            <SolutionItem
+              icon={s03}
+              label="市场调研"
+              href="/market-research"
+              onNavigate={navigate}
+            />
+            <SolutionItem
+              icon={s04}
+              label="SEO优化"
+              href="/seo-optimization"
+              onNavigate={navigate}
+            />
+            <SolutionItem
+              icon={s05}
+              label="社交媒体"
+              href="/social-media"
+              onNavigate={navigate}
+            />
+            <SolutionItem
+              icon={s06}
+              label="广告投放"
+              href="/advertising"
+              onNavigate={navigate}
+            />
+            <SolutionItem
+              icon={s07}
+              label="账号管理"
+              href="/account-management"
+              onNavigate={navigate}
+            />
+            <SolutionItem
+              icon={s08}
+              label="网络测试"
+              href="/network-testing"
+              onNavigate={navigate}
+            />
+          </div>
+        </MenuSection>
+
+        <MenuSection title="帮助中心">
+          <div className="space-y-2">
+            <HelpItem
+              icon={h01}
+              label="短效IP提取"
+              onClick={() => navigate('/collect?type=short')}
+            />
+            <HelpItem
+              icon={h02}
+              label="操作指南"
+              onClick={() => navigate('/docs/profile-settings')}
+            />
+            <HelpItem
+              icon={h03}
+              label="平台教程"
+              onClick={() => navigate('/docs/ios-proxy')}
+            />
+          </div>
+        </MenuSection>
+
+        <div className="space-y-2 pt-2">
+          <OtherLink
+            label="业务定制"
+            href="/custom"
+            onNavigate={navigate}
+          />
+        </div>
       </div>
     </div>
   )
 }
 
-function MenuTitle(props: {title: string}) {
+function MenuSection(props: {title: string, children: React.ReactNode}) {
   return (
-    <h3 className="text-xl text-weak px-4">
+    <div className="space-y-3">
-      {props.title}
+      <h3 className="text-sm font-semibold text-gray-500 tracking-wide">
-    </h3>
+        {props.title}
+      </h3>
+      {props.children}
+    </div>
+  )
+}
+
+function ProductItem(props: {
+  icon: StaticImageData
+  label: string
+  badge?: string
+  href: string
+  onNavigate: (href: string) => void
+}) {
+  return (
+    <button
+      type="button"
+      className="w-full flex items-center gap-3 rounded-lg border border-gray-100 bg-white px-4 py-3 text-left transition-all hover:border-blue-200 hover:shadow-sm"
+      onClick={() => props.onNavigate(props.href)}
+    >
+      <div className="shrink-0 w-8 h-8 bg-linear-to-br from-blue-50 to-cyan-50 rounded-lg flex items-center justify-center">
+        <Image src={props.icon} alt="" width={20} height={20} className="opacity-80"/>
+      </div>
+      <span className="flex-1 font-medium text-sm text-gray-900">{props.label}</span>
+      {props.badge && (
+        <span className="text-xs text-orange-600 bg-orange-50 px-2 py-1 rounded-full">
+          {props.badge}
+        </span>
+      )}
+    </button>
+  )
+}
+
+function SolutionItem(props: {
+  icon: StaticImageData
+  label: string
+  href: string
+  onNavigate: (href: string) => void
+}) {
+  return (
+    <button
+      type="button"
+      className="flex flex-col items-center gap-2 p-3 rounded-lg border border-gray-100 hover:border-blue-200 hover:bg-blue-50/50 transition-all"
+      onClick={() => props.onNavigate(props.href)}
+    >
+      <div className="w-10 h-10 bg-linear-to-br from-blue-50 to-cyan-50 rounded-full flex items-center justify-center">
+        <Image src={props.icon} alt="" width={20} height={20} className="opacity-80"/>
+      </div>
+      <span className="text-xs font-medium text-gray-700">{props.label}</span>
+    </button>
+  )
+}
+
+function HelpItem(props: {
+  icon: StaticImageData
+  label: string
+  onClick: () => void
+}) {
+  return (
+    <button
+      type="button"
+      className="w-full flex items-center gap-3 px-3 py-2.5 rounded-lg hover:bg-gray-50 transition-colors"
+      onClick={props.onClick}
+    >
+      <Image src={props.icon} alt="" width={20} height={20} className="opacity-70"/>
+      <span className="text-sm text-gray-700">{props.label}</span>
+    </button>
+  )
+}
+
+function OtherLink(props: {
+  label: string
+  href: string
+  onNavigate: (href: string) => void
+}) {
+  return (
+    <button
+      type="button"
+      className="w-full flex items-center px-3 py-2.5 text-sm text-gray-700 rounded-lg hover:bg-gray-50 transition-colors"
+      onClick={() => props.onNavigate(props.href)}
+    >
+      {props.label}
+    </button>
   )
 }

src/app/(home)/_components/header/menu-product.tsx

@@ -1,13 +1,17 @@
 'use client'
-import {ReactNode, useContext, useState} from 'react'
+import {ReactNode, useContext, useEffect, useState} from 'react'
 import Wrap from '@/components/wrap'
+import Image, {StaticImageData} from 'next/image'
 import Link from 'next/link'
 import {merge} from '@/lib/utils'
 import prod from '@/assets/header/product/prod.svg'
 import custom from '@/assets/header/product/custom.svg'
 import {useRouter} from 'next/navigation'
-import {FragmentTitle, HeaderContext} from './common'
+import {HeaderContext} from './common'
+import {Product} from '@/lib/models/product'
+import {listProductHome} from '@/actions/product'
 
+export type ProductItem = Product
 type TabType = 'domestic' | 'oversea'
 
 export default function ProductMenu() {
@@ -52,33 +56,51 @@ export function Tab(props: {
 }
 
 export function Domestic(props: {}) {
+  const [productList, setProductList] = useState<Product[]>([])
+  useEffect(() => {
+    const fetchProducts = async () => {
+      const res = await listProductHome({})
+      if (res.success) {
+        setProductList(res.data)
+      }
+    }
+    fetchProducts()
+  }, [])
+  const shortProduct = productList.find(p => p.name?.includes('短效') || p.code === 'short')
+  const longProduct = productList.find(p => p.name?.includes('长效') || p.code === 'long')
+
   return (
-    <section role="tabpanel" className="flex-auto flex flex-col lg:flex-row justify-evenly gap-3 lg:gap-0">
+    <section role="tabpanel" className="flex-auto">
-      <div className="w-full lg:w-64 flex flex-col">
+      <div className="grid grid-cols-1 lg:grid-cols-2 gap-3">
-        <FragmentTitle img={prod} text="短效 IP"/>
+        <div className="grid grid-cols-1 gap-3">
-        <DomesticLink
+          {shortProduct && (
-          label="短效动态 IP"
+            <ProductCard
-          desc="全国 300+ 城市级定位节点，IP 池资源充足，自动高频切换。适用于数据采集、市场调研、SEO 优化等高并发场景。稳定可靠，响应迅速，助力业务高效运转。"
+              icon={prod}
-          href="/product?type=short"
+              label="短效动态 IP"
-          discount={45}
+              discount="最低4.5折"
-        />
+              desc="全国 300+ 城市级定位节点，IP 池资源充足，自动高频切换。适用于数据采集、市场调研、SEO 优化等高并发场景。稳定可靠，响应迅速，助力业务高效运转。"
-      </div>
+              href={`/product?type=${shortProduct.code}`}
-      <div className="w-full lg:w-64 flex flex-col">
+            />
-        <FragmentTitle img={prod} text="长效 IP"/>
+          )}
-        <DomesticLink
+          {longProduct && (
-          label="长效动态 IP"
+            <ProductCard
-          desc="IP 存活时长可达数小时至数天，连接稳定不掉线。适用于账号养号、社交运营、电商管理等需要持续在线的场景。优质线路保障，为您的长期业务保驾护航。"
+              icon={prod}
-          href="/product?type=long"
+              label="长效动态 IP"
-          discount={45}
+              discount="最低4.5折"
-        />
+              desc="IP 存活时长可达数小时至数天，连接稳定不掉线。适用于账号养号、社交运营、电商管理等需要持续在线的场景。优质线路保障，为您的长期业务保驾护航。"
-      </div>
+              href={`/product?type=${longProduct.code}`}
-      <div className="w-full lg:w-64 flex flex-col">
+            />
-        <FragmentTitle img={custom} text="业务定制"/>
+          )}
-        <DomesticLink
+        </div>
-          label="优质/企业/精选IP"
+        <div className="flex flex-col gap-3">
-          desc="超 1000 家企业共同信赖之选！大客户经理全程 1 对 1 沟通，随时为您排忧解难，提供 24 小时不间断支持"
+          <ProductCard
-          href="/custom"
+            icon={custom}
-        />
+            label="业务定制"
+            discount="1V1 专属服务"
+            desc="超 1000 家企业共同信赖之选！大客户经理全程 1 对 1 沟通，随时为您排忧解难，提供 24 小时不间断支持"
+            href="/custom"
+          />
+        </div>
       </div>
     </section>
   )
@@ -92,11 +114,12 @@ export function Oversea(props: {}) {
   )
 }
 
-export function DomesticLink(props: {
+export function ProductCard(props: {
+  icon: StaticImageData
   label: string
+  discount: string
   desc: string
   href: string
-  discount?: number
 }) {
   const router = useRouter()
   const ctx = useContext(HeaderContext)
@@ -116,18 +139,24 @@ export function DomesticLink(props: {
         `transition-colors duration-150 ease-in-out`,
         `p-4 rounded-lg flex flex-col gap-1 hover:bg-blue-50`,
       )}
-      onClick={onClick}>
+      onClick={onClick}
-      <p className="flex gap-2">
+    >
-        <span>{props.label}</span>
+      <div className="flex items-start gap-3">
-        {props.discount && (
+        <div className="flex-none">
-          <span className="text-orange-500 text-xs text-light px-2 py-1 bg-orange-50 rounded-full">
+          <Image src={props.icon} alt="" width={30} height={30}/>
-            折扣 {props.discount}%
+        </div>
-          </span>
+        <div className="flex-1">
-        )}
+          <div className="flex items-center justify-between gap-3">
-      </p>
+            <span className="font-bold">{props.label}</span>
-      <p className="text-gray-400 text-sm">
+            <span className="text-xs font-medium text-orange-600 bg-orange-50 px-2 py-1 rounded-full">
-        {props.desc}
+              {props.discount}
-      </p>
+            </span>
+          </div>
+          <div className="mt-2 text-sm text-gray-400 space-y-1">
+            {props.desc}
+          </div>
+        </div>
+      </div>
     </Link>
   )
 }

src/app/(home)/collect/page.tsx

@@ -16,7 +16,7 @@ export default function CollectPage(props: CollectPageProps) {
     //   </Wrap>
     // </main>
     <HomePage path={[
-      {label: '短效IP 提取', href: '/collect'},
+      {label: '短效/长效IP 提取', href: '/collect'},
     ]}>
       <Wrap>
         <Extract/>

src/app/(home)/docs/layout.tsx

@@ -2,15 +2,15 @@ import Wrap from '@/components/wrap'
 import {Children} from '@/lib/utils'
 import Sidebar from './sidebar'
 import HomePage from '@/components/home/page'
+import SidebarDrawer from './sidebar-drawer'
 
 export default function DocsLayout(props: Children) {
   return (
-    <HomePage path={[
+    <HomePage path={[{label: '帮助中心', href: '/docs'}]}>
-      {label: '帮助中心', href: '/docs'},
+      <Wrap className="flex gap-3 flex-col md:flex-row">
-    ]}>
+        <SidebarDrawer/>
-      <Wrap className="flex gap-3">
+        <Sidebar className="hidden md:block w-68"/>
-        <Sidebar/>
+        <div className="flex-1 bg-white rounded-lg p-4 md:p-6 min-h-[420px]">
-        <div className="flex-1 bg-white  rounded-lg p-6 min-h-[420px]">
           {props.children}
         </div>
       </Wrap>

src/app/(home)/docs/page.tsx

@@ -1,5 +1,8 @@
 export default function DocsIndexPage() {
   return (
-    <div></div>
+    <div className="text-center text-slate-500 py-12">
+      <p className="text-lg">欢迎来到帮助中心</p>
+      <p className="text-sm mt-2">请从左侧目录选择需要查看的文档</p>
+    </div>
   )
 }

src/app/(home)/docs/sidebar-drawer.tsx

@@ -0,0 +1,37 @@
+'use client'
+import {useState} from 'react'
+import {Menu} from 'lucide-react'
+import {
+  Drawer,
+  DrawerContent,
+  DrawerTrigger,
+} from '@/components/ui/drawer'
+import Sidebar from './sidebar'
+
+export default function SidebarDrawer() {
+  const [open, setOpen] = useState(false)
+
+  return (
+    <div className="md:hidden flex items-center justify-between bg-white rounded-lg p-3">
+      <span className="font-medium text-slate-900">帮助中心</span>
+      <Drawer open={open} onOpenChange={setOpen}>
+        <DrawerTrigger asChild>
+          <button className="flex items-center gap-2 text-slate-600 hover:text-slate-900 p-1 cursor-pointer">
+            <Menu size={20}/>
+            <span className="text-sm">目录</span>
+          </button>
+        </DrawerTrigger>
+        <DrawerContent>
+          <div className="mx-auto w-full max-w-sm">
+            <div className="px-4 py-3 border-b">
+              <h3 className="text-lg font-semibold text-slate-900">帮助中心</h3>
+            </div>
+            <div className="px-2 py-2 max-h-[70vh] overflow-y-auto">
+              <Sidebar onClose={() => setOpen(false)}/>
+            </div>
+          </div>
+        </DrawerContent>
+      </Drawer>
+    </div>
+  )
+}

src/app/(home)/docs/sidebar.tsx

@@ -3,48 +3,45 @@ import {useState, useMemo, useCallback} from 'react'
 import Link from 'next/link'
 import {usePathname} from 'next/navigation'
 import {ChevronRight} from 'lucide-react'
-
+import {merge} from '@/lib/utils'
-type Props = {
-  collapsed?: boolean
-}
 
 // 菜单配置
 const MENU_ITEMS = [
   {
     group: '产品文档',
     items: [
-      {key: 'product/product-overview', label: '产品介绍'},
+      {key: 'product-overview', label: '产品介绍'},
-      {key: 'product/choose-product', label: '如何选择产品'},
+      {key: 'choose-product', label: '如何选择产品'},
-      {key: 'product/why-verify', label: '为什么需要实名认证'},
+      {key: 'why-verify', label: '为什么需要实名认证'},
-      {key: 'product/city-lines', label: '有哪些城市线路'},
+      {key: 'city-lines', label: '有哪些城市线路'},
-      {key: 'product/api-docs', label: 'ip提取接口文档'},
+      {key: 'api-docs', label: 'ip提取接口文档'},
       // 服务条款
     ],
   },
   {
     group: '操作指南',
     items: [
-      {key: 'operation/profile-settings', label: '修改个人信息和重置密码'},
+      {key: 'profile-settings', label: '修改个人信息和重置密码'},
-      {key: 'operation/whitelist-guide', label: '如何添加白名单'},
+      {key: 'whitelist-guide', label: '如何添加白名单'},
-      {key: 'operation/verify-guide', label: '如何进行实名认证'},
+      {key: 'verify-guide', label: '如何进行实名认证'},
-      {key: 'operation/extract-link', label: '如何生成提取链接'},
+      {key: 'extract-link', label: '如何生成提取链接'},
-      {key: 'operation/payment-records', label: '查看支付和使用记录'},
+      {key: 'payment-records', label: '查看支付和使用记录'},
     ],
   },
   {
     group: '客户端教程',
     items: [
-      {key: 'client/browser-proxy', label: '浏览器设置代理教程'},
+      {key: 'browser-proxy', label: '浏览器设置代理教程'},
-      {key: 'client/ios-proxy', label: 'iOS设置代理教程'},
+      {key: 'ios-proxy', label: 'iOS设置代理教程'},
-      {key: 'client/android-proxy', label: '安卓手机设置代理教程'},
+      {key: 'android-proxy', label: '安卓手机设置代理教程'},
-      {key: 'client/windows10-proxy', label: 'Windows10设置代理教程'},
+      {key: 'windows10-proxy', label: 'Windows10设置代理教程'},
     ],
   },
   {
     group: '常见问题',
     items: [
-      {key: 'faqs/faq-general', label: '常见问题总览'},
+      {key: 'faq-general', label: '常见问题总览'},
-      {key: 'faqs/faq-billing', label: '计费与套餐问题'},
+      {key: 'faq-billing', label: '计费与套餐问题'},
       // 业务场景集成方案
       // 故障排查
     ],
@@ -52,13 +49,18 @@ const MENU_ITEMS = [
   {
     group: '新闻资讯',
     items: [
-      {key: 'news/news-latest', label: '了解代理服务器的工作原理'},
+      {key: 'news-latest', label: '了解代理服务器的工作原理'},
-      {key: 'news/news-announce', label: '网站公告'},
+      {key: 'news-announce', label: '网站公告'},
     ],
   },
 ]
 
-export default function Sidebar({collapsed = false}: Props) {
+type Props = {
+  className?: string
+  onClose?: () => void
+}
+
+export default function Sidebar({className, onClose}: Props) {
   const pathname = usePathname()
 
   // 获取当前文档 key
@@ -100,9 +102,7 @@ export default function Sidebar({collapsed = false}: Props) {
 
   return (
     <aside
-      className={`bg-white rounded-lg p-3 transition-all duration-200 shrink-0 ${
+      className={merge(`bg-white rounded-lg p-3 transition-all duration-200 shrink-0`, className)}
-        collapsed ? 'w-20' : 'w-68'
-      }`}
     >
       <nav className="space-y-2">
         {MENU_ITEMS.map(section => (
@@ -110,9 +110,7 @@ export default function Sidebar({collapsed = false}: Props) {
             <div
               onClick={() => toggleGroup(section.group)}
               className={`flex items-center gap-2 cursor-pointer px-3 py-2 rounded-sm transition-colors ${
-                finalExpandedGroups[section.group] && !collapsed
+                finalExpandedGroups[section.group] && 'bg-blue-50'
-                  ? 'bg-blue-50'
-                  : 'hover:bg-slate-50'
               }`}
             >
               <div
@@ -123,15 +121,13 @@ export default function Sidebar({collapsed = false}: Props) {
                 <ChevronRight size={16}/>
               </div>
 
-              {!collapsed && (
+              <div className="text-lg font-semibold text-slate-900">
-                <div className="text-lg font-semibold text-slate-900">
+                {section.group}
-                  {section.group}
+              </div>
-                </div>
-              )}
             </div>
 
             {finalExpandedGroups[section.group] && (
-              <ul className={`mt-1 text-base ${collapsed ? 'hidden' : 'block'}`}>
+              <ul className="mt-1 text-base">
                 {section.items.map((item) => {
                   const isActive = currentKey === item.key
                   const href = getItemHref(item.key)
@@ -140,6 +136,7 @@ export default function Sidebar({collapsed = false}: Props) {
                     <li key={item.key}>
                       <Link
                         href={href}
+                        onClick={() => onClose?.()}
                         className={`block pl-8 py-2 text-base cursor-pointer transition-colors ${
                           isActive
                             ? 'bg-blue-50 font-semibold'

src/app/(home)/footer.tsx

@@ -41,7 +41,7 @@ export default function Footer(props: FooterProps) {
             items={[
               {name: `产品订购`, href: `/product`},
               {name: `获取代理`, href: `/collect`},
-              {name: `帮助中心`, href: `/docs/faqs/faq-general`},
+              {name: `帮助中心`, href: `/docs/faq-general`},
               {name: `企业服务`, href: `/custom`},
             ]}
           />
@@ -69,9 +69,9 @@ export default function Footer(props: FooterProps) {
           <SiteNavList
             title="帮助文档"
             items={[
-              {name: `产品功能`, href: `/docs/product/product-features`},
+              {name: `产品功能`, href: `/docs/product-overview`},
-              {name: `使用教程`, href: `/docs/client/browser-proxy`},
+              {name: `使用教程`, href: `/docs/browser-proxy`},
-              {name: `行业资讯`, href: `/docs/news/news-latest`},
+              {name: `行业资讯`, href: `/docs/news-latest`},
             ]}
           />
         </div>

src/app/(home)/header.tsx

@@ -164,10 +164,10 @@ export default function Header(props: HeaderProps) {
           </Wrap>
         </div>
 
-        {/* 下拉菜单 */}
+        {/* 桌面端下拉菜单 */}
         <div
           className={merge(
-            `flex-auto overflow-auto lg:flex-none lg:basis-72 shadow-lg box-content`,
+            `hidden lg:flex flex-auto overflow-auto lg:flex-none lg:basis-72 shadow-lg box-content`,
             `bg-[#fffe] backdrop-blur-sm`,
             `transition-[opacity,padding] transition-discrete duration-200 ease-in-out`,
             menu
@@ -180,7 +180,20 @@ export default function Header(props: HeaderProps) {
           {pages[page]}
         </div>
 
-        {/* 遮罩层 */}
+        {/* 移动端侧边栏菜单 */}
+        {menu && page === 3 && (
+          <div className="lg:hidden fixed inset-0 z-20 flex">
+            <div
+              className="flex-1 bg-black/40"
+              onPointerDown={enterMenuMask}
+            />
+            <div className="w-72 max-w-[80vw] bg-white shadow-xl overflow-y-auto">
+              {pages[3]}
+            </div>
+          </div>
+        )}
+
+        {/* 遮罩层（桌面端） */}
         <div className="flex-auto" onPointerEnter={enterMenuMask}/>
 
       </HeaderContext.Provider>
@@ -225,7 +238,7 @@ function MenuItem(props: {
         onPointerLeave={props.onPointerLeave}
         className={[
           `h-full px-4 flex gap-3 items-center cursor-pointer text-lg`,
-          `transition-colors duration-200 ease-in-out`,
+          `transition-colors duration-200 ease-in-out cursor-pointer`,
           props.active
             ? `text-blue-500`
             : ``,
@@ -269,7 +282,7 @@ function ProfileOrLogin() {
               <span>登录</span>
             </Link>
             <Link
-              href="/login"
+              href="/login?tab=sms"
               className={[
                 `w-20 lg:w-24 h-10 lg:h-12 bg-linear-to-r rounded-sm flex items-center justify-center lg:text-lg text-white`,
                 `transition-colors duration-200 ease-in-out`,

src/app/(home)/layout.tsx

@@ -1,7 +1,8 @@
 import {ReactNode} from 'react'
 import Header from './header'
 import Footer from './footer'
-
+import Script from 'next/script'
+import {MessageCircleMoreIcon} from 'lucide-react'
 export type HomeLayoutProps = {
   children: ReactNode
 }
@@ -17,6 +18,22 @@ export default function HomeLayout(props: HomeLayoutProps) {
 
       {/* 页脚 */}
       <Footer/>
+
+      {/* <Script id="qd2852138148beb7882a4a6a3e5ff5b569436003e7dc" src="https://wp.qiye.qq.com/qidian/2852138148/beb7882a4a6a3e5ff5b569436003e7dc" async defer></Script> */}
+      <a
+        href="https://wpa1.qq.com/K0s0cvwf?_type=wpa&qidian=true"
+        target="_blank"
+        rel="noopener noreferrer"
+        className="fixed bottom-6 right-6 z-50 w-14 h-14 rounded-full bg-blue-600 hover:bg-blue-700 shadow-lg hover:shadow-xl transition-all duration-300 hover:scale-110 flex items-center justify-center group"
+        aria-label="在线客服"
+      >
+        <span className="text-white font-bold text-lg">客</span>
+        <span className="text-white font-bold text-lg">服</span>
+
+        <span className="absolute -top-2 -right-2 flex items-center justify-center w-6 h-6 bg-red-500 rounded-full text-white shadow-md">
+          <MessageCircleMoreIcon size={14}/>
+        </span>
+      </a>
     </div>
   )
 }

src/app/admin/(dashboard)/_client/userCenter.tsx

@@ -26,7 +26,7 @@ export default async function UserCenter() {
     <Card className="h-full">
       <CardContent className="flex-auto flex flex-col justify-between gap-4">
         <div className="flex flex-col gap-1">
-          <p>{profile.username?.trim() || profile.email || profile.phone}</p>
+          <p>{profile.username?.trim() || profile.phone }</p>
           <p className="text-sm text-weak">{`最后登录：${format(profile.last_login, 'yyyy-MM-dd HH:mm')}`}</p>
         </div>
         <div className={merge(
@@ -59,7 +59,7 @@ export default async function UserCenter() {
               </>
             )}
         </div>
-        {/* <div className="flex flex-col gap-1">
+        <div className="flex flex-col gap-1">
           <h4 className="text-sm text-weak">账户余额</h4>
           <div className="flex justify-between items-baseline">
             <p className="text-xl text-accent">
@@ -68,7 +68,7 @@ export default async function UserCenter() {
             </p>
             <RechargeModal/>
           </div>
-        </div> */}
+        </div>
         <div className="flex flex-col gap-3">
           <h4 className="text-sm text-weak">快捷入口</h4>
           <div className="flex justify-around gap-2">

src/app/admin/bills/page.tsx

@@ -99,7 +99,7 @@ export default function BillsPage(props: BillsPageProps) {
                   <SelectItem value="all">全部</SelectItem>
                   <SelectItem value="3">充值</SelectItem>
                   <SelectItem value="1">消费</SelectItem>
-                  <SelectItem value="2">退款</SelectItem>
+                  {/* <SelectItem value="2">退款</SelectItem> */}
                 </SelectContent>
               </Select>
             )}
@@ -284,13 +284,13 @@ export default function BillsPage(props: BillsPageProps) {
               format(new Date(row.original.created_at), 'yyyy-MM-dd HH:mm')
             ),
           },
-          {
+          // {
-            accessorKey: 'action', header: `操作`, cell: item => (
+          //   accessorKey: 'action', header: `操作`, cell: item => (
-              <div className="flex gap-2">
+          //     <div className="flex gap-2">
-                -
+          //       -
-              </div>
+          //     </div>
-            ),
+          //   ),
-          },
+          // },
         ]}
       />
     </Page>

src/app/admin/clients.tsx

@@ -2,7 +2,6 @@
 import {ReactNode, Suspense, use, useState} from 'react'
 import Image from 'next/image'
 import Link from 'next/link'
-import {ChangePasswordDialog} from '@/components/composites/dialogs/change-password-dialog'
 import {RealnameAuthDialog} from '@/components/composites/dialogs/realname-auth-dialog'
 import UserCenter from '@/components/composites/user-center'
 import {Button} from '@/components/ui/button'
@@ -75,19 +74,20 @@ export function Content(props: {children: ReactNode}) {
 }
 function ContentResolved() {
   const profile = use(useProfileStore(store => store.profile))
-  if (!profile) throw new Error('登录状态异常')
+
-  return (
+  if (profile)
-    <>
+    return (
-      <RealnameAuthDialog
+      <>
-        triggerClassName="hidden"
+        <RealnameAuthDialog
-        defaultOpen={!profile.id_token}
+          triggerClassName="hidden"
-      />
+          defaultOpen={!profile.id_token}
-      <ChangePasswordDialog
+        />
-        triggerClassName="hidden"
+        {/* <ChangePasswordDialog
-        defaultOpen={!profile.has_password}
+          triggerClassName="hidden"
-      />
+          defaultOpen={!profile.has_password}
-    </>
+        /> */}
-  )
+      </>
+    )
 }
 
 export function Header() {
@@ -116,7 +116,14 @@ export function Header() {
       </div>
 
       {/* right */}
-      <div className="flex-none flex items-center justify-end pr-4">
+      <div className="flex-none flex items-center justify-end pr-4 max-md:hidden gap-2">
+        <Link
+          href="/"
+          className={merge(
+            `flex-none h-16 flex items-center justify-center`,
+          )}>
+          返回首页
+        </Link>
         <Suspense>
           <HeaderUserCenter/>
         </Suspense>
@@ -127,8 +134,7 @@ export function Header() {
 
 function HeaderUserCenter() {
   const profile = use(useProfileStore(store => store.profile))
-  if (!profile) throw new Error('登录状态异常')
+  if (profile) return <UserCenter profile={profile}/>
-  return <UserCenter profile={profile}/>
 }
 
 export function Navbar() {

src/app/admin/identify/page.tsx

@@ -98,6 +98,16 @@ export default function IdentifyPage(props: IdentifyPageProps) {
   const profile = useProfileStore(store => store.profile)
   const refreshProfile = useProfileStore(store => store.refreshProfile)
 
+  // 重置认证流程
+  const handleDialogOpenChange = async (open: boolean) => {
+    setOpenDialog(open)
+    if (!open) {
+      setStep('form')
+      setTarget('')
+      await refreshProfile()
+    }
+  }
+
   // ======================
   // render
   // ======================
@@ -125,7 +135,7 @@ export default function IdentifyPage(props: IdentifyPageProps) {
             </div>
             <Suspense>
               <IfNotIdentofy>
-                <Dialog open={openDialog} onOpenChange={setOpenDialog}>
+                <Dialog open={openDialog} onOpenChange={handleDialogOpenChange}>
                   <DialogTrigger asChild>
                     <Button className="w-full">去认证</Button>
                   </DialogTrigger>
@@ -165,11 +175,8 @@ export default function IdentifyPage(props: IdentifyPageProps) {
                       <div className="flex flex-col gap-4 items-center">
                         <canvas ref={canvas} width={256} height={256}/>
                         <p className="text-sm text-gray-600">请扫码完成认证</p>
-                        <Button onClick={async () => {
+                        <Button onClick={() => handleDialogOpenChange(false)}>
-                          await refreshProfile()
+                          已完成扫脸认证
-                          setOpenDialog(false)
-                        }}>
-                          已完成认证
                         </Button>
                       </div>
                     )}
@@ -223,7 +230,7 @@ export default function IdentifyPage(props: IdentifyPageProps) {
           <p className="flex gap-2 items-center justify-between w-56 self-center">
             <span className="flex gap-2">
               <span className="bg-primary/25 text-primary w-8 h-8 rounded-full flex items-center justify-center">03</span>
-              <span>充值、支付</span>
+              <span>支付订单</span>
             </span>
             <Image alt="步骤配图" src={step3}/>
           </p>

src/app/admin/profile/clients.tsx

@@ -78,8 +78,8 @@ export function BasicForm(props: {
 }) {
   const schema = z.object({
     username: z.string(),
-    email: z.string(),
+    email: z.string().email('请输入正确的邮箱格式').or(z.literal('')),
-    contact_qq: z.string(),
+    contact_qq: z.string().regex(/^\d*$/, 'QQ号只能包含数字'),
     contact_wechat: z.string(),
   })
   type Schema = z.infer<typeof schema>

src/app/admin/profile/page.tsx

@@ -3,16 +3,17 @@ import {Card, CardContent, CardHeader, CardTitle} from '@/components/ui/card'
 import {CheckCircle} from 'lucide-react'
 import Image from 'next/image'
 import banner from '@/app/admin/identify/_assets/banner.webp'
-import RechargeModal from '@/components/composites/recharge'
-import {RealnameAuthDialog} from '@/components/composites/dialogs/realname-auth-dialog'
 import {ChangePasswordDialog} from '@/components/composites/dialogs/change-password-dialog'
 import {getProfile} from '@/actions/auth'
 import {Aftersale, BasicForm} from './clients'
+import {Button} from '@/components/ui/button'
+import Link from 'next/link'
 
 export type ProfilePageProps = {}
 
 export default async function ProfilePage(props: ProfilePageProps) {
   const profile = await getProfile()
+
   if (!profile.success) {
     return (
       <Page>
@@ -22,6 +23,7 @@ export default async function ProfilePage(props: ProfilePageProps) {
   }
 
   const user = profile.data
+
   return (
     <Page className="lg:flex-row lg:items-stretch md:flex-col max-sm:flex-col">
       <div className="flex-3/4 flex flex-col gap-4">
@@ -34,26 +36,13 @@ export default async function ProfilePage(props: ProfilePageProps) {
 
         {/* 块信息 */}
         <div className="flex gap-4 max-md:flex-col max-sm:flex-col">
-
-          {/* <Card className="flex-1 ">
-            <CardHeader>
-              <CardTitle className="font-normal">账户余额（元）</CardTitle>
-            </CardHeader>
-            <CardContent className="flex-auto flex justify-between items-center px-8">
-              <p className="text-xl">{user.balance}</p>
-              <RechargeModal classNames={{
-                trigger: `h-10 px-6`,
-              }}/>
-            </CardContent>
-          </Card> */}
-
           <Card className="flex-1 ">
             <CardHeader>
               <CardTitle className="font-normal">修改密码</CardTitle>
             </CardHeader>
             <CardContent className="flex-auto flex justify-between items-center px-8">
               <p>{user.phone}</p>
-              <ChangePasswordDialog triggerClassName="w-24 h-9"/>
+              <ChangePasswordDialog triggerClassName="w-24 h-9" phone={user?.phone}/>
             </CardContent>
           </Card>
 
@@ -66,10 +55,13 @@ export default async function ProfilePage(props: ProfilePageProps) {
                 ? (
                   <>
                     <p className="text-sm">为了保障您的账户安全和正常使用服务，请您尽快完成实名认证</p>
-                    <RealnameAuthDialog
+                    {/* <RealnameAuthDialog
-                      defaultOpen={!user.id_token}
+                      // defaultOpen={!user.id_token}
                       triggerClassName="w-24"
-                    />
+                    /> */}
+                    <Link href="/admin/identify">
+                      <Button>立即认证</Button>
+                    </Link>
                   </>
                 )
                 : (

src/app/admin/record/page.tsx

@@ -164,16 +164,21 @@ export default function RecordPage(props: RecordPageProps) {
             cell: ({row}) => <div>{row.original.prov}</div>,
             accessorKey: 'prov',
           },
+          {
+            header: '城市',
+            cell: ({row}) => <div>{row.original.city}</div>,
+            accessorKey: 'city',
+          },
           {
             header: '提取数量',
             cell: ({row}) => <div>{row.original.count}</div>,
             accessorKey: 'count',
           },
-          {
+          // {
-            header: '资源数量',
+          //   header: '资源数量',
-            cell: ({row}) => <div>{row.original.resource_id}</div>,
+          //   cell: ({row}) => <div>{row.original.resource_id}</div>,
-            accessorKey: 'resource_id',
+          //   accessorKey: 'resource_id',
-          },
+          // },
           {
             header: '提取时间',
             cell: ({row}) => {

src/app/admin/resources/_components/filter.tsx

@@ -12,6 +12,7 @@ import {Eraser, Search} from 'lucide-react'
 export interface ResourceFilterValues {
   resource_no: string
   type: 'expire' | 'quota' | 'all'
+  status: '0' | '1' | '2'
   create_after?: Date
   create_before?: Date
   expire_after?: Date
@@ -41,13 +42,27 @@ export default function ResourceFilter({form, onSubmit, onReset}: ResourceFilter
               <SelectValue placeholder="选择套餐类型"/>
             </SelectTrigger>
             <SelectContent>
-              <SelectItem value="all">全部</SelectItem>
+              <SelectItem value="all" >全部</SelectItem>
               <SelectItem value="expire">包时</SelectItem>
               <SelectItem value="quota">包量</SelectItem>
             </SelectContent>
           </Select>
         )}
       </FormField>
+      <FormField name="status" label={<span className="text-sm">状态</span>}>
+        {({field}) => (
+          <Select value={field.value} onValueChange={field.onChange}>
+            <SelectTrigger className="w-24 h-9">
+              <SelectValue placeholder="选择状态"/>
+            </SelectTrigger>
+            <SelectContent>
+              <SelectItem value="0">全部</SelectItem>
+              <SelectItem value="1">可用</SelectItem>
+              <SelectItem value="2">已过期</SelectItem>
+            </SelectContent>
+          </Select>
+        )}
+      </FormField>
       <div className="flex flex-col gap-2">
         <Label className="text-sm">开通时间</Label>
         <div className="flex items-center">

src/app/admin/resources/_components/list.tsx

@@ -17,6 +17,7 @@ import {
   ExpireBadge,
   formatDateTime,
   getTodayUsage,
+  isValidResourcestatus,
   isValidResourceType,
   ResourceTypeBadge,
 } from './utils'
@@ -24,6 +25,7 @@ import {
 const filterSchema = zod.object({
   resource_no: zod.string().optional().default(''),
   type: zod.enum(['expire', 'quota', 'all']).default('all'),
+  status: zod.enum(['0', '1', '2']).default('1'),
   create_after: zod.date().optional(),
   create_before: zod.date().optional(),
   expire_after: zod.date().optional(),
@@ -47,12 +49,13 @@ export default function ResourceList({resourceType}: ResourceListProps) {
   // 从 URL 参数初始化筛选条件
   const params = useSearchParams()
   const paramType = params.get('type')
-
+  const paramStatus = params.get('status')
   const form = useForm<ResourceFilterValues>({
     resolver: zodResolver(filterSchema),
     defaultValues: {
       resource_no: params.get('resource_no') || '',
       type: isValidResourceType(paramType) ? paramType : 'all',
+      status: isValidResourcestatus(paramStatus) ? paramStatus : '1',
       create_after: params.get('create_after') ? new Date(params.get('create_after')!) : undefined,
       create_before: params.get('create_before') ? new Date(params.get('create_before')!) : undefined,
       expire_after: params.get('expire_after') ? new Date(params.get('expire_after')!) : undefined,
@@ -71,6 +74,7 @@ export default function ResourceList({resourceType}: ResourceListProps) {
         expire: 1,
         quota: 2,
       }[getValues('type')]
+      const status = getValues('status')
       const create_after = getValues('create_after')
       const create_before = getValues('create_before')
       const expire_after = getValues('expire_after')
@@ -82,6 +86,7 @@ export default function ResourceList({resourceType}: ResourceListProps) {
         page,
         size,
         type,
+        status: Number(status),
         create_after,
         create_before,
         expire_after,
@@ -116,6 +121,7 @@ export default function ResourceList({resourceType}: ResourceListProps) {
   const handleReset = () => {
     form.reset({
       type: 'all',
+      status: '1',
       resource_no: '',
       create_after: undefined,
       create_before: undefined,
@@ -159,7 +165,7 @@ export default function ResourceList({resourceType}: ResourceListProps) {
           const live = resourceKey === 'long'
             ? (row.original as Resource<2>).long.live
             : (row.original as Resource<1>).short.live
-          return <span>{isLong ? `${live}小时` : `${live / 60}分钟`}</span>
+          return <span>{isLong ? `${live}小时` : `${live}分钟`}</span>
         },
       },
       {
@@ -213,6 +219,17 @@ export default function ResourceList({resourceType}: ResourceListProps) {
         header: '开通时间',
         cell: ({row}) => formatDateTime(row.original.created_at),
       },
+      {
+        header: '状态',
+        cell: ({row}) => {
+          const isActive = row.original.active
+          return (
+            <span className={isActive ? 'text-green-500' : 'text-red-500'}>
+              {isActive ? '启用' : '禁用'}
+            </span>
+          )
+        },
+      },
     ]
 
     // 短效资源增加到期时间列

src/app/admin/resources/_components/utils.tsx

@@ -7,6 +7,11 @@ export function isValidResourceType(type: string | null): type is 'expire' | 'qu
   return type === 'expire' || type === 'quota' || type === 'all'
 }
 
+// 状态
+export function isValidResourcestatus(status: string | null): status is '0' | '1' | '2' {
+  return status === '0' || status === '1' || status === '2'
+}
+
 // 资源类型徽章
 export function ResourceTypeBadge({type}: {type: number}) {
   if (type === 1) {

src/app/layout.tsx

@@ -8,6 +8,8 @@ import {LayoutStoreProvider} from '@/components/stores/layout'
 import {ClientStoreProvider} from '@/components/stores/client'
 import {getProfile} from '@/actions/auth'
 import Script from 'next/script'
+import {AppStoreProvider} from '@/components/stores/app'
+import {getApiUrl} from '@/actions/base'
 
 export async function generateMetadata(): Promise<Metadata> {
   return {
@@ -25,18 +27,19 @@ export default async function RootLayout(props: Readonly<{
           <Effects>{props.children}</Effects>
         </StoreProviders>
         <Toaster position="top-center" richColors expand/>
-        <Script id="qd2852138148beb7882a4a6a3e5ff5b569436003e7dc" src="https://wp.qiye.qq.com/qidian/2852138148/beb7882a4a6a3e5ff5b569436003e7dc" async defer></Script>
       </body>
     </html>
   )
 }
 
-function StoreProviders(props: {children: ReactNode}) {
+async function StoreProviders(props: {children: ReactNode}) {
   return (
     <ProfileStoreProvider profile={getProfile().then(resp => resp.success ? resp.data : null)}>
       <LayoutStoreProvider>
         <ClientStoreProvider>
-          {props.children}
+          <AppStoreProvider url={await getApiUrl().then(r => r.data)}>
+            {props.children}
+          </AppStoreProvider>
         </ClientStoreProvider>
       </LayoutStoreProvider>
     </ProfileStoreProvider>

src/components/composites/dialogs/change-password-dialog.tsx

@@ -4,7 +4,7 @@ import {Dialog, DialogContent, DialogFooter, DialogHeader, DialogTitle, DialogTr
 import {Button} from '@/components/ui/button'
 import {Form, FormField} from '@/components/ui/form'
 import {Input} from '@/components/ui/input'
-import {useForm, useFormContext, useWatch} from 'react-hook-form'
+import {useForm, useFormContext} from 'react-hook-form'
 import {zodResolver} from '@hookform/resolvers/zod'
 import * as z from 'zod'
 import {toast} from 'sonner'
@@ -14,7 +14,6 @@ import dynamic from 'next/dynamic'
 
 // 表单验证规则
 const schema = z.object({
-  phone: z.string().regex(/^1\d{10}$/, `请输入正确的手机号`),
   captcha: z.string().nonempty('请输入验证码'),
   code: z.string().regex(/^\d{6}$/, `请输入正确的验证码`),
   password: z.string().min(6, `密码至少6位`),
@@ -32,6 +31,7 @@ interface ChangePasswordDialogProps {
   defaultOpen?: boolean
   onOpenChange?: (open: boolean) => void
   onSuccess?: () => void
+  phone?: string
 }
 
 export function ChangePasswordDialog({
@@ -40,12 +40,28 @@ export function ChangePasswordDialog({
   defaultOpen,
   onOpenChange,
   onSuccess,
+  phone,
 }: ChangePasswordDialogProps) {
   const [internalOpen, setInternalOpen] = useState(defaultOpen || false)
   const router = useRouter()
 
   const actualOpen = open !== undefined ? open : internalOpen
-  const actualOnOpenChange = onOpenChange || setInternalOpen
+  const actualOnOpenChange = (open: boolean) => {
+    if (!open) {
+      form.reset({
+        captcha: '',
+        code: '',
+        password: '',
+        confirm_password: '',
+      })
+    }
+    if (onOpenChange) {
+      onOpenChange(open)
+    }
+    else {
+      setInternalOpen(open)
+    }
+  }
 
   // 表单初始化
   const form = useForm<Schema>({
@@ -59,7 +75,6 @@ export function ChangePasswordDialog({
       ),
     ),
     defaultValues: {
-      phone: '',
       captcha: '',
       code: '',
       password: '',
@@ -68,10 +83,9 @@ export function ChangePasswordDialog({
   })
 
   // 提交处理
-  const handler = form.handleSubmit(async (value) => {
+  const handler = async (value: Schema) => {
     try {
       const resp = await updatePassword({
-        phone: value.phone,
         code: value.code,
         password: value.password,
       })
@@ -90,7 +104,7 @@ export function ChangePasswordDialog({
         description: e instanceof Error ? e.message : String(e),
       })
     }
-  })
+  }
 
   return (
     <Dialog open={actualOpen} onOpenChange={actualOnOpenChange}>
@@ -98,18 +112,22 @@ export function ChangePasswordDialog({
         <Button theme="outline" className={triggerClassName || 'w-24 h-9'}>修改密码</Button>
       </DialogTrigger>
       <DialogContent>
-        <DialogHeader>
+        <Form
-          <DialogTitle>修改密码</DialogTitle>
+          form={form}
-        </DialogHeader>
+          handler={async () => {
-        <Form form={form} handler={handler} className="flex flex-col gap-4 mt-4">
+            const data = form.getValues()
-          {/* 手机号输入 */}
+            await handler(data)
-          <FormField<Schema> name="phone" label="手机号" className="flex-auto">
+          }}
-            {({field}) => (
+          className="flex flex-col gap-4 mt-4">
-              <Input {...field} placeholder="请输入手机号" autoComplete="tel-national"/>
+          <DialogHeader>
-            )}
+            <DialogTitle>修改密码</DialogTitle>
-          </FormField>
+          </DialogHeader>
-
+          {phone && (
-          {/* 短信验证码 */}
+            <div className="flex items-center gap-2 p-3 bg-gray-50 rounded-lg">
+              <span className="text-sm text-gray-500">当前用户手机号：</span>
+              <span className="text-sm font-medium">{phone}</span>
+            </div>
+          )}
           <div className="flex gap-4 items-end">
             <FormField<Schema> name="code" label="验证码" className="flex-auto">
               {({field}) => (
@@ -118,36 +136,35 @@ export function ChangePasswordDialog({
             </FormField>
             <SendMsgByPhone/>
           </div>
-
-          {/* 新密码 */}
           <FormField<Schema> name="password" label="新密码" className="flex-auto">
             {({field}) => (
               <Input {...field} placeholder="请输入新密码" type="password" autoComplete="new-password"/>
             )}
           </FormField>
-
-          {/* 确认密码 */}
           <FormField<Schema> name="confirm_password" label="确认密码" className="flex-auto">
             {({field}) => (
               <Input {...field} placeholder="请再次输入新密码" type="password" autoComplete="new-password"/>
             )}
           </FormField>
-        </Form>
 
-        <DialogFooter>
+          <DialogFooter>
-          <Button
+            <Button
-            theme="outline"
+              theme="outline"
-            type="button"
+              type="button"
-            onClick={() => {
+              onClick={() => {
-              actualOnOpenChange(false)
+                form.reset({
-              form.reset()
+                  captcha: '',
-            }}>
+                  code: '',
-            关闭
+                  password: '',
-          </Button>
+                  confirm_password: '',
-          <Button onClick={handler}>
+                })
-            保存
+                actualOnOpenChange(false)
-          </Button>
+              }}>
-        </DialogFooter>
+              关闭
+            </Button>
+            <Button type="submit">保存</Button>
+          </DialogFooter>
+        </Form>
       </DialogContent>
     </Dialog>
   )
@@ -155,8 +172,7 @@ export function ChangePasswordDialog({
 
 function SendMsgByPhone() {
   const {control} = useFormContext<Schema>()
-  const phone = useWatch({control, name: 'phone'})
+  return <SendMsg/>
-  return <SendMsg phone={phone}/>
 }
 
-const SendMsg = dynamic(() => import('@/components/send-msg'), {ssr: false})
+const SendMsg = dynamic(() => import('@/components/updateSend-msg'), {ssr: false})

src/components/composites/extract/index.tsx

@@ -18,7 +18,7 @@ import {toast} from 'sonner'
 import {merge} from '@/lib/utils'
 import {Combobox} from '@/components/ui/combobox'
 import cities from './_assets/cities.json'
-import ExtractDocs from '@/app/(home)/docs/product/api-docs/page.md'
+import ExtractDocs from '@/app/(home)/docs/(product)/api-docs/page.md'
 import Link from 'next/link'
 import {useProfileStore} from '@/components/stores/profile'
 
@@ -337,7 +337,6 @@ function SelectResource() {
     setStatus('load')
     try {
       const resp = await allResource()
-
       if (!resp.success) {
         throw new Error('获取套餐失败，请稍后再试')
       }
@@ -381,102 +380,103 @@ function SelectResource() {
                 <Loader className="animate-spin" size={20}/>
                 <span>暂无可用套餐</span>
               </div>
-            ) : resources.map((resource, i) => (
+            ) : (
               <>
-                <SelectItem
+                {resources.map(resource => (
-                  key={`${resource.id}`}
+                  <SelectItem
-                  value={String(resource.id)}
+                    key={resource.id}
-                  className="p-3">
+                    value={String(resource.id)}
-                  <div className="flex flex-col gap-2 w-72">
+                    className="p-3">
-                    {resource.type === 1 && resource.short.type === 1 && (
+                    <div className="flex flex-col gap-2 w-72">
-                      <>
+                      {resource.type === 1 && resource.short.type === 1 && (
-                        <div className="flex gap-2 items-center bg-green-50 w-fit px-2 py-1 rounded-md text-sm">
+                        <>
-                          <Timer size={20}/>
+                          <div className="flex gap-2 items-center bg-green-50 w-fit px-2 py-1 rounded-md text-sm">
-                          <span>{name(resource)}</span>
+                            <Timer size={20}/>
-                        </div>
+                            <span>{name(resource)}</span>
-                        <div className="flex text-xs text-weak">
+                          </div>
-                          <span>{resource.resource_no}</span>
+                          <div className="flex text-xs text-weak">
-                        </div>
+                            <span>{resource.resource_no}</span>
-                        <div className="flex justify-between gap-2 text-xs text-weak">
+                          </div>
-                          <span>
+                          <div className="flex justify-between gap-2 text-xs text-weak">
-                            到期时间：
+                            <span>
-                            {format(resource.short.expire_at, 'yyyy-MM-dd HH:mm')}
+                              到期时间：
-                          </span>
+                              {format(resource.short.expire_at, 'yyyy-MM-dd HH:mm')}
-                          <span>{intlFormatDistance(resource.short.expire_at, new Date())}</span>
+                            </span>
-                        </div>
+                            <span>{intlFormatDistance(resource.short.expire_at, new Date())}</span>
-                      </>
+                          </div>
-                    )}
+                        </>
-                    {resource.type === 1 && resource.short.type === 2 && (
+                      )}
-                      <>
+                      {resource.type === 1 && resource.short.type === 2 && (
-                        <div className="flex gap-2 items-center bg-blue-50 w-fit px-2 py-1 rounded-md text-sm">
+                        <>
-                          <Box size={20}/>
+                          <div className="flex gap-2 items-center bg-blue-50 w-fit px-2 py-1 rounded-md text-sm">
-                          <span>{name(resource)}</span>
+                            <Box size={20}/>
-                        </div>
+                            <span>{name(resource)}</span>
-                        <div className="flex text-xs text-weak">
+                          </div>
-                          <span>{resource.resource_no}</span>
+                          <div className="flex text-xs text-weak">
-                        </div>
+                            <span>{resource.resource_no}</span>
-                        <div className="flex justify-between gap-2 text-xs text-weak">
+                          </div>
-                          <span>
+                          <div className="flex justify-between gap-2 text-xs text-weak">
-                            提取数量：
+                            <span>
-                            {resource.short.used}
+                              提取数量：
-                            {' '}
+                              {resource.short.used}
-                            /
+                              {' '}
-                            {resource.short.quota}
+                              /
-                          </span>
+                              {resource.short.quota}
-                          <span>
+                            </span>
-                            剩余
+                            <span>
-                            {resource.short.quota - resource.short.used}
+                              剩余
-                          </span>
+                              {resource.short.quota - resource.short.used}
-                        </div>
+                            </span>
-                      </>
+                          </div>
-                    )}
+                        </>
-                    {resource.type === 2 && resource.long.type === 1 && (
+                      )}
-                      <>
+                      {resource.type === 2 && resource.long.type === 1 && (
-                        <div className="flex gap-2 items-center bg-green-50 w-fit px-2 py-1 rounded-md text-sm">
+                        <>
-                          <Timer size={20}/>
+                          <div className="flex gap-2 items-center bg-green-50 w-fit px-2 py-1 rounded-md text-sm">
-                          <span>{name(resource)}</span>
+                            <Timer size={20}/>
-                        </div>
+                            <span>{name(resource)}</span>
-                        <div className="flex text-xs text-weak">
+                          </div>
-                          <span>{resource.resource_no}</span>
+                          <div className="flex text-xs text-weak">
-                        </div>
+                            <span>{resource.resource_no}</span>
-                        <div className="flex justify-between gap-2 text-xs text-weak">
+                          </div>
-                          <span>
+                          <div className="flex justify-between gap-2 text-xs text-weak">
-                            到期时间：
+                            <span>
-                            {format(resource.long.expire_at, 'yyyy-MM-dd HH:mm')}
+                              到期时间：
-                          </span>
+                              {format(resource.long.expire_at, 'yyyy-MM-dd HH:mm')}
-                          <span>{intlFormatDistance(resource.long.expire_at, new Date())}</span>
+                            </span>
-                        </div>
+                            <span>{intlFormatDistance(resource.long.expire_at, new Date())}</span>
-                      </>
+                          </div>
-                    )}
+                        </>
-                    {resource.type === 2 && resource.long.type === 2 && (
+                      )}
-                      <>
+                      {resource.type === 2 && resource.long.type === 2 && (
-                        <div className="flex gap-2 items-center bg-blue-50 w-fit px-2 py-1 rounded-md text-sm">
+                        <>
-                          <Box size={20}/>
+                          <div className="flex gap-2 items-center bg-blue-50 w-fit px-2 py-1 rounded-md text-sm">
-                          <span>{name(resource)}</span>
+                            <Box size={20}/>
-                        </div>
+                            <span>{name(resource)}</span>
-                        <div className="flex text-xs text-weak">
+                          </div>
-                          <span>{resource.resource_no}</span>
+                          <div className="flex text-xs text-weak">
-                        </div>
+                            <span>{resource.resource_no}</span>
-                        <div className="flex justify-between gap-2 text-xs text-weak">
+                          </div>
-                          <span>
+                          <div className="flex justify-between gap-2 text-xs text-weak">
-                            提取数量：
+                            <span>
-                            {resource.long.used}
+                              提取数量：
-                            {' '}
+                              {resource.long.used}
-                            /
+                              {' '}
-                            {resource.long.quota}
+                              /
-                          </span>
+                              {resource.long.quota}
-                          <span>
+                            </span>
-                            剩余
+                            <span>
-                            {resource.long.quota - resource.long.used}
+                              剩余
-                          </span>
+                              {resource.long.quota - resource.long.used}
-                        </div>
+                            </span>
-                      </>
+                          </div>
-                    )}
+                        </>
-                  </div>
+                      )}
-                </SelectItem>
+                    </div>
-                {i < resources.length - 1 && <SelectSeparator className="m-1"/>}
+                  </SelectItem>
+                ))}
               </>
-            ))}
+            )}
           </SelectContent>
         </Select>
       )}
@@ -651,9 +651,9 @@ function name(resource: Resource) {
     // 短效套餐
     switch (resource.short.type) {
     case 1:
-      return `短效包时 ${resource.short.live / 60} 分钟`
+      return `短效包时 ${resource.short.live} 分钟`
     case 2:
-      return `短效包量 ${resource.short.live / 60} 分钟`
+      return `短效包量 ${resource.short.live} 分钟`
     }
     break
 

src/components/composites/payment/desktop-payment.tsx

@@ -5,8 +5,10 @@ import {Loader} from 'lucide-react'
 import {useState} from 'react'
 import Image from 'next/image'
 import {PaymentModalProps} from './payment-modal'
+import {getTradeMethodDecoration} from '@/lib/models/trade'
 
 export function DesktopPayment(props: PaymentModalProps) {
+  const decoration = getTradeMethodDecoration(props.method)
   const [loading, setLoading] = useState(false)
 
   const onSubmit = async () => {
@@ -19,10 +21,10 @@ export function DesktopPayment(props: PaymentModalProps) {
     <DialogContent>
       <DialogHeader>
         <DialogTitle className="flex gap-2 items-center">
-          {props.decoration.icon ? (
+          {decoration.icon ? (
             <Image
-              src={props.decoration.icon}
+              src={decoration.icon}
-              alt={props.decoration.text}
+              alt={decoration.text}
               width={24}
               height={24}
               className="rounded-md"
@@ -30,7 +32,7 @@ export function DesktopPayment(props: PaymentModalProps) {
           ) : (
             <div className="w-6 h-6 bg-gray-200 rounded-full"/>
           )}
-          <span>{props.decoration.text}</span>
+          <span>{decoration.text}</span>
         </DialogTitle>
       </DialogHeader>
 
@@ -43,8 +45,8 @@ export function DesktopPayment(props: PaymentModalProps) {
         />
         <p className="text-sm text-gray-600">
           请使用
-          {props.decoration.text}
+          {decoration.text}
-          扫码支付
+          {/* 扫码支付 */}
         </p>
 
         <div className="w-full text-center space-y-2">

src/components/composites/payment/mobile-payment.tsx

@@ -6,8 +6,10 @@ import {CreditCard, Loader} from 'lucide-react'
 import {useState} from 'react'
 import Image from 'next/image'
 import {PaymentModalProps} from './payment-modal'
+import {getTradeMethodDecoration} from '@/lib/models/trade'
 
 export function MobilePayment(props: PaymentModalProps) {
+  const decoration = getTradeMethodDecoration(props.method)
   const [loading, setLoading] = useState(false) // 加载状态
   const [paymentInitiated, setPaymentInitiated] = useState(false) // 是否已发起支付
 
@@ -54,16 +56,16 @@ export function MobilePayment(props: PaymentModalProps) {
           <div className="flex justify-between">
             <span className="text-gray-600">支付方式</span>
             <div className="flex items-center gap-2">
-              {props.decoration.icon && (
+              {decoration.icon && (
                 <Image
-                  src={props.decoration.icon}
+                  src={decoration.icon}
-                  alt={props.decoration.text}
+                  alt={decoration.text}
                   width={28}
                   height={28}
                   className="rounded-md"
                 />
               )}
-              <span>{props.decoration.text}</span>
+              <span>{decoration.text}</span>
             </div>
           </div>
           <div className="flex justify-between">

src/components/composites/payment/payment-modal.tsx

@@ -6,7 +6,8 @@ import {Dialog} from '@/components/ui/dialog'
 import {PaymentProps} from './type'
 import {payClose} from '@/actions/resource'
 import {useEffect} from 'react'
-import {useRouter} from 'next/navigation'
+import {UniversalDesktopPayment} from './universal-desktop-payment'
+import {useAppStore} from '@/components/stores/app'
 
 export type PaymentModalProps = {
   onConfirm: (showFail: boolean) => Promise<void>
@@ -34,9 +35,10 @@ export function PaymentModal(props: PaymentModalProps) {
   }
 
   // SSE处理方式检查支付状态
+  const apiUrl = useAppStore('apiUrl')
   useEffect(() => {
     const eventSource = new EventSource(
-      `${process.env.NEXT_PUBLIC_API_BASE_URL}/api/trade/check?trade_no=${props.inner_no}&method=${props.method}`,
+      `${apiUrl}/api/trade/check?trade_no=${props.inner_no}&method=${props.method}`,
     )
     eventSource.onmessage = async (event) => {
       switch (event.data) {
@@ -53,7 +55,7 @@ export function PaymentModal(props: PaymentModalProps) {
     return () => {
       eventSource.close()
     }
-  }, [props])
+  }, [apiUrl, props])
 
   return (
     <Dialog
@@ -61,17 +63,13 @@ export function PaymentModal(props: PaymentModalProps) {
       onOpenChange={(open) => {
         if (!open) handleClose()
       }}>
-      {props.platform === TradePlatform.Mobile ? (
+
-        <MobilePayment
+      {props.platform === TradePlatform.Mobile
-          {...props}
+        ? <MobilePayment {...props} onClose={handleClose}/>
-          onClose={handleClose}
+        : <DesktopPayment {...props} onClose={handleClose}/>
-        />
+      }
-      ) : (
+
-        <DesktopPayment
+      {/* <UniversalDesktopPayment {...props} onClose={handleClose}/> */}
-          {...props}
-          onClose={handleClose}
-        />
-      )}
     </Dialog>
   )
 }

src/components/composites/payment/type.ts

@@ -8,8 +8,4 @@ export type PaymentProps = {
   amount: number
   platform: TradePlatform
   method: TradeMethod
-  decoration: {
-    icon: StaticImageData
-    text: string
-  }
 }

src/components/composites/payment/universal-desktop-payment.tsx

@@ -0,0 +1,83 @@
+'use client'
+import {DialogClose, DialogContent, DialogHeader, DialogTitle} from '@/components/ui/dialog'
+import {Button} from '@/components/ui/button'
+import {Loader} from 'lucide-react'
+import {useState} from 'react'
+import Image from 'next/image'
+import {PaymentModalProps} from './payment-modal'
+import {getTradeMethodDecoration, TradePlatform} from '@/lib/models/trade'
+
+export function UniversalDesktopPayment(props: PaymentModalProps) {
+  const decoration = getTradeMethodDecoration(props.method)
+  const [loading, setLoading] = useState(false)
+
+  const onSubmit = async () => {
+    setLoading(true)
+    await props.onConfirm(true)
+    setLoading(false)
+  }
+
+  return (
+    <DialogContent>
+      <DialogHeader>
+        <DialogTitle className="flex gap-2 items-center">
+          {decoration.icon ? (
+            <Image
+              src={decoration.icon}
+              alt={decoration.text}
+              width={24}
+              height={24}
+              className="rounded-md"
+            />
+          ) : (
+            <div className="w-6 h-6 bg-gray-200 rounded-full"/>
+          )}
+          <span>{decoration.text}</span>
+        </DialogTitle>
+      </DialogHeader>
+
+      <div className="flex flex-col items-center gap-4">
+        <Image
+          src={props.pay_url}
+          width={208}
+          height={208}
+          alt="二维码"
+        />
+        <div className="flex-none flex flex-col gap-1 items-center">
+          <p className="text-sm text-gray-600">
+            请使用 微信 或 支付宝 扫码支付
+          </p>
+          <p className="text-sm text-gray-600">
+            手机端长按二维码下载并识图
+          </p>
+        </div>
+
+        <div className="w-full text-center space-y-2">
+          <p className="text-sm font-medium">
+            支付金额:
+            <span className="text-accent">
+              ¥
+              {props.amount?.toFixed(2) || '0.00'}
+            </span>
+          </p>
+          <p className="text-xs text-gray-500">
+            订单号:
+            {props.inner_no}
+          </p>
+        </div>
+
+        <div className="flex gap-4 w-full justify-center">
+          <Button onClick={onSubmit}>
+            {loading && <Loader className="animate-spin mr-2"/>}
+            已完成支付
+          </Button>
+          <DialogClose asChild>
+            <Button theme="outline" onClick={() => props.onClose?.()}>
+              关闭
+            </Button>
+          </DialogClose>
+        </div>
+      </div>
+    </DialogContent>
+  )
+}

src/components/composites/purchase/custom/page.tsx

@@ -234,7 +234,7 @@ export default function CollectPage() {
               <div className="text-blue-600 font-bold text-2xl md:text-2xl text-center md:text-left">
                 现在注册，免费领取5000IP
               </div>
-              <FreeTrial className={merge('bg-blue-600 hover:bg-blue-700 text-white px-6 py-2 rounded-md whitespace-nowrap')}/>
+              <FreeTrial className={merge('bg-blue-600 hover:bg-blue-700 text-white px-6 py-2 rounded-md whitespace-nowrap cursor-pointer')}/>
             </div>
           </div>
         </div>