|
@@ -111,7 +111,7 @@ import {
|
|
|
onShow,
|
|
|
onUnload
|
|
|
} from "@dcloudio/uni-app";
|
|
|
-import { splitAddress, getCityCode } from '@/utils/adress'
|
|
|
+import { splitAddress, getCityCode,getAdressCode } from '@/utils/adress'
|
|
|
import { regionAddresstree } from '@/api/home.js'
|
|
|
|
|
|
import pickerAddress from '../pickerAddress/pickerAddress.vue'
|
|
@@ -359,44 +359,20 @@ function onCityWx(row) {
|
|
|
console.log('地区选点', row);
|
|
|
wx.chooseLocation({
|
|
|
success: async function (res) {
|
|
|
- console.log('res.address', res.address);
|
|
|
+ console.log('res.address', res);
|
|
|
|
|
|
const result = splitAddress(res.address);
|
|
|
- console.log("TCL: onCityWx -> result", result)
|
|
|
const res_dara = await regionAddresstree();
|
|
|
const handlecityData = getCityCode([result.province, result.city, result.district].join(' '), res_dara.data)
|
|
|
- console.log("TCL: onCityWx -> handlecityData", handlecityData)
|
|
|
- addressChange(handlecityData, row)
|
|
|
|
|
|
+
|
|
|
+ const api_res =await getAdressCode({ latitude: res.latitude, longitude: res.longitude },res_dara.data)
|
|
|
+ console.log("=================>", handlecityData,api_res)
|
|
|
+ addressChange(api_res.cityCode, row)
|
|
|
Object.assign(formData, {
|
|
|
// [row.key]: `${result.province}${result.city}${result.district}`,
|
|
|
address: result.detail
|
|
|
})
|
|
|
-
|
|
|
- // Object.assign(cityData, {
|
|
|
- // province: result.province,
|
|
|
- // city: result.city,
|
|
|
- // area:result.district,
|
|
|
- // })
|
|
|
-
|
|
|
- // Object.assign(formData, {
|
|
|
- // provinceName: result.province,
|
|
|
- // provinceCode: info.code[0],
|
|
|
- // provinceInd:indexArray[0] || 0,
|
|
|
- // cityName: result.city,
|
|
|
- // cityCode:info.code[1],
|
|
|
- // cityInd:indexArray[1] || 0,
|
|
|
- // districtName: result.district,
|
|
|
- // districtCode:info.code[2],
|
|
|
- // districtInd:indexArray[2] || 0,
|
|
|
-
|
|
|
- // address:result.detail
|
|
|
- // })
|
|
|
-
|
|
|
- // Object.assign(formData, {
|
|
|
- // [row.key]: `${result.province}${result.city}${result.district}`,
|
|
|
- // address:result.detail
|
|
|
- // })
|
|
|
},
|
|
|
fail: function (err) {
|
|
|
console.log(err);
|