Merge remote-tracking branch 'origin/master'

# Conflicts:
#	screen-demo/src/views/templateInstance.vue

screen-demo/package.json

@@ -46,7 +46,9 @@
     "parserOptions": {
       "parser": "@babel/eslint-parser"
     },
-    "rules": {}
+    "rules": {
+      "no-debugger": "off"
+    }
   },
   "browserslist": [
     "> 1%",

screen-demo/src/main.js

@@ -25,6 +25,8 @@ postMsgUtil.listen("checkCrossResult", function ({data}) {
   Vue.prototype.isCross = data !== 200
   localStorage.setItem('isCross', data !== 200)
 });
+
+
 new Vue({
   router,
   render: h => h(App),