按钮权限

src/components/AuthButton/index.jsx

@@ -13,11 +13,12 @@ const AuthButton = ({ children, name, noRight }) => {
 
   // const hasRight = btn.roles.some(x => current.some(y => x === y))
 
-  if (!btn || !btn.rolesList || !btn.rolesList.length) {
+  if (!btn) {
     return <>{children}</>
   }
 
-  const hasRight = btn.rolesList.some(x => current.some(y => x.roleId === y))
+  const hasRight = current.filter(x => x.code === name)[0]
+  
   return hasRight ? <>{children}</> : <>{noRight}</>
 }
 

src/models/user.js

@@ -34,7 +34,7 @@ const UserModel = {
       const currentUser = { ...taUser, roles: (taUser.roles || []).map(x => x.roleId) }
 
       setAllBtnAuth(buttonList)
-      setUserBtnAuth(currentUser.roles)
+      setUserBtnAuth(currentUser.buttons)
 
       return { ...state, currentUser, menuList, buttonList };
     },

src/pages/activity/ActivityList.jsx

@@ -156,8 +156,10 @@ const header = props => {
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
             {row.activityStatus === 0 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
           </AuthButton>
-          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
+          <AuthButton name="admin.buildingDynamic.tag" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{row.weight === 1 ? '取消标签' : '添加标签'}<Icon type="vertical-align-top" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
             {(row.activityStatus === 0 || row.activityStatus === 1) && <span style={{ color: '#FF925C',marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
           </AuthButton>
       {/* {(row.activityStatus === 0 || row.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{'下载二维码'} {<Icon type="qrcode" className={styles.shoppingCart} />}</span>} */}
@@ -315,9 +317,11 @@ const header = props => {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
-          </Button>
+          <AuthButton name="admin.buildingDynamic.search" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
+            </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
             </Button>

src/pages/activity/detailActivity.jsx

@@ -413,7 +413,9 @@ const Edit = props => {
         <AuthButton name="admin.SignList.get" noRight={null}>
           {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, detailData.dynamicId)}><Button>报名记录</Button></span>}
           </AuthButton>
+          <AuthButton name="admin.dymic.qrcode" noRight={null}>
           {(detailData.activityStatus === 0 || detailData.activityStatus === 2) &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, detailData)}>{<Button>下载二维码</Button>}</span>}
+          </AuthButton>
           <Button onClick={() => cancelPage()}>
             取消
           </Button>

src/pages/activity/drainage/DrainageList.jsx

@@ -186,18 +186,22 @@ const header = (props) => {
       align: 'center',
       render: (text, datas) => (
         <>
+        <AuthButton name="admin.taDrainage.put" noRight={null}>
           <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer'}} onClick={() => addshowModal(datas)}>
             编辑
           </span>
+        </AuthButton>
           <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>
           </AuthButton >
+          <AuthButton name="admin.taDrainage.publish" noRight={null}>
           <span style={{ right: '20px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', cursor: 'pointer', marginLeft: 20 }} onClick={exchangeDrainage(datas)}>
             {datas.status === 1 ? '下架' : '上架'}
           </span>
-          <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
+          </AuthButton>
+          <AuthButton name="admin.taDrainage.data" noRight={null}>
             <span style={{ right: '20px', top: '20px', fontSize: ' 0.106rem', zIndex: 1, color: '#FF7E48', cursor: 'pointer', marginLeft: 20  }} onClick={toEditList(datas)}>
               数据
             </span>
@@ -493,9 +497,11 @@ const header = (props) => {
           )}
         </Form.Item>
           <Form.Item >
+          <AuthButton name="admin.taDrainage.search" noRight={null}>
             <Button type="primary" htmlType="submit" className={styles.searchBtn} onClick>
               搜索
           </Button>
+          </AuthButton>
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>

src/pages/activity/groupActivity/detailActivity.jsx

@@ -378,7 +378,7 @@ const Edit = props => {
         {tab === 'share' && <Share />}
       </div>
       <div style={{textAlign: 'center'}}>
-        <AuthButton name="admin.SignList.get" noRight={null}>
+        <AuthButton name="admin.share.record" noRight={null}>
           {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && 
             <span 
               style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} 

src/pages/activity/groupActivity/list.jsx

@@ -119,13 +119,15 @@ const header = props => {
             <AuthButton name="admin.taShareActivity.finish.put" noRight={null}><span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={endGroupActivity(row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span></AuthButton>
           }
           {
-            <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
+            <AuthButton name="admin.taShareActivity.publish" noRight={null}>
               <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
             </AuthButton>
           }
           {
-            <AuthButton name="admin.taShareActivity.list.get" noRight={null}>
+            <AuthButton name="admin.taShareActivity.tag" 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>
+            </AuthButton>}{
+            <AuthButton name="admin.taShareActivity.top" noRight={null}>
               <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
             </AuthButton>}
 
@@ -299,9 +301,11 @@ const header = props => {
           )}
         </Form.Item>
         <Form.Item>
+        <AuthButton name="admin.taShareActivity.search" noRight={null}>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
             </Button>

src/pages/activity/helpActivity/detailActivity.jsx

@@ -377,7 +377,7 @@ const Edit = props => {
         {tab === 'share' && <Share />}
       </div>
       <div style={{textAlign: 'center'}}>
-        <AuthButton name="admin.SignList.get" noRight={null}>
+        <AuthButton name="admin.help.record" noRight={null}>
           {(detailData.activityStatus === 0 || detailData.activityStatus === 2) && 
             <span 
               style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} 

src/pages/activity/helpActivity/list.jsx

@@ -110,17 +110,19 @@ const getActivityDetail = (helpActivityId) => () => {
       render: (x, row) => (
         <>
           {
-            <AuthButton name="admin.top.update.post" noRight={null}>
+            <AuthButton name="admin.help.publish" noRight={null}>
               <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
             </AuthButton>
           }
           {row.activityStatus === 0 &&
-            <AuthButton name="admin.top.update.post" noRight={null}>
+            <AuthButton name="admin.help.finish" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" style={{color:'#bebebe'}} className={styles.edit} /></span> </AuthButton>
           }
           {
-          <AuthButton name="admin.top.update.post" noRight={null}>
+          <AuthButton name="admin.help.tag" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消标签' : '添加标签' }<Icon type="vertical-align-top"  style={{color:'#bebebe'}} className={styles.edit} /></span>
+          </AuthButton>}{
+          <AuthButton name="admin.help.top" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" style={{color:'#bebebe'}} className={styles.edit} /></span>
           </AuthButton> }
 
@@ -293,15 +295,17 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item>
         <Form.Item>
+        <AuthButton name="admin.help.search" noRight={null}>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
+      <AuthButton name="admin.help.add.post" noRight={null}>
         <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"/>

src/pages/building/list/index.jsx

@@ -112,7 +112,7 @@ function CartBody(props) {
       <p className={Styles.cardText}>
         <span className={Styles.title}>楼盘编号</span>
         <span style={{textOverflow: 'ellipsis',  whiteSpace: 'nowrap',  overflow: 'hidden'}}>：{data.code}</span>
-        <AuthButton name="admin.building.update.put" noRight={null}>
+        <AuthButton name="admin.building.update" noRight={null}>
           <span className={Styles.ediText} onClick={() => toEdi(data)}>
             编辑
                   <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
@@ -142,14 +142,14 @@ function CartBody(props) {
         <span >：{moment(data.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>
       </p>
       <p style={{ margin: '15px 0', position: 'relative', fontSize: '0.106rem' }}>
-      <AuthButton name="admin.building.update.status.put" noRight={null}>
+      <AuthButton name="admin.building.public" noRight={null}>
         <span style={{ color: '#FF4A4A' }} onClick={() => pulicAndUnPulic(data)}>
           {/* 已发布的时候，需要显示取消发布的字样 */}
           {data.status === 1 ? '取消发布' : '发布'}
           <Icon type={data.status === 1 ? 'close-circle' : 'form'} style={{ color: '#C0C4CC', marginLeft: '8px' }} />
         </span>
       </AuthButton>
-      <AuthButton name="admin.building.delete.id.delete" noRight={null}>
+      <AuthButton name="admin.building.delete" noRight={null}>
         <span style={{
           color: '#FF4A4A', position: 'absolute', right: '0',
         }} onClick={() => deleteBuilding(data)}>
@@ -319,16 +319,18 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-            <Button type="primary" htmlType="submit">
-              搜索
-            </Button>
+            <AuthButton name="admin.building.search" noRight={null}>
+              <Button type="primary" htmlType="submit">
+                搜索
+              </Button>
+            </AuthButton> 
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
         </Form.Item>
       </Form>
 
-      <AuthButton name="admin.building.add.post" noRight={null}>
+      <AuthButton name="admin.building.add" noRight={null}>
         <Button type="danger" className={Styles.addButton} onClick={() => toAdd()}>
           新增楼盘
         </Button>

src/pages/building/type/index.jsx

@@ -37,18 +37,22 @@ function body() {
       key: 'row',
       render: (_, record) => (
         <span >
-          <Button type="link" style={{
-            color: '#FF4A4A', right: '0',
-          }} onClick={() => deleteType(record)}>
-            删除
-            <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-          </Button>
-          <Button type="link" style={{
-            color: '#FF4A4A', right: '0',
-          }} onClick={() => toEdi(record.buildingTypeId)}>
-            编辑
-            <Icon type="copy" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
-          </Button>
+          <AuthButton name="admin.tdBuildingType.delete" noRight={null}>
+            <Button type="link" style={{
+              color: '#FF4A4A', right: '0',
+            }} onClick={() => deleteType(record)}>
+              删除
+              <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+            </Button>
+          </AuthButton>
+          <AuthButton name="admin.tdBuildingType.update" noRight={null}>
+            <Button type="link" style={{
+              color: '#FF4A4A', right: '0',
+            }} onClick={() => toEdi(record.buildingTypeId)}>
+              编辑
+              <Icon type="copy" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
+            </Button>
+          </AuthButton>
         </span>
       ),
     },
@@ -119,7 +123,7 @@ function body() {
 
   return (
     <>
-      <AuthButton name="admin.tdBuildingType.post" noRight={null}>
+      <AuthButton name="admin.tdBuildingType.add" noRight={null}>
         <Button type="danger" onClick={() => toEdi()}>新增类型</Button>
       </AuthButton>
       <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="buildingType"/>

src/pages/carouselFigure/advertisingList.jsx

@@ -96,9 +96,13 @@ const toEdit = (contentId) => () => {
       align: 'center',
       render: (x,row) => (
         <>
-          <AuthButton name="admin.extendContent.id.put" noRight={null}>
+          <AuthButton name="admin.advert.publish" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px',cursor: 'pointer' }} onClick={changeStatus(row)}>{ row.status === 1 ? '下架' : '上架' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.advert.put" noRight={null}>
             <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEdit(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.advert.delete" noRight={null}>
             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}>删除<Icon type="vertical-align-top" className={styles.edit} /></span>
           </AuthButton>
         </>
@@ -253,15 +257,17 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item>
         <Form.Item>
+        <AuthButton name="admin.advert.search" noRight={null}>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
         </Form.Item>
       </Form>
-      <AuthButton name="admin.extendContent.post" noRight={null}>
+      <AuthButton name="admin.advert.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
       </AuthButton>
       <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList"/>

src/pages/carouselFigure/carouselFigureList.jsx

@@ -96,9 +96,13 @@ const toEditCarouse = (contentId) => () => {
       align: 'center',
       render: (x,row) => (
         <>
-          <AuthButton name="admin.extendContent.id.put" noRight={null}>
+          <AuthButton name="admin.extendContent.publish" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer'}} onClick={changeStatus(row)}>{ row.status === 1 ? '下架' : '上架' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.extendContent.id.put" noRight={null}>
             <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditCarouse(row.contentId)}>编辑<Icon type="form" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.extendContent.delete" noRight={null}>
             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={deleteCarouse(row.contentId)}>删除<Icon type="vertical-align-top" className={styles.edit} /></span>
           </AuthButton>
         </>
@@ -251,9 +255,11 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item>
         <Form.Item>
+        <AuthButton name="admin.extendContent.search" noRight={null}>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>

src/pages/carouselFigure/customImg/list.jsx

@@ -94,7 +94,7 @@ function header(props) {
       align: 'center',
       render: (x, row) => (
         <>
-          <AuthButton name="admin.taNewsType.id.put" noRight={null}>
+          <AuthButton name="admin.custom.put" noRight={null}>
             <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditCustom(row.imgId)}>
               编辑<Icon type="form" className={styles.edit} />
             </span>
@@ -111,7 +111,7 @@ function header(props) {
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
         
       </Form>
-      <AuthButton name="admin.taGoods.add.post" noRight={null}>
+      <AuthButton name="admin.custom.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditCustom()}>新增</Button>
       </AuthButton>
       <Table rowKey="goodsList" dataSource={data.records} columns={columns} pagination={false} />

src/pages/channel/channelList.jsx

@@ -182,7 +182,9 @@ const header = props => {
           </Select>
         </div>
         <div >
+        <AuthButton name="admin.channel.search" noRight={null}>
           <Button type="primary" onClick={() => queryList()}>查询</Button>
+          </AuthButton>
           {/* <Button onClick={() => reset() }>重置</Button> */}
         </div>
       </div>

src/pages/channel/independentList/index.jsx

@@ -441,17 +441,21 @@ function body (props) {
           )}
         </Form.Item>
         <Form.Item style={{ position: 'absolute', right: '38px' }} >
-          <Button type="primary" htmlType="submit" >
-            搜索
-          </Button>
+          <AuthButton name="admin.major.search" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              搜索
+            </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
           </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportIndependen()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
-        导出
-      </Button>
+      <AuthButton name="admin.major.import" noRight={null}>
+        <Button type="primary" onClick={() => exportIndependen()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+          导出
+        </Button>
+      </AuthButton>
       <Table rowKey="independentIndex" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
       {/* 推荐客户 */}
       <ModalTable visibleData={gVisibleData} />

src/pages/customer/customerlist/index.jsx

@@ -264,11 +264,11 @@ function body(props) {
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => (
         <>
-          <AuthButton>
+          <AuthButton name="admin.customer.public.detail" noRight={null}>
             <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => publicCustomerDetail(record)}>查看详情</Button>
           </AuthButton>
           &nbsp;&nbsp;
-          <AuthButton>
+          <AuthButton name="admin.customer.recommend" noRight={null}>
             <Button className={customerType === 'private' ? Styles.displayS : Styles.text } type="link" onClick={() => showRecommend(record.personId)}>推荐客户</Button>
           </AuthButton>
         </>
@@ -358,7 +358,9 @@ function body(props) {
             &nbsp;
           <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showStatus(record)}>变更状态</Button>
+            </AuthButton>
             &nbsp;&nbsp;
+          <AuthButton name="admin.customer.recommend.belong" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
           </AuthButton>
             &nbsp;&nbsp;
@@ -366,7 +368,7 @@ function body(props) {
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => toCustomerDateil(record)}>查看详情</Button>
           </AuthButton>
             &nbsp;&nbsp;
-          <AuthButton name="admin.mine.taPointsRecords.id.get" noRight={null}>
+          <AuthButton name="admin.mine.taPointsRecords.point.record" noRight={null}>
             <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
           </AuthButton>
             &nbsp;
@@ -424,17 +426,21 @@ function body(props) {
           )}
         </Form.Item>}
         <Form.Item>
-            <Button type="primary" htmlType="submit" >
-              查询
-            </Button>
+            <AuthButton name="admin.customer.recommend.search" noRight={null}>
+              <Button type="primary" htmlType="submit" >
+                查询
+              </Button>
+            </AuthButton>
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
         </Form.Item>
       </Form>
-      <Button type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
-        导出
-      </Button>
+      <AuthButton name="admin.customer.import" noRight={null}>
+        <Button type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
+          导出
+        </Button>
+      </AuthButton>
 
       <div style={{ margin: '20px 0'}}>
         <AuthButton name="admin.customer.recommend.get" noRight={null}>

src/pages/integralMall/GoodsList.jsx

@@ -195,9 +195,11 @@ function header(props) {
           )}
         </Form.Item>
         <Form.Item>
-            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-              搜索
-            </Button>
+            <AuthButton name="admin.taGoods.search" noRight={null}>
+              <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+                搜索
+              </Button>
+            </AuthButton>
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>

src/pages/integralMall/exchangeRecords.jsx

@@ -184,9 +184,11 @@ function record(props) {
           </Form.Item>
           
           <Form.Item style={{position:'absolute',right:'38px'}}>
-            <Button type="primary" htmlType="submit">
-              搜索
-            </Button>
+            <AuthButton name="admin.taGoods.exchange" noRight={null}>
+              <Button type="primary" htmlType="submit">
+                搜索
+              </Button>
+            </AuthButton>
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>

src/pages/news/list/NewsList.jsx

@@ -180,7 +180,7 @@ function body(props) {
         cover={<img alt="example" src={data.newsImg} style={{ borderRadius: '12px 0 0 12px', width: '230px', height: '228px' }}></img>}
         bodyStyle={{ padding: '10px 20px' }}
       >
-        <AuthButton name="admin.taNews.id.put" noRight={null}>
+        <AuthButton name="admin.taNews.top" noRight={null}>
         <span style={{ position: 'absolute', right: '83px', top: '16px', fontSize: ' 0.106rem',zIndex:1, color: '#FF7E48', cursor: 'pointer' }} onClick={topNews(data.weight, data.newsId)}>{ data.weight === 1 ? '取消置顶' : '置顶' }</span>
         </AuthButton>
 
@@ -189,6 +189,8 @@ function body(props) {
             编辑
                   <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
           </span>
+          </AuthButton>
+          <AuthButton name="admin.taNews.publish" noRight={null}>
           {data.newsStatus === 0 ?
             <span style={{ position: 'absolute', left: '250px', bottom: ' 10px', fontSize: ' 0.106rem', color: '#FF7E48', zIndex: 1, cursor: 'pointer' }} onClick={cancelRelease.bind(this, data.newsId, 1, data.buildingId, data.newsType.newsTypeId)}>
               取消发布
@@ -296,9 +298,11 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" >
-            搜索
-          </Button>
+          <AuthButton name="admin.news.search" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              搜索
+            </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
             </Button>

src/pages/news/type/NewsType.jsx

@@ -134,9 +134,11 @@ function header(props) {
           )}
         </Form.Item>
         <Form.Item>
-            <Button type="primary" htmlType="submit" >
-              查询
-            </Button>
+            <AuthButton name="admin.taNewsType.search" noRight={null}>
+              <Button type="primary" htmlType="submit" >
+                查询
+              </Button>
+            </AuthButton>
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>

src/pages/recommend/recommendCustomer/index.jsx

@@ -225,18 +225,22 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item style={{ position:'absolute',right:'38px' }}>
-            <Button type="primary" htmlType="submit" >
-              搜索
-            </Button>
+            <AuthButton name="admin.recommend.search" noRight={null}>
+              <Button type="primary" htmlType="submit" >
+                搜索
+              </Button>
+            </AuthButton>
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
               重置
             </Button>
         </Form.Item>
       </Form>
       {/* style={{float:'right',margin:'20px 0'}} */}
-      <Button type="primary" onClick={() => exportRecommendCustomer()}>
-        导出
-      </Button>
+      <AuthButton name="admin.recommend.import" noRight={null}>
+        <Button type="primary" onClick={() => exportRecommendCustomer()}>
+          导出
+        </Button>
+      </AuthButton>
       <Table rowKey="recommendCustomer" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>
   );

src/pages/record/drainage/DrainageVisitRecordList.jsx

@@ -162,9 +162,11 @@ const header = props => {
           )}
         </Form.Item>
         <Form.Item>
+        <AuthButton name="admin.visit.record.search" noRight={null}>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}> 
             搜索
           </Button>
+          </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
             </Button>

src/pages/record/report/index.jsx

@@ -190,9 +190,11 @@ function body(props) {
           </Col>
           <div style={{minWidth:'150px',position: 'absolute', right: '-12px', }}>
             <Form.Item >
+            <AuthButton name="admin.report.search" noRight={null}>
               <Button type="primary" htmlType="submit">
                 搜索
             </Button>
+            </AuthButton>
               <Button style={{ marginLeft: 8 }} onClick={handleReset}>
                 重置
             </Button>
@@ -202,9 +204,11 @@ function body(props) {
         <div >
         </div>
       </Form>
+      <AuthButton name="admin.report.import" noRight={null}>
       <Button type="primary" onClick={() => exportReport()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
         导出
       </Button>
+      </AuthButton>
       <Table rowKey="report" style={{ marginTop: '40px' }} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>
   );

src/pages/staff/list/RoleList.jsx

@@ -8,6 +8,7 @@ import { Card, Avatar } from 'antd';
 import request from '../../../utils/request'
 import Styles from './style.less';
 import apis from '../../../services/apis';
+import AuthButton from '../../../components/AuthButton';
 
 const header = props => {
 // function confirm(id) {
@@ -118,12 +119,16 @@ const columns = [
     align: 'center',
 
     render: (text, record) => <>
+    <AuthButton name="admin.role.publish" noRight={null}>
       <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => stop(record.roleId, record.status)}>{ record.status === 1 ? '停用' : '启用' }
       <Icon type="stop" className={styles.shoppingCart} style={{ fontSize: 14 }}/>
       </span>
+      </AuthButton>
+      <AuthButton name="admin.role.put" noRight={null}>
       <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={() => toEditRole(record.roleId)} >编辑
       <Icon type="form" className={styles.edit} />
       </span>
+      </AuthButton>
     </>,
 
   },
@@ -132,7 +137,9 @@ const columns = [
 
 return (
     <>
+    <AuthButton name="admin.role.add" noRight={null}>
       <Button type="danger" className={styles.addBtn} onClick={addRole}>新增</Button>
+      </AuthButton>
       <div className={Styles.roletext}>
 
         <Table rowKey="roleList" dataSource={data.records} columns={columns} />

src/pages/staff/list/StaffList.jsx

@@ -4,7 +4,7 @@ import { Form, Input, Button, Icon, Select, message, Table, Divider, Row, Col, T
 import { FormattedMessage } from 'umi-plugin-react/locale';
 import styles from '../../style/GoodsList.less';
 import router from 'umi/router';
-
+import AuthButton from '../../../components/AuthButton';
 import apis from '../../../services/apis';
 import request from '../../../utils/request'
 import Styles from './style.less';
@@ -98,19 +98,22 @@ const CartBody = props => {
     <Card className={Styles.card}>
       <div>
         <Avatar src={data.photo} style={{ width: '0.48rem', height: '0.48rem' }} />
+        <AuthButton name="admin.user.put" noRight={null}>
         <Button type="link" style={{ color: '#FF925C', fontSize: '0.106rem', position: 'absolute', top: '40px', left: '0.56rem' }} onClick={toEditStaff(data.userId)}>
           编辑
                 <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
         </Button>
+        </AuthButton>
         {/* <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={() => departure(data)}>
           离职
                 <Icon type="exclamation-circle" style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
         </Button> */}
+        <AuthButton name="admin.user.publish" noRight={null}>
         <Button type="link" style={{ fontSize: ' 0.106rem', color: '#cacaca', position: 'absolute', top: '40px', right: '0' }} onClick={confirm(data)}>
           {data.status === 1 ? '停用' : '启用'}
           <Icon type={data.status === 1 ? 'close-circle' : 'form'} style={{ color: '#C0C4CC', marginLeft: '0.04rem' }} />
         </Button>
-
+        </AuthButton>
       </div>
       <div>
 
@@ -211,16 +214,19 @@ const header = props => {
         </Form.Item>
 
         <Form.Item>
+        <AuthButton name="admin.user.search" noRight={null}>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
-
+        </AuthButton>
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
             重置
             </Button>
         </Form.Item>
       </Form>
+      <AuthButton name="admin.user.add" noRight={null}>
       <Button type="danger" style={{ margin: '20px 0', padding: '2px 36px' }} onClick={toEditStaff()}>新增</Button>
+      </AuthButton>
       <Row style={{ padding: ' 0 10px' }}>
         {
           tempData.records.map((item, index) => (

src/pages/system/document/list.jsx

@@ -137,9 +137,11 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
+        <AuthButton name="admin.documentVerify.search" noRight={null}>
           <Button type="primary" htmlType="submit">
             查询
           </Button>
+          </AuthButton>
           &nbsp;&nbsp;&nbsp;&nbsp;
           <Button onClick={(e) => handleReset(e)}>
             清空

src/pages/system/housingPolicy.jsx

@@ -87,9 +87,13 @@ const toEditPolicy = (policyId) => () => {
       align: 'center',
       render: (x,row) => (
         <>
-          <AuthButton name="admin.taPolicy.id.put" noRight={null}>
+          <AuthButton name="admin.taPolicy.publish" noRight={null}>
             <span style={{ color: '#1990FF',cursor: 'pointer' }} onClick={publicOrNoPublic(row)}>{ row.publishStatus === 0 ? '发布' : '取消发布' }<Icon type="close-circle" className={styles.edit} /></span>
+          </AuthButton> 
+          <AuthButton name="admin.taPolicy.top" noRight={null}>
             <span style={{ color: '#1990FF', marginRight: '20px',cursor: 'pointer' }} onClick={topPolicy(row)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
+          </AuthButton>
+          <AuthButton name="admin.taPolicy.id.put" noRight={null}>
             <span style={{ color: '#FF925C',cursor: 'pointer' }} onClick={toEditPolicy(row.policyId)}>编辑<Icon type="form" className={styles.edit} /></span>
           </AuthButton>
           <AuthButton name="admin.taPolicy.id.delete" noRight={null}>
@@ -185,9 +189,11 @@ const handleSubmit = (e, props) => {
           )}
         </Form.Item>
         <Form.Item>
+        <AuthButton name="admin.taPolicy.search" noRight={null}>
           <Button type="primary" htmlType="submit" className={styles.searchBtn}>
             搜索
           </Button>
+          </AuthButton>
         </Form.Item>
       </Form>
       <AuthButton name="admin.taPolicy.post" noRight={null}>