Merge remote-tracking branch 'origin/feature-20240104' into feature-20240104

flossom-ui/src/views/system/siteCarouselInfo/index.vue

@@ -190,7 +190,7 @@
 					<span v-show="scope.row.type == 3">跳外部链接</span>
 					<span v-show="scope.row.type == 4">跳小程序</span>
 					<span v-show="scope.row.type == 5">导向视频号</span>
-					<span v-show="scope.row.type == 5">导向视频号直播间</span>
+					<span v-show="scope.row.type == 6">导向视频号直播间</span>
 				</template>
 			</el-table-column>
 			<el-table-column
@@ -822,7 +822,8 @@ export default {
 				updateBy: null,
 				updateTime: null,
 			}
-			this.resetForm('form')
+			this.resetForm('form');
+      this.$refs.upload.clearFiles();
 		},
 		/** 搜索按钮操作 */
 		handleQuery() {

flossom-ui/src/views/system/siteInfo/index.vue

@@ -814,6 +814,7 @@ export default {
 				updateTime: null,
 			}
 			this.resetForm('form')
+      this.$refs.upload.clearFiles();
 		},
 		dateUtil(date) {
 			// 获取年份、月份和日期