作者 sgj
1 个管道 的构建 通过 耗费 0 秒

Merge remote-tracking branch 'origin/master'

... ... @@ -55,7 +55,7 @@
<div class="voice_box voice_third">
<div class="voice_item">
<text class="iconfont icon-luyin voice_icon"></text>
<text class="voice_font luyin">点击图标可播放 时长:10</text>
<text class="voice_font luyin">点击图标可播放 时长:<span class="timeLength">0</span></text>
</div>
<div class="voice_btn_box">
<text class="iconfont icon-quxiao cancle_voice"></text>
... ... @@ -90,7 +90,7 @@
<div class="voice_box voice_third">
<div class="voice_item">
<text class="iconfont icon-luyin voice_icon"></text>
<text class="voice_font luyin">点击图标可播放 时长:10</text>
<text class="voice_font luyin">点击图标可播放 时长:<span class="timeLength">0</span></text>
</div>
<div class="voice_btn_box">
<text class="iconfont icon-quxiao cancle_voice"></text>
... ... @@ -100,7 +100,7 @@
<!--<div class="voice_box voice_second">-->
<!--<div class="voice_item">-->
<!--<text class="iconfont icon-luying_ongoing voice_icon"></text>-->
<!--<text class="voice_font luying_ongoing">正在播放 10秒/60秒</text>-->
<!--<text class="voice_font luying_ongoing">正在播放 <span class="timeLength">0</span>秒/60秒</text>-->
<!--</div>-->
<!--</div>-->
<div class="voice_box voice_first">
... ... @@ -131,7 +131,7 @@
<div class="voice_box voice_third">
<div class="voice_item">
<text class="iconfont icon-luyin voice_icon"></text>
<text class="voice_font luyin">点击图标可播放 时长:10</text>
<text class="voice_font luyin">点击图标可播放 时长:<span class="timeLength">0</span></text>
</div>
<div class="voice_btn_box">
<text class="iconfont icon-quxiao cancle_voice"></text>
... ... @@ -141,7 +141,7 @@
<!--<div class="voice_box voice_second">-->
<!--<div class="voice_item">-->
<!--<text class="iconfont icon-luying_ongoing voice_icon"></text>-->
<!--<text class="voice_font luying_ongoing">正在播放 10秒/60秒</text>-->
<!--<text class="voice_font luying_ongoing">正在播放 <span class="timeLength">0</span>秒/60秒</text>-->
<!--</div>-->
<!--</div>-->
<div class="voice_box voice_first">
... ... @@ -185,7 +185,7 @@
<strong id="minute_show"><text></text>01:</strong>
<strong id="second_show"><text></text>00</strong>
</div>
<div class="popup_info">还可以录制 <span id="second_test">5</span></div>
<div class="popup_info">还可以录制 <span id="second_test">60</span></div>
</div>
<div class="popup_btn_box">
<div class="popup_item start ">
... ... @@ -238,8 +238,8 @@
<!--弹窗-->
<div class="box" hidden>
<div class="public_popup_box">
<text>您已签到成功!</text>
<text>恭喜您获得10个积分</text>
<text>提交成功!</text>
<text>等待专家回复</text>
</div>
</div>
</div>
... ... @@ -389,6 +389,7 @@
//倒计时
var times = "60";//倒计时总秒数量
var time="";
var timeLength=0;
function countDown(times) {
var timer = null;
timer = setInterval(function () {
... ... @@ -432,6 +433,8 @@
})
$('.stopping').click(function () {
clearInterval(timer);
timeLength=60-times;
console.log('录音时长:'+timeLength);
localStorage.clear()
})
}
... ... @@ -465,7 +468,7 @@
$('#hour_show').html('<text id="h"></text>' + hour + ':');
$('#minute_show').html('<text></text>' + minute + ':');
$('#second_show').html('<text></text>' + second + '');
$('#second_test').html(60);
num = num + 1
var parent = $(this).parents('.voice_module')
... ... @@ -473,7 +476,7 @@
'<div class="voice_box voice_third" style="display: none;">\n' +
' <div class="voice_item">\n' +
' <text class="iconfont icon-luyin voice_icon"></text>\n' +
' <text class="voice_font luyin">点击图标可播放 时长:10秒</text>\n' +
' <text class="voice_font luyin">点击图标可播放 时长:<span class="timeLength">0</span>秒</text>\n' +
' </div>\n' +
' <div class="voice_btn_box">\n' +
' <text class="iconfont icon-quxiao cancle_voice"></text>\n' +
... ... @@ -541,6 +544,7 @@
//开始录音
var localId;
var timeLength;
$('.start').click(function () {
$('.start').hide()
$('.stop').hide()
... ... @@ -569,6 +573,7 @@
success: function (res) {
localId = res.localId;
}
});
})
... ... @@ -623,6 +628,8 @@
}
});
voiceBox.find('.voice_first').hide().siblings('.voice_third').attr('data-try',localId);
voiceBox.find('.voice_first').hide().siblings('.voice_third').attr('data-time',timeLength);
voiceBox.find('.timeLength').html(timeLength);
$('.second').hide()
})
... ... @@ -656,6 +663,7 @@
//重新录制
$('.rerecord').click(function () {
$('#second_test').html(60);
$('.first').show()
$('.second').hide()
$('.stop').hide()
... ...