合并

src/pages/building/list/index.jsx

@@ -111,10 +111,12 @@ function CartBody(props) {
       <p className={Styles.cardText}>
         <span className={Styles.title}>楼盘编号</span>
         <span >：{data.code}</span>
-        <span className={Styles.ediText} onClick={() => toEdi(data)}>
-          编辑
-                <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
-        </span>
+        <AuthButton name="admin.building.update.put" noRight={null}>
+          <span className={Styles.ediText} onClick={() => toEdi(data)}>
+            编辑
+                  <Icon type="form" style={{ color: '#C0C4CC', marginLeft: '10px' }} />
+          </span>
+        </AuthButton>
       </p>
       <p className={Styles.cardText}>
         <span className={Styles.title}>楼盘名称</span>
@@ -139,17 +141,21 @@ function CartBody(props) {
         <span >：{data.createDate}</span>
       </p>
       <p style={{ margin: '15px 0', position: 'relative', fontSize: '0.11rem' }}>
+      <AuthButton name="admin.building.update.status.put" 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}>
         <span style={{
           color: '#FF4A4A', position: 'absolute', right: '0',
         }} onClick={() => deleteBuilding(data)}>
           删除
                 <Icon type="rest" style={{ color: '#C0C4CC', marginLeft: '8px' }} />
         </span>
+      </AuthButton>
       </p>
     </Card>
   )
@@ -279,13 +285,15 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit">
-            搜索
-          </Button>
+          <AuthButton name="admin.buildinglist.get" noRight={null}>
+            <Button type="primary" htmlType="submit">
+              搜索
+            </Button>
+          </AuthButton>
         </Form.Item>
       </Form>
 
-      <AuthButton name="building.add" noRight={null}>
+      <AuthButton name="admin.building.add.post" noRight={null}>
         <Button type="danger" className={Styles.addButton} onClick={() => toAdd()}>
           新增楼盘
         </Button>

src/pages/building/type/index.jsx

@@ -5,6 +5,7 @@ import moment from 'moment';
 import Styles from './style.less'
 import request from '../../../utils/request';
 import apis from '../../../services/apis';
+import AuthButton from '@/components/AuthButton';
 
 function body() {
   // eslint-disable-next-line react-hooks/rules-of-hooks
@@ -96,7 +97,9 @@ function body() {
 
   return (
     <>
-      <Button type="danger" onClick={() => toEdi()}>新增类型</Button>
+      <AuthButton name="admin.tdBuildingType.post" noRight={null}>
+        <Button type="danger" onClick={() => toEdi()}>新增类型</Button>
+      </AuthButton>
       <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} />
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

src/pages/customer/customerlist/index.jsx

@@ -10,6 +10,7 @@ import Attribution from './components/attribution'
 import IntegralRecord from './components/integralRecord'
 import ChangeStatus from './components/changeStatus'
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import AuthButton from '@/components/AuthButton';
 
 
 const { Option } = Select;
@@ -191,13 +192,19 @@ function body(props) {
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => (
         <>
-          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showStatus(record)}>变更状态</Button>
-          &nbsp;&nbsp;
-          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
-          <br />
-          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => toCustomerDateil(record)}>查看详情</Button>
-          &nbsp;&nbsp;
-          <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
+          <AuthButton name="admin.customer.recommend.edit.id.put" noRight={null}>
+            <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showStatus(record)}>变更状态</Button>
+            &nbsp;&nbsp;
+            <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showGM(record)}>调整归属</Button>
+          </AuthButton>
+            <br />
+          <AuthButton name="admin.customer.recommend.get" noRight={null}>
+            <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}>
+            <Button className={customerType === 'private' ? Styles.text : Styles.displayS} type="link" onClick={() => showRecord(record)}>积分记录</Button>
+          </AuthButton>
         </>
       ),
     },
@@ -247,17 +254,21 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" >
-            查询
-          </Button>
+          <AuthButton name="admin.customer.recommend.get" noRight={null}>
+            <Button type="primary" htmlType="submit" >
+              查询
+            </Button>
+          </AuthButton>
         </Form.Item>
       </Form>
 
       <div style={{ marginTop: '20px', marginBottom: '20px' }}>
-        <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
-          <Radio.Button value="private">私客</Radio.Button>
-          <Radio.Button value="public">公客</Radio.Button>
-        </Radio.Group>
+        <AuthButton name="admin.customer.recommend.get" noRight={null}>
+          <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
+            <Radio.Button value="private">私客</Radio.Button>
+            <Radio.Button value="public">公客</Radio.Button>
+          </Radio.Group>
+        </AuthButton>
       </div>
       <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
 

src/pages/customer/independentList/index.jsx

@@ -5,6 +5,7 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
 
 
 const { Option } = Select;
@@ -375,9 +376,13 @@ function body(props) {
           {
             <>
               {/* <sapn style={{ color: 'rgba(239,39,58,1)' }}>查看详细</sapn> */}
-              <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => Invite(record)}>邀请经纪人</a>
+              <AuthButton name="admin.channel.InviteClientsList.get" noRight={null}>
+                <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => Invite(record)}>邀请经纪人</a>
+              </AuthButton>
               &nbsp;&nbsp;&nbsp;&nbsp;
-              <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => gM(record)}>推荐客户</a>
+              <AuthButton name="admin.customer.recommend.id.get" noRight={null}>
+                <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => gM(record)}>推荐客户</a>
+              </AuthButton>
             </>
           }
         </>
