diff --git a/src/views/task_template/edit.vue b/src/views/task_template/edit.vue index 920b74a..57aabca 100644 --- a/src/views/task_template/edit.vue +++ b/src/views/task_template/edit.vue @@ -105,25 +105,37 @@ /> - + - + - + @@ -144,7 +156,7 @@ v-if="mapShow" ref="mapRef" @success="setMap" - @close="mapShow = false" + @close="" > @@ -194,7 +206,11 @@ const formData = reactive({ money_two: 0, // 二阶段金额 money_three: 0, // 长期金额 types: "", //阶段类型 - extend: {}, + extend: { + origin: {}, //起点 + transfer: {}, //中转 + terminus: {}, //终点 + }, }); //任务类型接口 @@ -259,14 +275,35 @@ const mapRef = shallowRef>(); const changeTaskType = async (e: any) => { if (e == 32) { mapShow.value = true; //为三轮车时 - await nextTick(); - console.log(mapRef.value); - mapRef.value?.open(); + // await nextTick(); + // mapRef.value?.open(); } }; +// 当前点击的地图类型(起,转,终)点 +const mapType = ref(""); +const changeMap = async (e: Number) => { + let map_title = ""; + switch (e) { + case 0: + mapType.value = "origin"; + map_title = "起点"; + break; + case 1: + mapType.value = "transfer"; + map_title = "中转点"; + break; + case 2: + mapType.value = "terminus"; + map_title = "终点"; + break; + } + await nextTick(); + mapRef.value?.open(map_title); +}; + const setMap = (e: any) => { - formData.extend = e; + formData.extend[mapType.value] = e[0]; console.log("选择了地区", formData.extend); }; diff --git a/src/views/task_template/map.vue b/src/views/task_template/map.vue index c291855..edd26df 100644 --- a/src/views/task_template/map.vue +++ b/src/views/task_template/map.vue @@ -2,7 +2,7 @@
- 搜索 - 重置 + 搜索 + - +
@@ -72,6 +74,7 @@ const formRef = shallowRef(); const popupRef = shallowRef>(); const mode = ref("add"); const datalist = ref([]); +const title = ref(""); // 获取详情 const setFormData = async (data: Record) => { @@ -98,6 +101,12 @@ const resetMap = () => { mapRef.value.resetMap(); }; +// 搜索 +const searchText = ref(""); +const serach = () => { + mapRef.value.searchMap(searchText.value); +}; + const address = ref([]); const changeMaps = (e: any) => { address.value = JSON.parse(JSON.stringify(e)); @@ -112,8 +121,8 @@ const handleSubmit = async () => { }; //打开弹窗 -const open = (type = "add") => { - mode.value = type; +const open = (type = "地点") => { + title.value = "选择" + type; popupRef.value?.open(); };