周立森 5 years ago
parent
commit
840d0f8983
31 changed files with 71 additions and 72 deletions
  1. 9
    0
      src/global.less
  2. 1
    1
      src/pages/activity/ActivityList.jsx
  3. 1
    1
      src/pages/activity/SignList.jsx
  4. 1
    1
      src/pages/building/list/add/components/imageSet.jsx
  5. 2
    2
      src/pages/building/type/index.jsx
  6. 1
    1
      src/pages/carouselFigure/advertisingList.jsx
  7. 1
    1
      src/pages/carouselFigure/carouselFigureList.jsx
  8. 1
    1
      src/pages/channel/InviteClients.jsx
  9. 1
    1
      src/pages/channel/brokerList.jsx
  10. 1
    1
      src/pages/channel/channelList.jsx
  11. 1
    1
      src/pages/channel/recommendClients.jsx
  12. 1
    1
      src/pages/customer/customerlist/components/attribution.jsx
  13. 1
    1
      src/pages/customer/customerlist/components/integralRecord.jsx
  14. 1
    1
      src/pages/customer/customerlist/customerDetail.jsx
  15. 6
    6
      src/pages/customer/customerlist/index.jsx
  16. 2
    2
      src/pages/customer/drift/index.jsx
  17. 6
    6
      src/pages/customer/independentList/index.jsx
  18. 6
    6
      src/pages/customer/recommendCustomer/index.jsx
  19. 2
    2
      src/pages/customer/report/index.jsx
  20. 1
    1
      src/pages/indexEcharts/components/IntentionalCustomers.jsx
  21. 2
    2
      src/pages/indexEcharts/components/UserBehavior.jsx
  22. 1
    1
      src/pages/integralMall/GoodsList.jsx
  23. 2
    2
      src/pages/integralMall/achieve.jsx
  24. 1
    1
      src/pages/integralMall/exchangeRecords.jsx
  25. 1
    1
      src/pages/integralMall/verifyList.jsx
  26. 2
    2
      src/pages/news/type/NewsType.jsx
  27. 8
    23
      src/pages/news/type/editNews.jsx
  28. 1
    1
      src/pages/staff/list/RoleList.jsx
  29. 1
    1
      src/pages/system/housingPolicy.jsx
  30. 1
    1
      src/pages/system/messageList.jsx
  31. 5
    0
      src/services/apis.js

+ 9
- 0
src/global.less View File

@@ -89,6 +89,15 @@ ol {
89 89
   padding: 0 0 0 10px;
90 90
   align-items: center;
91 91
 }
92
+.ant-radio-button-wrapper{
93
+  color: #FF7E48;
94
+  border: 1px solid #FF7E48;
95
+}
96
+.ant-radio-group-solid .ant-radio-button-wrapper-checked:not(.ant-radio-button-wrapper-disabled) {
97
+  color: #fff;
98
+  background: #FF7E48;
99
+  border-color: #FF7E48;
100
+}
92 101
 .ant-row.ant-form-item .ant-form-item-label.ant-col-sm-3{
93 102
   min-width: 100px;
94 103
 }

+ 1
- 1
src/pages/activity/ActivityList.jsx View File

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

+ 1
- 1
src/pages/activity/SignList.jsx View File