@@ -405,9 +410,11 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
-            搜索
-          </Button>
+          <AuthButton name="admin.customer.agents.get" noRight={null}>
+            <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
+              搜索
+            </Button>
+          </AuthButton>
         </Form.Item>
       </Form>
 

src/pages/customer/recommendCustomer/index.jsx

@@ -5,6 +5,7 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
+import AuthButton from '@/components/AuthButton';
 
 
 const { Option } = Select;
@@ -130,7 +131,9 @@ function body(props) {
       render: (_, record) => (
         <>
           {
-            record.verifyStatus === 0 ? <sapn style={{ color: 'rgba(239,39,58,1)' }} onClick={() => toAudit(record.customerId)}>审核</sapn> : ''
+            <AuthButton name="admin.customer.recommend.verify.id.put" noRight={null}>
+              {record.verifyStatus === 0 ? <sapn style={{ color: 'rgba(239,39,58,1)' }} onClick={() => toAudit(record.customerId)}>审核</sapn> : ''}
+            </AuthButton>
           }
         </>
       ),
@@ -176,9 +179,11 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
-            搜索
-          </Button>
+          <AuthButton name="admin.customer.recommend.recommender.get" noRight={null}>
+            <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
+              搜索
+            </Button>
+          </AuthButton>
         </Form.Item>
       </Form>
 

src/pages/customer/report/index.jsx

@@ -5,6 +5,7 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
 import BuildSelect from '../../../components/SelectButton/BuildSelect'
+import AuthButton from '@/components/AuthButton';
 
 
 const { Option } = Select;
@@ -153,9 +154,11 @@ function body(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit">
-            搜索
-          </Button>
+          <AuthButton name="admin.customer.recommend.report.get" noRight={null}>
+            <Button type="primary" htmlType="submit">
+              搜索
+            </Button>
+          </AuthButton>
         </Form.Item>
       </Form>
       <Table style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />

src/pages/integralMall/GoodsList.jsx

@@ -6,6 +6,7 @@ import router from 'umi/router';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
 import request from '../../utils/request'
+import AuthButton from '@/components/AuthButton';
 
 const { Option } = Select;
 
@@ -123,8 +124,21 @@ function header(props) {
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x, row) => <><span style={{ color: '#EF273A', marginRight: '20px' }} onClick={changeGoodsStatus(row)}>{row.status == 1 ? '下架' : '上架'}<Icon type="shopping-cart" className={styles.shoppingCart} />
-                            </span><span style={{ color: '#FF925C' }} onClick={toEditGoods(row.goodsId)}>编辑<Icon type="form" className={styles.edit} /></span></>,
+      render: (x, row) => (
+        <>
+          <AuthButton name="admin.taGoods.change.put" noRight={null}>
+            <span style={{ color: '#EF273A', marginRight: '20px' }} onClick={changeGoodsStatus(row)}>
+              {row.status == 1 ? '下架' : '上架'}
+              {<Icon type="shopping-cart" className={styles.shoppingCart} />}
+            </span>
+          </AuthButton>
+          <AuthButton name="admin.taGoods.put" noRight={null}>
+            <span style={{ color: '#FF925C' }} onClick={toEditGoods(row.goodsId)}>
+              编辑<Icon type="form" className={styles.edit} />
+            </span>
+          </AuthButton>
+        </>
+      ),
     },
   ];
 
@@ -171,9 +185,11 @@ function header(props) {
           )}
         </Form.Item>
         <Form.Item>
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
-            搜索
-          </Button>
+          <AuthButton name="admin.taGoods.get" noRight={null}>
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
+              搜索
+            </Button>
+          </AuthButton>
         </Form.Item>
       </Form>
       <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>

src/pages/integralMall/achieve.jsx

@@ -6,7 +6,8 @@ import router from 'umi/router';
 import moment from 'moment';
 import BuildSelect from '../../components/SelectButton/BuildSelect'
 import apis from '../../services/apis';
-import request from '../../utils/request'
+import request from '../../utils/request';
+import AuthButton from '@/components/AuthButton';
 
 const { TabPane } = Tabs;
 
@@ -89,8 +90,20 @@ const columns = [
       dataIndex: 'handle',
       key: 'handle',
       align: 'center',
-      render: (x,row) => <><span style={{ color: '#EF273A', marginRight: '20px' }} onClick={changeStatus(row)}>{row.status == 1?'停用':'启用'}<Icon type="stop" className={styles.shoppingCart} /></span>
-                      <span style={{ color: '#FF925C' }}>{row.buildingId != null ? '编辑'`${<Icon type="form" className={styles.edit} />}` : ''}</span></>,
+      render: (x,row) => (
+        <>
+          <AuthButton name="admin.tdPointsRules.change.put" noRight={null}>
+            <span style={{ color: '#EF273A', marginRight: '20px' }} onClick={changeStatus(row)}>
+              {row.status == 1?'停用':'启用'}<Icon type="stop" className={styles.shoppingCart} />
+            </span>
+          </AuthButton>
+          <AuthButton name="admin.tdPointsRules.put" noRight={null}>
+            <span style={{ color: '#FF925C' }}>
+              {row.buildingId != null ? '编辑'`${<Icon type="form" className={styles.edit} />}` : ''}
+            </span>
+          </AuthButton>
+        </>
+      ),
     },
   ];