郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 4f6a2cd4d6cd7f24f85dda2a7a3b0ef26f7270c3 1 个父辈 b4bb305e
1 个管道 的构建 通过 耗费 6 秒

添加提取码

内嵌 并排对比
正在显示 9 个修改的文件 包含 223 行增加 和 188 行删除
... ... @@ -2,8 +2,14 @@
<project version="4">
<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/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.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/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$/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" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -14,90 +20,42 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="User.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<file leaf-file-name="add.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-3">
<caret line="1201" column="14" lean-forward="true" selection-start-line="1201" selection-start-column="14" selection-end-line="1201" selection-end-column="14" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<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#4206#0#PHP" expanded="false" />
<element signature="e#4212#4619#0#PHP" expanded="false" />
<element signature="e#4624#4967#0#PHP" expanded="false" />
<element signature="e#4973#5810#0#PHP" expanded="false" />
<element signature="e#5815#8010#0#PHP" expanded="false" />
<element signature="e#8016#8661#0#PHP" expanded="false" />
<element signature="e#8666#9750#0#PHP" expanded="false" />
<element signature="e#9756#10458#0#PHP" expanded="false" />
<element signature="e#10463#11663#0#PHP" expanded="false" />
<element signature="e#11669#12245#0#PHP" expanded="false" />
<element signature="e#12250#12797#0#PHP" expanded="false" />
<element signature="e#12803#13487#0#PHP" expanded="false" />
<element signature="e#13492#15282#0#PHP" expanded="false" />
<element signature="e#15288#16158#0#PHP" expanded="false" />
<element signature="e#16163#18311#0#PHP" expanded="false" />
<element signature="e#18317#18694#0#PHP" expanded="false" />
<element signature="e#18699#18963#0#PHP" expanded="false" />
<element signature="e#18969#19474#0#PHP" expanded="false" />
<element signature="e#19479#19730#0#PHP" expanded="false" />
<element signature="e#19736#20215#0#PHP" expanded="false" />
<element signature="e#20220#20977#0#PHP" expanded="false" />
<element signature="e#20983#21464#0#PHP" expanded="false" />
<element signature="e#21469#22239#0#PHP" expanded="false" />
<element signature="e#22245#22608#0#PHP" expanded="false" />
<element signature="e#22613#22804#0#PHP" expanded="false" />
<element signature="e#22810#23168#0#PHP" expanded="false" />
<element signature="e#23173#23363#0#PHP" expanded="false" />
<element signature="e#23369#24512#0#PHP" expanded="false" />
<element signature="e#24517#27182#0#PHP" expanded="false" />
<element signature="e#27188#27686#0#PHP" expanded="false" />
<element signature="e#27691#29056#0#PHP" expanded="false" />
<element signature="e#29062#29475#0#PHP" expanded="false" />
<element signature="e#29480#29959#0#PHP" expanded="false" />
<element signature="e#29965#30499#0#PHP" expanded="false" />
<element signature="e#30504#31418#0#PHP" expanded="false" />
<element signature="e#31424#32078#0#PHP" expanded="false" />
<element signature="e#32083#33350#0#PHP" expanded="false" />
<element signature="e#33356#34116#0#PHP" expanded="false" />
<element signature="e#34121#35196#0#PHP" expanded="false" />
<element signature="e#35222#36053#0#PHP" expanded="false" />
<element signature="e#36059#36479#0#PHP" expanded="false" />
<element signature="e#36484#36967#0#PHP" expanded="false" />
<element signature="e#36973#37779#0#PHP" expanded="false" />
<element signature="e#40953#42313#0#PHP" expanded="false" />
<element signature="e#42329#43388#0#PHP" expanded="false" />
<element signature="e#43395#44153#0#PHP" expanded="false" />
<element signature="e#44158#46422#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="280">
<caret line="54" column="28" lean-forward="true" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<file leaf-file-name="pic.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625">
<caret line="247" column="31" lean-forward="false" selection-start-line="247" selection-start-column="31" selection-end-line="247" selection-end-column="31" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
<element signature="e#575#888#0#PHP" expanded="false" />
<element signature="e#893#2938#0#PHP" expanded="false" />
<element signature="e#2944#3264#0#PHP" expanded="false" />
<element signature="e#3269#5320#0#PHP" expanded="false" />
<element signature="e#5326#5744#0#PHP" expanded="false" />
<element signature="e#5749#9603#0#PHP" expanded="false" />
<element signature="e#9609#10029#0#PHP" expanded="false" />
<element signature="e#10034#13893#0#PHP" expanded="false" />
<element signature="e#13920#17622#0#PHP" expanded="false" />
<element signature="e#17652#20596#0#PHP" expanded="false" />
<element signature="e#20625#21455#0#PHP" expanded="false" />
<element signature="e#21484#22317#0#PHP" expanded="false" />
<element signature="e#22340#22557#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="384">
<caret line="33" column="55" lean-forward="false" selection-start-line="33" selection-start-column="55" selection-end-line="33" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="pic.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="16" column="29" lean-forward="true" selection-start-line="16" selection-start-column="29" selection-end-line="16" selection-end-column="29" />
<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/pic/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="366">
<caret line="59" column="10" lean-forward="false" selection-start-line="59" selection-start-column="10" selection-end-line="59" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
... ... @@ -140,24 +98,24 @@
<option value="$PROJECT_DIR$/.gitignore" />
<option value="$PROJECT_DIR$/public/.gitignore" />
<option value="$PROJECT_DIR$/application/common/library/Auth.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/video.php" />
<option value="$PROJECT_DIR$/composer.json" />
<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$/public/assets/js/backend/video.js" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<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$/application/admin/view/wonderful/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/wonderful/edit.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/wonderful.js" />
<option value="$PROJECT_DIR$/application/extra/verify.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/lang/zh-cn/video.php" />
<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/view/pic/edit.html" />
<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" />
</list>
</option>
</component>
... ... @@ -175,11 +133,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="104" />
<option name="y" value="-15" />
<component name="ProjectFrameBounds">
<option name="x" value="190" />
<option name="y" value="100" />
<option name="width" value="1806" />
<option name="height" value="1009" />
<option name="height" value="989" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -212,14 +170,22 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="lang" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="lang" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="zh-cn" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -275,7 +241,7 @@
<workItem from="1574295812843" duration="20536000" />
<workItem from="1574336957891" duration="1350000" />
<workItem from="1574382087071" duration="22007000" />
<workItem from="1574410294356" duration="5166000" />
<workItem from="1574410294356" duration="7006000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -288,7 +254,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="167113000" />
<option name="totallyTimeSpent" value="168953000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -300,16 +266,17 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<frame x="190" y="100" width="1806" height="989" extended-state="0" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.1380597" 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="true" show_stripe_button="true" weight="0.14833906" 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" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.14145811" 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.14908257" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Favorites" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="7" side_tool="false" content_ui="tabs" />
... ... @@ -469,13 +436,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="29" lean-forward="false" selection-start-line="7" selection-start-column="29" selection-end-line="7" selection-end-column="29" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1200">
... ... @@ -486,20 +446,6 @@
<entry file="file://$PROJECT_DIR$/application/api/controller/Demo.php" />
<entry file="file://$PROJECT_DIR$/application/api/controller/Ems.php" />
<entry file="file://$PROJECT_DIR$/application/api/controller/Index.php" />
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1464">
<caret line="169" column="0" lean-forward="true" selection-start-line="169" selection-start-column="0" selection-end-line="169" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="14" column="34" lean-forward="false" selection-start-line="14" selection-start-column="34" selection-end-line="14" selection-end-column="34" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/overtrue/wechat/composer.json">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -528,6 +474,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="297">
<caret line="25" column="6" lean-forward="false" selection-start-line="25" selection-start-column="6" selection-end-line="25" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
... ... @@ -535,6 +482,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="411">
<caret line="28" column="9" lean-forward="false" selection-start-line="28" selection-start-column="9" selection-end-line="28" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
... ... @@ -542,6 +490,7 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="261">
<caret line="25" column="58" lean-forward="false" selection-start-line="25" selection-start-column="58" selection-end-line="25" selection-end-column="58" />
<folding />
</state>
</provider>
</entry>
... ... @@ -601,27 +550,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="34" column="105" lean-forward="false" selection-start-line="34" selection-start-column="105" selection-end-line="34" selection-end-column="105" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="359">
<caret line="32" column="93" lean-forward="false" selection-start-line="32" selection-start-column="93" selection-end-line="32" selection-end-column="93" />
</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="330">
<caret line="59" column="10" lean-forward="false" selection-start-line="59" selection-start-column="10" selection-end-line="59" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -629,27 +557,6 @@
</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="441">
<caret line="65" column="10" lean-forward="false" selection-start-line="65" selection-start-column="10" selection-end-line="65" selection-end-column="10" />
</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="427">
<caret line="95" column="10" lean-forward="false" selection-start-line="95" selection-start-column="10" selection-end-line="95" selection-end-column="10" />
</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="427">
<caret line="95" column="10" lean-forward="false" selection-start-line="95" selection-start-column="10" selection-end-line="95" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/wonderful/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="427">
... ... @@ -678,35 +585,12 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625">
<caret line="247" column="31" lean-forward="false" selection-start-line="247" selection-start-column="31" selection-end-line="247" selection-end-column="31" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
<element signature="e#575#888#0#PHP" expanded="false" />
<element signature="e#893#2938#0#PHP" expanded="false" />
<element signature="e#2944#3264#0#PHP" expanded="false" />
<element signature="e#3269#5320#0#PHP" expanded="false" />
<element signature="e#5326#5744#0#PHP" expanded="false" />
<element signature="e#5749#9603#0#PHP" expanded="false" />
<element signature="e#9609#10029#0#PHP" expanded="false" />
<element signature="e#10034#13893#0#PHP" expanded="false" />
<element signature="e#13920#17622#0#PHP" expanded="false" />
<element signature="e#17652#20596#0#PHP" expanded="false" />
<element signature="e#20625#21455#0#PHP" expanded="false" />
<element signature="e#21484#22317#0#PHP" expanded="false" />
<element signature="e#22340#22557#0#PHP" expanded="false" />
</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="-3">
<state relative-caret-position="147">
<caret line="1201" column="14" lean-forward="true" selection-start-line="1201" selection-start-column="14" selection-end-line="1201" selection-end-column="14" />
<folding>
<element signature="e#38#68#0#PHP" expanded="true" />
<element signature="e#38#68#0#PHP" expanded="false" />
<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" />
... ... @@ -762,5 +646,100 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="202">
<caret line="247" column="31" lean-forward="false" selection-start-line="247" selection-start-column="31" selection-end-line="247" selection-end-column="31" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
<element signature="e#575#888#0#PHP" expanded="false" />
<element signature="e#893#2938#0#PHP" expanded="false" />
<element signature="e#2944#3264#0#PHP" expanded="false" />
<element signature="e#3269#5320#0#PHP" expanded="false" />
<element signature="e#5326#5744#0#PHP" expanded="false" />
<element signature="e#5749#9603#0#PHP" expanded="false" />
<element signature="e#9609#10029#0#PHP" expanded="false" />
<element signature="e#10034#13893#0#PHP" expanded="false" />
<element signature="e#13920#17622#0#PHP" expanded="false" />
<element signature="e#17652#20596#0#PHP" expanded="false" />
<element signature="e#20625#21455#0#PHP" expanded="false" />
<element signature="e#21484#22317#0#PHP" expanded="false" />
<element signature="e#22340#22557#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="125">
<caret line="5" column="30" lean-forward="true" selection-start-line="5" selection-start-column="30" selection-end-line="5" selection-end-column="30" />
<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="1312">
<caret line="82" column="14" lean-forward="true" selection-start-line="82" selection-start-column="14" selection-end-line="82" selection-end-column="14" />
<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="587">
<caret line="83" column="10" lean-forward="true" selection-start-line="83" selection-start-column="10" selection-end-line="83" selection-end-column="10" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/video.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="19" column="34" lean-forward="true" selection-start-line="19" selection-start-column="34" selection-end-line="19" selection-end-column="34" />
<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="1226">
<caret line="169" column="0" lean-forward="true" selection-start-line="169" selection-start-column="0" selection-end-line="169" 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="366">
<caret line="59" column="10" lean-forward="false" selection-start-line="59" selection-start-column="10" selection-end-line="59" selection-end-column="10" />
<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="280">
<caret line="54" column="28" lean-forward="true" selection-start-line="54" selection-start-column="28" selection-end-line="54" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="384">
<caret line="33" column="55" lean-forward="false" selection-start-line="33" selection-start-column="55" selection-end-line="33" selection-end-column="55" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="16" column="29" lean-forward="true" selection-start-line="16" selection-start-column="29" selection-end-line="16" selection-end-column="29" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -7,6 +7,7 @@ return [
'Type_ids' => '地区标签',
'Water_url' => '带水印的小样图片',
'Url' => '高清百度云盘地址',
'Code' =>'提取码',
'Is_recommend' => '是否精选',
'Content' => '图片介绍',
'Price' =>'正常价格',
... ...
... ... @@ -8,8 +8,11 @@ return [
'Video' => '2K视频',
'Water_url' => '带水印云盘地址',
'Two_url' => '2k视频地址',
'Two_code' => '2k提取码',
'Four_url' => '4k视频地址',
'Four_code' => '4k提取码',
'Eight_url' => '8k视频地址',
'Eight_code' => '8k提取码',
'Price' =>'2k正常价格',
'Four_price' =>'4K正常价格',
'Eight_price' =>'8K正常价格',
... ...
... ... @@ -53,6 +53,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-code" class="form-control" name="row[code]" type="text" placeholder="请输入提取码">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-price" data-rule="required" class="form-control" name="row[price]" type="text" placeholder="请输入普通价格">
... ...
... ... @@ -53,6 +53,12 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-code" class="form-control" name="row[code]" type="text" value="{$row.code|htmlentities}" placeholder="请输入提取码">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Price')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-price" data-rule="required" class="form-control" name="row[price]" type="text" value="{$row.price}" placeholder="请输入普通价格">
... ...
... ... @@ -59,18 +59,36 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Two_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-two_code" class="form-control" name="row[two_code]" type="text" placeholder="请输入2k提取码">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Four_url')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-four_url" class="form-control" name="row[four_url]" type="text" placeholder="请输入4k视频网址">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Four_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-four_code" class="form-control" name="row[four_code]" type="text" placeholder="请输入4k提取码">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Eight_url')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-eight_url" class="form-control" name="row[eight_url]" type="text" placeholder="请输入8k视频网址">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Eight_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-eight_code" class="form-control" name="row[eight_code]" type="text" placeholder="请输入8k提取码">
</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>
... ...
... ... @@ -59,18 +59,36 @@
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Two_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-two_code" class="form-control" name="row[two_code]" type="text" value="{$row.two_code|htmlentities}" placeholder="请输入2k提取码">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Four_url')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-four_url" class="form-control" name="row[four_url]" type="text" value="{$row.four_url|htmlentities}" placeholder="请输入4k云盘地址">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Four_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-four_code" class="form-control" name="row[four_code]" type="text" value="{$row.four_code|htmlentities}" placeholder="请输入4k提取码">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Eight_url')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-eight_url" class="form-control" name="row[eight_url]" type="text" value="{$row.eight_url|htmlentities}" placeholder="请输入8k云盘地址">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Eight_code')}:</label>
<div class="col-xs-12 col-sm-8">
<input id="c-eight_code" class="form-control" name="row[eight_code]" type="text" value="{$row.eight_code|htmlentities}" placeholder="请输入8k提取码">
</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>
... ...
... ... @@ -31,6 +31,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('pic/type')},
{field: 'water_url', title: __('Water_url'), events: Table.api.events.image,formatter: Table.api.formatter.image},
{field: 'url', title: __('Url'), formatter: Table.api.formatter.url},
{field: 'code', title: __('Code')},
{field: 'price', title: __('Price')},
// {field: 'vip_price', title: __('Vip_price')},
{field: 'buy_num', title: __('Buy_num')},
... ...
... ... @@ -31,8 +31,11 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'type_ids', title: __('Type_ids'),searchList:$.getJSON('video/type')},
{field: 'water_url', title: __('Water_url'), formatter: Table.api.formatter.url},
{field: 'two_url', title: __('Two_url'), formatter: Table.api.formatter.url},
{field: 'two_code', title: __('Two_code')},
{field: 'four_url', title: __('Four_url'), formatter: Table.api.formatter.url},
{field: 'four_code', title: __('Four_code')},
{field: 'eight_url', title: __('Eight_url'), formatter: Table.api.formatter.url},
{field: 'eight_code', title: __('Eight_code')},
{field: 'buy_num', title: __('Buy_num')},
{field: 'click_num', title: __('Click_num')},
{field: 'price', title: __('Price')},
... ...