修复修改密码弹窗&取消后台显示客服弹窗 & 取消退出登录profile为空抛异常的判断

.vscode/settings.json

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

package.json

@@ -1,6 +1,6 @@
 {
   "name": "lanhu-web",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "private": true,
   "scripts": {
     "dev": "next dev -H 0.0.0.0 --turbopack",

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)/_components/header/menu-help.tsx

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

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

@@ -13,38 +13,38 @@ const MENU_ITEMS = [
   {
     group: '产品文档',
     items: [
-      {key: 'product/product-overview', label: '产品介绍'},
-      {key: 'product/choose-product', label: '如何选择产品'},
-      {key: 'product/why-verify', label: '为什么需要实名认证'},
-      {key: 'product/city-lines', label: '有哪些城市线路'},
-      {key: 'product/api-docs', label: 'ip提取接口文档'},
+      {key: 'product-overview', label: '产品介绍'},
+      {key: 'choose-product', label: '如何选择产品'},
+      {key: 'why-verify', label: '为什么需要实名认证'},
+      {key: 'city-lines', label: '有哪些城市线路'},
+      {key: 'api-docs', label: 'ip提取接口文档'},
       // 服务条款
     ],
   },
   {
     group: '操作指南',
     items: [
-      {key: 'operation/profile-settings', label: '修改个人信息和重置密码'},
-      {key: 'operation/whitelist-guide', label: '如何添加白名单'},
-      {key: 'operation/verify-guide', label: '如何进行实名认证'},
-      {key: 'operation/extract-link', label: '如何生成提取链接'},
-      {key: 'operation/payment-records', label: '查看支付和使用记录'},
+      {key: 'profile-settings', label: '修改个人信息和重置密码'},
+      {key: 'whitelist-guide', label: '如何添加白名单'},
+      {key: 'verify-guide', label: '如何进行实名认证'},
+      {key: 'extract-link', label: '如何生成提取链接'},
+      {key: 'payment-records', label: '查看支付和使用记录'},
     ],
   },
   {
     group: '客户端教程',
     items: [
-      {key: 'client/browser-proxy', label: '浏览器设置代理教程'},
-      {key: 'client/ios-proxy', label: 'iOS设置代理教程'},
-      {key: 'client/android-proxy', label: '安卓手机设置代理教程'},
-      {key: 'client/windows10-proxy', label: 'Windows10设置代理教程'},
+      {key: 'browser-proxy', label: '浏览器设置代理教程'},
+      {key: 'ios-proxy', label: 'iOS设置代理教程'},
+      {key: 'android-proxy', label: '安卓手机设置代理教程'},
+      {key: 'windows10-proxy', label: 'Windows10设置代理教程'},
     ],
   },
   {
     group: '常见问题',
     items: [
-      {key: 'faqs/faq-general', label: '常见问题总览'},
-      {key: 'faqs/faq-billing', label: '计费与套餐问题'},
+      {key: 'faq-general', label: '常见问题总览'},
+      {key: 'faq-billing', label: '计费与套餐问题'},
       // 业务场景集成方案
       // 故障排查
     ],
@@ -52,8 +52,8 @@ const MENU_ITEMS = [
   {
     group: '新闻资讯',
     items: [
-      {key: 'news/news-latest', label: '了解代理服务器的工作原理'},
-      {key: 'news/news-announce', label: '网站公告'},
+      {key: 'news-latest', label: '了解代理服务器的工作原理'},
+      {key: 'news-announce', label: '网站公告'},
     ],
   },
 ]

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/client/browser-proxy`},
-              {name: `行业资讯`, href: `/docs/news/news-latest`},
+              {name: `产品功能`, href: `/docs/product-overview`},
+              {name: `使用教程`, href: `/docs/browser-proxy`},
+              {name: `行业资讯`, href: `/docs/news-latest`},
             ]}
           />
         </div>

src/app/(home)/layout.tsx

@@ -1,6 +1,7 @@
 import {ReactNode} from 'react'
 import Header from './header'
 import Footer from './footer'
+import Script from 'next/script'
 
 export type HomeLayoutProps = {
   children: ReactNode
@@ -17,6 +18,8 @@ export default function HomeLayout(props: HomeLayoutProps) {
 
       {/* 页脚 */}
       <Footer/>
+
+      <Script id="qd2852138148beb7882a4a6a3e5ff5b569436003e7dc" src="https://wp.qiye.qq.com/qidian/2852138148/beb7882a4a6a3e5ff5b569436003e7dc" async defer></Script>
     </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(

src/app/admin/clients.tsx

@@ -75,19 +75,19 @@ export function Content(props: {children: ReactNode}) {
 }
 function ContentResolved() {
   const profile = use(useProfileStore(store => store.profile))
-  if (!profile) throw new Error('登录状态异常')
-  return (
-    <>
-      <RealnameAuthDialog
-        triggerClassName="hidden"
-        defaultOpen={!profile.id_token}
-      />
-      <ChangePasswordDialog
-        triggerClassName="hidden"
-        defaultOpen={!profile.has_password}
-      />
-    </>
-  )
+  if (profile)
+    return (
+      <>
+        <RealnameAuthDialog
+          triggerClassName="hidden"
+          defaultOpen={!profile.id_token}
+        />
+        <ChangePasswordDialog
+          triggerClassName="hidden"
+          defaultOpen={!profile.has_password}
+        />
+      </>
+    )
 }
 
 export function Header() {
@@ -127,8 +127,7 @@ export function Header() {
 
 function HeaderUserCenter() {
   const profile = use(useProfileStore(store => store.profile))
-  if (!profile) throw new Error('登录状态异常')
-  return <UserCenter profile={profile}/>
+  if (profile) return <UserCenter profile={profile}/>
 }
 
 export function Navbar() {

src/app/layout.tsx

@@ -25,7 +25,6 @@ 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>
   )

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

@@ -68,7 +68,7 @@ export function ChangePasswordDialog({
   })
 
   // 提交处理
-  const handler = form.handleSubmit(async (value) => {
+  const handler = async (value: Schema) => {
     try {
       const resp = await updatePassword({
         phone: value.phone,
@@ -90,7 +90,7 @@ export function ChangePasswordDialog({
         description: e instanceof Error ? e.message : String(e),
       })
     }
-  })
+  }
 
   return (
     <Dialog open={actualOpen} onOpenChange={actualOnOpenChange}>
@@ -98,10 +98,16 @@ export function ChangePasswordDialog({
         <Button theme="outline" className={triggerClassName || 'w-24 h-9'}>修改密码</Button>
       </DialogTrigger>
       <DialogContent>
-        <DialogHeader>
-          <DialogTitle>修改密码</DialogTitle>
-        </DialogHeader>
-        <Form form={form} handler={handler} className="flex flex-col gap-4 mt-4">
+        <Form
+          form={form}
+          handler={async () => {
+            const data = form.getValues()
+            await handler(data)
+          }}
+          className="flex flex-col gap-4 mt-4">
+          <DialogHeader>
+            <DialogTitle>修改密码</DialogTitle>
+          </DialogHeader>
           {/* 手机号输入 */}
           <FormField<Schema> name="phone" label="手机号" className="flex-auto">
             {({field}) => (
@@ -132,22 +138,20 @@ export function ChangePasswordDialog({
               <Input {...field} placeholder="请再次输入新密码" type="password" autoComplete="new-password"/>
             )}
           </FormField>
-        </Form>
 
-        <DialogFooter>
-          <Button
-            theme="outline"
-            type="button"
-            onClick={() => {
-              actualOnOpenChange(false)
-              form.reset()
-            }}>
-            关闭
-          </Button>
-          <Button onClick={handler}>
-            保存
-          </Button>
-        </DialogFooter>
+          <DialogFooter>
+            <Button
+              theme="outline"
+              type="button"
+              onClick={() => {
+                actualOnOpenChange(false)
+                form.reset()
+              }}>
+              关闭
+            </Button>
+            <Button type="submit">保存</Button>
+          </DialogFooter>
+        </Form>
       </DialogContent>
     </Dialog>
   )

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'
 

src/components/ui/pagination.tsx

@@ -107,13 +107,9 @@ function Pagination({
   const paginationItems = generatePaginationItems()
 
   return (
-    <div className={`flex flex-wrap items-center justify-end gap-4 ${className || ''}`}>
+    <div className={`flex flex-wrap items-center gap-4 ${className || ''}`}>
       <div className="flex-none flex items-center gap-2 text-sm text-muted-foreground">
-        共
-        {' '}
-        {total}
-        {' '}
-        条记录，每页
+        共 {total} 条记录，每页
         <Select
           value={size.toString()}
           onValueChange={handlePageSizeChange}