合并

config/routes.js

@@ -292,7 +292,7 @@ export default [
               },
               {
                 path: '/activity/helpActivity/edithelpActivity',
-                name: '新增',
+                name: '编辑',
                 hideInMenu: true,
                 component: './activity/helpActivity/edithelpActivity',
               },

src/pages/activity/drainage/Detail.jsx

@@ -146,7 +146,7 @@ const header = (props) => {
     
       <div>
         {/* H5项目名称 */}
-        {}  <Button type="primary" style={{ marginLeft: '30px', float: 'right', marginTop: '30px',marginBottom: '30px' }} onClick={excelPort}>导出数据</Button>
+        {}  <Button type="primary" style={{ marginLeft: '30px', float: 'right', marginTop: '30px', marginBottom: '30px' ,zIndex: 1}} onClick={excelPort}>导出数据</Button>
         <Table columns={columns} dataSource={datas}  pagination={false} />
         <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
        <Pagination showQuickJumper defaultCurrent={1} total={total.total} onChange={(e) => changePageNum(e)} />

src/pages/activity/helpActivity/edithelpActivity.jsx

@@ -81,8 +81,8 @@ const header = props => {
         }
 
         // 判断助力人数不得超过200
-        if (values.helpNum > 200) {
-          message.error('限制助力人数不能超过200')
+        if (values.personNum > 200) {
+          message.error('助力邀请人数不能超过200')
           return
         }
 

src/services/apis.js

@@ -461,16 +461,16 @@ export default {
         method: 'PUT',
         action: 'admin.taDrainage.id.put',
       },
-      taDrainageRecord:{
+      taDrainageRecord: {
         url: `${prefix}/taDrainageRecord`,
         method: 'GET',
         action: 'admin.taDrainageRecord.get',
       },
-      exporttaDrainageRecord:{
+      exporttaDrainageRecord: {
         url: `${prefix}/taDrainageRecord/export`,
         method: 'GET',
-        action: 'admin.taDrainageRecord/export.get',
-      }
+        action: 'admin.taDrainageRecord.export.get',
+      },
   },
   integralMall: {
     tdPointsRules: {
@@ -612,12 +612,12 @@ export default {
       method: 'POST',
       action: 'admin.taBuildingReport.add.post',
     },
-    documentVerifylist:{
+    documentVerifylist: {
       url: `${prefix}/documentVerify`,
       method: 'GET',
       action: 'admin.documentVerify.get',
     },
-    documentVerifyDetail:{
+    documentVerifyDetail: {
       url: `${prefix}/documentVerify/:id`,
       method: 'GET',
       action: 'admin.documentVerify.id.get',
@@ -733,57 +733,52 @@ export default {
   list: {
     url: `${prefix}/helpActivity/list`,
     method: 'GET',
-    action: 'admin.taRole.get',
-  },
-  effectiveList: {
-    url: `${prefix}/helpActivityEffective/list`,
-    method: 'GET',
-    action: 'admin.helpActivityEffective.get',
+    action: 'admin.helpActivity.get',
   },
   add: {
     url: `${prefix}/helpActivity/add`,
     method: 'post',
-    action: 'admin.taRole.get',
+    action: 'admin.helpActivity.add.post',
   },
   details: {
     url: `${prefix}/helpActivity/details`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.helpActivity.details.get',
   },
   update: {
     url: `${prefix}/helpActivity/update`,
     method: 'put',
-    action: 'admin.taRole.get',
+    action: 'admin.helpActivity.update.put',
   },
   top: {
     url: `${prefix}/top/update`,
     method: 'post',
-    action: 'admin.taRole.get',
+    action: 'admin.top.update.post',
   },
   record: {
     url: `${prefix}/helpRecord`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.helpRecord.get',
   },
   helpPeopleDetails: {
     url: `${prefix}/taHelpRecord/details`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.taHelpRecord.details.get',
   },
   verification: {
     url: `${prefix}/helpInitiateRecordVerify`,
     method: 'post',
-    action: 'admin.taRole.get',
+    action: 'admin.helpInitiateRecordVerify.get',
   },
   HelpInitiateRecordSucceed: {
     url: `${prefix}/HelpInitiateRecordSucceed/export`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.HelpInitiateRecordSucceed.export.get',
   },
   gethelpRecordExport: {
     url: `${prefix}/helpRecord/export`,
     method: 'get',
-    action: 'admin.taRole.get',
+    action: 'admin.helpRecord.export.get',
   },
  },
  groupActivity: {