Commit 71951cb5 by zhangheng

1

parent 2b6ccbb2
...@@ -2,7 +2,6 @@ ...@@ -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$/Public/static/images/s-c.png" afterPath="$PROJECT_DIR$/Public/static/images/s-c.png" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" /> <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>
...@@ -105,8 +104,8 @@ ...@@ -105,8 +104,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="219"> <state relative-caret-position="371">
<caret line="391" column="47" lean-forward="false" selection-start-line="391" selection-start-column="47" selection-end-line="391" selection-end-column="47" /> <caret line="436" column="48" lean-forward="false" selection-start-line="436" selection-start-column="48" selection-end-line="436" selection-end-column="48" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -543,12 +542,12 @@ ...@@ -543,12 +542,12 @@
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" /> <workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="6433000" /> <workItem from="1567098016695" duration="6433000" />
<workItem from="1567181764126" duration="5355000" /> <workItem from="1567181764126" duration="5420000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="67537000" /> <option name="totallyTimeSpent" value="67602000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="815" extended-state="6" /> <frame x="0" y="23" width="1440" height="815" extended-state="6" />
...@@ -937,8 +936,8 @@ ...@@ -937,8 +936,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="219"> <state relative-caret-position="371">
<caret line="391" column="47" lean-forward="false" selection-start-line="391" selection-start-column="47" selection-end-line="391" selection-end-column="47" /> <caret line="436" column="48" lean-forward="false" selection-start-line="436" selection-start-column="48" selection-end-line="436" selection-end-column="48" />
<folding /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -389,7 +389,7 @@ function mergeImage_two(url) { ...@@ -389,7 +389,7 @@ function mergeImage_two(url) {
cover_three.width = 533; cover_three.width = 533;
cover_three.height = 850; cover_three.height = 850;
var ctx = tmp.getContext('2d'); var ctx = tmp.getContext('2d');
ctx.drawImage(cover_four, 10, -13); ctx.drawImage(cover_four, 10, -9);
ctx.drawImage(cover_three, 0, 0); ctx.drawImage(cover_three, 0, 0);
setTimeout(function () { setTimeout(function () {
...@@ -414,7 +414,7 @@ function mergeImage_two(url) { ...@@ -414,7 +414,7 @@ function mergeImage_two(url) {
cover_three.width = 533; cover_three.width = 533;
cover_three.height = 850; cover_three.height = 850;
var ctx = tmp.getContext('2d'); var ctx = tmp.getContext('2d');
ctx.drawImage(cover_four, 10, -13); ctx.drawImage(cover_four, 10, -9);
ctx.drawImage(cover_three, 0, 0); ctx.drawImage(cover_three, 0, 0);
setTimeout(function () { setTimeout(function () {
...@@ -434,7 +434,7 @@ function mergeImage_two(url) { ...@@ -434,7 +434,7 @@ function mergeImage_two(url) {
cover_three.width = 533; cover_three.width = 533;
cover_three.height = 850; cover_three.height = 850;
var ctx = tmp.getContext('2d'); var ctx = tmp.getContext('2d');
ctx.drawImage(cover_four, 10, -13); ctx.drawImage(cover_four, 10, -9);
ctx.drawImage(cover_three, 0, 0); ctx.drawImage(cover_three, 0, 0);
setTimeout(function () { setTimeout(function () {
......
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