y

1b51057a · zhangheng · b3283941 · 1b51057a · 1b51057a
Commit 1b51057a authored Aug 27, 2019 by zhangheng
Show whitespace changes
Inline Side-by-side

Showing with 27 additions and 25 deletions

.idea/workspace.xml
+25 -23

Public/static/js/index.js
+2 -2

No files found.
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -2,10 +2,7 @@
 <project version="4">
  <component name="ChangeListManager">
    <list default="true" id="393705e8-a82c-4795-9b3b-5f911ddba9ac" name="Default" comment="">
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" afterPath="$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc" />
+      <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$/Application/Home/View/default/Index_index.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.css" afterPath="$PROJECT_DIR$/Public/static/css/main.css" />
-      <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Public/static/css/main.scss" afterPath="$PROJECT_DIR$/Public/static/css/main.scss" />
    </list>
    <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
    <option name="TRACKING_ENABLED" value="true" />
@@ -19,7 +16,7 @@
  </component>
  <component name="ExecutionTargetManager" SELECTED_TARGET="default_target" />
  <component name="FileEditorManager">
-    <splitter split-orientation="horizontal" split-proportion="0.24608295">
+    <splitter split-orientation="horizontal" split-proportion="0.5907834">
      <split-first>
        <leaf>
          <file leaf-file-name="index.html" pinned="false" current-in-tab="false">
@@ -81,7 +78,7 @@
              </provider>
            </entry>
          </file>
-          <file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="true">
+          <file leaf-file-name="Index_index.tpl" pinned="false" current-in-tab="false">
            <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
              <provider selected="true" editor-type-id="text-editor">
                <state relative-caret-position="228">
@@ -163,12 +160,14 @@
              </provider>
            </entry>
          </file>
-          <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
+          <file leaf-file-name="index.js" pinned="false" current-in-tab="true">
            <entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
              <provider selected="true" editor-type-id="text-editor">
-                <state relative-caret-position="1227">
+                <state relative-caret-position="486">
                  <caret line="385" column="1" lean-forward="true" selection-start-line="385" selection-start-column="1" selection-end-line="385" selection-end-column="1" />
-                  <folding />
+                  <folding>
+                    <marker date="1566839327000" expanded="true" signature="9861:11426" ph="{...}" />
+                  </folding>
                </state>
              </provider>
            </entry>
@@ -212,8 +211,8 @@
      <find>btn-close</find>
      <find>page-lang</find>
      <find>btn-next-map</find>
-      <find>mix/</find>
      <find>btn-info</find>
+      <find>mix/</find>
    </findStrings>
    <replaceStrings>
      <replace>m-</replace>
@@ -232,9 +231,9 @@
        <option value="$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php" />
        <option value="$PROJECT_DIR$/Application/User/View/default/Report_index.tpl" />
        <option value="$PROJECT_DIR$/Application/User/Controller/ReportController.class.php" />
-        <option value="$PROJECT_DIR$/Public/static/js/index.js" />
        <option value="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
        <option value="$PROJECT_DIR$/Public/static/css/main.scss" />
+        <option value="$PROJECT_DIR$/Public/static/js/index.js" />
      </list>
    </option>
  </component>
@@ -588,16 +587,16 @@
      <option name="number" value="Default" />
      <option name="presentableId" value="Default" />
      <updated>1566667513502</updated>
-      <workItem from="1566667516612" duration="44212000" />
+      <workItem from="1566667516612" duration="44877000" />
    </task>
    <servers />
  </component>
  <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="44212000" />
+    <option name="totallyTimeSpent" value="44877000" />
  </component>
  <component name="ToolWindowManager">
    <frame x="2" y="23" width="1440" height="817" extended-state="6" />
-    <editor active="false" />
+    <editor active="true" />
    <layout>
      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.22389127" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
      <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
@@ -607,7 +606,7 @@
      <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="8" side_tool="false" content_ui="tabs" />
      <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.24689655" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
      <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
-      <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17517242" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
+      <window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.17517242" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
      <window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="4" side_tool="true" content_ui="tabs" />
      <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="3" side_tool="false" content_ui="tabs" />
      <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="4" side_tool="false" content_ui="tabs" />
@@ -765,14 +764,6 @@
        </state>
      </provider>
    </entry>
-    <entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1227">
-          <caret line="385" column="1" lean-forward="true" selection-start-line="385" selection-start-column="1" selection-end-line="385" selection-end-column="1" />
-          <folding />
-        </state>
-      </provider>
-    </entry>
    <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
      <provider selected="true" editor-type-id="text-editor">
        <state relative-caret-position="228">
@@ -841,5 +832,15 @@
        </state>
      </provider>
    </entry>
+    <entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="486">
+          <caret line="385" column="1" lean-forward="true" selection-start-line="385" selection-start-column="1" selection-end-line="385" selection-end-column="1" />
+          <folding>
+            <marker date="1566839327000" expanded="true" signature="9861:11426" ph="{...}" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
  </component>
 </project>
\ No newline at end of file
--- a/Public/static/js/index.js
+++ b/Public/static/js/index.js
@@ -365,7 +365,7 @@ function mergeImage_two(url) {
    cover_three.src = url_three;
    cover_four.onload = function () {
        console.log(1)
-        // cover_three.onload = function () {
+        cover_three.onload = function () {
            console.log(22221)
        var tmp = $('<canvas></canvas>')[0];
        tmp.width = 640;
@@ -382,7 +382,7 @@ function mergeImage_two(url) {
            $('.page_checking').hide()
        }, 1000);
    };
-    // }
+    }
 }
 window.wx && wx.ready(function () {