✨ MK公开页、预结算体验优化、地图选址与认证密码规则完善
This commit is contained in:
@@ -42,6 +42,14 @@ export default {
|
||||
type: String,
|
||||
default: '',
|
||||
},
|
||||
longitude: {
|
||||
type: [String, Number],
|
||||
default: '',
|
||||
},
|
||||
latitude: {
|
||||
type: [String, Number],
|
||||
default: '',
|
||||
},
|
||||
},
|
||||
emits: ['update:modelValue', 'confirm'],
|
||||
data() {
|
||||
@@ -66,9 +74,11 @@ export default {
|
||||
this.visible = value;
|
||||
if (value) {
|
||||
this.keyword = this.address || '';
|
||||
this.selected = {};
|
||||
this.status = '可搜索地址或点击地图选点';
|
||||
this.searchResults = [];
|
||||
this.selected = this.buildInitialSelection();
|
||||
this.status = this.selected.longitude
|
||||
? this.selected.address || '已选点,可确认回填'
|
||||
: '可搜索地址或点击地图选点';
|
||||
}
|
||||
},
|
||||
},
|
||||
@@ -82,6 +92,18 @@ export default {
|
||||
}
|
||||
},
|
||||
methods: {
|
||||
buildInitialSelection() {
|
||||
const longitude = Number(this.longitude);
|
||||
const latitude = Number(this.latitude);
|
||||
if (!Number.isFinite(longitude) || !Number.isFinite(latitude)) {
|
||||
return {};
|
||||
}
|
||||
return {
|
||||
longitude,
|
||||
latitude,
|
||||
address: this.address || '',
|
||||
};
|
||||
},
|
||||
loadAmap() {
|
||||
if (window.AMap && window.AMap.Map) {
|
||||
return Promise.resolve();
|
||||
@@ -110,15 +132,27 @@ export default {
|
||||
return new Promise(resolve => {
|
||||
this.$nextTick(() => {
|
||||
if (!this.$refs.map) return resolve(null);
|
||||
const initial = this.buildInitialSelection();
|
||||
const center =
|
||||
Number.isFinite(initial.longitude) && Number.isFinite(initial.latitude)
|
||||
? [initial.longitude, initial.latitude]
|
||||
: [116.40769, 39.89945];
|
||||
if (!this.amap) {
|
||||
this.amap = new window.AMap.Map(this.$refs.map, {
|
||||
center: [116.40769, 39.89945],
|
||||
zoom: 11,
|
||||
center,
|
||||
zoom: initial.longitude ? 14 : 11,
|
||||
});
|
||||
this.amap.on('click', event => this.pickPoint(event.lnglat));
|
||||
} else {
|
||||
this.amap.resize();
|
||||
this.clearMarker();
|
||||
this.amap.setZoomAndCenter(initial.longitude ? 14 : 11, center);
|
||||
}
|
||||
if (initial.longitude) {
|
||||
const point = new window.AMap.LngLat(initial.longitude, initial.latitude);
|
||||
this.renderMarker(point);
|
||||
this.selected = { ...initial };
|
||||
this.status = initial.address || '已选点,可确认回填';
|
||||
}
|
||||
resolve(this.amap);
|
||||
});
|
||||
@@ -254,11 +288,19 @@ export default {
|
||||
}
|
||||
},
|
||||
confirm() {
|
||||
if (!this.selected.longitude || !this.selected.latitude) {
|
||||
this.$message.warning('请先搜索或点击地图完成选点');
|
||||
return;
|
||||
}
|
||||
if (!this.selected.address) {
|
||||
this.$message.warning('请等待地址解析完成后再确认');
|
||||
return;
|
||||
}
|
||||
this.$emit('confirm', this.selected.address);
|
||||
this.$emit('confirm', {
|
||||
address: this.selected.address,
|
||||
longitude: this.selected.longitude,
|
||||
latitude: this.selected.latitude,
|
||||
});
|
||||
this.visible = false;
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user