pnpm提交-排序修正

src/http/api.ts

@@ -20,8 +20,8 @@ export function generateSessionId() {
 
 
 export function baseUrl(){
-    // return 'https://ansnid.com';
+    return 'https://ansnid.com';
-    return '';
+    // return '';
 }
 
 export function getToken(){

src/pages/chat/components/listItem.tsx

@@ -8,7 +8,10 @@ type dataList = {
 }
 
 interface Props {
-    instanceData: Omit<dataList, 'messages'> & {},
+    instanceData: Omit<dataList, 'messages'> & {
+        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())}
                 >
-                    <div class='list-top-icon'></div>
+                    <div class={[instance.istop === 1 ?'list-top-icon-b':'list-top-icon'].join('')}></div>
                 </div>
             </div>
 

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;

src/pages/chat/img/posTopB.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1692354575685" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2366" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><path d="M43.072 974.72l380.864-301.952 151.936 161.6c0 0 63.424 17.28 67.328-30.72l-3.904-163.584 225.088-259.648 98.048-5.696c0 0 76.928-15.488 21.184-82.752l-275.072-276.928c0 0-74.944-9.6-69.248 59.584l0 75.008L383.552 367.104 225.856 376.64c0 0-57.728 19.2-36.608 69.248l148.16 146.176L43.072 974.72 43.072 974.72z" fill="#2c2c2c" p-id="2367"></path></svg>