@@ -69,7 +69,7 @@ const header = (props) => {
69 69
   return (
70 70
     <>
71 71
       <Button type="primary" className={styles.addBtn} onClick={toActivityList}>返回</Button>
72
-      <Table dataSource={data.list.data} columns={columns} pagination={false} />
72
+      <Table dataSource={data.list.data} columns={columns} pagination={false} rowKey="activity"/>
73 73
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
74 74
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
75 75
       </div>

+ 1
- 1
src/pages/building/list/add/components/imageSet.jsx View File

@@ -137,7 +137,7 @@ function imageSet(props) {
137 137
   return (
138 138
     <>
139 139
       <Button type="primary" onClick={() => showEdi()}>新增户型库</Button>
140
-      <Table dataSource={data} columns={columns} pagination={false} />
140
+      <Table dataSource={data} columns={columns} pagination={false} rowKey="imageSet" />
141 141
 
142 142
       {/* 编辑页 */}
143 143
       {/*  onSuccess是子组件传递事件信息  */}

+ 2
- 2
src/pages/building/type/index.jsx View File

@@ -27,7 +27,7 @@ function body() {
27 27
       title: '创建时间',
28 28
       dataIndex: 'createDate',
29 29
       key: 'createDate',
30
-      render: (_, record) => <sapn>{moment(record.createDate).format('YYYY-MM-DD')}</sapn>,
30
+      render: (_, record) => <span>{moment(record.createDate).format('YYYY-MM-DD')}</span>,
31 31
     },
32 32
     {
33 33
       title: '操作',
@@ -109,7 +109,7 @@ function body() {
109 109
       <AuthButton name="admin.tdBuildingType.post" noRight={null}>
110 110
         <Button type="danger" onClick={() => toEdi()}>新增类型</Button>
111 111
       </AuthButton>
112
-      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} />
112
+      <Table style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="buildingType"/>
113 113
       {/* 分页 */}
114 114
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
115 115
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={onChange} />

+ 1
- 1
src/pages/carouselFigure/advertisingList.jsx View File

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

+ 1
- 1
src/pages/carouselFigure/carouselFigureList.jsx View File

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

+ 1
- 1
src/pages/channel/InviteClients.jsx View File

@@ -79,7 +79,7 @@ const header = props => {
79 79
     <>
80 80
       <div className={channels.searchBox}>
81 81
       </div>
82
-      <Table dataSource={data.records} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
82
+      <Table dataSource={data.records} rowKey="InviteClient" columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
83 83
   </>
84 84
   )
85 85
 }

+ 1
- 1
src/pages/channel/brokerList.jsx View File

@@ -157,7 +157,7 @@ return (
157 157
       {/* <Button onClick={() => refurbishList() }>重置</Button> */}
158 158
     </div>
159 159
     </div>
160
-    <Table style={{marginTop:'40px'}} dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
160
+    <Table style={{marginTop:'40px'}} dataSource={data.list} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} rowKey="brokerList"/>
161 161
   </>
162 162
 )
163 163
 }

+ 1
- 1
src/pages/channel/channelList.jsx View File

@@ -192,7 +192,7 @@ const header = props => {
192 192
       <AuthButton name="admin.channel.post" noRight={null}>
193 193
         <Button type="danger" onClick={toAdd} className={channels.about} >新增</Button>
194 194
       </AuthButton>
195
-      <Table dataSource={data.result.records} columns={columns} pagination={{ pageSize: 10, total: data.result.total, onChange }} />
195
+      <Table dataSource={data.result.records} columns={columns} rowKey="channelList" pagination={{ pageSize: 10, total: data.result.total, onChange }} />
196 196
     </>
197 197
   )
198 198
 }

+ 1
- 1
src/pages/channel/recommendClients.jsx View File

@@ -131,7 +131,7 @@ const header = props => {
131 131
     }
132 132
 return (
133 133
   <>
134
-  <Table dataSource={data.records} columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
134
+  <Table dataSource={data.records} rowKey="recommendClist" columns={columns} pagination={{ pageSize: 10, total: data.total, onChange }} />
135 135
   </>
136 136
 )
137 137
 }

+ 1
- 1
src/pages/customer/customerlist/components/attribution.jsx View File

@@ -138,7 +138,7 @@ class ModalAttribution extends React.Component {
138 138
             // onOk={() => this.handleOk()}
139 139
             onCancel={(e) => this.handleCancel(e)}
140 140
           >
141
-            <Table dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
141
+            <Table rowKey="attribution" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
142 142
           </Modal>
143 143
       </>
144 144
     );

+ 1
- 1
src/pages/customer/customerlist/components/integralRecord.jsx View File

@@ -140,7 +140,7 @@ class ModalIntegralRecord extends React.Component {
140 140
             // onOk={() => this.handleOk()}
141 141
             onCancel={(e) => this.handleCancel(e)}
142 142
           >
143
-            <Table dataSource={this.state.dataSource.result.records} columns={columns} pagination={{ total: this.state.dataSource.result.total, onChange: e => this.onChange(e) }} />
143
+            <Table dataSource={this.state.dataSource.result.records} rowKey="integralrecord" columns={columns} pagination={{ total: this.state.dataSource.result.total, onChange: e => this.onChange(e) }} />
144 144
           </Modal>
145 145
       </>
146 146
     );

+ 1
- 1
src/pages/customer/customerlist/customerDetail.jsx View File

