许静 5 lat temu
rodzic
commit
88e0701940

+ 4
- 1
src/global.less Wyświetl plik

98
   background: #FF7E48;
98
   background: #FF7E48;
99
   border-color: #FF7E48;
99
   border-color: #FF7E48;
100
 }
100
 }
101
+.ant-radio-button-wrapper:not(:first-child)::before{
102
+  background: #FF7E48;
103
+}
101
 .ant-row.ant-form-item .ant-form-item-label.ant-col-sm-3{
104
 .ant-row.ant-form-item .ant-form-item-label.ant-col-sm-3{
102
   min-width: 100px;
105
   min-width: 100px;
103
 }
106
 }
105
   padding: 0;
108
   padding: 0;
106
 }
109
 }
107
 .antd-pro-pages-index-echarts-styles-pie,.antd-pro-pages-index-echarts-styles-bar{
110
 .antd-pro-pages-index-echarts-styles-pie,.antd-pro-pages-index-echarts-styles-bar{
108
-  padding: 0.1rem;
111
+  padding: 26px;
109
   margin-bottom: 25px;
112
   margin-bottom: 25px;
110
 }
113
 }
111
 .ant-breadcrumb{
114
 .ant-breadcrumb{

+ 1
- 1
src/pages/charts/CityNums.jsx Wyświetl plik

128
   }
128
   }
129
 
129
 
130
   return (
130
   return (
131
-    <div style={{ margin: ' 0 0 20px  0', width: '100%', borderRadius: '8px', boxShadow: '0px 0px 9px 1px rgba(0,0,0,0.12)', overflow: 'hidden' }}>
131
+    <div style={{ margin: ' 0 0 20px  0', width: '100%', borderRadius: '12px', boxShadow: '0px 0px 9px 1px rgba(0,0,0,0.12)', overflow: 'hidden' }}>
132
       <Echart options={options} style={{ width: '100%', height: '600px' }} ></Echart>
132
       <Echart options={options} style={{ width: '100%', height: '600px' }} ></Echart>
133
     </div>
133
     </div>
134
   )
134
   )

+ 56
- 56
src/pages/customer/independentList/index.jsx Wyświetl plik

18
   constructor(props) {
18
   constructor(props) {
19
     super(props);
19
     super(props);
20
     this.state = {
20
     this.state = {
21
-       dataSource: { records: [] },
22
-       visibleData: { visible: false, customerId: '', realtyConsultant: '' },
21
+      dataSource: { records: [] },
22
+      visibleData: { visible: false, customerId: '', realtyConsultant: '' },
23
     }
23
     }
24
   }
24
   }
25
 
25
 
69
     })
69
     })
70
   }
70
   }
71
 
71
 
72
-   // 分页
72
+  // 分页
73
   onChange(pageNum) {
73
   onChange(pageNum) {
74
     this.getList({ pageNumber: pageNum, pageSize: 5 })
74
     this.getList({ pageNumber: pageNum, pageSize: 5 })
75
   }
75
   }
79
       {
79
       {
80
         title: '头像',
80
         title: '头像',
81
         // eslint-disable-next-line jsx-a11y/alt-text
81
         // eslint-disable-next-line jsx-a11y/alt-text
82
-        render: (text, records) => <img src={records.picture } width={50} height={50} />,
82
+        render: (text, records) => <img src={records.picture} width={50} height={50} />,
83
       },
83
       },
84
       {
84
       {
85
         title: '用户名',
85
         title: '用户名',
95
         title: '性别',
95
         title: '性别',
96
         dataIndex: 'sex',
96
         dataIndex: 'sex',
97
         key: 'sex',
97
         key: 'sex',
98
-        render: (text, records) => <span>{ records.sex === 1 ? '男' : '女' }</span>,
98
+        render: (text, records) => <span>{records.sex === 1 ? '男' : '女'}</span>,
99
       },
99
       },
