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:29:38 +08:00
parent c1241a7455
commit 0231a33572
1 changed files with 0 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

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