Commit f42686c9 by zhangheng

y

parent 76181df6
...@@ -165,8 +165,8 @@ ...@@ -165,8 +165,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="323"> <state relative-caret-position="418">
<caret line="378" column="18" lean-forward="true" selection-start-line="378" selection-start-column="18" selection-end-line="378" selection-end-column="18" /> <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 /> <folding />
</state> </state>
</provider> </provider>
...@@ -590,12 +590,12 @@ ...@@ -590,12 +590,12 @@
<option name="number" value="Default" /> <option name="number" value="Default" />
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="55456000" /> <workItem from="1566667516612" duration="55568000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="55456000" /> <option name="totallyTimeSpent" value="55568000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="31" y="23" width="1440" height="817" extended-state="0" /> <frame x="31" y="23" width="1440" height="817" extended-state="0" />
...@@ -785,8 +785,8 @@ ...@@ -785,8 +785,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="323"> <state relative-caret-position="418">
<caret line="378" column="18" lean-forward="true" selection-start-line="378" selection-start-column="18" selection-end-line="378" selection-end-column="18" /> <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 /> <folding />
</state> </state>
</provider> </provider>
......
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,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=15"></script> <script type="text/javascript" src="__CDN__/js/index.js?t=16"></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>
......
...@@ -379,7 +379,7 @@ function mergeImage_two(url) { ...@@ -379,7 +379,7 @@ function mergeImage_two(url) {
alert('IOS') alert('IOS')
} }
ceshi.onload = function () { cover_three.onload = function () {
// cover_four.onload = function () { // cover_four.onload = function () {
var tmp = $('<canvas></canvas>')[0]; var tmp = $('<canvas></canvas>')[0];
...@@ -391,7 +391,9 @@ function mergeImage_two(url) { ...@@ -391,7 +391,9 @@ function mergeImage_two(url) {
ctx.drawImage(cover_three, 0, 0); ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 63, 190); ctx.drawImage(cover_four, 63, 190);
setTimeout(function () { setTimeout(function () {
cover_four.onload = function () {
$('.h-b').attr('src', tmp.toDataURL('image/jpeg', 0.5)); $('.h-b').attr('src', tmp.toDataURL('image/jpeg', 0.5));
};
$('.page-x-z').hide(); $('.page-x-z').hide();
$('.page-s-c').show(); $('.page-s-c').show();
$('.page_checking').hide() $('.page_checking').hide()
......
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