diff --git a/.idea/workspace.xml b/.idea/workspace.xml index fe92754..fc9a39e 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,8 +2,7 @@ <project version="4"> <component name="ChangeListManager"> <list default="true" id="e93f11c2-a7d9-4d35-8b1c-8dd18e7f5fef" name="Default" comment=""> - <change type="MODIFICATION" beforePath="$PROJECT_DIR$/application/admin/view/vip/index.html" afterPath="$PROJECT_DIR$/application/admin/view/vip/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/vip.js" afterPath="$PROJECT_DIR$/public/assets/js/backend/vip.js" /> </list> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="TRACKING_ENABLED" value="true" /> @@ -14,7 +13,7 @@ </component> <component name="FileEditorManager"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> - <file leaf-file-name="User.php" pinned="false" current-in-tab="false"> + <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="234"> @@ -49,26 +48,6 @@ </provider> </entry> </file> - <file leaf-file-name="vip.js" pinned="false" current-in-tab="false"> - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="450"> - <caret line="24" column="21" lean-forward="true" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" /> - <folding /> - </state> - </provider> - </entry> - </file> - <file leaf-file-name="index.html" pinned="false" current-in-tab="true"> - <entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="300"> - <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" /> - <folding /> - </state> - </provider> - </entry> - </file> </leaf> </component> <component name="FindInProjectRecents"> @@ -124,6 +103,7 @@ <option value="$PROJECT_DIR$/application/api/controller/Pay.php" /> <option value="$PROJECT_DIR$/application/api/controller/User.php" /> <option value="$PROJECT_DIR$/application/admin/view/vip/index.html" /> + <option value="$PROJECT_DIR$/public/assets/js/backend/vip.js" /> </list> </option> </component> @@ -141,9 +121,9 @@ <sorting>DEFINITION_ORDER</sorting> </component> <component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" /> - <component name="ProjectFrameBounds" extendedState="7"> - <option name="x" value="-72" /> - <option name="y" value="56" /> + <component name="ProjectFrameBounds" extendedState="1"> + <option name="x" value="36" /> + <option name="y" value="71" /> <option name="width" value="1883" /> <option name="height" value="946" /> </component> @@ -283,7 +263,7 @@ <workItem from="1574141466352" duration="745000" /> <workItem from="1574143209694" duration="3660000" /> <workItem from="1574146994475" duration="23222000" /> - <workItem from="1574209189943" duration="11839000" /> + <workItem from="1574209189943" duration="11979000" /> </task> <task id="LOCAL-00001" summary="调试"> <created>1574145133364</created> @@ -296,7 +276,7 @@ <servers /> </component> <component name="TimeTrackingManager"> - <option name="totallyTimeSpent" value="83414000" /> + <option name="totallyTimeSpent" value="83554000" /> </component> <component name="TodoView"> <todo-panel id="selected-file"> @@ -308,16 +288,17 @@ </todo-panel> </component> <component name="ToolWindowManager"> - <frame x="-8" y="-8" width="1936" height="1056" extended-state="7" /> + <frame x="36" y="71" width="1883" height="946" extended-state="1" /> + <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.15298508" 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.15743281" sideWeight="0.5" order="1" side_tool="false" content_ui="combo" /> <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.32912987" sideWeight="0.5" order="9" side_tool="false" content_ui="tabs" /> <window_info id="Event Log" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="true" content_ui="tabs" /> <window_info id="Database" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="0" side_tool="false" content_ui="tabs" /> <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="1" side_tool="false" content_ui="tabs" /> <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.33" sideWeight="0.5" order="5" side_tool="false" content_ui="tabs" /> <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" show_stripe_button="true" weight="0.25" sideWeight="0.5" order="2" side_tool="false" content_ui="tabs" /> - <window_info id="Terminal" active="true" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" show_stripe_button="true" weight="0.33841133" 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.38442522" 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" /> @@ -719,6 +700,22 @@ </state> </provider> </entry> + <entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="25"> + <caret line="22" column="31" lean-forward="true" selection-start-line="22" selection-start-column="31" selection-end-line="22" selection-end-column="31" /> + <folding /> + </state> + </provider> + </entry> + <entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html"> + <provider selected="true" editor-type-id="text-editor"> + <state relative-caret-position="300"> + <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" /> + <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="234"> @@ -752,21 +749,5 @@ </state> </provider> </entry> - <entry file="file://$PROJECT_DIR$/public/assets/js/backend/vip.js"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="450"> - <caret line="24" column="21" lean-forward="true" selection-start-line="24" selection-start-column="21" selection-end-line="24" selection-end-column="21" /> - <folding /> - </state> - </provider> - </entry> - <entry file="file://$PROJECT_DIR$/application/admin/view/vip/index.html"> - <provider selected="true" editor-type-id="text-editor"> - <state relative-caret-position="300"> - <caret line="12" column="24" lean-forward="false" selection-start-line="12" selection-start-column="24" selection-end-line="12" selection-end-column="24" /> - <folding /> - </state> - </provider> - </entry> </component> </project> \ No newline at end of file diff --git a/public/assets/js/backend/vip.js b/public/assets/js/backend/vip.js index 217bdd9..09ff301 100644 --- a/public/assets/js/backend/vip.js +++ b/public/assets/js/backend/vip.js @@ -27,7 +27,13 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin {field: 'id', title: __('Id')}, {field: 'createtime', title: __('Createtime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, {field: 'updatetime', title: __('Updatetime'), operate:'RANGE', addclass:'datetimerange', formatter: Table.api.formatter.datetime}, - {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: Table.api.formatter.operate} + {field: 'operate', title: __('Operate'), table: table, events: Table.api.events.operate, formatter: function (value, row, index) { + var that = $.extend({}, this); + var table = $(that.table).clone(true); + $(table).data("operate-del", null); + that.table = table; + return Table.api.formatter.operate.call(that, value, row, index); + }} ] ] });