魏超 5 lat temu
rodzic
commit
f15c1f2353

+ 2
- 2
src/pages/activity/ActivityList.jsx Wyświetl plik

@@ -137,11 +137,11 @@ const header = props => {
137 137
             {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>}
138 138
           </AuthButton>
139 139
           <AuthButton name="admin.buildingDynamic.finish.put" noRight={null}>
140
-            {row.isEnlist == 1 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
140
+            {row.activityStatus != 2 && <span style={{ color: '#1990FF',marginRight: '20px', cursor: 'pointer' }} onClick={finishDynamic.bind(this, row)}>结束活动<Icon type="poweroff" className={styles.edit} /></span>}
141 141
           </AuthButton>
142 142
           <AuthButton name="admin.buildingDynamic.update.put" noRight={null}>
143 143
             <span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={topDynamic(row)}>{row.weight === 1 ? '取消置顶' : '置顶'}<Icon type="vertical-align-top" className={styles.edit} /></span>
144
-            {row.isEnlist != 2 && <span style={{ color: '#FF925C',marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
144
+            {row.activityStatus != 2 && <span style={{ color: '#FF925C',marginRight: '20px', cursor: 'pointer' }} onClick={toEditGoods(row.dynamicId)}>编辑<Icon type="form" className={styles.edit} /></span>}
145 145
           </AuthButton>
146 146
       {row.status === 1 &&<span style={{ color: '#1990FF', marginRight: '20px', cursor: 'pointer' }} onClick={newQrcode.bind(this, row)}>{row.isEnlist === 1 && '下载二维码'} {row.isEnlist === 1 && <Icon type="qrcode" className={styles.shoppingCart} />}</span>}
147 147
         </>

+ 1
- 0
src/pages/activity/groupActivity/helpRecord.jsx Wyświetl plik

@@ -109,6 +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 113
       },
113 114
     ]
114 115
     return (