:twisted_rightwards_arrows: Merge branch 'dev_base' into online_kid_web

src/stage/index/index.html

@@ -73,6 +73,17 @@
 		var globalUseDurationRecord = 0;
 		setInterval('globalUseDurationRecord += 1', 1000);
 	</script>
+	<script>
+		//解决startsWith、endsWith在webview上不能使用问题
+		String.prototype.startsWith=function(str){
+			var reg=new RegExp("^"+str);
+			return reg.test(this);
+		}
+		String.prototype.endsWith=function(str){
+			var reg=new RegExp(str+"$");
+			return reg.test(this);
+		}
+	</script>
 </body>
 
 </html>

src/stage/index/style/ImageWareFullScreen.less

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