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
43d9edaf
authored
Aug 30, 2019
by
zhangheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
y
parent
77f5d270
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
33 deletions
+24
-33
.idea/workspace.xml
+22
-31
Application/Home/View/default/Index_index.tpl
+1
-1
Public/static/js/index.js
+1
-1
No files found.
.idea/workspace.xml
View file @
43d9edaf
...
@@ -2,10 +2,8 @@
...
@@ -2,10 +2,8 @@
<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=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc"
afterPath=
"$PROJECT_DIR$/.sass-cache/a99bcb3812225bbee2e3b2905f436d29891f981a/main.scssc"
/>
<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$/Public/static/css/main.css"
afterPath=
"$PROJECT_DIR$/Public/static/css/main.css"
/>
<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/css/main.scss"
afterPath=
"$PROJECT_DIR$/Public/static/css/main.scss"
/>
<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"
/>
</list>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
@@ -82,11 +80,11 @@
...
@@ -82,11 +80,11 @@
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"Index_index.tpl"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<file
leaf-file-name=
"Index_index.tpl"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<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=
"
228
"
>
<state
relative-caret-position=
"
456
"
>
<caret
line=
"
137"
column=
"29"
lean-forward=
"false"
selection-start-line=
"137"
selection-start-column=
"24"
selection-end-line=
"137"
selection-end-column=
"29
"
/>
<caret
line=
"
271"
column=
"60"
lean-forward=
"false"
selection-start-line=
"271"
selection-start-column=
"60"
selection-end-line=
"271"
selection-end-column=
"60
"
/>
<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"
/>
...
@@ -164,15 +162,12 @@
...
@@ -164,15 +162,12 @@
</provider>
</provider>
</entry>
</entry>
</file>
</file>
<file
leaf-file-name=
"index.js"
pinned=
"false"
current-in-tab=
"
tru
e"
>
<file
leaf-file-name=
"index.js"
pinned=
"false"
current-in-tab=
"
fals
e"
>
<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=
"428"
>
<state
relative-caret-position=
"67"
>
<caret
line=
"386"
column=
"12"
lean-forward=
"true"
selection-start-line=
"386"
selection-start-column=
"12"
selection-end-line=
"386"
selection-end-column=
"12"
/>
<caret
line=
"365"
column=
"22"
lean-forward=
"false"
selection-start-line=
"365"
selection-start-column=
"22"
selection-end-line=
"365"
selection-end-column=
"22"
/>
<folding>
<folding
/>
<marker
date=
"1567096492000"
expanded=
"true"
signature=
"10122:11046"
ph=
"{...}"
/>
<marker
date=
"1567096492000"
expanded=
"true"
signature=
"10446:11044"
ph=
"{...}"
/>
</folding>
</state>
</state>
</provider>
</provider>
</entry>
</entry>
...
@@ -219,8 +214,8 @@
...
@@ -219,8 +214,8 @@
<find>
mergeImage_two
</find>
<find>
mergeImage_two
</find>
<find>
mix/
</find>
<find>
mix/
</find>
<find>
hasc
</find>
<find>
hasc
</find>
<find>
map-29
</find>
<find>
page-m-b
</find>
<find>
page-m-b
</find>
<find>
map-29
</find>
</findStrings>
</findStrings>
<replaceStrings>
<replaceStrings>
<replace>
m-
</replace>
<replace>
m-
</replace>
...
@@ -239,9 +234,9 @@
...
@@ -239,9 +234,9 @@
<option
value=
"$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php"
/>
<option
value=
"$PROJECT_DIR$/Application/Home/Controller/IndexController.class.php"
/>
<option
value=
"$PROJECT_DIR$/Application/User/View/default/Report_index.tpl"
/>
<option
value=
"$PROJECT_DIR$/Application/User/View/default/Report_index.tpl"
/>
<option
value=
"$PROJECT_DIR$/Application/User/Controller/ReportController.class.php"
/>
<option
value=
"$PROJECT_DIR$/Application/User/Controller/ReportController.class.php"
/>
<option
value=
"$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
/>
<option
value=
"$PROJECT_DIR$/Public/static/css/main.scss"
/>
<option
value=
"$PROJECT_DIR$/Public/static/css/main.scss"
/>
<option
value=
"$PROJECT_DIR$/Public/static/js/index.js"
/>
<option
value=
"$PROJECT_DIR$/Public/static/js/index.js"
/>
<option
value=
"$PROJECT_DIR$/Application/Home/View/default/Index_index.tpl"
/>
</list>
</list>
</option>
</option>
</component>
</component>
...
@@ -595,12 +590,12 @@
...
@@ -595,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=
"54
317
000"
/>
<workItem
from=
"1566667516612"
duration=
"54
451
000"
/>
</task>
</task>
<servers
/>
<servers
/>
</component>
</component>
<component
name=
"TimeTrackingManager"
>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"54
317
000"
/>
<option
name=
"totallyTimeSpent"
value=
"54
451
000"
/>
</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"
/>
...
@@ -788,10 +783,18 @@
...
@@ -788,10 +783,18 @@
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Public/static/js/index.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"67"
>
<caret
line=
"365"
column=
"22"
lean-forward=
"false"
selection-start-line=
"365"
selection-start-column=
"22"
selection-end-line=
"365"
selection-end-column=
"22"
/>
<folding
/>
</state>
</provider>
</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=
"
228
"
>
<state
relative-caret-position=
"
456
"
>
<caret
line=
"
137"
column=
"29"
lean-forward=
"false"
selection-start-line=
"137"
selection-start-column=
"24"
selection-end-line=
"137"
selection-end-column=
"29
"
/>
<caret
line=
"
271"
column=
"60"
lean-forward=
"false"
selection-start-line=
"271"
selection-start-column=
"60"
selection-end-line=
"271"
selection-end-column=
"60
"
/>
<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"
/>
...
@@ -848,16 +851,5 @@
...
@@ -848,16 +851,5 @@
</state>
</state>
</provider>
</provider>
</entry>
</entry>
<entry
file=
"file://$PROJECT_DIR$/Public/static/js/index.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"428"
>
<caret
line=
"386"
column=
"12"
lean-forward=
"true"
selection-start-line=
"386"
selection-start-column=
"12"
selection-end-line=
"386"
selection-end-column=
"12"
/>
<folding>
<marker
date=
"1567096492000"
expanded=
"true"
signature=
"10122:11046"
ph=
"{...}"
/>
<marker
date=
"1567096492000"
expanded=
"true"
signature=
"10446:11044"
ph=
"{...}"
/>
</folding>
</state>
</provider>
</entry>
</component>
</component>
</project>
</project>
\ No newline at end of file
Application/Home/View/default/Index_index.tpl
View file @
43d9edaf
...
@@ -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=
9
"
></script>
<script
type=
"text/javascript"
src=
"__CDN__/js/index.js?t=
10
"
></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>
...
...
Public/static/js/index.js
View file @
43d9edaf
...
@@ -363,7 +363,7 @@ function mergeImage_two(url) {
...
@@ -363,7 +363,7 @@ 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
url_three
=
'
Public/static/images/s-c.jpg
'
;
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
;
...
...
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