郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 2f4139aa41be81747562992f8df176caafb0db02 1 个父辈 5a4f2c5f
1 个管道 的构建 通过 耗费 10 秒

修改后台点选视频介绍

内嵌 并排对比
正在显示 3 个修改的文件 包含 289 行增加 和 191 行删除
... ... @@ -5,8 +5,9 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/controller/Video.php" afterPath="$PROJECT_DIR$/application/admin/controller/Video.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/video/add.html" afterPath="$PROJECT_DIR$/application/admin/view/video/add.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -17,96 +18,69 @@
</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="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="200">
<caret line="322" column="0" lean-forward="true" selection-start-line="322" selection-start-column="0" selection-end-line="322" selection-end-column="0" />
<state relative-caret-position="183">
<caret line="128" column="17" lean-forward="true" selection-start-line="128" selection-start-column="17" selection-end-line="128" selection-end-column="17" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
<element signature="e#2947#3309#0#PHP" expanded="false" />
<element signature="e#3314#3604#0#PHP" expanded="false" />
<element signature="e#3610#3932#0#PHP" expanded="false" />
<element signature="e#3937#4224#0#PHP" expanded="false" />
<element signature="e#4231#4665#0#PHP" expanded="false" />
<element signature="e#4670#5028#0#PHP" expanded="false" />
<element signature="e#5034#5441#0#PHP" expanded="false" />
<element signature="e#5446#5789#0#PHP" expanded="false" />
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#8083#8594#0#PHP" expanded="false" />
<element signature="e#8631#9654#0#PHP" expanded="false" />
<element signature="e#9691#10690#0#PHP" expanded="false" />
<element signature="e#10730#11786#0#PHP" expanded="false" />
<element signature="e#12332#13012#0#PHP" expanded="false" />
<element signature="e#13017#13930#0#PHP" expanded="false" />
<element signature="e#13936#14725#0#PHP" expanded="false" />
<element signature="e#14730#16079#0#PHP" expanded="false" />
<element signature="e#16085#16787#0#PHP" expanded="false" />
<element signature="e#16792#18112#0#PHP" expanded="false" />
<element signature="e#18118#18694#0#PHP" expanded="false" />
<element signature="e#18699#19311#0#PHP" expanded="false" />
<element signature="e#19317#20033#0#PHP" expanded="false" />
<element signature="e#20038#22578#0#PHP" expanded="false" />
<element signature="e#22584#23514#0#PHP" expanded="false" />
<element signature="e#23519#27569#0#PHP" expanded="false" />
<element signature="e#23747#27563#0#PHP" expanded="false" />
<element signature="e#27575#27952#0#PHP" expanded="false" />
<element signature="e#27957#28399#0#PHP" expanded="false" />
<element signature="e#28405#29140#0#PHP" expanded="false" />
<element signature="e#29145#30817#0#PHP" expanded="false" />
<element signature="e#30823#31328#0#PHP" expanded="false" />
<element signature="e#31333#31584#0#PHP" expanded="false" />
<element signature="e#31590#32069#0#PHP" expanded="false" />
<element signature="e#32074#32831#0#PHP" expanded="false" />
<element signature="e#32837#33318#0#PHP" expanded="false" />
<element signature="e#33323#34093#0#PHP" expanded="false" />
<element signature="e#34099#34462#0#PHP" expanded="false" />
<element signature="e#34467#34658#0#PHP" expanded="false" />
<element signature="e#34664#35022#0#PHP" expanded="false" />
<element signature="e#35027#35218#0#PHP" expanded="false" />
<element signature="e#35224#36367#0#PHP" expanded="false" />
<element signature="e#36372#39037#0#PHP" expanded="false" />
<element signature="e#39043#39541#0#PHP" expanded="false" />
<element signature="e#39546#41292#0#PHP" expanded="false" />
<element signature="e#41298#41711#0#PHP" expanded="false" />
<element signature="e#41716#42195#0#PHP" expanded="false" />
<element signature="e#42201#42735#0#PHP" expanded="false" />
<element signature="e#42740#44125#0#PHP" expanded="false" />
<element signature="e#44131#44785#0#PHP" expanded="false" />
<element signature="e#44790#46805#0#PHP" expanded="false" />
<element signature="e#46811#47571#0#PHP" expanded="false" />
<element signature="e#47576#50285#0#PHP" expanded="false" />
<element signature="e#50311#51142#0#PHP" expanded="false" />
<element signature="e#51148#51568#0#PHP" expanded="false" />
<element signature="e#51573#52056#0#PHP" expanded="false" />
<element signature="e#52062#52868#0#PHP" expanded="false" />
<element signature="e#52873#56031#0#PHP" expanded="false" />
<element signature="e#53252#56025#0#PHP" expanded="false" />
<element signature="e#56046#57381#0#PHP" expanded="false" />
<element signature="e#57397#58431#0#PHP" expanded="false" />
<element signature="e#58437#59195#0#PHP" expanded="false" />
<element signature="e#59200#62943#0#PHP" expanded="false" />
<element signature="e#62949#63341#0#PHP" expanded="false" />
<element signature="e#63346#64298#0#PHP" expanded="false" />
<element signature="e#64322#64895#0#PHP" expanded="false" />
<element signature="e#64901#65500#0#PHP" expanded="false" />
<element signature="e#65505#66432#0#PHP" expanded="false" />
<element signature="e#66438#67152#0#PHP" expanded="false" />
<element signature="e#67158#67585#0#PHP" expanded="false" />
<element signature="e#67590#68059#0#PHP" expanded="false" />
<element signature="e#68066#69271#0#PHP" expanded="false" />
<element signature="e#69276#70979#0#PHP" expanded="false" />
<element signature="e#70985#71762#0#PHP" expanded="false" />
<element signature="e#71767#75705#0#PHP" expanded="false" />
<element signature="e#75711#76220#0#PHP" expanded="false" />
<element signature="e#76225#76897#0#PHP" expanded="false" />
<element signature="e#700#2169#0#PHP" expanded="false" />
<element signature="e#2450#2641#0#PHP" expanded="false" />
<element signature="e#2572#2641#0#PHP" expanded="false" />
<element signature="e#2658#2853#0#PHP" expanded="false" />
<element signature="e#2783#2853#0#PHP" expanded="false" />
<element signature="e#2870#3069#0#PHP" expanded="false" />
<element signature="e#2998#3069#0#PHP" expanded="false" />
<element signature="e#3148#3333#0#PHP" expanded="false" />
<element signature="e#3239#3333#0#PHP" expanded="false" />
<element signature="e#3350#3538#0#PHP" expanded="false" />
<element signature="e#3443#3538#0#PHP" expanded="false" />
<element signature="e#3555#3746#0#PHP" expanded="false" />
<element signature="e#3650#3746#0#PHP" expanded="false" />
<element signature="e#3787#3875#0#PHP" expanded="false" />
<element signature="e#3892#3990#0#PHP" expanded="false" />
<element signature="e#4007#4107#0#PHP" expanded="false" />
<element signature="e#7299#7474#0#PHP" expanded="false" />
<element signature="e#7413#7474#0#PHP" expanded="false" />
<element signature="e#7487#7666#0#PHP" expanded="false" />
<element signature="e#7604#7666#0#PHP" expanded="false" />
<element signature="e#7679#7862#0#PHP" expanded="false" />
<element signature="e#7799#7862#0#PHP" expanded="false" />
<element signature="e#7929#8094#0#PHP" expanded="false" />
<element signature="e#8012#8094#0#PHP" expanded="false" />
<element signature="e#8107#8275#0#PHP" expanded="false" />
<element signature="e#8192#8275#0#PHP" expanded="false" />
<element signature="e#8288#8459#0#PHP" expanded="false" />
<element signature="e#8375#8459#0#PHP" expanded="false" />
<element signature="e#8492#8572#0#PHP" expanded="false" />
<element signature="e#8585#8675#0#PHP" expanded="false" />
<element signature="e#8688#8780#0#PHP" expanded="false" />
<element signature="e#11263#11507#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="add.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1193">
<caret line="157" column="85" lean-forward="true" selection-start-line="157" selection-start-column="85" selection-end-line="157" selection-end-column="85" />
<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="200">
<caret line="119" column="28" lean-forward="true" selection-start-line="119" selection-start-column="28" selection-end-line="119" selection-end-column="28" />
<folding />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -140,8 +114,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/pic.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pic.js" />
<option value="$PROJECT_DIR$/application/admin/view/pic/add.html" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/wonderful.php" />
<option value="$PROJECT_DIR$/application/admin/view/wonderful/add.html" />
... ... @@ -157,11 +129,8 @@
<option value="$PROJECT_DIR$/application/admin/view/feng/index.html" />
<option value="$PROJECT_DIR$/application/admin/view/feng/edit.html" />
<option value="$PROJECT_DIR$/application/api/controller/Common.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
<option value="$PROJECT_DIR$/application/admin/view/pic/edit.html" />
<option value="$PROJECT_DIR$/application/common/controller/Api.php" />
<option value="$PROJECT_DIR$/application/common/library/Auth.php" />
<option value="$PROJECT_DIR$/application/admin/view/cover/add.html" />
<option value="$PROJECT_DIR$/application/admin/view/cover/index.html" />
<option value="$PROJECT_DIR$/application/admin/view/cover/edit.html" />
... ... @@ -187,10 +156,15 @@
<option value="$PROJECT_DIR$/application/admin/view/share/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/share.js" />
<option value="$PROJECT_DIR$/application/admin/view/video/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
<option value="$PROJECT_DIR$/application/common/controller/Api.php" />
<option value="$PROJECT_DIR$/application/common/library/Token.php" />
<option value="$PROJECT_DIR$/application/common/library/Auth.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
<option value="$PROJECT_DIR$/application/api/controller/Notify.php" />
<option value="$PROJECT_DIR$/application/api/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<option value="$PROJECT_DIR$/application/admin/view/video/add.html" />
</list>
</option>
</component>
... ... @@ -209,10 +183,10 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="581" />
<option name="y" value="-18" />
<option name="width" value="1513" />
<option name="height" value="971" />
<option name="x" value="-161" />
<option name="y" value="133" />
<option name="width" value="1940" />
<option name="height" value="978" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -247,29 +221,7 @@
<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" />
</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="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="video" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
... ... @@ -411,6 +363,7 @@
<workItem from="1583540220249" duration="10194000" />
<workItem from="1583551237397" duration="11815000" />
<workItem from="1583714063562" duration="30914000" />
<workItem from="1583799928944" duration="8921000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -437,7 +390,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="563593000" />
<option name="totallyTimeSpent" value="572514000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -452,7 +405,7 @@
<frame x="-8" y="-8" width="1936" height="1056" extended-state="7" />
<editor active="true" />
<layout>
<window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.17687543" 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.1369936" 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.329602" 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" />
... ... @@ -507,48 +460,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="458">
<caret line="624" column="0" lean-forward="false" selection-start-line="624" selection-start-column="0" selection-end-line="624" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/feng/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<caret line="2" column="4" lean-forward="false" selection-start-line="2" selection-start-column="4" selection-end-line="15" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/cover/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="3" column="28" lean-forward="true" selection-start-line="3" selection-start-column="28" selection-end-line="3" selection-end-column="28" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/feng/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="50">
<caret line="2" column="4" lean-forward="false" selection-start-line="2" selection-start-column="4" selection-end-line="15" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/cover/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
<caret line="6" column="139" lean-forward="false" selection-start-line="6" selection-start-column="139" selection-end-line="6" selection-end-column="150" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/cover/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="100">
<caret line="4" column="40" lean-forward="true" selection-start-line="4" selection-start-column="40" selection-end-line="4" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/cover.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="675">
... ... @@ -663,7 +574,6 @@
<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>
... ... @@ -1029,38 +939,81 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<entry file="file://$PROJECT_DIR$/application/common/library/token/Driver.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="269">
<caret line="35" column="22" lean-forward="false" selection-start-line="35" selection-start-column="22" selection-end-line="35" selection-end-column="22" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/library/Token.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="513">
<caret line="184" column="0" lean-forward="true" selection-start-line="184" selection-start-column="0" selection-end-line="184" selection-end-column="0" />
<state relative-caret-position="1462">
<caret line="63" column="27" lean-forward="false" selection-start-line="63" selection-start-column="27" selection-end-line="63" selection-end-column="27" />
<folding>
<element signature="e#700#2169#0#PHP" expanded="false" />
<element signature="e#2201#5830#0#PHP" expanded="false" />
<element signature="e#9580#9824#0#PHP" expanded="false" />
<element signature="e#1361#1911#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/add.html">
<entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
<caret line="34" column="135" lean-forward="false" selection-start-line="34" selection-start-column="135" selection-end-line="34" selection-end-column="135" />
<state relative-caret-position="1450">
<caret line="128" column="54" lean-forward="true" selection-start-line="128" selection-start-column="54" selection-end-line="128" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/edit.html">
<entry file="file://$PROJECT_DIR$/application/common/library/Auth.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1900">
<caret line="94" column="10" lean-forward="false" selection-start-line="94" selection-start-column="10" selection-end-line="94" selection-end-column="10" />
<folding />
<state relative-caret-position="411">
<caret line="87" column="20" lean-forward="true" selection-start-line="87" selection-start-column="20" selection-end-line="87" selection-end-column="20" />
<folding>
<element signature="e#1533#1626#0#PHP" expanded="false" />
<element signature="e#2650#2877#0#PHP" expanded="false" />
<element signature="e#2882#4805#0#PHP" expanded="false" />
<element signature="e#4811#4943#0#PHP" expanded="false" />
<element signature="e#4948#6186#0#PHP" expanded="false" />
<element signature="e#6192#6243#0#PHP" expanded="false" />
<element signature="e#6248#6612#0#PHP" expanded="false" />
<element signature="e#6618#6798#0#PHP" expanded="false" />
<element signature="e#6803#7890#0#PHP" expanded="false" />
<element signature="e#7896#7971#0#PHP" expanded="false" />
<element signature="e#7976#9295#0#PHP" expanded="false" />
<element signature="e#9301#9430#0#PHP" expanded="false" />
<element signature="e#9435#9943#0#PHP" expanded="false" />
<element signature="e#9949#9997#0#PHP" expanded="false" />
<element signature="e#10002#10127#0#PHP" expanded="false" />
<element signature="e#10133#10183#0#PHP" expanded="false" />
<element signature="e#10188#10256#0#PHP" expanded="false" />
<element signature="e#10262#10289#0#PHP" expanded="false" />
<element signature="e#10294#10595#0#PHP" expanded="false" />
<element signature="e#10601#10651#0#PHP" expanded="false" />
<element signature="e#10656#11069#0#PHP" expanded="false" />
<element signature="e#11075#11126#0#PHP" expanded="false" />
<element signature="e#11131#11208#0#PHP" expanded="false" />
<element signature="e#11214#11269#0#PHP" expanded="false" />
<element signature="e#11274#11355#0#PHP" expanded="false" />
<element signature="e#11361#11410#0#PHP" expanded="false" />
<element signature="e#11415#11494#0#PHP" expanded="false" />
<element signature="e#13082#13143#0#PHP" expanded="false" />
<element signature="e#13148#13236#0#PHP" expanded="false" />
<element signature="e#13242#13440#0#PHP" expanded="false" />
<element signature="e#13445#14406#0#PHP" expanded="false" />
<element signature="e#14412#14490#0#PHP" expanded="false" />
<element signature="e#14495#14593#0#PHP" expanded="false" />
<element signature="e#14599#14646#0#PHP" expanded="false" />
<element signature="e#14651#14744#0#PHP" expanded="false" />
<element signature="e#14750#14799#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="200">
<caret line="322" column="0" lean-forward="true" selection-start-line="322" selection-start-column="0" selection-end-line="322" selection-end-column="0" />
<state relative-caret-position="-34">
<caret line="227" column="7" lean-forward="true" selection-start-line="227" selection-start-column="7" selection-end-line="227" selection-end-column="7" />
<folding>
<element signature="e#535#1273#0#PHP" expanded="false" />
<element signature="e#1278#2941#0#PHP" expanded="false" />
... ... @@ -1074,10 +1027,8 @@
<element signature="e#5446#5789#0#PHP" expanded="false" />
<element signature="e#5795#6208#0#PHP" expanded="false" />
<element signature="e#6213#6530#0#PHP" expanded="false" />
<element signature="e#8083#8594#0#PHP" expanded="false" />
<element signature="e#8631#9654#0#PHP" expanded="false" />
<element signature="e#9691#10690#0#PHP" expanded="false" />
<element signature="e#10730#11786#0#PHP" expanded="false" />
<element signature="e#6536#7626#0#PHP" expanded="false" />
<element signature="e#7631#12326#0#PHP" expanded="false" />
<element signature="e#12332#13012#0#PHP" expanded="false" />
<element signature="e#13017#13930#0#PHP" expanded="false" />
<element signature="e#13936#14725#0#PHP" expanded="false" />
... ... @@ -1090,7 +1041,6 @@
<element signature="e#20038#22578#0#PHP" expanded="false" />
<element signature="e#22584#23514#0#PHP" expanded="false" />
<element signature="e#23519#27569#0#PHP" expanded="false" />
<element signature="e#23747#27563#0#PHP" expanded="false" />
<element signature="e#27575#27952#0#PHP" expanded="false" />
<element signature="e#27957#28399#0#PHP" expanded="false" />
<element signature="e#28405#29140#0#PHP" expanded="false" />
... ... @@ -1122,7 +1072,6 @@
<element signature="e#51573#52056#0#PHP" expanded="false" />
<element signature="e#52062#52868#0#PHP" expanded="false" />
<element signature="e#52873#56031#0#PHP" expanded="false" />
<element signature="e#53252#56025#0#PHP" expanded="false" />
<element signature="e#56046#57381#0#PHP" expanded="false" />
<element signature="e#57397#58431#0#PHP" expanded="false" />
<element signature="e#58437#59195#0#PHP" expanded="false" />
... ... @@ -1145,5 +1094,96 @@
</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="46">
<caret line="692" column="42" lean-forward="false" selection-start-line="692" selection-start-column="42" selection-end-line="692" selection-end-column="42" />
<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#16133#0#PHP" expanded="false" />
<element signature="e#6910#16066#0#PHP" expanded="false" />
<element signature="e#16139#16559#0#PHP" expanded="false" />
<element signature="e#16564#26588#0#PHP" expanded="false" />
<element signature="e#26605#26902#0#PHP" expanded="false" />
<element signature="e#26907#27300#0#PHP" expanded="false" />
<element signature="e#27327#30805#0#PHP" expanded="false" />
<element signature="e#30834#33739#0#PHP" expanded="false" />
<element signature="e#34571#35563#0#PHP" expanded="false" />
<element signature="e#39753#46925#0#PHP" expanded="false" />
<element signature="e#46948#47165#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Notify.php">
<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>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Video.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="183">
<caret line="128" column="17" lean-forward="true" selection-start-line="128" selection-start-column="17" selection-end-line="128" selection-end-column="17" />
<folding>
<element signature="e#700#2169#0#PHP" expanded="false" />
<element signature="e#2450#2641#0#PHP" expanded="false" />
<element signature="e#2572#2641#0#PHP" expanded="false" />
<element signature="e#2658#2853#0#PHP" expanded="false" />
<element signature="e#2783#2853#0#PHP" expanded="false" />
<element signature="e#2870#3069#0#PHP" expanded="false" />
<element signature="e#2998#3069#0#PHP" expanded="false" />
<element signature="e#3148#3333#0#PHP" expanded="false" />
<element signature="e#3239#3333#0#PHP" expanded="false" />
<element signature="e#3350#3538#0#PHP" expanded="false" />
<element signature="e#3443#3538#0#PHP" expanded="false" />
<element signature="e#3555#3746#0#PHP" expanded="false" />
<element signature="e#3650#3746#0#PHP" expanded="false" />
<element signature="e#3787#3875#0#PHP" expanded="false" />
<element signature="e#3892#3990#0#PHP" expanded="false" />
<element signature="e#4007#4107#0#PHP" expanded="false" />
<element signature="e#7299#7474#0#PHP" expanded="false" />
<element signature="e#7413#7474#0#PHP" expanded="false" />
<element signature="e#7487#7666#0#PHP" expanded="false" />
<element signature="e#7604#7666#0#PHP" expanded="false" />
<element signature="e#7679#7862#0#PHP" expanded="false" />
<element signature="e#7799#7862#0#PHP" expanded="false" />
<element signature="e#7929#8094#0#PHP" expanded="false" />
<element signature="e#8012#8094#0#PHP" expanded="false" />
<element signature="e#8107#8275#0#PHP" expanded="false" />
<element signature="e#8192#8275#0#PHP" expanded="false" />
<element signature="e#8288#8459#0#PHP" expanded="false" />
<element signature="e#8375#8459#0#PHP" expanded="false" />
<element signature="e#8492#8572#0#PHP" expanded="false" />
<element signature="e#8585#8675#0#PHP" expanded="false" />
<element signature="e#8688#8780#0#PHP" expanded="false" />
<element signature="e#11263#11507#0#PHP" expanded="false" />
</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="200">
<caret line="119" column="28" lean-forward="true" selection-start-line="119" selection-start-column="28" selection-end-line="119" selection-end-column="28" />
<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="1193">
<caret line="157" column="85" lean-forward="true" selection-start-line="157" selection-start-column="85" selection-end-line="157" selection-end-column="85" />
<folding />
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -85,25 +85,55 @@ class Video extends Backend
if ($params) {
$params = $this->preExcludeFields($params);
//截取提取码
if(!empty($params['two_url'])){
$params['two_code'] = substr($params['two_url'],-4);
}else{
$params['two_code'] = '';
}
if(!empty($params['four_url'])){
$params['four_code'] = substr($params['four_url'],-4);
}else{
$params['four_code'] = '';
}
if(!empty($params['eight_url'])){
$params['eight_code'] = substr($params['eight_url'],-4);
}else{
$params['eight_code'] = '';
}
$a = $params['one'];
//判断分辨率
if(!empty($params['two'])){
$a .= ','.$params['two'];
}else{
$params['two'] = '';
$a .= '';
}
if(!empty($params['four'])){
$a .= ','.$params['four'];
}else{
$params['four'] = '';
$a .= '';
}
if(!empty($params['eight'])){
$a .= ','.$params['eight'];
}else{
$params['eight'] = '';
$a .= '';
}
//判断价格
if(empty($params['price'])){
$params['price'] = 0;
}
if(empty($params['four_price'])){
$params['four_price'] = 0;
}
if(empty($params['eight_price'])){
$params['eight_price'] = 0;
}
$params['content'] = $a;
//如果内容关键字和地名关键字都为空
if($params['text_ids'] == '' && $params['address_ids'] == ''){
... ... @@ -186,24 +216,52 @@ class Video extends Backend
//截取提取码
if(!empty($params['two_url'])){
$params['two_code'] = substr($params['two_url'],-4);
}else{
$params['two_code'] = '';
}
if(!empty($params['four_url'])){
$params['four_code'] = substr($params['four_url'],-4);
}else{
$params['four_code'] = '';
}
if(!empty($params['eight_url'])){
$params['eight_code'] = substr($params['eight_url'],-4);
}else{
$params['eight_code'] = '';
}
$a = $params['one'];
//判断分辨率
if(!empty($params['two'])){
$a .= ','.$params['two'];
}else{
$params['two'] = '';
$a .= '';
}
if(!empty($params['four'])){
$a .= ','.$params['four'];
}else{
$params['four'] = '';
$a .= '';
}
if(!empty($params['eight'])){
$a .= ','.$params['eight'];
}else{
$params['eight'] = '';
$a .= '';
}
//判断价格
if(empty($params['price'])){
$params['price'] = 0;
}
if(empty($params['four_price'])){
$params['four_price'] = 0;
}
if(empty($params['eight_price'])){
$params['eight_price'] = 0;
}
$params['content'] = $a;
$params['type_ids'] =','.$params['type_ids'].',';
//如果内容关键字和地名关键字都为空
... ...
... ... @@ -127,37 +127,37 @@
<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')],'2K 分辨率 1920*1080',['data-rule'=>'required'])}
{: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'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('4K分辨率')}:</label>
<div class="col-xs-12 col-sm-8">
{:Form::checkboxs('row[four]', ['4K 分辨率 3840*2160'=>__('4K 分辨率 3840*2160'), '4K 分辨率 3840*2560'=>__('4K 分辨率 3840*2560'),'4K 分辨率 4096*2160'=>__('4K 分辨率 4096*2160')],'4K 分辨率 3840*2160',['data-rule'=>'required'])}
{:Form::checkboxs('row[four]', ['4K 分辨率 3840*2160'=>__('4K 分辨率 3840*2160'), '4K 分辨率 3840*2560'=>__('4K 分辨率 3840*2560'),'4K 分辨率 4096*2160'=>__('4K 分辨率 4096*2160')],['data-rule'=>'required'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('8K分辨率')}:</label>
<div class="col-xs-12 col-sm-8">
{:Form::checkboxs('row[eight]', ['8K 分辨率 7680*4320'=>__('8K 分辨率 7680*4320'), '6K 分辨率 6144*3456'=>__('6K 分辨率 6144*3456'),'5K 分辨率 5568*3648'=>__('5K 分辨率 5568*3648')],'8K 分辨率 7680*4320',['data-rule'=>'required'])}
{:Form::checkboxs('row[eight]', ['8K 分辨率 7680*4320'=>__('8K 分辨率 7680*4320'), '6K 分辨率 6144*3456'=>__('6K 分辨率 6144*3456'),'5K 分辨率 5568*3648'=>__('5K 分辨率 5568*3648')],['data-rule'=>'required'])}
</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">
{:Form::checkboxs('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800')], '800', ['data-rule'=>'required'])}
{:Form::checkboxs('row[price]', ['800'=>__('800'), '1200'=>__('1200'),'1800'=>__('1800')],['data-rule'=>'required'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Four_price')}:</label>
<div class="col-xs-12 col-sm-8">
{:Form::checkboxs('row[four_price]', ['1200'=>__('1200'), '2000'=>__('2000'),'2800'=>__('2800')], '1200', ['data-rule'=>'required'])}
{:Form::checkboxs('row[four_price]', ['1200'=>__('1200'), '2000'=>__('2000'),'2800'=>__('2800')],['data-rule'=>'required'])}
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Eight_price')}:</label>
<div class="col-xs-12 col-sm-8">
{:Form::checkboxs('row[eight_price]', ['2800'=>__('2800'), '1'=>__('3800'),'2'=>__('4800')], '2800', ['data-rule'=>'required'])}
{:Form::checkboxs('row[eight_price]', ['2800'=>__('2800'), '1'=>__('3800'),'2'=>__('4800')],['data-rule'=>'required'])}
</div>
</div>
<div class="form-group">
... ...