Commit 3d7feaf2 authored by superman's avatar superman

update

parent 45b190e1
webpackJsonp([33,31],[function(c,n){"use strict"}]);
\ No newline at end of file
!function(t){function a(e){if(r[e])return r[e].exports;var s=r[e]={exports:{},id:e,loaded:!1};return t[e].call(s.exports,s,s.exports,a),s.loaded=!0,s.exports}var e=window.webpackJsonp;window.webpackJsonp=function(i,c){for(var n,o,p=0,u=[];p<i.length;p++)o=i[p],s[o]&&u.push.apply(u,s[o]),s[o]=0;for(n in c){var v=c[n];switch(typeof v){case"object":t[n]=function(a){var e=a.slice(1),r=a[0];return function(a,s,i){t[r].apply(this,[a,s,i].concat(e))}}(v);break;case"function":t[n]=v;break;default:t[n]=t[v]}}for(e&&e(i,c);u.length;)u.shift().call(null,a);if(c[0])return r[0]=0,a(0)};var r={},s={31:0};a.e=function(t,e){if(0===s[t])return e.call(null,a);if(void 0!==s[t])s[t].push(e);else{s[t]=[e];var r=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.src=a.p+""+({0:"javascript/Authority-Item",1:"javascript/Users-Item",2:"javascript/Announcement-Item",3:"javascript/Product-Item",4:"javascript/Product-AddItem",5:"javascript/Trade-AddItem",6:"javascript/Trade-List",7:"javascript/Resource-List",8:"javascript/Product-List",9:"javascript/Authority-List",10:"javascript/Users-List",11:"javascript/Announcement-List",12:"javascript/CustomMessage-AddItem",13:"javascript/Withdraw-List",14:"javascript/Remittance-List",15:"javascript/CustomMessage-List",16:"javascript/AuthInfo-List",17:"javascript/Resource-Item",18:"javascript/Remittance-Item",19:"javascript/AuthInfo-Item",20:"javascript/Users-ModifyPassword",21:"javascript/Withdraw-Item",22:"javascript/Trade-Contract",23:"javascript/Trade-Commission",24:"javascript/BaseFunction-BaseUpload",25:"javascript/Users-Register",26:"javascript/Login",27:"javascript/Trade-Item",28:"javascript/CustomMessage-Item",29:"javascript/NotFound",30:"javascript/Home",32:"index"}[t]||t)+".js",r.appendChild(i)}},a.m=t,a.c=r,a.p="/"}(function(t){for(var a in t)if(Object.prototype.hasOwnProperty.call(t,a))switch(typeof t[a]){case"function":break;case"object":t[a]=function(a){var e=a.slice(1),r=t[a[0]];return function(t,a,s){r.apply(this,[t,a,s].concat(e))}}(t[a]);break;default:t[a]=t[t[a]]}return t}([])); !function(t){function a(e){if(r[e])return r[e].exports;var s=r[e]={exports:{},id:e,loaded:!1};return t[e].call(s.exports,s,s.exports,a),s.loaded=!0,s.exports}var e=window.webpackJsonp;window.webpackJsonp=function(i,c){for(var n,o,p=0,u=[];p<i.length;p++)o=i[p],s[o]&&u.push.apply(u,s[o]),s[o]=0;for(n in c){var v=c[n];switch(typeof v){case"object":t[n]=function(a){var e=a.slice(1),r=a[0];return function(a,s,i){t[r].apply(this,[a,s,i].concat(e))}}(v);break;case"function":t[n]=v;break;default:t[n]=t[v]}}for(e&&e(i,c);u.length;)u.shift().call(null,a);if(c[0])return r[0]=0,a(0)};var r={},s={31:0};a.e=function(t,e){if(0===s[t])return e.call(null,a);if(void 0!==s[t])s[t].push(e);else{s[t]=[e];var r=document.getElementsByTagName("head")[0],i=document.createElement("script");i.type="text/javascript",i.charset="utf-8",i.async=!0,i.src=a.p+""+({0:"javascript/Authority-Item",1:"javascript/Users-Item",2:"javascript/Announcement-Item",3:"javascript/Product-Item",4:"javascript/Product-AddItem",5:"javascript/Trade-List",6:"javascript/Resource-List",7:"javascript/Product-List",8:"javascript/Authority-List",9:"javascript/Announcement-List",10:"javascript/Users-List",11:"javascript/Trade-AddItem",12:"javascript/Withdraw-List",13:"javascript/Remittance-List",14:"javascript/CustomMessage-List",15:"javascript/AuthInfo-List",16:"javascript/CustomMessage-AddItem",17:"javascript/Resource-Item",18:"javascript/Remittance-Item",19:"javascript/AuthInfo-Item",20:"javascript/Users-ModifyPassword",21:"javascript/Withdraw-Item",22:"javascript/Trade-Contract",23:"javascript/Trade-Commission",24:"javascript/Trade-Item",25:"javascript/CustomMessage-Item",26:"javascript/BaseFunction-BaseUpload",27:"javascript/Users-Register",28:"javascript/Login",29:"javascript/NotFound",30:"javascript/Home",32:"index",33:"a"}[t]||t)+".js",r.appendChild(i)}},a.m=t,a.c=r,a.p="/"}(function(t){for(var a in t)if(Object.prototype.hasOwnProperty.call(t,a))switch(typeof t[a]){case"function":break;case"object":t[a]=function(a){var e=a.slice(1),r=t[a[0]];return function(t,a,s){r.apply(this,[t,a,s].concat(e))}}(t[a]);break;default:t[a]=t[t[a]]}return t}([]));
\ No newline at end of file \ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
webpackJsonp([30, 31], { webpackJsonp([30,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(12),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"}}});
539: function (e, l, t) { \ No newline at end of file
"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(670));
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"))
};
r.propTypes = {}, l["default"] = r, e.exports = l["default"]
}, 670: function (e, l) {
e.exports = {home: "home___nMSou"}
}
});
This source diff could not be displayed because it is too large. You can view the blob instead.
webpackJsonp([29,31],{10:function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var o=n(46),l=r(o),a=n(45),u=r(a);l["default"].Group=u["default"],t["default"]=l["default"],e.exports=t["default"]},12:[849,50],45:function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{"default":e}}function o(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function l(e,t){var n={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(n[r]=e[r]);return n}function a(e){var t,n=e.size,r=e.className,a=l(e,["size","className"]),i={large:"lg",small:"sm"}[n]||"",s=(0,f["default"])((t={"ant-btn-group":!0},o(t,p+i,i),o(t,r,r),t));return c["default"].createElement("div",u({},a,{className:s}))}Object.defineProperty(t,"__esModule",{value:!0});var u=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e};t["default"]=a;var i=n(1),c=r(i),s=n(3),f=r(s),p="ant-btn-group-";a.propTypes={size:c["default"].PropTypes.oneOf(["large","small"])},e.exports=t["default"]},46:function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{"default":e}}function o(e,t){for(var n=Object.getOwnPropertyNames(t),r=0;r<n.length;r++){var o=n[r],l=Object.getOwnPropertyDescriptor(t,o);l&&l.configurable&&void 0===e[o]&&Object.defineProperty(e,o,l)}return e}function l(e,t,n){return t in e?Object.defineProperty(e,t,{value:n,enumerable:!0,configurable:!0,writable:!0}):e[t]=n,e}function a(e,t){var n={};for(var r in e)t.indexOf(r)>=0||Object.prototype.hasOwnProperty.call(e,r)&&(n[r]=e[r]);return n}function u(e,t){if(!(e instanceof t))throw new TypeError("Cannot call a class as a function")}function i(e,t){if(!e)throw new ReferenceError("this hasn't been initialised - super() hasn't been called");return!t||"object"!=typeof t&&"function"!=typeof t?e:t}function c(e,t){if("function"!=typeof t&&null!==t)throw new TypeError("Super expression must either be null or a function, not "+typeof t);e.prototype=Object.create(t&&t.prototype,{constructor:{value:e,enumerable:!1,writable:!0,configurable:!0}}),t&&(Object.setPrototypeOf?Object.setPrototypeOf(e,t):o(e,t))}function s(e){return"string"==typeof e}function f(e){return s(e.type)&&j(e.props.children)?b["default"].cloneElement(e,{},e.props.children.split("").join(" ")):s(e)?(j(e)&&(e=e.split("").join(" ")),b["default"].createElement("span",null,e)):e}Object.defineProperty(t,"__esModule",{value:!0}),t["default"]=void 0;var p,d,m,y=Object.assign||function(e){for(var t=1;t<arguments.length;t++){var n=arguments[t];for(var r in n)Object.prototype.hasOwnProperty.call(n,r)&&(e[r]=n[r])}return e},h=n(1),b=r(h),v=n(3),O=r(v),g=n(6),_=n(7),P=r(_),T=/^[\u4e00-\u9fa5]{2}$/,j=T.test.bind(T),N=(d=p=function(e){function t(){var n,r,o;u(this,t);for(var l=arguments.length,a=Array(l),c=0;c<l;c++)a[c]=arguments[c];return n=r=i(this,e.call.apply(e,[this].concat(a))),m.call(r),o=n,i(r,o)}return c(t,e),t.prototype.componentWillUnmount=function(){this.clickedTimeout&&clearTimeout(this.clickedTimeout),this.timeout&&clearTimeout(this.timeout)},t.prototype.render=function(){var e,t=this.props,n=t.type,r=t.shape,o=t.size,u=t.className,i=t.htmlType,c=t.children,s=t.icon,p=t.loading,d=t.prefixCls,m=a(t,["type","shape","size","className","htmlType","children","icon","loading","prefixCls"]),h={large:"lg",small:"sm"}[o]||"",v=(0,O["default"])((e={},l(e,d,!0),l(e,d+"-"+n,n),l(e,d+"-"+r,r),l(e,d+"-"+h,h),l(e,d+"-icon-only",!c&&s),l(e,d+"-loading",p),l(e,u,u),e)),g=p?"loading":s,_=b["default"].Children.map(c,f);return b["default"].createElement("button",y({},m,{type:i||"button",className:v,onMouseUp:this.handleMouseUp,onClick:this.handleClick}),g?b["default"].createElement(P["default"],{type:g}):null,_)},t}(b["default"].Component),p.defaultProps={prefixCls:"ant-btn",onClick:function(){},loading:!1},p.propTypes={type:b["default"].PropTypes.string,shape:b["default"].PropTypes.oneOf(["circle","circle-outline"]),size:b["default"].PropTypes.oneOf(["large","default","small"]),htmlType:b["default"].PropTypes.oneOf(["submit","button","reset"]),onClick:b["default"].PropTypes.func,loading:b["default"].PropTypes.bool,className:b["default"].PropTypes.string,icon:b["default"].PropTypes.string},m=function(){var e=this;this.clearButton=function(t){t.className=t.className.replace(" "+e.props.prefixCls+"-clicked","")},this.handleClick=function(){var t,n=(0,g.findDOMNode)(e);e.clearButton(n),e.clickedTimeout=setTimeout(function(){return n.className+=" "+e.props.prefixCls+"-clicked"},10),clearTimeout(e.timeout),e.timeout=setTimeout(function(){return e.clearButton(n)},500),(t=e.props).onClick.apply(t,arguments)},this.handleMouseUp=function(t){(0,g.findDOMNode)(e).blur(),e.props.onMouseUp&&e.props.onMouseUp(t)}},d);t["default"]=N,e.exports=t["default"]},50:4,541:function(e,t,n){"use strict";function r(e){return e&&e.__esModule?e:{"default":e}}Object.defineProperty(t,"__esModule",{value:!0});var o=(n(12),n(10)),l=r(o),a=n(1),u=r(a),i=n(672),c=r(i),s=function(){return u["default"].createElement("div",{className:c["default"].normal},u["default"].createElement("div",{className:c["default"].container},u["default"].createElement("h1",{className:c["default"].title},"404"),u["default"].createElement("p",{className:c["default"].desc},"\u672a\u627e\u5230\u8be5\u9875\u9762"),u["default"].createElement("a",{href:"/"},u["default"].createElement(l["default"],{type:"primary",style:{marginTop:5}},"\u8fd4\u56de\u9996\u9875"))))};t["default"]=s,e.exports=t["default"]},672:function(e,t){e.exports={normal:"normal___1J5-e",container:"container___1yrrz",title:"title___3_IsN",desc:"desc___3ktop"}}}); webpackJsonp([29,31],{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 \ No newline at end of file
This diff is collapsed.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<component name="NewModuleRootManager" inherit-compiler-output="true"> <component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output /> <exclude-output />
<content url="file://$MODULE_DIR$"> <content url="file://$MODULE_DIR$">
<excludeFolder url="file://$MODULE_DIR$/dist" />
<excludeFolder url="file://$MODULE_DIR$/node_modules" /> <excludeFolder url="file://$MODULE_DIR$/node_modules" />
</content> </content>
<orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="sourceFolder" forTests="false" />
......
import React, {Component, PropTypes} from 'react'; import React, {Component, PropTypes} from 'react';
import {Router, Route, IndexRoute, Link} from 'react-router'; import {Link} from 'react-router';
import Layout from '../../components/Layout/Layout';
import {connect} from 'react-redux'; import {connect} from 'react-redux';
import {Menu, Icon} from 'antd';
import {Collapse, Menu, Icon, Upload, Row, Col} from 'antd';
const Panel = Collapse.Panel;
const SubMenu = Menu.SubMenu; const SubMenu = Menu.SubMenu;
const MenuItemGroup = Menu.ItemGroup; const MenuItemGroup = Menu.ItemGroup;
...@@ -21,17 +18,6 @@ export default class App extends Component { ...@@ -21,17 +18,6 @@ export default class App extends Component {
store: PropTypes.object.isRequired store: PropTypes.object.isRequired
}; };
// componentDidMount(){
// this.fetchAuthorityList();
// }
//
// fetchAuthorityList() {
// this.props.dispatch({
// type: 'FETCH_AUTHORITY_LIST',
// query: {s: 100}
// });
// };
render() { render() {
const styles = require('./App.less'); const styles = require('./App.less');
const menu = [ const menu = [
...@@ -112,7 +98,7 @@ export default class App extends Component { ...@@ -112,7 +98,7 @@ export default class App extends Component {
] ]
}]; }];
const {user, location:{pathname}} = this.props; const {user} = this.props;
if (user && user.authorities && user.authorities['ROLE_ADMIN']) { if (user && user.authorities && user.authorities['ROLE_ADMIN']) {
menu.push({ menu.push({
......
import React, {Component, PropTypes} from 'react'; import React, {Component, PropTypes} from 'react';
import Button from 'antd/lib/button';
const Home = ({location}) => { const Home = ({location}) => {
const styles = require('./Home.less'); const styles = require('./Home.less');
...@@ -37,6 +37,7 @@ const Home = ({location}) => { ...@@ -37,6 +37,7 @@ const Home = ({location}) => {
1. 权限系统。<br/> 1. 权限系统。<br/>
2. 用户退出, 用户密码修改。 2. 用户退出, 用户密码修改。
</p> </p>
<Button>Ok</Button>
</div> </div>
); );
......
import './index.html'; import './index.html';
import React from 'react'; import React from 'react';
import ReactDOM from 'react-dom'; import ReactDOM from 'react-dom';
import { Provider } from 'react-redux'; import {Provider} from 'react-redux';
import { createStore, applyMiddleware, compose, combineReducers } from 'redux'; import {createStore, applyMiddleware, compose, combineReducers} from 'redux';
import createSagaMiddleware from 'redux-saga'; import createSagaMiddleware from 'redux-saga';
import {Router, browserHistory } from 'react-router'; import {Router, browserHistory} from 'react-router';
import { syncHistoryWithStore, routerReducer as routing } from 'react-router-redux'; import {syncHistoryWithStore, routerReducer as routing} from 'react-router-redux';
import reducers from '../reducers/index'; import reducers from '../reducers/index';
import { ReduxAsyncConnect } from 'redux-async-connect'; import {ReduxAsyncConnect} from 'redux-async-connect';
import SagaManager from '../sagas/SagaManager'; import SagaManager from '../sagas/SagaManager';
import './index.less'; import './index.less';
import Button from 'antd/lib/button';
import Icon from 'antd/lib/icon';
import Row from 'antd/lib/row';
import Col from 'antd/lib/col';
import Form from 'antd/lib/form';
import Checkbox from 'antd/lib/checkbox';
import message from 'antd/lib/message';
import Tabs from 'antd/lib/tabs';
import Spin from 'antd/lib/spin';
import Table from 'antd/lib/table';
import DatePicker from 'antd/lib/date-picker';
import Modal from 'antd/lib/modal';
import Upload from 'antd/lib/upload';
import Radio from 'antd/lib/radio';
import Cascader from 'antd/lib/cascader';
////////////////////// //////////////////////
// Store // Store
...@@ -28,7 +43,7 @@ SagaManager.startSagas(sagaMiddleware); ...@@ -28,7 +43,7 @@ SagaManager.startSagas(sagaMiddleware);
if (module.hot) { if (module.hot) {
module.hot.accept('../reducers', () => { module.hot.accept('../reducers', () => {
const reducers = require('../reducers'); const reducers = require('../reducers');
const combinedReducers = combineReducers({ ...reducers, routing }); const combinedReducers = combineReducers({...reducers, routing});
store.replaceReducer(combinedReducers); store.replaceReducer(combinedReducers);
}); });
module.hot.accept('../sagas/SagaManager', () => { module.hot.accept('../sagas/SagaManager', () => {
...@@ -57,7 +72,7 @@ if (module.hot) { ...@@ -57,7 +72,7 @@ if (module.hot) {
const renderNormally = render; const renderNormally = render;
const renderException = (error) => { const renderException = (error) => {
const RedBox = require('redbox-react'); const RedBox = require('redbox-react');
ReactDOM.render(<RedBox error={error} />, document.getElementById('root')); ReactDOM.render(<RedBox error={error}/>, document.getElementById('root'));
}; };
render = () => { render = () => {
try { try {
......
...@@ -203,17 +203,17 @@ export default (store)=> { ...@@ -203,17 +203,17 @@ export default (store)=> {
</Route> </Route>
</Route> </Route>
<Route path="/login" getComponents={(location, callback)=> { <Route path="/login" getComponents={(location, callback)=> {
require.ensure([], function (require) { require.ensure(['../containers/Login/Login'], function (require) {
callback(null, require('../containers/Login/Login')); callback(null, require('../containers/Login/Login'));
}, 'javascript/Login'); }, 'javascript/Login');
}}/> }}/>
<Route path="/register" getComponents={(location, callback)=> { <Route path="/register" getComponents={(location, callback)=> {
require.ensure([], function (require) { require.ensure(['../containers/Users/Register'], function (require) {
callback(null, require('../containers/Users/Register')); callback(null, require('../containers/Users/Register'));
}, 'javascript/Users-Register'); }, 'javascript/Users-Register');
}}/> }}/>
<Route path="*" getComponents={(location, callback)=> { <Route path="*" getComponents={(location, callback)=> {
require.ensure([], function (require) { require.ensure(['../containers/NotFound/NotFound'], function (require) {
callback(null, require('../containers/NotFound/NotFound')); callback(null, require('../containers/NotFound/NotFound'));
}, 'javascript/NotFound'); }, 'javascript/NotFound');
}}/> }}/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment