1.3.5

dist/antd-lib.js

-webpackJsonp([33],[function(e,n,t){"use strict";function u(e){return e&&e.__esModule?e:{"default":e}}var c=t(11),o=(u(c),t(6)),r=(u(o),t(46)),s=(u(r),t(36)),a=(u(s),t(50)),f=(u(a),t(124)),i=(u(f),t(95)),d=(u(i),t(166)),l=(u(d),t(53)),p=(u(l),t(89)),_=(u(p),t(146)),b=(u(_),t(125)),k=(u(b),t(115)),v=(u(k),t(127)),w=(u(v),t(114));u(w)}]);
+webpackJsonp([33],[function(e,n,t){"use strict";function u(e){return e&&e.__esModule?e:{"default":e}}var c=t(12),o=(u(c),t(6)),r=(u(o),t(46)),s=(u(r),t(36)),a=(u(s),t(50)),f=(u(a),t(124)),i=(u(f),t(89)),d=(u(i),t(166)),l=(u(d),t(53)),p=(u(l),t(90)),_=(u(p),t(146)),b=(u(_),t(125)),k=(u(b),t(115)),v=(u(k),t(127)),w=(u(v),t(114));u(w)}]);
\ No newline at end of file

dist/javascript/Home.js

-webpackJsonp([31],{456:function(e,l,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(l,"__esModule",{value:!0});var u=t(1),a=n(u),r=t(11),c=n(r),d=function(e){var l=(e.location,t(588));return a["default"].createElement("div",{className:l.home},a["default"].createElement("h1",{style:{marginBottom:50}},"\u6b22\u8fce\u4f7f\u7528\u67a2\u7ebd\u79d1\u6280\u540e\u53f0"),a["default"].createElement("h3",null,"2016-08-19 \u66f4\u65b0 1.3.4"),a["default"].createElement("p",null,"1. BUG\u4fee\u590d: \u8ba2\u5355\u5408\u540c\u7269\u6d41\u5355\u53f7\u8bbe\u7f6e\u3002",a["default"].createElement("br",null),"2. BUG\u4fee\u590d: \u81ea\u5b9a\u4e49\u6d88\u606f\u63a8\u9001BUG; \u81ea\u5b9a\u4e49\u6d88\u606f\u8be6\u60c5\u5c55\u793a\u65f6\u5fae\u4fe1\u6e20\u9053\u53bb\u9664\u591a\u4f59\u5b57\u6bb5",a["default"].createElement("br",null),"3. BUG\u4fee\u590d: \u62a5\u5355\u5ba1\u6838\u5931\u8d25\u65f6\u8f93\u51fa\u62d2\u7edd\u7406\u7531",a["default"].createElement("br",null)),a["default"].createElement("h3",null,"2016-08-18 \u66f4\u65b0 1.3.3"),a["default"].createElement("p",null,'1. \u83dc\u5355\u680f\u589e\u52a0"\u8bbe\u7f6e"; "\u7ba1\u7406\u5458"\u83dc\u5355\u53ea\u5206\u914d\u7ed9\u7ba1\u7406\u5458\u89d2\u8272\u3002',a["default"].createElement("br",null),"2. \u4fee\u590dWindow\u4e0b, \u62a5\u5355\u5ba1\u6838\u7167\u7247\u4e0b\u8f7d\u6587\u4ef6\u6269\u5c55\u540d\u7f3a\u5931\u3002",a["default"].createElement("br",null),'3. \u521b\u5efa\u89d2\u8272\u65f6, \u89d2\u8272ID\u5f3a\u5236"ROLE_"\u5f00\u5934\u3002',a["default"].createElement("br",null),"4. ROLE_ADMIN, ROLE_USER, ROLE_DEFAULT \u4e09\u4e2a\u89d2\u8272\u4e0d\u5141\u8bb8\u5220\u9664\u3002",a["default"].createElement("br",null),"5. BUG\u4fee\u590d: \u63a8\u9001\u81ea\u5b9a\u4e49\u6d88\u606f\u6210\u529f\u540e\u8fdb\u5165\u6d88\u606f\u8be6\u60c5\u9875\u9762\u3002",a["default"].createElement("br",null),"6. \u66f4\u4e25\u8c28\u7684\u6743\u9650\u63a7\u5236\u3002"),a["default"].createElement("h3",null,"2016-08-17 \u66f4\u65b0 1.3.2"),a["default"].createElement("p",null,"1. \u62a5\u5355\u5ba1\u6838\u5217\u8868\u9875 \u4e0b\u8f7d\u5ba1\u6838\u6210\u529f\u7684\u7167\u7247\u3002"),a["default"].createElement("h3",null,"2016-08-15 \u66f4\u65b0 1.3.1"),a["default"].createElement("p",null,"1. \u589e\u52a0\u8eab\u4efd\u8ba4\u8bc1\u5ba1\u6838\u3002"),a["default"].createElement("h3",null,"2016-08-12 \u66f4\u65b0 1.3.0"),a["default"].createElement("p",null,"1. \u6743\u9650\u7cfb\u7edf\u3002",a["default"].createElement("br",null),"2. \u7528\u6237\u9000\u51fa, \u7528\u6237\u5bc6\u7801\u4fee\u6539\u3002"),a["default"].createElement(c["default"],null,"Ok"))};d.propTypes={},l["default"]=d,e.exports=l["default"]},588:function(e,l){e.exports={home:"home___nMSou"}}});
+webpackJsonp([31],{456:function(e,l,t){"use strict";function n(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(l,"__esModule",{value:!0});var u=t(1),a=n(u),r=function(e){var l=(e.location,t(588));return a["default"].createElement("div",{className:l.home},a["default"].createElement("h1",{style:{marginBottom:50}},"\u6b22\u8fce\u4f7f\u7528\u67a2\u7ebd\u79d1\u6280\u540e\u53f0"),a["default"].createElement("h3",null,"2016-08-22 \u66f4\u65b0 1.3.5"),a["default"].createElement("p",null,"1. \u9700\u6c42\u589e\u52a0: \u6ce8\u518c\u65f6\uff0c\u8868\u5355\u9a8c\u8bc1",a["default"].createElement("br",null),"2. \u9700\u6c42\u4fee\u6539: \u4e0b\u8f7d\u56fe\u7247\u547d\u540d\u65b9\u5f0f\u4e3a\u201c\u6295\u8d44\u4eba\u59d3\u540d-\u5b9e\u9645\u6253\u6b3e\u91d1\u989d\u201d",a["default"].createElement("br",null),"3. BUG\u4fee\u590d: \u62a5\u5355\u5ba1\u6838\u8fc7\u7a0b\u4e2d\uff0c\u6240\u5ba1\u6838\u7684\u56fe\u7247\u5c3a\u5bf8\u8fc7\u5927\u65f6\uff0c\u65e0\u6cd5\u70b9\u51fb\u56fe\u7247\u4e0a\u5173\u95ed\u952e",a["default"].createElement("br",null),"4. BUG\u4fee\u590d: \u4ea7\u54c1\u5217\u8868-\u53d1\u5e03\u516c\u544a-\u65b0\u589e\u516c\u544a\uff0c\u7f16\u8f91\u65b0\u589e\u516c\u544a\u5185\u5bb9\u65f6\uff0c\u9875\u9762\u53d1\u751f\u81ea\u52a8\u8df3\u8f6c\uff0c\u5bfc\u81f4\u65e0\u6cd5\u7f16\u8f91",a["default"].createElement("br",null),"5. BUG\u4fee\u590d: \u5408\u540c\u7269\u6d41-\u8fd0\u5355\u4fe1\u606f\u4fdd\u5b58\u6210\u529f\u540e\u8fd4\u56de\u5230\u4e0a\u4e00\u7ea7\u9875\u9762\uff0c\u518d\u6b21\u8fdb\u5165\u5408\u540c\u7269\u6d41\u9875\u9762\u65f6\uff0c\u4e4b\u524d\u4fdd\u5b58\u6210\u529f\u7684\u8fd0\u5355\u4fe1\u606f\u6d88\u5931",a["default"].createElement("br",null),"6. BUG\u4fee\u590d: \u4ea7\u54c1\u8be6\u60c5-\u65e0\u6cd5\u66f4\u65b0\u57fa\u91d1\u5230\u671f\u7f16\u8f91\u7684\u65f6\u95f4",a["default"].createElement("br",null)),a["default"].createElement("h3",null,"2016-08-19 \u66f4\u65b0 1.3.4"),a["default"].createElement("p",null,"1. BUG\u4fee\u590d: \u8ba2\u5355\u5408\u540c\u7269\u6d41\u5355\u53f7\u8bbe\u7f6e\u3002",a["default"].createElement("br",null),"2. BUG\u4fee\u590d: \u81ea\u5b9a\u4e49\u6d88\u606f\u63a8\u9001BUG; \u81ea\u5b9a\u4e49\u6d88\u606f\u8be6\u60c5\u5c55\u793a\u65f6\u5fae\u4fe1\u6e20\u9053\u53bb\u9664\u591a\u4f59\u5b57\u6bb5",a["default"].createElement("br",null),"3. BUG\u4fee\u590d: \u62a5\u5355\u5ba1\u6838\u5931\u8d25\u65f6\u8f93\u51fa\u62d2\u7edd\u7406\u7531",a["default"].createElement("br",null)),a["default"].createElement("h3",null,"2016-08-18 \u66f4\u65b0 1.3.3"),a["default"].createElement("p",null,'1. \u83dc\u5355\u680f\u589e\u52a0"\u8bbe\u7f6e"; "\u7ba1\u7406\u5458"\u83dc\u5355\u53ea\u5206\u914d\u7ed9\u7ba1\u7406\u5458\u89d2\u8272\u3002',a["default"].createElement("br",null),"2. \u4fee\u590dWindow\u4e0b, \u62a5\u5355\u5ba1\u6838\u7167\u7247\u4e0b\u8f7d\u6587\u4ef6\u6269\u5c55\u540d\u7f3a\u5931\u3002",a["default"].createElement("br",null),'3. \u521b\u5efa\u89d2\u8272\u65f6, \u89d2\u8272ID\u5f3a\u5236"ROLE_"\u5f00\u5934\u3002',a["default"].createElement("br",null),"4. ROLE_ADMIN, ROLE_USER, ROLE_DEFAULT \u4e09\u4e2a\u89d2\u8272\u4e0d\u5141\u8bb8\u5220\u9664\u3002",a["default"].createElement("br",null),"5. BUG\u4fee\u590d: \u63a8\u9001\u81ea\u5b9a\u4e49\u6d88\u606f\u6210\u529f\u540e\u8fdb\u5165\u6d88\u606f\u8be6\u60c5\u9875\u9762\u3002",a["default"].createElement("br",null),"6. \u66f4\u4e25\u8c28\u7684\u6743\u9650\u63a7\u5236\u3002"),a["default"].createElement("h3",null,"2016-08-17 \u66f4\u65b0 1.3.2"),a["default"].createElement("p",null,"1. \u62a5\u5355\u5ba1\u6838\u5217\u8868\u9875 \u4e0b\u8f7d\u5ba1\u6838\u6210\u529f\u7684\u7167\u7247\u3002"),a["default"].createElement("h3",null,"2016-08-15 \u66f4\u65b0 1.3.1"),a["default"].createElement("p",null,"1. \u589e\u52a0\u8eab\u4efd\u8ba4\u8bc1\u5ba1\u6838\u3002"),a["default"].createElement("h3",null,"2016-08-12 \u66f4\u65b0 1.3.0"),a["default"].createElement("p",null,"1. \u6743\u9650\u7cfb\u7edf\u3002",a["default"].createElement("br",null),"2. \u7528\u6237\u9000\u51fa, \u7528\u6237\u5bc6\u7801\u4fee\u6539\u3002"))};r.propTypes={},l["default"]=r,e.exports=l["default"]},588:function(e,l){e.exports={home:"home___nMSou"}}});
\ No newline at end of file

dist/javascript/Login.js

-webpackJsonp([29],{7:[841,23],8:2,14:[841,40],20:[841,31],21:function(e,t,l){"use strict";l(2),l(49),l(48)},23:2,31:2,40:2,48:[841,8],49:2,63:[841,65],65:2,270:function(e,t,l){"use strict";function a(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=void 0;var n,r,u,d,o,f=(l(20),l(53)),c=a(f),i=(l(7),l(11)),p=a(i),s=(l(63),l(124)),m=a(s),g=(l(14),l(58)),E=a(g),_=l(12),v=a(_),y=l(3),b=a(y),h=l(5),I=a(h),N=l(4),S=a(N),T=(l(21),l(50)),P=a(T),O=l(1),j=a(O),k=l(22),w=l(19),x=(n=(0,k.connect)(function(e){return{loading:e.user.loading}}),r=P["default"].create(),n(u=r((o=d=function(e){function t(){var a,n,r;(0,b["default"])(this,t);for(var u=arguments.length,d=Array(u),o=0;o<u;o++)d[o]=arguments[o];return a=n=(0,I["default"])(this,e.call.apply(e,[this].concat(d))),n.handleSubmit=function(e){e.preventDefault();var t=n.props.form.getFieldsValue();n.props.dispatch((0,v["default"])({},t,{replace:n.props.history.replace,type:"LOGIN_REQUEST"}))},n.render=function(){var e=n.props,t=e.form.getFieldProps,a=e.loading,r=l(589),u=l(831);return j["default"].createElement(c["default"],{spinning:a,tip:"\u6b63\u5728\u767b\u5f55..."},j["default"].createElement("div",{className:r.normal},j["default"].createElement("div",{className:r.content},j["default"].createElement("div",{className:r["login-bg"],style:{backgroundImage:"url("+u+")"}}),j["default"].createElement("div",{className:r["login-container"]},j["default"].createElement("div",null,j["default"].createElement("div",null,j["default"].createElement("h1",null,"\u67a2\u7ebd\u79d1\u6280\u540e\u53f0\u7ba1\u7406\u7cfb\u7edf"),j["default"].createElement(P["default"],{inline:!0,onSubmit:n.handleSubmit.bind(n)},j["default"].createElement("div",null,j["default"].createElement(P["default"].Item,null,j["default"].createElement(E["default"],(0,v["default"])({placeholder:"\u8bf7\u8f93\u5165\u8d26\u6237\u540d"},t("username")))),j["default"].createElement(P["default"].Item,null,j["default"].createElement(E["default"],(0,v["default"])({type:"password",placeholder:"\u8bf7\u8f93\u5165\u5bc6\u7801"},t("password"))))),j["default"].createElement("div",null,j["default"].createElement(P["default"].Item,null,j["default"].createElement(m["default"],t("agreement"),"\u8bb0\u4f4f\u6211")),j["default"].createElement(p["default"],{type:"primary",htmlType:"submit"},"\u767b\u5f55"),j["default"].createElement(w.Link,{to:"/register"},j["default"].createElement(p["default"],{type:"ghost"},"\u6ce8\u518c"))))))))))},r=a,(0,I["default"])(n,r)}return(0,S["default"])(t,e),t.prototype.componentWillMount=function(){sessionStorage.clear()},t}(O.Component),d.propTypes={form:O.PropTypes.object,dispatch:O.PropTypes.func},u=o))||u)||u);t["default"]=x,e.exports=t["default"]},589:function(e,t){e.exports={normal:"normal___1GD36",content:"content___1S3IP","login-bg":"login-bg___1CINX","login-container":"login-container___3JgsK",fadeIn:"fadeIn___3V6ip",fadeOut:"fadeOut___FoTgE"}},831:function(e,t,l){e.exports=l.p+"0e82090a7877fbb6f828e531fe738741.jpg"}});
+webpackJsonp([29],{7:[841,23],8:2,14:[841,40],20:[841,31],21:function(e,t,l){"use strict";l(2),l(49),l(48)},23:2,31:2,40:2,48:[841,8],49:2,63:[841,65],65:2,270:function(e,t,l){"use strict";function a(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=void 0;var n,r,u,d,o,f=(l(20),l(53)),c=a(f),i=(l(7),l(12)),p=a(i),s=(l(63),l(124)),m=a(s),g=(l(14),l(58)),E=a(g),_=l(11),v=a(_),y=l(3),b=a(y),h=l(5),I=a(h),N=l(4),S=a(N),T=(l(21),l(50)),P=a(T),O=l(1),j=a(O),k=l(22),w=l(19),x=(n=(0,k.connect)(function(e){return{loading:e.user.loading}}),r=P["default"].create(),n(u=r((o=d=function(e){function t(){var a,n,r;(0,b["default"])(this,t);for(var u=arguments.length,d=Array(u),o=0;o<u;o++)d[o]=arguments[o];return a=n=(0,I["default"])(this,e.call.apply(e,[this].concat(d))),n.handleSubmit=function(e){e.preventDefault();var t=n.props.form.getFieldsValue();n.props.dispatch((0,v["default"])({},t,{replace:n.props.history.replace,type:"LOGIN_REQUEST"}))},n.render=function(){var e=n.props,t=e.form.getFieldProps,a=e.loading,r=l(589),u=l(831);return j["default"].createElement(c["default"],{spinning:a,tip:"\u6b63\u5728\u767b\u5f55..."},j["default"].createElement("div",{className:r.normal},j["default"].createElement("div",{className:r.content},j["default"].createElement("div",{className:r["login-bg"],style:{backgroundImage:"url("+u+")"}}),j["default"].createElement("div",{className:r["login-container"]},j["default"].createElement("div",null,j["default"].createElement("div",null,j["default"].createElement("h1",null,"\u67a2\u7ebd\u79d1\u6280\u540e\u53f0\u7ba1\u7406\u7cfb\u7edf"),j["default"].createElement(P["default"],{inline:!0,onSubmit:n.handleSubmit.bind(n)},j["default"].createElement("div",null,j["default"].createElement(P["default"].Item,null,j["default"].createElement(E["default"],(0,v["default"])({placeholder:"\u8bf7\u8f93\u5165\u8d26\u6237\u540d"},t("username")))),j["default"].createElement(P["default"].Item,null,j["default"].createElement(E["default"],(0,v["default"])({type:"password",placeholder:"\u8bf7\u8f93\u5165\u5bc6\u7801"},t("password"))))),j["default"].createElement("div",null,j["default"].createElement(P["default"].Item,null,j["default"].createElement(m["default"],t("agreement"),"\u8bb0\u4f4f\u6211")),j["default"].createElement(p["default"],{type:"primary",htmlType:"submit"},"\u767b\u5f55"),j["default"].createElement(w.Link,{to:"/register"},j["default"].createElement(p["default"],{type:"ghost"},"\u6ce8\u518c"))))))))))},r=a,(0,I["default"])(n,r)}return(0,S["default"])(t,e),t.prototype.componentWillMount=function(){sessionStorage.clear()},t}(O.Component),d.propTypes={form:O.PropTypes.object,dispatch:O.PropTypes.func},u=o))||u)||u);t["default"]=x,e.exports=t["default"]},589:function(e,t){e.exports={normal:"normal___1GD36",content:"content___1S3IP","login-bg":"login-bg___1CINX","login-container":"login-container___3JgsK",fadeIn:"fadeIn___3V6ip",fadeOut:"fadeOut___FoTgE"}},831:function(e,t,l){e.exports=l.p+"0e82090a7877fbb6f828e531fe738741.jpg"}});
\ No newline at end of file

dist/javascript/NotFound.js

-webpackJsonp([30],{7:[841,23],23:2,271:function(e,t,a){"use strict";function l(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var n=(a(7),a(11)),r=l(n),u=a(1),c=l(u),d=a(590),f=l(d),s=function(){return c["default"].createElement("div",{className:f["default"].normal},c["default"].createElement("div",{className:f["default"].container},c["default"].createElement("h1",{className:f["default"].title},"404"),c["default"].createElement("p",{className:f["default"].desc},"\u672a\u627e\u5230\u8be5\u9875\u9762"),c["default"].createElement("a",{href:"/"},c["default"].createElement(r["default"],{type:"primary",style:{marginTop:5}},"\u8fd4\u56de\u9996\u9875"))))};t["default"]=s,e.exports=t["default"]},590:function(e,t){e.exports={normal:"normal___1J5-e",container:"container___1yrrz",title:"title___3_IsN",desc:"desc___3ktop"}}});
+webpackJsonp([30],{7:[841,23],23:2,271:function(e,t,a){"use strict";function l(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var n=(a(7),a(12)),r=l(n),u=a(1),c=l(u),d=a(590),f=l(d),s=function(){return c["default"].createElement("div",{className:f["default"].normal},c["default"].createElement("div",{className:f["default"].container},c["default"].createElement("h1",{className:f["default"].title},"404"),c["default"].createElement("p",{className:f["default"].desc},"\u672a\u627e\u5230\u8be5\u9875\u9762"),c["default"].createElement("a",{href:"/"},c["default"].createElement(r["default"],{type:"primary",style:{marginTop:5}},"\u8fd4\u56de\u9996\u9875"))))};t["default"]=s,e.exports=t["default"]},590:function(e,t){e.exports={normal:"normal___1J5-e",container:"container___1yrrz",title:"title___3_IsN",desc:"desc___3ktop"}}});
\ No newline at end of file

proxy.config.js

@@ -2,7 +2,7 @@
 // - https://github.com/dora-js/dora-plugin-proxy#规则定义
 
 module.exports = {
-    '/api/*': 'http://react.yanky.cn/',
+    // '/api/*': 'http://react.yanky.cn/',
     // '/api/*': 'http://192.168.1.126:8080/',
-    // '/api/*': 'http://localhost:8080/'
+    '/api/*': 'http://localhost:8080/'
 };

src/components/ProductForm/DateTimeStatusForm.jsx

@@ -64,7 +64,7 @@ export default class DateTimeSatausForm extends Component {
         if (formData.fundEstablishedTime) {
             data.fundEstablishedTime = formatDateTime(formData.fundEstablishedTime);
         }
-        if (formData.fundExpireTime[1]) {
+        if (formData.fundExpireTime) {
             data.fundExpireTime = formatDateTime(formData.fundExpireTime);
         }
 

src/containers/Announcement/EditItem.jsx

@@ -39,8 +39,12 @@ export default class EditItem extends Component {
 
     }
 
+    componentWillMount() {
+        this.props.dispatch({type: 'CLEART_ANNOUNCEMENT_ITEM'});
+    }
 
     componentDidMount() {
+
         const {params:{id}} = this.props;
         if (id) {
             this.fetchItem(id);

src/containers/Home/Home.jsx

 import React, {Component, PropTypes} from 'react';
-import Button from 'antd/lib/button';
 
 const Home = ({location}) => {
     const styles = require('./Home.less');
@@ -8,6 +7,16 @@ const Home = ({location}) => {
 
         <div className={styles.home}>
             <h1 style={{marginBottom: 50}}>欢迎使用枢纽科技后台</h1>
+            <h3>2016-08-22 更新 1.3.5</h3>
+            <p>
+                1. 需求增加: 注册时，表单验证<br/>
+                2. 需求修改: 下载图片命名方式为“投资人姓名-实际打款金额”<br/>
+                3. BUG修复: 报单审核过程中，所审核的图片尺寸过大时，无法点击图片上关闭键<br/>
+                4. BUG修复: 产品列表-发布公告-新增公告，编辑新增公告内容时，页面发生自动跳转，导致无法编辑<br/>
+                5. BUG修复: 合同物流-运单信息保存成功后返回到上一级页面，再次进入合同物流页面时，之前保存成功的运单信息消失<br/>
+                6. BUG修复: 产品详情-无法更新基金到期编辑的时间<br/>
+
+            </p>
             <h3>2016-08-19 更新 1.3.4</h3>
             <p>
                 1. BUG修复: 订单合同物流单号设置。<br/>
@@ -37,7 +46,6 @@ const Home = ({location}) => {
                 1. 权限系统。<br/>
                 2. 用户退出, 用户密码修改。
             </p>
-            <Button>Ok</Button>
         </div>
 
     );

src/containers/Trade/Contract.jsx

@@ -34,8 +34,7 @@ import HeaderOperation, {DetailOperations} from '../../components/HeaderOperatio
 
 @connect(state=>({
     loading: state.contract.loading,
-    trade: state.contract.trade,
-    shipping: state.contract.shipping
+    item: state.contract.item
 }))
 @Form.create()
 export default class Contract extends Component {
@@ -63,7 +62,7 @@ export default class Contract extends Component {
 
     render() {
 
-        const {trade, shipping, loading, form:{getFieldProps}, location:{query}} = this.props;
+        const {item, loading, form:{getFieldProps}, location:{query}} = this.props;
         const operation = (
             <HeaderOperation history={this.props.history} buttons={[{key: 'rollback'}]}/>
         );
@@ -77,12 +76,12 @@ export default class Contract extends Component {
                 <Spin spinning={loading}>
                     <Form horizontal onSubmit={this.handleSubmit.bind(this)} style={{marginTop: 20}}>
                         <Form.Item label="产品" {...smallFormItemLayout}>
-                            <p>{trade && trade.itemTitle || query.title}</p>
+                            <p>{item && item.itemTitle || query.title}</p>
                         </Form.Item>
                         <Form.Item label="顺丰运单" {...smallFormItemLayout}>
                             <Input placeholder="请填写顺丰运单编号"
                                    {...getFieldProps('expressNO', {
-                                       initialValue: shipping && shipping.expressNO
+                                       initialValue: item && item.expressNO
                                    })}  />
                         </Form.Item>
                         <Form.Item {...footerFormSubmitLayout} style={{marginTop: 30}}>

src/containers/Users/Register.jsx

@@ -22,6 +22,22 @@ export default class Register extends Component {
     handleSubmit(e) {
         e.preventDefault();
         const data = this.props.form.getFieldsValue();
+        if(!data.username){
+            message.error('请输入用户名');
+            return;
+        }
+        if(!data.password){
+            message.error('请输入密码');
+            return;
+        }
+        if(!data.confirmPassword){
+            message.error('请再次输入密码');
+            return;
+        }
+        if(data.confirmPassword != data.password){
+            message.error('密码与重复密码不一致');
+            return;
+        }
         console.log(data);
         this.props.dispatch({
             type: 'CREATE_USER',

src/entries/index.less

@@ -167,8 +167,8 @@
                 img {
                     margin: auto;
                     display: block;
-                    max-width: 100vw !important;
-                    max-height: 100vh !important;
+                    max-width: 95vw !important;
+                    max-height: 95vh !important;
 
                 }
                 .ant-modal-close {

src/reducers/announcement.js

@@ -52,6 +52,10 @@ const announcement = handleActions({
     ['UPDATE_ANNOUNCEMENT_ITEM_FAILED'](state, action){
         return {...state, err: action.err, loading: false, isEdit: false, item: null}
     },
+    ['CLEART_ANNOUNCEMENT_ITEM'](state){
+        delete state.item;
+        return {...state};
+    }
 }, initState);
 
 export default announcement;

src/reducers/contract.js

@@ -6,7 +6,7 @@ const contract = handleActions({
         return {...state, loading: true}
     },
     ['FETCH_CONTRACT_ITEM_SUCCESS'](state, action){
-        return {...state, loading: false, trade: action.trade, shipping: action.shipping}
+        return {...state, loading: false, item: action.item}
     },
     ['FETCH_CONTRACT_ITEM_FAILED'](state, action){
         return {...state, err: action.err, loading: false, trade: null, shipping: null}