123

src/global.less

   padding: 0 0 0 10px;
   align-items: center;
 }
+.ant-radio-button-wrapper{
+  color: #FF7E48;
+  border: 1px solid #FF7E48;
+}
+.ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
+  color: #fff;
+  background: #FF7E48;
+  border-color: #FF7E48;
+}
 .ant-row.ant-form-item .ant-form-item-label.ant-col-sm-3{
   min-width: 100px;
 }

src/pages/activity/ActivityList.jsx

       <AuthButton name="admin.buildingDynamic.add.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.list} columns={columns} pagination={false}/>
+      <Table dataSource={data.list} columns={columns} pagination={false} rowKey="activityList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
       </div>

src/pages/activity/SignList.jsx

   return (
     <>
       <Button type="primary" className={styles.addBtn} onClick={toActivityList}>返回</Button>
-      <Table dataSource={data.list.data} columns={columns} pagination={false} />
+      <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} />
       </div>

src/pages/building/list/add/components/imageSet.jsx

   return (
     <>
       <Button type="primary" onClick={() => showEdi()}>新增户型库</Button>
-      <Table dataSource={data} columns={columns} pagination={false} />
+      <Table dataSource={data} columns={columns} pagination={false} rowKey="imageSet" />
 
       {/* 编辑页 */}
       {/*  onSuccess是子组件传递事件信息  */}

src/pages/building/type/index.jsx

       title: '创建时间',
       dataIndex: 'createDate',
       key: 'createDate',
-      render: (_, record) => <sapn>{moment(record.createDate).format('YYYY-MM-DD')}</sapn>,
+      render: (_, record) => <span>{moment(record.createDate).format('YYYY-MM-DD')}</span>,
     },
     {
       title: '操作',
       <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} />
+      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="buildingType"/>
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={onChange} />

src/pages/carouselFigure/advertisingList.jsx

       <AuthButton name="admin.extendContent.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEdit()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.records} columns={columns} pagination={false}/>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="advertisingList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
       </div>

src/pages/carouselFigure/carouselFigureList.jsx

       <AuthButton name="admin.extendContent.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditCarouse()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.records} columns={columns} pagination={false}/>
+      <Table dataSource={data.records} columns={columns} pagination={false} rowKey="carouseFigureList"/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
       </div>

src/pages/channel/InviteClients.jsx

     <>
       <div className={channels.searchBox}>
       </div>
-      <Table dataSource={data.records} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
+      <Table dataSource={data.records} rowKey="InviteClient" columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
   </>
   )
 }

src/pages/channel/brokerList.jsx

       {/* <Button onClick={() => refurbishList() }>重置</Button> */}
     </div>
     </div>
-    <Table style={{marginTop:'40px'}} dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
+    <Table style={{marginTop:'40px'}} dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} rowKey="brokerList"/>
   </>
 )
 }

src/pages/channel/channelList.jsx

       <AuthButton name="admin.channel.post" noRight={null}>
         <Button type="danger" onClick={toAdd} className={channels.about} >新增</Button>
       </AuthButton>
-      <Table dataSource={data.result.records} columns={columns} pagination={{ pageSize: 10, total: data.result.total, onChange }} />
+      <Table dataSource={data.result.records} columns={columns} rowKey="channelList" pagination={{ pageSize: 10, total: data.result.total, onChange }} />
     </>
   )
 }

src/pages/channel/recommendClients.jsx

     }
 return (
   <>
-  <Table dataSource={data.records} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
+  <Table dataSource={data.records} rowKey="recommendClist" columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
   </>
 )
 }

src/pages/customer/customerlist/components/attribution.jsx

             // onOk={() => this.handleOk()}
             onCancel={(e) => this.handleCancel(e)}
           >
-            <Table dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+            <Table rowKey="attribution" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
           </Modal>
       </>
     );

src/pages/customer/customerlist/components/integralRecord.jsx

             // onOk={() => this.handleOk()}
             onCancel={(e) => this.handleCancel(e)}
           >
