Merge branch 'master' of http://git.scdxtc.com/chen/squareDancing

js/custom.js

@@ -179,7 +179,7 @@ function peopleObj(name,uid,say,action){
 	]
 	$.each(yspData, function (commentIndex, comment) {
 			yspHtml += `
-			<div id="${comment.uid}" class="dance-people data${comment.peopleId}" style="top: ${comment.top}; left: ${comment.left};">
+			<div id="${comment.uid}" class="dance-people data${peopleId}" style="top: ${comment.top}; left: ${comment.left};">
 				<div class="speak ">${comment.say}</div>
 				<div class="people-img ${comment.peopleImg} ${comment.dancin}">
 					<div class="stick ${comment.ying_guang}"></div>

js/handle.js

@@ -3,7 +3,7 @@ let uidObj = {}
 var musicList = []
 
 // 领舞人领舞时间 秒
-let leaderTime = 10
+let leaderTime = 15*60
 
 // 事件列表-中文
 let eventTextList = ['切歌', '跳跃', '向左', '向右', '左抖腿', '右抖腿', '抖动', '一起喊', '镜头']