郭盛 / areial · 提交

转到一个项目

作者 郭盛
提交 53270c1ede8dcdf8d8a1b70861339e712a04cb6d 1 个父辈 30f8ad13 master
1 个管道 的构建 通过 耗费 2 秒

添加后台个人信息购买详情

内嵌 并排对比
正在显示 9 个修改的文件 包含 567 行增加 和 310 行删除
... ... @@ -5,9 +5,15 @@
</component>
<component name="ChangeListManager">
<list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment="">
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/controller/OrderDetail.php" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/application/admin/view/order_detail/index.html" />
<change type="NEW" beforePath="" afterPath="$PROJECT_DIR$/public/assets/js/backend/order_detail.js" />
<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/controller/user/User.php" afterPath="$PROJECT_DIR$/application/admin/controller/user/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/model/User.php" afterPath="$PROJECT_DIR$/application/admin/model/User.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/user/user/index.html" afterPath="$PROJECT_DIR$/application/admin/view/user/user/index.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/api.html" afterPath="$PROJECT_DIR$/public/api.html" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/assets/js/backend/user/user.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/user/user.js" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -18,109 +24,22 @@
</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="order_detail.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order_detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="718">
<caret line="2422" column="1" lean-forward="true" selection-start-line="2422" selection-start-column="1" selection-end-line="2422" selection-end-column="1" />
<folding>
<element signature="e#4287#4721#0#PHP" expanded="false" />
<element signature="e#4726#5084#0#PHP" expanded="false" />
<element signature="e#5090#5497#0#PHP" expanded="false" />
<element signature="e#5502#5845#0#PHP" expanded="false" />
<element signature="e#5851#6264#0#PHP" expanded="false" />
<element signature="e#6269#6586#0#PHP" expanded="false" />
<element signature="e#6592#7691#0#PHP" expanded="false" />
<element signature="e#7696#13097#0#PHP" expanded="false" />
<element signature="e#13103#13783#0#PHP" expanded="false" />
<element signature="e#13788#14646#0#PHP" expanded="false" />
<element signature="e#14652#15441#0#PHP" expanded="false" />
<element signature="e#15446#16795#0#PHP" expanded="false" />
<element signature="e#16801#17503#0#PHP" expanded="false" />
<element signature="e#17508#18828#0#PHP" expanded="false" />
<element signature="e#18834#19410#0#PHP" expanded="false" />
<element signature="e#19415#20027#0#PHP" expanded="false" />
<element signature="e#20033#20749#0#PHP" expanded="false" />
<element signature="e#20754#25622#0#PHP" expanded="false" />
<element signature="e#25631#26561#0#PHP" expanded="false" />
<element signature="e#26566#31707#0#PHP" expanded="false" />
<element signature="e#31713#32090#0#PHP" expanded="false" />
<element signature="e#32095#32534#0#PHP" expanded="false" />
<element signature="e#32540#33361#0#PHP" expanded="false" />
<element signature="e#33366#36770#0#PHP" expanded="false" />
<element signature="e#36776#37281#0#PHP" expanded="false" />
<element signature="e#37286#37537#0#PHP" expanded="false" />
<element signature="e#37543#38022#0#PHP" expanded="false" />
<element signature="e#38027#38784#0#PHP" expanded="false" />
<element signature="e#38790#39271#0#PHP" expanded="false" />
<element signature="e#39276#40146#0#PHP" expanded="false" />
<element signature="e#40152#40515#0#PHP" expanded="false" />
<element signature="e#40520#40711#0#PHP" expanded="false" />
<element signature="e#40717#41075#0#PHP" expanded="false" />
<element signature="e#41080#41271#0#PHP" expanded="false" />
<element signature="e#41277#42420#0#PHP" expanded="false" />
<element signature="e#42425#45090#0#PHP" expanded="false" />
<element signature="e#45096#45594#0#PHP" expanded="false" />
<element signature="e#45599#47345#0#PHP" expanded="false" />
<element signature="e#47351#47764#0#PHP" expanded="false" />
<element signature="e#47769#48248#0#PHP" expanded="false" />
<element signature="e#48254#48788#0#PHP" expanded="false" />
<element signature="e#48793#50178#0#PHP" expanded="false" />
<element signature="e#50184#50838#0#PHP" expanded="false" />
<element signature="e#50843#52858#0#PHP" expanded="false" />
<element signature="e#52864#53624#0#PHP" expanded="false" />
<element signature="e#53629#56338#0#PHP" expanded="false" />
<element signature="e#56364#57195#0#PHP" expanded="false" />
<element signature="e#57201#57621#0#PHP" expanded="false" />
<element signature="e#57626#58109#0#PHP" expanded="false" />
<element signature="e#58115#58921#0#PHP" expanded="false" />
<element signature="e#58926#62084#0#PHP" expanded="false" />
<element signature="e#62099#63434#0#PHP" expanded="false" />
<element signature="e#63450#64484#0#PHP" expanded="false" />
<element signature="e#64490#65248#0#PHP" expanded="false" />
<element signature="e#65253#68996#0#PHP" expanded="false" />
<element signature="e#69002#69394#0#PHP" expanded="false" />
<element signature="e#69399#70351#0#PHP" expanded="false" />
<element signature="e#70375#70948#0#PHP" expanded="false" />
<element signature="e#70954#71553#0#PHP" expanded="false" />
<element signature="e#71558#72485#0#PHP" expanded="false" />
<element signature="e#72491#73205#0#PHP" expanded="false" />
<element signature="e#73211#73638#0#PHP" expanded="false" />
<element signature="e#73643#74112#0#PHP" expanded="false" />
<element signature="e#74119#75324#0#PHP" expanded="false" />
<element signature="e#75329#77032#0#PHP" expanded="false" />
<element signature="e#77038#77815#0#PHP" expanded="false" />
<element signature="e#77820#81758#0#PHP" expanded="false" />
<element signature="e#81764#82273#0#PHP" expanded="false" />
<element signature="e#82278#82950#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="475">
<caret line="28" column="78" lean-forward="true" selection-start-line="28" selection-start-column="78" selection-end-line="28" selection-end-column="78" />
<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="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/view/order_detail/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
<caret line="335" column="5" lean-forward="true" selection-start-line="335" selection-start-column="5" selection-end-line="335" selection-end-column="5" />
<folding>
<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#5630#0#PHP" expanded="false" />
<element signature="e#5636#6050#0#PHP" expanded="false" />
<element signature="e#6055#16076#0#PHP" expanded="false" />
<element signature="e#7031#16009#0#PHP" expanded="false" />
<element signature="e#16083#16400#0#PHP" expanded="false" />
<element signature="e#16405#16883#0#PHP" expanded="false" />
<element signature="e#16900#17197#0#PHP" expanded="false" />
<element signature="e#17202#17595#0#PHP" expanded="false" />
<element signature="e#17622#20883#0#PHP" expanded="false" />
<element signature="e#20912#23550#0#PHP" expanded="false" />
<element signature="e#23583#29910#0#PHP" expanded="false" />
<element signature="e#24378#29668#0#PHP" expanded="false" />
<element signature="e#29933#30150#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="100">
<caret line="4" column="51" lean-forward="true" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
... ... @@ -154,6 +73,7 @@
<find>vippayOrderNotify</find>
<find>充值</find>
<find>$data['money']</find>
<find>statusList</find>
</findStrings>
<replaceStrings>
<replace />
... ... @@ -168,16 +88,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/admin/view/order/fapiao.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/feng.js" />
<option value="$PROJECT_DIR$/application/admin/view/feng/add.html" />
<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$/public/assets/js/backend/order.js" />
<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" />
<option value="$PROJECT_DIR$/public/assets/js/backend/cover.js" />
<option value="$PROJECT_DIR$/application/admin/view/words/index.html" />
<option value="$PROJECT_DIR$/application/admin/model/Video.php" />
... ... @@ -219,6 +129,16 @@
<option value="$PROJECT_DIR$/application/config.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/model/User.php" />
<option value="$PROJECT_DIR$/application/admin/controller/user/User.php" />
<option value="$PROJECT_DIR$/application/admin/view/user/user/index.html" />
<option value="$PROJECT_DIR$/application/admin/view/order1/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order1.js" />
<option value="$PROJECT_DIR$/application/admin/controller/Order1.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/user/user.js" />
<option value="$PROJECT_DIR$/application/admin/controller/OrderDetail.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/order_detail.js" />
<option value="$PROJECT_DIR$/application/admin/view/order_detail/index.html" />
</list>
</option>
</component>
... ... @@ -236,10 +156,11 @@
<sorting>DEFINITION_ORDER</sorting>
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds">
<option name="x" value="676" />
<option name="width" value="1747" />
<option name="height" value="1030" />
<component name="ProjectFrameBounds" extendedState="7">
<option name="x" value="95" />
<option name="y" value="39" />
<option name="width" value="1783" />
<option name="height" value="953" />
</component>
<component name="ProjectView">
<navigator currentView="ProjectPane" proportions="" version="1">
... ... @@ -256,7 +177,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -273,29 +193,86 @@
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="application" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="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="order_detail" 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" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="areial" type="b2602c69:ProjectViewProjectNode" />
<item name="areial" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="assets" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="js" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="backend" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
</pane>
<pane id="Scope" />
<pane id="Scratches" />
</panes>
</component>
<component name="PropertiesComponent">
<property name="WebServerToolWindowFactoryState" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../fastadmin/questions" />
<property name="DefaultHtmlFileTemplate" value="HTML File" />
<property name="settings.editor.selected.configurable" value="preferences.keymap" />
</component>
<component name="RecentsManager">
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\htdocs\areial\public\uploads\20191120" />
<recent name="D:\htdocs\areial\public\uploads" />
<recent name="D:\htdocs\areial\public\cert" />
<recent name="D:\htdocs\areial\public\uploads\20191118" />
</key>
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\htdocs\areial\public\assets\js" />
<recent name="D:\htdocs\areial\public\assets\libs\bootstrap-table\dist\extensions" />
... ... @@ -303,12 +280,6 @@
<recent name="D:\htdocs\areial\extend" />
<recent name="D:\htdocs\areial\public\uploads\20191118" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\htdocs\areial\public\uploads\20191120" />
<recent name="D:\htdocs\areial\public\uploads" />
<recent name="D:\htdocs\areial\public\cert" />
<recent name="D:\htdocs\areial\public\uploads\20191118" />
</key>
</component>
<component name="RunDashboard">
<option name="ruleStates">
... ... @@ -452,7 +423,10 @@
<workItem from="1587016148758" duration="630000" />
<workItem from="1587698628412" duration="1095000" />
<workItem from="1590118157459" duration="15359000" />
<workItem from="1590137451444" duration="774000" />
<workItem from="1590137451444" duration="1533000" />
<workItem from="1590141410628" duration="1864000" />
<workItem from="1590193431145" duration="1982000" />
<workItem from="1590217205221" duration="7795000" />
</task>
<task id="LOCAL-00001" summary="调试">
<created>1574145133364</created>
... ... @@ -636,11 +610,46 @@
<option name="project" value="LOCAL" />
<updated>1590134877187</updated>
</task>
<option name="localTasksCounter" value="27" />
<task id="LOCAL-00027" summary="订单支付回调调试">
<created>1590141490625</created>
<option name="number" value="00027" />
<option name="presentableId" value="LOCAL-00027" />
<option name="project" value="LOCAL" />
<updated>1590141490625</updated>
</task>
<task id="LOCAL-00028" summary="订单支付回调调试">
<created>1590142690455</created>
<option name="number" value="00028" />
<option name="presentableId" value="LOCAL-00028" />
<option name="project" value="LOCAL" />
<updated>1590142690455</updated>
</task>
<task id="LOCAL-00029" summary="订单支付回调调试">
<created>1590193444584</created>
<option name="number" value="00029" />
<option name="presentableId" value="LOCAL-00029" />
<option name="project" value="LOCAL" />
<updated>1590193444584</updated>
</task>
<task id="LOCAL-00030" summary="订单支付回调调试">
<created>1590221336813</created>
<option name="number" value="00030" />
<option name="presentableId" value="LOCAL-00030" />
<option name="project" value="LOCAL" />
<updated>1590221336813</updated>
</task>
<task id="LOCAL-00031" summary="订单支付回调调试">
<created>1590222367309</created>
<option name="number" value="00031" />
<option name="presentableId" value="LOCAL-00031" />
<option name="project" value="LOCAL" />
<updated>1590222367309</updated>
</task>
<option name="localTasksCounter" value="32" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="676359000" />
<option name="totallyTimeSpent" value="688759000" />
</component>
<component name="TodoView">
<todo-panel id="selected-file">
... ... @@ -652,19 +661,19 @@
</todo-panel>
</component>
<component name="ToolWindowManager">
<frame x="676" y="0" width="1747" height="1030" extended-state="0" />
<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="true" show_stripe_button="true" weight="0.14285715" 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.13326226" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" />
<window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32876712" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" />
<window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" />
<window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" />
<window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
<window_info id="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.45048967" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" />
<window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="6" side_tool="false" content_ui="tabs" />
<window_info id="Terminal" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.449711" 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" />
<window_info id="Message" 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="3" side_tool="false" content_ui="tabs" />
<window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.4" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" />
... ... @@ -714,48 +723,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Category.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="254">
<caret line="134" column="0" lean-forward="true" selection-start-line="134" selection-start-column="0" selection-end-line="144" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/share/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="13" column="0" lean-forward="true" selection-start-line="13" selection-start-column="0" selection-end-line="13" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/share.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="26" column="53" lean-forward="true" selection-start-line="26" selection-start-column="53" selection-end-line="26" selection-end-column="53" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/share/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="350">
<caret line="14" column="14" lean-forward="true" selection-start-line="14" selection-start-column="14" selection-end-line="14" selection-end-column="14" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/share/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="550">
<caret line="22" column="10" lean-forward="true" selection-start-line="22" selection-start-column="10" selection-end-line="22" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Share.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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/library/token/Driver.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="269">
... ... @@ -834,13 +801,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
<caret line="0" column="0" lean-forward="false" selection-start-line="0" selection-start-column="0" selection-end-line="0" selection-end-column="0" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/video/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -900,13 +860,6 @@
<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="150">
<caret line="27" column="69" lean-forward="true" selection-start-line="27" selection-start-column="69" selection-end-line="27" selection-end-column="69" />
</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="775">
... ... @@ -957,13 +910,6 @@
</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="-24">
<caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/library/Auth.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
... ... @@ -986,13 +932,6 @@
</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="280">
<caret line="154" column="66" lean-forward="false" selection-start-line="154" selection-start-column="66" selection-end-line="154" selection-end-column="66" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Common.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="0">
... ... @@ -1198,7 +1137,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-375">
<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>
... ... @@ -1206,7 +1144,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-149">
<caret line="16" column="3" lean-forward="false" selection-start-line="16" selection-start-column="3" selection-end-line="16" selection-end-column="3" />
<folding />
</state>
</provider>
</entry>
... ... @@ -1214,14 +1151,196 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1249">
<caret line="35" column="5" lean-forward="true" selection-start-line="35" selection-start-column="5" selection-end-line="35" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/symfony/http-foundation/Response.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="372" column="20" lean-forward="false" selection-start-line="372" selection-start-column="20" selection-end-line="372" selection-end-column="20" />
</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="675">
<caret line="335" column="5" lean-forward="false" selection-start-line="335" selection-start-column="5" selection-end-line="335" selection-end-column="5" />
<folding>
<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#5630#0#PHP" expanded="false" />
<element signature="e#5636#6050#0#PHP" expanded="false" />
<element signature="e#6055#16076#0#PHP" expanded="false" />
<element signature="e#7031#16009#0#PHP" expanded="false" />
<element signature="e#16083#16400#0#PHP" expanded="false" />
<element signature="e#16405#16883#0#PHP" expanded="false" />
<element signature="e#16900#17197#0#PHP" expanded="false" />
<element signature="e#17202#17595#0#PHP" expanded="false" />
<element signature="e#17622#20883#0#PHP" expanded="false" />
<element signature="e#20912#23550#0#PHP" expanded="false" />
<element signature="e#23583#29910#0#PHP" expanded="false" />
<element signature="e#24378#29668#0#PHP" expanded="false" />
<element signature="e#29933#30150#0#PHP" expanded="false" />
</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="205">
<caret line="250" column="9" lean-forward="true" selection-start-line="250" selection-start-column="9" selection-end-line="250" selection-end-column="9" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Order.php">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pic.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="250">
<caret line="31" column="98" lean-forward="false" selection-start-line="31" selection-start-column="65" selection-end-line="31" selection-end-column="98" />
<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="-118">
<caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
<folding>
<element signature="e#700#2169#0#PHP" expanded="false" />
<element signature="e#2201#6736#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="304">
<caret line="796" column="0" lean-forward="true" selection-start-line="796" selection-start-column="0" selection-end-line="796" selection-end-column="0" />
<folding>
<element signature="e#4287#4721#0#PHP" expanded="false" />
<element signature="e#4726#5084#0#PHP" expanded="false" />
<element signature="e#5090#5497#0#PHP" expanded="false" />
<element signature="e#5502#5845#0#PHP" expanded="false" />
<element signature="e#5851#6264#0#PHP" expanded="false" />
<element signature="e#6269#6586#0#PHP" expanded="false" />
<element signature="e#6592#7691#0#PHP" expanded="false" />
<element signature="e#7696#14874#0#PHP" expanded="false" />
<element signature="e#7970#8064#0#PHP" expanded="false" />
<element signature="e#8127#12429#0#PHP" expanded="false" />
<element signature="e#8450#9749#0#PHP" expanded="false" />
<element signature="e#12495#12928#0#PHP" expanded="false" />
<element signature="e#12991#13400#0#PHP" expanded="false" />
<element signature="e#13464#13734#0#PHP" expanded="false" />
<element signature="e#13744#14868#0#PHP" expanded="false" />
<element signature="e#14319#14868#0#PHP" expanded="false" />
<element signature="e#14880#15560#0#PHP" expanded="false" />
<element signature="e#15565#16423#0#PHP" expanded="false" />
<element signature="e#16429#17218#0#PHP" expanded="false" />
<element signature="e#17223#18572#0#PHP" expanded="false" />
<element signature="e#18578#19280#0#PHP" expanded="false" />
<element signature="e#19285#20605#0#PHP" expanded="false" />
<element signature="e#20611#21187#0#PHP" expanded="false" />
<element signature="e#21192#21804#0#PHP" expanded="false" />
<element signature="e#21810#22526#0#PHP" expanded="false" />
<element signature="e#22531#27399#0#PHP" expanded="false" />
<element signature="e#27408#28338#0#PHP" expanded="false" />
<element signature="e#28343#33484#0#PHP" expanded="false" />
<element signature="e#33490#33867#0#PHP" expanded="false" />
<element signature="e#33872#34311#0#PHP" expanded="false" />
<element signature="e#34317#35138#0#PHP" expanded="false" />
<element signature="e#35143#38547#0#PHP" expanded="false" />
<element signature="e#38553#39058#0#PHP" expanded="false" />
<element signature="e#39063#39314#0#PHP" expanded="false" />
<element signature="e#39320#39799#0#PHP" expanded="false" />
<element signature="e#39804#40561#0#PHP" expanded="false" />
<element signature="e#40567#41048#0#PHP" expanded="false" />
<element signature="e#41053#41923#0#PHP" expanded="false" />
<element signature="e#41929#42292#0#PHP" expanded="false" />
<element signature="e#42297#42488#0#PHP" expanded="false" />
<element signature="e#42494#42852#0#PHP" expanded="false" />
<element signature="e#42857#43048#0#PHP" expanded="false" />
<element signature="e#43054#44197#0#PHP" expanded="false" />
<element signature="e#44202#46867#0#PHP" expanded="false" />
<element signature="e#46873#47371#0#PHP" expanded="false" />
<element signature="e#47376#49122#0#PHP" expanded="false" />
<element signature="e#49128#49541#0#PHP" expanded="false" />
<element signature="e#49546#50025#0#PHP" expanded="false" />
<element signature="e#50031#50565#0#PHP" expanded="false" />
<element signature="e#50570#51955#0#PHP" expanded="false" />
<element signature="e#51961#52615#0#PHP" expanded="false" />
<element signature="e#52620#54635#0#PHP" expanded="false" />
<element signature="e#54641#55401#0#PHP" expanded="false" />
<element signature="e#55406#58115#0#PHP" expanded="false" />
<element signature="e#58141#58972#0#PHP" expanded="false" />
<element signature="e#58978#59398#0#PHP" expanded="false" />
<element signature="e#59403#59886#0#PHP" expanded="false" />
<element signature="e#59892#60698#0#PHP" expanded="false" />
<element signature="e#60703#63861#0#PHP" expanded="false" />
<element signature="e#63876#65211#0#PHP" expanded="false" />
<element signature="e#65227#66261#0#PHP" expanded="false" />
<element signature="e#66267#67025#0#PHP" expanded="false" />
<element signature="e#67030#70773#0#PHP" expanded="false" />
<element signature="e#70779#71171#0#PHP" expanded="false" />
<element signature="e#71176#72128#0#PHP" expanded="false" />
<element signature="e#72152#72725#0#PHP" expanded="false" />
<element signature="e#72731#73330#0#PHP" expanded="false" />
<element signature="e#73335#74262#0#PHP" expanded="false" />
<element signature="e#74268#74982#0#PHP" expanded="false" />
<element signature="e#74988#75415#0#PHP" expanded="false" />
<element signature="e#75420#75889#0#PHP" expanded="false" />
<element signature="e#75896#77101#0#PHP" expanded="false" />
<element signature="e#77106#78809#0#PHP" expanded="false" />
<element signature="e#78815#79592#0#PHP" expanded="false" />
<element signature="e#79597#83535#0#PHP" expanded="false" />
<element signature="e#83541#84050#0#PHP" expanded="false" />
<element signature="e#84055#84727#0#PHP" expanded="false" />
<element signature="e#84733#84972#0#PHP" expanded="false" />
<element signature="e#84977#85060#0#PHP" expanded="false" />
</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="275">
<caret line="27" column="5" lean-forward="true" selection-start-line="27" selection-start-column="5" selection-end-line="27" selection-end-column="5" />
<folding>
<element signature="e#619#1611#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/user/user/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="75">
<caret line="3" column="51" lean-forward="false" selection-start-line="3" selection-start-column="51" selection-end-line="3" selection-end-column="51" />
<folding>
<element signature="n#div#1;n#div#0;n#!!top" expanded="false" />
</folding>
</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="375">
<caret line="60" column="44" lean-forward="true" selection-start-line="60" selection-start-column="44" selection-end-line="60" selection-end-column="44" />
<caret line="27" column="39" lean-forward="false" selection-start-line="27" selection-start-column="29" selection-end-line="27" selection-end-column="39" />
<folding />
</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="525">
<caret line="21" column="0" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="35" 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="350">
<caret line="59" column="36" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="294" selection-end-column="0" />
<folding>
<marker date="1583590171926" expanded="true" signature="3701:11482" ph="..." />
<marker date="1583590171926" expanded="true" signature="3719:3854" ph="..." />
... ... @@ -1419,128 +1538,45 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/user/User.php">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="450">
<caret line="18" column="33" lean-forward="true" selection-start-line="18" selection-start-column="33" selection-end-line="18" selection-end-column="33" />
<state relative-caret-position="350">
<caret line="14" column="15" lean-forward="true" selection-start-line="0" selection-start-column="0" selection-end-line="78" selection-end-column="3" />
<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="500">
<caret line="44" column="131" lean-forward="true" selection-start-line="44" selection-start-column="131" selection-end-line="44" selection-end-column="131" />
<state relative-caret-position="375">
<caret line="51" column="54" lean-forward="false" selection-start-line="51" selection-start-column="54" selection-end-line="51" selection-end-column="54" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/vendor/symfony/http-foundation/Response.php">
<entry file="file://$PROJECT_DIR$/application/admin/controller/OrderDetail.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="300">
<caret line="372" column="20" lean-forward="false" selection-start-line="372" selection-start-column="20" selection-end-line="372" selection-end-column="20" />
<folding />
<state relative-caret-position="-50">
<caret line="13" column="1" lean-forward="true" selection-start-line="13" selection-start-column="1" selection-end-line="13" selection-end-column="1" />
<folding>
<element signature="e#40#74#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/Pay.php">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/order_detail.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="218">
<caret line="335" column="5" lean-forward="true" selection-start-line="335" selection-start-column="5" selection-end-line="335" selection-end-column="5" />
<folding>
<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#5630#0#PHP" expanded="false" />
<element signature="e#5636#6050#0#PHP" expanded="false" />
<element signature="e#6055#16076#0#PHP" expanded="false" />
<element signature="e#7031#16009#0#PHP" expanded="false" />
<element signature="e#16083#16400#0#PHP" expanded="false" />
<element signature="e#16405#16883#0#PHP" expanded="false" />
<element signature="e#16900#17197#0#PHP" expanded="false" />
<element signature="e#17202#17595#0#PHP" expanded="false" />
<element signature="e#17622#20883#0#PHP" expanded="false" />
<element signature="e#20912#23550#0#PHP" expanded="false" />
<element signature="e#23583#29910#0#PHP" expanded="false" />
<element signature="e#24378#29668#0#PHP" expanded="false" />
<element signature="e#29933#30150#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="475">
<caret line="28" column="78" lean-forward="true" selection-start-line="28" selection-start-column="78" selection-end-line="28" selection-end-column="78" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/api/controller/User.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/order_detail/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="718">
<caret line="2422" column="1" lean-forward="true" selection-start-line="2422" selection-start-column="1" selection-end-line="2422" selection-end-column="1" />
<folding>
<element signature="e#4287#4721#0#PHP" expanded="false" />
<element signature="e#4726#5084#0#PHP" expanded="false" />
<element signature="e#5090#5497#0#PHP" expanded="false" />
<element signature="e#5502#5845#0#PHP" expanded="false" />
<element signature="e#5851#6264#0#PHP" expanded="false" />
<element signature="e#6269#6586#0#PHP" expanded="false" />
<element signature="e#6592#7691#0#PHP" expanded="false" />
<element signature="e#7696#13097#0#PHP" expanded="false" />
<element signature="e#13103#13783#0#PHP" expanded="false" />
<element signature="e#13788#14646#0#PHP" expanded="false" />
<element signature="e#14652#15441#0#PHP" expanded="false" />
<element signature="e#15446#16795#0#PHP" expanded="false" />
<element signature="e#16801#17503#0#PHP" expanded="false" />
<element signature="e#17508#18828#0#PHP" expanded="false" />
<element signature="e#18834#19410#0#PHP" expanded="false" />
<element signature="e#19415#20027#0#PHP" expanded="false" />
<element signature="e#20033#20749#0#PHP" expanded="false" />
<element signature="e#20754#25622#0#PHP" expanded="false" />
<element signature="e#25631#26561#0#PHP" expanded="false" />
<element signature="e#26566#31707#0#PHP" expanded="false" />
<element signature="e#31713#32090#0#PHP" expanded="false" />
<element signature="e#32095#32534#0#PHP" expanded="false" />
<element signature="e#32540#33361#0#PHP" expanded="false" />
<element signature="e#33366#36770#0#PHP" expanded="false" />
<element signature="e#36776#37281#0#PHP" expanded="false" />
<element signature="e#37286#37537#0#PHP" expanded="false" />
<element signature="e#37543#38022#0#PHP" expanded="false" />
<element signature="e#38027#38784#0#PHP" expanded="false" />
<element signature="e#38790#39271#0#PHP" expanded="false" />
<element signature="e#39276#40146#0#PHP" expanded="false" />
<element signature="e#40152#40515#0#PHP" expanded="false" />
<element signature="e#40520#40711#0#PHP" expanded="false" />
<element signature="e#40717#41075#0#PHP" expanded="false" />
<element signature="e#41080#41271#0#PHP" expanded="false" />
<element signature="e#41277#42420#0#PHP" expanded="false" />
<element signature="e#42425#45090#0#PHP" expanded="false" />
<element signature="e#45096#45594#0#PHP" expanded="false" />
<element signature="e#45599#47345#0#PHP" expanded="false" />
<element signature="e#47351#47764#0#PHP" expanded="false" />
<element signature="e#47769#48248#0#PHP" expanded="false" />
<element signature="e#48254#48788#0#PHP" expanded="false" />
<element signature="e#48793#50178#0#PHP" expanded="false" />
<element signature="e#50184#50838#0#PHP" expanded="false" />
<element signature="e#50843#52858#0#PHP" expanded="false" />
<element signature="e#52864#53624#0#PHP" expanded="false" />
<element signature="e#53629#56338#0#PHP" expanded="false" />
<element signature="e#56364#57195#0#PHP" expanded="false" />
<element signature="e#57201#57621#0#PHP" expanded="false" />
<element signature="e#57626#58109#0#PHP" expanded="false" />
<element signature="e#58115#58921#0#PHP" expanded="false" />
<element signature="e#58926#62084#0#PHP" expanded="false" />
<element signature="e#62099#63434#0#PHP" expanded="false" />
<element signature="e#63450#64484#0#PHP" expanded="false" />
<element signature="e#64490#65248#0#PHP" expanded="false" />
<element signature="e#65253#68996#0#PHP" expanded="false" />
<element signature="e#69002#69394#0#PHP" expanded="false" />
<element signature="e#69399#70351#0#PHP" expanded="false" />
<element signature="e#70375#70948#0#PHP" expanded="false" />
<element signature="e#70954#71553#0#PHP" expanded="false" />
<element signature="e#71558#72485#0#PHP" expanded="false" />
<element signature="e#72491#73205#0#PHP" expanded="false" />
<element signature="e#73211#73638#0#PHP" expanded="false" />
<element signature="e#73643#74112#0#PHP" expanded="false" />
<element signature="e#74119#75324#0#PHP" expanded="false" />
<element signature="e#75329#77032#0#PHP" expanded="false" />
<element signature="e#77038#77815#0#PHP" expanded="false" />
<element signature="e#77820#81758#0#PHP" expanded="false" />
<element signature="e#81764#82273#0#PHP" expanded="false" />
<element signature="e#82278#82950#0#PHP" expanded="false" />
</folding>
<state relative-caret-position="100">
<caret line="4" column="51" lean-forward="true" selection-start-line="4" selection-start-column="51" selection-end-line="4" selection-end-column="51" />
<folding />
</state>
</provider>
</entry>
... ...
<?php
namespace app\admin\controller;
use app\common\controller\Backend;
use think\Db;
/**
* 图片订单管理
*
* @icon fa fa-circle-o
*/
class OrderDetail extends Backend
{
/**
* Order模型对象
* @var \app\admin\model\Order
*/
protected $model = null;
public function _initialize()
{
parent::_initialize();
$this->model = new \app\admin\model\Order;
}
/**
* 默认生成的控制器所继承的父类中有index/add/edit/del/multi五个基础方法、destroy/restore/recyclebin三个回收站方法
* 因此在当前控制器中可不用编写增删改查的代码,除非需要自己控制这部分逻辑
* 需要将application/admin/library/traits/Backend.php中对应的方法复制到当前控制器,然后进行修改
*/
/**
* 查看
*/
public function index($ids = null)
{
//当前是否为关联查询
$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('user_id',$ids)
->where($where)
->order($sort, $order)
->count();
$list = $this->model
->with(['user'])
->where('user_id',$ids)
->where($where)
->order($sort, $order)
->limit($offset, $limit)
->select();
foreach ($list as $row) {
}
$list = collection($list)->toArray();
$type = new \app\admin\model\Pic();
$video = new \app\admin\model\Video();
foreach ($list as &$v){
$type_ids = $type->whereIn('id',$v['pic_id'])->column('title');
if(!empty($v['video_id'])){
$a = [];
$v['video_id'] = unserialize($v['video_id']);
foreach ($v['video_id'] as &$v1){
//获取视频标题
$v1['id'] = $video->where('id',$v1['id'])->column('title');
//判断视频属性
if($v1['attr'] == 1){
$v1['attr'] = '2k';
}elseif ($v1['attr'] == 2){
$v1['attr'] = '4k';
}else{
$v1['attr'] = '8k';
}
array_push($a,$v1['id']);
}
$v['video_id'] = $a;
}
$v['pic_id'] = trim(implode(',',$type_ids),',');
}
$result = array("total" => $total, "rows" => $list);
return json($result);
}
$this->assignconfig('ids',$ids);
return $this->view->fetch();
}
}
... ...
... ... @@ -24,6 +24,8 @@ class User extends Backend
{
parent::_initialize();
$this->model = model('User');
$this->view->assign("statusList", $this->model->getStatusList1());
}
/**
... ...
... ... @@ -22,6 +22,11 @@ class User extends Model
'jointime_text'
];
public function getStatusList1()
{
return ['0' => __('非会员'),'1' => __('会员列表')];
}
public function getOriginData()
{
return $this->origin;
... ...
<div class="panel panel-default panel-intro">
{:build_heading()}
<div class="panel-body">
<div id="myTabContent" class="tab-content">
<div class="tab-pane fade active in" id="one">
<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>-->
<!--<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>-->
<!--<ul class="dropdown-menu text-left" role="menu">-->
<!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=normal"><i class="fa fa-eye"></i> {:__('Set to normal')}</a></li>-->
<!--<li><a class="btn btn-link btn-multi btn-disabled disabled" href="javascript:;" data-params="status=hidden"><i class="fa fa-eye-slash"></i> {:__('Set to hidden')}</a></li>-->
<!--</ul>-->
<!--</div>-->
</div>
<table id="table" class="table table-striped table-bordered table-hover table-nowrap"
data-operate-edit="{:$auth->check('order/edit')}"
data-operate-del="{:$auth->check('order/del')}"
width="100%">
</table>
</div>
</div>
</div>
</div>
</div>
... ...
<div class="panel panel-default panel-intro">
{:build_heading()}
<div class="panel-heading">
{:build_heading(null,FALSE)}
<ul class="nav nav-tabs" data-field="is_vip">
<li class="active"><a href="#t-all" data-value="" data-toggle="tab">{:__('All')}</a></li>
{foreach name="statusList" item="vo"}
<li><a href="#t-{$key}" data-value="{$key}" data-toggle="tab">{$vo}</a></li>
{/foreach}
</ul>
</div>
<div class="panel-body">
<div id="myTabContent" class="tab-content">
... ...
... ... @@ -7776,7 +7776,7 @@
<div class="row mt0 footer">
<div class="col-md-6" align="left">
Generated on 2020-05-22 17:03:23 </div>
Generated on 2020-05-23 16:08:46 </div>
<div class="col-md-6" align="right">
<a href="https://www.fastadmin.net" target="_blank">FastAdmin</a>
</div>
... ...
define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefined, Backend, Table, Form) {
var Controller = {
index: function () {
// 初始化表格参数配置
Table.api.init({
extend: {
index_url: 'order_detail/index' +'/ids/' + Config.ids + location.search,
add_url: 'order_detail/add',
edit_url: 'order_detail/edit',
del_url: 'order_detail/del',
multi_url: 'order_detail/multi',
table: 'order_detail',
}
});
var table = $("#table");
// 初始化表格
table.bootstrapTable({
url: $.fn.bootstrapTable.defaults.extend.index_url,
pk: 'id',
sortName: 'id',
columns: [
[
{field: 'id', title: __('Id'), operate:false},
{field: 'user.nickname', title: __('昵称')},
{field: 'pic_id', title: __('图片素材'), operate:false},
{field: 'video_id', title: __('视频素材'), operate:false},
{field: 'total', title: __('总价'), operate:'BETWEEN'},
{field: 'status', title: __('Status'),formatter: Table.api.formatter.status,searchList:{'1': '待支付', '2': '已完成'}},
{field: 'num', title: __('订单号'), 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: 'user.is_vip', title: __('User.is_vip'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}}
]
]
});
// 为表格绑定事件
Table.api.bindevent(table);
},
add: function () {
Controller.api.bindevent();
},
edit: function () {
Controller.api.bindevent();
},
api: {
bindevent: function () {
Form.api.bindevent($("form[role=form]"));
}
}
};
return Controller;
});
\ No newline at end of file
... ...
... ... @@ -42,6 +42,18 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'joinip', title: __('Joinip'), formatter: Table.api.formatter.search},
{field: 'status', title: __('Status'), formatter: Table.api.formatter.status, searchList: {normal: __('Normal'), hidden: __('Hidden')}},
{field: 'money', title: __('账号余额')},
{field: 'id', title: __('按钮组'), table: table, events: Table.api.events.operate, buttons:
[
{
text: '购买信息列表',
title: '购买信息列表',
icon: 'fa fa-list',
classname: 'btn btn-xs btn-primary btn-dialog',
url: 'order_detail/index',
extend: 'data-area=\'["80%","80%"]\'',
}
], operate:false, formatter: Table.api.formatter.buttons
},
{field: 'is_vip', title: __('是否为会员'),formatter: Table.api.formatter.label,searchList:{'0': '否', '1': '是'}},
// {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate}
]
... ...