100
       {
100
       {
101
         title: '意向项目',
101
         title: '意向项目',
111
         title: '状态',
111
         title: '状态',
112
         // eslint-disable-next-line consistent-return
112
         // eslint-disable-next-line consistent-return
113
         render: (text, records) => {
113
         render: (text, records) => {
114
-                                    if (records.status === 1) { return '报备' }
115
-                                    if (records.status === 2) { return '到访' }
116
-                                    if (records.status === 3) { return '认购' }
117
-                                    if (records.status === 4) { return '签约' }
118
-                                    if (records.verifyStatus === 1) { return '待审核' }
119
-                                    if (records.verifyStatus === 2) { return '审核同意' }
120
-                                    if (records.verifyStatus === 3) { return '签约' }
121
-                                  },
114
+          if (records.status === 1) { return '报备' }
115
+          if (records.status === 2) { return '到访' }
116
+          if (records.status === 3) { return '认购' }
117
+          if (records.status === 4) { return '签约' }
118
+          if (records.verifyStatus === 1) { return '待审核' }
119
+          if (records.verifyStatus === 2) { return '审核同意' }
120
+          if (records.verifyStatus === 3) { return '签约' }
121
+        },
122
       },
122
       },
123
     ]
123
     ]
124
     return (
124
     return (
125
       <>
125
       <>
126
         <Modal
126
         <Modal
127
-            title="推荐客户"
128
-            destroyOnClose="true"
129
-            width={900}
130
-            footer={null}
131
-            visible={this.state.visibleData.visible}
132
-            // onOk={() => this.handleOk()}
133
-            onCancel={(e) => this.handleCancel(e)}
134
-          >
135
-            <Table rowKey="independentList" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
136
-          </Modal>
127
+          title="推荐客户"
128
+          destroyOnClose="true"
129
+          width={900}
130
+          footer={null}
131
+          visible={this.state.visibleData.visible}
132
+          // onOk={() => this.handleOk()}
133
+          onCancel={(e) => this.handleCancel(e)}
134
+        >
135
+          <Table rowKey="independentList" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
136
+        </Modal>
137
       </>
137
       </>
138
     );
138
     );
139
   }
139
   }
147
   constructor(props) {
147
   constructor(props) {
148
     super(props);
148
     super(props);
149
     this.state = {
149
     this.state = {
150
-       dataSource: { records: [] },
151
-       visibleData: { visible: false, customerId: '', realtyConsultant: '' },
150
+      dataSource: { records: [] },
151
+      visibleData: { visible: false, customerId: '', realtyConsultant: '' },
152
     }
152
     }
153
   }
153
   }
154
 
154
 
178
   }
178
   }
179
 
179
 
180
   getList(params) {
180
   getList(params) {
181
-     const { customerId } = this.props.visibleData
181
+    const { customerId } = this.props.visibleData
182
     if (customerId === '' || customerId === undefined) {
182
     if (customerId === '' || customerId === undefined) {
183
       return
183
       return
184
     }
184
     }
197
     })
197
     })
198
   }
198
   }
199
 
199
 
200
-   // 分页
200
+  // 分页
201
   onChange(pageNum) {
201
   onChange(pageNum) {
202
     this.getList({ pageNumber: pageNum, pageSize: 5 })
202
     this.getList({ pageNumber: pageNum, pageSize: 5 })
203
   }
203
   }
209
         dataIndex: 'img',
209
         dataIndex: 'img',
210
         key: 'img',
210
         key: 'img',
211
         align: 'center',
211
         align: 'center',
212
-        render: (text, record) => <img src={record.avatarurl}  width = {50} height = {50}/>,
212
+        render: (text, record) => <img src={record.avatarurl} width={50} height={50} />,
213
       },
213
       },
214
       {
214
       {
215
         title: '用户姓名',
215
         title: '用户姓名',
229
         dataIndex: 'sex',
229
         dataIndex: 'sex',
230
         key: 'sex',
230
         key: 'sex',
231
         align: 'center',
231
         align: 'center',
232
-        render: (text, list) => <span>{ list.sex === 1 ? '男' : '女' }</span>,
232
+        render: (text, list) => <span>{list.sex === 1 ? '男' : '女'}</span>,
233
       },
233
       },
234
     ]
234
     ]
235
     return (
235
     return (
236
       <>
236
       <>
237
         <Modal
237
         <Modal
238
-            title="推荐客户"
239
-            destroyOnClose="true"
240
-            width={900}
241
-            footer={null}
242
-            visible={this.state.visibleData.visible}
243
-            // onOk={() => this.handleOk()}
244
-            onCancel={(e) => this.handleCancel(e)}
245
-          >
246
-            <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
247
-          </Modal>
238
+          title="推荐客户"
239
+          destroyOnClose="true"
240
+          width={900}
241
+          footer={null}
242
+          visible={this.state.visibleData.visible}
243
+          // onOk={() => this.handleOk()}
244
+          onCancel={(e) => this.handleCancel(e)}
245
+        >
246
+          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
247
+        </Modal>
248
       </>
248
       </>
249
     );
249
     );