@@ -103,7 +103,7 @@ function header(props) {
103 103
       </div>
104 104
       <div className={styles.recordBox}>
105 105
         <p className={styles.tableName}>访问记录</p>
106
-        <Table dataSource={data.visitRecords} columns={columns} pagination={false} />
106
+        <Table dataSource={data.visitRecords} columns={columns} pagination={false} rowKey="customerDetail" />
107 107
       </div>
108 108
 
109 109
     </>

+ 6
- 6
src/pages/customer/customerlist/index.jsx View File

@@ -151,7 +151,7 @@ function body(props) {
151 151
       dataIndex: 'name',
152 152
       key: 'name',
153 153
       // eslint-disable-next-line no-nested-ternary
154
-      render: (_, record) => <><sapn>{customerType === 'private' ? record.name : record.nickname}</sapn></>,
154
+      render: (_, record) => <><span>{customerType === 'private' ? record.name : record.nickname}</span></>,
155 155
     },
156 156
     {
157 157
       title: '电话',
@@ -163,7 +163,7 @@ function body(props) {
163 163
       dataIndex: 'sex',
164 164
       key: 'sex',
165 165
       // eslint-disable-next-line no-nested-ternary
166
-      render: (_, record) => <><sapn>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</sapn></>,
166
+      render: (_, record) => <><span>{record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知'}</span></>,
167 167
     },
168 168
     {
169 169
       title: '置业顾问',
@@ -172,9 +172,9 @@ function body(props) {
172 172
       // eslint-disable-next-line no-nested-ternary
173 173
       render: (_, record) => (
174 174
         <>
175
-          <sapn>{record.consultantName}</sapn>
175
+          <span>{record.consultantName}</span>
176 176
           <br />
177
-          <sapn>{record.consultTel}</sapn>
177
+          <span>{record.consultTel}</span>
178 178
         </>
179 179
       ),
180 180
     },
@@ -183,7 +183,7 @@ function body(props) {
183 183
       dataIndex: 'reportRecommendStatus',
184 184
       key: 'reportRecommendStatus',
185 185
       // eslint-disable-next-line no-nested-ternary
186
-      render: (_, record) => <><sapn>{record.reportRecommendStatus === 0 ? '为报备' : record.reportRecommendStatus === 1 ? '报备' : record.reportRecommendStatus === 2 ? '推荐' : ''}</sapn></>,
186
+      render: (_, record) => <><span>{record.reportRecommendStatus === 0 ? '为报备' : record.reportRecommendStatus === 1 ? '报备' : record.reportRecommendStatus === 2 ? '推荐' : ''}</span></>,
187 187
     },
188 188
     {
189 189
       title: '操作',
@@ -268,7 +268,7 @@ function body(props) {
268 268
           </Radio.Group>
269 269
         </AuthButton>
270 270
       </div>
271
-      <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
271
+      <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" />
272 272
 
273 273
       {/* 调整归属 */}
274 274
       <Attribution visibleData={gVisibleData} />

+ 2
- 2
src/pages/customer/drift/index.jsx View File

@@ -54,13 +54,13 @@ function costomerDrift() {
54 54
       dataIndex: 'gender',
55 55
       key: 'gender',
56 56
       // eslint-disable-next-line no-nested-ternary
57
-      render: (_, record) => <><sapn>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</sapn></>,
57
+      render: (_, record) => <><span>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</span></>,
58 58
     },
59 59
   ];
60 60
 
61 61
   return (
62 62
     // eslint-disable-next-line max-len
63
-    <Table dataSource={dataSources.records} columns={columns} pagination={{ total: dataSources.total, onChange }} />
63
+    <Table dataSource={dataSources.records} rowKey="drift" columns={columns} pagination={{ total: dataSources.total, onChange }} />
64 64
   )
65 65
 }
66 66
 

+ 6
- 6
src/pages/customer/independentList/index.jsx View File

@@ -132,7 +132,7 @@ class ModalTable extends React.Component {
132 132
             // onOk={() => this.handleOk()}
133 133
             onCancel={(e) => this.handleCancel(e)}
134 134
           >
135
-            <Table dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
135
+            <Table rowKey="independentList" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
136 136
           </Modal>
137 137
       </>
138 138
     );
@@ -243,7 +243,7 @@ class InviteTable extends React.Component {
243 243
             // onOk={() => this.handleOk()}
244 244
             onCancel={(e) => this.handleCancel(e)}
245 245
           >
246
-            <Table dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
246
+            <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
247 247
           </Modal>
248 248
       </>
249 249
     );
@@ -374,13 +374,13 @@ function body(props) {
374 374
       dataIndex: 'gender',
375 375
       key: 'gender',
376 376
       // eslint-disable-next-line no-nested-ternary
377
-      render: (_, record) => <><sapn>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</sapn></>,
377
+      render: (_, record) => <><span>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</span></>,
378 378
     },
379 379
     {
380 380
       title: '类型',
381 381
       dataIndex: 'personType',
382 382
       key: 'personType',
383
-      render: (_, record) => <><sapn>{ record.channelName !== null ? '渠道经纪人' : '独立经纪人' }</sapn></>,
383
+      render: (_, record) => <><span>{ record.channelName !== null ? '渠道经纪人' : '独立经纪人' }</span></>,
384 384
     },
385 385
     {
386 386
       title: '所属渠道',
@@ -395,7 +395,7 @@ function body(props) {
395 395
         <>
396 396
           {
397 397
             <>
398
-              {/* <sapn style={{ color: 'rgba(239,39,58,1)' }}>查看详细</sapn> */}
398
+              {/* <span style={{ color: 'rgba(239,39,58,1)' }}>查看详细</span> */}
399 399
               <AuthButton name="admin.channel.InviteClientsList.get" noRight={null}>
400 400
                 <a style={{ color: 'rgba(239,39,58,1)' }} onClick={() => Invite(record)}>邀请经纪人</a>
401 401
               </AuthButton>
@@ -438,7 +438,7 @@ function body(props) {
438 438
       <Button type="primary" onClick={() => exportIndependen()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
439 439
         导出数据
440 440
       </Button>
441
-      <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
441
+      <Table rowKey="independentIndex" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
442 442
             {/* 调整归属 */}
443 443
         <ModalTable visibleData={gVisibleData} />
444 444
         <InviteTable visibleData={gInviteData} />

+ 6
- 6
src/pages/customer/recommendCustomer/index.jsx View File

@@ -128,7 +128,7 @@ function body(props) {
128 128
       dataIndex: 'sex',
129 129
       key: 'sex',
130 130
       // eslint-disable-next-line no-nested-ternary
131
-      render: (_, record) => <><sapn>{ record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知' }</sapn></>,
131
+      render: (_, record) => <><span>{ record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知' }</span></>,
132 132
     },
133 133
     {
134 134
       title: '意向项目',
@@ -139,19 +139,19 @@ function body(props) {
139 139
       title: '推荐人',
140 140
       dataIndex: 'consultantName',
141 141
       key: 'consultantName',
142
-      render: (_, record) => <><sapn>{ record.recommendName + " " + record.recommendTel }</sapn></>,
142
+      render: (_, record) => <><span>{ record.recommendName + " " + record.recommendTel }</span></>,
143 143
     },
144 144
     {
145 145
       title: '推荐时间',
146 146
       dataIndex: 'createDate',
147 147
       key: 'createDate',
148
-      render: (_, record) => <><sapn>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</sapn></>,
148
+      render: (_, record) => <><span>{ record.createDate && moment(record.createDate).format('YYYY-MM-DD') }</span></>,
149 149
     },
150 150
     {
151 151
       title: '状态',
152 152
       dataIndex: 'verifyStatus',
153 153
       key: 'verifyStatus',
154
-      render: (_, record) => <><sapn>{ record.verifyStatus === 0 ? '未通过': record.verifyStatus === 1 ? '已通过' : record.verifyStatus === 2 ? '已驳回' : '' }</sapn></>,
154
+      render: (_, record) => <><span>{ record.verifyStatus === 0 ? '未通过': record.verifyStatus === 1 ? '已通过' : record.verifyStatus === 2 ? '已驳回' : '' }</span></>,
155 155
     },
156 156
     {
157 157
       title: '操作',
@@ -161,7 +161,7 @@ function body(props) {
161 161
         <>
162 162
           {
163 163
             <AuthButton name="admin.customer.recommend.verify.id.put" noRight={null}>
164
-              {record.verifyStatus === 0 ? <sapn style={{ color: 'rgba(239,39,58,1)' }} onClick={() => toAudit(record.customerId)}>审核</sapn> : ''}
164
+              {record.verifyStatus === 0 ? <span style={{ color: 'rgba(239,39,58,1)' }} onClick={() => toAudit(record.customerId)}>审核</span> : ''}
165 165
             </AuthButton>
166 166
           }
167 167
         </>
@@ -216,7 +216,7 @@ function body(props) {
216 216
       <Button type="primary" onClick={() => exportRecommendCustomer()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
217 217
         导出数据
218 218
       </Button>
219
-      <Table dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
219
+      <Table rowKey="recommendCustomer" dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
220 220
     </>
221 221
   );
222 222
 }

+ 2
- 2
src/pages/customer/report/index.jsx View File

@@ -112,7 +112,7 @@ function body(props) {
112 112
       dataIndex: 'sex',
113 113
       key: 'sex',
114 114
       // eslint-disable-next-line no-nested-ternary
115
-      render: (_, record) => <><sapn>{ record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知' }</sapn></>,
115
+      render: (_, record) => <><span>{ record.sex === 1 ? '男' : record.sex === 2 ? '女' : '未知' }</span></>,
116 116
     },
117 117
     {
118 118
       title: '意向项目',
@@ -182,7 +182,7 @@ function body(props) {
182 182
       <Button type="primary" onClick={() => exportReport()} className={Styles.SubmitButton} style={{ marginTop: '5px' }}>
183 183
         导出数据
184 184
       </Button>
185
-      <Table style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
185
+      <Table rowKey="report" style={{marginTop:'40px'}} dataSource={dataSource.records} columns={columns} pagination={{ total: dataSource.total, onChange }} />
186 186
     </>
187 187
   );
188 188
 }

+ 1
- 1
src/pages/indexEcharts/components/IntentionalCustomers.jsx View File

@@ -86,7 +86,7 @@ const UserBehavior = (props) => {
86 86
 
87 87
         <BuildSelect slot='action' onChange={(e => handleBuildingChange(e))}></BuildSelect>
88 88
 
89
-        <Table dataSource={data.records} columns={columns} style={{marginTop:'15px'}} pagination={false} scroll={{ y: 500 }} />
89
+        <Table rowKey="IntentionalCustomers" dataSource={data.records} columns={columns} style={{marginTop:'15px'}} pagination={false} scroll={{ y: 500 }} />
90 90
 
91 91
       </div>
92 92
 

+ 2
- 2
src/pages/indexEcharts/components/UserBehavior.jsx View File

@@ -91,7 +91,7 @@ class EventcoModal extends React.Component {
91 91
           onCancel={() => this.handleCancel()}
92 92
           footer={null}
93 93
         >
94
-         <Table dataSource={this.state.eventList} columns={eventcolumns} pagination={false} rowKey="eventall" scroll={{ y: 400 }} />
94
+         <Table rowKey="UserBehavior" dataSource={this.state.eventList} columns={eventcolumns} pagination={false} rowKey="eventall" scroll={{ y: 400 }} />
95 95
         </Modal>
96 96
       </>
97 97
     )
@@ -269,7 +269,7 @@ const UserBehavior = props => {
269 269
         </div>
270 270
         <EChart onClick={() => router.push('/indexEcharts/userBehavior')} options={options} style={style} />
271 271
         {props.tableShow &&
272
-          <Table dataSource={recordList} columns={columns} pagination={false} rowKey="userbehavior" scroll={{ y: 500 }} />
272
+          <Table rowKey="UserBehaviorTwo" dataSource={recordList} columns={columns} pagination={false} rowKey="userbehavior" scroll={{ y: 500 }} />
273 273
         }
274 274
       </div>
275 275
       <EventcoModal visibleData={visibleData} onSuccess={() => onSuccess()} />

+ 1
- 1
src/pages/integralMall/GoodsList.jsx View File

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

+ 2
- 2
src/pages/integralMall/achieve.jsx View File

@@ -112,7 +112,7 @@ const columns = [
112 112
     <>
113 113
       <Tabs onChange={callback} type="card">
114 114
         <TabPane tab="平台积分" key="platform">
115
-          <Table style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
115
+          <Table rowKey="achieve" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
116 116
           <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
117 117
             <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
118 118
           </div>
@@ -131,7 +131,7 @@ const columns = [
131 131
               </Button>
132 132
             </Form.Item>
133 133
           </Form>
134
-          <Table style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
134
+          <Table rowKey="achie" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false}/>
135 135
           <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
136 136
             <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
137 137
           </div>

+ 1
- 1
src/pages/integralMall/exchangeRecords.jsx View File

@@ -187,7 +187,7 @@ function record(props) {
187 187
           </Form.Item>
188 188
         </div>
189 189
       </Form>
190
-      <Table style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />
190
+      <Table rowKey="exchangeRecords" style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />
191 191
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
192 192
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
193 193
       </div>

+ 1
- 1
src/pages/integralMall/verifyList.jsx View File

@@ -108,7 +108,7 @@ const header = (props) => {
108 108
   return (
109 109
     <>
110 110
       <Button type="primary" className={styles.addBtn} onClick={toBack}>返回</Button>
111
-      <Table dataSource={data.records} columns={columns} pagination={false} />
111
+      <Table rowKey="verifyList" dataSource={data.records} columns={columns} pagination={false} />
112 112
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
113 113
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
114 114
       </div>

+ 2
- 2
src/pages/news/type/NewsType.jsx View File

@@ -110,7 +110,7 @@ function header(props) {
110 110
             </span>
111 111
           </AuthButton>
112 112
         </>
113
-      )
113
+      ),
114 114
     },
115 115
   ];
116 116
 
@@ -131,7 +131,7 @@ function header(props) {
131 131
       <AuthButton name="admin.taNewsType.post" noRight={null}>
132 132
         <Button type="primary" className={styles.addBtn} onClick={toEditNews()}>新增</Button>
133 133
       </AuthButton>
134
-      <Table dataSource={data.records} columns={columns} pagination={false} />
134
+      <Table rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
135 135
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
136 136
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
137 137
       </div>

+ 8
- 23
src/pages/news/type/editNews.jsx View File

@@ -22,18 +22,13 @@ const header = props => {
22 22
 
23 23
   // 查询列表
24 24
   const getNewsData = (newsId) => {
25
-    request({ ...apis.newsType.get, urlData: { id: newsId },}).then((data) => {
26
-      cancelPage();
27
-    }).catch((err) => {
28
-      message.info(err.msg || err.message)
29
-    })
30
-
31 25
     request({
32
-        url: '/api/admin/taNewsType/' + newsId,
33
-        method: 'GET',
26
+        ...apis.newsType.get,
27
+        urlData: { id: newsId }
34 28
     }).then((data) => {
35
-        console.log(data)
36 29
         setNewsData(data)
30
+    }).catch((err) => {
31
+      message.error(err.msg || err.message)
37 32
     })
38 33
   }
39 34
   }
@@ -69,27 +64,17 @@ const header = props => {
69 64
   const handleSubmit = (values) => {
70 65
     if(newsId){
71 66
         values.newsTypeId = newsId
72
-        request({ ...apis.newsType.put, urlData: { id: newsId },}).then((data) => {
67
+        request({ ...apis.newsType.put, urlData: { id: newsId }, data: { ...values }}).then((data) => {
73 68
           cancelPage();
74 69
         }).catch((err) => {
75
-          message.info(err.msg || err.message)
70
+          message.error(err.msg || err.message)
76 71
         })
77 72
       }else{
78
-        request({ ...apis.newsType.post, data: { values },}).then((data) => {
73
+        request({ ...apis.newsType.post, data: { ...values } }).then((data) => {
79 74
           cancelPage();
80 75
         }).catch((err) => {
81
-          message.info(err.msg || err.message)
76
+          message.error(err.msg || err.message)
82 77
         })
83
-
84
-      // request({
85
-      //   url: '/api/admin/taNewsType',
86
-      //   method: 'POST',
87
-      //   data: values,
88
-      // }).then((data) => {
89
-      //   cancelPage()
90
-      // }).catch((err) => {
91
-      //   message.info(err.msg || err.message)
92
-      // })
93 78
       }
94 79
   }
95 80
 

+ 1
- 1
src/pages/staff/list/RoleList.jsx View File

@@ -126,7 +126,7 @@ return (
126 126
       <Button type="danger" className={styles.addBtn} onClick={addRole}>新增</Button>
127 127
       <div className={Styles.roletext}>
128 128
 
129
-        <Table dataSource={data.records} columns={columns} />
129
+        <Table rowKey="roleList" dataSource={data.records} columns={columns} />
130 130
       </div>
131 131
     </>
132 132
 

+ 1
- 1
src/pages/system/housingPolicy.jsx View File

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

+ 1
- 1
src/pages/system/messageList.jsx View File

@@ -60,7 +60,7 @@ const header = (props) => {
60 60
   return (
61 61
 
62 62
     <>
63
-      <Table dataSource={data.records} columns={columns} pagination={false}/>
63
+      <Table rowKey="messageList" dataSource={data.records} columns={columns} pagination={false}/>
64 64
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
65 65
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} />
66 66
       </div>

+ 5
- 0
src/services/apis.js View File

@@ -273,6 +273,11 @@ export default {
273 273
       url: `${prefix}/selectUserResource`,
274 274
       action: 'userStatistics',
275 275
     },
276
+    list:{
277
+      method:'Get',
278
+      url: `${prefix}/indexStatistical`,
279
+      action:'select',
280
+    },
276 281
     userBehavior: {
277 282
       summary: {
278 283
         method: 'GET',