xujing 5 年 前
コミット
6905a7a5fd

+ 1
- 1
config/routes.js ファイルの表示

@@ -244,7 +244,7 @@ export default [
244 244
                 component: './activity/ActivityList',
245 245
               },
246 246
               {
247
-                path: '/activity/editActivity',
247
+                path: '/activity/editActivity', 
248 248
                 name: '编辑活动',
249 249
                 hideInMenu: true,
250 250
                 component: './activity/editActivity',

+ 21
- 20
src/pages/activity/SignList.jsx ファイルの表示

@@ -67,10 +67,10 @@ const columns = [
67 67
 
68 68
 
69 69
 const header = props => {
70
-  const [data, setData] = useState({list: {}})
71
-//   const [page, changePage] = useState({})
72
-// 存入导入数据的值
73
-const { getFieldDecorator, getFieldsValue } = props.form
70
+  const [data, setData] = useState({ list: {} })
71
+  //   const [page, changePage] = useState({})
72
+  // 存入导入数据的值
73
+  const { getFieldDecorator, getFieldsValue } = props.form
74 74
   // eslint-disable-next-line react-hooks/rules-of-hooks
75 75
   useEffect(() => {
76 76
     // eslint-disable-next-line no-use-before-define
@@ -81,8 +81,8 @@ const { getFieldDecorator, getFieldsValue } = props.form
81 81
   const getSignList = params => {
82 82
     // eslint-disable-next-line no-shadow
83 83
     request({ ...apis.activity.signList, params: { ...params } }).then(data => {
84
-        console.log(data)
85
-        setData(data)
84
+      console.log(data)
85
+      setData(data)
86 86
     })
87 87
   }
88 88
 
@@ -95,23 +95,23 @@ const { getFieldDecorator, getFieldsValue } = props.form
95 95
       pathname: '/activity/ActivityList',
96 96
     });
97 97
   }
98
-    // 提交事件
99
-// eslint-disable-next-line no-shadow
100
-const handleSubmit = (e, props) => {
98
+  // 提交事件
99
+  // eslint-disable-next-line no-shadow
100
+  const handleSubmit = (e, props) => {
101 101
     e.preventDefault();
102 102
     props.form.validateFields((err, values) => {
103 103
       getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId, isCheckin: values.isCheckin, name: values.name, phone: values.phone })
104 104
     });
105 105
   }
106
-   // 重置搜索
107
-   function handleReset() {
106
+  // 重置搜索
107
+  function handleReset() {
108 108
     props.form.resetFields();
109 109
     getSignList({ pageNum: 1, pageSize: 10, dynamicId: props.location.query.dynamicId })
110 110
   }
111
- // eslint-disable-next-line class-methods-use-this
112
- function exportHelp() {
113
-  const fieldsValue = getFieldsValue()
114
-  console.log('fieldsValue', fieldsValue)
111
+  // eslint-disable-next-line class-methods-use-this
112
+  function exportHelp() {
113
+    const fieldsValue = getFieldsValue()
114
+    console.log('fieldsValue', fieldsValue)
115 115
     request({ ...apis.activity.getTaActivityDynamicEnlistExport, params: { ...fieldsValue, dynamicId: props.location.query.dynamicId } })
116 116
       .then(data => {
117 117
         if (!data) {
@@ -131,7 +131,7 @@ const handleSubmit = (e, props) => {
131 131
 
132 132
   return (
133 133
     <>
134
-    <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
134
+      <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
135 135
         <Form.Item>
136 136
           {getFieldDecorator('isCheckin')(
137 137
             <Select style={{ width: '180px' }} placeholder="签到状态">
@@ -161,13 +161,14 @@ const handleSubmit = (e, props) => {
161 161
             搜索
162 162
           </Button>
163 163
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
164
-              重置
164
+            重置
165 165
             </Button>
166 166
         </Form.Item>
167
+        <Button style={{ position: 'absolute', right: '30px' }} onClick={toActivityList}>返回</Button>
167 168
       </Form>
168
-      <Button type="primary" className={styles.addBtn} onClick={toActivityList}>返回</Button>
169
-      <Button name="admin.activityDynamicEnlist.export.get" noRight={null} type="primary" style={{ marginLeft: '85%' }} onClick={exportHelp}>导出</Button>
170
-      <Table dataSource={data.list.data} columns={columns} pagination={{ total: data.total, onChange: changePageNum }} rowKey="activity"/>
169
+
170
+     <div style={{textAlign:'right',margin:'6px 0 10px 0'}}> <Button name="admin.activityDynamicEnlist.export.get" noRight={null} type="primary" onClick={exportHelp}>导出</Button></div>
171
+      <Table dataSource={data.list.data} columns={columns} pagination={{ total: data.total, onChange: changePageNum }} rowKey="activity" />
171 172
       {/* <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
172 173
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
173 174
       </div> */}

+ 1
- 1
src/pages/activity/dataRecord/index.jsx ファイルの表示

@@ -46,7 +46,7 @@ const DataRecord = props => {
46 46
         <div>
47 47
             <div>
48 48
                 <span>{data.activityName || '0'}</span>
49
-                <Button type="primary" style={{ float: 'right', marginLeft: '20px', zIndex: 1 }} onClick={() => router.go(-1)}>
49
+                <Button style={{ float: 'right', zIndex: 1 }} onClick={() => router.go(-1)}>
50 50
                     返回
51 51
                </Button>
52 52
             </div>

+ 14
- 14
src/pages/activity/drainage/Detail.jsx ファイルの表示

@@ -30,7 +30,7 @@ const header = (props) => {
30 30
 
31 31
   }, [])
32 32
 
33
-  function gettaDrainageRecord (params) {
33
+  function gettaDrainageRecord(params) {
34 34
     request({ ...apis.activity.taDrainageRecord, params: { ...params } }).then((data) => {
35 35
       // setDatas(data) 
36 36
       console.log(data, '3333333333333')
@@ -54,7 +54,7 @@ const header = (props) => {
54 54
       message.info(err.msg || err.message)
55 55
     })
56 56
   }
57
-  function tableData (data) {
57
+  function tableData(data) {
58 58
     console.log('tabledata', data)
59 59
     return data.map((row, inx) => {
60 60
       return eval('(' + row.content + ')').reduce((acc, col) => {
@@ -71,7 +71,7 @@ const header = (props) => {
71 71
     })
72 72
   }
73 73
 
74
-  function tableTitle (data) {
74
+  function tableTitle(data) {
75 75
     tableTitle = eval('(' + data[0].content + ')')
76 76
     const cols = [{
77 77
       title: "提交时间",
@@ -93,15 +93,15 @@ const header = (props) => {
93 93
   //   gettaDrainageRecord({ pageNum: 1, pageSize: 10, drainageId: drainageId, startTime: Time(startDate), endTime: Time(endDate) })
94 94
   // }
95 95
 
96
-  function fromTime (str) {
96
+  function fromTime(str) {
97 97
     return str === '' ? null : `${moment(str).format('YYYY-MM-DDT00:00:00.000')}Z`
98 98
   }
99 99
 
100
-  function Time (str) {
100
+  function Time(str) {
101 101
     return str === '' ? null : `${moment(str).format('YYYY-MM-DD')}`
102 102
   }
103 103
   // 2019-10-30T11:04:49
104
-  function onChangetime (dates, dateStrings) {
104
+  function onChangetime(dates, dateStrings) {
105 105
     console.log(dateStrings[1])
106 106
     setEndDate(dateStrings[1])
107 107
     setStartDate(dateStrings[0])
@@ -113,7 +113,7 @@ const header = (props) => {
113 113
   }
114 114
 
115 115
 
116
-  function excelPort () {
116
+  function excelPort() {
117 117
     // const fieldsValue = getFieldsValue()
118 118
 
119 119
     request({ ...apis.activity.exporttaDrainageRecord, params: { drainageId: drainageId, startTime: fromTime(startDate), endTime: fromTime(endDate) } })
@@ -126,7 +126,7 @@ const header = (props) => {
126 126
 
127 127
 
128 128
 
129
-  function download (data) {
129
+  function download(data) {
130 130
     if (!data) {
131 131
       return
132 132
     }
@@ -139,7 +139,7 @@ const header = (props) => {
139 139
     link.click()
140 140
   }
141 141
 
142
-  function handleReset (e) {
142
+  function handleReset(e) {
143 143
     console.log(e)
144 144
     props.form.resetFields();
145 145
     setEndDate('')
@@ -157,10 +157,10 @@ const header = (props) => {
157 157
     <>
158 158
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
159 159
         <Form.Item label="提交时间">
160
-        {getFieldDecorator('time')(
161
-            <RangePicker showTime format="YYYY-MM-DD HH:mm:ss" 
162
-            showTime
163
-            onChange={onChangetime}
160
+          {getFieldDecorator('time')(
161
+            <RangePicker showTime format="YYYY-MM-DD HH:mm:ss"
162
+              showTime
163
+              onChange={onChangetime}
164 164
             />,
165 165
           )}
166 166
         </Form.Item>
@@ -171,7 +171,7 @@ const header = (props) => {
171 171
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
172 172
             重置
173 173
             </Button>
174
-            <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>返回</Button>  
174
+          <Button onClick={() => router.go(-1)} style={{ float: 'right' }}>返回</Button>
175 175
         </Form.Item>
176 176
       </Form>
177 177
       <div>

+ 88
- 87
src/pages/activity/groupActivity/helpRecord.jsx ファイルの表示

@@ -1,5 +1,5 @@
1 1
 import React, { useState, useEffect } from 'react';
2
-import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, message} from 'antd';
2
+import { Form, Icon, Input, Button, DatePicker, Select, Card, Row, Col, Pagination, Alert, Table, Avatar, Radio, Modal, Descriptions, message } from 'antd';
3 3
 import moment from 'moment';
4 4
 import request from '../../../utils/request';
5 5
 import apis from '../../../services/apis';
@@ -20,17 +20,17 @@ class InviteTable extends React.Component {
20 20
     super(props);
21 21
     this.state = {
22 22
       dataSource: { records: [] },
23
-      visibleData: { visible: false, groupActivityId: '', groupStatus: ''},
23
+      visibleData: { visible: false, groupActivityId: '', groupStatus: '' },
24 24
     }
25 25
   }
26 26
 
27 27
   // 挂载之后
28
-  componentDidMount () {
28
+  componentDidMount() {
29 29
     const { groupActivityId } = this.state.visibleData
30
-    this.getList({ groupActivityId: groupActivityId, groupStatus:status,  pageNumber: 1, pageSize: 5 })
30
+    this.getList({ groupActivityId: groupActivityId, groupStatus: status, pageNumber: 1, pageSize: 5 })
31 31
   }
32 32
 
33
-  componentDidUpdate (preProps, preState) {
33
+  componentDidUpdate(preProps, preState) {
34 34
     const { groupActivityId } = this.props.visibleData
35 35
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
36 36
       this.getList({ ...this.props.visibleData, pageNumber: 1, pageSize: 5 })
@@ -40,17 +40,17 @@ class InviteTable extends React.Component {
40 40
 
41 41
   // 弹框确定按钮
42 42
   // eslint-disable-next-line react/sort-comp
43
-  handleOk () {
43
+  handleOk() {
44 44
     this.setState({ visibleData: { visible: false, groupActivityId: '', realtyConsultant: '' } })
45 45
   }
46 46
 
47 47
   // 弹框取消按钮
48
-  handleCancel () {
48
+  handleCancel() {
49 49
     this.setState({ visibleData: { visible: false, groupActivityId: '', realtyConsultant: '' } })
50 50
   }
51 51
 
52
-  getList (params) {
53
-    console.log("params",params);
52
+  getList(params) {
53
+    console.log("params", params);
54 54
     request({ ...apis.groupActivity.shareChildList, params: { ...params } }).then(res => {
55 55
       this.setState({ dataSource: res })
56 56
     }).catch(err => {
@@ -67,12 +67,12 @@ class InviteTable extends React.Component {
67 67
   }
68 68
 
69 69
   // 分页
70
-  onChange (pageNum) {
70
+  onChange(pageNum) {
71 71
     this.getList({ pageNumber: pageNum, pageSize: 5 })
72 72
   }
73 73
 
74 74
   exportChildRecord(params) {
75
-    request({ ...apis.groupActivity.exportShareChildRecord, responseType: 'blob', params: { ...params} })
75
+    request({ ...apis.groupActivity.exportShareChildRecord, responseType: 'blob', params: { ...params } })
76 76
       .then(data => {
77 77
         if (!data) {
78 78
           return
@@ -89,7 +89,7 @@ class InviteTable extends React.Component {
89 89
       })
90 90
   }
91 91
 
92
-  render () {
92
+  render() {
93 93
     const columns = [
94 94
       {
95 95
         title: '用户姓名',
@@ -109,7 +109,7 @@ class InviteTable extends React.Component {
109 109
         dataIndex: 'createTime',
110 110
         key: 'createTime',
111 111
         align: 'center',
112
-        render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
112
+        render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
113 113
       },
114 114
     ]
115 115
     return (
@@ -148,11 +148,11 @@ class Verifier extends React.Component {
148 148
   }
149 149
 
150 150
   // 挂载之后
151
-  componentDidMount () {
151
+  componentDidMount() {
152 152
     const { groupActivityId } = this.state.visibleData
153 153
   }
154 154
 
155
-  componentDidUpdate (preProps, preState) {
155
+  componentDidUpdate(preProps, preState) {
156 156
     const { groupActivityId } = this.state.visibleData
157 157
     console.log('this.state.visibleData', this.state.visibleData)
158 158
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
@@ -161,18 +161,18 @@ class Verifier extends React.Component {
161 161
   }
162 162
 
163 163
   // 弹框确定按钮
164
-  handleOk () {
164
+  handleOk() {
165 165
   }
166 166
 
167 167
   // 弹框取消按钮
168
-  handleCancel () {
169
-    this.props.onSuccess({groupActivityId: this.props.visibleData.groupActivityId, groupStatus: 0});
168
+  handleCancel() {
169
+    this.props.onSuccess({ groupActivityId: this.props.visibleData.groupActivityId, groupStatus: 0 });
170 170
   }
171 171
 
172
-   getVerCodeList (params) {
172
+  getVerCodeList(params) {
173 173
     request({ ...apis.groupActivity.verification, params: { ...params } }).then(res => {
174 174
       message.info('核销成功')
175
-      this.props.onSuccess({groupActivityId: this.state.visibleData.groupActivityId, groupStatus: 0});
175
+      this.props.onSuccess({ groupActivityId: this.state.visibleData.groupActivityId, groupStatus: 0 });
176 176
     }).catch(err => {
177 177
       <Alert
178 178
         style={{
@@ -191,11 +191,11 @@ class Verifier extends React.Component {
191 191
 
192 192
   // eslint-disable-next-line class-methods-use-this
193 193
   verification(e) {
194
-    console.log("asdasdasdasd",this.state.visibleData);
195
-    this.getVerCodeList({ groupActivityId: this.state.visibleData.groupActivityId, verifyCode: this.state.visibleData.verificationCode, recordId: this.state.visibleData.recordId})
194
+    console.log("asdasdasdasd", this.state.visibleData);
195
+    this.getVerCodeList({ groupActivityId: this.state.visibleData.groupActivityId, verifyCode: this.state.visibleData.verificationCode, recordId: this.state.visibleData.recordId })
196 196
   }
197 197
 
198
-  render () {
198
+  render() {
199 199
     return (
200 200
       <>
201 201
         <Modal
@@ -207,8 +207,8 @@ class Verifier extends React.Component {
207 207
           // onOk={() => this.handleOk()}
208 208
           onCancel={(e) => this.handleCancel(e)}
209 209
         >
210
-          <div><span>核销码:<input style={{marginLeft: '10px'}} onChange={this.verify.bind(this)}/></span>
211
-           <Button name="admin.taShareRecord.verificate.put" noRight={null} style={{ marginLeft: '80px', marginTop:'10px', backgroundColor:'red' }} onClick={() => this.verification()}><span style={{color:'white'}}>立即核销</span></Button>
210
+          <div><span>核销码:<input style={{ marginLeft: '10px' }} onChange={this.verify.bind(this)} /></span>
211
+            <Button name="admin.taShareRecord.verificate.put" noRight={null} style={{ marginLeft: '80px', marginTop: '10px', backgroundColor: 'red' }} onClick={() => this.verification()}><span style={{ color: 'white' }}>立即核销</span></Button>
212 212
           </div>
213 213
         </Modal>
214 214
       </>
@@ -223,9 +223,9 @@ class Verifier extends React.Component {
223 223
  * @returns
224 224
  */
225 225
 function body(props) {
226
-  const [gInviteData, setGInviteData] = useState({ visible: false, groupActivityId : '', recordId:'',  groupStatus: ''})
226
+  const [gInviteData, setGInviteData] = useState({ visible: false, groupActivityId: '', recordId: '', groupStatus: '' })
227 227
 
228
-  const [gVerifierData, setVerifierData] = useState({ visible: false, groupActivityId: '', verificateCode: '', recordId: ''})
228
+  const [gVerifierData, setVerifierData] = useState({ visible: false, groupActivityId: '', verificateCode: '', recordId: '' })
229 229
 
230 230
   const { getFieldDecorator, getFieldsValue } = props.form
231 231
 
@@ -240,7 +240,7 @@ function body(props) {
240 240
 
241 241
   // 调整归属 ============  start
242 242
   // eslint-disable-next-line react-hooks/rules-of-hooks
243
-  const [gVisibleData, setGVisibleData] = useState({ visible: false})
243
+  const [gVisibleData, setGVisibleData] = useState({ visible: false })
244 244
 
245 245
 
246 246
   // 变更状态 ============= end
@@ -251,11 +251,11 @@ function body(props) {
251 251
     getList({ pageNumber: 1, pageSize: 10, groupStatus: groupStatus, groupActivityId: groupActivityId })
252 252
   }, [])
253 253
 
254
-  
254
+
255 255
   function getFailList(params) {
256 256
     // 网路请求
257 257
     request({ ...apis.groupActivity.shareFailList, params: { ...params } }).then(res => {
258
-        console.log(res);
258
+      console.log(res);
259 259
       setDataSource(res)
260 260
     }).catch(err => {
261 261
       // eslint-disable-next-line no-unused-expressions
@@ -290,7 +290,7 @@ function body(props) {
290 290
   }
291 291
 
292 292
   function displayNone() {
293
-    setGVisibleData({ visible: false})
293
+    setGVisibleData({ visible: false })
294 294
   }
295 295
 
296 296
   // 提交事件
@@ -320,21 +320,22 @@ function body(props) {
320 320
 
321 321
   // 助力成功/进行中/助力失败
322 322
   function radioButtonHandleSizeChange(e) {
323
-    setGInviteData({ visible: false})
323
+    setGInviteData({ visible: false })
324 324
     displayNone()
325 325
 
326 326
     const { value } = e.target
327 327
     setgroupStatus(value)
328
-    if (value == 0) { 
329
-        getList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId, ...props.form.getFieldsValue() }) }
328
+    if (value == 0) {
329
+      getList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId, ...props.form.getFieldsValue() })
330
+    }
330 331
     if (value == 1 || value == 2) {
331
-         getFailList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId, ...props.form.getFieldsValue() })
332
-         }
332
+      getFailList({ pageNumber: 1, pageSize: 10, groupStatus: value, groupActivityId: groupActivityId, ...props.form.getFieldsValue() })
333
+    }
333 334
   }
334 335
 
335 336
   function handleReset() {
336 337
     props.form.resetFields();
337
-    getList({ pageNumber: 1, pageSize: 10, groupStatus, groupActivityId:groupActivityId })
338
+    getList({ pageNumber: 1, pageSize: 10, groupStatus, groupActivityId: groupActivityId })
338 339
   }
339 340
 
340 341
   function toCustomerDateil(record) {
@@ -346,7 +347,7 @@ function body(props) {
346 347
     });
347 348
   }
348 349
 
349
-  function download (data) {
350
+  function download(data) {
350 351
     if (!data) {
351 352
       return
352 353
     }
@@ -359,8 +360,8 @@ function body(props) {
359 360
     link.click()
360 361
   }
361 362
 
362
-  function exportRecord () {
363
-    request({ ...apis.groupActivity.exportShareRecord, responseType: 'blob', params: {groupActivityId: groupActivityId, groupStatus: groupStatus } })
363
+  function exportRecord() {
364
+    request({ ...apis.groupActivity.exportShareRecord, responseType: 'blob', params: { groupActivityId: groupActivityId, groupStatus: groupStatus } })
364 365
       .then(response => {
365 366
         download(response)
366 367
       }).catch(error => {
@@ -368,30 +369,30 @@ function body(props) {
368 369
       })
369 370
   }
370 371
 
371
-// 助力记录弹框
372
-function helpRecord(row) {
373
-// 关闭核销
374
-// eslint-disable-next-line max-len
375
-  setVerifierData({ visible: false, groupActivityId: row.groupActivityId,  groupStatus: 0})
376
-  // eslint-disable-next-line max-len
377
-  setGInviteData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: row.status, recordId: row.recordId})
378
-}
379
- // 打开核销
380
- function shareRecordVerify(row) {
381
-  setVerifierData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: 0, recordId: row.recordId})
382
-  setGInviteData({ visible: false, groupActivityId: row.groupActivityId})
383
- }
384
-
385
- function onSuccess(e) {
386
-  setVerifierData({ visible: false, groupActivityId: e.groupActivityId, groupStatus: 0})
387
-  getList({ pageNumber: 1, pageSize: 10, ...e});
388
- }
389
-
390
- function returnList(params) {
391
-  router.push({
372
+  // 助力记录弹框
373
+  function helpRecord(row) {
374
+    // 关闭核销
375
+    // eslint-disable-next-line max-len
376
+    setVerifierData({ visible: false, groupActivityId: row.groupActivityId, groupStatus: 0 })
377
+    // eslint-disable-next-line max-len
378
+    setGInviteData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: row.status, recordId: row.recordId })
379
+  }
380
+  // 打开核销
381
+  function shareRecordVerify(row) {
382
+    setVerifierData({ visible: true, groupActivityId: row.groupActivityId, groupStatus: 0, recordId: row.recordId })
383
+    setGInviteData({ visible: false, groupActivityId: row.groupActivityId })
384
+  }
385
+
386
+  function onSuccess(e) {
387
+    setVerifierData({ visible: false, groupActivityId: e.groupActivityId, groupStatus: 0 })
388
+    getList({ pageNumber: 1, pageSize: 10, ...e });
389
+  }
390
+
391
+  function returnList(params) {
392
+    router.push({
392 393
       pathname: '/activity/groupActivity/list',
393 394
     });
394
-}
395
+  }
395 396
 
396 397
   const publicColumns = [
397 398
     {
@@ -414,7 +415,7 @@ function helpRecord(row) {
414 415
       key: 'createTime',
415 416
       align: 'center',
416 417
       width: '15%',
417
-      render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>,
418
+      render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>,
418 419
     },
419 420
     {
420 421
       title: '参团者',
@@ -422,7 +423,7 @@ function helpRecord(row) {
422 423
       key: 'helpCount',
423 424
       align: 'center',
424 425
       width: '15%',
425
-      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.joinPeople === null ? 0 : record.joinPeople}/{record.groupBuyPeople}</a>,
426
+      render: (text, record) => <a style={{ color: '#66B3FF' }} onClick={() => helpRecord(record)}>{record.joinPeople === null ? 0 : record.joinPeople}/{record.groupBuyPeople}</a>,
426 427
     },
427 428
   ]
428 429
 
@@ -447,15 +448,15 @@ function helpRecord(row) {
447 448
       key: 'createTime',
448 449
       align: 'center',
449 450
       width: '10%',
450
-      render: (x, row) => <><span>{row.createTime ?`${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
451
+      render: (x, row) => <><span>{row.createTime ? `${moment(row.createTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
451 452
     },
452 453
     {
453
-        title: '成团时间',
454
-        dataIndex: 'endTime',
455
-        key: 'endTime',
456
-        align: 'center',
457
-        width: '10%',
458
-        render: (x, row) => <><span>{row.endTime ?`${moment(row.endTime).format('YYYY-MM-DD HH:mm:ss')}`:''}</span></>
454
+      title: '成团时间',
455
+      dataIndex: 'endTime',
456
+      key: 'endTime',
457
+      align: 'center',
458
+      width: '10%',
459
+      render: (x, row) => <><span>{row.endTime ? `${moment(row.endTime).format('YYYY-MM-DD HH:mm:ss')}` : ''}</span></>
459 460
     },
460 461
     {
461 462
       title: '核销状态',
@@ -478,16 +479,16 @@ function helpRecord(row) {
478 479
       render: (x, row) => (
479 480
         <>
480 481
           {row.verificationStatus === 0 &&
481
-          <AuthButton name="admin.taShare.writeOff" noRight={null}>
482
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={(e) => shareRecordVerify(row)}>核销</span>
483
-          </AuthButton>
484
-        }
482
+            <AuthButton name="admin.taShare.writeOff" noRight={null}>
483
+              <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={(e) => shareRecordVerify(row)}>核销</span>
484
+            </AuthButton>
485
+          }
485 486
         </>
486 487
       ),
487 488
     },
488 489
   ]
489 490
 
490
-  
491
+
491 492
   const changePageNum = pageNumber => {
492 493
     getList({ pageNum: pageNumber, pageSize: 10 })
493 494
   }
@@ -504,16 +505,16 @@ function helpRecord(row) {
504 505
           )}
505 506
         </Form.Item>
506 507
         <Form.Item>
507
-            <Button type="primary" htmlType="submit" >
508
-              搜索
509
-            </Button>
510
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
511
-              重置
508
+          <Button type="primary" htmlType="submit" >
509
+            搜索
512 510
             </Button>
513
-            <Button style={{ marginLeft: 8 }} onClick={returnList}>
514
-              返回
511
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
512
+            重置
515 513
             </Button>
516 514
         </Form.Item>
515
+        <Button style={{ float: 'right' }} onClick={returnList}>
516
+          返回
517
+        </Button>
517 518
       </Form>
518 519
       <Button name="admin.taShareRecord.export.get" noRight={null} type="primary" onClick={() => exportRecord()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
519 520
         导出
@@ -531,11 +532,11 @@ function helpRecord(row) {
531 532
 
532 533
       {groupStatus === '0' ?
533 534
         <Table dataSource={dataSource.records} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
534
-        <Table dataSource={dataSource.records} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> 
535
+        <Table dataSource={dataSource.records} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" />
535 536
       }
536
-       <InviteTable visibleData={gInviteData} />
537
-       {/* 核销 */}
538
-       <Verifier visibleData={gVerifierData} onSuccess={(e) => onSuccess(e)} />
537
+      <InviteTable visibleData={gInviteData} />
538
+      {/* 核销 */}
539
+      <Verifier visibleData={gVerifierData} onSuccess={(e) => onSuccess(e)} />
539 540
     </>
540 541
   );
541 542
 }

+ 27
- 25
src/pages/activity/groupActivity/list.jsx ファイルの表示

@@ -10,6 +10,7 @@ import apis from '../../../services/apis';
10 10
 import request from '../../../utils/request';
11 11
 import AuthButton from '@/components/AuthButton';
12 12
 import Prompt from 'umi/prompt';
13
+import Navigate from '@/components/Navigate';
13 14
 
14 15
 const { Option } = Select;
15 16
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
@@ -28,7 +29,7 @@ const header = props => {
28 29
       localStorage.setItem("groupActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
29 30
       getList({ pageNum: 1, pageSize: 10 });
30 31
     }
31
- 
32
+
32 33
   }, [])
33 34
 
34 35
   // 查询列表
@@ -58,16 +59,16 @@ const header = props => {
58 59
         groupActivityId,
59 60
       },
60 61
     });
61
-  } 
62
+  }
62 63
 
63 64
   const getJoinPeople = (groupActivityId) => () => {
64 65
     router.push({
65 66
       pathname: '/activity/groupActivity/helpRecord',
66 67
       query: {
67
-          groupActivityId,
68
+        groupActivityId,
68 69
       },
69 70
     });
70
-  } 
71
+  }
71 72
 
72 73
   const toDataReacord = id => {
73 74
     router.push({
@@ -91,8 +92,9 @@ const header = props => {
91 92
       dataIndex: 'activityName',
92 93
       key: 'activityName',
93 94
       align: 'center',
94
-      render:  (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
95
-                              <span style={{color: 'blue',cursor: 'pointer'}} onClick={getActivityDetail(row.groupActivityId)}>{row.activityName}</span></div></>,
95
+      render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
96
+        <Navigate onClick={getActivityDetail(row.groupActivityId)}>{row.activityName}</Navigate></div></>,
97
+      // <span style={{color: 'blue',cursor: 'pointer'}} onClick={getActivityDetail(row.groupActivityId)}>{row.activityName}</span></div></>,
96 98
     },
97 99
     {
98 100
       title: '活动时间',
@@ -112,8 +114,8 @@ const header = props => {
112 114
       dataIndex: 'participateNum',
113 115
       key: 'participateNum',
114 116
       align: 'center',
115
-      render: (x, row) => <><div style={{overflow: 'hidden',textOverflow: 'ellipsis',whiteSpace: 'nowrap', width: '201px',title:'content'}}>
116
-                            <span style={{color: 'blue',cursor: 'pointer'}} onClick={getJoinPeople(row.groupActivityId)}>{row.participateNum}</span></div></>,
117
+      render: (x, row) => <><div style={{ overflow: 'hidden', textOverflow: 'ellipsis', whiteSpace: 'nowrap', width: '201px', title: 'content' }}>
118
+        <span style={{ color: 'blue', cursor: 'pointer' }} onClick={getJoinPeople(row.groupActivityId)}>{row.participateNum}</span></div></>,
117 119
     },
118 120
     {
119 121
       title: '成团数',
@@ -150,7 +152,7 @@ const header = props => {
150 152
           }
151 153
           {
152 154
             <AuthButton name="admin.taShareActivity.publish" noRight={null}>
153
-              <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
155
+              <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>
154 156
             </AuthButton>
155 157
           }
156 158
           {
@@ -160,7 +162,7 @@ const header = props => {
160 162
             <AuthButton name="admin.taShareActivity.top" noRight={null}>
161 163
               <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={recommendGroupActivity(row)}>{row.sort === true ? '取消推荐首页' : '推荐首页'}<Icon type="vertical-align-top" className={styles.edit} /></span>
162 164
             </AuthButton>}
163
-            {<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => toDataReacord(row.groupActivityId)}>数据记录<Icon type="form" className={styles.edit} /></span>}
165
+          {<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={() => toDataReacord(row.groupActivityId)}>数据记录<Icon type="form" className={styles.edit} /></span>}
164 166
           {(row.activityStatus === 0 || row.activityStatus === 1) &&
165 167
             <AuthButton name="admin.taShareActivity.update.put" noRight={null}>
166 168
               <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditActivity(row.groupActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
@@ -170,13 +172,13 @@ const header = props => {
170 172
       ),
171 173
     },
172 174
   ];
173
-  
175
+
174 176
   const finishDynamic = (row) => {
175 177
     Modal.confirm({
176 178
       title: '结束以后将无法编辑, 是否继续?',
177 179
       okText: '确定',
178 180
       cancelText: '取消',
179
-      onOk () {
181
+      onOk() {
180 182
         request({ ...apis.activity.finish, data: { dynamicId: row.dynamicId, top: "" } }).then((data) => {
181 183
           console.log(data)
182 184
           message.info('操作成功!')
@@ -195,7 +197,7 @@ const header = props => {
195 197
       title: '活动会被强制结束,小程序端无法再发起或参与此拼团,如果不想让客户看到活动,请再点击取消发布按钮',
196 198
       okText: '确定',
197 199
       cancelText: '取消',
198
-      onOk () {
200
+      onOk() {
199 201
         request({ ...apis.groupActivity.finish, urlData: { id: row.groupActivityId } }).then((data) => {
200 202
           console.log(data)
201 203
           message.info('操作成功!')
@@ -278,7 +280,7 @@ const header = props => {
278 280
 
279 281
   const changePageNum = pageNumber => {
280 282
     localStorage.setItem("groupActivePageParams", JSON.stringify({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() }));
281
-   
283
+
282 284
     getList({ pageNum: pageNumber, pageSize: 10, ...props.form.getFieldsValue() })
283 285
   }
284 286
 
@@ -295,7 +297,7 @@ const header = props => {
295 297
   }
296 298
 
297 299
   //重置搜索
298
-  function handleReset () {
300
+  function handleReset() {
299 301
     props.form.resetFields();
300 302
     localStorage.setItem("groupActivePageParams", JSON.stringify({ pageNum: 1, pageSize: 10 }));
301 303
     getList({ pageNum: 1, pageSize: 10 })
@@ -335,9 +337,9 @@ const header = props => {
335 337
           )}
336 338
         </Form.Item>
337 339
         <Form.Item>
338
-        <AuthButton name="admin.taShareActivity.search" noRight={null}>
339
-          <Button type="primary" htmlType="submit" className={styles.searchBtn}>
340
-            搜索
340
+          <AuthButton name="admin.taShareActivity.search" noRight={null}>
341
+            <Button type="primary" htmlType="submit" className={styles.searchBtn}>
342
+              搜索
341 343
           </Button>
342 344
           </AuthButton>
343 345
           <Button style={{ marginLeft: 8 }} onClick={handleReset}>
@@ -348,13 +350,13 @@ const header = props => {
348 350
       <AuthButton name="admin.taShareActivity.post" noRight={null}>
349 351
         <Button type="danger" className={styles.addBtn} onClick={toEditActivity()}>新增</Button>
350 352
       </AuthButton>
351
-      <Table 
352
-      // onRow={record => {
353
-      //     return {
354
-      //       onClick: getActivityDetail(record.groupActivityId),
355
-      //     };
356
-      //   }}
357
-        style={{marginTop:'30px'}} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
353
+      <Table
354
+        // onRow={record => {
355
+        //     return {
356
+        //       onClick: getActivityDetail(record.groupActivityId),
357
+        //     };
358
+        //   }}
359
+        style={{ marginTop: '30px' }} dataSource={data.records} columns={columns} pagination={false} rowKey="activityList" />
358 360
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
359 361
         <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
360 362
       </div>

+ 73
- 73
src/pages/activity/helpActivity/helpRecord.jsx ファイルの表示

@@ -25,12 +25,12 @@ class InviteTable extends React.Component {
25 25
   }
26 26
 
27 27
   // 挂载之后
28
-  componentDidMount () {
28
+  componentDidMount() {
29 29
     const { helpId } = this.state.visibleData
30 30
     this.getList({ helpRecordInitiateId: helpId, pageNum: 1, pageSize: 5 })
31 31
   }
32 32
 
33
-  componentDidUpdate (preProps, preState) {
33
+  componentDidUpdate(preProps, preState) {
34 34
     const { helpId } = this.state.visibleData
35 35
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
36 36
       this.getList({ helpRecordInitiateId: helpId, pageNum: 1, pageSize: 5 })
@@ -40,18 +40,18 @@ class InviteTable extends React.Component {
40 40
 
41 41
   // 弹框确定按钮
42 42
   // eslint-disable-next-line react/sort-comp
43
-  handleOk () {
43
+  handleOk() {
44 44
     this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
45 45
     this.props.onCancel()
46 46
   }
47 47
 
48 48
   // 弹框取消按钮
49
-  handleCancel () {
49
+  handleCancel() {
50 50
     this.setState({ visibleData: { visible: false, helpId: '', realtyConsultant: '' } })
51 51
     this.props.onCancel()
52 52
   }
53 53
 
54
-  getList (params) {
54
+  getList(params) {
55 55
     if (params.helpRecordInitiateId === '') {
56 56
       return
57 57
     }
@@ -92,12 +92,12 @@ class InviteTable extends React.Component {
92 92
 
93 93
   // 分页
94 94
   // eslint-disable-next-line react/sort-comp
95
-  onChange (pageNum) {
95
+  onChange(pageNum) {
96 96
     const { helpId } = this.state.visibleData
97 97
     this.getList({ helpRecordInitiateId: helpId, pageNum: pageNum, pageSize: 5 })
98 98
   }
99 99
 
100
-  render () {
100
+  render() {
101 101
     const columns = [
102 102
       {
103 103
         title: '用户姓名',
@@ -132,10 +132,10 @@ class InviteTable extends React.Component {
132 132
           onCancel={e => this.handleCancel(e)}
133 133
         >
134 134
 
135
-      <Button name="admin.HelpInitiateRecordSucceed.export.get" noRight={null} type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
136
-        导出
135
+          <Button name="admin.HelpInitiateRecordSucceed.export.get" noRight={null} type="primary" onClick={() => this.exportHelp()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
136
+            导出
137 137
       </Button>
138
-          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
138
+          <Table rowKey="independent" dataSource={this.state.dataSource.records} columns={columns} pagination={{ pageSize: 5, total: this.state.dataSource.total, onChange: e => this.onChange(e) }} />
139 139
         </Modal>
140 140
       </>
141 141
     );
@@ -156,11 +156,11 @@ class Verifier extends React.Component {
156 156
   }
157 157
 
158 158
   // 挂载之后
159
-  componentDidMount () {
159
+  componentDidMount() {
160 160
     const { helpId } = this.state.visibleData
161 161
   }
162 162
 
163
-  componentDidUpdate (preProps, preState) {
163
+  componentDidUpdate(preProps, preState) {
164 164
     const { helpId } = this.state.visibleData
165 165
     if (this.props.visibleData.visible !== preState.visibleData.visible) {
166 166
       // eslint-disable-next-line react/no-did-update-set-state
@@ -170,19 +170,19 @@ class Verifier extends React.Component {
170 170
 
171 171
   // 弹框确定按钮
172 172
   // eslint-disable-next-line react/sort-comp
173
-  handleOk () {
173
+  handleOk() {
174 174
     this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
175 175
   }
176 176
 
177 177
   // 弹框取消按钮
178
-  handleCancel () {
178
+  handleCancel() {
179 179
     console.log('核销关闭');
180 180
     // this.setState({ visibleData: { visible: false, helpId: '', helpRecordInitiateId: '', verificationCode: '' } })
181 181
     this.props.onCancel()
182 182
   }
183 183
 
184 184
   // eslint-disable-next-line class-methods-use-this
185
-  audit (params) {
185
+  audit(params) {
186 186
     request({ ...apis.helpActivity.verification, params: { ...params } }).then(res => {
187 187
       // eslint-disable-next-line no-undef
188 188
       message.info('核销成功')
@@ -210,7 +210,7 @@ class Verifier extends React.Component {
210 210
     this.audit({ helpRecordInitiateId: this.state.visibleData.helpId, verifyCode: this.state.visibleData.verificationCode })
211 211
   }
212 212
 
213
-  render () {
213
+  render() {
214 214
     return (
215 215
       <>
216 216
         <Modal
@@ -222,8 +222,8 @@ class Verifier extends React.Component {
222 222
           // onOk={() => this.handleOk()}
223 223
           onCancel={e => this.handleCancel(e)}
224 224
         >
225
-          <div><span>核销码:<input style={{marginLeft: '10px'}} onChange={this.verify.bind(this)}/></span>
226
-           <Button name="admin.helpInitiateRecordVerify.post" noRight={null} onClick={e => this.verification(e)} style={{ marginLeft: '80px', marginTop:'10px', backgroundColor:'red' }}><span style={{color:'white'}}>立即核销</span></Button>
225
+          <div><span>核销码:<input style={{ marginLeft: '10px' }} onChange={this.verify.bind(this)} /></span>
226
+            <Button name="admin.helpInitiateRecordVerify.post" noRight={null} onClick={e => this.verification(e)} style={{ marginLeft: '80px', marginTop: '10px', backgroundColor: 'red' }}><span style={{ color: 'white' }}>立即核销</span></Button>
227 227
           </div>
228 228
         </Modal>
229 229
       </>
@@ -342,7 +342,7 @@ function body(props) {
342 342
     });
343 343
   }
344 344
 
345
-  function exportCustomer () {
345
+  function exportCustomer() {
346 346
     const fieldsValue = getFieldsValue()
347 347
     request({ ...apis.helpActivity.HelpInitiateRecordSucceed, responseType: 'blob', params: { ...fieldsValue, customerType, helpActivityId, condition: customerType } })
348 348
       .then(response => {
@@ -352,7 +352,7 @@ function body(props) {
352 352
       })
353 353
   }
354 354
 
355
-  function download (data) {
355
+  function download(data) {
356 356
     if (!data) {
357 357
       return
358 358
     }
@@ -365,41 +365,41 @@ function body(props) {
365 365
     link.click()
366 366
   }
367 367
 
368
-// 助力记录弹框
369
-function helpRecord(row) {
370
-  setVerifierData({ visible: false, helpId: row.helpRecordInitiateId, elpRecordInitiateId: '', verificationCode: '' })
371
-  setGInviteData({ visible: true, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
372
-}
373
- // 核销
374
- function helpInitiateRecordVerify(row) {
375
-// 关闭助力记录弹框
376
-  setGInviteData({ visible: false, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
377
-
378
-  // 核销
379
-  setVerifierData({ visible: true, helpId: row.helpRecordInitiateId, helpActivityId: row.helpActivityId, elpRecordInitiateId: '', verificationCode: '' })
380
- }
381
- // 核销回调
382
- function onSuccess(e) {
383
-   console.log('回调:', e)
384
-   getList(e)
385
-    
386
-   // 关闭
387
-   onCancel()
388
- }
389
-
390
- function onCancel(e) {
368
+  // 助力记录弹框
369
+  function helpRecord(row) {
370
+    setVerifierData({ visible: false, helpId: row.helpRecordInitiateId, elpRecordInitiateId: '', verificationCode: '' })
371
+    setGInviteData({ visible: true, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
372
+  }
391 373
   // 核销
392
-  setVerifierData({ visible: false, helpId: '', helpActivityId: '', elpRecordInitiateId: '', verificationCode: '' })
393
-  // 助力者
394
-  setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
395
- }
396
-
397
- // 返回到首页
398
- function returList(params) {
399
-  router.push({
374
+  function helpInitiateRecordVerify(row) {
375
+    // 关闭助力记录弹框
376
+    setGInviteData({ visible: false, helpId: row.helpRecordInitiateId, realtyConsultant: row.realtyConsultant })
377
+
378
+    // 核销
379
+    setVerifierData({ visible: true, helpId: row.helpRecordInitiateId, helpActivityId: row.helpActivityId, elpRecordInitiateId: '', verificationCode: '' })
380
+  }
381
+  // 核销回调
382
+  function onSuccess(e) {
383
+    console.log('回调:', e)
384
+    getList(e)
385
+
386
+    // 关闭
387
+    onCancel()
388
+  }
389
+
390
+  function onCancel(e) {
391
+    // 核销
392
+    setVerifierData({ visible: false, helpId: '', helpActivityId: '', elpRecordInitiateId: '', verificationCode: '' })
393
+    // 助力者
394
+    setGInviteData({ visible: false, helpId: '', realtyConsultant: '' })
395
+  }
396
+
397
+  // 返回到首页
398
+  function returList(params) {
399
+    router.push({
400 400
       pathname: '/activity/helpActivity/list',
401 401
     });
402
-}
402
+  }
403 403
 
404 404
   const publicColumns = [
405 405
     {
@@ -430,7 +430,7 @@ function helpRecord(row) {
430 430
       key: 'helpCount',
431 431
       align: 'center',
432 432
       width: '15%',
433
-      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.helpCount}/{record.persionNumCount}</a>,
433
+      render: (text, record) => <a style={{ color: '#66B3FF' }} onClick={() => helpRecord(record)}>{record.helpCount}/{record.persionNumCount}</a>,
434 434
     },
435 435
   ]
436 436
 
@@ -467,7 +467,7 @@ function helpRecord(row) {
467 467
       key: 'helpCount',
468 468
       align: 'center',
469 469
       width: '15%',
470
-      render: (text, record) => <a style={ { color: '#66B3FF' } } onClick={() => helpRecord(record)}>{record.helpCount}人</a>,
470
+      render: (text, record) => <a style={{ color: '#66B3FF' }} onClick={() => helpRecord(record)}>{record.helpCount}人</a>,
471 471
     },
472 472
     {
473 473
       title: '核销状态',
@@ -488,10 +488,10 @@ function helpRecord(row) {
488 488
       render: (x, row) => (
489 489
         <>
490 490
           {row.verificationStatus === 0 &&
491
-          <AuthButton name="admin.SignList.get" noRight={null}>
492
-           <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={() => helpInitiateRecordVerify(row)}>核销</span>
493
-          </AuthButton>
494
-        }
491
+            <AuthButton name="admin.SignList.get" noRight={null}>
492
+              <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={() => helpInitiateRecordVerify(row)}>核销</span>
493
+            </AuthButton>
494
+          }
495 495
         </>
496 496
       ),
497 497
     },
@@ -499,7 +499,7 @@ function helpRecord(row) {
499 499
 
500 500
   return (
501 501
     <>
502
-    {console.log('customerType', customerType)}
502
+      {console.log('customerType', customerType)}
503 503
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
504 504
         <Form.Item>
505 505
           {getFieldDecorator('tel')(
@@ -510,34 +510,34 @@ function helpRecord(row) {
510 510
           )}
511 511
         </Form.Item>
512 512
         <Form.Item>
513
-            <Button type="primary" htmlType="submit" >
514
-              搜索
515
-            </Button>
516
-            <Button style={{ marginLeft: 8 }} onClick={handleReset}>
517
-              重置
513
+          <Button type="primary" htmlType="submit" >
514
+            搜索
518 515
             </Button>
519
-            <Button style={{ marginLeft: 8 }} onClick={returList}>
520
-              返回
516
+          <Button style={{ marginLeft: 8 }} onClick={handleReset}>
517
+            重置
521 518
             </Button>
522 519
         </Form.Item>
520
+        <Button style={{ float: 'right' }} onClick={returList}>
521
+          返回
522
+        </Button>
523 523
       </Form>
524 524
       <Button name="admin.helpRecord.export.get" noRight={null} type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
525 525
         导出
526 526
       </Button>
527 527
 
528 528
       <div style={{ margin: '20px 0' }}>
529
-          <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
530
-            <Radio.Button value="helpSucceed">助力成功</Radio.Button>
531
-            <Radio.Button value="helpUnderway">进行中</Radio.Button>
532
-            <Radio.Button value="helpUnfinished">助力失败</Radio.Button>
533
-          </Radio.Group>
529
+        <Radio.Group value={customerType} onChange={radioButtonHandleSizeChange} buttonStyle="solid">
530
+          <Radio.Button value="helpSucceed">助力成功</Radio.Button>
531
+          <Radio.Button value="helpUnderway">进行中</Radio.Button>
532
+          <Radio.Button value="helpUnfinished">助力失败</Radio.Button>
533
+        </Radio.Group>
534 534
       </div>
535 535
       {customerType === 'helpSucceed' ?
536 536
         <Table dataSource={dataSource.list} columns={privateColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" /> :
537 537
         <Table dataSource={dataSource.list} columns={publicColumns} pagination={{ total: dataSource.total, onChange }} rowKey="customerList" />
538 538
       }
539
-        <Verifier visibleData={gVerifierData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)} />
540
-       <InviteTable visibleData={gInviteData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)}/>
539
+      <Verifier visibleData={gVerifierData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)} />
540
+      <InviteTable visibleData={gInviteData} onSuccess={e => onSuccess(e)} onCancel={(e) => onCancel(e)} />
541 541
     </>
542 542
   );
543 543
 }

+ 3
- 3
src/pages/activity/helpActivity/signList.jsx ファイルの表示

@@ -515,10 +515,10 @@ function helpRecord(row) {
515 515
             <Button style={{ marginLeft: 8 }} onClick={handleReset}>
516 516
               重置
517 517
             </Button>
518
-            <Button style={{ marginLeft: 8 }} onClick={returList}>
519
-              返回
520
-            </Button>
521 518
         </Form.Item>
519
+        <Button style={{ float: 'right' }} onClick={returList}>
520
+          返回
521
+        </Button>
522 522
       </Form>
523 523
       <Button name="admin.helpRecord.export.get" noRight={null} type="primary" onClick={() => exportCustomer()} style={{ float: 'right', margin: '20px 0', zIndex: 1 }}>
524 524
         导出

+ 1
- 1
src/pages/building/list/add/components/buildingImage.jsx ファイルの表示

@@ -223,7 +223,7 @@ function BuildingImageModel(props) {
223 223
 
224 224
   return (
225 225
     <>
226
-      <Button type="danger" style={{ marginLeft: '18px', float: 'right' }} onClick={() => router.go(-1)}>返回</Button>
226
+      <Button style={{ marginLeft: '18px', float: 'right' }} onClick={() => router.go(-1)}>返回</Button>
227 227
       <span style={{ marginTop: '10px', marginBottom: '10px' }}>{props.apartment.apartmentName}({imageList.length})</span>
228 228
       <Button type="link" style={{ color: 'blue' }} onClick={() => edi()}>重命名</Button>
229 229
       <Button type="link" style={{ color: 'blue' }} onClick={() => deletePhoto()}>删除相册</Button>

+ 11
- 9
src/pages/building/list/add/components/imageSet.jsx ファイルの表示

@@ -125,7 +125,7 @@ function imageSet(props) {
125 125
           // openNotificationWithIcon('error', err.message)
126 126
         })
127 127
       },
128
-      onCancel() {},
128
+      onCancel() { },
129 129
     });
130 130
   }
131 131
 
@@ -140,31 +140,31 @@ function imageSet(props) {
140 140
       title: '销售状态',
141 141
       dataIndex: 'marketStatus',
142 142
       key: 'marketStatus',
143
-      render: (_, record) => <span>{ (saleType.filter(x => x.id == record.marketStatus)[0] || {}).name }</span>,
143
+      render: (_, record) => <span>{(saleType.filter(x => x.id == record.marketStatus)[0] || {}).name}</span>,
144 144
     },
145 145
     {
146 146
       title: '户型',
147 147
       dataIndex: 'houseType',
148 148
       key: 'houseType',
149
-      render: (_, record) => <span>{ (houseType.filter(x => x.id == record.houseType)[0] || {}).name }</span>,
149
+      render: (_, record) => <span>{(houseType.filter(x => x.id == record.houseType)[0] || {}).name}</span>,
150 150
     },
151 151
     {
152 152
       title: '面积',
153 153
       dataIndex: 'buildingArea',
154 154
       key: 'buildingArea',
155
-      render: (buildingArea, _) => <span>{ `${buildingArea === 0 || buildingArea === null ? "-" : buildingArea + "m²"}` }</span>,
155
+      render: (buildingArea, _) => <span>{`${buildingArea === 0 || buildingArea === null ? "-" : buildingArea + "m²"}`}</span>,
156 156
     },
157 157
     {
158 158
       title: '使用面积',
159 159
       dataIndex: 'insideArea',
160 160
       key: 'insideArea',
161
-      render: (insideArea, _) => <span>{ `${insideArea === 0 || insideArea === null ? "-" : insideArea + "m²"}` }</span>,
161
+      render: (insideArea, _) => <span>{`${insideArea === 0 || insideArea === null ? "-" : insideArea + "m²"}`}</span>,
162 162
     },
163 163
     {
164 164
       title: '创建时间',
165 165
       dataIndex: 'createDate',
166 166
       key: 'createDate',
167
-      render: (_, record) => <span>{ moment(record.createDate).format('YYYY-MM-DD HH:mm:ss') }</span>,
167
+      render: (_, record) => <span>{moment(record.createDate).format('YYYY-MM-DD HH:mm:ss')}</span>,
168 168
     },
169 169
     {
170 170
       title: '操作',
@@ -181,13 +181,15 @@ function imageSet(props) {
181 181
 
182 182
   return (
183 183
     <>
184
-      <Button type="primary" onClick={() => showEdi()}>新增户型</Button>
185
-      <Button type="danger" style={{ marginLeft: '18px'}} onClick={() => router.go(-1)}>返回</Button>
184
+      <div style={{ display: 'flex', alignItems: 'center', marginBottom: '16px', justifyContent: 'space-between' }}>
185
+        <Button type="primary" onClick={() => showEdi()}>新增户型</Button>
186
+        <Button onClick={() => router.go(-1)}>返回</Button>
187
+      </div>
186 188
       <Table dataSource={data} columns={columns} pagination={false} rowKey="imageSet" />
187 189
 
188 190
       {/* 编辑页 */}
189 191
       {/*  onSuccess是子组件传递事件信息  */}
190
-      <ModalImage visibleData={visibleData} key="ModalImage" onSuccess={() => onModalChange()}/>
192
+      <ModalImage visibleData={visibleData} key="ModalImage" onSuccess={() => onModalChange()} />
191 193
     </>
192 194
   )
193 195
 }

+ 10
- 8
src/pages/building/list/add/components/panoramaImage.jsx ファイルの表示

@@ -99,11 +99,11 @@ function panoramaImage(props) {
99 99
    */
100 100
   function showEdi(record) {
101 101
     // 网路请求
102
-    request({ ...apis.paorama.panoramaApartList, params: { buildingId:  props.building.buildingId } }).then(res => {
102
+    request({ ...apis.paorama.panoramaApartList, params: { buildingId: props.building.buildingId } }).then(res => {
103 103
       setVisibleData({ visible: true, apartmentId: record === undefined ? '' : record.apartmentId, buildingId: props.building.buildingId, panoramaType: "apartment", panoramaList: res })
104
-     }).catch(err => {
104
+    }).catch(err => {
105 105
       this.openNotificationWithIcon('error', err)
106
-     })
106
+    })
107 107
   }
108 108
 
109 109
   /**
@@ -126,7 +126,7 @@ function panoramaImage(props) {
126 126
           // openNotificationWithIcon('error', err.message)
127 127
         })
128 128
       },
129
-      onCancel() {},
129
+      onCancel() { },
130 130
     });
131 131
   }
132 132
 
@@ -136,7 +136,7 @@ function panoramaImage(props) {
136 136
       title: '封面图',
137 137
       dataIndex: 'coverImg',
138 138
       key: 'coverImg',
139
-      render: (x, record) =>  <img style={{ width: '150px', height: '120px' }} src={x} alt="" />,
139
+      render: (x, record) => <img style={{ width: '150px', height: '120px' }} src={x} alt="" />,
140 140
     },
141 141
     {
142 142
       title: '类型',
@@ -168,13 +168,15 @@ function panoramaImage(props) {
168 168
 
169 169
   return (
170 170
     <>
171
-      <Button type="primary" onClick={() => showEdi()}>新增全景图</Button>
172
-      <Button type="danger" style={{ marginLeft: '18px'}} onClick={() => router.go(-1)}>返回</Button>
171
+      <div style={{ display: 'flex', alignItems: 'center', marginBottom: '16px', justifyContent: 'space-between' }}>
172
+        <Button type="primary" onClick={() => showEdi()}>新增全景图</Button>
173
+        <Button onClick={() => router.go(-1)}>返回</Button>
174
+      </div>
173 175
       <Table dataSource={data} columns={columns} pagination={false} rowKey="imageSet" />
174 176
 
175 177
       {/* 编辑页 */}
176 178
       {/*  onSuccess是子组件传递事件信息  */}
177
-      <ModalPanoramaImage visibleData={visibleData} key="ModalImage" onSuccess={() => onModalChange()}/>
179
+      <ModalPanoramaImage visibleData={visibleData} key="ModalImage" onSuccess={() => onModalChange()} />
178 180
     </>
179 181
   )
180 182
 }

+ 5
- 2
src/pages/customer/customerlist/customerDetail.jsx ファイルの表示

@@ -123,7 +123,10 @@ function header(props) {
123 123
   ];
124 124
   return (
125 125
     <>
126
-      <Button type="danger" style={{ marginBottom: '18px' }} onClick={() => router.go(-1)}>返回</Button>
126
+      <div style={{ textAlign: 'right', marginBottom:'16px'}}>
127
+        <Button onClick={() => router.go(-1)}>返回</Button>
128
+      </div>
129
+
127 130
       <div className={styles.cardBox}>
128 131
         <div className={styles.rightBox}>
129 132
           <p className={styles.tit}>客户信息</p>
@@ -199,7 +202,7 @@ function header(props) {
199 202
       <div className={styles.recordBox}>
200 203
         <p className={styles.tableName}>访问记录</p>
201 204
         <BuildSelect onChange={changBuilding} value={buildingIdValue} />
202
-        <Table dataSource={tableData.records} columns={columns} style={{marginTop: '15px'}} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
205
+        <Table dataSource={tableData.records} columns={columns} style={{ marginTop: '15px' }} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
203 206
         {/* <Pagination showQuickJumper defaultCurrent={1} total={data.records} onChange={e => changePageNum(e)} current={data.visitRecords.total}/> */}
204 207
       </div>
205 208
       <Prompt message={location =>

+ 33
- 31
src/pages/customer/customerlist/publicCustomerDetail.jsx ファイルの表示

@@ -1,5 +1,5 @@
1 1
 import React, { useState, useEffect } from 'react';
2
-import { Form, Table, Pagination,Button } from 'antd';
2
+import { Form, Table, Pagination, Button } from 'antd';
3 3
 import { FormattedMessage } from 'umi-plugin-react/locale';
4 4
 import publicStyle from './publicStyle.less';
5 5
 import apis from '../../../services/apis';
@@ -16,8 +16,8 @@ function header(props) {
16 16
    * @returns
17 17
    */
18 18
   // eslint-disable-next-line react-hooks/rules-of-hooks
19
-  const [data, setData] = useState([{ }])
20
-  const [tableData, setTableDataData] = useState([{ }])
19
+  const [data, setData] = useState([{}])
20
+  const [tableData, setTableDataData] = useState([{}])
21 21
   const [dataConsultant, setDataonsultant] = useState({})
22 22
   const [intentionData, setIntentionData] = useState([])
23 23
   const [buildingIdValue, setBuildingIdData] = useState()
@@ -44,8 +44,8 @@ function header(props) {
44 44
         }]),
45 45
       )
46 46
       arr.push(a)
47
-   }
48
-   setIntentionData(arr)
47
+    }
48
+    setIntentionData(arr)
49 49
   }
50 50
 
51 51
   // 查询
@@ -62,12 +62,12 @@ function header(props) {
62 62
       setIntentionData(res.intentions)
63 63
     })
64 64
   }
65
-// 分页
66
-// 分页
67
-function onChange(number) {
68
-  if (id === '' || id === undefined) {
69
-    return
70
-  }
65
+  // 分页
66
+  // 分页
67
+  function onChange(number) {
68
+    if (id === '' || id === undefined) {
69
+      return
70
+    }
71 71
     request({ ...apis.customer.cecommendPublic, urlData: { id }, params: { pageNumber: number, pageSize: 10 } }).then(res => {
72 72
       setData(res)
73 73
       setTableDataData(res.visitRecords)
@@ -98,14 +98,14 @@ function onChange(number) {
98 98
       dataIndex: 'visitTime',
99 99
       key: 'visitTime',
100 100
       align: 'center',
101
-      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss') }</span>,
101
+      render: (_, record) => <span> {moment(record.visitTime).format('YYYY-MM-DD HH:mm:ss')}</span>,
102 102
     },
103 103
     {
104 104
       title: '停留时间',
105 105
       dataIndex: 'visitDuration',
106 106
       key: 'visitDuration',
107 107
       align: 'center',
108
-      render: (_, record) => <span>{record.visitDuration === null ? 0 : record.visitDuration }秒</span>,
108
+      render: (_, record) => <span>{record.visitDuration === null ? 0 : record.visitDuration}秒</span>,
109 109
     },
110 110
   ]
111 111
   // 意向
@@ -113,8 +113,8 @@ function onChange(number) {
113 113
     {
114 114
       title: 'Name',
115 115
       dataIndex: 'name',
116
-      width:200,
117
-    render: (_, record) => <span>{record.buildingName}</span>,
116
+      width: 200,
117
+      render: (_, record) => <span>{record.buildingName}</span>,
118 118
     },
119 119
     {
120 120
       title: 'Address',
@@ -125,28 +125,30 @@ function onChange(number) {
125 125
 
126 126
   return (
127 127
     <>
128
-    <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px' }}>返回</Button>
128
+      <div style={{ textAlign: 'right', marginBottom: '16px' }}>
129
+        <Button onClick={() => router.go(-1)}>返回</Button>
130
+      </div>
129 131
       <div className={publicStyle.cardBox}>
130
-     {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
132
+        {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
131 133
         <div className={publicStyle.rightBox}>
132 134
           <p className={publicStyle.tit}>客户信息</p>
133
-          <img className={publicStyle.touxiang} src={ data.avatarurl && data.avatarurl } />
135
+          <img className={publicStyle.touxiang} src={data.avatarurl && data.avatarurl} />
134 136
           <div className={publicStyle.right}>
135
-            <p className={publicStyle.rightItem}>用户名称:{ data.name === null ? data.nickname : data.name }</p>
136
-            <p className={publicStyle.rightItem}>手机号码:{ data.phone }</p>
137
+            <p className={publicStyle.rightItem}>用户名称:{data.name === null ? data.nickname : data.name}</p>
138
+            <p className={publicStyle.rightItem}>手机号码:{data.phone}</p>
137 139
             <p className={publicStyle.rightItem}>首次访问时间:{data.visitTime && moment(data.visitTime).format('YYYY-MM-DD')}</p>
138 140
           </div>
139 141
           <div className={publicStyle.Centered}>
140
-          <p>访问时长:{ data.duration }秒</p>
141
-          <p>访问次数:{ data.visitTimes }次</p>
142
-          <p className={publicStyle.rightItem}>来源渠道:{data.personFrom ? data.personFrom : '其他'}</p>
143
-          {/* <p>预约人数:{ data.visiteNum }</p> */}
142
+            <p>访问时长:{data.duration}秒</p>
143
+            <p>访问次数:{data.visitTimes}次</p>
144
+            <p className={publicStyle.rightItem}>来源渠道:{data.personFrom ? data.personFrom : '其他'}</p>
145
+            {/* <p>预约人数:{ data.visiteNum }</p> */}
144 146
           </div>
145 147
           {/* <p className={styles.rightItem}>预约到访时间:{data.appointmentTime && moment(data.appointmentTime).format('YYYY-MM-DD') }</p> */}
146 148
           <div className={publicStyle.rightInfo}>
147
-            <p className={publicStyle.rightItem}>国家:{ data && data.country }</p>
148
-            <p className={publicStyle.rightItem}>省份:{ data && data.province }</p>
149
-            <p className={publicStyle.rightItem}>城市:{ data && data.city }</p>
149
+            <p className={publicStyle.rightItem}>国家:{data && data.country}</p>
150
+            <p className={publicStyle.rightItem}>省份:{data && data.province}</p>
151
+            <p className={publicStyle.rightItem}>城市:{data && data.city}</p>
150 152
             {/* <p className={styles.rightItem}>详细信息:</p> */}
151 153
             {/* <p className={styles.rightItem}>意向项目:{data.intention }</p> */}
152 154
             {/* <p className={styles.rightItem}>客户说明:{ data.verifyRemark }</p> */}
@@ -155,19 +157,19 @@ function onChange(number) {
155 157
         {/* { console.log("data:",data),console.log("data:",dataConsultant)} */}
156 158
         <div className={publicStyle.leftBoxCentre}>
157 159
           <div className={publicStyle.tit}>
158
-                <span>项目名称</span>
159
-                <span style={{ float: 'right' }}>意向值</span>
160
+            <span>项目名称</span>
161
+            <span style={{ float: 'right' }}>意向值</span>
160 162
           </div>
161 163
           {/* <img className={styles.touxiang} src={ data.picture && data.picture } /> */}
162 164
           <div className={publicStyle.infoItem}>
163
-          <Table columnWidth={10} showHeader={false} columns={intention} dataSource={intentionData} pagination={false} scroll={intentionData.length >= 3 ? { y: 240 } : false}/>
165
+            <Table columnWidth={10} showHeader={false} columns={intention} dataSource={intentionData} pagination={false} scroll={intentionData.length >= 3 ? { y: 240 } : false} />
164 166
           </div>
165 167
         </div>
166 168
       </div>
167 169
       <div className={publicStyle.recordBox}>
168 170
         <p className={publicStyle.tableName}>访问记录</p>
169 171
         <BuildSelect onChange={changBuilding} value={buildingIdValue} />
170
-        <Table dataSource={tableData.records} columns={columns} style={{marginTop: '15px'}} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
172
+        <Table dataSource={tableData.records} columns={columns} style={{ marginTop: '15px' }} pagination={{ pageSize: 10, total: tableData.total, onChange }} />
171 173
       </div>
172 174
       <Prompt message={location =>
173 175
         location.pathname.startsWith("/customer/customerlist")

+ 2
- 1
src/pages/eContract/manage/edit.jsx ファイルの表示

@@ -115,6 +115,7 @@ const header = props => {
115 115
     return (
116 116
 
117 117
         <>
118
+            <div align="right"><Button onClick={() => router.go(-1)}>返回</Button></div>
118 119
 
119 120
             {datas.map((x) => {
120 121
                 return <Row style={{ margin: '20px 0' }}>
@@ -130,7 +131,7 @@ const header = props => {
130 131
                     </Col>
131 132
                 </Row>
132 133
             })}
133
-            <div align="center"><Button className={Styles.rebtn} onClick={() => router.go(-1)}>返回</Button></div>
134
+        
134 135
 
135 136
         </>
136 137
     )

+ 2
- 7
src/pages/eContract/template/detail.jsx ファイルの表示

@@ -28,6 +28,8 @@ const header = props => {
28 28
 
29 29
   return (
30 30
     <>
31
+      <div align="right"><Button onClick={() => toCancel()}>返回</Button></div>
32
+
31 33
       <Form labelCol={{ span: 6 }} wrapperCol={{ span: 14 }} style={{ position: 'relative' }}>
32 34
         <Form.Item label="合同标题">
33 35
           <span>{data.contractTemplateName}</span>
@@ -36,13 +38,6 @@ const header = props => {
36 38
           <div><a href={data.contractTemplateAddress} target='_blank' style={{ color: '#66B3FF', fontSize: '14px' }}>
37 39
             查看文件</a></div>
38 40
         </Form.Item>
39
-        <Form.Item wrapperCol={{ span: 15, offset: 7 }}>
40
-          <div style={{ margin: '0.16rem 0 0.06rem' }}>
41
-            <Button onClick={() => toCancel()} style={{ marginLeft: '20px' }}>
42
-              返回
43
-          </Button>
44
-          </div>
45
-        </Form.Item>
46 41
       </Form>
47 42
     </>
48 43
   )

+ 2
- 1
src/pages/house/house/edit/components/house.jsx ファイルの表示

@@ -233,6 +233,7 @@ function House(props) {
233 233
   const { getFieldDecorator } = props.form
234 234
   return (
235 235
     <>
236
+      <div align="right"><Button onClick={() => router.go(-1)}>返回</Button></div>
236 237
       <Form layout="inline" onSubmit={e => handleSubmit(e)}>
237 238
         <Form.Item>
238 239
           {getFieldDecorator('termName')(
@@ -289,7 +290,7 @@ function House(props) {
289 290
       <Button type="danger" onClick={() => showEdi({ type: "add", houseId: '' })} style={{ marginTop: '20px' }}>新增房源</Button>
290 291
       <Button type="primary" onClick={() => showEdi({ type: "batch" })} style={{ marginLeft: '18px' }}>批量导入房源</Button>
291 292
       <Button type="primary" onClick={() => showAparement()} style={{ marginLeft: '18px' }}>批量修改对应户型</Button>
292
-      <Button type="danger" style={{ marginLeft: '18px' }} onClick={() => router.go(-1)}>返回</Button>
293
+
293 294
       <Table rowSelection={rowSelection} dataSource={data.records} columns={columns} pagination={{ defaultCurrent: 1, current: data.current, total: data.total, onChange: e => changePageNum(e) }} style={{ marginTop: '20px' }} rowKey={r => r.houseId} />
294 295
 
295 296
       <Modal

+ 62
- 62
src/pages/indexEcharts/userBehavior.jsx ファイルの表示

@@ -1,5 +1,5 @@
1 1
 import React, { Component, useState, useEffect } from 'react';
2
-import { Radio, DatePicker, Form, Input, Button, Icon, Select, message, Table , Row, Col, Menu, Dropdown } from 'antd';
2
+import { Radio, DatePicker, Form, Input, Button, Icon, Select, message, Table, Row, Col, Menu, Dropdown } from 'antd';
3 3
 
4 4
 import moment from 'moment';
5 5
 import UserBehavior from './components/UserBehavior'
@@ -151,31 +151,31 @@ const header = props => {
151 151
 
152 152
   const { getFieldDecorator, getFieldsError, getFieldError, isFieldTouched } = props.form;
153 153
   return (
154
-  <>
155
-    <div>
154
+    <>
156 155
       <div>
157
-        <Form layout="inline" onSubmit={handleSubmit}>
158
-          <Form.Item>
159
-            {getFieldDecorator('radioGroup')(
160
-              <Radio.Group buttonStyle="solid">
161
-                <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
162
-                <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
163
-              </Radio.Group>,
164
-            )}
165
-          </Form.Item>
166
-          <Form.Item>
167
-            {getFieldDecorator('rangePicker')(
168
-              <RangePicker
169
-                style={{ paddingLeft: '30px', width: '400px' }}
170
-                ranges={{
171
-                  Today: [moment(), moment()],
172
-                  'This Month': [moment().startOf('month'), moment().endOf('month')],
173
-                }}
174
-                // defaultValue={[moment(new Date(new Date().setDate((new Date().getDate() - 6))), 'YYYY-MM-DD HH:MM:SS'), moment(new Date(), 'YYYY-MM-DD HH:MM:SS')]}
175
-                showTime
176
-              />,
177
-            )}
178
-          </Form.Item>
156
+        <div>
157
+          <Form layout="inline" onSubmit={handleSubmit}>
158
+            <Form.Item>
159
+              {getFieldDecorator('radioGroup')(
160
+                <Radio.Group buttonStyle="solid">
161
+                  <Radio.Button value="a" onClick={getDataOf(7)}>最近7天</Radio.Button>
162
+                  <Radio.Button value="b" onClick={getDataOf(30)}>最近1月</Radio.Button>
163
+                </Radio.Group>,
164
+              )}
165
+            </Form.Item>
166
+            <Form.Item>
167
+              {getFieldDecorator('rangePicker')(
168
+                <RangePicker
169
+                  style={{ paddingLeft: '30px', width: '400px' }}
170
+                  ranges={{
171
+                    Today: [moment(), moment()],
172
+                    'This Month': [moment().startOf('month'), moment().endOf('month')],
173
+                  }}
174
+                  // defaultValue={[moment(new Date(new Date().setDate((new Date().getDate() - 6))), 'YYYY-MM-DD HH:MM:SS'), moment(new Date(), 'YYYY-MM-DD HH:MM:SS')]}
175
+                  showTime
176
+                />,
177
+              )}
178
+            </Form.Item>
179 179
 
180 180
             <Button type="primary" htmlType="submit" style={{ marginLeft: '30px', float: 'right' }}>
181 181
               搜索
@@ -184,52 +184,52 @@ const header = props => {
184 184
               重置
185 185
             </Button>
186 186
 
187
-            <Button type="danger" style={{ marginLeft: '18px', float: 'right' }} onClick={() => router.go(-1)}>返回</Button>
188
-
189
-          <div style={{ display: 'flex', margin: '24px 0' }}>
190
-            <Form.Item>
191
-              {getFieldDecorator('buildingId')(
192
-                <BuildSelect style={{ width: '14%', minWidth: '160px' }} slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>,
193
-              )}
194
-            </Form.Item>
195
-            <Form.Item>
196
-              {getFieldDecorator('handleType')(
197
-                <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChangeType}>
187
+            <Button style={{ float: 'right' }} onClick={() => router.go(-1)}>返回</Button>
188
+
189
+            <div style={{ display: 'flex', margin: '24px 0' }}>
190
+              <Form.Item>
191
+                {getFieldDecorator('buildingId')(
192
+                  <BuildSelect style={{ width: '14%', minWidth: '160px' }} slot="action" onChange={(e => handleBuildingChange(e))}></BuildSelect>,
193
+                )}
194
+              </Form.Item>
195
+              <Form.Item>
196
+                {getFieldDecorator('handleType')(
197
+                  <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="所有事件组" onChange={handleChangeType}>
198 198
                     {eventypes.map(type => (
199 199
                       <Option key={type.typeId}>{type.typeName}</Option>
200 200
                     ))}
201
-                </Select>,
202
-              )}
203
-            </Form.Item>
204
-            <Form.Item>
205
-              {getFieldDecorator('handleEvent')(
206
-                 <Select style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChangeEvent}>
207
-                      {eventList.map(event => (
208
-                        <Option key={event.eventId}>{event.eventName}</Option>
209
-                      ))}
210 201
                   </Select>,
211
-              )}
212
-            </Form.Item>
213
-            <Form.Item>
214
-              {getFieldDecorator('handleProperty')(
215
-                 <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChangeProperty}>
202
+                )}
203
+              </Form.Item>
204
+              <Form.Item>
205
+                {getFieldDecorator('handleEvent')(
206
+                  <Select style={{ width: '14%', minWidth: '200px', marginLeft: '2%' }} placeholder="请选择事件" onChange={handleChangeEvent}>
207
+                    {eventList.map(event => (
208
+                      <Option key={event.eventId}>{event.eventName}</Option>
209
+                    ))}
210
+                  </Select>,
211
+                )}
212
+              </Form.Item>
213
+              <Form.Item>
214
+                {getFieldDecorator('handleProperty')(
215
+                  <Select style={{ width: '14%', minWidth: '160px', marginLeft: '2%' }} placeholder="请选择属性" onChange={handleChangeProperty}>
216 216
                     {properties.map(property => (
217 217
                       <Option key={property.propertyId}>{property.propertyName}</Option>
218 218
                     ))}
219
-                </Select>,
220
-              )}
221
-            </Form.Item>
222
-          </div>
223
-        </Form>
224
-      </div>
219
+                  </Select>,
220
+                )}
221
+              </Form.Item>
222
+            </div>
223
+          </Form>
224
+        </div>
225 225
 
226
-      <div style={{ margin: '24px 0' }}>
227
-       <UserBehavior tableShow BuildSelectHide buildingId={buildingId} endDate={endDate} startDate={startDate} eventType={eventType} activity={activity} event={event} dataZoom onReData={e => redata(e)}></UserBehavior>
228
-      </div>
226
+        <div style={{ margin: '24px 0' }}>
227
+          <UserBehavior tableShow BuildSelectHide buildingId={buildingId} endDate={endDate} startDate={startDate} eventType={eventType} activity={activity} event={event} dataZoom onReData={e => redata(e)}></UserBehavior>
228
+        </div>
229 229
 
230
-      {/* <Table dataSource={dataSource} columns={columns} pagination={false} scroll={{ y: 500 }} /> */}
231
-    </div>
232
-  </>
230
+        {/* <Table dataSource={dataSource} columns={columns} pagination={false} scroll={{ y: 500 }} /> */}
231
+      </div>
232
+    </>
233 233
   )
234 234
 }
235 235
 

+ 55
- 61
src/pages/indexEcharts/userSource.jsx ファイルの表示

@@ -99,7 +99,7 @@ class Header extends React.Component {
99 99
 
100 100
   datalist = () => {
101 101
     console.log()
102
-    this.setState({ 
102
+    this.setState({
103 103
       endDate: daterange[1] === '' ? new Date() : daterange[1],
104 104
       startDate: daterange[0] === '' ? moment().subtract(7, 'day').toDate() : daterange[0],
105 105
     })
@@ -114,11 +114,11 @@ class Header extends React.Component {
114 114
   onTabledatas = (e) => {
115 115
     console.log('this.state.userType: ', this.state.userType)
116 116
     e.tdWxDicts.map(x => {
117
-        columns = columns.filter(y => y.key != x.sceneType).concat({
118
-          title: x.sceneAlias,
119
-          dataIndex: x.sceneType,
120
-          key: x.sceneType,
121
-        })
117
+      columns = columns.filter(y => y.key != x.sceneType).concat({
118
+        title: x.sceneAlias,
119
+        dataIndex: x.sceneType,
120
+        key: x.sceneType,
121
+      })
122 122
     })
123 123
     const data = (e.list || []).reduce((acc, item) => {
124 124
       const { sceneType, fromNum, registeredNum, createTime } = item
@@ -127,16 +127,16 @@ class Header extends React.Component {
127 127
       return acc
128 128
     }, {})
129 129
 
130
-    const dictData =  e.tdWxDicts.reduce((acc,item,index) => {
130
+    const dictData = e.tdWxDicts.reduce((acc, item, index) => {
131 131
       const { sceneType } = item
132 132
       acc[sceneType] = 0
133 133
       return acc
134
-    },{})
134
+    }, {})
135 135
 
136
-    const tableData = Object.keys(data).map(k => data[k]).reduce((acc,item,index) => {
136
+    const tableData = Object.keys(data).map(k => data[k]).reduce((acc, item, index) => {
137 137
       acc[index] = { ...dictData, ...item }
138 138
       return acc
139
-    },[])
139
+    }, [])
140 140
 
141 141
     this.setState({ tableData })
142 142
 
@@ -151,61 +151,55 @@ class Header extends React.Component {
151 151
 
152 152
   render() {
153 153
     return (
154
-    <>
155
-      <div style={{
156
-        backgroundColor: '#fff',
157
-        padding: '32PX 28px',
158
-        boxShadow: '0px 0px 16px 2px rgba(0,0,0,0.12)',
159
-        borderRadius: '12px',
160
-        minHeight: '60vh'
161
-      }}>
162
-        <Radio.Group buttonStyle="solid" defaultValue="a">
163
-          <Radio.Button value="a" onClick={() => this.getDataOf(7)}>最近7天</Radio.Button>
164
-          <Radio.Button value="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
165
-        </Radio.Group>
166
-        <RangePicker
167
-          style={{ paddingLeft: '30px' }}
168
-          ranges={{
169
-            Today: [moment(), moment()],
170
-            'This Month': [moment().startOf('month'), moment().endOf('month')],
171
-          }}
172
-          // showTime
173
-          // format="YYYY/MM/DD HH:mm:ss"
174
-          onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
175
-        />
176
-        <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
177
-          搜索
178
-        </Button>
179
-        <Button type="danger" onClick={() => router.go(-1)} style={{ marginBottom: '18px', marginLeft: '30px' }}>返回</Button>
154
+      <>
180 155
         <div>
181
-  
182
-          <div style={{ display: 'flex' }}>
183
-            <div style={{
184
-              width: '1060px',
185
-              height: '560px',
186
-              paddingTop: '40px',
187
-              marginRight: ' 40px',
188
-            }}>
189
-              <UserSource BuildSelectHide={true} endDate={this.state.endDate} startDate={this.state.startDate} onSuccess={(e) => this.onSuccess(e)}></UserSource>
190
-            </div>
191
-            <div style={{
192
-              width: '509px',
193
-              height: '600px',
194
-              paddingTop: '40px',
195
-  
196
-            }}>
197
-              <UserSourcepie endDate={this.state.endDate} startDate={this.state.startDate}></UserSourcepie>
156
+          <Radio.Group buttonStyle="solid" defaultValue="a">
157
+            <Radio.Button value="a" onClick={() => this.getDataOf(7)}>最近7天</Radio.Button>
158
+            <Radio.Button value="b" onClick={() => this.getDataOf(30)}>最近1月</Radio.Button>
159
+          </Radio.Group>
160
+          <RangePicker
161
+            style={{ paddingLeft: '30px' }}
162
+            ranges={{
163
+              Today: [moment(), moment()],
164
+              'This Month': [moment().startOf('month'), moment().endOf('month')],
165
+            }}
166
+            // showTime
167
+            // format="YYYY/MM/DD HH:mm:ss"
168
+            onChange={(_dates, dateStrings) => this.onChangetime(_dates, dateStrings)}
169
+          />
170
+          <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }} onClick={() => this.datalist()}>
171
+            搜索
172
+        </Button>
173
+          <Button onClick={() => router.go(-1)} style={{ float: 'right' }}>返回</Button>
174
+          <div>
175
+
176
+            <div style={{ display: 'flex' }}>
177
+              <div style={{
178
+                width: '1060px',
179
+                height: '560px',
180
+                paddingTop: '40px',
181
+                marginRight: ' 40px',
182
+              }}>
183
+                <UserSource BuildSelectHide={true} endDate={this.state.endDate} startDate={this.state.startDate} onSuccess={(e) => this.onSuccess(e)}></UserSource>
184
+              </div>
185
+              <div style={{
186
+                width: '509px',
187
+                height: '600px',
188
+                paddingTop: '40px',
189
+
190
+              }}>
191
+                <UserSourcepie endDate={this.state.endDate} startDate={this.state.startDate}></UserSourcepie>
192
+              </div>
198 193
             </div>
194
+            <Select style={{ width: '180px' }} placeholder="所有用户" onChange={(e) => this.handleSelectChange(e)}>
195
+              <Option value='all'>所有用户</Option>
196
+              <Option value='registered'>注册用户</Option>
197
+            </Select>
198
+
199
+            <Table style={{ marginTop: '20px' }} dataSource={this.state.tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
199 200
           </div>
200
-          <Select style={{ width: '180px' }} placeholder="所有用户" onChange={(e) => this.handleSelectChange(e)}>
201
-            <Option value='all'>所有用户</Option>
202
-            <Option value='registered'>注册用户</Option>
203
-          </Select>
204
-  
205
-          <Table style={{marginTop:'20px'}} dataSource={this.state.tableData} columns={columns} pagination={false} scroll={{ y: 500 }}></Table>
206 201
         </div>
207
-      </div>
208
-    </>
202
+      </>
209 203
     )
210 204
   }
211 205
 }

+ 15
- 15
src/pages/integralMall/verifyList.jsx ファイルの表示

@@ -11,16 +11,16 @@ const { Option } = Select;
11 11
 const { MonthPicker, RangePicker, WeekPicker } = DatePicker;
12 12
 
13 13
 const header = (props) => {
14
-  const [ data, setData ] = useState({})
14
+  const [data, setData] = useState({})
15 15
 
16 16
   useEffect(() => {
17
-    getVerifyList({pageNum: 1,pageSize: 10, phone: props.location.query.telValue });
18
-  },[])
17
+    getVerifyList({ pageNum: 1, pageSize: 10, phone: props.location.query.telValue });
18
+  }, [])
19 19
 
20 20
   // 查询列表
21 21
   const getVerifyList = (params) => {
22
-    request({ ...apis.integralMall.taPointsExchange, params: { ...params },}).then((data) => {
23
-        setData(data)
22
+    request({ ...apis.integralMall.taPointsExchange, params: { ...params }, }).then((data) => {
23
+      setData(data)
24 24
     })
25 25
   }
26 26
 
@@ -38,12 +38,12 @@ const header = (props) => {
38 38
     // console.log(new Date())
39 39
     row.verifyDate = new Date()
40 40
     // console.log('row.verifyDate: ', row.verifyDate)
41
-    request({ ...apis.integralMall.changeTaPointsExchange, data: row}).then((data) => {
42
-        message.info("操作成功")
43
-        getVerifyList({ pageNum: 1, pageSize: 10, phone: props.location.query.telValue })
41
+    request({ ...apis.integralMall.changeTaPointsExchange, data: row }).then((data) => {
42
+      message.info("操作成功")
43
+      getVerifyList({ pageNum: 1, pageSize: 10, phone: props.location.query.telValue })
44 44
     })
45 45
   }
46
-  
46
+
47 47
   const columns = [
48 48
     {
49 49
       title: '用户姓名',
@@ -56,7 +56,7 @@ const header = (props) => {
56 56
       dataIndex: 'personType',
57 57
       key: 'personType',
58 58
       align: 'center',
59
-      render: (personType)=> <><span>{personType === 'Realty Consultant' ? '置业顾问' : personType === 'Sales Executive' ? '销售主管' : personType === 'estate agent' ? '经纪人' : personType === 'customer' ? '客户' : ''}</span></>
59
+      render: (personType) => <><span>{personType === 'Realty Consultant' ? '置业顾问' : personType === 'Sales Executive' ? '销售主管' : personType === 'estate agent' ? '经纪人' : personType === 'customer' ? '客户' : ''}</span></>
60 60
     },
61 61
     {
62 62
       title: '手机号',
@@ -96,24 +96,24 @@ const header = (props) => {
96 96
       dataIndex: 'status',
97 97
       key: 'status',
98 98
       align: 'center',
99
-      render: (status)=> <><span>{status == 1 ? '已领取' : '未领取'}</span></>
99
+      render: (status) => <><span>{status == 1 ? '已领取' : '未领取'}</span></>
100 100
     },
101 101
     {
102 102
       title: '操作',
103 103
       dataIndex: 'handle',
104 104
       key: 'handle',
105 105
       align: 'center',
106
-      render: (x,row) => <span style={{ color: '#1990FF' }} onClick={changeStatus(row)}>{ row.status == 1?'':'核销' }</span>
107
-           
106
+      render: (x, row) => <span style={{ color: '#1990FF' }} onClick={changeStatus(row)}>{row.status == 1 ? '' : '核销'}</span>
107
+
108 108
     },
109 109
   ];
110 110
 
111 111
   return (
112 112
     <>
113
-      <Button type="primary" className={styles.addBtn} onClick={toBack}>返回</Button>
113
+      <div align="right" style={{marginBottom:'16px'}}><Button onClick={toBack}>返回</Button></div>
114 114
       <Table rowKey="verifyList" dataSource={data.records} columns={columns} pagination={false} />
115 115
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
116
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
116
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
117 117
       </div>
118 118
     </>
119 119
   )

+ 46
- 47
src/pages/record/share/clickCountList.jsx ファイルの表示

@@ -19,21 +19,21 @@ function record(props) {
19 19
   const { getFieldDecorator } = props.form
20 20
 
21 21
   // 获取初始化数据
22
-  const [ data, setData ] = useState({})
22
+  const [data, setData] = useState({})
23 23
   const personId = props.location.query.id
24 24
 
25 25
   useEffect(() => {
26 26
     getList({ pageNum: 1, pageSize: 10, personId: personId });
27
-  },[])
27
+  }, [])
28 28
 
29 29
   // 查询列表
30 30
   const getList = (params) => {
31
-    request({ ...apis.activity.clickCountList, params: { ...params },}).then((data) => {
32
-        if (data){
33
-            setData(data)
34
-        }
35
-        
36
-        console.log("data:",data)
31
+    request({ ...apis.activity.clickCountList, params: { ...params }, }).then((data) => {
32
+      if (data) {
33
+        setData(data)
34
+      }
35
+
36
+      console.log("data:", data)
37 37
     })
38 38
   }
39 39
 
@@ -42,24 +42,24 @@ function record(props) {
42 42
     props.form.resetFields();
43 43
   }
44 44
 
45
-  function back(){
45
+  function back() {
46 46
     router.go(-1);
47 47
   }
48
-  
48
+
49 49
   // 提交事件
50 50
   const handleSubmit = (e, props) => {
51 51
     e.preventDefault();
52 52
     props.form.validateFields((err, values) => {
53 53
       if (!err) {
54
-        let {shareTime,receiveTime, ...submitValue} = values
55
-        if(null != shareTime && shareTime.length > 0){
54
+        let { shareTime, receiveTime, ...submitValue } = values
55
+        if (null != shareTime && shareTime.length > 0) {
56 56
           const [startCreateDate, endCreateDate] = shareTime
57 57
           submitValue.startCreateDate = moment(startCreateDate).format('YYYY-MM-DD');
58 58
           submitValue.endCreateDate = moment(endCreateDate).format('YYYY-MM-DD');
59
-        }else{
59
+        } else {
60 60
           submitValue.startCreateDate = null
61 61
           submitValue.endCreateDate = null
62
-        }        
62
+        }
63 63
         console.log(submitValue)
64 64
         getList({ pageNum: 1, pageSize: 10, personId: personId, ...submitValue })
65 65
       }
@@ -83,17 +83,17 @@ function record(props) {
83 83
       align: 'center',
84 84
     },
85 85
     {
86
-        title: '用户名',
87
-        dataIndex: 'personName',
88
-        key: 'personName',
89
-        align: 'center',
90
-      },
91
-      {
92
-        title: '手机号',
93
-        dataIndex: 'personPhone',
94
-        key: 'personPhone',
95
-        align: 'center',
96
-      },
86
+      title: '用户名',
87
+      dataIndex: 'personName',
88
+      key: 'personName',
89
+      align: 'center',
90
+    },
91
+    {
92
+      title: '手机号',
93
+      dataIndex: 'personPhone',
94
+      key: 'personPhone',
95
+      align: 'center',
96
+    },
97 97
     {
98 98
       title: '访问时间',
99 99
       dataIndex: 'createDate',
@@ -106,34 +106,33 @@ function record(props) {
106 106
   return (
107 107
 
108 108
     <>
109
+      <div align="right" style={{ marginBottom: '16px' }}><Button onClick={back}>返回</Button></div>
109 110
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
110 111
         <div style={{ display: 'flex' }}>
111
-            <Form.Item label="分享类型" >
112
-                {getFieldDecorator('shareType')(
113
-                <Select placeholder="分享类型" style={{ width: '200px' }}>
114
-                    <Option value="dynamic_share">报名活动</Option>
115
-                    <Option value="help_share">助力活动</Option>
116
-                    <Option value="group_share">拼团活动</Option>
117
-                    <Option value="h5_share">H5活动</Option>
118
-                    <Option value="building_share">项目</Option>
119
-                    <Option value="news_share">资讯</Option>
120
-                    <Option value="house_share">房源</Option>
121
-                    <Option value="card_share">名片</Option>
122
-                </Select>,
123
-                )}
124
-            </Form.Item>
112
+          <Form.Item label="分享类型" >
113
+            {getFieldDecorator('shareType')(
114
+              <Select placeholder="分享类型" style={{ width: '200px' }}>
115
+                <Option value="dynamic_share">报名活动</Option>
116
+                <Option value="help_share">助力活动</Option>
117
+                <Option value="group_share">拼团活动</Option>
118
+                <Option value="h5_share">H5活动</Option>
119
+                <Option value="building_share">项目</Option>
120
+                <Option value="news_share">资讯</Option>
121
+                <Option value="house_share">房源</Option>
122
+                <Option value="card_share">名片</Option>
123
+              </Select>,
124
+            )}
125
+          </Form.Item>
125 126
           <Form.Item>
126 127
             {getFieldDecorator('shareTitle')(
127
-                <Input
128
+              <Input
128 129
                 prefix={<Icon type="text" style={{ color: 'rgba(0,0,0,.25)' }} />}
129 130
                 placeholder="分享标题"
130
-                />,
131
+              />,
131 132
             )}
132 133
           </Form.Item>
133
-          <Form.Item style={{position:'absolute',right:'38px'}}>
134
-            <Button style={{ marginRight: 8 }} onClick={back}>
135
-              返回
136
-            </Button>
134
+          <Form.Item style={{ position: 'absolute', right: '38px' }}>
135
+
137 136
             <AuthButton name="admin.taGoods.exchange" noRight={null}>
138 137
               <Button type="primary" htmlType="submit">
139 138
                 搜索
@@ -145,9 +144,9 @@ function record(props) {
145 144
           </Form.Item>
146 145
         </div>
147 146
       </Form>
148
-      <Table rowKey="exchangeRecords" style={{marginTop:'40px'}} dataSource={data.records} columns={columns} pagination={false} />
147
+      <Table rowKey="exchangeRecords" style={{ marginTop: '40px' }} dataSource={data.records} columns={columns} pagination={false} />
149 148
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
150
-        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current}/>
149
+        <Pagination showQuickJumper defaultCurrent={1} total={data.total} onChange={changePageNum} current={data.current} />
151 150
       </div>
152 151
     </>
153 152
   )

+ 1
- 3
src/pages/record/share/shareCountList.jsx ファイルの表示

@@ -91,6 +91,7 @@ function record(props) {
91 91
   return (
92 92
 
93 93
     <>
94
+     <div align="right" style={{marginBottom:'16px'}}><Button onClick={back}>返回</Button></div>
94 95
       <Form layout="inline" onSubmit={e => handleSubmit(e, props)}>
95 96
         <div style={{ display: 'flex' }}>
96 97
             <Form.Item label="分享类型" >
@@ -116,9 +117,6 @@ function record(props) {
116 117
             )}
117 118
           </Form.Item>
118 119
           <Form.Item style={{position:'absolute',right:'38px'}}>
119
-            <Button style={{ marginRight: 8 }} onClick={back}>
120
-              返回
121
-            </Button>
122 120
             <AuthButton name="admin.taGoods.exchange" noRight={null}>
123 121
               <Button type="primary" htmlType="submit">
124 122
                 搜索

+ 61
- 63
src/pages/statistical/activity/addRegistNum.jsx ファイルの表示

@@ -15,10 +15,10 @@ const { RangePicker } = DatePicker;
15 15
 const { Option } = Select
16 16
 
17 17
 const formItemLayout = {
18
-    labelCol: { span: 10},
19
-    wrapperCol: { span: 14 },
20
-  };
21
-  
18
+  labelCol: { span: 10 },
19
+  wrapperCol: { span: 14 },
20
+};
21
+
22 22
 let daterange = []
23 23
 let tableTitle = ['类型']
24 24
 
@@ -76,31 +76,31 @@ class SharePersonNum extends React.Component {
76 76
     super(props)
77 77
     let startDate;
78 78
     let endDate;
79
-    if (props.location.query.queryDate){
80
-      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
81
-      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
82
-    }else{
83
-      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
84
-      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
79
+    if (props.location.query.queryDate) {
80
+      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
81
+      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
82
+    } else {
83
+      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
84
+      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
85 85
     }
86 86
     console.log(startDate)
87 87
     this.state = {
88 88
       formData: {
89 89
         personFrom: '',
90 90
         province: '',
91
-        pageNum:'',
92
-        pageSize:'',
91
+        pageNum: '',
92
+        pageSize: '',
93 93
         startDate: startDate,
94 94
         endDate: endDate,
95 95
         activityId: props.location.query.activityId,
96
-        activityType:props.location.query.activityType,
97
-        buildingId: props.location.query.buildingId,      
96
+        activityType: props.location.query.activityType,
97
+        buildingId: props.location.query.buildingId,
98 98
       },
99
-      personData: [],  
99
+      personData: [],
100 100
       dataSoures: [],
101 101
       tableData: [],
102 102
       userType: 'all',
103
-      activityName:  props.location.query.activityName
103
+      activityName: props.location.query.activityName
104 104
     }
105 105
   }
106 106
 
@@ -108,12 +108,12 @@ class SharePersonNum extends React.Component {
108 108
     this.getTableList()
109 109
   }
110 110
 
111
-  getTableList () {
111
+  getTableList() {
112 112
     const { formData } = this.state
113 113
     console.log(formData)
114 114
     request({ ...apis.activityDataStatis.activityAddRegist, params: formData }).then(data => {
115 115
       console.log(data)
116
-      this.setState({ tableData: data.records, total: data.total})
116
+      this.setState({ tableData: data.records, total: data.total })
117 117
     }).catch()
118 118
   }
119 119
 
@@ -139,37 +139,37 @@ class SharePersonNum extends React.Component {
139 139
     this.props.form.resetFields()
140 140
     let startDate;
141 141
     let endDate;
142
-    if (this.props.location.query.queryDate){
143
-      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
144
-      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
145
-    }else{
146
-      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
147
-      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
142
+    if (this.props.location.query.queryDate) {
143
+      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
144
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
145
+    } else {
146
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
147
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
148 148
     }
149 149
     this.setState({
150 150
       formData: {
151 151
         personFrom: '',
152 152
         province: '',
153
-        pageNum:'',
154
-        pageSize:'',
153
+        pageNum: '',
154
+        pageSize: '',
155 155
         startDate: startDate,
156 156
         endDate: endDate,
157 157
         activityId: this.props.location.query.activityId,
158
-        activityType:this.props.location.query.activityType,
159
-        buildingId: this.props.location.query.buildingId,      
158
+        activityType: this.props.location.query.activityType,
159
+        buildingId: this.props.location.query.buildingId,
160 160
       },
161
-      personData: [],  
161
+      personData: [],
162 162
       dataSoures: [],
163 163
       tableData: [],
164 164
       userType: 'all',
165
-      activityName:  this.props.location.query.activityName
166
-    },this.getTableList)
165
+      activityName: this.props.location.query.activityName
166
+    }, this.getTableList)
167 167
   }
168 168
 
169 169
   goback = () => {
170 170
     router.go(-1);
171 171
   }
172
-  
172
+
173 173
   exportActivityStats = () => {
174 174
     const { formData } = this.state
175 175
     request({ ...apis.activityDataStatis.activityAddRegistNumExport, params: formData }).then(data => {
@@ -177,12 +177,12 @@ class SharePersonNum extends React.Component {
177 177
         return
178 178
       }
179 179
       const url = window.URL.createObjectURL(new Blob([data]))
180
-        const link = document.createElement('a')
181
-        link.style.display = 'none'
182
-        link.href = url
183
-        link.setAttribute('download', '分享统计.xlsx')
184
-        document.body.append(link)
185
-        link.click()
180
+      const link = document.createElement('a')
181
+      link.style.display = 'none'
182
+      link.href = url
183
+      link.setAttribute('download', '分享统计.xlsx')
184
+      document.body.append(link)
185
+      link.click()
186 186
     }).catch()
187 187
   }
188 188
 
@@ -205,44 +205,42 @@ class SharePersonNum extends React.Component {
205 205
     const { getFieldDecorator } = this.props.form;
206 206
 
207 207
     return (
208
-    <>
208
+      <>
209
+        <div align="right" style={{ marginBottom: '16px' }}><Button onClick={this.goback}>返回</Button></div>
209 210
         <div>
210
-          <span style={{marginLeft:'20px'}}>分享内容:{this.state.activityName}</span>
211
+          <span style={{ marginLeft: '20px' }}>分享内容:{this.state.activityName}</span>
211 212
         </div>
212 213
         <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
213
-        <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
214
-            {getFieldDecorator('province')(<Input placeholder="请输入归属地"/>)}
215
-        </Form.Item>
216
-        <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
217
-          {getFieldDecorator('personFrom')(
218
-            <WxDictSelect />,
219
-          )}
220
-        </Form.Item>
221
-          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
214
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
215
+            {getFieldDecorator('province')(<Input placeholder="请输入归属地" />)}
216
+          </Form.Item>
217
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
218
+            {getFieldDecorator('personFrom')(
219
+              <WxDictSelect />,
220
+            )}
221
+          </Form.Item>
222
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
222 223
             <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
223
-                搜索
224
+              搜索
224 225
             </Button>
225 226
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
226 227
           </Form.Item>
227
-          </Form>     
228
+        </Form>
228 229
         <div>
229
-            <Button type="primary" style={{ float: 'right', margin: '20px 0', marginLeft: '20px', zIndex: 1 }} onClick={this.goback}>
230
-                返回
231
-            </Button>
232
-        <AuthButton name="admin.statistical.activity.export" noRight={null}>
230
+          <AuthButton name="admin.statistical.activity.export" noRight={null}>
233 231
             <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
234
-                导出
232
+              导出
235 233
             </Button>
236
-            </AuthButton>
237
-          <Table style={{marginTop:'20px'}} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total}} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
234
+          </AuthButton>
235
+          <Table style={{ marginTop: '20px' }} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total }} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
238 236
         </div>
239 237
         <Prompt message={location =>
240
-        location.pathname.startsWith("/statistical/activity")
241
-          ? true
242
-          : localStorage.removeItem("tabState")} />
243
-    </>
238
+          location.pathname.startsWith("/statistical/activity")
239
+            ? true
240
+            : localStorage.removeItem("tabState")} />
241
+      </>
244 242
     )
245
-    
243
+
246 244
   }
247 245
 }
248 246
 const WrappedTypeForm = Form.create()(SharePersonNum);

+ 1
- 1
src/pages/statistical/activity/detail.jsx ファイルの表示

@@ -368,7 +368,7 @@ function record(props) {
368 368
     return (
369 369
 
370 370
         <>
371
-            <Button type="danger" style={{ marginBottom: '18px' }} onClick={() => router.go(-1)}>返回</Button>
371
+            <div align="right" style={{ marginBottom: '16px' }}><Button onClick={() => router.go(-1)}>返回</Button></div>
372 372
             <Form layout="inline">
373 373
                 <div style={{ display: 'flex', alignItems: 'center' }}>
374 374
                     <Radio.Group buttonStyle="solid" value={radioVal} onChange={setFormData} style={{ marginRight: '16px', }}>

+ 70
- 71
src/pages/statistical/activity/shareNum.jsx ファイルの表示

@@ -14,10 +14,10 @@ const { RangePicker } = DatePicker;
14 14
 const { Option } = Select
15 15
 
16 16
 const formItemLayout = {
17
-    labelCol: { span: 10},
18
-    wrapperCol: { span: 14 },
19
-  };
20
-  
17
+  labelCol: { span: 10 },
18
+  wrapperCol: { span: 14 },
19
+};
20
+
21 21
 let daterange = []
22 22
 let tableTitle = ['类型']
23 23
 let queryDate = ''
@@ -65,34 +65,34 @@ class SharePersonNum extends React.Component {
65 65
     queryDate = props.location.query.queryDate
66 66
     let startDate;
67 67
     let endDate;
68
-    if (props.location.query.queryDate){
69
-      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
70
-      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
71
-    }else{
72
-      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
73
-      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
68
+    if (props.location.query.queryDate) {
69
+      startDate = moment(props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
70
+      endDate = moment(props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
71
+    } else {
72
+      startDate = moment(props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
73
+      endDate = moment(props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
74 74
     }
75 75
     this.state = {
76 76
       formData: {
77 77
         sharePhone: '',
78 78
         sharePersonType: '',
79
-        pageNum:'',
80
-        pageSize:'',
81
-        shareName:'',
82
-        sort:null,
83
-        colKey:null,
79
+        pageNum: '',
80
+        pageSize: '',
81
+        shareName: '',
82
+        sort: null,
83
+        colKey: null,
84 84
         startDate: startDate,
85 85
         endDate: endDate,
86 86
         activityId: props.location.query.activityId,
87
-        activityType:props.location.query.activityType,
87
+        activityType: props.location.query.activityType,
88 88
         personId: props.location.query.personId,
89
-        buildingId: props.location.query.buildingId   
89
+        buildingId: props.location.query.buildingId
90 90
       },
91
-      personData: [],  
91
+      personData: [],
92 92
       dataSoures: [],
93 93
       tableData: [],
94 94
       userType: 'all',
95
-      activityName:  props.location.query.activityName
95
+      activityName: props.location.query.activityName
96 96
     }
97 97
   }
98 98
 
@@ -100,12 +100,12 @@ class SharePersonNum extends React.Component {
100 100
     this.getTableList()
101 101
   }
102 102
 
103
-  getTableList () {
103
+  getTableList() {
104 104
     const { formData } = this.state
105 105
     console.log(formData)
106 106
     request({ ...apis.activityDataStatis.activityShareNum, params: formData }).then(data => {
107 107
       console.log(data)
108
-      this.setState({ tableData: data.records, total: data.total})
108
+      this.setState({ tableData: data.records, total: data.total })
109 109
     }).catch()
110 110
   }
111 111
 
@@ -133,41 +133,41 @@ class SharePersonNum extends React.Component {
133 133
     this.props.form.resetFields()
134 134
     let startDate;
135 135
     let endDate;
136
-    if (this.props.location.query.queryDate){
137
-      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
138
-      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
139
-    }else{
140
-      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss')+'.000Z';
141
-      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss')+'.999Z';
136
+    if (this.props.location.query.queryDate) {
137
+      startDate = moment(this.props.location.query.queryDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
138
+      endDate = moment(this.props.location.query.queryDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
139
+    } else {
140
+      startDate = moment(this.props.location.query.startDate).hours(0).minutes(0).seconds(0).milliseconds(0).format('YYYY-MM-DDTHH:mm:ss') + '.000Z';
141
+      endDate = moment(this.props.location.query.endDate).hours(23).minutes(59).seconds(59).milliseconds(999).format('YYYY-MM-DDTHH:mm:ss') + '.999Z';
142 142
     }
143 143
     this.setState({
144 144
       formData: {
145 145
         sharePhone: '',
146 146
         sharePersonType: '',
147
-        pageNum:'',
148
-        pageSize:'',
149
-        shareName:'',
150
-        sort:null,
151
-        colKey:null,
147
+        pageNum: '',
148
+        pageSize: '',
149
+        shareName: '',
150
+        sort: null,
151
+        colKey: null,
152 152
         startDate: startDate,
153 153
         endDate: endDate,
154 154
         activityId: this.props.location.query.activityId,
155
-        activityType:this.props.location.query.activityType,
155
+        activityType: this.props.location.query.activityType,
156 156
         personId: this.props.location.query.personId,
157
-        buildingId: this.props.location.query.buildingId   
157
+        buildingId: this.props.location.query.buildingId
158 158
       },
159
-      personData: [],  
159
+      personData: [],
160 160
       dataSoures: [],
161 161
       tableData: [],
162 162
       userType: 'all',
163
-      activityName:  this.props.location.query.activityName
164
-    },this.getTableList)
163
+      activityName: this.props.location.query.activityName
164
+    }, this.getTableList)
165 165
   }
166 166
 
167 167
   goback = () => {
168 168
     router.go(-1);
169 169
   }
170
-  
170
+
171 171
   exportActivityStats = () => {
172 172
     const { formData } = this.state
173 173
     request({ ...apis.activityDataStatis.activityShareNumExport, params: formData }).then(data => {
@@ -175,12 +175,12 @@ class SharePersonNum extends React.Component {
175 175
         return
176 176
       }
177 177
       const url = window.URL.createObjectURL(new Blob([data]))
178
-        const link = document.createElement('a')
179
-        link.style.display = 'none'
180
-        link.href = url
181
-        link.setAttribute('download', '分享统计.xlsx')
182
-        document.body.append(link)
183
-        link.click()
178
+      const link = document.createElement('a')
179
+      link.style.display = 'none'
180
+      link.href = url
181
+      link.setAttribute('download', '分享统计.xlsx')
182
+      document.body.append(link)
183
+      link.click()
184 184
     }).catch()
185 185
   }
186 186
 
@@ -207,52 +207,51 @@ class SharePersonNum extends React.Component {
207 207
     const { getFieldDecorator } = this.props.form;
208 208
 
209 209
     return (
210
-    <>
210
+      <>
211
+        <div align="right" style={{ marginBottom: '16px' }}><Button onClick={this.goback}>返回</Button></div>
211 212
         <div>
212
-          <span style={{marginLeft:'20px'}}>分享内容:{this.state.activityName}</span>
213
+          <span style={{ marginLeft: '20px' }}>分享内容:{this.state.activityName}</span>
213 214
         </div>
214
-        <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)}>
215
-          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
215
+        <Form layout="inline" onSubmit={e => this.handleSubmit(e, this.props)} style={{ display: 'flex', alignItems: 'center' }}>
216
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
216 217
             {getFieldDecorator('sharePersonType')(
217
-                <Select placeholder="分享者类型" style={{ width: 150, marginLeft:'20px'  }}>
218
+              <Select placeholder="分享者类型" style={{ width: 150, marginLeft: '20px' }}>
218 219
                 <Option value="drift">游客</Option>
219 220
                 <Option value="customer">普通客户</Option>
220 221
                 <Option value="Realty Consultant">置业顾问</Option>
221 222
                 <Option value="estate agent">专业经纪人</Option>
222
-            </Select>
223
+              </Select>
223 224
             )}
224 225
           </Form.Item>
225
-          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
226
-              {getFieldDecorator('sharePersonPhone')(<Input placeholder="分享者电话"/>)}
226
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
227
+            {getFieldDecorator('sharePersonPhone')(<Input placeholder="分享者电话" />)}
227 228
           </Form.Item>
228
-          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
229
-              {getFieldDecorator('sharePersonName')(<Input placeholder="分享者姓名"/>)}
229
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
230
+            {getFieldDecorator('sharePersonName')(<Input placeholder="分享者姓名" />)}
230 231
           </Form.Item>
231
-          <Form.Item style={{marginTop:'20px', marginBottom:'20px'}}>
232
+          <Form.Item style={{ marginTop: '20px', marginBottom: '20px' }}>
232 233
             <Button type="primary" htmlType="submit" style={{ marginLeft: '30px' }}>
233
-                搜索
234
+              搜索
234 235
             </Button>
235 236
             <Button onClick={e => this.handleReset()} style={{ marginLeft: '30px' }}>重置</Button>
236 237
           </Form.Item>
237
-          </Form>     
238
-        <div>
239
-            <Button type="primary" style={{ float: 'right', margin: '20px 0', marginLeft: '20px', zIndex: 1 }} onClick={this.goback}>
240
-                返回
238
+          <AuthButton name="admin.statistical.activity.export" noRight={null}>
239
+            <Button type="primary" style={{ position: 'absolute',right:'27px', zIndex: 1 }} onClick={this.exportActivityStats}>
240
+              导出
241 241
             </Button>
242
-        <AuthButton name="admin.statistical.activity.export" noRight={null}>
243
-            <Button type="primary" style={{ float: 'right', margin: '20px 0', zIndex: 1 }} onClick={this.exportActivityStats}>
244
-                导出
245
-            </Button>
246
-            </AuthButton>
247
-          <Table style={{marginTop:'20px'}} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total}} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
242
+          </AuthButton>
243
+        </Form>
244
+        <div>
245
+
246
+          <Table style={{ marginTop: '20px' }} dataSource={this.state.tableData} columns={columns} pagination={{ total: this.state.total }} onChange={this.handleTableChange} scroll={{ y: 500 }}></Table>
248 247
         </div>
249 248
         <Prompt message={location =>
250
-        location.pathname.startsWith("/statistical/activity")
251
-          ? true
252
-          : localStorage.removeItem("tabState")} />
253
-    </>
249
+          location.pathname.startsWith("/statistical/activity")
250
+            ? true
251
+            : localStorage.removeItem("tabState")} />
252
+      </>
254 253
     )
255
-    
254
+
256 255
   }
257 256
 }
258 257
 const WrappedTypeForm = Form.create()(SharePersonNum);