250
   }
250
   }
318
   // 分页
318
   // 分页
319
   function onChange(pageNum) {
319
   function onChange(pageNum) {
320
     // eslint-disable-next-line react-hooks/rules-of-hooks
320
     // eslint-disable-next-line react-hooks/rules-of-hooks
321
-      getList({ pageNumber: pageNum, pageSize: 10 })
321
+    getList({ pageNumber: pageNum, pageSize: 10 })
322
   }
322
   }
323
 
323
 
324
   function toAudit(cuurentId) {
324
   function toAudit(cuurentId) {
332
 
332
 
333
   function exportIndependen() {
333
   function exportIndependen() {
334
     request({ ...apis.customer.customerRecommendAgentsExport, responseType: 'blob' })
334
     request({ ...apis.customer.customerRecommendAgentsExport, responseType: 'blob' })
335
-    .then(response => {
336
-      download(response)
337
-    }).catch(error => {
335
+      .then(response => {
336
+        download(response)
337
+      }).catch(error => {
338
 
338
 
339
-    })
339
+      })
340
   }
340
   }
341
 
341
 
342
   function download(data) {
342
   function download(data) {
374
       dataIndex: 'gender',
374
       dataIndex: 'gender',
375
       key: 'gender',
375
       key: 'gender',
376
       // eslint-disable-next-line no-nested-ternary
376
       // eslint-disable-next-line no-nested-ternary
377
-      render: (_, record) => <><span>{ record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知' }</span></>,
377
+      render: (_, record) => <><span>{record.gender === '1' ? '男' : record.gender === '2' ? '女' : '未知'}</span></>,
378
     },
378
     },
379
     {
379
     {
380
       title: '类型',
380
       title: '类型',
381
       dataIndex: 'personType',
381
       dataIndex: 'personType',
382
       key: 'personType',
382
       key: 'personType',
383
-      render: (_, record) => <><span>{ record.channelName !== null ? '渠道经纪人' : '独立经纪人' }</span></>,
383
+      render: (_, record) => <><span>{record.channelName !== null ? '渠道经纪人' : '独立经纪人'}</span></>,
384
     },
384
     },
385
     {
385
     {
386
       title: '所属渠道',
386
       title: '所属渠道',
412
 
412
 
413
   return (
413
   return (
414
     <>
414
     <>
415
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
415
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{ display: 'flex', alignItems: 'center' }}>
416
         <Form.Item>
416
         <Form.Item>
417
           {getFieldDecorator('name')(
417
           {getFieldDecorator('name')(
418
             <Input
418
             <Input
429
             />,
429
             />,
430
           )}
430
           )}
431
         </Form.Item>
431
         </Form.Item>
432
-        <Form.Item>
433
-            <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
434
-              搜索
435
-            </Button>
432
+        <Form.Item style={{ position:'absolute',right:'38px' }} >
433
+          <Button type="primary" htmlType="submit" >
434
+            搜索
435
+          </Button>
436
         </Form.Item>
436
         </Form.Item>
437
       </Form>
437
       </Form>
438
-      <Button type="primary" onClick={() => exportIndependen()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
439
-        导出数据
438
+      <Button type="primary" onClick={() => exportIndependen()}  style={{ float: 'right', margin: '20px 0' }}>
439
+        导出
440
       </Button>
440
       </Button>
441
       <Table rowKey="independentIndex" 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
-            {/* 调整归属 */}
443
-        <ModalTable visibleData={gVisibleData} />
444
-        <InviteTable visibleData={gInviteData} />
442
+      {/* 调整归属 */}
443
+      <ModalTable visibleData={gVisibleData} />
444
+      <InviteTable visibleData={gInviteData} />
445
     </>
445
     </>
446
   );
446
   );
447
 }
447
 }

+ 2
- 2
src/pages/customer/independentList/style.less Wyświetl plik

1
 .SubmitButton {
1
 .SubmitButton {
2
   background: rgba(239,39,58,1);
2
   background: rgba(239,39,58,1);
3
-  border-radius: 7px;
3
+  border-radius: 6px;
4
   border: 0px;
4
   border: 0px;
5
 }
5
 }
6
 .SelectFrom {
6
 .SelectFrom {
7
   width: 180px;
7
   width: 180px;
8
   background: #ffffff;
8
   background: #ffffff;
9
-  border-radius: 7px;
9
+  border-radius: 6px;
10
   border: 1px solid #dbdbdb;
10
   border: 1px solid #dbdbdb;
11
 }
11
 }
12
 .addButton {
12
 .addButton {

+ 5
- 5
src/pages/customer/recommendCustomer/index.jsx Wyświetl plik

171
 
171
 
172
   return (
172
   return (
173
     <>
173
     <>
174
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
174
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{display:'flex'}}>
175
         <Form.Item>
175
         <Form.Item>
176
           {getFieldDecorator('name')(
176
           {getFieldDecorator('name')(
177
             <Input
177
             <Input
207
             </Select>,
207
             </Select>,
208
           )}
208
           )}
209
         </Form.Item>
209
         </Form.Item>
210
-        <Form.Item>
211
-            <Button type="primary" htmlType="submit" className={Styles.SubmitButton}>
210
+        <Form.Item style={{ position:'absolute',right:'38px' }}>
211
+            <Button type="primary" htmlType="submit" >
212
               搜索
212
               搜索
213
             </Button>
213
             </Button>
214
         </Form.Item>
214
         </Form.Item>
215
       </Form>
215
       </Form>
216
-      <Button type="primary" onClick={() => exportRecommendCustomer()} className={Styles.SubmitButton} style={{ marginTop: '5px', marginBottom: '5px' }}>
217
-        导出数据
216
+      <Button type="primary" onClick={() => exportRecommendCustomer()} style={{float:'right',margin:'20px 0'}}>
217
+        导出
218
       </Button>
218
       </Button>
219
       <Table rowKey="recommendCustomer" 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
     </>

+ 4
- 4
src/pages/customer/report/index.jsx Wyświetl plik

133
 
133
 
134
   return (
134
   return (
135
     <>
135
     <>
136
-      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
136
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)} style={{display:'flex'}}>
137
         <Form.Item>
137
         <Form.Item>
138
           {getFieldDecorator('name')(
138
           {getFieldDecorator('name')(
139
             <Input
139
             <Input
173
             <BuildSelect />,
173
             <BuildSelect />,
174
           )}
174
           )}
175
         </Form.Item>
175
         </Form.Item>
176
-        <Form.Item>
176
+        <Form.Item style={{ position:'absolute',right:'38px' }}>
177
             <Button type="primary" htmlType="submit">
177
             <Button type="primary" htmlType="submit">
178
               搜索
178
               搜索
179
             </Button>
179
             </Button>
180
         </Form.Item>
180
         </Form.Item>
181
       </Form>
181
       </Form>
182
-      <Button type="primary" onClick={() => exportReport()} className={Styles.SubmitButton} style={{ marginTop: '5px' }}>
183
-        导出数据
182
+      <Button type="primary" onClick={() => exportReport()} style={{ float:'right',margin:'20px 0' }}>
183
+        导出
184
       </Button>
184
       </Button>
185
       <Table rowKey="report" 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
     </>

+ 2
- 3
src/pages/indexEcharts/styles.less Wyświetl plik

11
 .pie {
11
 .pie {
12
   width: 30%;
12
   width: 30%;
13
   min-width: 370px;
13
   min-width: 370px;
14
-  height: 560px;
15
   background: rgba(255, 255, 255, 1);
14
   background: rgba(255, 255, 255, 1);
16
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
15
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
17
   border-radius: 12px;
16
   border-radius: 12px;
25
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
24
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
26
   border-radius: 12px;
25
   border-radius: 12px;
27
   margin-bottom: 25px;
26
   margin-bottom: 25px;
28
-  padding: 40px;
27
+  padding: 26px;
29
 }
28
 }
30
 
29
 
31
 .customers {
30
 .customers {
34
   background: rgba(255, 255, 255, 1);
33
   background: rgba(255, 255, 255, 1);
35
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
34
   box-shadow: 0px 0px 16px 2px rgba(0, 0, 0, 0.12);
36
   border-radius: 12px 12px 0px 0px;
35
   border-radius: 12px 12px 0px 0px;
37
-  padding: 40px;
36
+  padding: 26px;
38
 }
37
 }

+ 15
- 10
src/pages/integralMall/exchangeRecords.jsx Wyświetl plik

155
           </Form.Item>
155
           </Form.Item>
156
           <Form.Item>
156
           <Form.Item>
157
             {getFieldDecorator('personType')(
157
             {getFieldDecorator('personType')(
158
-              <Select style={{ width: '220px' }} placeholder="用户类型">
158
+              <Select style={{ minWidth: '1.1rem' }} placeholder="用户类型">
159
                 <Option value="Realty Consultant">置业顾问</Option>
159
                 <Option value="Realty Consultant">置业顾问</Option>
160
                 <Option value="Sales Executive">销售主管</Option>
160
                 <Option value="Sales Executive">销售主管</Option>
161
                 <Option value="estate agent">经纪人</Option>
161
                 <Option value="estate agent">经纪人</Option>
164
           </Form.Item>
164
           </Form.Item>
165
           <Form.Item>
165
           <Form.Item>
166
             {getFieldDecorator('status')(
166
             {getFieldDecorator('status')(
167
-              <Select style={{ width: '220px' }} placeholder="状态">
167
+              <Select style={{ minWidth: '1.1rem' }} placeholder="状态">
168
                 <Option value="1">已领取</Option>
168
                 <Option value="1">已领取</Option>
169
                 <Option value="0">未领取</Option>
169
                 <Option value="0">未领取</Option>
170
               </Select>,
170
               </Select>,
171
             )}
171
             )}
172
           </Form.Item>
172
           </Form.Item>
173
-          <Form.Item>
173
+          
174
+          <Form.Item style={{position:'absolute',right:'38px'}}>
175
+            <Button type="primary" htmlType="submit">
176
+              搜索
177
+            </Button>
178
+          </Form.Item>
179
+        </div>
180
+        <div style={{margin:'10px 0'}}>
181
+        <Form.Item>
182
+          <span style={{marginRight:'10px'}}>兑换时间:</span>
174
             {getFieldDecorator('exchangeTime')(
183
             {getFieldDecorator('exchangeTime')(
175
-              <RangePicker placeholder={['兑换开始时间','兑换结束时间']}/>
184
+              <RangePicker placeholder={['开始时间','结束时间']}/>
176
             )}
185
             )}
177
           </Form.Item>
186
           </Form.Item>
178
           <Form.Item>
187
           <Form.Item>
188
+          <span style={{marginRight:'10px'}}>领取时间:</span>
179
             {getFieldDecorator('receiveTime')(
189
             {getFieldDecorator('receiveTime')(
180
-              <RangePicker placeholder={['领取开始时间','领取结束时间']}/>
190
+              <RangePicker placeholder={['开始时间','结束时间']}/>
181
             )}
191
             )}
182
           </Form.Item>
192
           </Form.Item>
183
-          <Form.Item>
184
-            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
185
-              搜索
186
-            </Button>
187
-          </Form.Item>
188
         </div>
193
         </div>
189
       </Form>
194
       </Form>
190
       <Table rowKey="exchangeRecords" style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />
195
       <Table rowKey="exchangeRecords" style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />

+ 1
- 1
src/pages/news/type/NewsType.jsx Wyświetl plik

129
         </Form.Item>
129
         </Form.Item>
130
       </Form>
130
       </Form>
131
       <AuthButton name="admin.taNewsType.post" noRight={null}>
131
       <AuthButton name="admin.taNewsType.post" noRight={null}>
132
-        <Button type="primary" className={styles.addBtn} onClick={toEditNews()}>新增</Button>
132
+        <Button type="danger" className={styles.addBtn} onClick={toEditNews()}>新增</Button>
133
       </AuthButton>
133
       </AuthButton>
134
       <Table rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
134
       <Table rowKey="newsType" dataSource={data.records} columns={columns} pagination={false} />
135
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
135
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>

+ 1
- 1
src/pages/system/housingPolicy.jsx Wyświetl plik

182
         </Form.Item>
182
         </Form.Item>
183
       </Form>
183
       </Form>
184
       <AuthButton name="admin.taPolicy.post" noRight={null}>
184
       <AuthButton name="admin.taPolicy.post" noRight={null}>
185
-        <Button type="primary" className={styles.addBtn} onClick={toEditPolicy()}>新增</Button>
185
+        <Button type="danger" className={styles.addBtn} onClick={toEditPolicy()}>新增</Button>
186
       </AuthButton>
186
       </AuthButton>
187
       <Table rowKey="housingPolicy" dataSource={data.records} columns={columns} pagination={false}/>
187
       <Table rowKey="housingPolicy" dataSource={data.records} columns={columns} pagination={false}/>
188
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
188
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>