Merge branch 'develop' of http://203.156.249.2:3000/elab-damai-h5/h5-webgl-program into develop

src/components/newBottomCom/viewAI/viewAI.vue

@@ -14,8 +14,8 @@
 	} from 'mint-ui';
 	import lottie from "lottie-web"; //lottie
 	// const { createWorker } = require('@ffmpeg/ffmpeg');
-	import { FFmpeg } from "@ffmpeg/ffmpeg";
-	import { fetchFile, toBlobURL } from '@ffmpeg/util';
+	// import { FFmpeg } from "@ffmpeg/ffmpeg";
+	// import { fetchFile, toBlobURL } from '@ffmpeg/util';
 	var qiniu = require('qiniu-js');
 	const baseURL = '.'
 	let ffmpeg = null;

src/components/newBottomCom/viewCareful/viewCareful.scss

@@ -3,6 +3,7 @@
 	width: auto;
 	box-sizing: border-box;
 	z-index: 12;
+    height:calc(100% - 130px);
 }
 .grid{
 	display: grid;
@@ -20,6 +21,7 @@
 .scroll-view{
 	overflow-y: auto;
 	margin-top:30px;
+    height: 100%;
 }
 .careful-item .item-top {
 	font-family: "Verdana Bold";

src/components/newQCCom/viewAI/viewAI.vue

@@ -14,8 +14,8 @@
 	} from 'mint-ui';
 	import lottie from "lottie-web"; //lottie
 	// const { createWorker } = require('@ffmpeg/ffmpeg');
-	import { FFmpeg } from "@ffmpeg/ffmpeg";
-	import { fetchFile, toBlobURL } from '@ffmpeg/util';
+	// import { FFmpeg } from "@ffmpeg/ffmpeg";
+	// import { fetchFile, toBlobURL } from '@ffmpeg/util';
 	var qiniu = require('qiniu-js');
 	const baseURL = '.'
 	let ffmpeg = null;

src/components/newQCCom/viewCareful/viewCareful.scss

@@ -3,6 +3,7 @@
 	width: auto;
 	box-sizing: border-box;
 	z-index: 12;
+    height:calc(100% - 130px);
 }
 .grid{
 	display: grid;
@@ -20,6 +21,7 @@
 .scroll-view{
 	overflow-y: auto;
 	margin-top:30px;
+    height: 100%;
 }
 .careful-item .item-top {
 	font-family: "Verdana Bold";