-            <Table dataSource={this.state.dataSource.result.records} columns={columns} pagination={{ total: this.state.dataSource.result.total, onChange: e => this.onChange(e) }} />
+            <Table dataSource={this.state.dataSource.result.records} rowKey="integralrecord" columns={columns} pagination={{ total: this.state.dataSource.result.total, onChange: e => this.onChange(e) }} />
           </Modal>
       </>
     );

src/pages/customer/customerlist/customerDetail.jsx

       </div>
       <div className={styles.recordBox}>
         <p className={styles.tableName}>访问记录</p>
-        <Table dataSource={data.visitRecords} columns={columns} pagination={false} />
+        <Table dataSource={data.visitRecords} columns={columns} pagination={false} rowKey="customerDetail" />
       </div>
 
     </>

src/pages/customer/customerlist/index.jsx

       dataIndex: 'name',
       key: 'name',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><sapn>{customerType === 'private' ? record.name : record.nickname}</sapn></>,
+      render: (_, record) => <><span>{customerType === 'private' ? record.name : record.nickname}</span></>,
     },
     {
       title: '电话',
       dataIndex: 'sex',
       key: 'sex',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><sapn>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</sapn></>,
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
     },
     {
       title: '置业顾问',
       // eslint-disable-next-line no-nested-ternary
       render: (_, record) => (
         <>
-          <sapn>{record.consultantName}</sapn>
+          <span>{record.consultantName}</span>
           <br />
-          <sapn>{record.consultTel}</sapn>
+          <span>{record.consultTel}</span>
         </>
       ),
     },
       dataIndex: 'reportRecommendStatus',
       key: 'reportRecommendStatus',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><sapn>{record.reportRecommendStatus === 0 ? '为报备' : record.reportRecommendStatus === 1 ? '报备' : record.reportRecommendStatus === 2 ? '推荐' : ''}</sapn></>,
+      render: (_, record) => <><span>{record.reportRecommendStatus === 0 ? '为报备' : record.reportRecommendStatus === 1 ? '报备' : record.reportRecommendStatus === 2 ? '推荐' : ''}</span></>,
     },
     {
       title: '操作',
           </Radio.Group>
         </AuthButton>
       </div>
-      <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
+      <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" />
 
       {/* 调整归属 */}
       <Attribution visibleData={gVisibleData} />

src/pages/customer/drift/index.jsx

       dataIndex: 'gender',
       key: 'gender',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><sapn>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</sapn></>,
+      render: (_, record) => <><span>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</span></>,
     },
   ];
 
   return (
     // eslint-disable-next-line max-len
-    <Table dataSource={dataSources.records} columns={columns} pagination={{ total: dataSources.total, onChange }} />
+    <Table dataSource={dataSources.records} rowKey="drift" columns={columns} pagination={{ total: dataSources.total, onChange }} />
   )
 }
 

src/pages/customer/independentList/index.jsx

             // onOk={() => this.handleOk()}
             onCancel={(e) => this.handleCancel(e)}
           >
-            <Table dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+            <Table rowKey="independentList" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
           </Modal>
       </>
     );
             // onOk={() => this.handleOk()}
             onCancel={(e) => this.handleCancel(e)}
           >
-            <Table dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
+            <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
           </Modal>
       </>
     );
       dataIndex: 'gender',
       key: 'gender',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><sapn>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</sapn></>,
