Commit 93e7cb64 by zhangheng

2

parent df7a59db
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
<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="DELETED" beforePath="$PROJECT_DIR$/Public/static/images/cehi.jpg" afterPath="" />
<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$/Application/Home/View/default/Index_index.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" /> <change type="MODIFICATION" beforePath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" afterPath="$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl" />
<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" />
...@@ -113,8 +114,8 @@ ...@@ -113,8 +114,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="114"> <state relative-caret-position="190">
<caret line="378" column="20" lean-forward="true" selection-start-line="378" selection-start-column="20" selection-end-line="378" selection-end-column="20" /> <caret line="370" column="24" lean-forward="true" selection-start-line="370" selection-start-column="24" selection-end-line="370" selection-end-column="24" />
<folding /> <folding />
</state> </state>
</provider> </provider>
...@@ -544,12 +545,12 @@ ...@@ -544,12 +545,12 @@
<option name="presentableId" value="Default" /> <option name="presentableId" value="Default" />
<updated>1566667513502</updated> <updated>1566667513502</updated>
<workItem from="1566667516612" duration="55749000" /> <workItem from="1566667516612" duration="55749000" />
<workItem from="1567098016695" duration="30000" /> <workItem from="1567098016695" duration="129000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="55779000" /> <option name="totallyTimeSpent" value="55878000" />
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="0" y="23" width="1440" height="817" extended-state="6" /> <frame x="0" y="23" width="1440" height="817" extended-state="6" />
...@@ -827,8 +828,8 @@ ...@@ -827,8 +828,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="114"> <state relative-caret-position="190">
<caret line="378" column="20" lean-forward="true" selection-start-line="378" selection-start-column="20" selection-end-line="378" selection-end-column="20" /> <caret line="370" column="24" lean-forward="true" selection-start-line="370" selection-start-column="24" selection-end-line="370" selection-end-column="24" />
<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=18"></script> <script type="text/javascript" src="__CDN__/js/index.js?t=19"></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>
......
...@@ -367,7 +367,7 @@ function mergeImage_two(url) { ...@@ -367,7 +367,7 @@ function mergeImage_two(url) {
var cover_four = new Image(); var cover_four = new Image();
var ceshi=new Image();; var ceshi=new Image();;
var url_three = '/Public/static/images/ceshi.jpg?t=1'; var url_three = '/Public/static/images/h-b.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;
......
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