切换导航条
此项目
正在载入...
登录
郭盛
/
areial
·
提交
转到一个项目
GitLab
转到仪表盘
项目
活动
文件
提交
管道
0
构建
0
图表
里程碑
问题
0
合并请求
0
成员
标记
维基
派生
网络
创建新的问题
下载为
邮件补丁
差异文件
浏览文件
作者
郭盛
5 years ago
提交
3ae1ab608ff516a96675bda3be00cf13f6c4182e
1 个父辈
7a1e9154
1 个管道 的构建
通过
耗费 8 秒
修改后台图片管理的逻辑
变更
6
构建
1
隐藏空白字符变更
内嵌
并排对比
正在显示
6 个修改的文件
包含
133 行增加
和
169 行删除
.idea/workspace.xml
application/admin/controller/Pic.php
application/admin/lang/zh-cn/pic.php
application/admin/view/pic/add.html
application/admin/view/pic/edit.html
public/assets/js/backend/pic.js
.idea/workspace.xml
查看文件 @
3ae1ab6
...
...
@@ -5,7 +5,11 @@
</component>
<component
name=
"ChangeListManager"
>
<list
default=
"true"
id=
"e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef"
name=
"Default"
comment=
""
>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/api/controller/User.php"
afterPath=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/admin/controller/Pic.php"
afterPath=
"$PROJECT_DIR$/application/admin/controller/Pic.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php"
afterPath=
"$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/admin/view/pic/add.html"
afterPath=
"$PROJECT_DIR$/application/admin/view/pic/add.html"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/application/admin/view/pic/edit.html"
afterPath=
"$PROJECT_DIR$/application/admin/view/pic/edit.html"
/>
<change
type=
"MODIFICATION"
beforePath=
"$PROJECT_DIR$/public/assets/js/backend/pic.js"
afterPath=
"$PROJECT_DIR$/public/assets/js/backend/pic.js"
/>
</list>
<option
name=
"EXCLUDED_CONVERTED_TO_IGNORED"
value=
"true"
/>
<option
name=
"TRACKING_ENABLED"
value=
"true"
/>
...
...
@@ -16,92 +20,22 @@
</component>
<component
name=
"FileEditorManager"
>
<leaf
SIDE_TABS_SIZE_LIMIT_KEY=
"300"
>
<file
leaf-file-name=
"User.php"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/User.php"
>
<file
leaf-file-name=
"add.html"
pinned=
"false"
current-in-tab=
"false"
>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/pic/add.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"544"
>
<caret
line=
"285"
column=
"0"
lean-forward=
"false"
selection-start-line=
"285"
selection-start-column=
"0"
selection-end-line=
"285"
selection-end-column=
"0"
/>
<folding>
<element
signature=
"e#535#1273#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#1278#2941#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#2947#3309#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3314#3604#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3610#3932#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#3937#4224#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4231#4665#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#4670#5028#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5034#5441#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5446#5789#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#5795#6208#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6213#6530#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#6536#7634#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8426#8733#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#8796#9078#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#9142#9412#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#10432#11112#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11117#11975#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#11981#12770#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#12775#14124#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14130#14832#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#14837#16157#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16163#16739#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#16744#17356#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#17362#18078#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#18083#21715#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#21721#22651#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#22656#26706#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#26712#27089#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27094#27533#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#27539#28274#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#28279#29951#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#29957#30462#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30467#30718#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#30724#31203#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31208#31965#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#31971#32452#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#32457#33227#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33233#33596#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33601#33792#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#33798#34156#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34161#34352#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#34358#35501#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#35506#38171#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38177#38675#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#38680#40426#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40432#40845#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#40850#41329#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41335#41869#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#41874#43259#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43265#43919#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#43924#45939#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#45945#46705#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#46710#49419#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#49445#50276#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#50282#50702#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#50707#51190#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#51196#52002#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#52007#55165#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#53800#55159#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#55180#56515#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#55296#55698#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#56531#57565#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#57571#58329#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#58334#62077#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#62083#62475#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#62480#63432#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#63456#64029#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#64035#64634#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#64639#65566#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#65572#66286#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66292#66719#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#66724#67193#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#67200#68405#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#68410#70113#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#70119#70896#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#70901#74839#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#74845#75354#0#PHP"
expanded=
"false"
/>
<element
signature=
"e#75359#76031#0#PHP"
expanded=
"false"
/>
</folding>
<state
relative-caret-position=
"225"
>
<caret
line=
"87"
column=
"14"
lean-forward=
"true"
selection-start-line=
"87"
selection-start-column=
"14"
selection-end-line=
"87"
selection-end-column=
"14"
/>
<folding
/>
</state>
</provider>
</entry>
</file>
<file
leaf-file-name=
"edit.html"
pinned=
"false"
current-in-tab=
"true"
>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/pic/edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"405"
>
<caret
line=
"95"
column=
"35"
lean-forward=
"true"
selection-start-line=
"95"
selection-start-column=
"35"
selection-end-line=
"95"
selection-end-column=
"35"
/>
<folding
/>
</state>
</provider>
</entry>
...
...
@@ -182,14 +116,14 @@
<option
value=
"$PROJECT_DIR$/application/api/controller/Notify.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/controller/Video.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/video/add.html"
/>
<option
value=
"$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/pic/edit.html"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/pic/add.html"
/>
<option
value=
"$PROJECT_DIR$/application/admin/controller/Pic.php"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/pic.js"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/a.php"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/Pay.php"
/>
<option
value=
"$PROJECT_DIR$/application/api/controller/User.php"
/>
<option
value=
"$PROJECT_DIR$/public/assets/js/backend/pic.js"
/>
<option
value=
"$PROJECT_DIR$/application/admin/controller/Pic.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/pic/add.html"
/>
<option
value=
"$PROJECT_DIR$/application/admin/view/pic/edit.html"
/>
</list>
</option>
</component>
...
...
@@ -208,8 +142,8 @@
</component>
<component
name=
"PhpWorkspaceProjectConfiguration"
backward_compatibility_performed=
"true"
/>
<component
name=
"ProjectFrameBounds"
extendedState=
"1"
>
<option
name=
"x"
value=
"212"
/>
<option
name=
"y"
value=
"117"
/>
<option
name=
"x"
value=
"168"
/>
<option
name=
"y"
value=
"77"
/>
<option
name=
"width"
value=
"1652"
/>
<option
name=
"height"
value=
"917"
/>
</component>
...
...
@@ -246,14 +180,22 @@
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"view"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
<path>
<item
name=
"areial"
type=
"b2602c69:ProjectViewProjectNode"
/>
<item
name=
"areial"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"application"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"api"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"controller"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"admin"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"view"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
<item
name=
"pic"
type=
"2a2b976b:PhpTreeStructureProvider$1"
/>
</path>
</expand>
<select
/>
...
...
@@ -398,7 +340,7 @@
<workItem
from=
"1583799928944"
duration=
"18981000"
/>
<workItem
from=
"1583826020973"
duration=
"10927000"
/>
<workItem
from=
"1583848752159"
duration=
"3638000"
/>
<workItem
from=
"1583886688361"
duration=
"1
0730
000"
/>
<workItem
from=
"1583886688361"
duration=
"1
3699
000"
/>
</task>
<task
id=
"LOCAL-00001"
summary=
"调试"
>
<created>
1574145133364
</created>
...
...
@@ -425,7 +367,7 @@
<servers
/>
</component>
<component
name=
"TimeTrackingManager"
>
<option
name=
"totallyTimeSpent"
value=
"6
07869
000"
/>
<option
name=
"totallyTimeSpent"
value=
"6
10838
000"
/>
</component>
<component
name=
"TodoView"
>
<todo-panel
id=
"selected-file"
>
...
...
@@ -437,7 +379,8 @@
</todo-panel>
</component>
<component
name=
"ToolWindowManager"
>
<frame
x=
"212"
y=
"117"
width=
"1652"
height=
"917"
extended-state=
"1"
/>
<frame
x=
"168"
y=
"77"
width=
"1652"
height=
"917"
extended-state=
"1"
/>
<editor
active=
"true"
/>
<layout>
<window_info
id=
"Project"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"true"
show_stripe_button=
"true"
weight=
"0.16520101"
sideWeight=
"0.5"
order=
"1"
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.32912987"
sideWeight=
"0.5"
order=
"9"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -446,7 +389,7 @@
<window_info
id=
"Version Control"
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=
"1"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Run"
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=
"5"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Structure"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"
true"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"tru
e"
show_stripe_button=
"true"
weight=
"0.46666667"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Terminal"
active=
"
false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"fals
e"
show_stripe_button=
"true"
weight=
"0.46666667"
sideWeight=
"0.5"
order=
"2"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Favorites"
active=
"false"
anchor=
"left"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.33"
sideWeight=
"0.5"
order=
"0"
side_tool=
"true"
content_ui=
"tabs"
/>
<window_info
id=
"Debug"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.4"
sideWeight=
"0.5"
order=
"6"
side_tool=
"false"
content_ui=
"tabs"
/>
<window_info
id=
"Cvs"
active=
"false"
anchor=
"bottom"
auto_hide=
"false"
internal_type=
"DOCKED"
type=
"DOCKED"
visible=
"false"
show_stripe_button=
"true"
weight=
"0.25"
sideWeight=
"0.5"
order=
"7"
side_tool=
"false"
content_ui=
"tabs"
/>
...
...
@@ -775,14 +718,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/video/add.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"177"
>
<caret
line=
"18"
column=
"10"
lean-forward=
"true"
selection-start-line=
"18"
selection-start-column=
"10"
selection-end-line=
"18"
selection-end-column=
"10"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"275"
>
...
...
@@ -790,62 +725,6 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/assets/js/backend/video.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"289"
>
<caret
line=
"31"
column=
"24"
lean-forward=
"true"
selection-start-line=
"31"
selection-start-column=
"24"
selection-end-line=
"32"
selection-end-column=
"111"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/video/edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"125"
>
<caret
line=
"14"
column=
"79"
lean-forward=
"true"
selection-start-line=
"14"
selection-start-column=
"79"
selection-end-line=
"14"
selection-end-column=
"79"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"225"
>
<caret
line=
"9"
column=
"30"
lean-forward=
"false"
selection-start-line=
"9"
selection-start-column=
"30"
selection-end-line=
"9"
selection-end-column=
"30"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/controller/Video.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"146"
>
<caret
line=
"211"
column=
"9"
lean-forward=
"true"
selection-start-line=
"211"
selection-start-column=
"9"
selection-end-line=
"211"
selection-end-column=
"9"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/assets/js/backend/pic.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"225"
>
<caret
line=
"33"
column=
"79"
lean-forward=
"true"
selection-start-line=
"33"
selection-start-column=
"79"
selection-end-line=
"33"
selection-end-column=
"79"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/pic/edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"175"
>
<caret
line=
"82"
column=
"10"
lean-forward=
"false"
selection-start-line=
"82"
selection-start-column=
"10"
selection-end-line=
"82"
selection-end-column=
"10"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/pic/add.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"250"
>
<caret
line=
"82"
column=
"10"
lean-forward=
"false"
selection-start-line=
"82"
selection-start-column=
"10"
selection-end-line=
"82"
selection-end-column=
"10"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/controller/Pic.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"1366"
>
<caret
line=
"175"
column=
"39"
lean-forward=
"true"
selection-start-line=
"175"
selection-start-column=
"39"
selection-end-line=
"175"
selection-end-column=
"39"
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/api/controller/a.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"-1125"
>
...
...
@@ -968,5 +847,79 @@
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/assets/js/backend/pic.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"525"
>
<caret
line=
"39"
column=
"148"
lean-forward=
"false"
selection-start-line=
"39"
selection-start-column=
"148"
selection-end-line=
"39"
selection-end-column=
"148"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/public/assets/js/backend/video.js"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"364"
>
<caret
line=
"46"
column=
"83"
lean-forward=
"true"
selection-start-line=
"46"
selection-start-column=
"83"
selection-end-line=
"46"
selection-end-column=
"83"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/video/add.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"375"
>
<caret
line=
"120"
column=
"4"
lean-forward=
"false"
selection-start-line=
"120"
selection-start-column=
"4"
selection-end-line=
"125"
selection-end-column=
"10"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/video/edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"241"
>
<caret
line=
"119"
column=
"4"
lean-forward=
"true"
selection-start-line=
"119"
selection-start-column=
"4"
selection-end-line=
"124"
selection-end-column=
"10"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/controller/Video.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"221"
>
<caret
line=
"136"
column=
"40"
lean-forward=
"true"
selection-start-line=
"136"
selection-start-column=
"40"
selection-end-line=
"136"
selection-end-column=
"40"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/controller/Pic.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"129"
>
<caret
line=
"227"
column=
"35"
lean-forward=
"true"
selection-start-line=
"227"
selection-start-column=
"35"
selection-end-line=
"227"
selection-end-column=
"35"
/>
<folding>
<element
signature=
"e#2424#5390#0#PHP"
expanded=
"false"
/>
</folding>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"150"
>
<caret
line=
"6"
column=
"26"
lean-forward=
"true"
selection-start-line=
"6"
selection-start-column=
"26"
selection-end-line=
"6"
selection-end-column=
"26"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/pic/add.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"225"
>
<caret
line=
"87"
column=
"14"
lean-forward=
"true"
selection-start-line=
"87"
selection-start-column=
"14"
selection-end-line=
"87"
selection-end-column=
"14"
/>
<folding
/>
</state>
</provider>
</entry>
<entry
file=
"file://$PROJECT_DIR$/application/admin/view/pic/edit.html"
>
<provider
selected=
"true"
editor-type-id=
"text-editor"
>
<state
relative-caret-position=
"405"
>
<caret
line=
"95"
column=
"35"
lean-forward=
"true"
selection-start-line=
"95"
selection-start-column=
"35"
selection-end-line=
"95"
selection-end-column=
"35"
/>
<folding
/>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
...
...
application/admin/controller/Pic.php
查看文件 @
3ae1ab6
...
...
@@ -92,7 +92,6 @@ class Pic extends Backend
$params
[
'code'
]
=
''
;
}
//如果内容关键字和地名关键字都为空
if
(
$params
[
'text_ids'
]
==
''
&&
$params
[
'address_ids'
]
==
''
){
$this
->
error
(
'请选择关键字标签'
);
...
...
application/admin/lang/zh-cn/pic.php
查看文件 @
3ae1ab6
...
...
@@ -5,7 +5,7 @@ return [
'Is_show'
=>
'权重'
,
'Is_top'
=>
'是否置顶'
,
'Number'
=>
'编号'
,
'Keyword'
=>
'关键词
(多个关键词中间用逗号隔开)
'
,
'Keyword'
=>
'关键词'
,
'text_ids'
=>
'内容关键字标签'
,
'Address_ids'
=>
'地名关键字标签'
,
'Thumbnail'
=>
'缩略图'
,
...
...
application/admin/view/pic/add.html
查看文件 @
3ae1ab6
...
...
@@ -84,7 +84,7 @@
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Price')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
<input
id=
"c-price"
data-rule=
"required"
class=
"form-control"
name=
"row[price]"
type=
"text"
placeholder=
"请输入普通价格"
>
{:build_radios('row[price]', ['800'=>__('800'), '1500'=>__('1200'),'3000'=>__('3000')])}
</div>
</div>
<div
class=
"form-group"
>
...
...
@@ -93,6 +93,12 @@
<textarea
id=
"c-content"
data-rule=
"required"
class=
"form-control editor"
rows=
"5"
name=
"row[content]"
cols=
"50"
></textarea>
</div>
</div>
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('图片介绍')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--{:build_radios('row[content]', ['比较珍贵的奇观天气精品'=>'比较珍贵的奇观天气精品', '地拍相机拍摄的高品质延时素材'=>'地拍相机拍摄的高品质延时素材','升格超级慢动作精品素材'=>'升格超级慢动作精品素材','X7无人机拍摄的高品质航拍素材'=>'X7无人机拍摄的高品质航拍素材','MAIVC 2无人机拍摄的高品质航拍延时素材'=>'MAIVC 2无人机拍摄的高品质航拍延时素材'])}-->
<!--</div>-->
<!--</div>-->
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Is_top')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
...
...
application/admin/view/pic/edit.html
查看文件 @
3ae1ab6
...
...
@@ -84,7 +84,7 @@
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Price')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
<input
id=
"c-price"
data-rule=
"required"
class=
"form-control"
name=
"row[price]"
type=
"text"
value=
"{$row.price}"
placeholder=
"请输入普通价格"
>
{:build_radios('row[price]', ['800'=>__('800'), '1500'=>__('1500'),'3000'=>__('3000元')],$row['price'])}
</div>
</div>
<div
class=
"form-group"
>
...
...
@@ -93,6 +93,12 @@
<textarea
id=
"c-content"
data-rule=
"required"
class=
"form-control editor"
name=
"row[content]"
placeholder=
"请输入图片介绍"
>
{$row.content}
</textarea>
</div>
</div>
<!--<div class="form-group">-->
<!--<label class="control-label col-xs-12 col-sm-2">{:__('图片介绍')}:</label>-->
<!--<div class="col-xs-12 col-sm-8">-->
<!--{:build_radios('row[content]', ['比较珍贵的奇观天气精品'=>'比较珍贵的奇观天气精品', '地拍相机拍摄的高品质延时素材'=>'地拍相机拍摄的高品质延时素材','升格超级慢动作精品素材'=>'升格超级慢动作精品素材','X7无人机拍摄的高品质航拍素材'=>'X7无人机拍摄的高品质航拍素材','MAIVC 2无人机拍摄的高品质航拍延时素材'=>'MAIVC 2无人机拍摄的高品质航拍延时素材'],$row['content'])}-->
<!--</div>-->
<!--</div>-->
<div
class=
"form-group"
>
<label
class=
"control-label col-xs-12 col-sm-2"
>
{:__('Is_top')}:
</label>
<div
class=
"col-xs-12 col-sm-8"
>
...
...
public/assets/js/backend/pic.js
查看文件 @
3ae1ab6
...
...
@@ -37,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{
field
:
'pictype_ids'
,
title
:
__
(
'Pictype_ids'
),
searchList
:
$
.
getJSON
(
'pic/pictype'
)},
{
field
:
'water_url'
,
title
:
__
(
'Water_url'
),
operate
:
false
,
events
:
Table
.
api
.
events
.
image
,
formatter
:
Table
.
api
.
formatter
.
image
},
{
field
:
'url'
,
title
:
__
(
'Url'
),
operate
:
false
,
formatter
:
Table
.
api
.
formatter
.
url
},
{
field
:
'price'
,
title
:
__
(
'Price'
),
operate
:
false
},
{
field
:
'price'
,
title
:
__
(
'Price'
),
formatter
:
Table
.
api
.
formatter
.
label
,
searchList
:{
'800'
:
'800'
,
'1500'
:
'1500'
,
'3000'
:
'3000'
}
},
{
field
:
'buy_num'
,
title
:
__
(
'Buy_num'
),
operate
:
false
},
{
field
:
'money'
,
title
:
__
(
'Money'
),
operate
:
false
},
{
field
:
'click_num'
,
title
:
__
(
'Click_num'
),
operate
:
false
},
...
...
请
注册
或
登录
后发表评论