From cf4fedbee25a62d2c93ae45e680625dd5b29ec89 Mon Sep 17 00:00:00 2001 From: luJianJun <2587063613@qq.com> Date: Fri, 18 Aug 2023 18:49:36 +0800 Subject: [PATCH] =?UTF-8?q?pnpm=E6=8F=90=E4=BA=A4-=E6=8E=92=E5=BA=8F?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/http/api.ts | 4 ++-- src/pages/chat/components/listItem.tsx | 19 +++++++++++++------ src/pages/chat/css/list.css | 7 +++++++ src/pages/chat/img/posTopB.svg | 1 + 4 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 src/pages/chat/img/posTopB.svg diff --git a/src/http/api.ts b/src/http/api.ts index 217c310..a6d6c09 100644 --- a/src/http/api.ts +++ b/src/http/api.ts @@ -20,8 +20,8 @@ export function generateSessionId() { export function baseUrl(){ - // return 'https://ansnid.com'; - return ''; + return 'https://ansnid.com'; + // return ''; } export function getToken(){ diff --git a/src/pages/chat/components/listItem.tsx b/src/pages/chat/components/listItem.tsx index 4c75e0e..d23c3a7 100644 --- a/src/pages/chat/components/listItem.tsx +++ b/src/pages/chat/components/listItem.tsx @@ -8,7 +8,10 @@ type dataList = { } interface Props { - instanceData: Omit & {}, + instanceData: Omit & { + title?:string, + istop?:number + }, key: any, setList: Function, infoList: any, @@ -30,12 +33,16 @@ export default ({ instanceData, key, setList, infoList, popShow,setErrorFun }: P //获取置顶数据 const getToppingItem = (arr: any) => { let toppingArr: { id: string, istop: boolean }[] = [] + let copyArr: any[]=[] arr.map((res: { istop: boolean; id: string }, i: number) => { if (res.istop) { - toppingArr.push(arr.splice(i, 1)[0] as { istop: boolean; id: string }) + copyArr.push(arr[i]) + }else{ + toppingArr.push(arr[i]) } }) - return toppingArr + console.log(arr) + return [...copyArr,...toppingArr] } //设置置顶 @@ -48,7 +55,7 @@ export default ({ instanceData, key, setList, infoList, popShow,setErrorFun }: P setErrorFun(data.message) } res(null) - }, '/chat/top', 'GET'); + }, '/chat/top', 'POST'); }) } @@ -58,7 +65,7 @@ export default ({ instanceData, key, setList, infoList, popShow,setErrorFun }: P let item = arr[key] setItemTop(item.uniqid, item).then(res=>{ let toppindItem = getToppingItem(arr) - setList('data', (list: null[]) => [...toppindItem, ...arr]) + setList('data', (list: null[]) => [...toppindItem]) }) e.stopPropagation() } @@ -89,7 +96,7 @@ export default ({ instanceData, key, setList, infoList, popShow,setErrorFun }: P class="inline-flex p-2 items-center gap-1 rounded-md hv-base" onClick={e => setDataTop(e, key())} > -
+
diff --git a/src/pages/chat/css/list.css b/src/pages/chat/css/list.css index 5249a8c..7540d46 100644 --- a/src/pages/chat/css/list.css +++ b/src/pages/chat/css/list.css @@ -17,6 +17,13 @@ background-position: center; background-size: 1rem 1rem; } +.list-top-icon-b { + width: 1rem; + height: 1rem; + background: url('../img/posTopB.svg') no-repeat; + background-position: center; + background-size: 1rem 1rem; +} .add-new-icon { width: 1rem; diff --git a/src/pages/chat/img/posTopB.svg b/src/pages/chat/img/posTopB.svg new file mode 100644 index 0000000..0bb96ad --- /dev/null +++ b/src/pages/chat/img/posTopB.svg @@ -0,0 +1 @@ + \ No newline at end of file