Merge branch 'master' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager

src/pages/building/list/add/components/base.jsx

@@ -52,10 +52,8 @@ function AddBuilding(props) {
 
    // 获取详情信息
    function getById(currentId) {
-    const { url, method } = apis.building.buildingGetById
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(currentId)
 
-    request({ url: tempUrl, method }).then(res => {
+    request({ ...apis.building.buildingGetById, urlData: { id: currentId } }).then(res => {
       res.openingDate = moment(res.openingDate)
       res.receivedDate = moment(res.receivedDate)
       res.avatarImage = res.buildingImg.map(item => item.url)

src/pages/building/list/add/components/imageSet.jsx

@@ -51,10 +51,7 @@ function imageSet(props) {
 
   function getList(params) {
     // 网路请求
-    const { url, method } = apis.building.buildingApartment
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(props.building.buildingId)
-
-    request({ url: tempUrl, method, params: { ...params } }).then(res => {
+    request({ ...apis.building.buildingApartment, urlData: { id: props.building.buildingId }, params: { ...params } }).then(res => {
       setData(res)
     }).catch(err => {
       openNotificationWithIcon('error', err.message)
@@ -86,10 +83,7 @@ function imageSet(props) {
    */
   function deleteApartment(record) {
     // 网路请求
-    const { url, method } = apis.building.buildingApartmentDelete
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(record.apartmentId)
-
-    request({ url: tempUrl, method }).then(res => {
+    request({ ...apis.building.buildingApartmentDelete, urlData: { id: record.apartmentId } }).then(res => {
       getList()
       openNotificationWithIcon('error', '操作成功')
     }).catch(err => {

src/pages/building/list/add/components/modalImage.jsx

@@ -87,10 +87,7 @@ class ModalImage extends React.Component {
     }
 
     // 网路请求
-    const { url, method } = apis.building.buildingApartmentGetById
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(apartmentId)
-
-    request({ url: tempUrl, method, params: { ...params } }).then(res => {
+    request({ ...apis.building.buildingApartmentGetById, urlData: { id: apartmentId }, params: { ...params } }).then(res => {
       // res.img = res.buildingImgList.map((item, _) => item.url)
       res.img = res.buildingImgList.map(item => item.url)
       this.props.form.setFieldsValue(res)

src/pages/building/list/add/components/poster.jsx

@@ -51,10 +51,8 @@ const Poster = props => {
 
   // 获取详情信息
   function getById(currentId) {
-    const { url, method } = apis.building.buildingGetById
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(currentId)
-
-    request({ url: tempUrl, method }).then(res => {
+ 
+    request({ ...apis.building.buildingGetById, urlData: { id: currentId } }).then(res => {
       setBuilding(res)
     })
   }

src/pages/building/list/index.jsx

@@ -77,16 +77,13 @@ function CartBody(props) {
    * @param {*} record
    */
   function deleteBuilding(record) {
-    const { url, method } = apis.building.deleteBuilding
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(record.buildingId)
-
     const modal = Modal.confirm();
     modal.update({
       content: '确定删除此楼盘？',
       okText: '确认',
       cancelText: '关闭',
       onOk: () => {
-        request({ url: tempUrl, method }).then(() => {
+        request({ ...apis.building.deleteBuilding, urlData: { id: record.buildingId } }).then(() => {
           openNotificationWithIcon('success', '操作成功')
           props.onSuccess()
         }).catch(err => {
@@ -245,7 +242,6 @@ function body(props) {
           {getFieldDecorator('name')(
             <Input
               prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
-              type="password"
               placeholder="楼盘名称"
             />,
           )}

src/pages/building/type/edi.jsx

@@ -31,10 +31,7 @@ function body(props) {
 
   // 获取详情信息
   function getById(currentId) {
-    const { url, method } = apis.buildingType.getById
-    const tempUrl = url.substring(0, url.lastIndexOf('id')).concat(currentId)
-
-    request({ url: tempUrl, method }).then(res => {
+    request({ ...apis.buildingType.getById, urlData: { id: currentId } }).then(res => {
       data = res
       props.form.setFieldsValue(res)
     })

src/pages/customer/recommendCustomer/index.jsx

@@ -86,7 +86,7 @@ function body(props) {
       ...apis.customer.customerRecommendRecommenderExport, 
       responseType: 'blob',
     }).then(response => {
-      console.log('exportRecommendCustomer: ', response.body())
+      console.log('exportRecommendCustomer: ', response)
       download(response)
     }).catch(error => {
 

src/services/apis.js

@@ -55,22 +55,22 @@ export default {
     },
     buildingGetById: {
       method: 'GET',
-      url: `${prefix}/buildingSelectId/id`,
+      url: `${prefix}/buildingSelectId/:id`,
       action: 'admin.buildingSelectId.id.get',
     },
     deleteBuilding: {
       method: 'DELETE',
-      url: `${prefix}/building/delete/id`,
+      url: `${prefix}/building/delete/:id`,
       action: 'admin.building.delete.id.delete',
     },
     buildingApartment: {
       method: 'GET',
-      url: `${prefix}/buildingApartment/buildingId/id`,
+      url: `${prefix}/buildingApartment/buildingId/:id`,
       action: 'admin.buildingApartment.buildingId.id.get',
     },
     buildingApartmentGetById: {
       method: 'GET',
-      url: `${prefix}/buildingApartment/id`,
+      url: `${prefix}/buildingApartment/:id`,
       action: 'admin.buildingApartment.id.get',
     },
     buildingApartmentUpdate: {
@@ -85,7 +85,7 @@ export default {
     },
     buildingApartmentDelete: {
       method: 'DELETE',
-      url: `${prefix}/apartment/deleted/id`,
+      url: `${prefix}/apartment/deleted/:id`,
       action: 'admin.apartment.deleted.id.delete',
     },
     buildingSelect: {
@@ -102,12 +102,12 @@ export default {
     },
     delete: {
       method: 'DELETE',
-      url: `${prefix}/tdBuildingType/id`,
+      url: `${prefix}/tdBuildingType/:id`,
       action: 'admin.tdBuildingType.id.delete',
     },
     update: {
       method: 'PUT',
-      url: `${prefix}/tdBuildingType/id`,
+      url: `${prefix}/tdBuildingType/:id`,
       action: 'admin.tdBuildingType.id.put',
     },
     add: {
@@ -117,7 +117,7 @@ export default {
     },
     getById: {
       method: 'GET',
-      url: `${prefix}/tdBuildingType/id`,
+      url: `${prefix}/tdBuildingType/:id`,
       action: 'admin.tdBuildingType.id.get',
     },
   },

src/utils/request.js

@@ -76,8 +76,12 @@ request.interceptors.response.use(async (response, options) => {
       });
       throw new Error(response.statusText);
     } else {
-      // console.log('response: ', response)
-      // console.log('response.headers: ', response.headers)
+      console.log('response.headers: ', response.headers)
+      console.log('response.headers.Content-Type: ', response.headers.get('Content-Type'))
+      if (response.headers.get('Content-Type') === 'application/octet-stream;charset=utf-8') {
+        return response
+      }
+
       const { code, data, message } = await response.clone().json();
       if (code != 1000) {
         notification.error({