郭盛 / scrap · 提交

转到一个项目

作者 郭盛
提交 4e909530bc429a71d45bfd0281a78a9f49315ae8 1 个父辈 99f876a2
1 个管道 的构建 通过 耗费 9 秒

后台加入身份判断

内嵌 并排对比
正在显示 4 个修改的文件 包含 248 行增加 和 165 行删除
... ... @@ -3,7 +3,9 @@
<component name="ChangeListManager">
<list default="true" id="0011664b-87e9-41bd-9f37-18792fb15777" name="Default" comment="">
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/.idea/workspace.xml" afterPath="$PROJECT_DIR$/.idea/workspace.xml" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" afterPath="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/api/index/controller/UserController.php" afterPath="$PROJECT_DIR$/api/index/controller/UserController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" afterPath="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
<change type="MODIFICATION" beforePath="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" afterPath="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -25,74 +27,64 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="RecycleController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<file leaf-file-name="UserController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/admin/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="259" column="5" lean-forward="true" selection-start-line="259" selection-start-column="5" selection-end-line="259" selection-end-column="5" />
<state relative-caret-position="620">
<caret line="352" column="5" lean-forward="false" selection-start-line="352" selection-start-column="5" selection-end-line="352" selection-end-column="5" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
<element signature="e#892#1227#0#PHP" expanded="false" />
<element signature="e#1232#1729#0#PHP" expanded="false" />
<element signature="e#1735#1995#0#PHP" expanded="false" />
<element signature="e#2000#2289#0#PHP" expanded="false" />
<element signature="e#2295#2634#0#PHP" expanded="false" />
<element signature="e#2639#3142#0#PHP" expanded="false" />
<element signature="e#3148#3364#0#PHP" expanded="false" />
<element signature="e#3369#3738#0#PHP" expanded="false" />
<element signature="e#3744#4046#0#PHP" expanded="false" />
<element signature="e#4051#4450#0#PHP" expanded="false" />
<element signature="e#4456#4653#0#PHP" expanded="false" />
<element signature="e#4658#4915#0#PHP" expanded="false" />
<element signature="e#4921#5117#0#PHP" expanded="false" />
<element signature="e#5122#5384#0#PHP" expanded="false" />
<element signature="e#5390#5845#0#PHP" expanded="false" />
<element signature="e#5850#6416#0#PHP" expanded="false" />
<element signature="e#6422#6765#0#PHP" expanded="false" />
<element signature="e#6770#7251#0#PHP" expanded="false" />
<element signature="e#7257#7548#0#PHP" expanded="false" />
<element signature="e#7553#7904#0#PHP" expanded="false" />
<element signature="e#7910#8263#0#PHP" expanded="false" />
<element signature="e#8268#8673#0#PHP" expanded="false" />
<element signature="e#8679#9062#0#PHP" expanded="false" />
<element signature="e#9067#9734#0#PHP" expanded="false" />
<element signature="e#9740#10184#0#PHP" expanded="false" />
<element signature="e#10189#11036#0#PHP" expanded="false" />
<element signature="e#11042#11310#0#PHP" expanded="false" />
<element signature="e#11315#11787#0#PHP" expanded="false" />
<element signature="e#11793#12099#0#PHP" expanded="false" />
<element signature="e#12104#13747#0#PHP" expanded="false" />
<element signature="e#13768#14087#0#PHP" expanded="false" />
<element signature="e#1013#1302#0#PHP" expanded="false" />
<element signature="e#1307#2242#0#PHP" expanded="false" />
<element signature="e#2248#2538#0#PHP" expanded="false" />
<element signature="e#2543#2734#0#PHP" expanded="false" />
<element signature="e#2740#3037#0#PHP" expanded="false" />
<element signature="e#3042#4380#0#PHP" expanded="false" />
<element signature="e#4386#4676#0#PHP" expanded="false" />
<element signature="e#4681#5161#0#PHP" expanded="false" />
<element signature="e#5167#5464#0#PHP" expanded="false" />
<element signature="e#5469#7067#0#PHP" expanded="false" />
<element signature="e#7073#7370#0#PHP" expanded="false" />
<element signature="e#7375#7582#0#PHP" expanded="false" />
<element signature="e#7588#7897#0#PHP" expanded="false" />
<element signature="e#7902#8398#0#PHP" expanded="false" />
<element signature="e#8404#8695#0#PHP" expanded="false" />
<element signature="e#8700#9092#0#PHP" expanded="false" />
<element signature="e#9098#9389#0#PHP" expanded="false" />
<element signature="e#9394#9861#0#PHP" expanded="false" />
<element signature="e#9867#10158#0#PHP" expanded="false" />
<element signature="e#10163#10636#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="SubscribeController.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<file leaf-file-name="AdminIndexController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/app/user/controller/AdminIndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="27" column="25" lean-forward="true" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" />
<state relative-caret-position="595">
<caret line="146" column="28" lean-forward="false" selection-start-line="146" selection-start-column="28" selection-end-line="146" selection-end-column="28" />
<folding>
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4680#0#PHP" expanded="false" />
<element signature="e#1236#1529#0#PHP" expanded="false" />
<element signature="e#1534#2298#0#PHP" expanded="false" />
<element signature="e#2304#2598#0#PHP" expanded="false" />
<element signature="e#2603#3052#0#PHP" expanded="false" />
<element signature="e#3058#3352#0#PHP" expanded="false" />
<element signature="e#3685#3981#0#PHP" expanded="false" />
<element signature="e#3998#4297#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="RestBaseController.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<file leaf-file-name="index.html" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="515">
<caret line="119" column="42" lean-forward="true" selection-start-line="119" selection-start-column="42" selection-end-line="119" selection-end-column="42" />
<folding />
<state relative-caret-position="445">
<caret line="47" column="74" lean-forward="true" selection-start-line="47" selection-start-column="74" selection-end-line="47" selection-end-column="74" />
<folding>
<element signature="n#style#0;n#span#0;n#a#0;n#if#0;n#td#9;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#a#1;n#if#0;n#td#9;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -117,9 +109,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/data/conf/database.php" />
<option value="$PROJECT_DIR$/.gitlab-ci.yml" />
<option value="$PROJECT_DIR$/app/admin/controller/AboutController.php" />
<option value="$PROJECT_DIR$/public/static/style/base.css" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/index/shopgoods/photo.html" />
<option value="$PROJECT_DIR$/public/themes/simpleboot3/index/user/index.html" />
... ... @@ -165,9 +154,12 @@
<option value="$PROJECT_DIR$/api/wxapp/controller/PublicController.php" />
<option value="$PROJECT_DIR$/api/index/controller/HomeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/RecycleController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php" />
<option value="$PROJECT_DIR$/api/index/controller/SubscribeController.php" />
<option value="$PROJECT_DIR$/api/index/controller/UserController.php" />
<option value="$PROJECT_DIR$/app/admin/controller/UserController.php" />
<option value="$PROJECT_DIR$/app/user/controller/AdminIndexController.php" />
<option value="$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html" />
</list>
</option>
</component>
... ... @@ -186,8 +178,8 @@
</component>
<component name="PhpWorkspaceProjectConfiguration" backward_compatibility_performed="true" />
<component name="ProjectFrameBounds" extendedState="1">
<option name="x" value="235" />
<option name="y" value="57" />
<option name="x" value="309" />
<option name="y" value="60" />
<option name="width" value="1582" />
<option name="height" value="982" />
</component>
... ... @@ -217,21 +209,56 @@
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="api" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="index" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="app" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="controller" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
<path>
<item name="scrap" type="b2602c69:ProjectViewProjectNode" />
<item name="scrap" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="public" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="themes" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_simpleboot3" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="user" type="2a2b976b:PhpTreeStructureProvider$1" />
<item name="admin_index" type="2a2b976b:PhpTreeStructureProvider$1" />
</path>
</expand>
<select />
</subPane>
... ... @@ -325,15 +352,15 @@
<workItem from="1574837405404" duration="1203000" />
<workItem from="1574903328460" duration="15512000" />
<workItem from="1574930017327" duration="7716000" />
<workItem from="1574986868818" duration="2791000" />
<workItem from="1574986868818" duration="8975000" />
</task>
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="358499000" />
<option name="totallyTimeSpent" value="364683000" />
</component>
<component name="ToolWindowManager">
<frame x="235" y="57" width="1582" height="982" extended-state="1" />
<frame x="309" y="60" width="1582" height="982" 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.18528253" sideWeight="0.5" order="0" side_tool="false" content_ui="combo" />
... ... @@ -387,41 +414,6 @@
<watches-manager />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payedit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="200">
<caret line="20" column="77" lean-forward="true" selection-start-line="20" selection-start-column="77" selection-end-line="20" selection-end-column="77" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/payadd.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="225">
<caret line="9" column="44" lean-forward="false" selection-start-line="9" selection-start-column="44" selection-end-line="9" selection-end-column="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/admin/money/pay.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="439">
<caret line="24" column="43" lean-forward="false" selection-start-line="24" selection-start-column="43" selection-end-line="24" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/admin/controller/MoneyController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="625">
<caret line="145" column="39" lean-forward="false" selection-start-line="145" selection-start-column="39" selection-end-line="145" selection-end-column="39" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/model/OrderModel.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="325">
<caret line="18" column="37" lean-forward="true" selection-start-line="18" selection-start-column="37" selection-end-line="18" selection-end-column="37" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/vendor/overtrue/wechat/src/Foundation/Application.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="304">
... ... @@ -738,38 +730,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="149">
<caret line="562" column="58" lean-forward="true" selection-start-line="562" selection-start-column="58" selection-end-line="562" selection-end-column="58" />
<folding>
<element signature="e#345#694#0#PHP" expanded="false" />
<element signature="e#699#1464#0#PHP" expanded="false" />
<element signature="e#1470#1699#0#PHP" expanded="false" />
<element signature="e#3335#3682#0#PHP" expanded="false" />
<element signature="e#3687#4133#0#PHP" expanded="false" />
<element signature="e#4139#4399#0#PHP" expanded="false" />
<element signature="e#4404#4605#0#PHP" expanded="false" />
<element signature="e#4611#4873#0#PHP" expanded="false" />
<element signature="e#4878#5083#0#PHP" expanded="false" />
<element signature="e#5089#5531#0#PHP" expanded="false" />
<element signature="e#5536#6764#0#PHP" expanded="false" />
<element signature="e#6787#7332#0#PHP" expanded="false" />
<element signature="e#7338#7619#0#PHP" expanded="false" />
<element signature="e#7624#8016#0#PHP" expanded="false" />
<element signature="e#8022#8574#0#PHP" expanded="false" />
<element signature="e#8579#9937#0#PHP" expanded="false" />
<element signature="e#9943#10400#0#PHP" expanded="false" />
<element signature="e#10405#11668#0#PHP" expanded="false" />
<element signature="e#11691#12043#0#PHP" expanded="false" />
<element signature="e#12049#12733#0#PHP" expanded="false" />
<element signature="e#12738#13997#0#PHP" expanded="false" />
<element signature="e#14003#14465#0#PHP" expanded="false" />
<element signature="e#14470#16675#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/ShopgoodsController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="618">
... ... @@ -833,10 +793,34 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="515">
<caret line="119" column="42" lean-forward="true" selection-start-line="119" selection-start-column="42" selection-end-line="119" selection-end-column="42" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-50">
<caret line="32" column="7" lean-forward="false" selection-start-line="32" selection-start-column="7" selection-end-line="32" selection-end-column="7" />
<folding>
<element signature="e#305#577#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4680#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/RecycleController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="95">
<caret line="259" column="5" lean-forward="true" selection-start-line="259" selection-start-column="5" selection-end-line="259" selection-end-column="5" />
<caret line="259" column="5" lean-forward="false" selection-start-line="259" selection-start-column="5" selection-end-line="259" selection-end-column="5" />
<folding>
<element signature="e#342#596#0#PHP" expanded="false" />
<element signature="e#601#886#0#PHP" expanded="false" />
... ... @@ -875,26 +859,108 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/simplewind/cmf/controller/RestBaseController.php">
<entry file="file://$PROJECT_DIR$/api/index/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="515">
<caret line="119" column="42" lean-forward="true" selection-start-line="119" selection-start-column="42" selection-end-line="119" selection-end-column="42" />
<state relative-caret-position="450">
<caret line="84" column="22" lean-forward="true" selection-start-line="84" selection-start-column="22" selection-end-line="84" selection-end-column="22" />
<folding>
<element signature="e#345#694#0#PHP" expanded="false" />
<element signature="e#699#1464#0#PHP" expanded="false" />
<element signature="e#1470#1699#0#PHP" expanded="false" />
<element signature="e#3343#3690#0#PHP" expanded="false" />
<element signature="e#3695#4141#0#PHP" expanded="false" />
<element signature="e#4147#4407#0#PHP" expanded="false" />
<element signature="e#4412#4613#0#PHP" expanded="false" />
<element signature="e#4619#4881#0#PHP" expanded="false" />
<element signature="e#4886#5091#0#PHP" expanded="false" />
<element signature="e#5097#5539#0#PHP" expanded="false" />
<element signature="e#5544#6772#0#PHP" expanded="false" />
<element signature="e#6795#7340#0#PHP" expanded="false" />
<element signature="e#7346#7627#0#PHP" expanded="false" />
<element signature="e#7632#8024#0#PHP" expanded="false" />
<element signature="e#8030#8582#0#PHP" expanded="false" />
<element signature="e#8587#9945#0#PHP" expanded="false" />
<element signature="e#9951#10408#0#PHP" expanded="false" />
<element signature="e#10413#11676#0#PHP" expanded="false" />
<element signature="e#11699#12051#0#PHP" expanded="false" />
<element signature="e#12057#12741#0#PHP" expanded="false" />
<element signature="e#12746#14005#0#PHP" expanded="false" />
<element signature="e#14011#14473#0#PHP" expanded="false" />
<element signature="e#14478#16683#0#PHP" expanded="false" />
<element signature="e#16689#17298#0#PHP" expanded="false" />
<element signature="e#17303#18636#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="jar://$APPLICATION_HOME_DIR$/lib/phpstorm.jar!/resources/html5-schema/html5/tables.rnc">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="273">
<caret line="123" column="16" lean-forward="false" selection-start-line="123" selection-start-column="16" selection-end-line="123" selection-end-column="16" />
<folding />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/api/index/controller/SubscribeController.php">
<entry file="file://$PROJECT_DIR$/app/admin/controller/IndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="275">
<caret line="27" column="25" lean-forward="true" selection-start-line="27" selection-start-column="25" selection-end-line="27" selection-end-column="25" />
<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$/app/admin/controller/UserController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="620">
<caret line="352" column="5" lean-forward="false" selection-start-line="352" selection-start-column="5" selection-end-line="352" selection-end-column="5" />
<folding>
<element signature="e#583#854#0#PHP" expanded="false" />
<element signature="e#1119#1594#0#PHP" expanded="false" />
<element signature="e#1599#2490#0#PHP" expanded="false" />
<element signature="e#2497#2911#0#PHP" expanded="false" />
<element signature="e#2916#3386#0#PHP" expanded="false" />
<element signature="e#3393#3889#0#PHP" expanded="false" />
<element signature="e#3894#4680#0#PHP" expanded="false" />
<element signature="e#1013#1302#0#PHP" expanded="false" />
<element signature="e#1307#2242#0#PHP" expanded="false" />
<element signature="e#2248#2538#0#PHP" expanded="false" />
<element signature="e#2543#2734#0#PHP" expanded="false" />
<element signature="e#2740#3037#0#PHP" expanded="false" />
<element signature="e#3042#4380#0#PHP" expanded="false" />
<element signature="e#4386#4676#0#PHP" expanded="false" />
<element signature="e#4681#5161#0#PHP" expanded="false" />
<element signature="e#5167#5464#0#PHP" expanded="false" />
<element signature="e#5469#7067#0#PHP" expanded="false" />
<element signature="e#7073#7370#0#PHP" expanded="false" />
<element signature="e#7375#7582#0#PHP" expanded="false" />
<element signature="e#7588#7897#0#PHP" expanded="false" />
<element signature="e#7902#8398#0#PHP" expanded="false" />
<element signature="e#8404#8695#0#PHP" expanded="false" />
<element signature="e#8700#9092#0#PHP" expanded="false" />
<element signature="e#9098#9389#0#PHP" expanded="false" />
<element signature="e#9394#9861#0#PHP" expanded="false" />
<element signature="e#9867#10158#0#PHP" expanded="false" />
<element signature="e#10163#10636#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/app/user/controller/AdminIndexController.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="595">
<caret line="146" column="28" lean-forward="false" selection-start-line="146" selection-start-column="28" selection-end-line="146" selection-end-column="28" />
<folding>
<element signature="e#1236#1529#0#PHP" expanded="false" />
<element signature="e#1534#2298#0#PHP" expanded="false" />
<element signature="e#2304#2598#0#PHP" expanded="false" />
<element signature="e#2603#3052#0#PHP" expanded="false" />
<element signature="e#3058#3352#0#PHP" expanded="false" />
<element signature="e#3685#3981#0#PHP" expanded="false" />
<element signature="e#3998#4297#0#PHP" expanded="false" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/themes/admin_simpleboot3/user/admin_index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="445">
<caret line="47" column="74" lean-forward="true" selection-start-line="47" selection-start-column="74" selection-end-line="47" selection-end-column="74" />
<folding>
<element signature="n#style#0;n#span#0;n#a#0;n#if#0;n#td#9;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#a#1;n#if#0;n#td#9;n#tr#0;n#foreach#0;n#tbody#0;n#table#0;n#form#1;n#div#0;n#body#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
... ...
... ... @@ -83,7 +83,7 @@ class UserController extends RestBaseController
$number = generateCode();
//发送验证码
$data = array(
'content' => "您的验证码是：" . $number."十分钟之内有效",//短信内容
'content' => "【垃圾回收变现】您的验证码是：" . $number."十分钟之内有效",//短信内容
'mobile' => $phone,//手机号码
'productid' => '676767',//产品id
'xh' => ''//小号
... ...
... ... @@ -130,4 +130,28 @@ class AdminIndexController extends AdminBaseController
$this->error('数据传入失败！');
}
}
//设置为回收员
public function set()
{
$id = input('param.id', 0, 'intval');
if ($id) {
Db::name("user")->where(["id" => $id, "user_type" => 2])->setField('is_set', 1);
$this->success("设置成功！", '');
} else {
$this->error('数据传入失败！');
}
}
//取消设置
public function cancel()
{
$id = input('param.id', 0, 'intval');
if ($id) {
Db::name("user")->where(["id" => $id, "user_type" => 2])->setField('is_set', 0);
$this->success("设置成功！", '');
} else {
$this->error('数据传入失败！');
}
}
}
... ...
... ... @@ -28,8 +28,7 @@
<th>{:lang('REGISTRATION_TIME')}</th>
<th>{:lang('LAST_LOGIN_TIME')}</th>
<th>{:lang('LAST_LOGIN_IP')}</th>
<th>{:lang('STATUS')}</th>
<th>{:lang('ACTIONS')}</th>
<th>是否设置为回收员</th>
</tr>
</thead>
<tbody>
... ... @@ -48,20 +47,14 @@
<td>{:date('Y-m-d H:i:s',$vo['create_time'])}</td>
<td>{:date('Y-m-d H:i:s',$vo['last_login_time'])}</td>
<td>{$vo.last_login_ip}</td>
<td>{$user_statuses[$vo['user_status']]}</td>
<td>
<neq name="vo.id" value="1">
<empty name="vo.user_status">
<a href="{:url('adminIndex/cancelban',array('id'=>$vo['id']))}"
class="js-ajax-dialog-btn"
data-msg="{:lang('ACTIVATE_USER_CONFIRM_MESSAGE')}">{:lang('ACTIVATE_USER')}</a>
<else/>
<a href="{:url('adminIndex/ban',array('id'=>$vo['id']))}" class="js-ajax-dialog-btn"
data-msg="{:lang('BLOCK_USER_CONFIRM_MESSAGE')}">{:lang('BLOCK_USER')}</a>
</empty>
<else/>
<a style="color: #ccc;">{:lang('BLOCK_USER')}</a>
</neq>
<if condition="$vo.is_set eq 1">
<a href="{:url('adminIndex/cancel',array('id'=>$vo['id']))}" class="js-ajax-dialog-btn"
data-msg="您确定要取消设置吗"><span style="color: red">取消设置</span></a>
<else />
<a href="{:url('adminIndex/set',array('id'=>$vo['id']))}" class="js-ajax-dialog-btn"
data-msg="您确定要设置吗"><span style="color: green">设置</span></a>
</if>
</td>
</tr>
</foreach>
... ...