Commit ea9e712f by zhangheng

y

parent 867d78ba
......@@ -163,8 +163,8 @@
<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="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" />
<state relative-caret-position="429">
<caret line="381" column="20" lean-forward="true" selection-start-line="381" selection-start-column="20" selection-end-line="381" selection-end-column="20" />
<folding />
</state>
</provider>
......@@ -585,12 +585,12 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="45514000" />
<workItem from="1566667516612" duration="45604000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="45514000" />
<option name="totallyTimeSpent" value="45604000" />
</component>
<component name="ToolWindowManager">
<frame x="2" y="23" width="1440" height="817" extended-state="6" />
......@@ -832,8 +832,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state relative-caret-position="429">
<caret line="381" column="20" lean-forward="true" selection-start-line="381" selection-start-column="20" selection-end-line="381" selection-end-column="20" />
<folding />
</state>
</provider>
......
......@@ -363,9 +363,9 @@ function mergeImage_two(url) {
var url_two_t = url;
cover_four.src = url_two_t;
cover_three.src = url_three;
cover_four.onload = function () {
cover_three.onload = function () {
alert(1)
cover_three.onload = function () {
cover_four.onload = function () {
alert(22221)
var tmp = $('<canvas></canvas>')[0];
tmp.width = 640;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment