Merge branch 'v3' of ssh://94.191.59.107:10222/houwenfeng/cloudfile-ui into v3

src/api/biz/favorite.js

@@ -45,9 +45,10 @@ export function updateFavorite(data) {
 }
 
 // 删除文件收藏
-export function delFavorite(favoriteId) {
+export function delFavorite(data) {
   return request({
-    url: '/biz/favorite/' + favoriteId,
-    method: 'delete'
+    url: '/biz/favorite/cancel',
+    method: 'post',
+    data: data
   })
 }

src/views/collect/index.vue

@@ -493,7 +493,7 @@ const tabchange = async (labelId) => {
     orderByColumn: "createTime",
   };
   if (labelId === "second") {
-    const res = await listFavorite();
+    const res = await listFavoriteById(-1);
     console.log("res", res);
     return
   }

src/views/myfile/MyFile.vue

@@ -146,7 +146,7 @@
                                             <el-icon v-if="scope.row.isFavorite == 'N'">
                                                 <Star />
                                             </el-icon>
-                                            <img v-else @click.stop="delCollect(scope.row,$event)" src="../../assets/images/yellowstar.png" alt="">
+                                            <img v-else @click.stop="delCollect(scope.row,true)" src="../../assets/images/yellowstar.png" alt="">
                                             <img src="../../assets/images/fileBox.png" style="width: 20px;height: 24px;"
                                                 alt="">
                                             {{ scope.row.dirName }}
@@ -204,7 +204,7 @@
                                             <el-icon v-if="scope.row.isFavorite == 'N'">
                                                 <Star />
                                             </el-icon>
-                                            <img v-else @click.stop="delCollect(scope.row,$event)" src="../../assets/images/yellowstar.png" alt="">
+                                            <img v-else @click.stop="delCollect(scope.row,false)" src="../../assets/images/yellowstar.png" alt="">
                                             <img :src="getImage(scope.row.fileType)" alt="">
                                             {{ scope.row.fileName }}
                                         </span>
@@ -1236,15 +1236,23 @@ export default {
             }
         }
         // 取消文件收藏
-        const delCollect = async (row,e)=>{
+        const delCollect = async (row,isfolder)=>{
             const thisRow = toRaw(row)
             console.log('thisRow',thisRow);
-            // console.log('e',e);
-            if(thisRow.dirType){
-                const res = await delFavorite(thisRow.dirId)
+            let query = {}
+            if(isfolder){
+                query = {
+                    isFolder:"Y",
+                    relaId:thisRow.dirId
+                }
             }else{
-                const res = await delFavorite(thisRow.docId)
+               query = {
+                    isFolder:"N",
+                    relaId:thisRow.docId
+                } 
             }
+            const res = await delFavorite(query)
+            //TODO 之后需要重新获取数据
             console.log('res',res);
         }
         onMounted(() => {