+      render: (_, record) => <><span>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</span></>,
     },
     {
       title: '类型',
       dataIndex: 'personType',
       key: 'personType',
-      render: (_, record) => <><sapn>{ record.channelName !== null ? '渠道经纪人' : '独立经纪人' }</sapn></>,
+      render: (_, record) => <><span>{ record.channelName !== null ? '渠道经纪人' : '独立经纪人' }</span></>,
     },
     {
       title: '所属渠道',
         <>
           {
             <>
-              {/* <sapn style={{ color: 'rgba(239,39,58,1)' }}>查看详细</sapn> */}
+              {/* <span style={{ color: 'rgba(239,39,58,1)' }}>查看详细</span> */}
               <AuthButton name="admin.channel.InviteClientsList.get" noRight={null}>
                 <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => Invite(record)}>邀请经纪人</a>
               </AuthButton>
       <Button type="primary" onClick={() => exportIndependen()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
         导出数据
       </Button>
-      <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
+      <Table rowKey="independentIndex" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
             {/* 调整归属 */}
         <ModalTable visibleData={gVisibleData} />
         <InviteTable visibleData={gInviteData} />

src/pages/customer/recommendCustomer/index.jsx

       dataIndex: 'sex',
       key: 'sex',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><sapn>{ record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知' }</sapn></>,
+      render: (_, record) => <><span>{ record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知' }</span></>,
     },
     {
       title: '意向项目',
       title: '推荐人',
       dataIndex: 'consultantName',
       key: 'consultantName',
-      render: (_, record) => <><sapn>{ record.recommendName + " " + record.recommendTel }</sapn></>,
+      render: (_, record) => <><span>{ record.recommendName + " " + record.recommendTel }</span></>,
     },
     {
       title: '推荐时间',
       dataIndex: 'createDate',
       key: 'createDate',
-      render: (_, record) => <><sapn>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</sapn></>,
+      render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
     },
     {
       title: '状态',
       dataIndex: 'verifyStatus',
       key: 'verifyStatus',
-      render: (_, record) => <><sapn>{ record.verifyStatus === 0 ? '未通过': record.verifyStatus === 1 ? '已通过' : record.verifyStatus === 2 ? '已驳回' : '' }</sapn></>,
+      render: (_, record) => <><span>{ record.verifyStatus === 0 ? '未通过': record.verifyStatus === 1 ? '已通过' : record.verifyStatus === 2 ? '已驳回' : '' }</span></>,
     },
     {
       title: '操作',
         <>
           {
             <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> : ''}
+              {record.verifyStatus === 0 ? <span style={{ color: 'rgba(239,39,58,1)' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
             </AuthButton>
           }
         </>
       <Button type="primary" onClick={() => exportRecommendCustomer()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
         导出数据
       </Button>
-      <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
+      <Table rowKey="recommendCustomer" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>
   );
 }

src/pages/customer/report/index.jsx

       dataIndex: 'sex',
       key: 'sex',
       // eslint-disable-next-line no-nested-ternary
-      render: (_, record) => <><sapn>{ record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知' }</sapn></>,
+      render: (_, record) => <><span>{ record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知' }</span></>,
     },
     {
       title: '意向项目',
       <Button type="primary" onClick={() => exportReport()} className={Styles.SubmitButton} style={{ marginTop: '5px' }}>
         导出数据
       </Button>
-      <Table style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
+      <Table rowKey="report" style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
     </>
   );
 }

src/pages/indexEcharts/components/IntentionalCustomers.jsx

 
         <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>
 
-        <Table dataSource={data.records} columns={columns} style={{marginTop:'15px'}} pagination={false} scroll={{ y: 500 }} />
+        <Table rowKey="IntentionalCustomers" dataSource={data.records} columns={columns} style={{marginTop:'15px'}} pagination={false} scroll={{ y: 500 }} />
 
       </div>
 

src/pages/indexEcharts/components/UserBehavior.jsx

           onCancel={() => this.handleCancel()}
           footer={null}
         >
-         <Table dataSource={this.state.eventList} columns={eventcolumns} pagination={false} rowKey="eventall" scroll={{ y: 400 }} />
+         <Table rowKey="UserBehavior" dataSource={this.state.eventList} columns={eventcolumns} pagination={false} rowKey="eventall" scroll={{ y: 400 }} />
         </Modal>
       </>
     )
         </div>
         <EChart onClick={() => router.push('/indexEcharts/userBehavior')} options={options} style={style} />
         {props.tableShow &&
-          <Table dataSource={recordList} columns={columns} pagination={false} rowKey="userbehavior" scroll={{ y: 500 }} />
+          <Table rowKey="UserBehaviorTwo" dataSource={recordList} columns={columns} pagination={false} rowKey="userbehavior" scroll={{ y: 500 }} />
         }
       </div>
       <EventcoModal visibleData={visibleData} onSuccess={() => onSuccess()} />

src/pages/integralMall/GoodsList.jsx

       <AuthButton name="admin.taGoods.add.post" noRight={null}>
         <Button type="danger" className={styles.addBtn} onClick={toEditGoods()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.records} columns={columns} pagination={false} />
+      <Table rowKey="goodsList" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
       </div>

src/pages/integralMall/achieve.jsx

     <>
       <Tabs onChange={callback} type="card">
         <TabPane tab="平台积分" key="platform">
-          <Table style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
+          <Table rowKey="achieve" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
           <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
             <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
           </div>
               </Button>
             </Form.Item>
           </Form>
-          <Table style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
+          <Table rowKey="achie" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
           <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
             <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
           </div>

src/pages/integralMall/exchangeRecords.jsx

           </Form.Item>
         </div>
       </Form>
-      <Table style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />
+      <Table rowKey="exchangeRecords" style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
       </div>

src/pages/integralMall/verifyList.jsx

   return (
     <>
       <Button type="primary" className={styles.addBtn} onClick={toBack}>返回</Button>
-      <Table dataSource={data.records} columns={columns} pagination={false} />
+      <Table rowKey="verifyList" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
       </div>

src/pages/news/type/NewsType.jsx

             </span>
           </AuthButton>
         </>
-      )
+      ),
     },
   ];
 
       <AuthButton name="admin.taNewsType.post" noRight={null}>
         <Button type="primary" className={styles.addBtn} onClick={toEditNews()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.records} columns={columns} pagination={false} />
+      <Table rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
       </div>

src/pages/news/type/editNews.jsx

 
   // 查询列表
   const getNewsData = (newsId) => {
-    request({ ...apis.newsType.get, urlData: { id: newsId },}).then((data) => {
-      cancelPage();
-    }).catch((err) => {
-      message.info(err.msg || err.message)
-    })
-
     request({
-        url: '/api/admin/taNewsType/' + newsId,
-        method: 'GET',
+        ...apis.newsType.get,
+        urlData: { id: newsId }
     }).then((data) => {
-        console.log(data)
         setNewsData(data)
+    }).catch((err) => {
+      message.error(err.msg || err.message)
     })
   }
   }
   const handleSubmit = (values) => {
     if(newsId){
         values.newsTypeId = newsId
-        request({ ...apis.newsType.put, urlData: { id: newsId },}).then((data) => {
+        request({ ...apis.newsType.put, urlData: { id: newsId }, data: { ...values }}).then((data) => {
           cancelPage();
         }).catch((err) => {
-          message.info(err.msg || err.message)
+          message.error(err.msg || err.message)
         })
       }else{
-        request({ ...apis.newsType.post, data: { values },}).then((data) => {
+        request({ ...apis.newsType.post, data: { ...values } }).then((data) => {
           cancelPage();
         }).catch((err) => {
-          message.info(err.msg || err.message)
+          message.error(err.msg || err.message)
         })
-
-      // request({
-      //   url: '/api/admin/taNewsType',
-      //   method: 'POST',
-      //   data: values,
-      // }).then((data) => {
-      //   cancelPage()
-      // }).catch((err) => {
-      //   message.info(err.msg || err.message)
-      // })
       }
   }
 

src/pages/staff/list/RoleList.jsx

       <Button type="danger" className={styles.addBtn} onClick={addRole}>新增</Button>
       <div className={Styles.roletext}>
 
-        <Table dataSource={data.records} columns={columns} />
+        <Table rowKey="roleList" dataSource={data.records} columns={columns} />
       </div>
     </>
 

src/pages/system/housingPolicy.jsx

       <AuthButton name="admin.taPolicy.post" noRight={null}>
         <Button type="primary" className={styles.addBtn} onClick={toEditPolicy()}>新增</Button>
       </AuthButton>
-      <Table dataSource={data.records} columns={columns} pagination={false}/>
+      <Table rowKey="housingPolicy" dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
       </div>

src/pages/system/messageList.jsx

   return (
 
     <>
-      <Table dataSource={data.records} columns={columns} pagination={false}/>
+      <Table rowKey="messageList" dataSource={data.records} columns={columns} pagination={false}/>
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
       </div>

src/services/apis.js

       url: `${prefix}/selectUserResource`,
       action: 'userStatistics',
     },
+    list:{
+      method:'Get',
+      url: `${prefix}/indexStatistical`,
+      action:'select',
+    },
     userBehavior: {
       summary: {
         method: 'GET',