From 01e0891fa80f81991a8ae16e49b2e554cedea99c Mon Sep 17 00:00:00 2001
From: lyp <lyp@123.com>
Date: Wed, 5 Mar 2025 17:47:04 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/head/Head.tsx | 68 +++++++++++++++++++++++++++++++++-------
 1 file changed, 56 insertions(+), 12 deletions(-)

diff --git a/src/layout/head/Head.tsx b/src/layout/head/Head.tsx
index d1ab7b9..0e87362 100644
--- a/src/layout/head/Head.tsx
+++ b/src/layout/head/Head.tsx
@@ -93,7 +93,7 @@ type FieldType = {
 //     },
 // ];
 
-import { DownOutlined, UserOutlined, QuestionCircleOutlined, BellOutlined, KeyOutlined, LogoutOutlined, GiftOutlined, AccountBookOutlined, ContainerOutlined, MenuFoldOutlined, UsergroupAddOutlined,TableOutlined } from "@ant-design/icons";
+import { DownOutlined, UserOutlined, QuestionCircleOutlined, BellOutlined, KeyOutlined, LogoutOutlined, GiftOutlined, AccountBookOutlined, ContainerOutlined, MenuFoldOutlined, UsergroupAddOutlined, TableOutlined } from "@ant-design/icons";
 import { useContext, useEffect, useState } from "react";
 import {
     put, get,
@@ -124,8 +124,8 @@ export default function Head() {
     const [packList, setPackList] = useState<any[]>([]) //服务包列表
     const [packPage, setPackPage] = useState(1) //服务包分页
     const [packTotal, setPackTotal] = useState(0) //服务包总数
-     // 获取我得服务包信息
-     const getPickList = (page:number) => {
+    // 获取我得服务包信息
+    const getPickList = (page: number) => {
 
         get<any>({
             messageApi,
@@ -140,10 +140,10 @@ export default function Head() {
 
             },
             onSuccess({ data }) {
-              
+
                 setPackList(data.rows)
                 setPackTotal(data.total)
-               
+
             },
             onFinally() {
 
@@ -648,14 +648,24 @@ export default function Head() {
         // packageType
         {
             title: '套餐类型',
-            dataIndex: 'packageType',
+            dataIndex: 'packageInfoAppDTO',
             key: 'packageOrderId',
             // 居中显示
             align: 'center',
             render: (text) => {
-                return <div>{text=="ALL"?'全托管':'写材料'} </div>
+                return <div>{text.packageType == "ALL" ? '全托管' : '写材料'} </div>
             }
         },
+        // {
+        //     title: '套餐类型',
+        //     dataIndex: 'packageInfoAppDTO',
+        //     key: 'packageOrderId',
+        //     // 居中显示
+        //     align: 'center',
+        //     render: (text) => {
+        //         return <div>{text} </div>
+        //     }
+        // },
         {
             title: '价格',
             dataIndex: 'packageTotalMoney',
@@ -663,11 +673,11 @@ export default function Head() {
             // 居中显示
             align: 'center',
             render: (text) => {
-                return <div>{text/100}元</div>
+                return <div>{text / 100}元</div>
             }
         },
         {
-            title: '当前剩余次数',
+            title: '剩余次数',
             dataIndex: 'packageTotalSurplusCount',
             align: 'center',
             key: 'packageOrderId',
@@ -675,6 +685,15 @@ export default function Head() {
                 return <div>{text} </div>
             }
         },
+        {
+            title: '总次数',
+            dataIndex: 'packageTotalCount',
+            align: 'center',
+            key: 'packageOrderId',
+            render: (text: any) => {
+                return <div>{text} </div>
+            }
+        },
         {
             title: '下单时间',
             align: 'center',
@@ -887,6 +906,30 @@ export default function Head() {
                     {/* <div className="right" style={{backgroundImage: `url(${headRightBg})`}}> */}
 
                     <div className="right">
+                        {/* <div className='kf' onClick={()=>{
+                            setPackageModal(true)
+                            setPackPage(1);
+                            getPickList(1)
+                        }}
+                        >
+                            <div style={{
+                                display: 'flex',
+                               flexDirection: 'column',
+                                alignItems: 'center',
+                                justifyContent: 'center',
+                               
+                            }}>
+                                <div className='kfText '>套餐包</div>
+                                <div style={{
+                                    marginTop:10,
+                                    fontWeight: 700,
+                                }}>
+                                    <span>全托管:100件</span>
+                                    <span style={{marginLeft:10}}>写材料:100件</span>
+                                </div>
+                            </div>
+                        </div> */}
+                        {/* <div className='headLine'></div> */}
                         <div className='kf' onClick={() => {
                             setkfModal(true)
                         }}>
@@ -1201,9 +1244,10 @@ export default function Head() {
                     </div>
                     <div className='invitation-box'>
                         <div className='invBox-top'>
-                            <div className='invBox-title' style={{ fontSize: '24px',
-                                width: bindingInvNum?264:362,
-                             }}>
+                            <div className='invBox-title' style={{
+                                fontSize: '24px',
+                                width: bindingInvNum ? 264 : 362,
+                            }}>
                                 他人邀请码
                             </div>
                             <div className='invBox-line'></div>