7 years ago · 6e060f4774
--- a/src/main/vue/src/pagesPre/Home.vue
+++ b/src/main/vue/src/pagesPre/Home.vue
@@ -103,19 +103,19 @@ export default {
 
				                 content: '“国际及综合应用馆”。在6号馆，重点展示世界范围内智能制造领域的关键技术、核心产品、解决方案及相关行业应用等。',
			
 
				                 voice: 'http://oss.izouma.com/zhinengdahui/audio/2018-10-08-11-27-16-eoxqhm99.mp3'
			
 
				             }],
			
 
				-            nowMessage: 1,
			
 
				+            nowMessage: 4,
			
 
				             isVoice: false
			
 
				         }
			
 
				     },
			
 
				     watch: {
			
 
				         showBox() {
			
 
				-            this.changeVoice(this.showBox)
			
 
				+            if (!this.showBox) {
			
 
				+                this.changeVoice(this.showBox)
			
 
				+            }
			
 
				+
			
 
				         }
			
 
				     },
			
 
				     mounted() {
			
 
				-        setTimeout(() => {
			
 
				-            //  this.$refs.music.play();
			
 
				-        }, 500)
			
 
				     },
			
 
				     methods: {
			
 
				         goBack() {
			
@@ -130,10 +130,11 @@ export default {
 
				             this.showBox = true
			
 
				             this.changeVoice(true)
			
 
				 
			
 
				-
			
 
				         },
			
 
				         changeVoice(value) {
			
 
				-            this.$refs.music.pause();
			
 
				+            if (this.$refs.music) {
			
 
				+                this.$refs.music.pause();
			
 
				+            }
			
 
				             if (value) {
			
 
				                 setTimeout(() => {
			
 
				                     this.$refs.music.play();
			
--- a/src/main/webapp/WEB-INF/html/admin.html
+++ b/src/main/webapp/WEB-INF/html/admin.html
@@ -1 +1 @@
 
				-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.88330763060e10186890877d69171382.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.b0a895f6b426b8da89c7.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/admin.ec298cb679344c0b7b7b.js></script></body></html>
			
 
				+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><script src=/static/fontawesome-v5.2.0.js></script><link href=/static/css/admin.88330763060e10186890877d69171382.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f6d1776f7d7de20783ea.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/admin.ec298cb679344c0b7b7b.js></script></body></html>
			
--- a/src/main/webapp/WEB-INF/html/index.html
+++ b/src/main/webapp/WEB-INF/html/index.html
@@ -5,7 +5,7 @@
 
				             position: absolute;
			
 
				             top: 0;
			
 
				             left: 0;
			
 
				-        }</style><link href=/static/css/index.80c301c85b07951bbf7ff1f6359243bc.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.b0a895f6b426b8da89c7.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/index.6d69922289be9d8484c8.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
			
 
				+        }</style><link href=/static/css/index.e3592871ba27bb87430f70b5187df37a.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f6d1776f7d7de20783ea.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/index.6d69922289be9d8484c8.js></script></body><script>var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串
			
 
				     var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1; //判断是否IE<11浏览器
			
 
				     var isEdge = userAgent.indexOf("Edge") > -1 && !isIE; //判断是否IE的Edge浏览器
			
 
				     var isIE11 = userAgent.indexOf('Trident') > -1 && userAgent.indexOf("rv:11.0") > -1;
			
--- a/src/main/webapp/WEB-INF/html/loginAdmin.html
+++ b/src/main/webapp/WEB-INF/html/loginAdmin.html
@@ -1 +1 @@
 
				-<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.bc5c78a02358f02b38783ad4d43c1d0d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.b0a895f6b426b8da89c7.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/loginAdmin.97223717073d07360948.js></script></body></html>
			
 
				+<!DOCTYPE html><html><head><meta charset=utf-8><meta name=viewport content="width=device-width,initial-scale=1"><meta name=referrer content=origin><title>管理后台</title><link rel=icon href=/static/favicon.ico><script src=/static/polyfill.min.js></script><link href=/static/css/loginAdmin.bc5c78a02358f02b38783ad4d43c1d0d.css rel=stylesheet></head><body><div id=app></div><script type=text/javascript src=/static/js/manifest.f6d1776f7d7de20783ea.js></script><script type=text/javascript src=/static/js/vendor.917ed396bd28477dbcec.js></script><script type=text/javascript src=/static/js/loginAdmin.97223717073d07360948.js></script></body></html>
			
--- a/src/main/webapp/static/css/index.e3592871ba27bb87430f70b5187df37a.css
+++ b/src/main/webapp/static/css/index.e3592871ba27bb87430f70b5187df37a.css
--- a/src/main/webapp/static/js/13.475ae4aadae839fae816.js
+++ b/src/main/webapp/static/js/13.475ae4aadae839fae816.js
--- a/src/main/webapp/static/js/13.f8048179f7024ff2764e.js
+++ b/src/main/webapp/static/js/13.f8048179f7024ff2764e.js
--- a/src/main/webapp/static/js/manifest.f6d1776f7d7de20783ea.js
+++ b/src/main/webapp/static/js/manifest.f6d1776f7d7de20783ea.js