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

src/pages/activity/SignList.jsx

@@ -166,7 +166,7 @@ const handleSubmit = (e, props) => {
         </Form.Item>
       </Form>
       <Button type="primary" className={styles.addBtn} onClick={toActivityList}>返回</Button>
-      <Button type="primary" style={{ marginLeft: '85%' }} onClick={exportHelp}>导出</Button>
+      <Button name="admin.activityDynamicEnlist.export.get" noRight={null} type="primary" style={{ marginLeft: '85%' }} onClick={exportHelp}>导出</Button>
       <Table dataSource={data.list.data} columns={columns} pagination={false} rowKey="activity"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />

src/pages/activity/drainage/DrainageList.jsx

@@ -146,7 +146,7 @@ const header = (props) => {
               查看详情
             </span>
           </AuthButton>
-          <AuthButton name="admin.taDrainageRecord.get" noRight={null}>
+          <AuthButton name="admin.taDrainage.id.delete" noRight={null}>
             <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={deleteDrainage(datas.drainageId)}>
               删除
             </span>
@@ -328,7 +328,7 @@ const header = (props) => {
             </Button>
           </Form.Item>
         </Form>
-        <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
+        <AuthButton name="admin.taDrainage.add.post" noRight={null}>
           <Button type="danger" className={styles.addBtn} onClick={showModal}>新增</Button>
         </AuthButton>
         <Modal

src/pages/activity/groupActivity/helpRecord.jsx

@@ -122,7 +122,7 @@ class InviteTable extends React.Component {
           // onOk={() => this.handleOk()}
           onCancel={(e) => this.handleCancel(e)}
         >
-          <Button type="primary" onClick={() => this.exportChildRecord({ ...this.props.visibleData, pageNumber: 1, pageSize: 5 })} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+          <Button type="primary" name="admin.taShareChildRecord.export.get" noRight={null} onClick={() => this.exportChildRecord({ ...this.props.visibleData, pageNumber: 1, pageSize: 5 })} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
             导出
           </Button>
 
@@ -207,7 +207,7 @@ class Verifier extends React.Component {
           onCancel={(e) => this.handleCancel(e)}
         >
           <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
-           <Button onClick={() => this.verification()}>立即核销</Button>
+           <Button name="admin.taShareRecord.verificate.put" noRight={null} onClick={() => this.verification()}>立即核销</Button>
           </div>
         </Modal>
       </>
@@ -514,7 +514,7 @@ function helpRecord(row) {
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportRecord()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+      <Button name="admin.taShareRecord.export.get" noRight={null} type="primary" onClick={() => exportRecord()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
         导出
       </Button>
 

src/pages/activity/groupActivity/list.jsx

@@ -98,28 +98,41 @@ const toEditActivity = (groupActivityId) => () => {
       align: 'center',
       render: (x, row) => (
         <>
+          {row.activityStatus === 0 &&
+          <AuthButton name="admin.taShareActivity.finish.put" noRight={null}><span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span></AuthButton>
+          }
+          {row.activityStatus === 0 &&
+          <AuthButton name="admin.taShareSuccessRecord.get" noRight={null}>    <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span></AuthButton>
+          }
           {row.activityStatus === 0 &&
           <AuthButton name="admin.taShareActivity.list.get" noRight={null}>
-        
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
         </AuthButton> }
 
           {row.activityStatus === 1 &&
-           <AuthButton name="admin.taShareActivity.list.get" noRight={null}>
-                      <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
-                      <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
-                      <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
-            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+          <AuthButton name="admin.taShareActivity.update.put" noRight={null}>
+            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
+          </AuthButton>
+          }
+           {row.activityStatus === 1 &&
+          <AuthButton name="admin.taShareActivity.finish.put" noRight={null}>
+                <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
+          </AuthButton>
+          }
+           {row.activityStatus === 1 &&
+           <AuthButton name="admin.taShareActivity.weight.put" noRight={null}>
+                <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+                <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
         </AuthButton>
           }
 
-          {row.activityStatus === 2 &&
-        <AuthButton name="admin.taShareActivity.list.get" noRight={null}>
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span>
-           <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+        {row.activityStatus === 2 &&
+        <AuthButton><span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.groupActivityId)}>拼团记录<Icon type="snippets" className={styles.shoppingCart} /></span></AuthButton>
+        }
+         {row.activityStatus === 2 &&
+        <AuthButton name="admin.taShareActivity.weight.put" noRight={null}>
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topGroupActivity(row, row.weight)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{ row.sort === true ? '取消推荐首页' : '推荐首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
         </AuthButton>
           }

src/pages/activity/helpActivity/helpRecord.jsx

@@ -127,7 +127,7 @@ class InviteTable extends React.Component {
           onCancel={e => this.handleCancel(e)}
         >
 
-      <Button type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+      <Button name="admin.HelpInitiateRecordSucceed.export.get" noRight={null} type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
         导出
       </Button>
           <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
@@ -218,7 +218,7 @@ class Verifier extends React.Component {
           onCancel={e => this.handleCancel(e)}
         >
           <div><span>核销码:<input onChange={this.verify.bind(this)}/></span>
-           <Button onClick={e => this.verification(e)} style={{ marginLeft: '80px' }}>立即核销</Button>
+           <Button name="admin.helpInitiateRecordVerify.post" noRight={null} onClick={e => this.verification(e)} style={{ marginLeft: '80px' }}>立即核销</Button>
           </div>
         </Modal>
       </>
@@ -516,7 +516,7 @@ function helpRecord(row) {
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+      <Button name="admin.helpRecord.export.get" noRight={null} type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
         导出
       </Button>
 

src/pages/activity/helpActivity/list.jsx

@@ -92,26 +92,35 @@ const toEditGoods = (helpActivityId) => () => {
       render: (x, row) => (
         <>
           {row.activityStatus === 0 &&
-          <AuthButton name="admin.SignList.get" noRight={null}>
-        
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+          <AuthButton name="admin.helpRecord.get">
+             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+          </AuthButton>}
+          {row.activityStatus === 0 &&
+          <AuthButton name="admin.top.update.post" noRight={null}>
             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
           </AuthButton> }
 
           {row.activityStatus === 1 &&
-           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-                      <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
-                      {/* <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span> */}
+          <AuthButton name="admin.helpActivity.update.put" noRight={null}>
+            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
+          </AuthButton>
+          }
+          {row.activityStatus === 1 &&
+           <AuthButton name="admin.top.update.post" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
             </AuthButton>
           }
 
           {row.activityStatus === 2 &&
-        <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+          <AuthButton name="admin.helpRecord.get" noRight={null}>
+            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
+          </AuthButton>
+          }
+           {row.activityStatus === 2 &&
+        <AuthButton name="admin.top.update.post" noRight={null}>
            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
         </AuthButton>
@@ -266,7 +275,7 @@ const handleSubmit = (e, props) => {
         </Form.Item>
       </Form>
       <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
-        <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
+        <Button name="admin.helpActivity.add.post" noRight={null} type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       </AuthButton>
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="activityList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/services/apis.js

@@ -439,7 +439,7 @@ export default {
       getTaActivityDynamicEnlistExport: {
         url: `${prefix}/activityDynamicEnlist/export`,
         method: 'GET',
-        action: 'admin.SignList.get',
+        action: 'admin.activityDynamicEnlist.export.get',
       },
       taDrainage: {
         url: `${prefix}/taDrainage`,