Преглед на файлове

Merge remote-tracking branch 'origin/test'

Conflicts:
	src/main/webapp/WEB-INF/views/portal/index.html
limin преди 7 години
родител
ревизия
82227c15ce
променени са 1 файла, в които са добавени 2 реда и са изтрити 1 реда
  1. 2 1
      src/main/webapp/WEB-INF/views/portal/index.html

+ 2 - 1
src/main/webapp/WEB-INF/views/portal/index.html

@@ -145,9 +145,10 @@
 			</div>
 			<div class="wield_cont">
 				<div class="video">
-					<video id="video1" controls="true" controlslist="nodownload">
+					<video id="video1" controls="true" controlslist="nodownload">
 <!-- 						<source src="http://118.190.205.7:8000/Pear-Demo-Yosemite_National_Park.mp4 "  type="video/mp4"> -->
 						<source th:src="${vurl == null? 'http://118.190.205.7:8000/Pear-Demo-Yosemite_National_Park.mp4': 'http://118.190.205.7:8000/'+vurl}"  type="video/mp4">
+
 						您的浏览器不支持 HTML5 video 标签。
 					</video>
 				</div>