Merge branch 'master' of http://47.100.37.243:10080/ZHOU/yunsu

ys_vue/build/webpack.base.conf.js

@@ -10,7 +10,8 @@ function resolve(dir) {
 
 module.exports = {
   entry: {
-    app: './src/main.js'
+    //app: './src/main.js'
+    app: ["babel-polyfill", "./src/main.js"]
   },
   output: {
     path: config.build.assetsRoot,

ys_vue/package.json

@@ -26,7 +26,7 @@
     "babel-core": "^6.22.1",
     "babel-loader": "^6.2.10",
     "babel-plugin-transform-runtime": "^6.22.0",
-    "babel-polyfill": "^6.16.0",
+    "babel-polyfill": "^6.26.0",
     "babel-preset-env": "^1.2.1",
     "babel-preset-es2015": "^6.0.0",
     "babel-preset-stage-2": "^6.22.0",