:twisted_rightwards_arrows: Merge branch 'dev_base' into dev_audio

src/stage/index/scene/ImageWareFullScreenScene.js

@@ -12,7 +12,7 @@ class ImageWareFullScreenScene extends scene {
 
 	renderImageView() {
 		const curImage = this.curImageList[this.curImageIndex];
-		document.getElementById('ImageWareFullScreen').setAttribute('src', curImage.url);
+		document.getElementById('wareImg').setAttribute('src', curImage.url);
 	}
 
 	dynamicChangeWare(wareIndex, type) {

src/stage/index/style/ImageWareFullScreen.less

@@ -1,4 +1,4 @@
-#ImageWareFullScreen {
+#wareImg {
 	position: absolute;
 	left: 0;
 	top: 0;