Merge branch 'master' of https://git.cocorobo.cn/CocoRoboLabs/cocoroboBlockly

src/components/blockly.vue

@@ -91,7 +91,7 @@ export default {
     },
     //下一步
     go() {
-      this.$router.push("./function?isCamera=" + false);
+      this.$router.push("./function?isCamera=" + 1);
     },
   },
 

src/components/function.vue

@@ -122,7 +122,7 @@ export default {
     _s1.src = "/static/bundle.js";
     _s1.type = "text/javascript";
     document.head.appendChild(_s1);
-    if (this.$route.query.isCamera) {
+    if (this.$route.query.isCamera == "1") {
       this.$message.error("摄像头开启失败，请检查摄像头是否可用！");
     }
   }