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

src/models/officialweb.js

@@ -174,14 +174,16 @@ export default {
       });
     },
     * setschoollocation({ payload }, { call, put, select }) {
-      const { longitude, latitude, locationAddress } = payload;
+      const {
+        longitude, latitude, locationAddress, province, city, district,
+      } = yield select(state => state.schooladd);
       const { schoolInfo } = yield select(state => state.officialweb);
       const newschoolInfo = JSON.parse(JSON.stringify(schoolInfo));
       yield put({
         type: 'updateState',
         payload: {
           schoolInfo: Object.assign(newschoolInfo, {
-            location_address: locationAddress,
+            location_address: province + city + locationAddress,
             latitude,
             longitude,
           }),

src/pages/schooledit/index.js

@@ -277,7 +277,7 @@ class SchoolAddForm extends React.Component {
               {/* <Col xs={{ span: 6, offset: 9 }} md={{ span: 3, offset: 0 }} lg={{ span: 2, offset: 0 }} xl={{ span: 2, offset: 0 }} className={pageStyles.addschool}>添加</Col> */}
             </Row>
             <Row>
-              <Col xs={{ span: 24 }} md={{ span: 24 }}>
+              <Col xs={{ span: 22 }} md={{ span: 18 }}>
                 <ChoosePosition />
               </Col>
             </Row>