activity

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/staff/list/StaffList.jsx

@@ -30,18 +30,27 @@ 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) => () => {
+    if(data.status === 1){
+      Modal.confirm({
+        title: '确认停用该角色？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          console.log('OK');
+        }
+      });
+    }else{
+      Modal.confirm({
+        title: '确认启用该角色？',
+        okText: '确认',
+        cancelText: '取消',
+        onOk() {
+          console.log('OK');
+        }
+      });
+    }
+    
   }
   return (
 
@@ -53,14 +62,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>

src/services/apis.js

@@ -161,6 +161,68 @@ export default {
       url: `${prefix}/selectUserResource`
     },
 
+  },
+  activity: {
+      list: {
+        method: 'GET',
+        url: '/api/admin/iBuildingDynamicList',
+      },
+      weight: {
+        method: 'PUT',
+        url: '/api/admin/buildingDynamic/weight',
+      },
+      cancel: {
+        method: 'PUT',
+        url: '/api/admin/buildingDynamic/cancel/:id',
+      },
+      send: {
+        url: '/api/admin/buildingDynamic/send/:id',
+        method: 'PUT',
+      },
+      finish: {
+        url: '/api/admin/buildingDynamic/finish',
+        method: 'PUT',
+      },
+      details: {
+        url: '/api/admin/buildingDynamic/Details',
+        method: 'GET',
+      },
+      update: {
+        url: '/api/admin/buildingDynamic/update',
+        method: 'PUT',
+      },
+      add: {
+        url: '/api/admin/buildingDynamic/add',
+        method: 'POST',
+      },
+      poster: {
+        url: '/api/admin/poster',
+        method: 'GET',
+      },
+      updatePoster: {
+        url: '/api/admin/poster/:id',
+        method: 'PUT',
+      },
+      addPoster: {
+        url: '/api/admin/poster',
+        method: 'POST',
+      },
+      shareContent: {
+        url: '/api/admin/shareContent',
+        method: 'GET',
+      },
+      updateShareContent: {
+        url: '/api/admin/shareContent/:id',
+        method: 'PUT',
+      },
+      addShareContent: {
+        url: '/api/admin/shareContent',
+        method: 'POST',
+      },
+      signList: {
+        url: '/api/admin/SignList',
+        method: 'GET',
+      }
   }
   // indexEcharts:{
   //   list:{