Merge branch '0321-v3.1.3' into test

public/resource/js/videoCheckList.js

@@ -103,7 +103,7 @@ define(['doT', 'text!temp/video_check_list_template_tpl.html', 'css!style/home.c
 				house.videoId = $(this).attr("data-id");
 				$('.shop-name').html(house.videoName);
 				$('.shop-time').html(house.videoTime);
-				var tag = '<video src="' + ServerHostImageLiu + '/resource/lib/Attachments/video/' + house.videoPath + '" controls="controls" type="video/mp4" id="video-check" preload="none" poster="' + ServerHostImageLiu + '/resource/lib/Attachments/video/' + house.video_image + '"></video>'
+				var tag = '<video src="' + ServerHostImageLiu + '/resource/lib/Attachments/video/' + house.videoPath + '" controls="controls" type="video/mp4" id="video-check" preload="none" muted poster="' + ServerHostImageLiu + '/resource/lib/Attachments/video/' + house.video_image + '"></video>'
 				$(".video-span").html(tag);
 //				<video src="/resource/image/liu.mp4" controls="controls" type="video/mp4" id="video-check" preload="none"></video>
 //				document.getElementById("video-check").src = ServerHostImageLiu + '/resource/lib/Attachments/video/' + house.videoPath;

public/resource/template/house_template_tpl.html

@@ -155,7 +155,7 @@
     [% for(var item in it){ %]
     <tr class="text-left" style="width: 272px;float: left;">
         <td style="margin-right: 10px;">
-        	<video src="[%= it[item]['video_path'] %]" controls="controls" preload="none" muted type="video/mp4" id="video-check" style="width: 260px;height: 476px;margin-right: 10px;" poster="[%= it[item]['video_image'] %]"></video>
+        	<video src="[%= it[item]['video_path'] %]" controls="controls" preload="none" muted type="video/mp4" id="video-check" style="width: 260px;height: 476px;margin-right: 10px;" poster="[%= it[item]['video_image'] %]" muted></video>
         <br />
              上传人:[%= it[item]['upload_name'] %]
        <br />

public/resource/template/video_check_list_template_tpl.html

@@ -38,7 +38,7 @@
     [% for(var item in it){ %]
     <tr class="text-left" style="width: 272px;float: left;">
         <td style="margin-right: 10px;">
-        	<video src="[%= it[item]['video_path'] %]" controls="controls" preload="none" type="video/mp4" id="video-check" style="width: 260px;height: 476px;margin-right: 6px;" poster="[%= it[item]['video_image'] %]"></video>
+        	<video src="[%= it[item]['video_path'] %]" controls="controls" preload="none" type="video/mp4" id="video-check" style="width: 260px;height: 476px;margin-right: 6px;" poster="[%= it[item]['video_image'] %]" muted></video>
         <br />
              上传人:[%= it[item]['upload_name'] %]
        <br />