Merge pull request #389 from zuiidea/develop

Develop

package.json

@@ -1,24 +1,24 @@
 {
   "private": true,
   "dependencies": {
-    "antd": "^2.10.0",
+    "antd": "^2.11.2",
     "classnames": "^2.2.5",
     "draftjs-to-markdown": "^0.4.0",
     "dva": "^1.2.0",
     "dva-loading": "^0.2.0",
     "lodash": "^4.17.4",
     "nprogress": "^0.2.0",
-    "qs": "^6.2.0",
-    "react": "^15.4.4",
-    "react-countup": "1.3.0",
-    "react-dom": "^15.4.1",
-    "react-draft-wysiwyg": "^1.8.1",
-    "react-helmet": "^5.0.0",
-    "recharts": "^0.19.0"
+    "qs": "^6.5.0",
+    "react": "^15.6.1",
+    "react-countup": "^2.1.1",
+    "react-dom": "^15.6.1",
+    "react-draft-wysiwyg": "^1.10.0",
+    "react-helmet": "^5.1.3",
+    "recharts": "^0.22.4"
   },
   "devDependencies": {
-    "axios": "^0.15.3",
-    "babel-eslint": "^6.1.2",
+    "axios": "^0.16.2",
+    "babel-eslint": "^7.2.3",
     "babel-plugin-dev-expression": "^0.2.1",
     "babel-plugin-dva-hmr": "^0.3.2",
     "babel-plugin-import": "^1.1.1",
@@ -27,19 +27,19 @@
     "babel-runtime": "^6.9.2",
     "draftjs-to-html": "^0.7.0",
     "dva-model-extend": "^0.1.1",
-    "eslint": "^3.17.1",
-    "eslint-config-airbnb": "^9.0.1",
-    "eslint-loader": "^1.7.1",
-    "eslint-plugin-import": "^1.16.0",
-    "eslint-plugin-jsx-a11y": "^1.4.2",
-    "eslint-plugin-react": "^5.1.1",
+    "eslint": "^4.1.1",
+    "eslint-config-airbnb": "^15.0.2",
+    "eslint-loader": "^1.9.0",
+    "eslint-plugin-import": "^2.6.1",
+    "eslint-plugin-jsx-a11y": "^6.0.2",
+    "eslint-plugin-react": "^7.1.0",
     "jsonp": "^0.2.1",
     "less-vars-to-js": "^1.1.2",
     "mockjs": "^1.0.1-beta3",
     "path-to-regexp": "^1.7.0",
     "rc-tween-one": "^1.0.0",
     "redbox-react": "^1.2.10",
-    "roadhog": "0.6.0-beta.6"
+    "roadhog": "0.6.0"
   },
   "pre-commit": [
     "lint"

src/mock/user.js

@@ -27,7 +27,7 @@ let database = usersListData.data
 
 const EnumRoleType = {
   ADMIN: 'admin',
-  DEFAULT: 'admin',
+  DEFAULT: 'guest',
   DEVELOPER: 'developer',
 }
 

src/models/app.js

@@ -2,8 +2,9 @@ import { query, logout } from '../services/app'
 import * as menusService from '../services/menus'
 import { routerRedux } from 'dva/router'
 import { parse } from 'qs'
-import { prefix } from 'config'
+import config from 'config'
 import { EnumRoleType } from 'enums'
+const { prefix } = config
 
 export default {
   namespace: 'app',

src/routes/dashboard/components/weather.less

@@ -35,6 +35,7 @@
       font-size: 36px;
       text-align: right;
       height: 64px;
+      color: #fff;
     }
 
     .description {