Commit 961aed2d by zhangheng

y

parent 15f124da
......@@ -83,7 +83,7 @@
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
<state relative-caret-position="355">
<caret line="243" column="0" lean-forward="true" selection-start-line="243" selection-start-column="0" selection-end-line="243" selection-end-column="0" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......@@ -165,8 +165,8 @@
<file leaf-file-name="index.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
<caret line="361" column="22" lean-forward="false" selection-start-line="361" selection-start-column="22" selection-end-line="361" selection-end-column="22" />
<state relative-caret-position="380">
<caret line="377" column="32" lean-forward="true" selection-start-line="377" selection-start-column="32" selection-end-line="377" selection-end-column="32" />
<folding />
</state>
</provider>
......@@ -246,7 +246,7 @@
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="33" />
<option name="y" value="151" />
<option name="y" value="23" />
<option name="width" value="1440" />
<option name="height" value="817" />
</component>
......@@ -587,15 +587,15 @@
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1566667513502</updated>
<workItem from="1566667516612" duration="48187000" />
<workItem from="1566667516612" duration="48265000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="48187000" />
<option name="totallyTimeSpent" value="48265000" />
</component>
<component name="ToolWindowManager">
<frame x="33" y="151" width="1440" height="817" extended-state="0" />
<frame x="33" y="23" width="1440" height="817" extended-state="0" />
<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" />
......@@ -774,15 +774,15 @@
</entry>
<entry file="file://$PROJECT_DIR$/Public/static/js/index.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="38">
<caret line="361" column="22" lean-forward="false" selection-start-line="361" selection-start-column="22" selection-end-line="361" selection-end-column="22" />
<state relative-caret-position="380">
<caret line="377" column="32" lean-forward="true" selection-start-line="377" selection-start-column="32" selection-end-line="377" selection-end-column="32" />
<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="304">
<state relative-caret-position="355">
<caret line="243" column="0" lean-forward="true" selection-start-line="243" selection-start-column="0" selection-end-line="243" selection-end-column="0" />
<folding>
<element signature="n#style#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......
......@@ -242,7 +242,7 @@
<!--<script type="text/javascript"-->
<!--src="http://api2.izhida.cn/wechat_js_config?app_id=wx4c3c856ab83a946b&v=1.2.1&api_list=all&app_stat_key=2tzKMdJxaQREJDP7"></script>-->
<script type="text/javascript" src="__CDN__/js/index.js?t=1"></script>
<script type="text/javascript" src="__CDN__/js/index.js?t=2"></script>
<link href="__CDN__/css/notify.css" rel="stylesheet">
<script type="text/javascript" src="__CDN__/js/jquery-notify.js"></script>
......
......@@ -376,7 +376,7 @@ function mergeImage_two(url) {
ctx.drawImage(cover_three, 0, 0);
ctx.drawImage(cover_four, 63, 190);
setTimeout(function () {
$('.h-b').attr('src', tmp.toDataURL('image/jpeg', 0.6));
$('.h-b').attr('src', tmp.toDataURL('image/jpeg', 0.3));
$('.page-x-z').hide();
$('.page-s-c').show();
$('.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