Merge branch 'master' of http://116.255.135.38:3000/zhangzl/nsgk_mobile

config/index.js

@@ -13,7 +13,7 @@ module.exports = {
       "/dev-api": {
         // 请求的目标主机
         //target: 'http://116.255.135.38:8081/nsgk_test/',
-        target: 'http://192.168.31.107:8080/',
+        target: 'http://localhost:8080/',
         changeOrigin: true,
         pathRewrite: {
           '^/dev-api': ''
@@ -23,7 +23,7 @@ module.exports = {
 
     // Various Dev Server settings
     host: '0.0.0.0', // can be overwritten by process.env.HOST
-    port: 8080, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
+    port: 85, // can be overwritten by process.env.PORT, if port is in use, a free one will be determined
     autoOpenBrowser: false,
     errorOverlay: true,
     notifyOnErrors: true,

package.json

@@ -76,4 +76,4 @@
     "last 2 versions",
     "not ie <= 8"
   ]
-}
+}