郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 aacd70a37fb0364faa498da8369da9f9910f160c 1 个父辈 95592e1b
1 个管道 的构建 通过 耗费 3 秒

修改增加唯一编号

内嵌 并排对比
正在显示 17 个修改的文件 包含 260 行增加 和 230 行删除
... ... @@ -2,7 +2,22 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<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/controller/Video.php" afterPath="$PROJECT_DIR$/application/admin/controller/Video.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Wonderful.php" afterPath="$PROJECT_DIR$/application/admin/controller/Wonderful.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/lang/zh-cn/video.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.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$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/wonderful/add.html" afterPath="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" afterPath="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
<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$/public/assets/js/backend/pic.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/video.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -12,81 +27,7 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="427">
<caret line="128" column="21" lean-forward="true" selection-start-line="128" selection-start-column="21" selection-end-line="128" selection-end-column="21" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#4577#4984#0#PHP" expanded="false" />
<element signature="e#4989#5332#0#PHP" expanded="false" />
<element signature="e#5338#6175#0#PHP" expanded="false" />
<element signature="e#6180#8375#0#PHP" expanded="false" />
<element signature="e#8381#9026#0#PHP" expanded="false" />
<element signature="e#9031#10127#0#PHP" expanded="false" />
<element signature="e#10133#10922#0#PHP" expanded="false" />
<element signature="e#10927#12275#0#PHP" expanded="false" />
<element signature="e#12281#12983#0#PHP" expanded="false" />
<element signature="e#12988#14188#0#PHP" expanded="false" />
<element signature="e#14194#14770#0#PHP" expanded="false" />
<element signature="e#14775#15322#0#PHP" expanded="false" />
<element signature="e#15328#16012#0#PHP" expanded="false" />
<element signature="e#16017#18113#0#PHP" expanded="false" />
<element signature="e#18119#18989#0#PHP" expanded="false" />
<element signature="e#18994#21490#0#PHP" expanded="false" />
<element signature="e#21496#21873#0#PHP" expanded="false" />
<element signature="e#21878#22199#0#PHP" expanded="false" />
<element signature="e#22205#22710#0#PHP" expanded="false" />
<element signature="e#22715#22966#0#PHP" expanded="false" />
<element signature="e#22972#23451#0#PHP" expanded="false" />
<element signature="e#23456#24213#0#PHP" expanded="false" />
<element signature="e#24219#24700#0#PHP" expanded="false" />
<element signature="e#24705#25475#0#PHP" expanded="false" />
<element signature="e#25481#25844#0#PHP" expanded="false" />
<element signature="e#25849#26040#0#PHP" expanded="false" />
<element signature="e#26046#26404#0#PHP" expanded="false" />
<element signature="e#26409#26600#0#PHP" expanded="false" />
<element signature="e#26606#27749#0#PHP" expanded="false" />
<element signature="e#27754#30419#0#PHP" expanded="false" />
<element signature="e#30425#30923#0#PHP" expanded="false" />
<element signature="e#30928#32674#0#PHP" expanded="false" />
<element signature="e#32680#33093#0#PHP" expanded="false" />
<element signature="e#33098#33577#0#PHP" expanded="false" />
<element signature="e#33583#34117#0#PHP" expanded="false" />
<element signature="e#34122#35507#0#PHP" expanded="false" />
<element signature="e#35513#36167#0#PHP" expanded="false" />
<element signature="e#36172#38187#0#PHP" expanded="false" />
<element signature="e#37210#37672#0#PHP" expanded="false" />
<element signature="e#38193#38953#0#PHP" expanded="false" />
<element signature="e#38958#41667#0#PHP" expanded="false" />
<element signature="e#41693#42524#0#PHP" expanded="false" />
<element signature="e#42530#42950#0#PHP" expanded="false" />
<element signature="e#42955#43438#0#PHP" expanded="false" />
<element signature="e#43444#44250#0#PHP" expanded="false" />
<element signature="e#44255#47409#0#PHP" expanded="false" />
<element signature="e#47424#48752#0#PHP" expanded="false" />
<element signature="e#48768#49795#0#PHP" expanded="false" />
<element signature="e#49801#50559#0#PHP" expanded="false" />
<element signature="e#50564#54307#0#PHP" expanded="false" />
<element signature="e#54313#54705#0#PHP" expanded="false" />
<element signature="e#54710#55662#0#PHP" expanded="false" />
<element signature="e#55686#56259#0#PHP" expanded="false" />
<element signature="e#56265#56864#0#PHP" expanded="false" />
<element signature="e#56869#57796#0#PHP" expanded="false" />
<element signature="e#57802#58516#0#PHP" expanded="false" />
<element signature="e#58522#58949#0#PHP" expanded="false" />
<element signature="e#58954#59423#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
</leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300" />
</component>
<component name="FindInProjectRecents">
<findStrings>
... ... @@ -124,8 +65,6 @@
<option value="$PROJECT_DIR$/public/assets/js/backend/user/user.js" />
<option value="$PROJECT_DIR$/application/admin/view/vip/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/vip.js" />
<option value="$PROJECT_DIR$/application/admin/controller/Pic.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/admin/view/order/index.html" />
<option value="$PROJECT_DIR$/application/admin/model/User.php" />
<option value="$PROJECT_DIR$/application/admin/model/Order.php" />
... ... @@ -141,20 +80,22 @@
<option value="$PROJECT_DIR$/application/nsms/nsms.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/extra/verify.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.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/view/pic/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Wonderful.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
<option value="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<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/api/controller/User.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
</list>
</option>
</component>
... ... @@ -172,11 +113,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="481" />
<option name="y" value="55" />
<option name="width" value="1696" />
<option name="height" value="961" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="42" />
<option name="y" value="112" />
<option name="width" value="1907" />
<option name="height" value="943" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -210,14 +151,33 @@
<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="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -296,7 +256,7 @@
<workItem from="1575340427887" duration="256000" />
<workItem from="1575420983161" duration="9911000" />
<workItem from="1575444277051" duration="130000" />
<workItem from="1575457595017" duration="767000" />
<workItem from="1575457595017" duration="3691000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -309,7 +269,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="300369000" />
<option name="totallyTimeSpent" value="303293000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -321,10 +281,9 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="481" y="55" width="1696" height="961" extended-state="0" />
<editor active="true" />
<frame x="42" y="112" width="1907" height="943" extended-state="1" />
<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.17787287" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1575528" 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" />
<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.33" sideWeight="0.5" order="0" 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="0" side_tool="false" content_ui="tabs" />
... ... @@ -379,20 +338,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$USER_HOME$/Desktop/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-17250">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/助通短信平台账号/php_HY_demo.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-311">
<caret line="19" column="0" lean-forward="true" selection-start-line="19" selection-start-column="0" selection-end-line="19" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/extend/nsms/nsms.php" />
<entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -621,13 +566,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="27" lean-forward="false" selection-start-line="7" selection-start-column="27" selection-end-line="7" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/api.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2175">
... ... @@ -663,166 +601,203 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
<entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="211">
<caret line="18" column="28" lean-forward="true" selection-start-line="18" selection-start-column="28" selection-end-line="18" selection-end-column="28" />
<state relative-caret-position="267">
<caret line="57" column="14" lean-forward="false" selection-start-line="57" selection-start-column="14" selection-end-line="57" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="41" column="4" lean-forward="false" selection-start-line="41" selection-start-column="4" selection-end-line="46" selection-end-column="10" />
<state relative-caret-position="357">
<caret line="437" column="7" lean-forward="true" selection-start-line="437" selection-start-column="7" selection-end-line="437" selection-end-column="7" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#4571#0#PHP" expanded="false" />
<element signature="e#4577#4984#0#PHP" expanded="false" />
<element signature="e#4989#5332#0#PHP" expanded="false" />
<element signature="e#5338#6175#0#PHP" expanded="false" />
<element signature="e#6180#8375#0#PHP" expanded="false" />
<element signature="e#8381#9026#0#PHP" expanded="false" />
<element signature="e#9031#10127#0#PHP" expanded="false" />
<element signature="e#10133#10922#0#PHP" expanded="false" />
<element signature="e#10927#12275#0#PHP" expanded="false" />
<element signature="e#12281#12983#0#PHP" expanded="false" />
<element signature="e#12988#14188#0#PHP" expanded="false" />
<element signature="e#14194#14770#0#PHP" expanded="false" />
<element signature="e#14775#15336#0#PHP" expanded="false" />
<element signature="e#15342#16026#0#PHP" expanded="false" />
<element signature="e#16031#18127#0#PHP" expanded="false" />
<element signature="e#18133#19003#0#PHP" expanded="false" />
<element signature="e#19008#21504#0#PHP" expanded="false" />
<element signature="e#21510#21887#0#PHP" expanded="false" />
<element signature="e#21892#22213#0#PHP" expanded="false" />
<element signature="e#22219#22724#0#PHP" expanded="false" />
<element signature="e#22729#22980#0#PHP" expanded="false" />
<element signature="e#22986#23465#0#PHP" expanded="false" />
<element signature="e#23470#24227#0#PHP" expanded="false" />
<element signature="e#24233#24714#0#PHP" expanded="false" />
<element signature="e#24719#25489#0#PHP" expanded="false" />
<element signature="e#25495#25858#0#PHP" expanded="false" />
<element signature="e#25863#26054#0#PHP" expanded="false" />
<element signature="e#26060#26418#0#PHP" expanded="false" />
<element signature="e#26423#26614#0#PHP" expanded="false" />
<element signature="e#26620#27763#0#PHP" expanded="false" />
<element signature="e#27768#30433#0#PHP" expanded="false" />
<element signature="e#30439#30937#0#PHP" expanded="false" />
<element signature="e#30942#32688#0#PHP" expanded="false" />
<element signature="e#32694#33107#0#PHP" expanded="false" />
<element signature="e#33112#33591#0#PHP" expanded="false" />
<element signature="e#33597#34131#0#PHP" expanded="false" />
<element signature="e#34136#35521#0#PHP" expanded="false" />
<element signature="e#35527#36181#0#PHP" expanded="false" />
<element signature="e#36186#38201#0#PHP" expanded="false" />
<element signature="e#37224#37686#0#PHP" expanded="false" />
<element signature="e#38207#38967#0#PHP" expanded="false" />
<element signature="e#38972#41681#0#PHP" expanded="false" />
<element signature="e#41707#42538#0#PHP" expanded="false" />
<element signature="e#42544#42964#0#PHP" expanded="false" />
<element signature="e#42969#43452#0#PHP" expanded="false" />
<element signature="e#43458#44264#0#PHP" expanded="false" />
<element signature="e#44269#47423#0#PHP" expanded="false" />
<element signature="e#47438#48766#0#PHP" expanded="false" />
<element signature="e#48782#49809#0#PHP" expanded="false" />
<element signature="e#49815#50573#0#PHP" expanded="false" />
<element signature="e#50578#54321#0#PHP" expanded="false" />
<element signature="e#54327#54719#0#PHP" expanded="false" />
<element signature="e#54724#55676#0#PHP" expanded="false" />
<element signature="e#55700#56273#0#PHP" expanded="false" />
<element signature="e#56279#56878#0#PHP" expanded="false" />
<element signature="e#56883#57810#0#PHP" expanded="false" />
<element signature="e#57816#58530#0#PHP" expanded="false" />
<element signature="e#58536#58963#0#PHP" expanded="false" />
<element signature="e#58968#59437#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="265">
<caret line="41" column="4" lean-forward="true" selection-start-line="41" selection-start-column="4" selection-end-line="46" selection-end-column="10" />
<state relative-caret-position="150">
<caret line="6" column="26" lean-forward="false" 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$/public/assets/js/backend/wonderful.js">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="22" column="36" lean-forward="true" selection-start-line="22" selection-start-column="36" selection-end-line="22" selection-end-column="36" />
<state relative-caret-position="400">
<caret line="20" column="45" lean-forward="true" selection-start-line="20" selection-start-column="45" selection-end-line="20" selection-end-column="45" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="251">
<caret line="119" column="4" lean-forward="true" selection-start-line="119" selection-start-column="4" selection-end-line="124" selection-end-column="10" />
<state relative-caret-position="175">
<caret line="7" column="4" lean-forward="true" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="526">
<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 relative-caret-position="175">
<caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="4" lean-forward="false" selection-start-line="4" selection-start-column="4" selection-end-line="5" selection-end-column="28" />
<state relative-caret-position="409">
<caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="28" lean-forward="false" selection-start-line="5" selection-start-column="28" selection-end-line="5" selection-end-column="28" />
<caret line="5" column="26" lean-forward="false" selection-start-line="5" selection-start-column="26" selection-end-line="5" selection-end-column="26" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="534">
<caret line="39" column="132" lean-forward="false" selection-start-line="39" selection-start-column="132" selection-end-line="39" selection-end-column="132" />
<state relative-caret-position="475">
<caret line="20" column="43" lean-forward="false" selection-start-line="20" selection-start-column="43" selection-end-line="20" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Wonderful.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="236">
<caret line="19" column="43" lean-forward="false" selection-start-line="19" selection-start-column="43" selection-end-line="19" selection-end-column="43" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="375">
<caret line="45" column="132" lean-forward="true" selection-start-line="45" selection-start-column="24" selection-end-line="45" selection-end-column="132" />
<state relative-caret-position="125">
<caret line="5" column="24" lean-forward="false" selection-start-line="5" selection-start-column="24" selection-end-line="5" selection-end-column="24" />
<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="175">
<caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" 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="25">
<caret line="1" column="4" lean-forward="false" selection-start-line="1" selection-start-column="4" selection-end-line="6" selection-end-column="10" />
<state relative-caret-position="175">
<caret line="7" column="4" lean-forward="false" selection-start-line="7" selection-start-column="4" selection-end-line="12" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/edit.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="10" lean-forward="false" selection-start-line="6" selection-start-column="10" selection-end-line="6" selection-end-column="10" />
<state relative-caret-position="125">
<caret line="5" column="14" lean-forward="true" selection-start-line="5" selection-start-column="14" selection-end-line="5" selection-end-column="14" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="267">
<caret line="57" column="14" lean-forward="false" selection-start-line="57" selection-start-column="14" selection-end-line="57" selection-end-column="14" />
<state relative-caret-position="300">
<caret line="12" column="10" lean-forward="false" selection-start-line="12" selection-start-column="10" selection-end-line="12" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="427">
<caret line="128" column="21" lean-forward="true" selection-start-line="128" selection-start-column="21" selection-end-line="128" selection-end-column="21" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#4577#4984#0#PHP" expanded="false" />
<element signature="e#4989#5332#0#PHP" expanded="false" />
<element signature="e#5338#6175#0#PHP" expanded="false" />
<element signature="e#6180#8375#0#PHP" expanded="false" />
<element signature="e#8381#9026#0#PHP" expanded="false" />
<element signature="e#9031#10127#0#PHP" expanded="false" />
<element signature="e#10133#10922#0#PHP" expanded="false" />
<element signature="e#10927#12275#0#PHP" expanded="false" />
<element signature="e#12281#12983#0#PHP" expanded="false" />
<element signature="e#12988#14188#0#PHP" expanded="false" />
<element signature="e#14194#14770#0#PHP" expanded="false" />
<element signature="e#14775#15322#0#PHP" expanded="false" />
<element signature="e#15328#16012#0#PHP" expanded="false" />
<element signature="e#16017#18113#0#PHP" expanded="false" />
<element signature="e#18119#18989#0#PHP" expanded="false" />
<element signature="e#18994#21490#0#PHP" expanded="false" />
<element signature="e#21496#21873#0#PHP" expanded="false" />
<element signature="e#21878#22199#0#PHP" expanded="false" />
<element signature="e#22205#22710#0#PHP" expanded="false" />
<element signature="e#22715#22966#0#PHP" expanded="false" />
<element signature="e#22972#23451#0#PHP" expanded="false" />
<element signature="e#23456#24213#0#PHP" expanded="false" />
<element signature="e#24219#24700#0#PHP" expanded="false" />
<element signature="e#24705#25475#0#PHP" expanded="false" />
<element signature="e#25481#25844#0#PHP" expanded="false" />
<element signature="e#25849#26040#0#PHP" expanded="false" />
<element signature="e#26046#26404#0#PHP" expanded="false" />
<element signature="e#26409#26600#0#PHP" expanded="false" />
<element signature="e#26606#27749#0#PHP" expanded="false" />
<element signature="e#27754#30419#0#PHP" expanded="false" />
<element signature="e#30425#30923#0#PHP" expanded="false" />
<element signature="e#30928#32674#0#PHP" expanded="false" />
<element signature="e#32680#33093#0#PHP" expanded="false" />
<element signature="e#33098#33577#0#PHP" expanded="false" />
<element signature="e#33583#34117#0#PHP" expanded="false" />
<element signature="e#34122#35507#0#PHP" expanded="false" />
<element signature="e#35513#36167#0#PHP" expanded="false" />
<element signature="e#36172#38187#0#PHP" expanded="false" />
<element signature="e#37210#37672#0#PHP" expanded="false" />
<element signature="e#38193#38953#0#PHP" expanded="false" />
<element signature="e#38958#41667#0#PHP" expanded="false" />
<element signature="e#41693#42524#0#PHP" expanded="false" />
<element signature="e#42530#42950#0#PHP" expanded="false" />
<element signature="e#42955#43438#0#PHP" expanded="false" />
<element signature="e#43444#44250#0#PHP" expanded="false" />
<element signature="e#44255#47409#0#PHP" expanded="false" />
<element signature="e#47424#48752#0#PHP" expanded="false" />
<element signature="e#48768#49795#0#PHP" expanded="false" />
<element signature="e#49801#50559#0#PHP" expanded="false" />
<element signature="e#50564#54307#0#PHP" expanded="false" />
<element signature="e#54313#54705#0#PHP" expanded="false" />
<element signature="e#54710#55662#0#PHP" expanded="false" />
<element signature="e#55686#56259#0#PHP" expanded="false" />
<element signature="e#56265#56864#0#PHP" expanded="false" />
<element signature="e#56869#57796#0#PHP" expanded="false" />
<element signature="e#57802#58516#0#PHP" expanded="false" />
<element signature="e#58522#58949#0#PHP" expanded="false" />
<element signature="e#58954#59423#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="325">
<caret line="28" column="24" lean-forward="true" selection-start-line="28" selection-start-column="24" selection-end-line="28" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="28" column="63" lean-forward="false" selection-start-line="28" selection-start-column="63" selection-end-line="28" selection-end-column="63" />
<folding />
</state>
</provider>
</entry>
... ...
... ... @@ -18,7 +18,7 @@ class Pic extends Backend
* @var \app\admin\model\Pic
*/
protected $model = null;
protected $searchFields = 'title';
protected $searchFields = 'title,number';
public function _initialize()
{
parent::_initialize();
... ...
... ... @@ -18,7 +18,7 @@ class Video extends Backend
* @var \app\admin\model\Video
*/
protected $model = null;
protected $searchFields = 'title';
protected $searchFields = 'title,number';
public function _initialize()
{
... ...
... ... @@ -17,7 +17,7 @@ class Wonderful extends Backend
* @var \app\admin\model\Wonderful
*/
protected $model = null;
protected $searchFields = 'title';
protected $searchFields = 'title,number';
public function _initialize()
{
... ...
... ... @@ -4,6 +4,7 @@ return [
'Title' => '图片标题',
'Is_show' =>'权重',
'Is_top' =>'是否置顶',
'Number' =>'编号',
'Keyword' => '关键词（多个关键词中间用逗号隔开）',
'Thumbnail' => '缩略图',
'Type_ids' => '地区标签',
... ...
... ... @@ -3,6 +3,7 @@
return [
'Title' => '视频标题',
'Is_show' =>'权重',
'Number' =>'编号',
'Is_top' =>'是否置顶',
'Keyword' => '关键词',
'Thumbnail' => '视频封面图',
... ...
... ... @@ -3,9 +3,11 @@
return [
'Title' => '视频标题',
'Thumbnail' => '视频封面',
'Number' =>'编号',
'Video' => '视频',
'Is_show' => '首页展示权重',
'Is_top' => '是否置顶',
'Content' =>'简介',
'Createtime' => '创建时间',
'Updatetime' => '修改时间'
];
... ...
... ... @@ -6,6 +6,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-number" data-rule="required" class="form-control" name="row[number]" type="text" placeholder="请输入唯一编号">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" placeholder="请输入标题">
... ...
... ... @@ -6,6 +6,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-number" data-rule="required" class="form-control" name="row[number]" type="text" value="{$row.number|htmlentities}" placeholder="请输入唯一编号">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-title" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}">
... ...
... ... @@ -6,6 +6,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-number" data-rule="required" class="form-control" name="row[number]" type="text" placeholder="请输入唯一编号">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" placeholder="请输入视频标题">
... ...
... ... @@ -6,6 +6,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-number" data-rule="required" class="form-control" name="row[number]" type="text" value="{$row.number|htmlentities}" placeholder="请输入唯一编号">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}" placeholder="请输入视频标题">
... ...
... ... @@ -6,6 +6,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-number" data-rule="required" class="form-control" name="row[number]" type="text" placeholder="请输入唯一编号">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" placeholder="请输入标题">
... ... @@ -40,6 +46,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
<div class="col-xs-12 col-sm-8">
<textarea id="c-content" data-rule="required" class="form-control editor" name="row[content]" placeholder="请输入大片介绍"></textarea>
</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">
{:build_radios('row[is_top]', ['0'=>__('否'), '1'=>__('是')])}
... ...
... ... @@ -6,6 +6,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Number')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-number" data-rule="required" class="form-control" name="row[number]" type="text" value="{$row.number|htmlentities}" placeholder="请输入唯一编号">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Title')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-title" data-rule="required" class="form-control" name="row[title]" type="text" value="{$row.title|htmlentities}" placeholder="请输入标题">
... ... @@ -40,6 +46,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Content')}:</label>
<div class="col-xs-12 col-sm-8">
<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">{:__('Is_top')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[is_top]', ['0'=>__('否'), '1'=>__('是')], $row['is_top'])}
... ...
... ... @@ -442,7 +442,7 @@ class User extends Api
$page = $this->request->param('page',1,'intval');
$pageNum = $this->request->param('pageNum',10,'intval');
$data = Db::name('wonderful')
->field('id,thumbnail,video')
->field('id,thumbnail,video,title,content')
->order('id desc')
->page($page,$pageNum)
->select();
... ...
... ... @@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
[
{checkbox: true},
{field: 'id', title: __('Id'),operate:false},
{field: 'number', title: __('Number')},
{field: 'is_show', title: __('Is_show'),operate:false},
{field: 'title', title: __('Title'),operate:false},
{field: 'keyword', title: __('Keyword'),operate:false},
... ...
... ... @@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
[
{checkbox: true},
{field: 'id', title: __('Id'),operate:false},
{field: 'number', title: __('Number')},
{field: 'is_show', title: __('Is_show'),operate:false},
{field: 'title', title: __('Title'),operate:false},
{field: 'keyword', title: __('Keyword'),operate:false},
... ...
... ... @@ -26,6 +26,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
[
{checkbox: true},
{field: 'id', title: __('Id'),operate:false},
{field: 'number', title: __('Number')},
{field: 'is_show', title: __('Is_show'),operate:false},
{field: 'title', title: __('Title'),operate:false},
{field: 'thumbnail', title: __('Thumbnail'),operate:false,formatter: Table.api.formatter.image},
... ...