Commit c1b20af4 by zhangheng

y

parent 8bf744e8
...@@ -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="304"> <state relative-caret-position="190">
<caret line="281" column="37" lean-forward="true" selection-start-line="281" selection-start-column="37" selection-end-line="281" selection-end-column="37" /> <caret line="275" column="8" lean-forward="true" selection-start-line="275" selection-start-column="8" selection-end-line="275" selection-end-column="8" />
<folding> <folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
...@@ -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="266"> <state relative-caret-position="152">
<caret line="378" column="9" lean-forward="false" selection-start-line="378" selection-start-column="9" selection-end-line="378" selection-end-column="9" /> <caret line="368" column="0" lean-forward="true" selection-start-line="368" selection-start-column="0" selection-end-line="368" selection-end-column="0" />
<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="54787000" /> <workItem from="1566667516612" duration="54989000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="54787000" /> <option name="totallyTimeSpent" value="54989000" />
</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,16 +785,16 @@ ...@@ -785,16 +785,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="266"> <state relative-caret-position="152">
<caret line="378" column="9" lean-forward="false" selection-start-line="378" selection-start-column="9" selection-end-line="378" selection-end-column="9" /> <caret line="368" column="0" lean-forward="true" selection-start-line="368" selection-start-column="0" selection-end-line="368" 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="304"> <state relative-caret-position="190">
<caret line="281" column="37" lean-forward="true" selection-start-line="281" selection-start-column="37" selection-end-line="281" selection-end-column="37" /> <caret line="275" column="8" lean-forward="true" selection-start-line="275" selection-start-column="8" selection-end-line="275" selection-end-column="8" />
<folding> <folding>
<element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#0;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" /> <element signature="n#style#0;n#div#1;n#div#0;n#div#0;n#body#0;n#html#0;n#!!top" expanded="true" />
......
...@@ -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=11"></script> <script type="text/javascript" src="__CDN__/js/index.js?t=12"></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>
......
...@@ -365,16 +365,16 @@ function mergeImage_two(url) { ...@@ -365,16 +365,16 @@ function mergeImage_two(url) {
var cover = new Image(); var cover = new Image();
var cover_three = new Image(); var cover_three = new Image();
var cover_four = new Image(); var cover_four = new Image();
var ceshi; var ceshi=new Image();;
var url_three = '/Public/static/images/s-c.jpg?t=1'; var url_three = '/Public/static/images/s-c.jpg?t=1';
var url_two_t = url; var url_two_t = url;
cover_four.src = url_two_t; cover_four.src = url_two_t;
cover_three.src = url_three; cover_three.src = url_three;
if(isAndroid){ if(isAndroid){
ceshi='/Public/static/images/s-c.jpg?t=1'; ceshi.src='/Public/static/images/s-c.jpg?t=1';
}else { }else {
ceshi = url; ceshi.src= url;
} }
ceshi.onload = function () { ceshi.onload = function () {
// cover_four.onload = function () { // cover_four.onload = 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