切换导航条
此项目
正在载入...
登录
郭盛
/
micro
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
47fecaf6b477d15554448318953ec4945d3eae87
1 个父辈
93a082c6
1 个管道 的构建
通过
耗费 1 秒
修改
变更
4
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
67 行增加
和
82 行删除
.idea/workspace.xml
application/index/view/home/good.html
application/index/view/home/honor.html
application/index/view/home/infolist.html
.idea/workspace.xml
查看文件 @
47fecaf
...
...
@@ -52,7 +52,9 @@
<change
type=
"DELETED"
beforePath=
"$PROJECT_DIR$/runtime/temp/e5363a65b1737248258053ea572c6cec.php"
afterPath=
""
/>
<change
type=
"DELETED"
beforePath=
"$PROJECT_DIR$/runtime/temp/eb1de82eae981681221c31b3fb35f19b.php"
afterPath=
""
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/.idea/workspace.xml"
afterPath=
"$PROJECT_DIR$/.idea/workspace.xml"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/index/view/home/index.html"
afterPath=
"$PROJECT_DIR$/application/index/view/home/index.html"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/index/view/home/good.html"
afterPath=
"$PROJECT_DIR$/application/index/view/home/good.html"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/index/view/home/honor.html"
afterPath=
"$PROJECT_DIR$/application/index/view/home/honor.html"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/index/view/home/infolist.html"
afterPath=
"$PROJECT_DIR$/application/index/view/home/infolist.html"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/runtime/temp/f7f57faf5d244a1c8676e019bce2cb24.php"
afterPath=
"$PROJECT_DIR$/runtime/temp/f7f57faf5d244a1c8676e019bce2cb24.php"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
...
...
@@ -67,7 +69,7 @@
<file
leaf-file-name=
"Home.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/application/index/controller/Home.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
288
"
>
<state
relative-caret-position=
"
0
"
>
<caret
line=
"60"
column=
"0"
lean-forward=
"false"
selection-start-line=
"60"
selection-start-column=
"0"
selection-end-line=
"60"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#1708#2006#0#PHP"
expanded=
"false"
/>
...
...
@@ -79,22 +81,12 @@
</provider>
</entry>
</file>
<file
leaf-file-name=
"index.html"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/application/index/view/home/index.html"
>
<file
leaf-file-name=
"infolist.html"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/application/index/view/home/infolist.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"50"
>
<caret
line=
"243"
column=
"26"
lean-forward=
"false"
selection-start-line=
"243"
selection-start-column=
"26"
selection-end-line=
"243"
selection-end-column=
"26"
/>
<folding>
<element
signature=
"n#div#0;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"false"
/>
<element
signature=
"n#div#1;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"false"
/>
<element
signature=
"n#div#3;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"false"
/>
<element
signature=
"n#div#4;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"false"
/>
<element
signature=
"n#div#1;n#div#0;n#div#4;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"false"
/>
<element
signature=
"e#8970#9099#0"
expanded=
"false"
/>
<element
signature=
"e#9628#9662#0"
expanded=
"false"
/>
<element
signature=
"e#9721#9769#0"
expanded=
"false"
/>
<element
signature=
"e#9829#9878#0"
expanded=
"false"
/>
</folding>
<state
relative-caret-position=
"425"
>
<caret
line=
"20"
column=
"10"
lean-forward=
"false"
selection-start-line=
"20"
selection-start-column=
"10"
selection-end-line=
"20"
selection-end-column=
"10"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -102,8 +94,8 @@
<file
leaf-file-name=
"Serve.php"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/application/index/controller/Serve.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"125"
>
<caret
line=
"48"
column=
"3"
lean-forward=
"true"
selection-start-line=
"48"
selection-start-column=
"3"
selection-end-line=
"70"
selection-end-column=
"5"
/>
<state
relative-caret-position=
"1025"
>
<caret
line=
"48"
column=
"3"
lean-forward=
"false"
selection-start-line=
"48"
selection-start-column=
"3"
selection-end-line=
"70"
selection-end-column=
"5"
/>
<folding>
<element
signature=
"e#4940#5873#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5878#6813#0#PHP"
expanded=
"false"
/>
...
...
@@ -118,7 +110,7 @@
<file
leaf-file-name=
"index.html"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/application/index/view/serve/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
925
"
>
<state
relative-caret-position=
"
1600
"
>
<caret
line=
"64"
column=
"10"
lean-forward=
"true"
selection-start-line=
"64"
selection-start-column=
"10"
selection-end-line=
"64"
selection-end-column=
"10"
/>
<folding
/>
</state>
...
...
@@ -176,15 +168,12 @@
<option
value=
"$PROJECT_DIR$/application/index/view/serve/schoollist.html"
/>
<option
value=
"$PROJECT_DIR$/application/index/view/serve/select.html"
/>
<option
value=
"$PROJECT_DIR$/application/index/view/home/desc.html"
/>
<option
value=
"$PROJECT_DIR$/application/index/view/home/honor.html"
/>
<option
value=
"$PROJECT_DIR$/application/index/view/home/infodetail.html"
/>
<option
value=
"$PROJECT_DIR$/application/index/view/home/infolist.html"
/>
<option
value=
"$PROJECT_DIR$/application/index/view/serve/index.html"
/>
<option
value=
"$PROJECT_DIR$/application/admin/lang/zh-cn/good.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/good/add.html"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/good/edit.html"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/good.js"
/>
<option
value=
"$PROJECT_DIR$/application/index/view/home/good.html"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/information.js"
/>
<option
value=
"$PROJECT_DIR$/application/admin/lang/zh-cn/news.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/news/add.html"
/>
...
...
@@ -199,6 +188,9 @@
<option
value=
"$PROJECT_DIR$/application/index/controller/Serve.php"
/>
<option
value=
"$PROJECT_DIR$/application/index/controller/Home.php"
/>
<option
value=
"$PROJECT_DIR$/application/index/view/home/index.html"
/>
<option
value=
"$PROJECT_DIR$/application/index/view/home/honor.html"
/>
<option
value=
"$PROJECT_DIR$/application/index/view/home/good.html"
/>
<option
value=
"$PROJECT_DIR$/application/index/view/home/infolist.html"
/>
</list>
</option>
</component>
...
...
@@ -216,9 +208,9 @@
<sorting>
DEFINITION_ORDER
</sorting>
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
>
<option
name=
"x"
value=
"316"
/>
<option
name=
"y"
value=
"143"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"328"
/>
<option
name=
"y"
value=
"69"
/>
<option
name=
"width"
value=
"1428"
/>
<option
name=
"height"
value=
"1000"
/>
</component>
...
...
@@ -278,14 +270,6 @@
<item
name=
"view"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"home"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"micro"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"micro"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"index"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"view"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"serve"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
<select
/>
</subPane>
...
...
@@ -361,19 +345,20 @@
<workItem
from=
"1576892177034"
duration=
"1122000"
/>
<workItem
from=
"1577338667713"
duration=
"105000"
/>
<workItem
from=
"1577339099002"
duration=
"252000"
/>
<workItem
from=
"1577438308296"
duration=
"8586000"
/>
<workItem
from=
"1577438308296"
duration=
"8662000"
/>
<workItem
from=
"1577447609680"
duration=
"153000"
/>
</task>
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"107
666
000"
/>
<option
name=
"totallyTimeSpent"
value=
"107
895
000"
/>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"3
16"
y=
"143"
width=
"1428"
height=
"1000"
extended-state=
"0
"
/>
<frame
x=
"3
28"
y=
"69"
width=
"1428"
height=
"1000"
extended-state=
"1
"
/>
<editor
active=
"true"
/>
<layout>
<window_info
id=
"Remote Host"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.32967836"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.20
614035
"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.20
906433
"
sideWeight=
"0.5"
order=
"0"
side_tool=
"false"
content_ui=
"combo"
/>
<window_info
id=
"TODO"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Event Log"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.3297062"
sideWeight=
"0.5"
order=
"7"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Database"
active=
"false"
anchor=
"right"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"3"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -481,13 +466,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/index/view/home/infolist.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"175"
>
<caret
line=
"7"
column=
"15"
lean-forward=
"false"
selection-start-line=
"7"
selection-start-column=
"15"
selection-end-line=
"7"
selection-end-column=
"15"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/lang/zh-cn/good.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"125"
>
...
...
@@ -530,13 +508,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/index/view/home/good.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"718"
>
<caret
line=
"88"
column=
"55"
lean-forward=
"true"
selection-start-line=
"88"
selection-start-column=
"55"
selection-end-line=
"88"
selection-end-column=
"55"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/assets/js/backend/famous.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"225"
>
...
...
@@ -544,13 +515,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/index/view/home/honor.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1100"
>
<caret
line=
"101"
column=
"43"
lean-forward=
"true"
selection-start-line=
"101"
selection-start-column=
"43"
selection-end-line=
"101"
selection-end-column=
"43"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/index/controller/Index.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
...
...
@@ -737,7 +701,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"25"
>
<caret
line=
"1"
column=
"0"
lean-forward=
"true"
selection-start-line=
"1"
selection-start-column=
"0"
selection-end-line=
"1"
selection-end-column=
"0"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -745,7 +708,6 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"350"
>
<caret
line=
"14"
column=
"14"
lean-forward=
"false"
selection-start-line=
"14"
selection-start-column=
"14"
selection-end-line=
"14"
selection-end-column=
"14"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -753,27 +715,13 @@
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"271"
>
<caret
line=
"54"
column=
"17"
lean-forward=
"false"
selection-start-line=
"54"
selection-start-column=
"17"
selection-end-line=
"54"
selection-end-column=
"17"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/index/controller/Home.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"288"
>
<caret
line=
"60"
column=
"0"
lean-forward=
"false"
selection-start-line=
"60"
selection-start-column=
"0"
selection-end-line=
"60"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#1708#2006#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2026#2487#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2504#2742#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2759#3090#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/index/controller/Serve.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"125"
>
<caret
line=
"48"
column=
"3"
lean-forward=
"true"
selection-start-line=
"48"
selection-start-column=
"3"
selection-end-line=
"70"
selection-end-column=
"5"
/>
<state
relative-caret-position=
"1025"
>
<caret
line=
"48"
column=
"3"
lean-forward=
"false"
selection-start-line=
"48"
selection-start-column=
"3"
selection-end-line=
"70"
selection-end-column=
"5"
/>
<folding>
<element
signature=
"e#4940#5873#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5878#6813#0#PHP"
expanded=
"false"
/>
...
...
@@ -786,15 +734,31 @@
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/index/view/serve/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
925
"
>
<state
relative-caret-position=
"
1600
"
>
<caret
line=
"64"
column=
"10"
lean-forward=
"true"
selection-start-line=
"64"
selection-start-column=
"10"
selection-end-line=
"64"
selection-end-column=
"10"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/index/view/home/honor.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"375"
>
<caret
line=
"18"
column=
"13"
lean-forward=
"true"
selection-start-line=
"18"
selection-start-column=
"13"
selection-end-line=
"18"
selection-end-column=
"13"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/index/view/home/good.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"293"
>
<caret
line=
"26"
column=
"12"
lean-forward=
"false"
selection-start-line=
"26"
selection-start-column=
"12"
selection-end-line=
"26"
selection-end-column=
"12"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/index/view/home/index.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"
50
"
>
<state
relative-caret-position=
"
1625
"
>
<caret
line=
"243"
column=
"26"
lean-forward=
"false"
selection-start-line=
"243"
selection-start-column=
"26"
selection-end-line=
"243"
selection-end-column=
"26"
/>
<folding>
<element
signature=
"n#div#0;n#div#0;n#body#0;n#html#0;n#!!top"
expanded=
"false"
/>
...
...
@@ -810,5 +774,26 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/index/controller/Home.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"0"
>
<caret
line=
"60"
column=
"0"
lean-forward=
"false"
selection-start-line=
"60"
selection-start-column=
"0"
selection-end-line=
"60"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#1708#2006#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2026#2487#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2504#2742#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2759#3090#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/index/view/home/infolist.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"425"
>
<caret
line=
"20"
column=
"10"
lean-forward=
"false"
selection-start-line=
"20"
selection-start-column=
"10"
selection-end-line=
"20"
selection-end-column=
"10"
/>
<folding
/>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
...
...
application/index/view/home/good.html
查看文件 @
47fecaf
...
...
@@ -24,7 +24,7 @@
<div
class=
"left_arrow"
>
<img
src=
"/assets/index/img/left_arrow.png"
alt=
""
>
</div>
园区
优势
园区
环境
</div>
...
...
application/index/view/home/honor.html
查看文件 @
47fecaf
...
...
@@ -23,7 +23,7 @@
<div
class=
"left_arrow"
>
<img
src=
"/assets/index/img/left_arrow.png"
alt=
""
>
</div>
园区
荣誉
园区
配套
</div>
<div
class=
"park_profile"
>
<div
class=
"bg_pic"
>
...
...
application/index/view/home/infolist.html
查看文件 @
47fecaf
...
...
@@ -18,7 +18,7 @@
<div
class=
"left_arrow"
>
<img
src=
"/assets/index/img/left_arrow.png"
alt=
""
>
</div>
新闻
资讯
园区
资讯
</div>
<!-- 新闻资讯 -->
<div
class=
"news_infor_wrap"
>
...
...
请
注册
或
登录
后发表评论