Merge branch 'master' of http://36.137.93.232:3000/hf/byte-sailing-new

src/components/selectCity/index.vue

@@ -42,6 +42,16 @@ defineProps({
 		default: false,
 	},
 })
+//监听modelValue的变化
+watch(formData.value, (val) => {
+	// console.log(formData.value[proxy.addressId || 'provinceId'],formData.value[proxy.addressName || 'provinceName'])
+	if(!formData.value[proxy.addressId || 'provinceId'] && !formData.value[proxy.addressName || 'provinceName']) {
+		showModel.value = ''
+	}else{
+		showModel.value = formData.value[proxy.addressId || 'provinceId'] || formData.value[proxy.addressName || 'provinceName']
+	}
+})
+
 const getCityData = (val) => {
     let isAddCity = true
 	//判断val是否在data里面