郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 08fdd733a7358664e7473ac0aa416f6b9b0d0073 1 个父辈 24f87a5d
1 个管道 的构建 通过 耗费 11 秒

修改数组中空值的接口

内嵌 并排对比
正在显示 7 个修改的文件 包含 483 行增加 和 314 行删除
... ... @@ -5,10 +5,13 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<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/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -18,12 +21,22 @@
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Video.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="821">
<caret line="136" column="40" lean-forward="false" selection-start-line="136" selection-start-column="40" selection-end-line="136" selection-end-column="40" />
<folding />
</state>
</provider>
</entry>
</file>
<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="104">
<caret line="642" column="13" lean-forward="false" selection-start-line="642" selection-start-column="13" selection-end-line="642" selection-end-column="13" />
<state relative-caret-position="167">
<caret line="703" column="33" lean-forward="false" selection-start-line="703" selection-start-column="33" selection-end-line="703" selection-end-column="33" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -51,114 +64,66 @@
<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#21791#22721#0#PHP" expanded="false" />
<element signature="e#26992#27369#0#PHP" expanded="false" />
<element signature="e#27374#27813#0#PHP" expanded="false" />
<element signature="e#27819#28640#0#PHP" expanded="false" />
<element signature="e#28645#32049#0#PHP" expanded="false" />
<element signature="e#29091#32043#0#PHP" expanded="false" />
<element signature="e#32055#32560#0#PHP" expanded="false" />
<element signature="e#32565#32816#0#PHP" expanded="false" />
<element signature="e#32822#33301#0#PHP" expanded="false" />
<element signature="e#33306#34063#0#PHP" expanded="false" />
<element signature="e#34069#34550#0#PHP" expanded="false" />
<element signature="e#34555#35325#0#PHP" expanded="false" />
<element signature="e#35331#35694#0#PHP" expanded="false" />
<element signature="e#35699#35890#0#PHP" expanded="false" />
<element signature="e#35896#36254#0#PHP" expanded="false" />
<element signature="e#36259#36450#0#PHP" expanded="false" />
<element signature="e#36456#37599#0#PHP" expanded="false" />
<element signature="e#37604#40269#0#PHP" expanded="false" />
<element signature="e#40275#40773#0#PHP" expanded="false" />
<element signature="e#40778#42524#0#PHP" expanded="false" />
<element signature="e#42530#42943#0#PHP" expanded="false" />
<element signature="e#42948#43427#0#PHP" expanded="false" />
<element signature="e#43433#43967#0#PHP" expanded="false" />
<element signature="e#43972#45357#0#PHP" expanded="false" />
<element signature="e#45363#46017#0#PHP" expanded="false" />
<element signature="e#46022#48037#0#PHP" expanded="false" />
<element signature="e#48043#48803#0#PHP" expanded="false" />
<element signature="e#48808#51517#0#PHP" expanded="false" />
<element signature="e#51543#52374#0#PHP" expanded="false" />
<element signature="e#52380#52800#0#PHP" expanded="false" />
<element signature="e#52805#53288#0#PHP" expanded="false" />
<element signature="e#53294#54100#0#PHP" expanded="false" />
<element signature="e#54105#57263#0#PHP" expanded="false" />
<element signature="e#55898#57257#0#PHP" expanded="false" />
<element signature="e#57278#58613#0#PHP" expanded="false" />
<element signature="e#57394#57796#0#PHP" expanded="false" />
<element signature="e#58629#59663#0#PHP" expanded="false" />
<element signature="e#59669#60427#0#PHP" expanded="false" />
<element signature="e#60432#64175#0#PHP" expanded="false" />
<element signature="e#64181#64573#0#PHP" expanded="false" />
<element signature="e#64578#65530#0#PHP" expanded="false" />
<element signature="e#65554#66127#0#PHP" expanded="false" />
<element signature="e#66133#66732#0#PHP" expanded="false" />
<element signature="e#66737#67664#0#PHP" expanded="false" />
<element signature="e#67670#68384#0#PHP" expanded="false" />
<element signature="e#68390#68817#0#PHP" expanded="false" />
<element signature="e#68822#69291#0#PHP" expanded="false" />
<element signature="e#69298#70503#0#PHP" expanded="false" />
<element signature="e#70508#72211#0#PHP" expanded="false" />
<element signature="e#72217#72994#0#PHP" expanded="false" />
<element signature="e#72999#76937#0#PHP" expanded="false" />
<element signature="e#76943#77452#0#PHP" expanded="false" />
<element signature="e#77457#78129#0#PHP" expanded="false" />
<element signature="e#18083#22210#0#PHP" expanded="false" />
<element signature="e#22216#23146#0#PHP" expanded="false" />
<element signature="e#23151#27836#0#PHP" expanded="false" />
<element signature="e#27842#28219#0#PHP" expanded="false" />
<element signature="e#28224#28663#0#PHP" expanded="false" />
<element signature="e#28669#29490#0#PHP" expanded="false" />
<element signature="e#29495#32899#0#PHP" expanded="false" />
<element signature="e#29941#32893#0#PHP" expanded="false" />
<element signature="e#32905#33410#0#PHP" expanded="false" />
<element signature="e#33415#33666#0#PHP" expanded="false" />
<element signature="e#33672#34151#0#PHP" expanded="false" />
<element signature="e#34156#34913#0#PHP" expanded="false" />
<element signature="e#34919#35400#0#PHP" expanded="false" />
<element signature="e#35405#36175#0#PHP" expanded="false" />
<element signature="e#36181#36544#0#PHP" expanded="false" />
<element signature="e#36549#36740#0#PHP" expanded="false" />
<element signature="e#36746#37104#0#PHP" expanded="false" />
<element signature="e#37109#37300#0#PHP" expanded="false" />
<element signature="e#37306#38449#0#PHP" expanded="false" />
<element signature="e#38454#41119#0#PHP" expanded="false" />
<element signature="e#41125#41623#0#PHP" expanded="false" />
<element signature="e#41628#43374#0#PHP" expanded="false" />
<element signature="e#43380#43793#0#PHP" expanded="false" />
<element signature="e#43798#44277#0#PHP" expanded="false" />
<element signature="e#44283#44817#0#PHP" expanded="false" />
<element signature="e#44822#46207#0#PHP" expanded="false" />
<element signature="e#46213#46867#0#PHP" expanded="false" />
<element signature="e#46872#48887#0#PHP" expanded="false" />
<element signature="e#48893#49653#0#PHP" expanded="false" />
<element signature="e#49658#52367#0#PHP" expanded="false" />
<element signature="e#52393#53224#0#PHP" expanded="false" />
<element signature="e#53230#53650#0#PHP" expanded="false" />
<element signature="e#53655#54138#0#PHP" expanded="false" />
<element signature="e#54144#54950#0#PHP" expanded="false" />
<element signature="e#54955#58113#0#PHP" expanded="false" />
<element signature="e#56748#58107#0#PHP" expanded="false" />
<element signature="e#58128#59463#0#PHP" expanded="false" />
<element signature="e#58244#58646#0#PHP" expanded="false" />
<element signature="e#59479#60513#0#PHP" expanded="false" />
<element signature="e#60519#61277#0#PHP" expanded="false" />
<element signature="e#61282#65025#0#PHP" expanded="false" />
<element signature="e#65031#65423#0#PHP" expanded="false" />
<element signature="e#65428#66380#0#PHP" expanded="false" />
<element signature="e#66404#66977#0#PHP" expanded="false" />
<element signature="e#66983#67582#0#PHP" expanded="false" />
<element signature="e#67587#68514#0#PHP" expanded="false" />
<element signature="e#68520#69234#0#PHP" expanded="false" />
<element signature="e#69240#69667#0#PHP" expanded="false" />
<element signature="e#69672#70141#0#PHP" expanded="false" />
<element signature="e#70148#71353#0#PHP" expanded="false" />
<element signature="e#71358#73061#0#PHP" expanded="false" />
<element signature="e#73067#73844#0#PHP" expanded="false" />
<element signature="e#73849#77787#0#PHP" expanded="false" />
<element signature="e#77793#78302#0#PHP" expanded="false" />
<element signature="e#78307#78979#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Video.php" pinned="false" current-in-tab="false">
<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>
</file>
<file leaf-file-name="add.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="34" column="129" lean-forward="false" selection-start-line="34" selection-start-column="129" selection-end-line="34" selection-end-column="140" />
<folding />
</state>
</provider>
</entry>
</file>
<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="480">
<caret line="31" column="28" lean-forward="true" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
<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="555">
<caret line="32" column="81" lean-forward="true" selection-start-line="32" selection-start-column="81" selection-end-line="32" selection-end-column="81" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="32" column="81" lean-forward="true" selection-start-line="32" selection-start-column="81" selection-end-line="32" selection-end-column="81" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -238,11 +203,11 @@
<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/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.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$/application/api/controller/User.php" />
</list>
</option>
</component>
... ... @@ -260,10 +225,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="-36" />
<option name="width" value="1660" />
<option name="height" value="943" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="99" />
<option name="y" value="111" />
<option name="width" value="1652" />
<option name="height" value="933" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -281,6 +247,7 @@
</navigator>
<panes>
<pane id="Scratches" />
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -297,43 +264,19 @@
<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="api" 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="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" 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="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="view" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="pic" 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" />
<item name="video" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -476,7 +419,10 @@
<workItem from="1583886688361" duration="20321000" />
<workItem from="1583922378448" duration="31000" />
<workItem from="1583973595016" duration="1197000" />
<workItem from="1584405342474" duration="3009000" />
<workItem from="1584405342474" duration="4206000" />
<workItem from="1584687351301" duration="330000" />
<workItem from="1584758035473" duration="1782000" />
<workItem from="1584775386700" duration="2949000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -503,7 +449,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="621697000" />
<option name="totallyTimeSpent" value="627955000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -515,17 +461,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" />
<frame x="99" y="111" width="1652" height="933" 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.21002132" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.15515076" 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.32876712" 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" />
<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="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="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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.46469834" 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="true" show_stripe_button="true" weight="0.46733668" sideWeight="0.5" order="2" side_tool="false" 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="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="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" />
... ... @@ -573,23 +518,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/admin/view/addword/index.html" />
<entry file="file://$PROJECT_DIR$/application/admin/controller/Addword.php" />
<entry file="file://$USER_HOME$/Desktop/新建文件夹/bower.json" />
<entry file="file://$PROJECT_DIR$/public/assets/js/require-backend.min.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-600">
<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://$PROJECT_DIR$/bower.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="9" column="26" lean-forward="true" selection-start-line="9" selection-start-column="26" selection-end-line="9" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/libs/bootstrap-table/dist/extensions/page-jumpto/README.md">
<provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
<state split_layout="SPLIT">
... ... @@ -749,13 +677,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="775">
<caret line="85" column="0" lean-forward="true" selection-start-line="85" selection-start-column="0" selection-end-line="85" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/library/token/Driver.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="269">
... ... @@ -827,7 +748,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="219">
<caret line="39" column="59" lean-forward="true" selection-start-line="39" selection-start-column="59" selection-end-line="39" selection-end-column="59" />
<folding />
</state>
</provider>
</entry>
... ... @@ -892,30 +812,295 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="317">
<caret line="359" column="31" lean-forward="false" selection-start-line="359" selection-start-column="31" selection-end-line="359" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2310">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/index/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-5721">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</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">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="55" column="21" lean-forward="false" selection-start-line="55" selection-start-column="21" selection-end-line="55" selection-end-column="21" />
<folding>
<element signature="e#581#700#0#PHP" expanded="false" />
<element signature="e#706#1019#0#PHP" expanded="false" />
<element signature="e#1024#3100#0#PHP" expanded="false" />
<element signature="e#3106#3426#0#PHP" expanded="false" />
<element signature="e#3431#5513#0#PHP" expanded="false" />
<element signature="e#5519#5937#0#PHP" expanded="false" />
<element signature="e#5942#15963#0#PHP" expanded="false" />
<element signature="e#7706#9115#0#PHP" expanded="false" />
<element signature="e#9144#13082#0#PHP" expanded="false" />
<element signature="e#17509#20987#0#PHP" expanded="false" />
<element signature="e#21016#23921#0#PHP" expanded="false" />
<element signature="e#23954#30281#0#PHP" expanded="false" />
<element signature="e#24839#26095#0#PHP" expanded="false" />
<element signature="e#26141#29646#0#PHP" expanded="false" />
<element signature="e#30304#30521#0#PHP" expanded="false" />
<element signature="e#631#922#0#PHP" expanded="false" />
<marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." />
<marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." />
<marker date="1583590171926" expanded="false" signature="3739:3805" ph="..." />
<marker date="1583590171926" expanded="false" signature="3878:3925" ph="..." />
<marker date="1583590171926" expanded="true" signature="3926:3964" ph="..." />
<marker date="1583590171926" expanded="false" signature="3988:4015" ph="..." />
<marker date="1583590171926" expanded="true" signature="4016:4171" ph="..." />
<marker date="1583590171926" expanded="false" signature="4195:4211" ph="..." />
<marker date="1583590171926" expanded="true" signature="4212:5259" ph="..." />
<marker date="1583590171926" expanded="false" signature="4238:4282" ph="..." />
<marker date="1583590171926" expanded="true" signature="4283:4361" ph="..." />
<marker date="1583590171926" expanded="false" signature="4313:4325" ph="..." />
<marker date="1583590171926" expanded="false" signature="4385:4429" ph="..." />
<marker date="1583590171926" expanded="true" signature="4430:4508" ph="..." />
<marker date="1583590171926" expanded="false" signature="4461:4473" ph="..." />
<marker date="1583590171926" expanded="false" signature="4532:4576" ph="..." />
<marker date="1583590171926" expanded="true" signature="4577:4655" ph="..." />
<marker date="1583590171926" expanded="false" signature="4608:4620" ph="..." />
<marker date="1583590171926" expanded="false" signature="4679:4723" ph="..." />
<marker date="1583590171926" expanded="true" signature="4724:4805" ph="..." />
<marker date="1583590171926" expanded="false" signature="4755:4767" ph="..." />
<marker date="1583590171926" expanded="false" signature="4829:4873" ph="..." />
<marker date="1583590171926" expanded="true" signature="4874:4959" ph="..." />
<marker date="1583590171926" expanded="false" signature="4906:4918" ph="..." />
<marker date="1583590171926" expanded="false" signature="4983:5027" ph="..." />
<marker date="1583590171926" expanded="true" signature="5028:5110" ph="..." />
<marker date="1583590171926" expanded="false" signature="5062:5074" ph="..." />
<marker date="1583590171926" expanded="false" signature="5134:5178" ph="..." />
<marker date="1583590171926" expanded="true" signature="5179:5242" ph="..." />
<marker date="1583590171926" expanded="true" signature="5284:5748" ph="..." />
<marker date="1583590171926" expanded="false" signature="5312:5378" ph="..." />
<marker date="1583590171926" expanded="false" signature="5421:5466" ph="..." />
<marker date="1583590171926" expanded="true" signature="5467:5731" ph="..." />
<marker date="1583590171926" expanded="false" signature="5468:5474" ph=" " />
<marker date="1583590171926" expanded="false" signature="5474:5480" ph=" " />
<marker date="1583590171926" expanded="false" signature="5480:5486" ph=" " />
<marker date="1583590171926" expanded="false" signature="5486:5492" ph=" " />
<marker date="1583590171926" expanded="false" signature="5524:5533" ph="..." />
<marker date="1583590171926" expanded="false" signature="5576:5585" ph="..." />
<marker date="1583590171926" expanded="false" signature="5614:5623" ph="..." />
<marker date="1583590171926" expanded="false" signature="5648:5657" ph="..." />
<marker date="1583590171926" expanded="false" signature="5772:5790" ph="..." />
<marker date="1583590171926" expanded="true" signature="5791:6108" ph="..." />
<marker date="1583590171926" expanded="false" signature="5819:5885" ph="..." />
<marker date="1583590171926" expanded="false" signature="5924:5952" ph="..." />
<marker date="1583590171926" expanded="false" signature="5954:5960" ph=" " />
<marker date="1583590171926" expanded="false" signature="5960:5966" ph=" " />
<marker date="1583590171926" expanded="false" signature="5966:5972" ph=" " />
<marker date="1583590171926" expanded="false" signature="5972:5978" ph=" " />
<marker date="1583590171926" expanded="false" signature="6031:6040" ph="..." />
<marker date="1583590171926" expanded="false" signature="6132:6150" ph="..." />
<marker date="1583590171926" expanded="true" signature="6151:6557" ph="..." />
<marker date="1583590171926" expanded="false" signature="6179:6245" ph="..." />
<marker date="1583590171926" expanded="false" signature="6286:6331" ph="..." />
<marker date="1583590171926" expanded="true" signature="6332:6540" ph="..." />
<marker date="1583590171926" expanded="false" signature="6333:6339" ph=" " />
<marker date="1583590171926" expanded="false" signature="6339:6345" ph=" " />
<marker date="1583590171926" expanded="false" signature="6345:6351" ph=" " />
<marker date="1583590171926" expanded="false" signature="6351:6357" ph=" " />
<marker date="1583590171926" expanded="false" signature="6381:6387" ph=" " />
<marker date="1583590171926" expanded="false" signature="6390:6396" ph=" " />
<marker date="1583590171926" expanded="false" signature="6398:6404" ph=" " />
<marker date="1583590171926" expanded="false" signature="6455:6464" ph="..." />
<marker date="1583590171926" expanded="false" signature="6494:6503" ph="..." />
<marker date="1583590171926" expanded="false" signature="6581:6628" ph="..." />
<marker date="1583590171926" expanded="false" signature="6630:6636" ph=" " />
<marker date="1583590171926" expanded="false" signature="6636:6642" ph=" " />
<marker date="1583590171926" expanded="false" signature="6642:6648" ph=" " />
<marker date="1583590171926" expanded="false" signature="6648:6654" ph=" " />
<marker date="1583590171926" expanded="false" signature="6709:6718" ph="..." />
<marker date="1583590171926" expanded="false" signature="6837:6884" ph="..." />
<marker date="1583590171926" expanded="false" signature="6886:6892" ph=" " />
<marker date="1583590171926" expanded="false" signature="6892:6898" ph=" " />
<marker date="1583590171926" expanded="false" signature="6898:6904" ph=" " />
<marker date="1583590171926" expanded="false" signature="6904:6910" ph=" " />
<marker date="1583590171926" expanded="false" signature="6964:6973" ph="..." />
<marker date="1583590171926" expanded="false" signature="7047:7063" ph="..." />
<marker date="1583590171926" expanded="false" signature="7115:7162" ph="..." />
<marker date="1583590171926" expanded="false" signature="7164:7170" ph=" " />
<marker date="1583590171926" expanded="false" signature="7170:7176" ph=" " />
<marker date="1583590171926" expanded="false" signature="7176:7182" ph=" " />
<marker date="1583590171926" expanded="false" signature="7182:7188" ph=" " />
<marker date="1583590171926" expanded="false" signature="7215:7241" ph="..." />
<marker date="1583590171926" expanded="false" signature="7319:7337" ph="..." />
<marker date="1583590171926" expanded="true" signature="7338:7936" ph="..." />
<marker date="1583590171926" expanded="false" signature="7366:7432" ph="..." />
<marker date="1583590171926" expanded="false" signature="7471:7518" ph="..." />
<marker date="1583590171926" expanded="false" signature="7520:7526" ph=" " />
<marker date="1583590171926" expanded="false" signature="7526:7532" ph=" " />
<marker date="1583590171926" expanded="false" signature="7532:7538" ph=" " />
<marker date="1583590171926" expanded="false" signature="7538:7544" ph=" " />
<marker date="1583590171926" expanded="false" signature="7629:7676" ph="..." />
<marker date="1583590171926" expanded="false" signature="7678:7684" ph=" " />
<marker date="1583590171926" expanded="false" signature="7684:7690" ph=" " />
<marker date="1583590171926" expanded="false" signature="7690:7696" ph=" " />
<marker date="1583590171926" expanded="false" signature="7696:7702" ph=" " />
<marker date="1583590171926" expanded="false" signature="7803:7850" ph="..." />
<marker date="1583590171926" expanded="false" signature="7852:7858" ph=" " />
<marker date="1583590171926" expanded="false" signature="7858:7864" ph=" " />
<marker date="1583590171926" expanded="false" signature="7864:7870" ph=" " />
<marker date="1583590171926" expanded="false" signature="7870:7876" ph=" " />
<marker date="1583590171926" expanded="false" signature="7960:7978" ph="..." />
<marker date="1583590171926" expanded="true" signature="7979:9624" ph="..." />
<marker date="1583590171926" expanded="false" signature="8007:8073" ph="..." />
<marker date="1583590171926" expanded="false" signature="8112:8159" ph="..." />
<marker date="1583590171926" expanded="false" signature="8161:8167" ph=" " />
<marker date="1583590171926" expanded="false" signature="8167:8173" ph=" " />
<marker date="1583590171926" expanded="false" signature="8173:8179" ph=" " />
<marker date="1583590171926" expanded="false" signature="8179:8185" ph=" " />
<marker date="1583590171926" expanded="false" signature="8309:8356" ph="..." />
<marker date="1583590171926" expanded="false" signature="8358:8364" ph=" " />
<marker date="1583590171926" expanded="false" signature="8364:8370" ph=" " />
<marker date="1583590171926" expanded="false" signature="8370:8376" ph=" " />
<marker date="1583590171926" expanded="false" signature="8376:8382" ph=" " />
<marker date="1583590171926" expanded="false" signature="8534:8581" ph="..." />
<marker date="1583590171926" expanded="false" signature="8583:8589" ph=" " />
<marker date="1583590171926" expanded="false" signature="8589:8595" ph=" " />
<marker date="1583590171926" expanded="false" signature="8595:8601" ph=" " />
<marker date="1583590171926" expanded="false" signature="8601:8607" ph=" " />
<marker date="1583590171926" expanded="false" signature="8726:8773" ph="..." />
<marker date="1583590171926" expanded="false" signature="8775:8781" ph=" " />
<marker date="1583590171926" expanded="false" signature="8781:8787" ph=" " />
<marker date="1583590171926" expanded="false" signature="8787:8793" ph=" " />
<marker date="1583590171926" expanded="false" signature="8793:8799" ph=" " />
<marker date="1583590171926" expanded="false" signature="8883:8930" ph="..." />
<marker date="1583590171926" expanded="false" signature="8932:8938" ph=" " />
<marker date="1583590171926" expanded="false" signature="8938:8944" ph=" " />
<marker date="1583590171926" expanded="false" signature="8944:8950" ph=" " />
<marker date="1583590171926" expanded="false" signature="8950:8956" ph=" " />
<marker date="1583590171926" expanded="false" signature="9016:9063" ph="..." />
<marker date="1583590171926" expanded="false" signature="9065:9071" ph=" " />
<marker date="1583590171926" expanded="false" signature="9071:9077" ph=" " />
<marker date="1583590171926" expanded="false" signature="9077:9083" ph=" " />
<marker date="1583590171926" expanded="false" signature="9083:9089" ph=" " />
<marker date="1583590171926" expanded="false" signature="9273:9320" ph="..." />
<marker date="1583590171926" expanded="false" signature="9322:9328" ph=" " />
<marker date="1583590171926" expanded="false" signature="9328:9334" ph=" " />
<marker date="1583590171926" expanded="false" signature="9334:9340" ph=" " />
<marker date="1583590171926" expanded="false" signature="9340:9346" ph=" " />
<marker date="1583590171926" expanded="false" signature="9474:9521" ph="..." />
<marker date="1583590171926" expanded="false" signature="9523:9529" ph=" " />
<marker date="1583590171926" expanded="false" signature="9529:9535" ph=" " />
<marker date="1583590171926" expanded="false" signature="9535:9541" ph=" " />
<marker date="1583590171926" expanded="false" signature="9541:9547" ph=" " />
<marker date="1583590171926" expanded="false" signature="9648:9666" ph="..." />
<marker date="1583590171926" expanded="true" signature="9667:10167" ph="..." />
<marker date="1583590171926" expanded="false" signature="9695:9761" ph="..." />
<marker date="1583590171926" expanded="false" signature="9802:9849" ph="..." />
<marker date="1583590171926" expanded="false" signature="9851:9857" ph=" " />
<marker date="1583590171926" expanded="false" signature="9857:9863" ph=" " />
<marker date="1583590171926" expanded="false" signature="9863:9869" ph=" " />
<marker date="1583590171926" expanded="false" signature="9869:9875" ph=" " />
<marker date="1583590171926" expanded="false" signature="9987:10034" ph="..." />
<marker date="1583590171926" expanded="false" signature="10036:10042" ph=" " />
<marker date="1583590171926" expanded="false" signature="10042:10048" ph=" " />
<marker date="1583590171926" expanded="false" signature="10048:10054" ph=" " />
<marker date="1583590171926" expanded="false" signature="10054:10060" ph=" " />
<marker date="1583590171926" expanded="false" signature="10191:10209" ph="..." />
<marker date="1583590171926" expanded="true" signature="10210:11210" ph="..." />
<marker date="1583590171926" expanded="false" signature="10238:10304" ph="..." />
<marker date="1583590171926" expanded="false" signature="10343:10390" ph="..." />
<marker date="1583590171926" expanded="false" signature="10392:10398" ph=" " />
<marker date="1583590171926" expanded="false" signature="10398:10404" ph=" " />
<marker date="1583590171926" expanded="false" signature="10404:10410" ph=" " />
<marker date="1583590171926" expanded="false" signature="10410:10416" ph=" " />
<marker date="1583590171926" expanded="false" signature="10482:10529" ph="..." />
<marker date="1583590171926" expanded="false" signature="10531:10537" ph=" " />
<marker date="1583590171926" expanded="false" signature="10537:10543" ph=" " />
<marker date="1583590171926" expanded="false" signature="10543:10549" ph=" " />
<marker date="1583590171926" expanded="false" signature="10549:10555" ph=" " />
<marker date="1583590171926" expanded="false" signature="10612:10659" ph="..." />
<marker date="1583590171926" expanded="false" signature="10661:10667" ph=" " />
<marker date="1583590171926" expanded="false" signature="10667:10673" ph=" " />
<marker date="1583590171926" expanded="false" signature="10673:10679" ph=" " />
<marker date="1583590171926" expanded="false" signature="10679:10685" ph=" " />
<marker date="1583590171926" expanded="false" signature="10763:10810" ph="..." />
<marker date="1583590171926" expanded="false" signature="10812:10818" ph=" " />
<marker date="1583590171926" expanded="false" signature="10818:10824" ph=" " />
<marker date="1583590171926" expanded="false" signature="10824:10830" ph=" " />
<marker date="1583590171926" expanded="false" signature="10830:10836" ph=" " />
<marker date="1583590171926" expanded="false" signature="10929:10976" ph="..." />
<marker date="1583590171926" expanded="false" signature="10978:10984" ph=" " />
<marker date="1583590171926" expanded="false" signature="10984:10990" ph=" " />
<marker date="1583590171926" expanded="false" signature="10990:10996" ph=" " />
<marker date="1583590171926" expanded="false" signature="10996:11002" ph=" " />
<marker date="1583590171926" expanded="false" signature="11076:11123" ph="..." />
<marker date="1583590171926" expanded="false" signature="11125:11131" ph=" " />
<marker date="1583590171926" expanded="false" signature="11131:11137" ph=" " />
<marker date="1583590171926" expanded="false" signature="11137:11143" ph=" " />
<marker date="1583590171926" expanded="false" signature="11143:11149" ph=" " />
<marker date="1583590171926" expanded="false" signature="11234:11314" ph="..." />
<marker date="1583590171926" expanded="false" signature="11375:11455" ph="..." />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
<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="190">
<caret line="99" column="21" lean-forward="true" selection-start-line="99" selection-start-column="21" selection-end-line="99" selection-end-column="21" />
<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="371">
<caret line="134" column="189" lean-forward="true" selection-start-line="134" selection-start-column="189" selection-end-line="134" selection-end-column="189" />
<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="300">
<caret line="129" column="172" lean-forward="true" selection-start-line="129" selection-start-column="172" selection-end-line="129" selection-end-column="172" />
<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="1315">
<caret line="99" column="21" lean-forward="true" selection-start-line="99" selection-start-column="21" selection-end-line="99" selection-end-column="21" />
<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="821">
<caret line="136" column="40" lean-forward="false" 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/api/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="104">
<caret line="642" column="13" lean-forward="false" selection-start-line="642" selection-start-column="13" selection-end-line="642" selection-end-column="13" />
<state relative-caret-position="167">
<caret line="703" column="33" lean-forward="false" selection-start-line="703" selection-start-column="33" selection-end-line="703" selection-end-column="33" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -943,102 +1128,64 @@
<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#21791#22721#0#PHP" expanded="false" />
<element signature="e#26992#27369#0#PHP" expanded="false" />
<element signature="e#27374#27813#0#PHP" expanded="false" />
<element signature="e#27819#28640#0#PHP" expanded="false" />
<element signature="e#28645#32049#0#PHP" expanded="false" />
<element signature="e#29091#32043#0#PHP" expanded="false" />
<element signature="e#32055#32560#0#PHP" expanded="false" />
<element signature="e#32565#32816#0#PHP" expanded="false" />
<element signature="e#32822#33301#0#PHP" expanded="false" />
<element signature="e#33306#34063#0#PHP" expanded="false" />
<element signature="e#34069#34550#0#PHP" expanded="false" />
<element signature="e#34555#35325#0#PHP" expanded="false" />
<element signature="e#35331#35694#0#PHP" expanded="false" />
<element signature="e#35699#35890#0#PHP" expanded="false" />
<element signature="e#35896#36254#0#PHP" expanded="false" />
<element signature="e#36259#36450#0#PHP" expanded="false" />
<element signature="e#36456#37599#0#PHP" expanded="false" />
<element signature="e#37604#40269#0#PHP" expanded="false" />
<element signature="e#40275#40773#0#PHP" expanded="false" />
<element signature="e#40778#42524#0#PHP" expanded="false" />
<element signature="e#42530#42943#0#PHP" expanded="false" />
<element signature="e#42948#43427#0#PHP" expanded="false" />
<element signature="e#43433#43967#0#PHP" expanded="false" />
<element signature="e#43972#45357#0#PHP" expanded="false" />
<element signature="e#45363#46017#0#PHP" expanded="false" />
<element signature="e#46022#48037#0#PHP" expanded="false" />
<element signature="e#48043#48803#0#PHP" expanded="false" />
<element signature="e#48808#51517#0#PHP" expanded="false" />
<element signature="e#51543#52374#0#PHP" expanded="false" />
<element signature="e#52380#52800#0#PHP" expanded="false" />
<element signature="e#52805#53288#0#PHP" expanded="false" />
<element signature="e#53294#54100#0#PHP" expanded="false" />
<element signature="e#54105#57263#0#PHP" expanded="false" />
<element signature="e#55898#57257#0#PHP" expanded="false" />
<element signature="e#57278#58613#0#PHP" expanded="false" />
<element signature="e#57394#57796#0#PHP" expanded="false" />
<element signature="e#58629#59663#0#PHP" expanded="false" />
<element signature="e#59669#60427#0#PHP" expanded="false" />
<element signature="e#60432#64175#0#PHP" expanded="false" />
<element signature="e#64181#64573#0#PHP" expanded="false" />
<element signature="e#64578#65530#0#PHP" expanded="false" />
<element signature="e#65554#66127#0#PHP" expanded="false" />
<element signature="e#66133#66732#0#PHP" expanded="false" />
<element signature="e#66737#67664#0#PHP" expanded="false" />
<element signature="e#67670#68384#0#PHP" expanded="false" />
<element signature="e#68390#68817#0#PHP" expanded="false" />
<element signature="e#68822#69291#0#PHP" expanded="false" />
<element signature="e#69298#70503#0#PHP" expanded="false" />
<element signature="e#70508#72211#0#PHP" expanded="false" />
<element signature="e#72217#72994#0#PHP" expanded="false" />
<element signature="e#72999#76937#0#PHP" expanded="false" />
<element signature="e#76943#77452#0#PHP" expanded="false" />
<element signature="e#77457#78129#0#PHP" expanded="false" />
<element signature="e#18083#22210#0#PHP" expanded="false" />
<element signature="e#22216#23146#0#PHP" expanded="false" />
<element signature="e#23151#27836#0#PHP" expanded="false" />
<element signature="e#27842#28219#0#PHP" expanded="false" />
<element signature="e#28224#28663#0#PHP" expanded="false" />
<element signature="e#28669#29490#0#PHP" expanded="false" />
<element signature="e#29495#32899#0#PHP" expanded="false" />
<element signature="e#29941#32893#0#PHP" expanded="false" />
<element signature="e#32905#33410#0#PHP" expanded="false" />
<element signature="e#33415#33666#0#PHP" expanded="false" />
<element signature="e#33672#34151#0#PHP" expanded="false" />
<element signature="e#34156#34913#0#PHP" expanded="false" />
<element signature="e#34919#35400#0#PHP" expanded="false" />
<element signature="e#35405#36175#0#PHP" expanded="false" />
<element signature="e#36181#36544#0#PHP" expanded="false" />
<element signature="e#36549#36740#0#PHP" expanded="false" />
<element signature="e#36746#37104#0#PHP" expanded="false" />
<element signature="e#37109#37300#0#PHP" expanded="false" />
<element signature="e#37306#38449#0#PHP" expanded="false" />
<element signature="e#38454#41119#0#PHP" expanded="false" />
<element signature="e#41125#41623#0#PHP" expanded="false" />
<element signature="e#41628#43374#0#PHP" expanded="false" />
<element signature="e#43380#43793#0#PHP" expanded="false" />
<element signature="e#43798#44277#0#PHP" expanded="false" />
<element signature="e#44283#44817#0#PHP" expanded="false" />
<element signature="e#44822#46207#0#PHP" expanded="false" />
<element signature="e#46213#46867#0#PHP" expanded="false" />
<element signature="e#46872#48887#0#PHP" expanded="false" />
<element signature="e#48893#49653#0#PHP" expanded="false" />
<element signature="e#49658#52367#0#PHP" expanded="false" />
<element signature="e#52393#53224#0#PHP" expanded="false" />
<element signature="e#53230#53650#0#PHP" expanded="false" />
<element signature="e#53655#54138#0#PHP" expanded="false" />
<element signature="e#54144#54950#0#PHP" expanded="false" />
<element signature="e#54955#58113#0#PHP" expanded="false" />
<element signature="e#56748#58107#0#PHP" expanded="false" />
<element signature="e#58128#59463#0#PHP" expanded="false" />
<element signature="e#58244#58646#0#PHP" expanded="false" />
<element signature="e#59479#60513#0#PHP" expanded="false" />
<element signature="e#60519#61277#0#PHP" expanded="false" />
<element signature="e#61282#65025#0#PHP" expanded="false" />
<element signature="e#65031#65423#0#PHP" expanded="false" />
<element signature="e#65428#66380#0#PHP" expanded="false" />
<element signature="e#66404#66977#0#PHP" expanded="false" />
<element signature="e#66983#67582#0#PHP" expanded="false" />
<element signature="e#67587#68514#0#PHP" expanded="false" />
<element signature="e#68520#69234#0#PHP" expanded="false" />
<element signature="e#69240#69667#0#PHP" expanded="false" />
<element signature="e#69672#70141#0#PHP" expanded="false" />
<element signature="e#70148#71353#0#PHP" expanded="false" />
<element signature="e#71358#73061#0#PHP" expanded="false" />
<element signature="e#73067#73844#0#PHP" expanded="false" />
<element signature="e#73849#77787#0#PHP" expanded="false" />
<element signature="e#77793#78302#0#PHP" expanded="false" />
<element signature="e#78307#78979#0#PHP" expanded="false" />
</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/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="34" column="129" lean-forward="false" selection-start-line="34" selection-start-column="129" selection-end-line="34" selection-end-column="140" />
<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="480">
<caret line="31" column="28" lean-forward="true" selection-start-line="31" selection-start-column="28" selection-end-line="31" selection-end-column="28" />
<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="391">
<caret line="32" column="81" lean-forward="true" selection-start-line="32" selection-start-column="81" selection-end-line="32" selection-end-column="81" />
<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="555">
<caret line="32" column="81" lean-forward="true" selection-start-line="32" selection-start-column="81" selection-end-line="32" selection-end-column="81" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -32,7 +32,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Keyword')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-keyword" data-rule="required" class="form-control" name="row[keyword]" type="text" placeholder="请输入关键字(多个用单个空格隔开)">
<input id="c-keyword" class="form-control" name="row[keyword]" type="text" placeholder="请输入关键字(多个用单个空格隔开)">
</div>
</div>
<div class="form-group">
... ... @@ -99,12 +99,12 @@
<!--{: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">
{:build_radios('row[is_top]', ['0'=>__('否'), '1'=>__('是')])}
</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'=>__('是')])}-->
<!--</div>-->
<!--</div>-->
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -32,7 +32,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Keyword')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-keyword" data-rule="required" class="form-control" name="row[keyword]" type="text" value="{$row.keyword|htmlentities}" placeholder="请输入关键字(多个用单个空格隔开)">
<input id="c-keyword" class="form-control" name="row[keyword]" type="text" value="{$row.keyword|htmlentities}" placeholder="请输入关键字(多个用单个空格隔开)">
</div>
</div>
<div class="form-group">
... ... @@ -99,12 +99,12 @@
<!--{: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">
{:build_radios('row[is_top]', ['0'=>__('否'), '1'=>__('是')], $row['is_top'])}
</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'])}-->
<!--</div>-->
<!--</div>-->
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -32,7 +32,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Keyword')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-keyword" data-rule="required" class="form-control" name="row[keyword]" type="text" placeholder="请输入视频关键词(多个用单个空格隔开)">
<input id="c-keyword" class="form-control" name="row[keyword]" type="text" placeholder="请输入视频关键词(多个用单个空格隔开)">
</div>
</div>
<div class="form-group">
... ... @@ -127,7 +127,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('2K分辨率')}:</label>
<div class="col-xs-12 col-sm-8">
{:Form::checkboxs('row[two]', ['2K 分辨率 1920*1080'=>__('2K 分辨率 1920*1080'), '2K 分辨率 1920*1280'=>__('2K 分辨率 1920*1280'),'2K 分辨率 2560*1440'=>__('2K 分辨率 2560*1440')],['data-rule'=>'required'])}
{:build_radios('row[two]', ['2K 分辨率 1920*1080'=>__('2K 分辨率 1920*1080'), '2K 分辨率 1920*1280'=>__('2K 分辨率 1920*1280'),'2K 分辨率 2560*1440'=>__('2K 分辨率 2560*1440')])}
</div>
</div>
<div class="form-group">
... ... @@ -160,12 +160,12 @@
{:Form::checkboxs('row[eight_price]', ['2800'=>__('2800'), '1'=>__('3800'),'2'=>__('4800')],['data-rule'=>'required'])}
</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'=>__('是')])}
</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'=>__('是')])}-->
<!--</div>-->
<!--</div>-->
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -32,7 +32,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Keyword')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-keyword" data-rule="required" class="form-control" name="row[keyword]" type="text" value="{$row.keyword|htmlentities}" placeholder="请输入关键字(多个用单个空格隔开)">
<input id="c-keyword" class="form-control" name="row[keyword]" type="text" value="{$row.keyword|htmlentities}" placeholder="请输入关键字(多个用单个空格隔开)">
</div>
</div>
<div class="form-group">
... ... @@ -126,7 +126,7 @@
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('2K分辨率')}:</label>
<div class="col-xs-12 col-sm-8">
{:Form::checkboxs('row[two]', ['2K 分辨率 1920*1080'=>__('2K 分辨率 1920*1080'), '2K 分辨率 1920*1280'=>__('2K 分辨率 1920*1280'),'2K 分辨率 2560*1440'=>__('2K 分辨率 2560*1440')],$row['two'])}
{:build_radios('row[two]', ['2K 分辨率 1920*1080'=>__('2K 分辨率 1920*1080'), '2K 分辨率 1920*1280'=>__('2K 分辨率 1920*1280'),'2K 分辨率 2560*1440'=>__('2K 分辨率 2560*1440')],$row['two'])}
</div>
</div>
<div class="form-group">
... ... @@ -161,12 +161,12 @@
</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'])}
</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'])}-->
<!--</div>-->
<!--</div>-->
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
... ...
... ... @@ -606,6 +606,12 @@ class User extends Api
}
$a = trim($key,',');
$data['keyword'] = explode(',',$a);
array_push($data['keyword'],$data['price']);
foreach ($data['keyword'] as $k=>$v){
if(!$v){
unset($data['keyword'][$k]);
}
}
$click_num = $data['click_num'] + 1;
Db::name('pic')->where('id',$pic_id)->update(['click_num'=>$click_num]);
$data['accredit'] = $rule.$accredit['thumbnail'];
... ... @@ -647,7 +653,12 @@ class User extends Api
$accredit = Db::name('accredit')
->where('id',1)
->find();
array_push($data['keyword'],$data['price']);
foreach ($data['keyword'] as $k=>$v){
if(!$v){
unset($data['keyword'][$k]);
}
}
$click_num = $data['click_num'] + 1;
Db::name('pic')->where('id',$pic_id)->update(['click_num'=>$click_num]);
$data['is_vip'] = 1;
... ... @@ -732,7 +743,12 @@ class User extends Api
$key = $keyword.','.$keywords;
}
$data['keyword'] = explode(',',$key);
array_push($data['keyword'],$data['price']);
foreach ($data['keyword'] as $k=>$v){
if(!$v){
unset($data['keyword'][$k]);
}
}
$accredit = Db::name('accredit')
->where('id',1)
->find();
... ... @@ -777,6 +793,12 @@ class User extends Api
$key = $keyword.','.$keywords;
}
$data['keyword'] = explode(',',$key);
array_push($data['keyword'],$data['price']);
foreach ($data['keyword'] as $k=>$v){
if(!$v){
unset($data['keyword'][$k]);
}
}
$accredit = Db::name('accredit')
->where('id',1)
->find();
... ...
... ... @@ -7679,7 +7679,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-03-17 09:33:36 </div>
Generated on 2020-03-21 16:13:18 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...