同步6/16

src/views/system/Activity/index.vue

@@ -145,10 +145,14 @@ const { queryParams, form, rules } = toRefs(data);
 /** 查询活动管理列表 */
 const getList = async () => {
   loading.value = true;
-  const res = await listActivity(queryParams.value);
-  activityList.value = res.rows;
-  total.value = res.total;
-  loading.value = false;
+  listActivity(queryParams.value)
+    .then((res) => {
+      activityList.value = res.rows;
+      total.value = res.total;
+    })
+    .finally(() => {
+      loading.value = false;
+    });
 };
 /** 发布按钮 */
 const handleSend = (row: ActivityVO) => {
@@ -198,7 +202,7 @@ const handleAdd = () => {
 
 /** 修改按钮操作 */
 const handleUpdate = async (row?: ActivityVO) => {
-  const _id = row.id || ids.value[0];
+  const _id = row?.id || ids.value[0];
   router.push({
     path: '/repair/editActivity',
     query: {