diff --git a/public/static/js/phone-image.js b/public/static/js/phone-image.js index 66e07a4..fa49425 100644 --- a/public/static/js/phone-image.js +++ b/public/static/js/phone-image.js @@ -955,7 +955,7 @@ var PhoneImageEngine = (function () { captureNext(); }).catch(function () { // 加载失败,回退到html2canvas - capturePageViaHtml2Canvas($elem, $staging, opts, results, idx, total, deferred, captureNext); + capturePageViaHtml2Canvas($elem, $staging, opts, results, deferred, function () { idx++; captureNext(); }); }); return; } else { @@ -968,7 +968,7 @@ var PhoneImageEngine = (function () { } } - capturePageViaHtml2Canvas($elem, $staging, opts, results, idx, total, deferred, captureNext); + capturePageViaHtml2Canvas($elem, $staging, opts, results, deferred, function () { idx++; captureNext(); }); } captureNext(); @@ -977,7 +977,7 @@ var PhoneImageEngine = (function () { /** * 用html2canvas截图单页 */ - function capturePageViaHtml2Canvas($elem, $staging, opts, results, idx, total, deferred, captureNext) { + function capturePageViaHtml2Canvas($elem, $staging, opts, results, deferred, onDone) { html2canvas($elem[0], { scale: opts.scale, useCORS: true, @@ -991,11 +991,10 @@ var PhoneImageEngine = (function () { } else { results.push(canvas.toDataURL('image/jpeg', opts.quality)); } - idx++; - captureNext(); + onDone(); }).catch(function (err) { $staging.css({ visibility: 'hidden' }); - deferred.reject('截图失败(第' + (idx + 1) + '页): ' + err); + deferred.reject('截图失败: ' + err); }); }