update

.gitignore

 node_modules
 .DS_Store
+.idea
 .idea/
 .idea/workspace.xml

src/containers/Product/List.jsx

@@ -198,8 +198,6 @@ export default class List extends Component {
             </div>
         );
 
-
-
         const header = (
             <MainHeader breadcrumb={['产品管理', '产品列表']}
                         title="产品列表"

src/containers/Trade/Commission.jsx

@@ -82,7 +82,7 @@ export default class Commission extends Component {
                             <Input placeholder="实际佣金"
                                    readOnly
                                 {...getFieldProps('realReturn', {
-                                    initialValue: item && item.realReturn && item.realReturn.yj
+                                    initialValue: item && item.commission
                                 })}  />
                         </Form.Item>
                         <Form.Item {...footerFormSubmitLayout} style={{marginTop:30}}>

src/containers/Trade/Item.jsx

@@ -106,8 +106,8 @@ export default class Item extends Component {
                                             <span>{'收益 ' + item.realReturn.sy}</span>
                                         }
                                         {
-                                            item.realReturn && item.realReturn.yj &&
-                                            <span>{'佣金 ' + item.realReturn.yj}</span>
+                                            item.realReturn && item.commission &&
+                                            <span>{'佣金 ' + item.commission}</span>
                                         }
                                     </Col>
                                 </Row>

src/utils.js

@@ -59,7 +59,7 @@ export const productStatusToString = status => {
 };
 
 export const productEnableCreateTrade = status => {
-    return status > 1 && status < 17;
+    return status > 1 && status <= 21;
 };
 
 export const USER_STATUS = {