提交

src/components/drawers/AddLive.vue

@@ -77,8 +77,9 @@
                   :disabled-time="disabledRangeTime"
                   style="width: 400px; height: 40px; border-radius: 8px"
                   v-model:value="dateTime"
+                  format="YYYY-MM-DD HH:mm"
+                  valueFormat="YYYY-MM-DD HH:mm"
                   @change="timeChange"
-                  format="YYYY/MM/DD HH:mm"
                   :placeholder="['      开始时间', '        结束时间']"
               />
             </div>
@@ -433,8 +434,6 @@ const range = (start, end) => {
 
 function timeChange(time, timeStr) {
   formData.value.liveStartTime = timeStr[0]
-  formData.value.submitStartTime = timeStr[0]
-  formData.value.submitEndTime = timeStr[1]
   formData.value.liveEndTime = timeStr[1]
 }
 
@@ -456,6 +455,7 @@ async function confirm() {
     throw Error("数据校验不通过")
   });
   if (taskIndex.value === -1) {
+<<<<<<< HEAD
     let list = props.taskList
     list.push(
             {name: formData.value.liveName,
@@ -463,6 +463,10 @@ async function confirm() {
               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 {
     const data = props.taskList[taskIndex.value]
     data.name = formData.value.liveName
@@ -474,7 +478,7 @@ async function confirm() {
 
 function openDrawer(i, row) {
   row && (formData.value = {...row.info});
-  row && (dateTime.value = [dayjs(row.info.submitStartTime, "YYYY-MM-DD HH:mm"), dayjs(row.info.submitEndTime, "YYYY-MM-DD HH:mm")]);
+  row && (dateTime.value = [row.info.liveStartTime, row.info.liveEndTime]);
   (i >= 0) && (taskIndex.value = i)
   visible.value = true
 }