浏览代码

Merge branch 'v3.5' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into v3.5

魏熙美 5 年前
父节点
当前提交
4741d428b4
共有 2 个文件被更改,包括 7 次插入5 次删除
  1. 4
    4
      src/pages/activity/helpActivity/list.jsx
  2. 3
    1
      src/pages/system/document/audit.jsx

+ 4
- 4
src/pages/activity/helpActivity/list.jsx 查看文件

93
         <>
93
         <>
94
           {row.activityStatus === 0 &&
94
           {row.activityStatus === 0 &&
95
           <AuthButton name="admin.helpRecord.get">
95
           <AuthButton name="admin.helpRecord.get">
96
-             <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
96
+             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
97
           </AuthButton>}
97
           </AuthButton>}
98
           {row.activityStatus === 0 &&
98
           {row.activityStatus === 0 &&
99
           <AuthButton name="admin.top.update.post" noRight={null}>
99
           <AuthButton name="admin.top.update.post" noRight={null}>
100
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
100
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 2)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>
101
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
101
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 0)}>{ row.weight === 1 ? '取消置顶' : '置顶' }<Icon type="vertical-align-top" className={styles.edit} /></span>
102
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
102
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row, 1)}>{ row.isMain === true ? '取消推首页' : '推首页' }<Icon type="vertical-align-top" className={styles.edit} /></span>
103
           </AuthButton> }
103
           </AuthButton> }
104
 
104
 
105
           {row.activityStatus === 1 &&
105
           {row.activityStatus === 1 &&
106
           <AuthButton name="admin.helpActivity.update.put" noRight={null}>
106
           <AuthButton name="admin.helpActivity.update.put" noRight={null}>
107
-            <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
107
+            <span style={{ color: '#FF925C', marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.helpActivityId)}>编辑<Icon type="form" className={styles.edit} /></span>
108
           </AuthButton>
108
           </AuthButton>
109
           }
109
           }
110
           {row.activityStatus === 1 &&
110
           {row.activityStatus === 1 &&
116
 
116
 
117
           {row.activityStatus === 2 &&
117
           {row.activityStatus === 2 &&
118
           <AuthButton name="admin.helpRecord.get" noRight={null}>
118
           <AuthButton name="admin.helpRecord.get" noRight={null}>
119
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
119
+            <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={ getSignList.bind(this, row.helpActivityId)}>助力记录<Icon type="snippets" className={styles.shoppingCart} /></span>
120
           </AuthButton>
120
           </AuthButton>
121
           }
121
           }
122
            {row.activityStatus === 2 &&
122
            {row.activityStatus === 2 &&

+ 3
- 1
src/pages/system/document/audit.jsx 查看文件

19
     // 网路请求
19
     // 网路请求
20
     console.log(props, '1111')
20
     console.log(props, '1111')
21
     request({ ...apis.system.documentVerifyDetail, urlData: { id: documentVerifyId } }).then(data => {
21
     request({ ...apis.system.documentVerifyDetail, urlData: { id: documentVerifyId } }).then(data => {
22
-      console.log('data:', data.imgList)
22
+      console.log('data:', data)
23
       setData(data.imgList)
23
       setData(data.imgList)
24
     }).catch(err => {
24
     }).catch(err => {
25
       // eslint-disable-next-line no-unused-expressions
25
       // eslint-disable-next-line no-unused-expressions
40
 
40
 
41
 
41
 
42
   const handleOk = () => {
42
   const handleOk = () => {
43
+
44
+
43
     Modal.confirm({
45
     Modal.confirm({
44
       title: '审核通过后,将给当前用户发放积分 确认审核通过?',
46
       title: '审核通过后,将给当前用户发放积分 确认审核通过?',
45
       okText: '确认',
47
       okText: '确认',