Merge branch 'master' of http://192.168.1.222:3000/weieryang/bjbyrd-website

src/views/admin/activity.vue

@@ -235,7 +235,9 @@ const handleDelete = (id: number) => {
       const res: any = await request.delete('/Activity/activity/' + id);
 
       await alterRes(res);
-    });
+    }).catch(() => {
+      console.log('取消');
+    })
 }
 
 let tableData = ref([]);

src/views/admin/article.vue

@@ -276,7 +276,9 @@ const handleDelete = (id: number) => {
       const res: any = await request.delete('/GwHome/gwhome/' + id);
 
       await alterRes(res);
-    });
+    }).catch(() => {
+      console.log('取消');
+    })
 }
 
 let tableData = ref([]);

src/views/admin/artist.vue

@@ -223,7 +223,9 @@
         const res: any = await request.delete('/Artist/artist/' + id);
   
         await alterRes(res);
-      });
+      }).catch(() => {
+      console.log('取消');
+    })
   }
   
   let tableData = ref([]);

src/views/admin/product.vue

@@ -424,7 +424,9 @@ const handleDeleteType = (id: number) => {
       const res: any = await request.delete('/Type/type/' + id);
 
       await alterRes(res);
-    });
+    }).catch(() => {
+      console.log('取消');
+    })
 }
 
 
@@ -443,7 +445,9 @@ const handleDelete = (id: number) => {
       const res: any = await request.delete('/Product/product/' + id);
 
       await alterRes(res);
-    });
+    }).catch(() => {
+      console.log('取消');
+    })
 }
 
 let tableData = ref([]);