dos

Public/static/js/common.js

@@ -379,28 +379,22 @@ function showResult(event) {
                 success: function (resp) {
                 success: function (resp) {
                     if (resp.status == 1) {
                     if (resp.status == 1) {
                         resultFlag = 10
                         resultFlag = 10
-                        setTimeout(function () {
-                            $('.page7 .first-block').show();
+                        dialogFlag = 'first'
                         createPosterLock = true;
                         createPosterLock = true;
-                        }, 2000);
                         window.pt = '1'
                         window.pt = '1'
                     } else {
                     } else {
-                        setTimeout(function () {
-                            $('.page7 .second-block').show();
+                        dialogFlag = 'second'
                         createPosterLock = true;
                         createPosterLock = true;
-                        }, 2000);
                         window.pt = '2'
                         window.pt = '2'
                     }
                     }
-                    createPoster(resultFlag)
+                    createPoster(resultFlag, dialogFlag)
                 }
                 }
             })
             })
         } else if (window.pt === '2') {
         } else if (window.pt === '2') {
-            setTimeout(function () {
-                $('.page7 .second-block').show();
             createPosterLock = true;
             createPosterLock = true;
-            }, 2000);
             window.pt = '2'
             window.pt = '2'
-            createPoster(resultFlag)
+            dialogFlag = 'second'
+            createPoster(resultFlag, dialogFlag)
 
 
         } else {
         } else {
             createPoster(resultFlag)
             createPoster(resultFlag)
@@ -428,7 +422,7 @@ function retry() {
     $('.poster-canvas').html('')
     $('.poster-canvas').html('')
 }
 }
 
 
-function createPoster(resultFlag) {
+function createPoster(resultFlag, dialogFlag = false) {
     $('#notification_area').remove();
     $('#notification_area').remove();
     my_notify('正在生成海报，请稍候', 60000);
     my_notify('正在生成海报，请稍候', 60000);
 
 
@@ -457,8 +451,14 @@ function createPoster(resultFlag) {
                 $('.posterimg').attr('src', getManBase64(posterCanvas));
                 $('.posterimg').attr('src', getManBase64(posterCanvas));
                 $('.page').hide();
                 $('.page').hide();
                 $('.page7').show();
                 $('.page7').show();
+
+                if (dialogFlag) {
+                    setTimeout(function () {
+                        $(`.page7 .${dialogFlag}-block`).show();
+                        createPosterLock = true;
+                    }, 1300);
+                } else {
                     $('#notification_area').remove();
                     $('#notification_area').remove();
-                if ($('.first-block').css('display') == 'none' && $('.second-block').css('display') == 'none') {
                     my_notify('请长按页面保存海报');
                     my_notify('请长按页面保存海报');
                 }
                 }
                 $('#posterCanvas').css({
                 $('#posterCanvas').css({