Commit 34db6758 by zhangheng

1

parent 6f1bbf0c
...@@ -83,8 +83,8 @@ ...@@ -83,8 +83,8 @@
<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="true">
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"> <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="418">
<caret line="284" column="5" lean-forward="true" selection-start-line="284" selection-start-column="5" selection-end-line="284" selection-end-column="5" /> <caret line="291" column="60" lean-forward="false" selection-start-line="291" selection-start-column="60" selection-end-line="291" selection-end-column="60" />
<folding> <folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding> </folding>
...@@ -105,8 +105,8 @@ ...@@ -105,8 +105,8 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="false"> <file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<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="276"> <state relative-caret-position="238">
<caret line="436" column="48" lean-forward="true" selection-start-line="436" selection-start-column="48" selection-end-line="436" selection-end-column="48" /> <caret line="393" column="0" lean-forward="true" selection-start-line="393" selection-start-column="0" selection-end-line="393" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -543,12 +543,12 @@ ...@@ -543,12 +543,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="5648000" /> <workItem from="1567181764126" duration="5695000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="67830000" /> <option name="totallyTimeSpent" value="67877000" />
</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" />
...@@ -927,16 +927,16 @@ ...@@ -927,16 +927,16 @@
</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="276"> <state relative-caret-position="238">
<caret line="436" column="48" lean-forward="true" selection-start-line="436" selection-start-column="48" selection-end-line="436" selection-end-column="48" /> <caret line="393" column="0" lean-forward="true" selection-start-line="393" selection-start-column="0" selection-end-line="393" selection-end-column="0" />
<folding /> <folding />
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"> <entry file="file://$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="285"> <state relative-caret-position="418">
<caret line="284" column="5" lean-forward="true" selection-start-line="284" selection-start-column="5" selection-end-line="284" selection-end-column="5" /> <caret line="291" column="60" lean-forward="false" selection-start-line="291" selection-start-column="60" selection-end-line="291" selection-end-column="60" />
<folding> <folding>
<element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#6;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding> </folding>
......
...@@ -289,7 +289,7 @@ ...@@ -289,7 +289,7 @@
<script type="text/javascript" <script type="text/javascript"
src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all"></script> 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=34"></script> <script type="text/javascript" src="__CDN__/js/index.js?t=35"></script>
<link href="__CDN__/css/notify.css" rel="stylesheet"> <link href="__CDN__/css/notify.css" rel="stylesheet">
<script type="text/javascript" src="__CDN__/js/jquery-notify.js"></script> <script type="text/javascript" src="__CDN__/js/jquery-notify.js"></script>
......
...@@ -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, 4, 0); ctx.drawImage(cover_four, 0, 0);
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, 4, 0); ctx.drawImage(cover_four, 0, 0);
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, 4, 0); ctx.drawImage(cover_four, 0, 0);
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