y

.idea/workspace.xml

@@ -2,7 +2,6 @@
 <project version="4">
 <project version="4">
   <component name="ChangeListManager">
   <component name="ChangeListManager">
     <list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
     <list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
       <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/js/index.js" afterPath="$PROJECT_DIR$/Public/static/js/index.js" />
     </list>
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -164,8 +163,8 @@
           <file leaf-file-name="index.js" pinned="false" current-in-tab="true">
           <file leaf-file-name="index.js" pinned="false" current-in-tab="true">
             <entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
             <entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
               <provider selected="true" editor-type-id="text-editor">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="315">
-                  <caret line="373" column="21" lean-forward="false" selection-start-line="373" selection-start-column="21" selection-end-line="373" selection-end-column="21" />
+                <state relative-caret-position="144">
+                  <caret line="370" column="34" lean-forward="false" selection-start-line="370" selection-start-column="34" selection-end-line="370" selection-end-column="34" />
                   <folding />
                   <folding />
                 </state>
                 </state>
               </provider>
               </provider>
@@ -586,12 +585,12 @@
       <option name="number" value="Default" />
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1566667513502</updated>
       <updated>1566667513502</updated>
-      <workItem from="1566667516612" duration="48468000" />
+      <workItem from="1566667516612" duration="48538000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="48468000" />
+    <option name="totallyTimeSpent" value="48538000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="33" y="23" width="1440" height="817" extended-state="0" />
     <frame x="33" y="23" width="1440" height="817" extended-state="0" />
@@ -833,8 +832,8 @@
     </entry>
     </entry>
     <entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
     <entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
       <provider selected="true" editor-type-id="text-editor">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="315">
-          <caret line="373" column="21" lean-forward="false" selection-start-line="373" selection-start-column="21" selection-end-line="373" selection-end-column="21" />
+        <state relative-caret-position="144">
+          <caret line="370" column="34" lean-forward="false" selection-start-line="370" selection-start-column="34" selection-end-line="370" selection-end-column="34" />
           <folding />
           <folding />
         </state>
         </state>
       </provider>
       </provider>

Public/static/js/index.js

@@ -364,15 +364,12 @@ function mergeImage_two(url) {
     cover_four.src = url_two_t;
     cover_four.src = url_two_t;
     cover_three.src = url_three;
     cover_three.src = url_three;
     cover_three.onload = function () {
     cover_three.onload = function () {
-        alert(1)
         var tmp = $('<canvas></canvas>')[0];
         var tmp = $('<canvas></canvas>')[0];
         tmp.width = 640;
         tmp.width = 640;
         tmp.height = 1238;
         tmp.height = 1238;
-        cover_four.onload = function () {
-            alert(2)
-
         cover_three.width = 640;
         cover_three.width = 640;
         cover_three.height = 1238;
         cover_three.height = 1238;
+        cover_four.onload = function () {
         var ctx = tmp.getContext('2d');
         var ctx = tmp.getContext('2d');
         ctx.drawImage(cover_three, 0, 0);
         ctx.drawImage(cover_three, 0, 0);
         ctx.drawImage(cover_four, 63, 190);
         ctx.drawImage(cover_four, 63, 190);
@@ -381,7 +378,7 @@ function mergeImage_two(url) {
             $('.page-x-z').hide();
             $('.page-x-z').hide();
             $('.page-s-c').show();
             $('.page-s-c').show();
             $('.page_checking').hide()
             $('.page_checking').hide()
-        }, 5000);
+        }, 4000);
     };
     };
     }
     }
 }
 }