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

src/pages/activity/ActivityList.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -22,11 +22,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/iBuildingDynamicList',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.activity.list, params: { ...params } }).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -124,11 +120,7 @@ const toEditGoods = (dynamicId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/buildingDynamic/finish',
-                  method: 'PUT',
-                  data: {dynamicId: row.dynamicId, top: ""},
-              }).then((data) => {
+              request({ ...apis.activity.finish, data: {dynamicId: row.dynamicId, top: ""} }).then((data) => {
                   console.log(data)
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10 })
@@ -143,11 +135,7 @@ const toEditGoods = (dynamicId) => () => {
 //   置顶
   const topDynamic = (row) => () => {
       const weight = Math.abs(row.weight - 1)
-      request({
-          url: '/api/admin/buildingDynamic/weight',
-          method: 'PUT',
-          params: {dynamicId: row.dynamicId, weight},
-      }).then((data) => {
+      request({ ...apis.activity.weight, params: {dynamicId: row.dynamicId, weight} }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
@@ -167,10 +155,7 @@ const toEditGoods = (dynamicId) => () => {
   
   // 取消活动
   const cancelDynamic = (row) => {
-      request({
-          url: '/api/admin/buildingDynamic/cancel/'+row.dynamicId,
-          method: 'PUT',
-      }).then((data) => {
+      request({ ...apis.activity.cancel, urlData: {id: row.dynamicId}}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 })
       }).catch((err) => {
@@ -181,10 +166,7 @@ const toEditGoods = (dynamicId) => () => {
   
   //发布活动
   const sendDynamic = (row) => {
-      request({
-          url: '/api/admin/buildingDynamic/send/'+row.dynamicId,
-          method: 'PUT',
-      }).then((data) => {
+      request({ ...apis.activity.send, urlData: {id: row.dynamicId}}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 });
       }).catch((err) => {

src/pages/activity/SignList.jsx

@@ -4,7 +4,7 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -50,11 +50,7 @@ const header = (props) => {
 
   // 查询列表
   const getSignList = (params) => {
-    request({
-        url: '/api/admin/SignList',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.activity.signList, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })

src/pages/activity/editActivity.jsx

@@ -2,6 +2,7 @@ import React, { useState, useEffect } from 'react';
 import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
+import apis from '../../services/apis';
 import moment from 'moment';
 import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
@@ -36,11 +37,7 @@ const Edit = (props) => {
 
     // 查询列表
     const getDynamicData = (dynamicId) => {
-      request({
-        url: '/api/admin/buildingDynamic/Details',
-        method: 'GET',
-        params: { dynamicId },
-      }).then((data) => {
+      request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
         console.log(data)
         setDynamicData(data)
       })
@@ -143,22 +140,14 @@ const Edit = (props) => {
       console.log('submit data --->', submitValue)
       if (dynamicId) {
         submitValue.dynamicId = dynamicId
-        request({
-          url: '/api/admin/buildingDynamic/update',
-          method: 'PUT',
-          data: submitValue,
-        }).then((data) => {
+        request({ ...apis.activity.update, data: submitValue }).then((data) => {
           message.info("保存成功")
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
       } else {
-        request({
-          url: '/api/admin/buildingDynamic/add',
-          method: 'POST',
-          data: submitValue,
-        }).then((data) => {
+        request({ ...apis.activity.add, data: submitValue }).then((data) => {
           message.info("保存成功")
           cancelPage()
         }).catch((err) => {
@@ -178,11 +167,7 @@ const Edit = (props) => {
 
     if(dynamicId){
       useEffect(() => {
-        request({
-          url: '/api/admin/poster',
-          method: 'GET',
-          params: {targetId: dynamicId,targetType: 'activity'},
-        }).then((data) => {
+        request({ ...apis.activity.poster, params: {targetId: dynamicId,targetType: 'activity'} }).then((data) => {
           console.log(data,"2222")
           if(data.length > 0){
             setPosterId(data[0].posterId)
@@ -199,21 +184,13 @@ const Edit = (props) => {
     const submitPoster  = () => {
        if(dynamicId){
         if(posterId){
-          request({
-            url: '/api/admin/poster/'+posterId,
-            method: 'PUT',
-            data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},
-          }).then((data) => {
+          request({ ...apis.activity.updatePoster, urlData: {id: posterId}, data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
          }else{
-          request({
-            url: '/api/admin/poster',
-            method: 'POST',
-            data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},
-          }).then((data) => {
+          request({ ...apis.activity.addPoster, data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
             setPosterId(data.posterId)
             message.info("保存成功")
           }).catch((err) => {
@@ -290,11 +267,7 @@ const Edit = (props) => {
     
     if(dynamicId){
       useEffect(() => {
-        request({
-          url: '/api/admin/shareContent',
-          method: 'GET',
-          params: {targetId: dynamicId,targetType: 'activity'},
-        }).then((data) => {
+        request({ ...apis.activity.shareContent, params: {targetId: dynamicId,targetType: 'activity'},}).then((data) => {
           console.log(data,"2222")
           if(data.length > 0){
             setShareContentId(data[0].shareContentId)
@@ -310,21 +283,13 @@ const Edit = (props) => {
     const submitShare = () => {
       if(dynamicId){
         if(shareContentId){
-          request({
-            url: '/api/admin/shareContent/'+shareContentId,
-            method: 'PUT',
-            data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},
-          }).then((data) => {
+          request({ ...apis.activity.updateShareContent, urlData: {id: shareContentId},data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
             message.info("保存成功")
           }).catch((err) => {
             message.info(err.msg || err.message)
           })
          }else{
-          request({
-            url: '/api/admin/shareContent',
-            method: 'POST',
-            data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},
-          }).then((data) => {
+          request({ ...apis.activity.addShareContent, data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
             setShareContentId(data.shareContentId)
             message.info("保存成功")
           }).catch((err) => {

src/pages/carouselFigure/advertisingList.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -22,11 +22,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/extendContent',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -97,11 +93,7 @@ const toEdit = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/buildingDynamic/finish',
-                  method: 'PUT',
-                  data: {dynamicId: row.dynamicId, top: ""},
-              }).then((data) => {
+              request({ ...apis.carsuseFigure.finish, data: {dynamicId: row.dynamicId, top: ""},}).then((data) => {
                   console.log(data)
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
@@ -123,11 +115,7 @@ const toEdit = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/extendContent/'+row.contentId,
-                  method: 'PUT',
-                  data: row,
-              }).then((data) => {
+              request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
               }).catch((err) => {
@@ -143,11 +131,7 @@ const toEdit = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/extendContent/'+row.contentId,
-                  method: 'PUT',
-                  data: row,
-              }).then((data) => {
+              request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'screen' })
               }).catch((err) => {

src/pages/carouselFigure/carouselFigureList.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -22,11 +22,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/extendContent',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.carsuseFigure.extendContent, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -97,11 +93,7 @@ const toEditCarouse = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/buildingDynamic/finish',
-                  method: 'PUT',
-                  data: {dynamicId: row.dynamicId, top: ""},
-              }).then((data) => {
+            request({ ...apis.carsuseFigure.finish, data: {dynamicId: row.dynamicId, top: ""},}).then((data) => {
                   console.log(data)
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
@@ -123,11 +115,7 @@ const toEditCarouse = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/extendContent/'+row.contentId,
-                  method: 'PUT',
-                  data: row,
-              }).then((data) => {
+            request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
               }).catch((err) => {
@@ -143,11 +131,7 @@ const toEditCarouse = (contentId) => () => {
           okText: '确定',
           cancelText: '取消',
           onOk() {
-              request({
-                  url: '/api/admin/extendContent/'+row.contentId,
-                  method: 'PUT',
-                  data: row,
-              }).then((data) => {
+            request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: row.contentId}, data: row,}).then((data) => {
                   message.info('操作成功！')
                   getList({ pageNum: 1, pageSize: 10, showType: 'banner' })
               }).catch((err) => {

src/pages/carouselFigure/editAdvertising.jsx

@@ -7,6 +7,7 @@ import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -27,10 +28,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   // 查询列表
   const getDetail = (contentId) => {
-    request({
-        url: '/api/admin/extendContent/' + contentId,
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -123,21 +121,13 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     const handleSubmit = val => { 
       val.showType = 'screen'
       if(contentId){
-        request({
-          url: '/api/admin/extendContent/'+contentId,
-          method: 'PUT',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
       }else{
-        request({
-          url: '/api/admin/extendContent',
-          method: 'POST',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.carsuseFigure.addExtendContent, data: val,}).then((data) => {
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)

src/pages/carouselFigure/editCarousel.jsx

@@ -7,6 +7,7 @@ import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -27,10 +28,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   // 查询列表
   const getDetail = (contentId) => {
-    request({
-        url: '/api/admin/extendContent/' + contentId,
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.carsuseFigure.getExtendContent,urlData:{id: contentId}}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -123,21 +121,13 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     const handleSubmit = val => { 
       val.showType = 'banner'
       if(contentId){
-        request({
-          url: '/api/admin/extendContent/'+contentId,
-          method: 'PUT',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.carsuseFigure.updataExtendContent,urlData:{id: contentId}, data: val,}).then((data) => {
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
       }else{
-        request({
-          url: '/api/admin/extendContent',
-          method: 'POST',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.carsuseFigure.addExtendContent, data: val,}).then((data) => {
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)

src/pages/integralMall/GoodsList.jsx

@@ -4,7 +4,7 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -20,11 +20,7 @@ function header(props) {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taGoods',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.integralMall.getTaGoods, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -62,11 +58,7 @@ function header(props) {
       okText: '确认',
       cancelText: '取消',
       onOk() {
-        request({
-          url: '/api/admin/taGoods/change',
-          method: 'PUT',
-          data: { ...row },
-        }).then((data) => {
+        request({ ...apis.integralMall.changeTaGoods, data: { ...row },}).then((data) => {
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10 });
         })

src/pages/integralMall/achieve.jsx

@@ -5,6 +5,7 @@ import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { TabPane } = Tabs;
@@ -28,11 +29,7 @@ useEffect(() => {
 
 // 查询列表
 const getList = (params) => {
-  request({
-      url: '/api/admin/tdPointsRules',
-      method: 'GET',
-      params: { ...params },
-  }).then((data) => {
+  request({ ...apis.integralMall.tdPointsRules, params: { ...params },}).then((data) => {
       console.log(data)
       setData(data)
   })
@@ -54,11 +51,7 @@ const changePageNum = (pageNumber) => {
   }
 
   const changeStatus = (row) => () => {
-    request({
-      url: '/api/admin/tdPointsRules/change',
-      method: 'PUT',
-      data: { ...row },
-    }).then((data) => {
+    request({ ...apis.integralMall.change, data: { ...row },}).then((data) => {
       message.info('操作成功！')
       getList({ pageNum: 1, pageSize: 10, type: carType})
     })

src/pages/integralMall/editGoods.jsx

@@ -6,6 +6,7 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
 import router from 'umi/router';
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { TextArea } = Input;
@@ -21,10 +22,7 @@ const header = props => {
 
   // 查询列表
   const getGoodsData = (goodsId) => {
-    request({
-        url: '/api/admin/taGoods/' + goodsId,
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.integralMall.taGoods, urlData: { id: goodsId },}).then((data) => {
         console.log(data)
         setGoodsData(data)
     })
@@ -111,21 +109,13 @@ const header = props => {
   const handleSubmit = (values) => {
     if(goodsId){
       values.goodsId = goodsId
-      request({
-        url: '/api/admin/taGoods',
-        method: 'PUT',
-        data: values,
-      }).then((data) => {
+      request({ ...apis.integralMall.updateTaGoods, data: values,}).then((data) => {
         cancelPage()
       }).catch((err) => {
         message.info(err.msg || err.message)
       })
       }else{
-      request({
-        url: '/api/admin/taGoods/add',
-        method: 'POST',
-        data: values,
-      }).then((data) => {
+      request({ ...apis.integralMall.addTaGoods, data: values,}).then((data) => {
         cancelPage()
       }).catch((err) => {
         message.info(err.msg || err.message)

src/pages/integralMall/exchangeRecords.jsx

@@ -5,7 +5,7 @@ import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 /**
@@ -27,11 +27,7 @@ function record(props) {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taPointsExchange',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.integralMall.taPointsExchange, params: { ...params },}).then((data) => {
         setData(data)
     })
   }

src/pages/integralMall/verifyList.jsx

@@ -4,7 +4,7 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../style/GoodsList.less';
 import router from 'umi/router';
 import moment from 'moment';
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -19,11 +19,7 @@ const header = (props) => {
 
   // 查询列表
   const getVerifyList = (params) => {
-    request({
-      url: '/api/admin/taPointsExchange',
-      method: 'GET',
-      params: { ...params },
-    }).then((data) => {
+    request({ ...apis.integralMall.taPointsExchange, params: { ...params },}).then((data) => {
         setData(data)
     })
   }
@@ -39,11 +35,7 @@ const header = (props) => {
   }
 
   const changeStatus = (row) => () => {
-    request({
-      url: '/api/admin/taPointsExchange/change',
-      method: 'PUT',
-      data: row
-    }).then((data) => {
+    request({ ...apis.integralMall.changeTaPointsExchange, data: row}).then((data) => {
         message.info("操作成功")
         getVerifyList({ pageNum: pageNumber, pageSize: 10, phone: props.location.query.telValue })
     })

src/pages/staff/list/StaffList.jsx

@@ -5,6 +5,7 @@ import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../../style/GoodsList.less';
 import router from 'umi/router';
 import { Card, Avatar } from 'antd';
+import apis from '../../../services/apis';
 import request from '../../../utils/request'
 import Styles from './style.less';
 
@@ -22,6 +23,7 @@ const toEditStaff = (userId) => () => {
   });
 }
 
+
 /**
  *卡片
  *
@@ -30,18 +32,34 @@ const toEditStaff = (userId) => () => {
 const CartBody = (props) => {
   const { data } = props
 
-  const confirm = () => {
-    Modal.confirm({
-      title: '确认停用该角色？',
-      okText: '确认',
-      cancelText: '取消',
-      onOk() {
-        console.log('OK');
-      },
-      onCancel() {
-        console.log('Cancel');
-      },
-    });
+  const confirm = (data) => () => {
+    console.log(data,"11111")
+    if(data.status === 1){
+      Modal.confirm({
+        title: '确认停用该角色？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({ ...apis.staff.change, urlData: {id:data.userId,type:'off'}}).then((data) => {
+            message.info("操作成功")
+            props.onFresh()
+          })
+        }
+      });
+    }else{
+      Modal.confirm({
+        title: '确认启用该角色？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          request({ ...apis.staff.change, urlData: {id:data.userId,type:'on'}}).then((data) => {
+            message.info("操作成功")
+            props.onFresh()
+          })
+        }
+      });
+    }
+    
   }
   return (
 
@@ -53,14 +71,14 @@ const CartBody = (props) => {
           编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
         </Button>
-        <Button type="link" style={{ fontSize: '18px', color: '#cacaca', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
-          停用
+        <Button type="link" style={{ fontSize: '18px', color: '#cacaca', position: 'absolute', top: '50px', right: '0' }} onClick={confirm(data)}>
+          {data.status === 1 ? '停用' : '启用'}
                 <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
         </Button>
-        <Button type="link" style={{ fontSize: '18px', color: '#FF925C', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
+        {/* <Button type="link" style={{ fontSize: '18px', color: '#FF925C', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
           启用
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-        </Button>
+        </Button> */}
 
       </div>
       <div>
@@ -75,7 +93,7 @@ const CartBody = (props) => {
 
         <p className={Styles.cardText} >姓名 : {data.userName}
         </p>
-        <p className={Styles.statusText} > 状态 : {data.status === '1' ? '启用' : '停用'} </p>
+        <p className={Styles.statusText} > 状态 : {data.status === 1 ? '启用' : '停用'} </p>
         <p className={Styles.phoneText} >
           电话 : {data.phone}
         </p>
@@ -85,7 +103,6 @@ const CartBody = (props) => {
   )
 }
 
-
 const header = (props) => {
   const [tempData, setTempData] = useState([])
   useEffect(() => {
@@ -93,11 +110,7 @@ const header = (props) => {
   }, [])
 
   const getList = (params) => {
-    request({
-      url: '/api/admin/taUser',
-      method: 'GET',
-      params: { ...params },
-    }).then((data) => {
+    request({ ...apis.staff.taUser, params: { ...params } }).then((data) => {
       console.log(data, "listData")
       setTempData(data.records)
     })
@@ -162,7 +175,7 @@ const header = (props) => {
         {
           tempData.map((item, index) => (
             <Col span={6}>
-              <CartBody data={item} />
+              <CartBody data={item} onFresh={()=> getList({ pageNum: 1, pageSize: 10 })}/>
             </Col>
           ))
         }

src/pages/staff/list/editStaff.jsx

@@ -9,6 +9,7 @@ import XForm, { FieldTypes } from '../../../components/XForm';
 import Wangedit from '../../../components/Wangedit/Wangedit'
 import channels from './channelList.less';
 import Tagss from '../components/Tagss.jsx';
+import apis from '../../../services/apis';
 import request from '../../../utils/request'
 
 const { TextArea } = Input;
@@ -27,21 +28,14 @@ const Edit = (props) => {
   const [tagData, setTagData] = useState([])
 
   const getTagList = () => {
-    request({
-      url: '/api/admin/taTags',
-      method: 'GET',
-      params: {pageNum:1,pageSize:999}
-    }).then((data) => {
+    request({ ...apis.staff.taTags, params: {pageNum:1,pageSize:999} }).then((data) => {
       setTagData(data.records)
     })
   }
 
   // 查询列表
   const getUserData = (userId) => {
-    request({
-      url: '/api/admin/taUser/'+userId,
-      method: 'GET',
-    }).then((data) => {
+    request({ ...apis.staff.getTaUser, urlData: {id:userId} }).then((data) => {
       console.log(data,"tauser")
       setUserData(data)
     })
@@ -60,21 +54,13 @@ const Edit = (props) => {
 
   const handleSubmit = val => {
     if(userId){
-      request({
-        url: '/api/admin/taUser/' + userId,
-        method: 'PUT',
-        data: val,
-      }).then((data) => {
+      request({ ...apis.staff.updateTaUser, urlData: {id:userId},data: val, }).then((data) => {
         console.log(data,"tauser")
         message.info("保存成功")
         router.go(-1)
       })
     }else{
-      request({
-        url: '/api/admin/taUser',
-        method: 'POST',
-        data: val,
-      }).then((data) => {
+      request({ ...apis.staff.addTaUser, data: val, }).then((data) => {
         console.log(data,"tauser")
         message.info("保存成功")
         router.go(-1)

src/pages/system/editPolicy.jsx

@@ -8,6 +8,7 @@ import BuildSelect from '../../components/SelectButton/BuildSelect'
 import SelectCity from '../../components/SelectButton/CitySelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -27,10 +28,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   // 查询列表
   const getPolicyData = (policyId) => {
-    request({
-        url: '/api/admin/taPolicy/' + policyId,
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.system.taPolicy, urlData: {id: policyId} }).then((data) => {
         console.log(data)
         setPolicyData(data)
     })
@@ -80,22 +78,14 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
       console.log('submit data --->', val)
       if(policyId){
         val.policyId = policyId
-        request({
-          url: '/api/admin/taPolicy/'+policyId,
-          method: 'PUT',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.system.updateTaPolicy, urlData: {id: policyId},data: val, }).then((data) => {
           message.info("保存成功")
           cancelPage()
         }).catch((err) => {
           message.info(err.msg || err.message)
         })
       }else{
-        request({
-          url: '/api/admin/taPolicy',
-          method: 'POST',
-          data: val,
-        }).then((data) => {
+        request({ ...apis.system.addTaPolicy,data: val, }).then((data) => {
           message.info("保存成功")
           cancelPage()
         }).catch((err) => {

src/pages/system/housingPolicy.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -21,11 +21,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taPolicy',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.system.getTaPolicy, params: { ...params }, }).then((data) => {
         console.log(data)
         setData(data)
     })
@@ -104,10 +100,7 @@ const deletePolicy = (policyId) => () => {
     okText: '确定',
     cancelText: '取消',
     onOk() {
-        request({
-            url: '/api/admin/taPolicy/'+policyId,
-            method: 'DELETE',
-        }).then((data) => {
+        request({ ...apis.system.deleteTaPolicy, urlData: {id: policyId }, }).then((data) => {
             message.info('操作成功！')
             getList({ pageNum: 1, pageSize: 10,cityId: '' });
         }).catch((err) => {
@@ -123,11 +116,7 @@ const deletePolicy = (policyId) => () => {
   const topPolicy = (row) => () => {
       const weight = Math.abs(row.weight - 1)
       row.weight = weight
-      request({
-          url: '/api/admin/taPolicy/'+row.policyId,
-          method: 'PUT',
-          data: row,
-      }).then((data) => {
+      request({ ...apis.system.updateTaPolicy, urlData: {id: row.policyId},data: row, }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10,cityId: '' });
@@ -144,11 +133,7 @@ const deletePolicy = (policyId) => () => {
         row.publishStatus = 1
       }
 
-      request({
-        url: '/api/admin/taPolicy/'+row.policyId,
-        method: 'PUT',
-        data: row,
-      }).then((data) => {
+      request({ ...apis.system.updateTaPolicy, urlData: {id: row.policyId},data: row, }).then((data) => {
           console.log(data)
           message.info('操作成功！')
           getList({ pageNum: 1, pageSize: 10,cityId: '' });

src/pages/system/intention.jsx

@@ -7,6 +7,7 @@ import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
+import apis from '../../services/apis';
 import request from '../../utils/request'
 import SelectCity from '../../components/SelectButton/CitySelect'
 
@@ -23,11 +24,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   const changBuilding = (buildingId) => {
     setBuildingIdData(buildingId)
-    request({
-      url: '/api/admin/tdBizEventIntention',
-      method: 'GET',
-      params: {pageNum: 1, pageSize: 999,buildingId}
-    }).then((data) => {
+    request({ ...apis.system.tdBizEventIntention, params: {pageNum: 1, pageSize: 999,buildingId}}).then((data) => {
       console.log(data)
       setData(data.records)
     })
@@ -50,11 +47,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
     if(buildingIdValue === ''){
       return
     }
-    request({
-      url: '/api/admin/taBuildingIntentionAddOrUpdate/' + buildingIdValue,
-      method: 'POST',
-      data
-    }).then((data) => {
+    request({ ...apis.system.taBuildingIntentionAddOrUpdate, urlData: {id: buildingIdValue}, data,}).then((data) => {
       message.info("保存成功")
     })
   }

src/pages/system/messageList.jsx

@@ -6,7 +6,7 @@ import router from 'umi/router';
 import moment from 'moment';
 import SelectCity from '../../components/SelectButton/CitySelect'
 import BuildSelect from '../../components/SelectButton/BuildSelect'
-
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { Option } = Select;
@@ -22,11 +22,7 @@ const header = (props) => {
 
   // 查询列表
   const getList = (params) => {
-    request({
-        url: '/api/admin/taCustomerMessage',
-        method: 'GET',
-        params: { ...params },
-    }).then((data) => {
+    request({ ...apis.system.taCustomerMessage, params: { ...params },}).then((data) => {
         console.log(data)
         setData(data)
     })

src/pages/system/report.jsx

@@ -7,6 +7,7 @@ import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import XForm, { FieldTypes } from '../../components/XForm';
 import Wangedit from '../../components/Wangedit/Wangedit'
+import apis from '../../services/apis';
 import request from '../../utils/request'
 
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -27,19 +28,13 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   // 查询数据
   const getReportList = () => {
-    request({
-        url: '/api/admin/tdReports',
-        method: 'GET',
-    }).then((data) => {
+    request({ ...apis.system.tdReports, }).then((data) => {
         setData((data.records || []).map(x => ({label: x.reportName, value: x.reportCode}) ))
     })
   }
 
   const getCheckedList = () => {
-    request({
-      url: '/api/admin/taBuildingReports',
-      method: 'GET',
-    }).then((data) => {
+    request({ ...apis.system.taBuildingReports, }).then((data) => {
       setCheckData((data.records || []).map((x) => x.reportCode))
     })
   }
@@ -51,11 +46,7 @@ const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
 
   const saveCheckedReport = () => {
     console.log(checkData)
-    request({
-      url: '/api/admin/taBuildingReport/add',
-      method: 'POST',
-      data: {list: checkData}
-    }).then((data) => {
+    request({ ...apis.system.addTaBuildingReports, data: {list: checkData}}).then((data) => {
       message.info("保存成功")
     })
   }

src/services/apis.js

@@ -161,6 +161,200 @@ export default {
       url: `${prefix}/selectUserResource`
     },
 
+  },
+  activity: {
+      list: {
+        method: 'GET',
+        url: `${prefix}/iBuildingDynamicList`,
+      },
+      weight: {
+        method: 'PUT',
+        url: `${prefix}/buildingDynamic/weight`,
+      },
+      cancel: {
+        method: 'PUT',
+        url: `${prefix}/buildingDynamic/cancel/:id`,
+      },
+      send: {
+        url: `${prefix}/buildingDynamic/send/:id`,
+        method: 'PUT',
+      },
+      finish: {
+        url: `${prefix}/buildingDynamic/finish`,
+        method: 'PUT',
+      },
+      details: {
+        url: `${prefix}/buildingDynamic/Details`,
+        method: 'GET',
+      },
+      update: {
+        url: `${prefix}/buildingDynamic/update`,
+        method: 'PUT',
+      },
+      add: {
+        url: `${prefix}/buildingDynamic/add`,
+        method: 'POST',
+      },
+      poster: {
+        url: `${prefix}/poster`,
+        method: 'GET',
+      },
+      updatePoster: {
+        url: `${prefix}/poster/:id`,
+        method: 'PUT',
+      },
+      addPoster: {
+        url: `${prefix}/poster`,
+        method: 'POST',
+      },
+      shareContent: {
+        url: `${prefix}/shareContent`,
+        method: 'GET',
+      },
+      updateShareContent: {
+        url: `${prefix}/shareContent/:id`,
+        method: 'PUT',
+      },
+      addShareContent: {
+        url: `${prefix}/shareContent`,
+        method: 'POST',
+      },
+      signList: {
+        url: `${prefix}/SignList`,
+        method: 'GET',
+      }
+  },
+  integralMall: {
+    tdPointsRules: {
+      url: `${prefix}/tdPointsRules`,
+      method: 'GET',
+    },
+    change: {
+      url: `${prefix}/tdPointsRules/change`,
+      method: 'PUT',
+    },
+    taGoods: {
+      url: `${prefix}/taGoods/:id`,
+      method: 'GET',
+    },
+    updateTaGoods: {
+      url: `${prefix}/taGoods`,
+      method: 'PUT',
+    },
+    addTaGoods: {
+      url: `${prefix}/taGoods/add`,
+      method: 'POST',
+    },
+    taPointsExchange: {
+      url: `${prefix}/taPointsExchange`,
+        method: 'GET',
+    },
+    getTaGoods: {
+      url: `${prefix}/taGoods`,
+      method: 'GET',
+    },
+    changeTaGoods: {
+      url: `${prefix}/taGoods/change`,
+      method: 'PUT',
+    },
+    changeTaPointsExchange: {
+      url: `${prefix}/taPointsExchange/change`,
+      method: 'PUT',
+    }
+  },
+  carsuseFigure: {
+    extendContent: {
+      url: `${prefix}/extendContent`,
+      method: 'GET',
+    },
+    finish: {
+      url: `${prefix}/buildingDynamic/finish`,
+      method: 'PUT',
+    },
+    updataExtendContent: {
+      url: `${prefix}/extendContent/:id`,
+      method: 'PUT',
+    },
+    getExtendContent: {
+      url: `${prefix}/extendContent/:id`,
+      method: 'GET',
+    },
+    addExtendContent: {
+      url: `${prefix}/extendContent`,
+      method: 'POST',
+    }
+  },
+  system: {
+    taPolicy: {
+      url: `${prefix}/taPolicy/:id`,
+      method: 'GET',
+    },
+    updateTaPolicy: {
+      url: `${prefix}/taPolicy/:id`,
+      method: 'PUT',
+    },
+    addTaPolicy: {
+      url: `${prefix}/taPolicy`,
+      method: 'POST',
+    },
+    getTaPolicy: {
+      url: `${prefix}/taPolicy`,
+      method: 'GET',
+    },
+    deleteTaPolicy: {
+      url: `${prefix}/taPolicy/:id`,
+      method: 'DELETE',
+    },
+    tdBizEventIntention: {
+      url: `${prefix}/tdBizEventIntention`,
+      method: 'GET',
+    },
+    taBuildingIntentionAddOrUpdate: {
+      url: `${prefix}/taBuildingIntentionAddOrUpdate/:id`,
+      method: 'POST',
+    },
+    taCustomerMessage: {
+      url: `${prefix}/taCustomerMessage`,
+      method: 'GET',
+    },
+    tdReports: {
+      url: `${prefix}/tdReports`,
+      method: 'GET',
+    },
+    taBuildingReports: {
+      url: `${prefix}/taBuildingReports`,
+      method: 'GET',
+    },
+    addTaBuildingReports: {
+      url: `${prefix}/taBuildingReport/add`,
+      method: 'POST',
+    }
+  },
+  staff: {
+    taUser: {
+      url: `${prefix}/taUser`,
+      method: 'GET',
+    },
+    taTags: {
+      url: `${prefix}/taTags`,
+      method: 'GET',
+    },
+    getTaUser: {
+      url: `${prefix}/taUser/:id`,
+      method: 'GET',
+    },
+    updateTaUser: {
+      url: `${prefix}/taUser/:id`,
+      method: 'PUT',
+    },
+    addTaUser: {
+      url: `${prefix}/taUser`,
+      method: 'POST',
+    },
+    change: {
+      url: `${prefix}/turn/taUser/:id/:type`,
+      method: 'PUT',
+    }
   }
   // indexEcharts:{
   //   list:{