Merge branch 'dev' of git.mjitech.com:zhangxin/max_android_panel into dev

package.json

@@ -2,12 +2,12 @@
   "name": "max_android_panel",
   "name": "max_android_panel",
   "version": "1.0.0",
   "version": "1.0.0",
   "private": true,
   "private": true,
-  "description": "Maxbox machinePage 27",
+  "description": "max_android_panel",
   "main": "index.js",
   "main": "index.js",
   "scripts": {
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
     "test": "echo \"Error: no test specified\" && exit 1",
     "clean": "rm -rf static/*",
     "clean": "rm -rf static/*",
-    "start": "cross-env NODE_ENV=development webpack-dev-server --version=2.0.3 --env=dev -d --history-api-fallback --hot --inline --progress --colors --port 80 --host 0.0.0.0",
+    "start": "cross-env NODE_ENV=development webpack-dev-server --version=2.0.3 --env=dev -d --history-api-fallback --hot --inline --progress --colors --port 6999 --host 0.0.0.0",
     "build": "cross-env NODE_ENV=production webpack --env=build --version=2.0.3 --progress --color",
     "build": "cross-env NODE_ENV=production webpack --env=build --version=2.0.3 --progress --color",
     "build:prod": "cross-env NODE_ENV=development webpack --env=build --progress --color"
     "build:prod": "cross-env NODE_ENV=development webpack --env=build --progress --color"
   },
   },

webpack.config.js

@@ -156,4 +156,4 @@ let envConfig = {
     }
     }
 }
 }
 
 
-module.exports = Object.assign({},baseConfig,envConfig[env]);
+module.exports = Object.assign({}, baseConfig, envConfig[env]);
\ No newline at end of file