y

.idea/workspace.xml

@@ -165,8 +165,8 @@
           <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
             <entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
               <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="323">
-                  <caret line="378" column="18" lean-forward="true" selection-start-line="378" selection-start-column="18" selection-end-line="378" selection-end-column="18" />
+                <state relative-caret-position="418">
+                  <caret line="393" column="15" lean-forward="true" selection-start-line="393" selection-start-column="15" selection-end-line="393" selection-end-column="49" />
                   <folding />
                 </state>
               </provider>
@@ -590,12 +590,12 @@
       <option name="number" value="Default" />
       <option name="presentableId" value="Default" />
       <updated>1566667513502</updated>
-      <workItem from="1566667516612" duration="55456000" />
+      <workItem from="1566667516612" duration="55568000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="55456000" />
+    <option name="totallyTimeSpent" value="55568000" />
   </component>
   <component name="ToolWindowManager">
     <frame x="31" y="23" width="1440" height="817" extended-state="0" />
@@ -785,8 +785,8 @@
     </entry>
     <entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="323">
-          <caret line="378" column="18" lean-forward="true" selection-start-line="378" selection-start-column="18" selection-end-line="378" selection-end-column="18" />
+        <state relative-caret-position="418">
+          <caret line="393" column="15" lean-forward="true" selection-start-line="393" selection-start-column="15" selection-end-line="393" selection-end-column="49" />
           <folding />
         </state>
       </provider>

Application/Home/View/default/Index_index.tpl

@@ -269,7 +269,7 @@
 <script type="text/javascript"
 src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all"></script>
 
-<script type="text/javascript" src="__CDN__/js/index.js?t=15"></script>
+<script type="text/javascript" src="__CDN__/js/index.js?t=16"></script>
 <link href="__CDN__/css/notify.css" rel="stylesheet">
 <script type="text/javascript" src="__CDN__/js/jquery-notify.js"></script>
 

Public/static/js/index.js

@@ -379,7 +379,7 @@ function mergeImage_two(url) {
         alert('IOS')
     }
 
-    ceshi.onload = function () {
+    cover_three.onload = function () {
         // cover_four.onload = function () {
 
             var tmp = $('<canvas></canvas>')[0];
@@ -391,7 +391,9 @@ function mergeImage_two(url) {
             ctx.drawImage(cover_three, 0, 0);
             ctx.drawImage(cover_four, 63, 190);
             setTimeout(function () {
+                cover_four.onload = function () {
                 $('.h-b').attr('src', tmp.toDataURL('image/jpeg', 0.5));
+                };
                 $('.page-x-z').hide();
                 $('.page-s-c').show();
                 $('.page_checking').hide()