Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
php
/
dencare-game
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Members
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
789cacd2
authored
Aug 28, 2019
by
zhangheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
y
parent
dc9c5252
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
12 deletions
+10
-12
.idea/workspace.xml
+6
-6
Application/Home/View/default/Index_index.tpl
+1
-1
Public/static/js/index.js
+3
-5
No files found.
.idea/workspace.xml
View file @
789cacd2
...
...
@@ -164,8 +164,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=
"
448
"
>
<caret
line=
"3
81"
column=
"21"
lean-forward=
"true"
selection-start-line=
"381"
selection-start-column=
"21"
selection-end-line=
"381"
selection-end-column=
"2
1"
/>
<state
relative-caret-position=
"
87
"
>
<caret
line=
"3
66"
column=
"41"
lean-forward=
"false"
selection-start-line=
"366"
selection-start-column=
"41"
selection-end-line=
"366"
selection-end-column=
"4
1"
/>
<folding
/>
</state>
</provider>
...
...
@@ -587,12 +587,12 @@
<option
name=
"number"
value=
"Default"
/>
<option
name=
"presentableId"
value=
"Default"
/>
<updated>
1566667513502
</updated>
<workItem
from=
"1566667516612"
duration=
"49
490
000"
/>
<workItem
from=
"1566667516612"
duration=
"49
551
000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"49
490
000"
/>
<option
name=
"totallyTimeSpent"
value=
"49
551
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"33"
y=
"23"
width=
"1440"
height=
"817"
extended-state=
"0"
/>
...
...
@@ -774,8 +774,8 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/Public/static/js/index.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
448
"
>
<caret
line=
"3
81"
column=
"21"
lean-forward=
"true"
selection-start-line=
"381"
selection-start-column=
"21"
selection-end-line=
"381"
selection-end-column=
"2
1"
/>
<state
relative-caret-position=
"
87
"
>
<caret
line=
"3
66"
column=
"41"
lean-forward=
"false"
selection-start-line=
"366"
selection-start-column=
"41"
selection-end-line=
"366"
selection-end-column=
"4
1"
/>
<folding
/>
</state>
</provider>
...
...
Application/Home/View/default/Index_index.tpl
View file @
789cacd2
...
...
@@ -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=
5
"
></script>
<script
type=
"text/javascript"
src=
"__CDN__/js/index.js?t=
7
"
></script>
<link
href=
"__CDN__/css/notify.css"
rel=
"stylesheet"
>
<script
type=
"text/javascript"
src=
"__CDN__/js/jquery-notify.js"
></script>
...
...
Public/static/js/index.js
View file @
789cacd2
...
...
@@ -363,8 +363,8 @@ function mergeImage_two(url) {
var
url_two_t
=
url
;
cover_four
.
src
=
url_two_t
;
cover_three
.
src
=
url_three
;
cover_three
.
onload
=
function
()
{
//
cover_four.onload = function () {
//
cover_three.onload = function () {
cover_four
.
onload
=
function
()
{
var
tmp
=
$
(
'<canvas></canvas>'
)[
0
];
tmp
.
width
=
640
;
...
...
@@ -380,9 +380,7 @@ function mergeImage_two(url) {
$
(
'.page-s-c'
).
show
();
$
(
'.page_checking'
).
hide
()
},
6000
);
// }
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment