Browse Source

修复了bug

周立森 5 years ago
parent
commit
c6d1276d80

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

@@ -117,19 +117,19 @@ const header = props => {
117 117
       render: (x, row) => (
118 118
         <>
119 119
           <AuthButton name="admin.SignList.get" noRight={null}>
120
-            <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? '报名记录' : ''}{ (row.isEnlist==1||row.isEnlist==2)  && <Icon type="snippets" className={styles.shoppingCart} />}</span>
120
+            <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={getSignList.bind(this, row.dynamicId)}>{row.isEnlist == '1' || row.isEnlist == '2' ? '报名记录' : ''}{ (row.isEnlist==1||row.isEnlist==2)  && <Icon type="snippets" className={styles.shoppingCart} />}</span>
121 121
           </AuthButton>
122 122
           <AuthButton name="admin.buildingDynamic.send.dynamicId.put" noRight={null}>
123
-            {row.activityStatus != 0 && <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>}
123
+            {row.activityStatus != 0 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={sendOrPublicDynamic.bind(this, row)}>{row.status === 1 ? '取消发布' : '发布'}<Icon type="close-circle" className={styles.edit} /></span>}
124 124
           </AuthButton>
125 125
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
126
-            {row.isEnlist == 1 && <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
126
+            {row.isEnlist == 1 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
127 127
           </AuthButton>
128 128
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
129 129
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
130
-            {row.isEnlist != 2 && <span style={{ color: '#FF925C', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
130
+            {row.isEnlist != 2 && <span style={{ color: '#FF925C',marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
131 131
           </AuthButton>
132
-          <span style={{ color: '#1990FF', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{row.isEnlist == '1' ? '下载二维码' : ''}<Icon type="qrcode" className={styles.shoppingCart} /></span>
132
+          <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{row.isEnlist == '1' ? '下载二维码' : ''}<Icon type="qrcode" className={styles.shoppingCart} /></span>
133 133
         </>
134 134
       ),
135 135
     },

+ 3
- 5
src/pages/system/document/audit.jsx View File

@@ -159,10 +159,10 @@ function body (props) {
159 159
         <AuthButton name="admin.documentVerify.id.put" noRight={null}>
160 160
               <Button style={{ marginTop: '30px' }} onClick={() => handleOk(2)}>不通过</Button>
161 161
             </AuthButton>
162
-            {/* &nbsp;&nbsp;&nbsp;&nbsp;
163
-        <Button onClick={cancelPage}>返回</Button> */}
164
-
165 162
           </div>}
163
+
164
+          {props.data.verifyStatus == 2 &&  <p style={{ fontSize: '0.096rem',marginTop: '30px' }}>驳回原因:{props.data.rejectReason}   </p>}
165
+
166 166
           <Modal
167 167
             title="驳回原因"
168 168
             visible={visible}
@@ -192,9 +192,7 @@ function body (props) {
192 192
         {
193 193
           // data.consultant && data.consultant.projects.map((item, _) => <span>{item}</span>)
194 194
           data.map((data, inx) =>
195
-
196 195
             <Card data={data}></Card>
197
-
198 196
           )
199 197
         }
200 198
         {/* <Card data = {data.records}></Card> */}

+ 1
- 1
src/pages/system/document/list.jsx View File

@@ -110,7 +110,7 @@ function body(props) {
110 110
       render: (x,row) => (
111 111
         <>
112 112
           <AuthButton name="admin.documentVerify.id.get" noRight={null}>
113
-            <span style={{ color: '#1990FF',cursor: 'pointer' }} onClick={()=>audit(row)}>{ row.verifyStatus === 0 ? '审核' : '查看' }</span>
113
+            <span style={{ color: '#1990FF',cursor: 'pointer' }} onClick={()=>audit(row)}>{ row.unverified === 0 ? '查看' : '审核' }</span>
114 114
            </AuthButton>
115 115
         </>
116 116
       )