郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 aba2c5b08b20a33a3389b544d7a6cd676eb99d7d 1 个父辈 5a107243
1 个管道 的构建 失败 耗费 5 秒

地区下的图片跟视频

内嵌 并排对比
正在显示 8 个修改的文件 包含 421 行增加 和 193 行删除
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="" />
<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/controller/Order.php" afterPath="$PROJECT_DIR$/application/admin/controller/Order.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" afterPath="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/model/Order.php" afterPath="$PROJECT_DIR$/application/admin/model/Order.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/order/index.html" afterPath="$PROJECT_DIR$/application/admin/view/order/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/api/controller/User.php" afterPath="$PROJECT_DIR$/application/api/controller/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/order.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/order.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
<option name="SHOW_DIALOG" value="false" />
... ... @@ -11,22 +19,67 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="Order.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<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="560">
<caret line="32" column="4" lean-forward="false" selection-start-line="32" selection-start-column="4" selection-end-line="32" selection-end-column="4" />
<folding />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="order.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="31" column="98" lean-forward="false" selection-start-line="31" selection-start-column="98" selection-end-line="31" selection-end-column="98" />
<folding />
<state relative-caret-position="248">
<caret line="355" column="0" lean-forward="true" selection-start-line="355" selection-start-column="0" selection-end-line="355" selection-end-column="0" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#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#9762#0#PHP" expanded="false" />
<element signature="e#11888#12590#0#PHP" expanded="false" />
<element signature="e#12595#13795#0#PHP" expanded="false" />
<element signature="e#13801#14377#0#PHP" expanded="false" />
<element signature="e#14382#14929#0#PHP" expanded="false" />
<element signature="e#14935#15619#0#PHP" expanded="false" />
<element signature="e#15624#17720#0#PHP" expanded="false" />
<element signature="e#17726#18596#0#PHP" expanded="false" />
<element signature="e#18601#21097#0#PHP" expanded="false" />
<element signature="e#21103#21480#0#PHP" expanded="false" />
<element signature="e#21485#21749#0#PHP" expanded="false" />
<element signature="e#21755#22260#0#PHP" expanded="false" />
<element signature="e#22265#22516#0#PHP" expanded="false" />
<element signature="e#22522#23001#0#PHP" expanded="false" />
<element signature="e#23006#23763#0#PHP" expanded="false" />
<element signature="e#23769#24250#0#PHP" expanded="false" />
<element signature="e#24255#25025#0#PHP" expanded="false" />
<element signature="e#25031#25394#0#PHP" expanded="false" />
<element signature="e#25399#25590#0#PHP" expanded="false" />
<element signature="e#25596#25954#0#PHP" expanded="false" />
<element signature="e#25959#26149#0#PHP" expanded="false" />
<element signature="e#26155#27298#0#PHP" expanded="false" />
<element signature="e#27303#29968#0#PHP" expanded="false" />
<element signature="e#29974#30472#0#PHP" expanded="false" />
<element signature="e#30477#32223#0#PHP" expanded="false" />
<element signature="e#32229#32642#0#PHP" expanded="false" />
<element signature="e#32647#33126#0#PHP" expanded="false" />
<element signature="e#33132#33666#0#PHP" expanded="false" />
<element signature="e#33671#35056#0#PHP" expanded="false" />
<element signature="e#35062#35716#0#PHP" expanded="false" />
<element signature="e#35721#37674#0#PHP" expanded="false" />
<element signature="e#35875#35961#0#PHP" expanded="false" />
<element signature="e#36050#36138#0#PHP" expanded="false" />
<element signature="e#37680#38440#0#PHP" expanded="false" />
<element signature="e#38445#41154#0#PHP" expanded="false" />
<element signature="e#41180#42011#0#PHP" expanded="false" />
<element signature="e#42017#42437#0#PHP" expanded="false" />
<element signature="e#42442#42925#0#PHP" expanded="false" />
<element signature="e#42931#43737#0#PHP" expanded="false" />
<element signature="e#43742#46896#0#PHP" expanded="false" />
<element signature="e#46911#48239#0#PHP" expanded="false" />
<element signature="e#48255#49282#0#PHP" expanded="false" />
<element signature="e#49288#50046#0#PHP" expanded="false" />
<element signature="e#50051#52438#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -85,11 +138,14 @@
<option value="$PROJECT_DIR$/application/admin/controller/Video.php" />
<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/order.php" />
<option value="$PROJECT_DIR$/application/admin/view/order/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
<option value="$PROJECT_DIR$/public/assets/js/backend/video.js" />
<option value="$PROJECT_DIR$/application/admin/controller/Order.php" />
<option value="$PROJECT_DIR$/application/admin/model/User.php" />
<option value="$PROJECT_DIR$/application/admin/model/Order.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order.js" />
<option value="$PROJECT_DIR$/application/admin/lang/zh-cn/order.php" />
<option value="$PROJECT_DIR$/application/api/controller/User.php" />
</list>
</option>
</component>
... ... @@ -107,11 +163,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="245" />
<option name="y" value="61" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="-31" />
<option name="y" value="63" />
<option name="width" value="1776" />
<option name="height" value="972" />
<option name="height" value="966" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -139,20 +195,20 @@
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" 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="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="uploads" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="20191118" 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" />
</path>
</expand>
<select />
... ... @@ -214,7 +270,7 @@
<workItem from="1574410294356" duration="15863000" />
<workItem from="1574469667436" duration="25235000" />
<workItem from="1574641631900" duration="15479000" />
<workItem from="1574669596135" duration="1936000" />
<workItem from="1574669596135" duration="7667000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -227,7 +283,7 @@
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="220460000" />
<option name="totallyTimeSpent" value="226191000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -239,16 +295,16 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="245" y="61" width="1776" height="972" extended-state="0" />
<frame x="-31" y="63" width="1776" height="966" extended-state="1" />
<layout>
<window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.15617716" 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.15617716" 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="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.13652694" 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.1363088" 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" />
... ... @@ -296,38 +352,11 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/.gitignore">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="7" lean-forward="false" selection-start-line="0" selection-start-column="7" selection-end-line="0" selection-end-column="7" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/.gitlab-ci.yml">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="8" column="33" lean-forward="false" selection-start-line="8" selection-start-column="27" selection-end-line="8" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/model/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1991">
<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$/thinkphp/library/think/Validate.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="453">
<caret line="112" column="20" lean-forward="false" selection-start-line="112" selection-start-column="20" selection-end-line="112" selection-end-column="20" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/library/Auth.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="585">
<caret line="105" column="38" lean-forward="true" selection-start-line="105" selection-start-column="38" selection-end-line="105" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
... ... @@ -379,13 +408,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
<caret line="43" column="60" lean-forward="true" selection-start-line="43" selection-start-column="60" selection-end-line="43" selection-end-column="60" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/user/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -393,13 +415,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-116">
<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$/application/admin/lang/zh-cn/vip.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="150">
... ... @@ -484,20 +499,6 @@
</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" />
</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">
<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$/application/admin/controller/Wonderful.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="400">
... ... @@ -514,18 +515,11 @@
</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="400">
<caret line="20" column="4" lean-forward="false" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="38" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/controller/Api.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="294">
<caret line="172" column="35" lean-forward="true" selection-start-line="172" selection-start-column="35" selection-end-line="172" selection-end-column="35" />
<folding />
</state>
</provider>
</entry>
... ... @@ -533,6 +527,23 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1100">
<caret line="69" column="26" lean-forward="true" selection-start-line="69" selection-start-column="26" selection-end-line="69" selection-end-column="26" />
<folding>
<element signature="e#450#569#0#PHP" expanded="false" />
<element signature="e#575#888#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#10343#0#PHP" expanded="false" />
<element signature="e#8532#10276#0#PHP" expanded="false" />
<element signature="e#10349#10769#0#PHP" expanded="false" />
<element signature="e#10774#15443#0#PHP" expanded="false" />
<element signature="e#13629#15375#0#PHP" expanded="false" />
<element signature="e#15470#19172#0#PHP" expanded="false" />
<element signature="e#19202#22146#0#PHP" expanded="false" />
<element signature="e#22175#23432#0#PHP" expanded="false" />
<element signature="e#23461#24747#0#PHP" expanded="false" />
<element signature="e#24770#24987#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
... ... @@ -543,75 +554,6 @@
</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="456">
<caret line="990" column="5" lean-forward="true" selection-start-line="990" selection-start-column="5" selection-end-line="990" selection-end-column="5" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#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#9762#0#PHP" expanded="false" />
<element signature="e#9768#10470#0#PHP" expanded="false" />
<element signature="e#10475#11675#0#PHP" expanded="false" />
<element signature="e#11681#12257#0#PHP" expanded="false" />
<element signature="e#12262#12809#0#PHP" expanded="false" />
<element signature="e#12815#13499#0#PHP" expanded="false" />
<element signature="e#13504#15600#0#PHP" expanded="false" />
<element signature="e#15606#16476#0#PHP" expanded="false" />
<element signature="e#18983#19360#0#PHP" expanded="false" />
<element signature="e#19365#19629#0#PHP" expanded="false" />
<element signature="e#19635#20140#0#PHP" expanded="false" />
<element signature="e#20145#20396#0#PHP" expanded="false" />
<element signature="e#20402#20881#0#PHP" expanded="false" />
<element signature="e#20886#21643#0#PHP" expanded="false" />
<element signature="e#21649#22130#0#PHP" expanded="false" />
<element signature="e#22135#22905#0#PHP" expanded="false" />
<element signature="e#22911#23274#0#PHP" expanded="false" />
<element signature="e#23279#23470#0#PHP" expanded="false" />
<element signature="e#23476#23834#0#PHP" expanded="false" />
<element signature="e#23839#24029#0#PHP" expanded="false" />
<element signature="e#24035#25178#0#PHP" expanded="false" />
<element signature="e#25183#27848#0#PHP" expanded="false" />
<element signature="e#27854#28352#0#PHP" expanded="false" />
<element signature="e#28357#30103#0#PHP" expanded="false" />
<element signature="e#30109#30522#0#PHP" expanded="false" />
<element signature="e#30527#31006#0#PHP" expanded="false" />
<element signature="e#31012#31546#0#PHP" expanded="false" />
<element signature="e#31551#32936#0#PHP" expanded="false" />
<element signature="e#32942#33596#0#PHP" expanded="false" />
<element signature="e#33601#35554#0#PHP" expanded="false" />
<element signature="e#33755#33841#0#PHP" expanded="false" />
<element signature="e#33930#34018#0#PHP" expanded="false" />
<element signature="e#35560#36320#0#PHP" expanded="false" />
<element signature="e#36325#39034#0#PHP" expanded="false" />
<element signature="e#39060#39891#0#PHP" expanded="false" />
<element signature="e#39897#40317#0#PHP" expanded="false" />
<element signature="e#40322#40805#0#PHP" expanded="false" />
<element signature="e#40811#41617#0#PHP" expanded="false" />
<element signature="e#41622#44776#0#PHP" expanded="false" />
<element signature="e#44791#46119#0#PHP" expanded="false" />
<element signature="e#46135#47162#0#PHP" expanded="false" />
<element signature="e#47168#47926#0#PHP" expanded="false" />
<element signature="e#47931#50318#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="25" lean-forward="true" selection-start-line="7" selection-start-column="25" selection-end-line="7" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/wonderful.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
... ... @@ -660,37 +602,187 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/order/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pic.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="234">
<caret line="169" column="4" lean-forward="true" selection-start-line="169" selection-start-column="4" selection-end-line="176" selection-end-column="5" />
<folding>
<element signature="e#684#1822#0#PHP" expanded="false" />
<element signature="e#1854#3656#0#PHP" expanded="false" />
<element signature="e#3688#5728#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="39" column="4" lean-forward="true" selection-start-line="39" selection-start-column="4" selection-end-line="69" selection-end-column="5" />
<folding>
<element signature="e#450#914#0#PHP" expanded="false" />
<marker date="1562338656000" expanded="true" signature="13159:13266" ph="SELECT COLUM... COLUMNS" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/model/UserRule.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$/application/admin/model/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="22" column="6" lean-forward="true" selection-start-line="22" selection-start-column="6" selection-end-line="22" selection-end-column="6" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Vip.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/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="36" column="83" lean-forward="false" selection-start-line="36" selection-start-column="83" selection-end-line="36" selection-end-column="83" />
<state relative-caret-position="309">
<caret line="30" column="100" lean-forward="true" selection-start-line="30" selection-start-column="100" selection-end-line="30" selection-end-column="100" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/order/index.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/pic/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="13" column="0" lean-forward="false" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
<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/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1030">
<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$/application/admin/model/Order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="654">
<caret line="30" column="0" lean-forward="true" selection-start-line="30" selection-start-column="0" selection-end-line="30" 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="560">
<caret line="32" column="4" lean-forward="false" selection-start-line="32" selection-start-column="4" selection-end-line="32" selection-end-column="4" />
<state relative-caret-position="679">
<caret line="61" column="27" lean-forward="true" selection-start-line="61" selection-start-column="27" selection-end-line="61" selection-end-column="27" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user/user.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="425">
<caret line="44" column="129" lean-forward="false" selection-start-line="44" selection-start-column="60" selection-end-line="44" selection-end-column="129" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/lang/zh-cn/order.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="175">
<caret line="7" column="32" lean-forward="false" selection-start-line="7" selection-start-column="32" selection-end-line="7" selection-end-column="32" />
<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="400">
<caret line="31" column="98" lean-forward="false" selection-start-line="31" selection-start-column="98" selection-end-line="31" selection-end-column="98" />
<state relative-caret-position="425">
<caret line="31" column="70" lean-forward="false" selection-start-line="31" selection-start-column="70" selection-end-line="31" selection-end-column="70" />
<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="248">
<caret line="355" column="0" lean-forward="true" selection-start-line="355" selection-start-column="0" selection-end-line="355" selection-end-column="0" />
<folding>
<element signature="e#365#484#0#PHP" expanded="false" />
<element signature="e#490#1228#0#PHP" expanded="false" />
<element signature="e#1233#2896#0#PHP" expanded="false" />
<element signature="e#2902#3430#0#PHP" expanded="false" />
<element signature="e#3435#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#9762#0#PHP" expanded="false" />
<element signature="e#11888#12590#0#PHP" expanded="false" />
<element signature="e#12595#13795#0#PHP" expanded="false" />
<element signature="e#13801#14377#0#PHP" expanded="false" />
<element signature="e#14382#14929#0#PHP" expanded="false" />
<element signature="e#14935#15619#0#PHP" expanded="false" />
<element signature="e#15624#17720#0#PHP" expanded="false" />
<element signature="e#17726#18596#0#PHP" expanded="false" />
<element signature="e#18601#21097#0#PHP" expanded="false" />
<element signature="e#21103#21480#0#PHP" expanded="false" />
<element signature="e#21485#21749#0#PHP" expanded="false" />
<element signature="e#21755#22260#0#PHP" expanded="false" />
<element signature="e#22265#22516#0#PHP" expanded="false" />
<element signature="e#22522#23001#0#PHP" expanded="false" />
<element signature="e#23006#23763#0#PHP" expanded="false" />
<element signature="e#23769#24250#0#PHP" expanded="false" />
<element signature="e#24255#25025#0#PHP" expanded="false" />
<element signature="e#25031#25394#0#PHP" expanded="false" />
<element signature="e#25399#25590#0#PHP" expanded="false" />
<element signature="e#25596#25954#0#PHP" expanded="false" />
<element signature="e#25959#26149#0#PHP" expanded="false" />
<element signature="e#26155#27298#0#PHP" expanded="false" />
<element signature="e#27303#29968#0#PHP" expanded="false" />
<element signature="e#29974#30472#0#PHP" expanded="false" />
<element signature="e#30477#32223#0#PHP" expanded="false" />
<element signature="e#32229#32642#0#PHP" expanded="false" />
<element signature="e#32647#33126#0#PHP" expanded="false" />
<element signature="e#33132#33666#0#PHP" expanded="false" />
<element signature="e#33671#35056#0#PHP" expanded="false" />
<element signature="e#35062#35716#0#PHP" expanded="false" />
<element signature="e#35721#37674#0#PHP" expanded="false" />
<element signature="e#35875#35961#0#PHP" expanded="false" />
<element signature="e#36050#36138#0#PHP" expanded="false" />
<element signature="e#37680#38440#0#PHP" expanded="false" />
<element signature="e#38445#41154#0#PHP" expanded="false" />
<element signature="e#41180#42011#0#PHP" expanded="false" />
<element signature="e#42017#42437#0#PHP" expanded="false" />
<element signature="e#42442#42925#0#PHP" expanded="false" />
<element signature="e#42931#43737#0#PHP" expanded="false" />
<element signature="e#43742#46896#0#PHP" expanded="false" />
<element signature="e#46911#48239#0#PHP" expanded="false" />
<element signature="e#48255#49282#0#PHP" expanded="false" />
<element signature="e#49288#50046#0#PHP" expanded="false" />
<element signature="e#50051#52438#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</component>
</project>
\ No newline at end of file
... ...
... ... @@ -32,4 +32,45 @@ class Order extends Backend
*/
/**
* 查看
*/
public function index()
{
//当前是否为关联查询
$this->relationSearch = true;
//设置过滤方法
$this->request->filter(['strip_tags']);
if ($this->request->isAjax())
{
//如果发送的来源是Selectpage，则转发到Selectpage
if ($this->request->request('keyField'))
{
return $this->selectpage();
}
list($where, $sort, $order, $offset, $limit) = $this->buildparams();
$total = $this->model
->with(['user'])
->where($where)
->order($sort, $order)
->count();
$list = $this->model
->with(['user'])
->where($where)
->order($sort, $order)
->limit($offset, $limit)
->select();
foreach ($list as $row) {
}
$list = collection($list)->toArray();
$result = array("total" => $total, "rows" => $list);
return json($result);
}
return $this->view->fetch();
}
}
... ...
<?php
return [
'User_id' => '用户ID',
'Pic_id' => '图片ID',
'Video_id' => '视频ID',
'Total' => '价格',
'Status' => '状态',
'Num' => '订单号',
'Createtime' => '创建时间',
'Paytime' => '支付时间'
'User_id' => '用户ID',
'Pic_id' => '图片ID',
'Video_id' => '视频ID',
'Total' => '价格',
'Status' => '状态',
'Num' => '订单号',
'Createtime' => '创建时间',
'Paytime' => '支付时间',
'User.id' => 'ID',
'User.group_id' => '组别ID',
'User.username' => '用户名',
'User.nickname' => '用户昵称',
'User.password' => '密码',
'User.salt' => '密码盐',
'User.email' => '电子邮箱',
'User.mobile' => '手机号',
'User.avatar' => '头像',
'User.level' => '等级',
'User.gender' => '性别',
'User.birthday' => '生日',
'User.bio' => '格言',
'User.money' => '余额',
'User.score' => '积分',
'User.successions' => '连续登录天数',
'User.maxsuccessions' => '最大连续登录天数',
'User.prevtime' => '上次登录时间',
'User.logintime' => '登录时间',
'User.loginip' => '登录IP',
'User.loginfailure' => '失败次数',
'User.joinip' => '加入IP',
'User.jointime' => '加入时间',
'User.createtime' => '创建时间',
'User.updatetime' => '更新时间',
'User.token' => 'Token',
'User.status' => '状态',
'User.verification' => '验证',
'User.openid' => 'openid',
'User.is_vip' => '是否为会员'
];
... ...
... ... @@ -45,4 +45,8 @@ class Order extends Model
}
public function user()
{
return $this->belongsTo('User', 'user_id', 'id', [], 'LEFT')->setEagerlyType(0);
}
}
... ...
... ... @@ -7,10 +7,10 @@
<div class="widget-body no-padding">
<div id="toolbar" class="toolbar">
<a href="javascript:;" class="btn btn-primary btn-refresh" title="{:__('Refresh')}" ><i class="fa fa-refresh"></i> </a>
<!--<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>-->
<!--<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('order/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>-->
<!--<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>-->
<!--<a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('order/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>-->
<a href="javascript:;" class="btn btn-success btn-add {:$auth->check('order/add')?'':'hide'}" title="{:__('Add')}" ><i class="fa fa-plus"></i> {:__('Add')}</a>
<a href="javascript:;" class="btn btn-success btn-edit btn-disabled disabled {:$auth->check('order/edit')?'':'hide'}" title="{:__('Edit')}" ><i class="fa fa-pencil"></i> {:__('Edit')}</a>
<a href="javascript:;" class="btn btn-danger btn-del btn-disabled disabled {:$auth->check('order/del')?'':'hide'}" title="{:__('Delete')}" ><i class="fa fa-trash"></i> {:__('Delete')}</a>
<a href="javascript:;" class="btn btn-danger btn-import {:$auth->check('order/import')?'':'hide'}" title="{:__('Import')}" id="btn-import-file" data-url="ajax/upload" data-mimetype="csv,xls,xlsx" data-multiple="false"><i class="fa fa-upload"></i> {:__('Import')}</a>
<div class="dropdown btn-group {:$auth->check('order/multi')?'':'hide'}">
<a class="btn btn-primary btn-more dropdown-toggle btn-disabled disabled" data-toggle="dropdown"><i class="fa fa-cog"></i> {:__('More')}</a>
... ...
... ... @@ -296,6 +296,67 @@ class User extends Api
}
/**
* @ApiTitle (分类下的图片视频)
* @ApiSummary (分类下的图片视频)
* @ApiMethod (POST)
* @ApiRoute (/api/user/pic_video)
* @ApiHeaders (name=token, type=string, required=true, description="请求的Token")
*
* @ApiParams (name="type_id", type="inter", required=true, description="地区ID")
* @ApiParams (name="type", type="inter", required=false, description="类型ID（图片为1 视频为2）")
* @ApiParams (name="page", type="inter", required=false, description="当前页(默认1)")
* @ApiParams (name="pageNum", type="inter", required=false, description="每页显示数据个数（默认10）")
* @ApiReturn({
"code": 1,
"msg": "成功",
"time": "1571492001",
"data": {
"id": 4,//图片id,
"thumbnail": //缩略图,
}
})
*/
public function pic_video()
{
$rule = config('verify.path');
$page = $this->request->param('page',1,'intval');
$pageNum = $this->request->param('pageNum',10,'intval');
$type_id = $this->request->post('type_id');
$type = $this->request->post('type');
if($type == 1){
$type = ','.$type_id.',';
$where['type_ids'] = ['like',"%$type%"];
$data = Db::name('pic')
->where($where)
->field('id,thumbnail,title')
->order('id desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
}
$this->success('SUCCESS',$data);
}else{
$type = ','.$type_id.',';
$where['type_ids'] = ['like',"%$type%"];
$data = Db::name('video')
->where($where)
->field('id,thumbnail,video')
->order('id desc')
->page($page,$pageNum)
->select();
foreach ($data as &$v){
$v['thumbnail'] = $rule.$v['thumbnail'];
$v['video'] = $rule.$v['video'];
}
$this->success('SUCCESS',$data);
}
}
/**
* @ApiTitle (视频列表)
* @ApiSummary (视频列表)
* @ApiMethod (POST)
... ...
此 diff 太大无法显示。
... ... @@ -23,16 +23,16 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
sortName: 'id',
columns: [
[
{checkbox: true},
{field: 'id', title: __('Id'), operate:false},
{field: 'user_id', title: __('User_id'), operate:false},
{field: 'user.nickname', title: __('User.nickname')},
{field: 'pic_id', title: __('Pic_id'), operate:false},
{field: 'video_id', title: __('Video_id'), operate:false},
{field: 'total', title: __('Total'), operate:false},
{field: 'status', title: __('Status'),searchList:$.getJSON('order/type')},
{field: 'total', title: __('Total'), operate:'BETWEEN'},
{field: 'status', title: __('Status'),formatter: Table.api.formatter.status,searchList:{'1': '待支付', '2': '已完成'}},
{field: 'num', title: __('Num'), operate:false},
{field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'paytime', title: __('Paytime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
// {field: 'paytime', title: __('Paytime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'user.is_vip', title: __('User.is_vip'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}}
]
]
});
... ...