Merge branch 'master' of http://192.168.0.115:3000/4dkankan/laser_v1

8cb759d0cce1070852cf832cca6738f8.navvis_logo_black.svg

@@ -3,221 +3,63 @@
 <svg version="1.1" id="图层_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 viewBox="0 0 533 255" style="enable-background:new 0 0 533 255;" xml:space="preserve">
 <style type="text/css">
-	.st0{fill:#FFFFFF;}
-	.st1{fill:#FFFFFF;fill-opacity:0;}
+	.st0{fill:#FFFFFF;fill-opacity:0;}
+	.st1{fill-rule:evenodd;clip-rule:evenodd;fill:#FFFFFF;}
 </style>
+<path class="st0" d="M0,0v255h533V0H0z"/>
 <g>
-	<g>
-		<g>
-			<path class="st0" d="M148.9,75.3c-9.3-0.6-20.9,0.7-30.1,8.7c-2.6,2.5-3.8,3.9-5.8,6.6c-2,2.8-3.8,5.7-5.4,8.6
-				c-1.7,3.1-3.2,6.3-4.5,9.3c-1.4,3.3-2.4,6.4-3,8.9c0,0.2-0.1,0.5-0.2,0.7c-0.1,0.2-0.1,0.5-0.2,0.7c-0.1,0.2-0.1,0.5-0.2,0.7
-				c0,0.2-0.1,0.5-0.2,0.7c-0.7,3.1-1.3,6.1-1.7,9.1c-0.5,3.3-0.8,6.5-1,9.7c-0.1,1.8-0.2,3.6-0.2,5.4l-5.5,1.5
-				c0,0,0.8-15.2,4.1-26.6c5.6-19.6,14.4-30.8,14.4-30.8c-30.6,25.7-38,78.9-38,78.9v0.9c5.1-6.5,13.9-12.6,18.9-15
-				c1.5-0.7,4.6-1.7,6.4-2.2c0.2,2.9,0.6,5.6,1.1,8.2c0,0.2,0.1,0.4,0.1,0.6c0,0.2,0.1,0.4,0.1,0.6c0,0.2,0.1,0.4,0.1,0.6
-				c0,0.2,0.1,0.4,0.1,0.6l20.2-7.5c-0.1-0.2-0.7-1.9-1.6-4.7c-0.4-1.2-0.7-2.2-1-3.5l2.6-0.7l-1.8-5.4l-2,0.4
-				c-0.4-2.5-0.7-4.9-0.9-7.5c-0.2-2.6-0.2-5.4-0.2-8.1c0-0.2,0-0.4,0-0.6c0-0.2,0-0.4,0-0.6c0-0.2,0-0.4,0-0.6c0-0.2,0-0.4,0-0.6
-				c0.1-2.4,0.6-5.2,1.4-8.2c0.7-2.8,1.7-5.8,2.9-8.7c1.2-2.7,2.6-5.5,4.3-8c1.6-2.5,3.6-4.9,5.9-7.1c12.1-12.1,18.8-5.1,19.5,8.8
-				c0.9,17-5.2,25.4-6.6,28.2c-15.4,30.9-33.3,37-46.4,43c-11.3,5.2-19.9,9.2-19.9,9.2c66.7,1.4,98.2-24.3,106.1-52.2
-				C189.1,98.6,169.7,76.6,148.9,75.3z M118.2,84.8c0,0,0.1-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1
-				c0,0,0.1-0.1,0.1-0.1c0.1-0.1,0.3-0.1,0.4-0.1l0.7,0.6c0.1,0.1,0.1,0.2,0,0.4c0,0-0.1,0.1-0.1,0.1c0,0-0.1,0.1-0.1,0.1
-				c0,0-0.1,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c-0.1,0.1-0.3,0.2-0.4,0.1l-0.7-0.6C118.1,85.1,118.1,84.9,118.2,84.8z M116.9,86.4
-				c0,0,0.1-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0.1-0.1,0.3-0.2,0.4-0.1l0.7,0.6
-				c0.1,0.1,0.1,0.2,0,0.4c0,0-0.1,0.1-0.1,0.1c0,0-0.1,0.1-0.1,0.1c0,0-0.1,0.1-0.1,0.1c0,0-0.1,0.1-0.1,0.1
-				c-0.1,0.1-0.3,0.1-0.4,0.1l-0.7-0.6C116.8,86.6,116.8,86.5,116.9,86.4z M115.5,87.9c0,0,0.1-0.1,0.1-0.1s0.1-0.1,0.1-0.1
-				c0,0,0-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0.1-0.1,0.3-0.2,0.4-0.1L117,88c0.1,0.1,0.1,0.2,0,0.4c0,0,0,0.1-0.1,0.1
-				c0,0-0.1,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c0,0-0.1,0.1-0.1,0.1c-0.1,0.1-0.2,0.2-0.4,0.1l-0.7-0.5
-				C115.4,88.2,115.4,88.1,115.5,87.9z M114.3,89.5c0,0,0.1-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1
-				c0.1-0.1,0.2-0.2,0.4-0.1l0.7,0.5c0.1,0.1,0.1,0.2,0,0.4c0,0-0.1,0.1-0.1,0.1c0,0-0.1,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1
-				c0,0-0.1,0.1-0.1,0.1c-0.1,0.1-0.2,0.2-0.4,0.1l-0.7-0.5C114.2,89.8,114.2,89.7,114.3,89.5z M113.1,91.1
-				C113.1,91.1,113.1,91.1,113.1,91.1c0.1-0.1,0.1-0.2,0.2-0.2c0,0,0-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0.1-0.1,0.2-0.2,0.4-0.1
-				l0.7,0.5c0.1,0.1,0.1,0.2,0,0.4c0,0-0.1,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c0,0-0.1,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1
-				c-0.1,0.1-0.2,0.2-0.4,0.1l-0.7-0.5C113,91.4,113,91.3,113.1,91.1z M111.9,92.8c0,0,0.1-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1
-				c0,0,0.1-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1c0.1-0.1,0.2-0.2,0.3-0.1l0.7,0.5c0.1,0.1,0.1,0.2,0,0.4c0,0-0.1,0.1-0.1,0.1
-				c0,0,0,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c0,0-0.1,0.1-0.1,0.1c-0.1,0.1-0.2,0.2-0.3,0.1l-0.8-0.5C111.9,93.1,111.9,92.9,111.9,92.8z
-				 M110.8,94.5c0,0,0-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1c0.1-0.1,0.2-0.2,0.4-0.1l0.8,0.5
-				c0.1,0.1,0.1,0.2,0,0.4c0,0-0.1,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c-0.1,0.1-0.2,0.2-0.3,0.1
-				l-0.8-0.5C110.8,94.8,110.7,94.6,110.8,94.5z M109.8,96.2c0,0,0-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1
-				c0,0,0-0.1,0.1-0.1c0.1-0.1,0.2-0.2,0.3-0.1l0.8,0.5c0.1,0.1,0.1,0.2,0,0.4c0,0,0,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1
-				c0,0-0.1,0.1-0.1,0.1c0,0-0.1,0.1-0.1,0.1c-0.1,0.1-0.2,0.2-0.3,0.1l-0.8-0.5C109.7,96.5,109.7,96.4,109.8,96.2z M108.6,98.3
-				c0,0,0-0.1,0.1-0.1c0,0,0.1-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1c0-0.1,0.1-0.1,0.1-0.1c0.1-0.2,0.2-0.2,0.4-0.1l0.8,0.5
-				c0.1,0.1,0.1,0.2,0.1,0.4c0,0,0,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c-0.1,0.1-0.2,0.2-0.3,0.1
-				l-0.8-0.5C108.5,98.6,108.5,98.4,108.6,98.3z M107.6,100.1c0,0,0-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1c0-0.1,0-0.1,0.1-0.1
-				c0,0,0-0.1,0.1-0.1c0.1-0.1,0.2-0.2,0.3-0.1l0.8,0.5c0.1,0.1,0.1,0.2,0.1,0.4c0,0,0,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1
-				c0,0,0,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c-0.1,0.1-0.2,0.2-0.3,0.1l-0.8-0.5C107.5,100.4,107.5,100.2,107.6,100.1z M106.6,101.9
-				c0,0,0.1-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1c0,0,0-0.1,0-0.1c0.1-0.1,0.2-0.2,0.4-0.1l0.8,0.5
-				c0.1,0.1,0.1,0.2,0.1,0.4c0,0-0.1,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c-0.1,0.1-0.2,0.2-0.3,0.1
-				l-0.9-0.5C106.6,102.2,106.5,102,106.6,101.9z M105.7,103.7c0,0,0-0.1,0-0.1c0,0,0-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1
-				c0,0,0-0.1,0.1-0.1c0.1-0.1,0.2-0.2,0.3-0.1l0.9,0.5c0.1,0.1,0.2,0.2,0.1,0.4c0,0,0,0.1-0.1,0.1c0,0.1,0,0.1-0.1,0.1
-				c0,0.1,0,0.1-0.1,0.1c0,0,0,0.1-0.1,0.1c-0.1,0.2-0.2,0.2-0.3,0.2l-0.9-0.5C105.7,104,105.6,103.9,105.7,103.7z M104.8,105.6
-				c0,0,0-0.1,0.1-0.1c0,0,0-0.1,0.1-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0.1-0.1c0.1-0.2,0.2-0.2,0.4-0.2l0.9,0.5
-				c0.1,0.1,0.2,0.2,0.1,0.4c0,0,0,0.1-0.1,0.1c0,0.1,0,0.1,0,0.1c0,0,0,0.1-0.1,0.1c0,0,0,0.1,0,0.1c-0.1,0.1-0.2,0.2-0.3,0.1
-				L105,106C104.8,105.9,104.8,105.7,104.8,105.6z M104,107.4c0,0,0-0.1,0-0.1c0,0,0-0.1,0.1-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0.1-0.1
-				c0.1-0.1,0.2-0.2,0.3-0.1l0.9,0.4c0.1,0.1,0.2,0.2,0.1,0.4c0,0,0,0.1-0.1,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1
-				c-0.1,0.2-0.2,0.2-0.3,0.2l-0.9-0.4C104,107.8,104,107.6,104,107.4z M103.2,109.3c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1
-				c0,0,0-0.1,0-0.1c0,0,0-0.1,0.1-0.1c0.1-0.1,0.2-0.2,0.4-0.2l0.9,0.4c0.1,0.1,0.2,0.2,0.1,0.4c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1
-				c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c-0.1,0.1-0.2,0.2-0.3,0.2l-1-0.4C103.2,109.6,103.2,109.5,103.2,109.3z M111.9,130.4v-0.2
-				c0-0.1,0-0.1,0-0.2c0-0.2,0.1-0.4,0.2-0.4l0.9,0.2c0.1,0.1,0.2,0.2,0.3,0.5c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2
-				c0,0.1,0,0.1,0,0.2v0.2c0,0.2-0.1,0.4-0.2,0.4l-1-0.2c-0.2-0.1-0.2-0.2-0.3-0.5v-0.2C111.9,130.5,111.9,130.4,111.9,130.4z
-				 M112.2,124l0.9,0.3c0.1,0.1,0.2,0.2,0.2,0.4v0.2c0,0,0,0,0,0c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1v0.3c0,0.2-0.1,0.4-0.2,0.3
-				l-0.9-0.3c-0.1-0.1-0.2-0.2-0.2-0.5c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1v-0.2c0,0,0,0,0,0v0
-				C112,124,112.1,123.9,112.2,124z M112.1,122.6c0-0.1,0-0.1,0-0.2c0,0,0-0.1,0-0.1c0-0.1,0-0.1,0-0.2c0,0,0-0.1,0-0.1
-				c0-0.1,0.1-0.1,0.1-0.1c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0.1,0,0.1,0l0.8,0.3c0.1,0.1,0.1,0.2,0.2,0.2l0,0c0,0,0,0,0,0.1
-				c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2v0.1c0,0.2-0.1,0.3-0.2,0.2l-0.9-0.3
-				C112.2,122.9,112.1,122.7,112.1,122.6z M112.1,126.7l0.9,0.3c0.1,0.1,0.2,0.2,0.2,0.5v0.8c0,0.2-0.1,0.4-0.2,0.3l-0.9-0.2
-				c-0.1-0.1-0.2-0.2-0.2-0.5v-0.2c0-0.1,0-0.1,0-0.2v-0.4C111.9,126.8,112,126.7,112.1,126.7z M112.2,132.6l1,0.2
-				c0.2,0,0.3,0.2,0.3,0.5c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.2-0.1,0.4-0.2,0.4l-1-0.2
-				c-0.2,0-0.3-0.2-0.3-0.5c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2
-				C111.9,132.7,112,132.6,112.2,132.6z M113.3,121.4l-0.8-0.3c-0.1-0.1-0.2-0.2-0.2-0.3v-0.1c0,0,0-0.1,0-0.1v-0.1c0,0,0-0.1,0-0.1
-				c0-0.1,0.1-0.2,0.2-0.2l0.8,0.3c0.1,0.1,0.2,0.2,0.2,0.3c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1s0,0.1,0,0.1c0,0,0,0.1,0,0.1
-				C113.5,121.4,113.4,121.5,113.3,121.4z M112.3,118.4c-0.1,0.4-0.2,0.8-0.2,1.2c-0.1,0.4-0.1,0.8-0.2,1.2
-				c-0.1,0.4-0.1,0.8-0.1,1.1c0,0.2,0,0.4,0,0.6c0,0.2,0,0.4,0,0.6c0,0.2,0,0.4,0,0.6c0,0.2,0,0.4,0,0.6c0,0.8-0.1,1.6-0.1,2.4
-				c0,0.8,0,1.6,0,2.4c0,0.8,0,1.6,0,2.4c0,0.8,0,1.6,0.1,2.5l-11-2.3c0.1-0.9,0.2-1.8,0.3-2.7c0.1-0.9,0.2-1.8,0.3-2.6
-				c0.1-0.9,0.3-1.7,0.4-2.6c0.2-0.9,0.3-1.7,0.5-2.6c0-0.2,0.1-0.5,0.1-0.7c0-0.2,0.1-0.5,0.1-0.7c0-0.2,0.1-0.4,0.1-0.7
-				c0-0.2,0.1-0.4,0.1-0.7c0.1-0.4,0.2-0.8,0.3-1.2c0.1-0.4,0.2-0.8,0.3-1.3c0.1-0.4,0.2-0.9,0.4-1.3c0.1-0.4,0.3-0.9,0.4-1.3
-				l8.5,3.5C112.5,117.6,112.4,118,112.3,118.4z M102.6,111.1c0,0,0-0.1,0.1-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1
-				c0.1-0.2,0.2-0.2,0.3-0.2l1,0.4c0.1,0.1,0.2,0.2,0.2,0.4c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0.1,0,0.1,0,0.1c0,0,0,0.1,0,0.1
-				c-0.1,0.2-0.2,0.2-0.3,0.2l-1-0.4c-0.1-0.1-0.2-0.2-0.2-0.4C102.6,111.1,102.6,111.1,102.6,111.1z M101.9,113c0,0,0-0.1,0-0.1
-				c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0-0.1,0.2-0.2,0.3-0.1l1,0.4c0.1,0.1,0.2,0.2,0.2,0.4c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1
-				c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0.1-0.2,0.2-0.3,0.2l-1-0.4c-0.2-0.1-0.2-0.2-0.2-0.4C101.9,113.1,101.9,113,101.9,113z
-				 M101.3,114.8c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0.1-0.1,0.2-0.2,0.3-0.1l1,0.4c0.2,0.1,0.2,0.2,0.2,0.4
-				c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c-0.1,0.1-0.2,0.2-0.3,0.1l-1.1-0.4c-0.2-0.1-0.2-0.2-0.2-0.4
-				C101.3,114.9,101.3,114.8,101.3,114.8z M100.8,116.5C100.8,116.5,100.8,116.4,100.8,116.5c0-0.2,0-0.2,0.1-0.2c0,0,0-0.1,0-0.1
-				c0.1-0.1,0.2-0.2,0.3-0.1l1.1,0.4c0.2,0.1,0.2,0.2,0.2,0.3c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1
-				c0,0.1-0.2,0.2-0.3,0.1L101,117c-0.2-0.1-0.3-0.2-0.2-0.3C100.8,116.6,100.8,116.5,100.8,116.5z M100.3,118.3c0-0.1,0-0.1,0-0.2
-				c0-0.1,0-0.1,0-0.2c0,0,0-0.1,0-0.2c0,0,0-0.1,0.1-0.1c0.1-0.1,0.1-0.1,0.2-0.1l1.1,0.4c0.1,0.1,0.1,0.2,0.2,0.3c0,0,0,0,0,0
-				c0,0,0,0.1,0,0.1c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0,0,0.1,0,0.2c0,0.2-0.2,0.3-0.3,0.3l-1.1-0.4
-				c-0.2-0.1-0.2-0.3-0.2-0.5C100.3,118.4,100.3,118.4,100.3,118.3z M99.7,120.9c0,0,0-0.1,0-0.2c0,0,0-0.1,0-0.1c0-0.1,0-0.1,0-0.2
-				c0,0,0,0,0-0.1c0,0,0,0,0,0c0,0,0-0.1,0-0.1c0,0,0,0,0-0.1c0-0.2,0.2-0.3,0.4-0.3l1.1,0.4c0.2,0.1,0.3,0.2,0.2,0.5c0,0,0,0,0,0
-				c0,0,0,0,0,0c0,0,0,0,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0.1,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1
-				c-0.1,0.3-0.2,0.4-0.4,0.4l-1.2-0.4c-0.2-0.1-0.2-0.3-0.2-0.5C99.7,121,99.7,121,99.7,120.9z M99.1,124c0-0.1,0-0.1,0-0.2
-				c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2c0.1-0.3,0.2-0.4,0.4-0.4l1.2,0.4c0.2,0.1,0.3,0.3,0.2,0.5c0,0.1,0,0.1,0,0.2
-				c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.3-0.2,0.4-0.4,0.4l-1.2-0.3c-0.2-0.1-0.3-0.3-0.2-0.6
-				C99.1,124.2,99.1,124.1,99.1,124z M98.5,127.2c0-0.1,0-0.1,0-0.2c0-0.1,0-0.2,0-0.2c0-0.1,0-0.1,0-0.2c0-0.3,0.2-0.4,0.4-0.4
-				l1.2,0.3c0.2,0.1,0.3,0.3,0.2,0.5c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2
-				c0,0.3-0.2,0.4-0.4,0.4l-1.3-0.3c-0.2-0.1-0.3-0.3-0.3-0.6C98.5,127.4,98.5,127.3,98.5,127.2z M98.1,130.5c0-0.1,0-0.1,0-0.2
-				c0-0.1,0-0.1,0-0.2c0-0.1,0-0.2,0-0.2c0-0.3,0.2-0.4,0.4-0.4l1.3,0.3c0.2,0.1,0.3,0.3,0.3,0.5c0,0.1,0,0.2,0,0.2
-				c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0,0.2c0,0.1,0,0.1,0,0.2c0,0.3-0.2,0.4-0.4,0.4l-1.4-0.3c-0.2-0.1-0.3-0.3-0.3-0.6
-				C98,130.7,98.1,130.6,98.1,130.5z M97.6,134.5c0-0.1,0-0.2,0-0.2c0-0.1,0-0.2,0-0.2c0-0.1,0-0.1,0-0.2c0-0.3,0.2-0.4,0.4-0.4
-				l1.4,0.2c0.2,0.1,0.3,0.3,0.3,0.5c0,0.1,0,0.2,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0,0.2
-				c0,0.3-0.2,0.4-0.4,0.4l-1.4-0.2c-0.2-0.1-0.3-0.3-0.3-0.6C97.6,134.6,97.6,134.5,97.6,134.5z M97.3,137.9c0-0.1,0-0.2,0-0.2
-				c0-0.1,0-0.1,0-0.2c0-0.1,0-0.2,0-0.2c0-0.3,0.2-0.5,0.4-0.4l1.5,0.2c0.2,0,0.3,0.3,0.3,0.5c0,0.1,0,0.2,0,0.2v0.2
-				c0,0.1,0,0.2,0,0.2c0,0.1,0,0.2,0,0.2c0,0.3-0.2,0.5-0.4,0.4l-1.5-0.2c-0.2,0-0.4-0.3-0.4-0.6C97.3,138.1,97.3,138,97.3,137.9z
-				 M97.2,141.4c0-0.1,0-0.2,0-0.2c0-0.1,0-0.2,0-0.2c0-0.1,0-0.2,0-0.2c0-0.3,0.2-0.5,0.4-0.5l1.5,0.2c0.2,0,0.4,0.2,0.4,0.5v0.9
-				c0,0.3-0.2,0.5-0.4,0.5l-1.6-0.1c-0.2,0-0.4-0.3-0.4-0.6C97.2,141.6,97.2,141.5,97.2,141.4z M97.1,145v-0.7
-				c0-0.3,0.2-0.5,0.4-0.5l1.6,0.1c0.1,0,0.1,0,0.2,0.1c0,0,0.1,0,0.1,0.1c0,0,0,0,0.1,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1
-				c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0,0.2v0.2c0,0.1,0,0.2,0,0.2c0,0.1,0,0.2,0,0.2c0,0.3-0.2,0.5-0.4,0.5l-1.6-0.1
-				c-0.2,0-0.4-0.2-0.4-0.5C97.1,145.1,97.1,145.1,97.1,145z M97.3,148.8c0-0.1,0-0.2,0-0.2v-0.2c0-0.1,0-0.2,0-0.2
-				c0-0.1,0-0.2,0-0.2c0-0.3,0.2-0.5,0.4-0.5l1.7,0.1c0.1,0,0.1,0,0.2,0.1c0,0,0,0,0,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0
-				c0,0,0,0.1,0.1,0.1c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0,0.2c0,0.1,0,0.2,0,0.2c0,0.1,0,0.2,0,0.2c0,0.1,0,0.2,0,0.2
-				c0,0.3-0.1,0.5-0.4,0.5l-1.7,0C97.5,149.3,97.3,149.1,97.3,148.8z M97.6,152.5c0-0.1,0-0.2,0-0.2c0-0.1,0-0.2,0-0.3
-				c0-0.1,0-0.2,0-0.2c0-0.1,0-0.2,0-0.2c0-0.3,0.2-0.5,0.4-0.5l1.7,0c0.1,0,0.1,0,0.2,0.1c0,0,0,0,0.1,0c0,0,0.1,0,0.1,0.1
-				c0,0,0,0,0.1,0.1c0,0,0,0.1,0.1,0.1c0,0.1,0.1,0.1,0.1,0.2c0,0.1,0,0.2,0,0.2c0,0.1,0,0.2,0,0.2c0,0.1,0,0.2,0,0.2
-				c0,0.1,0,0.2,0,0.2c0,0.3-0.1,0.5-0.4,0.5l-1.8,0C97.8,153,97.6,152.8,97.6,152.5z M98,156.1c0-0.1,0-0.2,0-0.2
-				c0-0.1,0-0.2,0-0.3c0-0.1,0-0.2,0-0.2c0-0.1,0-0.2,0-0.2c0-0.3,0.1-0.5,0.4-0.5l1.8-0.1c0.1,0,0.1,0,0.2,0c0,0,0.1,0,0.1,0.1
-				c0,0,0,0,0.1,0c0,0,0.1,0.1,0.1,0.1c0,0,0,0,0,0c0,0.1,0.1,0.1,0.1,0.2c0,0.1,0,0.2,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.2,0,0.2
-				c0,0.1,0,0.2,0,0.2c0.1,0.3-0.1,0.5-0.4,0.5l-1.9,0.1C98.3,156.6,98.1,156.4,98,156.1z M101.3,160.2l-1.9,0.2
-				c-0.3,0-0.6-0.2-0.7-0.6v-0.1c0,0,0,0,0-0.1c0,0,0,0,0-0.1c0,0,0,0,0-0.1c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2
-				c0-0.1,0-0.1,0-0.2c0-0.3,0.1-0.5,0.4-0.5l1.9-0.1c0.1,0,0.1,0,0.2,0c0.1,0,0.1,0,0.1,0.1c0,0,0,0,0,0c0.1,0.1,0.2,0.2,0.2,0.4
-				c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0.1,0.2c0,0.1,0,0.1,0,0.2c0,0,0,0,0,0.1c0,0,0,0,0,0.1c0,0,0,0,0,0.1
-				c0,0,0,0,0,0.1C101.7,159.9,101.6,160.2,101.3,160.2z M102.6,160.2c0-0.1,0-0.1-0.1-0.2c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2
-				c0-0.1,0-0.1-0.1-0.2c-0.5-2-1-4.2-1.3-6.3c-0.3-2.1-0.5-4.2-0.7-6.4c-0.1-2.1-0.2-4.2-0.2-6.3c0-2,0.1-4.1,0.2-6.1l11.3,2.1
-				c0,4,2.2,15.1,4.1,18.7l-13.4,4.7L102.6,160.2z M116.9,151.5c0,0.1,0.1,0.1,0.1,0.2c0,0.1,0,0.1,0.1,0.2c0,0.1,0,0.1,0.1,0.2
-				c0,0.1,0,0.1,0.1,0.2c0.1,0.2,0,0.4-0.2,0.4l-1.2,0c-0.2,0-0.4-0.2-0.5-0.4c0-0.1,0-0.1-0.1-0.2c0-0.1,0-0.1-0.1-0.2
-				c0-0.1,0-0.1-0.1-0.2c0-0.1-0.1-0.1-0.1-0.2c-0.1-0.2,0-0.4,0.2-0.4l1.2,0C116.7,151.1,116.8,151.3,116.9,151.5z M116,148.6
-				c0,0.1,0,0.1,0.1,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0.1,0.2c0,0.1,0,0.1,0.1,0.2c0.1,0.3,0,0.4-0.2,0.4l-1.2,0
-				c-0.2,0-0.4-0.2-0.4-0.4c0-0.1,0-0.1-0.1-0.2c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1-0.1-0.2c0-0.1,0-0.1,0-0.2c-0.1-0.3,0-0.4,0.2-0.4
-				l1.2,0C115.8,148.2,115.9,148.4,116,148.6z M115.2,145.6c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0.1,0.2c0,0.1,0,0.1,0,0.2
-				c0,0.1,0,0.1,0,0.2c0.1,0.3,0,0.4-0.2,0.4l-1.1-0.1c-0.2,0-0.3-0.2-0.4-0.4c0-0.1,0-0.1-0.1-0.2c0-0.1,0-0.1,0-0.2
-				c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2c0-0.2,0-0.4,0.2-0.4l1.1,0.1C115,145.2,115.2,145.4,115.2,145.6z M114.6,142.7
-				c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.3,0,0.4-0.2,0.4l-1.1-0.1c-0.2,0-0.3-0.2-0.4-0.5
-				c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2c0-0.3,0-0.4,0.2-0.4l1.1,0.1
-				C114.4,142.2,114.5,142.4,114.6,142.7z M114.1,139.7c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2
-				c0,0.3,0,0.4-0.2,0.4l-1.1-0.1c-0.2,0-0.3-0.2-0.3-0.5c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2
-				c0-0.3,0.1-0.4,0.2-0.4l1,0.2C113.9,139.2,114.1,139.4,114.1,139.7z M113.7,136.7c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2
-				c0,0.1,0,0.1,0,0.2c0,0.1,0,0.1,0,0.2c0,0.2,0,0.4-0.2,0.4l-1-0.2c-0.2,0-0.3-0.2-0.3-0.5c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2
-				c0-0.1,0-0.1,0-0.2c0-0.1,0-0.1,0-0.2c0-0.2,0.1-0.4,0.2-0.4l1,0.2C113.6,136.3,113.7,136.5,113.7,136.7z M113.7,119.4
-				c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0.1-0.1,0.2-0.2,0.2l-0.8-0.3c-0.1,0-0.2-0.2-0.2-0.3c0,0,0-0.1,0-0.1
-				c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0-0.1,0.1-0.2,0.2-0.1l0.8,0.3c0.1,0,0.2,0.2,0.2,0.3
-				C113.7,119.3,113.7,119.4,113.7,119.4z M114,117.7c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0.1-0.1,0.2-0.2,0.2
-				l-0.8-0.3c-0.1-0.1-0.2-0.2-0.2-0.3c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0-0.1,0.1-0.2,0.3-0.2
-				l0.8,0.3c0.1,0.1,0.2,0.2,0.1,0.3C114,117.7,114,117.7,114,117.7z M114.4,115.9c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1
-				c0,0.1-0.1,0.2-0.2,0.2l-0.8-0.3c-0.1-0.1-0.2-0.2-0.2-0.3c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1
-				c0-0.1,0.2-0.2,0.3-0.2l0.8,0.3c0.1,0.1,0.2,0.2,0.1,0.3C114.4,115.8,114.4,115.9,114.4,115.9z M114.8,114.2c0,0,0,0.1,0,0.1
-				c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0.1-0.1,0.2-0.3,0.2l-0.8-0.3c-0.1-0.1-0.2-0.2-0.1-0.3c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1
-				c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0.1-0.1,0.2-0.2,0.3-0.2l0.8,0.4c0.1,0.1,0.2,0.2,0.1,0.3C114.8,114.1,114.8,114.1,114.8,114.2
-				z M115.3,112.3c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c-0.1,0.1-0.2,0.2-0.3,0.2l-0.7-0.3
-				c-0.1-0.1-0.2-0.2-0.1-0.3c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0.1-0.1,0.2-0.2,0.3-0.2l0.7,0.4
-				C115.3,112,115.4,112.2,115.3,112.3z M115.8,110.7c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0.1-0.2,0.2-0.3,0.2
-				l-0.7-0.4c-0.1-0.1-0.1-0.2-0.1-0.3c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0.1-0.1,0.2-0.2,0.3-0.2
-				l0.7,0.4c0.1,0.1,0.1,0.2,0.1,0.3C115.8,110.6,115.8,110.7,115.8,110.7z M116.4,108.9c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1
-				c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c-0.1,0.1-0.2,0.2-0.3,0.2l-0.7-0.4c-0.1-0.1-0.1-0.2-0.1-0.3c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1
-				c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0.1-0.1,0.2-0.2,0.3-0.2l0.7,0.4C116.5,108.6,116.5,108.7,116.4,108.9z M117.1,107.1
-				c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c0,0,0,0.1,0,0.1c-0.1,0.1-0.2,0.2-0.3,0.1l-0.7-0.4c-0.1-0.1-0.1-0.2-0.1-0.3
-				c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0-0.1c0,0,0-0.1,0.1-0.1c0.1-0.1,0.2-0.2,0.3-0.1l0.7,0.4
-				C117.1,106.9,117.1,107,117.1,107.1z M116,106.3c-0.4,1.1-0.9,2.2-1.2,3.2c-0.4,1.1-0.7,2.2-1.1,3.3c-0.3,1.1-0.6,2.2-0.9,3.3
-				l-8.4-3.6c0.4-1.1,0.8-2.3,1.3-3.4c0.4-1.1,0.9-2.3,1.4-3.4c0.5-1.1,1-2.3,1.6-3.4c0.6-1.1,1.1-2.2,1.8-3.3l6.9,4.2
-				C116.9,104.2,116.4,105.2,116,106.3z M123.6,93.3c-0.7,0.9-1.4,1.8-2.1,2.7c-0.6,0.9-1.3,1.9-1.8,2.9c-0.6,1-1.1,2-1.7,3
-				l-6.8-4.3c0.6-1.1,1.3-2.1,1.9-3.1c0.7-1,1.4-2,2.1-3c0.7-1,1.5-2,2.3-2.9c0.8-1,1.6-1.9,2.5-2.8l5.8,5
-				C125.1,91.5,124.3,92.4,123.6,93.3z"/>
-		</g>
-	</g>
-	<g>
-		<polygon class="st0" points="197.1,171.8 197.1,169.9 227.7,169.9 227.7,171.8 197.1,171.8 		"/>
-	</g>
-	<g>
-		<polygon class="st0" points="431.1,171.8 431.1,169.9 461.7,169.9 461.7,171.8 431.1,171.8 		"/>
-	</g>
-	<g>
-		<path class="st0" d="M360.4,104l-9,47.8h-23.7l8.9-47.6c0.8-5.4,4.1-8.2,9.7-8.2h7.7C359.1,96.1,361.2,98.7,360.4,104z M343,119.4
-			h5.4l2.2-11.5c0.5-2.4-0.4-3.6-2.6-3.6h-2.1L343,119.4z M343.6,127.3h-2.1l-3.1,16.6h5.6l2.4-13
-			C346.5,128.5,345.6,127.3,343.6,127.3z"/>
-		<g>
-			<g>
-				<path class="st0" d="M255.7,96.1h-37.6c-7.1,0-11.1,2.9-12.2,8.8l-8.8,47h59l8.8-46.7C266,98.9,263,95.9,255.7,96.1z M253.7,107
-					l-7,37.2h-37.6l7.6-40.3h3c2,0,2.8,1.2,2.3,3.6l-5.7,30.4h3.8c2,0,3.7-0.6,5.1-1.9c1.2-1.3,2-2.5,2.2-3.8l5.3-28.2h3
-					c2,0,2.8,1.3,2.3,3.8l-5.6,30.1h4c4,0,6.3-1.5,6.9-4.5l0.6-3.3l4.9-26.1h2.5C253.5,103.9,254.2,104.9,253.7,107z"/>
+	<g id="展示界面-更多" transform="translate(-268.000000, -335.000000)">
+		<g id="气泡弹出框-_x2F_-带icon样式" transform="translate(239.000000, 141.000000)">
+			<g id="矩形-2" transform="translate(0.000000, 184.000000)">
+				<path id="logo_CN" class="st1" d="M354.1,107.9c2.6,1.4,3.5,4.7,2.1,7.3c-0.3,0.5-1.3,1.8-2.7,3.5l-0.6,0.8H376
+					c1.9,0,3.4,1.5,3.4,3.4c0,1.7-1.2,3.1-2.9,3.4l-0.6,0h-7.5v8.7h7.5c1.9,0,3.4,1.5,3.4,3.4c0,1.7-1.2,3.1-2.8,3.3l-0.5,0h-7.5
+					v8.7h7.5c1.9,0,3.4,1.5,3.4,3.4c0,1.7-1.2,3.1-2.8,3.3l-0.5,0h-7.5v8.7h7.5c1.9,0,3.4,1.5,3.4,3.4c0,1.7-1.2,3.1-2.8,3.3l-0.5,0
+					h-29.2c-0.1,0-0.1,0-0.2,0c-2.4,0-4.4-1.8-4.7-4.1l0-0.6v-36.3c-0.5,0.5-0.9,0.9-1.3,1.3l-1.1,1.1c-0.1,0.1-0.3,0.2-0.5,0.2
+					c-0.4,0-0.7-0.4-0.7-0.8l0-0.1l0,0l0-0.1l0,0c1.6-6,7.4-21.6,8.5-23.5C348.2,107.4,351.5,106.5,354.1,107.9z M302.2,112.1
+					c0.6,0,1.2,0.1,1.8,0.4l0.1,0l0.1,0.1l0.1,0.1c1.3,0.7,2.3,2,2.6,3.6l0,0.7v51.2c0,0.7-0.1,1.3-0.4,1.9c-0.6,1.5-2,2.6-3.7,2.9
+					l-0.7,0.1H249c-2.4,0-4.4-1.8-4.7-4.1l0-0.6v-51.2l0-0.7c0.3-2.1,2-3.8,4.1-4.1l0.6,0H302.2z M511.2,107.3c2.7,0,5,2.2,5,5
+					c0,2.6-1.9,4.7-4.3,5l-0.6,0v0l-18.1,0c-0.1,0.7-0.3,1.4-0.5,2.2l-0.3,1.1h19.8c1.7,0,3.1,1.4,3.1,3.1c0,1.5-1.1,2.8-2.5,3.1
+					l-0.6,0.1H490l-0.8,1.6l0,0l-0.8,1.6h26.5c1.7,0,3.1,1.4,3.1,3.1c0,1.5-1.1,2.8-2.5,3.1l-0.6,0.1h-30.3l-1.4,1.9l0,0l-1.5,1.9
+					h31.4c1.9,0,3.4,1.5,3.4,3.4c0,0,0,0.1,0,0.1l0,0l0,24.5c0,2-1.2,3.7-3,4.4c-0.3,0.1-0.6,0.3-1,0.3l-0.5,0h-41.3
+					c-1,0-1.9-0.4-2.5-1.1c-0.9-0.7-1.5-1.8-1.7-2.9l-0.1-0.7V153c-6.6,3.8-11,4.2-12.1,2.7c-1.5-2,1.9-3.5,8.9-10
+					c2.1-1.9,4.4-4.7,6.6-7.9l1.1-1.6h-14c-1.7,0-3.1-1.4-3.1-3.1c0-1.5,1.1-2.8,2.5-3.1l0.6-0.1h17.7l0.8-1.6l0,0l0.8-1.6H460
+					c-1.7,0-3.1-1.4-3.1-3.1c0-1.5,1.1-2.8,2.5-3.1l0.6-0.1h18.5c0.2-0.8,0.4-1.5,0.5-2.2l0.2-1.1l-20.7,0l0,0h0l0,0h0
+					c-0.9-0.1-1.7-0.8-1.7-1.7c0-0.7,0.4-1.3,1-1.6l0.4-0.1l0,0l52-6.4C510.5,107.3,510.9,107.3,511.2,107.3z M442.2,107.3
+					c2.7,0,5,2.2,5,5c0,2.6-1.9,4.7-4.3,5l-0.6,0v0l-18.1,0c-0.1,0.7-0.3,1.4-0.5,2.2l-0.3,1.1h19.8c1.7,0,3.1,1.4,3.1,3.1
+					c0,1.5-1.1,2.8-2.5,3.1l-0.6,0.1H421l-0.8,1.6l0,0l-0.8,1.6h26.5c1.7,0,3.1,1.4,3.1,3.1c0,1.5-1.1,2.8-2.5,3.1l-0.6,0.1h-30.3
+					l-1.4,1.9l0,0l-1.5,1.9h31.4c1.9,0,3.4,1.5,3.4,3.4c0,0,0,0.1,0,0.1l0,0l0,24.5c0,2-1.2,3.7-3,4.4c-0.3,0.1-0.6,0.3-1,0.3
+					l-0.5,0h-41.3c-1,0-1.9-0.4-2.5-1.1c-0.9-0.7-1.5-1.8-1.7-2.9l-0.1-0.7V153c-6.6,3.8-11,4.2-12.1,2.7c-1.5-2,1.9-3.5,8.9-10
+					c2.1-1.9,4.4-4.7,6.6-7.9l1.1-1.6h-14c-1.7,0-3.1-1.4-3.1-3.1c0-1.5,1.1-2.8,2.5-3.1l0.6-0.1h17.7l0.8-1.6l0,0l0.8-1.6h-16.3
+					c-1.7,0-3.1-1.4-3.1-3.1c0-1.5,1.1-2.8,2.5-3.1l0.6-0.1h18.5c0.2-0.8,0.4-1.5,0.5-2.2l0.2-1.1l-20.7,0l0,0h0l0,0h0
+					c-0.9-0.1-1.7-0.8-1.7-1.7c0-0.7,0.4-1.3,1-1.6l0.4-0.1l0,0l52-6.4C441.5,107.3,441.8,107.3,442.2,107.3z M336.6,160.2l0.8,0
+					c0,0,0,0,0,0c0.7,0,1.3,0.6,1.3,1.3c0,0.2-0.1,0.4-0.1,0.6l-0.2,0.2l0,0c-0.1,0.1-0.1,0.1-0.1,0.1c-2.7,3.1-9.7,7.7-16.3,9.5
+					c-2.5,0.7-7.1-2-7.7-4.5c-0.6-2.5,0.9-5,3.4-5.6c1.7-0.4,12.7-1.5,18-1.6L336.6,160.2z M360.1,157.4h-8.7v8.7h8.7V157.4z
+					 M507.1,146.9h-30.9v2.9h25.3c1.5,0,2.8,1.3,2.8,2.8c0,1.4-1,2.5-2.3,2.8l-0.5,0h-25.3v2.3h22c1.5,0,2.8,1.3,2.8,2.8
+					c0,1.4-1,2.5-2.3,2.8l-0.5,0h-22v2.8h30.9V146.9z M438.1,146.9h-30.9v2.9h25.3c1.5,0,2.8,1.3,2.8,2.8c0,1.4-1,2.5-2.3,2.8
+					l-0.5,0h-25.3v2.3h22c1.5,0,2.8,1.3,2.8,2.8c0,1.4-1,2.5-2.3,2.8l-0.5,0h-22v2.8h30.9V146.9z M262.1,121.7h-8.4v41.6h43.7v-41.6
+					h-7.8v23.8c0,0.6,0.3,1,0.8,1.1l0.4,0c1.8,0,3.2,1.5,3.2,3.3c0,1.6-1.1,2.9-2.7,3.2l-0.6,0.1h-7c-1.7,0-2.9-0.4-3.7-1.2
+					c-0.7-0.7-1-1.7-1.2-3l0-0.8v-26.3h-6.4l0,13.1c0,4-0.2,6.5-3.2,11.2l-0.7,1.1l-1.4,2.2c-1,1.5-2.7,2.4-4.4,2.4
+					c-1,0-1.9-0.3-2.8-0.8c-2.3-1.5-3.1-4.5-2-6.9l0.3-0.7l1.6-2.8c1.3-1.9,2.1-2,2.2-6.2l0-1.1V121.7z M331.4,107.6
+					c1.8,0.9,2.5,3.1,1.6,4.9l0,0.1l0,0l0,0.1l-9,20.6h2.3l4.6-8.2c0,0,0-0.1,0-0.1c0.9-1.8,3.1-2.5,4.8-1.6
+					c1.8,0.9,2.5,3.1,1.6,4.9l0,0.1l0,0.1l-8.4,19.2c2,0,4.8-0.3,6.9-0.8c0.5-0.1,1.1-0.3,1.4-0.3c0,0,0,0,0.1,0l0,0c0,0,0,0,0,0
+					c0.2,0,0.3,0,0.4,0.1c0.5,0.2,0.8,0.6,0.8,1.2l0,0.3l0,0l-0.1,0.3c-0.7,1.5-5.4,5.5-13,8.3c-2,0.8-4.6,1.1-5.8,1.1
+					c-0.7,0-1.3-0.2-1.8-0.4c-0.8-0.4-1.5-1-1.9-1.8c-0.6-1.1-0.7-2.2-0.3-3.4l0.3-0.7l6.8-11.7h-4l-0.6,0l0,0l-0.6,0h-0.2
+					c-0.5-0.1-0.9-0.2-1.4-0.5c-2.2-1.1-3.2-3.6-2.5-5.8l0.2-0.6l0,0l0-0.1l0-0.1l0,0l0,0l12.8-23.1c0,0,0-0.1,0-0.1
+					C327.5,107.5,329.6,106.7,331.4,107.6z M360.1,141.9h-8.7v8.7h8.7V141.9z M360.1,126.4h-8.7v8.7h8.7V126.4z M364.3,107.3
+					c2.5,0,4.5,2,4.5,4.6c0,1.6-1.9,4.1-3.4,6.1l-0.6,0.7l-0.1,0c-0.1,0.1-0.3,0.2-0.5,0.2c-0.1,0-0.2,0-0.3-0.1l-0.1-0.1l-0.1,0
+					c-1.6-2.1-4-5.1-4-6.8C359.8,109.3,361.8,107.3,364.3,107.3z"/>
 			</g>
 		</g>
-		<path class="st0" d="M416.3,108l-7.1,38c-0.7,3.8-3.4,5.8-8,5.8h-3.4l5.8-31l-4.2,1.4l2.2-11.6c4.5-2.8,8.1-7.6,10.8-14.6h9.6
-			C420.4,100.6,418.5,104.6,416.3,108z M452.2,151.8h-11.8l-7.8-37.7h-14l1.6-8.8h12.5l0.5-9.2h10.8l-0.5,9.2h8.1l-1-7.6h9.8
-			l1.1,7.2c0.5,4.2-1.4,7.2-5.7,9.3h-11.8L452.2,151.8z"/>
-		<path class="st0" d="M361.8,135.2h-5l11.3-13.6h8.8l-7.6,9.8C367.4,133.8,366.1,135.2,361.8,135.2z"/>
-		<path class="st0" d="M382.1,102.7l1.2-6.6h10.5l-1.2,6.6h4.7l-1.5,8h-4.7l-6.6,35.3c-0.3,1.4-1,2.7-2.2,4
-			c-1.4,1.2-3.1,1.9-5.1,1.9h-10.7l1.5-7.8h4.2c0.2,0,0.5,0,1,0c0.3,0,0.6-0.1,0.8-0.2c0.6-0.5,0.7-1,0.8-1.7l4.9-26.4
-			c0.7-3.4-1-5.2-5-5.2h-13.5l1.5-8H382.1z"/>
-		<path class="st0" d="M285.6,110.7l10-14.6h8l-24.5,35.2h5.3l-1.3,7.7h-10.5c-4.1-0.3-5.3-2.9-3.5-7.7l9.5-12.9h-3.5
-			c-4.5-0.8-5.4-3.7-2.6-8.8l10.4-13.5h8.1l-10.6,14.6H285.6z M295.9,151.8l1.3-7.7h7.2l1.1-6.1h-7.2l1.4-7.7h7.2l1.1-6h-7.2
-			l1.4-7.9h7.2l1.1-6h-7.2l1.3-7.7h7.2l1.2-6.7h9.5l-1.2,6.7h6l-1.4,7.7h-6l-1.1,6h4.9l-1.4,7.9h-4.9l-1.1,6h4.9l-1.3,7.7h-4.9
-			l-1.1,6.1h6.3l-0.6,3.3c-0.5,2.9-2.6,4.4-6.3,4.4H295.9z"/>
-		<path class="st0" d="M300.9,110.5l-6.3,35.5c-0.7,3.9-3.2,5.8-7.5,5.8h-0.6l7.3-41.4H300.9z"/>
-	</g>
-	<path class="st0" d="M280.1,151.8h-14.9l1.3-7.7h19.1l-0.4,2.6C284.6,150.1,282.9,151.8,280.1,151.8z"/>
-	<g>
-		<path class="st0" d="M270.4,169.4c-0.8,0.8-1.8,1.6-2.7,2.1c-0.2-0.5-0.7-1.2-1.1-1.6c1.1-0.4,2.2-1.2,3-2.1H267v-1.7h1.4
-			c-0.1-0.6-0.6-1.5-1-2.2l1.5-0.6c0.5,0.7,0.9,1.6,1.1,2.2l-1.5,0.6h1.8V163h2v3.1h3.4v1.7h-2.6c0.8,0.5,1.8,1,2.1,1.3l-1.1,1.5
-			c-0.4-0.4-1.1-1-1.8-1.5v1.9h-2V169.4z M273.2,178.6c-0.3-0.3-0.8-0.6-1.4-0.9c-1.2,0.9-2.6,1.6-4.2,2c-0.2-0.5-0.6-1.2-1-1.6
-			c1.3-0.3,2.5-0.7,3.5-1.4c-0.8-0.5-1.7-0.9-2.5-1.2c0.3-0.5,0.7-1,1-1.6h-1.4v-1.7h2.2c0.2-0.4,0.3-0.7,0.4-1l1.9,0.3
-			c-0.1,0.2-0.2,0.5-0.3,0.7h2.3l0.3,0l1.1,0.4c-0.4,1.6-1.1,2.9-2.1,3.9c0.5,0.3,0.9,0.5,1.3,0.8L273.2,178.6z M270.7,173.9
-			c-0.2,0.3-0.4,0.7-0.5,1c0.5,0.2,1,0.5,1.4,0.7c0.5-0.5,0.9-1.1,1.3-1.7H270.7z M275.5,163.9c-0.6,0.8-1.1,1.6-1.6,2.2l-1.4-0.6
-			c0.4-0.6,0.9-1.6,1.2-2.3L275.5,163.9z M282.1,168.3c-0.3,2.5-0.9,4.6-1.7,6.4c0.8,1.4,1.9,2.5,3.3,3.3c-0.5,0.4-1.1,1.1-1.4,1.7
-			c-1.2-0.8-2.2-1.8-3-3c-1,1.4-2.3,2.4-4,3.3c-0.2-0.4-0.7-1.3-1.1-1.7c1.8-0.8,3.1-1.9,4-3.4c-0.5-1.1-0.9-2.4-1.3-3.7
-			c-0.3,0.6-0.6,1.1-1,1.6c-0.3-0.4-1.1-1.1-1.5-1.4c1.4-1.9,2.2-4.9,2.6-8.1l1.9,0.3c-0.1,1-0.3,2-0.5,3h4.8v2H282.1z M278.2,168.3
-			c0.3,1.4,0.6,2.8,1.1,4.1c0.4-1.2,0.7-2.6,0.9-4.1H278.2z"/>
-		<path class="st0" d="M319.2,174.6h-6.7v2.7c0,1.1-0.3,1.7-1.1,2c-0.9,0.3-2,0.4-3.5,0.4c-0.1-0.6-0.6-1.6-0.9-2.2
-			c1.1,0,2.4,0,2.8,0c0.4,0,0.5-0.1,0.5-0.3v-2.6h-6.6v-2h6.6v-1c0.8-0.4,1.5-0.9,2.2-1.5h-5.8v-2h7.9l0.5-0.1l1.4,1.1
-			c-1,1.1-2.5,2.2-4,3.1v0.3h6.7V174.6z M305.8,168.8h-2.1v-4.1h6.7c-0.2-0.4-0.4-0.8-0.7-1.2l2.1-0.6c0.4,0.5,0.9,1.2,1.1,1.8h6.2
-			v4.1h-2.2v-2.1h-11.1V168.8z"/>
-		<path class="st0" d="M346.2,166.3c0,0.9-0.1,1.9-0.2,2.9h8c0,0,0,0.7-0.1,0.9c-0.3,5.5-0.6,7.7-1.3,8.4c-0.5,0.6-1.1,0.8-1.9,0.9
-			c-0.7,0.1-1.9,0.1-3.1,0c-0.1-0.6-0.4-1.5-0.8-2.1c1.2,0.1,2.4,0.1,3,0.1c0.4,0,0.6,0,0.8-0.2c0.5-0.4,0.8-2.2,0.9-6h-6
-			c-0.5,3.3-1.8,6.4-5.2,8.4c-0.3-0.6-1-1.3-1.5-1.7c4.6-2.6,4.7-7.3,4.9-11.6h-4.2v-2.1h15.7v2.1H346.2z"/>
-		<path class="st0" d="M382.6,172.8c-0.6,0.2-1.3,0.4-1.9,0.6v6.4h-1.9V174c-1,0.3-1.9,0.6-2.7,0.8l-0.5-2c0.9-0.2,2-0.5,3.2-0.8
-			v-3.4h-1.2c-0.2,0.9-0.4,1.6-0.7,2.3c-0.3-0.3-1.1-0.8-1.5-1c0.6-1.4,0.9-3.7,1-5.8l1.8,0.3c-0.1,0.7-0.2,1.4-0.3,2.1h0.8V163h1.9
-			v3.4h1.5v2h-1.5v2.9l1.6-0.5L382.6,172.8z M392.2,165.8c0,0,0,0.7,0,1c-0.3,8-0.7,10.9-1.3,11.8c-0.4,0.6-0.8,0.8-1.4,0.9
-			c-0.5,0.1-1.3,0.1-2,0.1c-0.1-0.6-0.3-1.5-0.6-2.1c0.7,0.1,1.3,0.1,1.6,0.1c0.3,0,0.5-0.1,0.7-0.3c0.5-0.6,0.8-3,1.1-9.4H390
-			c-0.9,4.5-2.7,9.2-5.6,11.5c-0.4-0.4-1.1-0.9-1.7-1.2c2.9-2.1,4.6-6.1,5.5-10.3h-0.8c-0.8,2.9-2.3,6.1-4.1,7.8
-			c-0.4-0.4-1.1-0.9-1.6-1.2c1.8-1.4,3.2-4,3.9-6.6h-0.9c-0.5,1.2-1.1,2.3-1.8,3.2c-0.3-0.3-1.2-0.9-1.6-1.2
-			c1.4-1.6,2.4-4.1,2.9-6.7l1.9,0.4c-0.2,0.8-0.4,1.6-0.7,2.4H392.2z"/>
 	</g>
+	<path class="st1" d="M166.5,156.1c6.4-12.5,10-26.6,10-41.6c0-32.6-26.2-59-58.6-59c-32.3,0-58.5,26.4-58.5,59
+		c0,4.8,0.4,9.5,1.1,14.1c-9,0-14.9,1.7-15.9,5.4c-1.5,5.6,8.2,13.6,24.5,21.4c5.8,2.9,11.8,5.6,17.8,8.3c3.7,1.6,7.3,3.2,11,4.8
+		c3.7,1.6,7.4,3.2,11.1,4.9c-2-0.2-4-0.5-6-0.8c-2-0.3-4-0.7-6-1.1c-4-0.9-7.9-1.9-11.8-3.1c-3.7-1.1-7.3-2.4-10.9-3.8
+		c10.4,15.9,25.7,28.2,43.6,35c12.6-4.7,23.8-12.2,33.1-21.7c17.8,1.5,30.1-0.5,31.6-6.1C183.8,167.2,177.6,161.7,166.5,156.1z
+		 M55.1,135.9c0.3-1.1,2.6-1.5,6.6-1.4c0.6,2.7,1.3,5.3,2.1,7.9C57.9,139.6,54.7,137.3,55.1,135.9z M118,157.7
+		c-23.6,0-42.8-19.3-42.8-43.1S94.3,71.4,118,71.4c23.6,0,42.8,19.3,42.8,43.1S141.6,157.7,118,157.7z M170.1,167.3
+		c-0.4,1.4-4.5,1.8-11.2,1.1c1.6-2.1,3.1-4.4,4.4-6.6C168,164.2,170.4,166.1,170.1,167.3z"/>
+	<path class="st1" d="M146,100.6l-0.7-1.5c-1.1,4.4-4.9,7.8-9.5,8.2l-0.9,0c-5.6,0-10.3-4.4-10.7-9.9l0-0.9c0-4.8,3-8.8,7.3-10.3
+		l0.9-0.3c-3.9-2.1-8.2-3.3-12.8-3.6l-1.7,0c-17.2,0-31.2,14.1-31.2,31.5c0,16.9,13.3,30.7,29.9,31.4l1.4,0
+		c16.8,0,30.5-13.4,31.2-30.1l0-1.4C148.9,109.1,147.8,104.6,146,100.6z"/>
 </g>
-<path class="st1" d="M0,0v255h533V0H0z"/>
 </svg>

IndoorViewerAPI.js

@@ -198767,7 +198767,7 @@ and limitations under the License.
 , function(t, e) {
     var n = "MapView/UI/MapAttribution.html";
     window.angular.module("ng").run(["$templateCache", function(t) {
-        t.put(n, '<span title="{{vm.attribution}}">{{vm.attribution}}</span>\n')
+        t.put(n, '<span title="4dkankan, © PopSmart,  © 高德地图">4dkankan, © PopSmart,  © 高德地图</span>\n')
     }
     ]),
     t.exports = n

css/style.css

@@ -984,4 +984,30 @@ floor-changer .btn-group-vertical button[ng-repeat="floorName in vm.floorNames |
     background: transparent !important;
     border-radius: 4px !important;
     color: #15BEC8 !important;
+}
+
+
+
+/* 关于 */
+#about-modal .modal-body >div:nth-of-type(4) {
+    display: none;
+
+}
+
+
+#about-modal .modal-body >div:nth-of-type(5) {
+    display: none;
+
+}
+#about-modal .modal-body>div:nth-of-type(6) >span,
+#about-modal .modal-body>div:nth-of-type(6) ul {
+    display: none;
+
+}
+#about-modal .modal-body>div:nth-of-type(6) {
+    height: 40px;
+}
+#about-modal .modal-body>div:nth-of-type(7) {
+    display: none;
+
 }

locat/addDataSet.html

@@ -396,9 +396,14 @@
                                 alert('图片宽高需要大于512')
                                 input.value = '';
                                 return false;
+                            } else if (img.width != img.height) {
+                                alert('图片比例必须为1:1')
+                                input.value = '';
+                                return false;
                             } else {
 
                                 self.file = file
+                                self.uploadData.size =img.width
                                 self.getImage()
                             }
                         };
@@ -626,8 +631,8 @@
                     formData.append('orientation', saveAngle)
                     // formData.append('sceneCode', this.sceneNum)
                     // formData.append('sceneCode', 't810')
-                    axios.post('indoor/'+this.sceneNum+'/api/map/upload', formData)
-                    // axios.post('http://192.168.0.135:9294/indoor/t810/api/map/upload', formData)
+                    axios.post('indoor/' + this.sceneNum + '/api/map/upload', formData)
+                        // axios.post('http://192.168.0.135:9294/indoor/t810/api/map/upload', formData)
                         .then(function (response) {
                             alert('成功')
                         })