Merge branch 'lament' into 'master'

Lament

See merge request pigbigbig/beyond-clouds-front!160

nuxt.config.js

@@ -19,12 +19,7 @@ module.exports = {
     ],
     link: [
       { rel: 'icon', type: 'image/x-icon', href: '/favicon.ico' }
-    ],
-    script: [
-      {
-        src: '/grayscale.js'
-      },
-    ],
+    ]
   },
   /*
   ** Customize the progress-bar color
@@ -34,7 +29,7 @@ module.exports = {
   ** Global CSS
   */
   css: [
-    '~/assets/gray-filter.css',
+    // '~/assets/gray-filter.css',
     '~/assets/font/iconfont.css',
     '~/assets/reset.scss',
   ],

static/grayscale.js

@@ -329,7 +329,7 @@ function IEVersion() {
       return 6;//IE版本<=7
     }
   } else if(isEdge) {
-    return 'edge';//edge
+    return -1;//edge
   } else if(isIE11) {
     return 11; //IE11
   }else{