傅行帆 5 년 전
부모
커밋
57debc6dd3
5개의 변경된 파일105개의 추가작업 그리고 91개의 파일을 삭제
  1. 6
    24
      src/pages/activity/ActivityList.jsx
  2. 2
    6
      src/pages/activity/SignList.jsx
  3. 10
    45
      src/pages/activity/editActivity.jsx
  4. 25
    16
      src/pages/staff/list/StaffList.jsx
  5. 62
    0
      src/services/apis.js

+ 6
- 24
src/pages/activity/ActivityList.jsx 파일 보기

6
 import moment from 'moment';
6
 import moment from 'moment';
7
 import SelectCity from '../../components/SelectButton/CitySelect'
7
 import SelectCity from '../../components/SelectButton/CitySelect'
8
 import BuildSelect from '../../components/SelectButton/BuildSelect'
8
 import BuildSelect from '../../components/SelectButton/BuildSelect'
9
-
9
+import apis from '../../services/apis';
10
 import request from '../../utils/request'
10
 import request from '../../utils/request'
11
 
11
 
12
 const { Option } = Select;
12
 const { Option } = Select;
22
 
22
 
23
   // 查询列表
23
   // 查询列表
24
   const getList = (params) => {
24
   const getList = (params) => {
25
-    request({
26
-        url: '/api/admin/iBuildingDynamicList',
27
-        method: 'GET',
28
-        params: { ...params },
29
-    }).then((data) => {
25
+    request({ ...apis.activity.list, params: { ...params } }).then((data) => {
30
         console.log(data)
26
         console.log(data)
31
         setData(data)
27
         setData(data)
32
     })
28
     })
124
           okText: '确定',
120
           okText: '确定',
125
           cancelText: '取消',
121
           cancelText: '取消',
126
           onOk() {
122
           onOk() {
127
-              request({
128
-                  url: '/api/admin/buildingDynamic/finish',
129
-                  method: 'PUT',
130
-                  data: {dynamicId: row.dynamicId, top: ""},
131
-              }).then((data) => {
123
+              request({ ...apis.activity.finish, data: {dynamicId: row.dynamicId, top: ""} }).then((data) => {
132
                   console.log(data)
124
                   console.log(data)
133
                   message.info('操作成功!')
125
                   message.info('操作成功!')
134
                   getList({ pageNum: 1, pageSize: 10 })
126
                   getList({ pageNum: 1, pageSize: 10 })
143
 //   置顶
135
 //   置顶
144
   const topDynamic = (row) => () => {
136
   const topDynamic = (row) => () => {
145
       const weight = Math.abs(row.weight - 1)
137
       const weight = Math.abs(row.weight - 1)
146
-      request({
147
-          url: '/api/admin/buildingDynamic/weight',
148
-          method: 'PUT',
149
-          params: {dynamicId: row.dynamicId, weight},
150
-      }).then((data) => {
138
+      request({ ...apis.activity.weight, params: {dynamicId: row.dynamicId, weight} }).then((data) => {
151
           console.log(data)
139
           console.log(data)
152
           message.info('操作成功!')
140
           message.info('操作成功!')
153
           getList({ pageNum: 1, pageSize: 10 })
141
           getList({ pageNum: 1, pageSize: 10 })
167
   
155
   
168
   // 取消活动
156
   // 取消活动
169
   const cancelDynamic = (row) => {
157
   const cancelDynamic = (row) => {
170
-      request({
171
-          url: '/api/admin/buildingDynamic/cancel/'+row.dynamicId,
172
-          method: 'PUT',
173
-      }).then((data) => {
158
+      request({ ...apis.activity.cancel, urlData: {id: row.dynamicId}}).then((data) => {
174
           message.info('操作成功!')
159
           message.info('操作成功!')
175
           getList({ pageNum: 1, pageSize: 10 })
160
           getList({ pageNum: 1, pageSize: 10 })
176
       }).catch((err) => {
161
       }).catch((err) => {
181
   
166
   
182
   //发布活动
167
   //发布活动
183
   const sendDynamic = (row) => {
168
   const sendDynamic = (row) => {
184
-      request({
185
-          url: '/api/admin/buildingDynamic/send/'+row.dynamicId,
186
-          method: 'PUT',
187
-      }).then((data) => {
169
+      request({ ...apis.activity.send, urlData: {id: row.dynamicId}}).then((data) => {
188
           message.info('操作成功!')
170
           message.info('操作成功!')
189
           getList({ pageNum: 1, pageSize: 10 });
171
           getList({ pageNum: 1, pageSize: 10 });
190
       }).catch((err) => {
172
       }).catch((err) => {

+ 2
- 6
src/pages/activity/SignList.jsx 파일 보기

4
 import styles from '../style/GoodsList.less';
4
 import styles from '../style/GoodsList.less';
5
 import router from 'umi/router';
5
 import router from 'umi/router';
6
 import moment from 'moment';
6
 import moment from 'moment';
7
-
7
+import apis from '../../services/apis';
8
 import request from '../../utils/request'
8
 import request from '../../utils/request'
9
 
9
 
10
 const { Option } = Select;
10
 const { Option } = Select;
50
 
50
 
51
   // 查询列表
51
   // 查询列表
52
   const getSignList = (params) => {
52
   const getSignList = (params) => {
53
-    request({
54
-        url: '/api/admin/SignList',
55
-        method: 'GET',
56
-        params: { ...params },
57
-    }).then((data) => {
53
+    request({ ...apis.activity.signList, params: { ...params },}).then((data) => {
58
         console.log(data)
54
         console.log(data)
59
         setData(data)
55
         setData(data)
60
     })
56
     })

+ 10
- 45
src/pages/activity/editActivity.jsx 파일 보기

2
 import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
2
 import { Form, Input, Button, Icon, Select, Tabs, Radio, DatePicker, message, Upload } from 'antd';
3
 import { FormattedMessage } from 'umi-plugin-react/locale';
3
 import { FormattedMessage } from 'umi-plugin-react/locale';
4
 import styles from '../style/GoodsList.less';
4
 import styles from '../style/GoodsList.less';
5
+import apis from '../../services/apis';
5
 import moment from 'moment';
6
 import moment from 'moment';
6
 import router from 'umi/router';
7
 import router from 'umi/router';
7
 import BuildSelect from '../../components/SelectButton/BuildSelect'
8
 import BuildSelect from '../../components/SelectButton/BuildSelect'
36
 
37
 
37
     // 查询列表
38
     // 查询列表
38
     const getDynamicData = (dynamicId) => {
39
     const getDynamicData = (dynamicId) => {
39
-      request({
40
-        url: '/api/admin/buildingDynamic/Details',
41
-        method: 'GET',
42
-        params: { dynamicId },
43
-      }).then((data) => {
40
+      request({ ...apis.activity.details, params: { dynamicId } }).then((data) => {
44
         console.log(data)
41
         console.log(data)
45
         setDynamicData(data)
42
         setDynamicData(data)
46
       })
43
       })
143
       console.log('submit data --->', submitValue)
140
       console.log('submit data --->', submitValue)
144
       if (dynamicId) {
141
       if (dynamicId) {
145
         submitValue.dynamicId = dynamicId
142
         submitValue.dynamicId = dynamicId
146
-        request({
147
-          url: '/api/admin/buildingDynamic/update',
148
-          method: 'PUT',
149
-          data: submitValue,
150
-        }).then((data) => {
143
+        request({ ...apis.activity.update, data: submitValue }).then((data) => {
151
           message.info("保存成功")
144
           message.info("保存成功")
152
           cancelPage()
145
           cancelPage()
153
         }).catch((err) => {
146
         }).catch((err) => {
154
           message.info(err.msg || err.message)
147
           message.info(err.msg || err.message)
155
         })
148
         })
156
       } else {
149
       } else {
157
-        request({
158
-          url: '/api/admin/buildingDynamic/add',
159
-          method: 'POST',
160
-          data: submitValue,
161
-        }).then((data) => {
150
+        request({ ...apis.activity.add, data: submitValue }).then((data) => {
162
           message.info("保存成功")
151
           message.info("保存成功")
163
           cancelPage()
152
           cancelPage()
164
         }).catch((err) => {
153
         }).catch((err) => {
178
 
167
 
179
     if(dynamicId){
168
     if(dynamicId){
180
       useEffect(() => {
169
       useEffect(() => {
181
-        request({
182
-          url: '/api/admin/poster',
183
-          method: 'GET',
184
-          params: {targetId: dynamicId,targetType: 'activity'},
185
-        }).then((data) => {
170
+        request({ ...apis.activity.poster, params: {targetId: dynamicId,targetType: 'activity'} }).then((data) => {
186
           console.log(data,"2222")
171
           console.log(data,"2222")
187
           if(data.length > 0){
172
           if(data.length > 0){
188
             setPosterId(data[0].posterId)
173
             setPosterId(data[0].posterId)
199
     const submitPoster  = () => {
184
     const submitPoster  = () => {
200
        if(dynamicId){
185
        if(dynamicId){
201
         if(posterId){
186
         if(posterId){
202
-          request({
203
-            url: '/api/admin/poster/'+posterId,
204
-            method: 'PUT',
205
-            data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},
206
-          }).then((data) => {
187
+          request({ ...apis.activity.updatePoster, urlData: {id: posterId}, data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
207
             message.info("保存成功")
188
             message.info("保存成功")
208
           }).catch((err) => {
189
           }).catch((err) => {
209
             message.info(err.msg || err.message)
190
             message.info(err.msg || err.message)
210
           })
191
           })
211
          }else{
192
          }else{
212
-          request({
213
-            url: '/api/admin/poster',
214
-            method: 'POST',
215
-            data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},
216
-          }).then((data) => {
193
+          request({ ...apis.activity.addPoster, data: {targetId: dynamicId,targetType: 'activity',posterImg: imgValue,posterTitle: inputValue,posterDescription: textAreaValue},}).then((data) => {
217
             setPosterId(data.posterId)
194
             setPosterId(data.posterId)
218
             message.info("保存成功")
195
             message.info("保存成功")
219
           }).catch((err) => {
196
           }).catch((err) => {
290
     
267
     
291
     if(dynamicId){
268
     if(dynamicId){
292
       useEffect(() => {
269
       useEffect(() => {
293
-        request({
294
-          url: '/api/admin/shareContent',
295
-          method: 'GET',
296
-          params: {targetId: dynamicId,targetType: 'activity'},
297
-        }).then((data) => {
270
+        request({ ...apis.activity.shareContent, params: {targetId: dynamicId,targetType: 'activity'},}).then((data) => {
298
           console.log(data,"2222")
271
           console.log(data,"2222")
299
           if(data.length > 0){
272
           if(data.length > 0){
300
             setShareContentId(data[0].shareContentId)
273
             setShareContentId(data[0].shareContentId)
310
     const submitShare = () => {
283
     const submitShare = () => {
311
       if(dynamicId){
284
       if(dynamicId){
312
         if(shareContentId){
285
         if(shareContentId){
313
-          request({
314
-            url: '/api/admin/shareContent/'+shareContentId,
315
-            method: 'PUT',
316
-            data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},
317
-          }).then((data) => {
286
+          request({ ...apis.activity.updateShareContent, urlData: {id: shareContentId},data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
318
             message.info("保存成功")
287
             message.info("保存成功")
319
           }).catch((err) => {
288
           }).catch((err) => {
320
             message.info(err.msg || err.message)
289
             message.info(err.msg || err.message)
321
           })
290
           })
322
          }else{
291
          }else{
323
-          request({
324
-            url: '/api/admin/shareContent',
325
-            method: 'POST',
326
-            data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},
327
-          }).then((data) => {
292
+          request({ ...apis.activity.addShareContent, data: {targetId: dynamicId,shareContentType: 'activity',shareContentImg: imgValue,shareContentTitle: inputValue},}).then((data) => {
328
             setShareContentId(data.shareContentId)
293
             setShareContentId(data.shareContentId)
329
             message.info("保存成功")
294
             message.info("保存成功")
330
           }).catch((err) => {
295
           }).catch((err) => {

+ 25
- 16
src/pages/staff/list/StaffList.jsx 파일 보기

30
 const CartBody = (props) => {
30
 const CartBody = (props) => {
31
   const { data } = props
31
   const { data } = props
32
 
32
 
33
-  const confirm = () => {
34
-    Modal.confirm({
35
-      title: '确认停用该角色?',
36
-      okText: '确认',
37
-      cancelText: '取消',
38
-      onOk() {
39
-        console.log('OK');
40
-      },
41
-      onCancel() {
42
-        console.log('Cancel');
43
-      },
44
-    });
33
+  const confirm = (data) => () => {
34
+    if(data.status === 1){
35
+      Modal.confirm({
36
+        title: '确认停用该角色?',
37
+        okText: '确认',
38
+        cancelText: '取消',
39
+        onOk() {
40
+          console.log('OK');
41
+        }
42
+      });
43
+    }else{
44
+      Modal.confirm({
45
+        title: '确认启用该角色?',
46
+        okText: '确认',
47
+        cancelText: '取消',
48
+        onOk() {
49
+          console.log('OK');
50
+        }
51
+      });
52
+    }
53
+    
45
   }
54
   }
46
   return (
55
   return (
47
 
56
 
53
           编辑
62
           编辑
54
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
63
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
55
         </Button>
64
         </Button>
56
-        <Button type="link" style={{ fontSize: '18px', color: '#cacaca', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
57
-          停用
65
+        <Button type="link" style={{ fontSize: '18px', color: '#cacaca', position: 'absolute', top: '50px', right: '0' }} onClick={confirm(data)}>
66
+          {data.status === 1 ? '停用' : '启用'}
58
                 <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
67
                 <Icon type="close-circle" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
59
         </Button>
68
         </Button>
60
-        <Button type="link" style={{ fontSize: '18px', color: '#FF925C', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
69
+        {/* <Button type="link" style={{ fontSize: '18px', color: '#FF925C', position: 'absolute', top: '50px', right: '0' }} onClick={confirm}>
61
           启用
70
           启用
62
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
71
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
63
-        </Button>
72
+        </Button> */}
64
 
73
 
65
       </div>
74
       </div>
66
       <div>
75
       <div>

+ 62
- 0
src/services/apis.js 파일 보기

161
       url: `${prefix}/selectUserResource`
161
       url: `${prefix}/selectUserResource`
162
     },
162
     },
163
 
163
 
164
+  },
165
+  activity: {
166
+      list: {
167
+        method: 'GET',
168
+        url: '/api/admin/iBuildingDynamicList',
169
+      },
170
+      weight: {
171
+        method: 'PUT',
172
+        url: '/api/admin/buildingDynamic/weight',
173
+      },
174
+      cancel: {
175
+        method: 'PUT',
176
+        url: '/api/admin/buildingDynamic/cancel/:id',
177
+      },
178
+      send: {
179
+        url: '/api/admin/buildingDynamic/send/:id',
180
+        method: 'PUT',
181
+      },
182
+      finish: {
183
+        url: '/api/admin/buildingDynamic/finish',
184
+        method: 'PUT',
185
+      },
186
+      details: {
187
+        url: '/api/admin/buildingDynamic/Details',
188
+        method: 'GET',
189
+      },
190
+      update: {
191
+        url: '/api/admin/buildingDynamic/update',
192
+        method: 'PUT',
193
+      },
194
+      add: {
195
+        url: '/api/admin/buildingDynamic/add',
196
+        method: 'POST',
197
+      },
198
+      poster: {
199
+        url: '/api/admin/poster',
200
+        method: 'GET',
201
+      },
202
+      updatePoster: {
203
+        url: '/api/admin/poster/:id',
204
+        method: 'PUT',
205
+      },
206
+      addPoster: {
207
+        url: '/api/admin/poster',
208
+        method: 'POST',
209
+      },
210
+      shareContent: {
211
+        url: '/api/admin/shareContent',
212
+        method: 'GET',
213
+      },
214
+      updateShareContent: {
215
+        url: '/api/admin/shareContent/:id',
216
+        method: 'PUT',
217
+      },
218
+      addShareContent: {
219
+        url: '/api/admin/shareContent',
220
+        method: 'POST',
221
+      },
222
+      signList: {
223
+        url: '/api/admin/SignList',
224
+        method: 'GET',
225
+      }
164
   }
226
   }
165
   // indexEcharts:{
227
   // indexEcharts:{
166
   //   list:{
228
   //   list:{