Merge branch 'master' of https://gitlab.ezijing.com/ezijing/transport-weapp-h5

package.json

@@ -7,7 +7,7 @@
     "lint": "eslint --ext .js --ext .jsx --ext .vue src/",
     "lint:fix": "eslint --fix --ext .js --ext .jsx --ext .vue src/",
     "dev": "cross-env NODE_ENV=development SERVER_PORT=3002 webpack-dev-server --inline --progress --config build/webpack.client.conf.js",
-    "build:test": "cross-env NODE_ENV=test webpack --progress --config build/webpack.client.conf.js && cross-env NODE_ENV=test n use 8.11.3 ./build/uploadAliyunCDN.js",
+    "build:test": "cross-env NODE_ENV=test webpack --progress --config build/webpack.client.conf.js && cross-env NODE_ENV=test && node ./build/uploadAliyunCDN.js",
     "build:pro": "cross-env NODE_ENV=production webpack --progress --config build/webpack.client.conf.js && cross-env NODE_ENV=production n use 8.11.3 ./build/uploadAliyunCDN.js"
   },
   "repository": {
@@ -26,7 +26,7 @@
   ],
   "devDependencies": {
     "acorn": "^7.1.1",
-    "ali-oss": "^6.5.1",
+    "ali-oss": "^6.10.0",
     "autoprefixer": "^9.7.5",
     "babel-core": "^6.26.3",
     "babel-eslint": "^10.1.0",