y

.idea/workspace.xml

@@ -163,7 +163,7 @@
           <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="467">
+                <state relative-caret-position="448">
                   <caret line="382" column="15" lean-forward="false" selection-start-line="382" selection-start-column="15" selection-end-line="382" selection-end-column="15" />
                   <caret line="382" column="15" lean-forward="false" selection-start-line="382" selection-start-column="15" selection-end-line="382" selection-end-column="15" />
                   <folding />
                   <folding />
                 </state>
                 </state>
@@ -585,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="45436000" />
+      <workItem from="1566667516612" duration="45514000" />
     </task>
     </task>
     <servers />
     <servers />
   </component>
   </component>
   <component name="TimeTrackingManager">
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="45436000" />
+    <option name="totallyTimeSpent" value="45514000" />
   </component>
   </component>
   <component name="ToolWindowManager">
   <component name="ToolWindowManager">
     <frame x="2" y="23" width="1440" height="817" extended-state="6" />
     <frame x="2" y="23" width="1440" height="817" extended-state="6" />
@@ -832,7 +832,7 @@
     </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="467">
+        <state relative-caret-position="448">
           <caret line="382" column="15" lean-forward="false" selection-start-line="382" selection-start-column="15" selection-end-line="382" selection-end-column="15" />
           <caret line="382" column="15" lean-forward="false" selection-start-line="382" selection-start-column="15" selection-end-line="382" selection-end-column="15" />
           <folding />
           <folding />
         </state>
         </state>

Public/static/js/index.js

@@ -363,10 +363,10 @@ function mergeImage_two(url) {
     var url_two_t = url;
     var url_two_t = url;
     cover_four.src = url_two_t;
     cover_four.src = url_two_t;
     cover_three.src = url_three;
     cover_three.src = url_three;
-    // cover_four.onload = function () {
-        console.log(1)
+    cover_four.onload = function () {
+        alert(1)
         cover_three.onload = function () {
         cover_three.onload = function () {
-            console.log(22221)
+            alert(22221)
         var tmp = $('<canvas></canvas>')[0];
         var tmp = $('<canvas></canvas>')[0];
         tmp.width = 640;
         tmp.width = 640;
         tmp.height = 1238;
         tmp.height = 1238;
@@ -380,9 +380,9 @@ 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()
-        }, 3000);
+        }, 2000);
     };
     };
-    // }
+    }
 }
 }
 
 
 window.wx && wx.ready(function () {
 window.wx && wx.ready(function () {