Merge branch 'develop' of http://120.27.195.166:3000/chenglb/PMS_Frontend_v1.0.0 into develop

src/pages/OffPeak/OffPeakShareRecords/ShareParkMgm/infoModal/index.jsx

@@ -39,6 +39,9 @@ function InfoModal (props)  {
 
     const validateCws = (_, value) => {
         const total = baseForm.getFieldValue('total');
+        if (Number.isInteger(value)) {
+            return Promise.reject(new Error('可预约车位数必须为整数'));
+        }
         if (value < 0) {
           return Promise.reject(new Error('可预约车位数错误'));
         }

src/pages/SystemMgm/AreaManage/ModalAreaAdd/index.jsx

@@ -31,8 +31,8 @@ function ModalAreaAdd(props) {
         lng: ''
       }
       if (formData.latlng && formData.latlng.split(',').length) {
-        latlngObj['lat'] = formData.latlng.split(',')[0]
-        latlngObj['lng'] = formData.latlng.split(',')[1]
+        latlngObj['lat'] = formData.latlng.split(',')[1]
+        latlngObj['lng'] = formData.latlng.split(',')[0]
       }
       onOk(formData={...formData,id: editForm.id, ...latlngObj}, editStatus, )
       form.resetFields()
@@ -60,6 +60,7 @@ function ModalAreaAdd(props) {
           ...editForm,
           latlng: latlng
         })
+        setAreaType(editForm.type)
       } else {
         form.setFieldsValue({
           pid: pid,