Commit adad8696 authored by wangxuelai's avatar wangxuelai

Merge remote-tracking branch 'origin/bww-v1'

parents b45e6736 e8127945
...@@ -177,6 +177,7 @@ export default { ...@@ -177,6 +177,7 @@ export default {
const { const {
longitude, latitude, locationAddress, province, city, district, longitude, latitude, locationAddress, province, city, district,
} = yield select(state => state.schooladd); } = yield select(state => state.schooladd);
console.log(latitude, longitude);
const { schoolInfo } = yield select(state => state.officialweb); const { schoolInfo } = yield select(state => state.officialweb);
const newschoolInfo = JSON.parse(JSON.stringify(schoolInfo)); const newschoolInfo = JSON.parse(JSON.stringify(schoolInfo));
yield put({ yield put({
......
...@@ -223,6 +223,8 @@ class SelectPlaceMap extends React.Component { ...@@ -223,6 +223,8 @@ class SelectPlaceMap extends React.Component {
city: this.state.locationList[index].ad_info.city, city: this.state.locationList[index].ad_info.city,
district: this.state.locationList[index].ad_info.district, district: this.state.locationList[index].ad_info.district,
address: `${this.state.locationList[index].title}`, address: `${this.state.locationList[index].title}`,
longitude: this.state.locationList[index].location.lng,
latitude: this.state.locationList[index].location.lat,
}, },
}); });
// message.success('已将该地址导入为机构地址,不要忘记保存哦', 2); // message.success('已将该地址导入为机构地址,不要忘记保存哦', 2);
...@@ -245,6 +247,8 @@ class SelectPlaceMap extends React.Component { ...@@ -245,6 +247,8 @@ class SelectPlaceMap extends React.Component {
city: this.state.locationList[index].ad_info.city, city: this.state.locationList[index].ad_info.city,
district: this.state.locationList[index].ad_info.district, district: this.state.locationList[index].ad_info.district,
address: `${this.state.locationList[index].title}`, address: `${this.state.locationList[index].title}`,
longitude: this.state.locationList[index].location.lng,
latitude: this.state.locationList[index].location.lat,
}, },
}); });
// message.success('已将该地址导入为机构地址,不要忘记保存哦', 2); // message.success('已将该地址导入为机构地址,不要忘记保存哦', 2);
...@@ -326,6 +330,8 @@ class SelectPlaceMap extends React.Component { ...@@ -326,6 +330,8 @@ class SelectPlaceMap extends React.Component {
city: this.state.locationList[index].ad_info.city, city: this.state.locationList[index].ad_info.city,
district: this.state.locationList[index].ad_info.district, district: this.state.locationList[index].ad_info.district,
address: `${this.state.locationList[index].title}`, address: `${this.state.locationList[index].title}`,
longitude: this.state.locationList[index].location.lng,
latitude: this.state.locationList[index].location.lat,
}, },
}); });
// message.success('已将该地址导入为机构地址,不要忘记保存哦', 2); // message.success('已将该地址导入为机构地址,不要忘记保存哦', 2);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment