hz/fe-manage
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/fe-manage.git synced 2025-12-12 12:26:47 +08:00
Code Issues Packages Projects Releases Wiki Activity

合并冲突

Browse Source
This commit is contained in:
lpq
2023-02-19 20:34:24 +08:00
parent 73a29eb4c6
commit 216ddac945
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/components/drawers/AddLive.vue
View File

@@ -462,21 +462,12 @@ async function confirm() {
throw Error("数据校验不通过");
});
if (taskIndex.value === -1) {
<<<<<<< HEAD
let list = props.taskList
list.push(
{name: formData.value.liveName,
type: props.type,
info: {...formData.value}
})
=======
const list = props.taskList;
list.push({
name: formData.value.liveName,
type: props.type,
info: { ...formData.value },
});
>>>>>>> 3e84518fc6431b5650dd225e2a6ff09936fbffe0
} else {
const data = props.taskList[taskIndex.value];
data.name = formData.value.liveName;