合并dev-ly

src/views/marketing/config/components/push.vue

@@ -56,16 +56,10 @@
 		<el-form ref="ruleFormRef" :model="formData" :rules="dataRules" label-width="90px"
 			class="flex flex-wrap mt-4 w-1/2">
 			<el-form-item label="推送应用" prop="pushApp" class="w-full">
-<<<<<<< HEAD
-				<el-select v-model="formData.pushApp" placeholder="请选择推送应用" multiple collapse-tags collapse-tags-tooltip
-					:max-collapse-tags="4" filterable class="w-full" :value-key="'appId'">
-					<el-option v-for="item in appOptions" :key="item.value" :label="item.label" :value="item.value" />
-=======
 				<el-select v-model="formData.pushApp" placeholder="请选择推送方式" multiple collapse-tags collapse-tags-tooltip
 					:max-collapse-tags="4" filterable remote class="w-full">
 					<el-option v-for="item in appOptions" :key="item.value" :label="item.label"
 						:value="item.value" />
->>>>>>> dev-ly
 				</el-select>
 			</el-form-item>
 			<el-form-item label="主动推送" prop="autoPush" class="w-1/2">
@@ -590,30 +584,6 @@ const formatNum = (value: string | number = 0) => {
 	}
 	return '';
 };
-<<<<<<< HEAD
-
-onMounted(() => {
-	getAppListData();
-});
-
-watch(
-	() => props.rowData,
-	(val) => {
-		if (val) {
-			formData.value = {
-				...props.rowData,
-				action: props.rowData?.action || '1',
-				pushFrequency: formatNum(props.rowData?.pushFrequency),
-				pushApp: normalizePushApp(props.rowData.pushApp || []),
-				pushBundle: props.rowData.pushBundle || [],
-			};
-			ipData.value = props.rowData.ip || [];
-			domainData.value = props.rowData.domain || [];
-			regionData.value = props.rowData.pushAddr || ['全部国家'];
-			oldUrl.value = props.rowData.pushContent;
-		}
-	}
-=======
 // 修改 watch 部分
 watch(
   () => props.rowData,
@@ -641,7 +611,6 @@ watch(
     }
   },
   { deep: false } // 避免深度监听
->>>>>>> dev-ly
 );
 </script>
 <style lang="scss"></style>