王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 fbc51df666549ccaeb0cc6c015232942294cc26e 1 个父辈 4118e0f0
1 个管道 的构建 通过 耗费 1 秒

后台bug

内嵌 并排对比
正在显示 2 个修改的文件 包含 28 行增加 和 40 行删除
... ... @@ -5,12 +5,6 @@
</component>
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/application/admin/view/users/money.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/controller/Users.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/Users.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/merchant/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/merchant/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/users/edit.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/users/edit.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/js/backend/users.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/users.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/thinkphp/library/think/Controller.php" beforeDir="false" afterPath="$PROJECT_DIR$/thinkphp/library/think/Controller.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -55,7 +49,7 @@
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/users.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="436">
<caret line="40" column="57" lean-forward="true" selection-start-line="40" selection-start-column="57" selection-end-line="40" selection-end-column="57" />
<caret line="40" column="57" selection-start-line="40" selection-start-column="57" selection-end-line="40" selection-end-column="57" />
</state>
</provider>
</entry>
... ... @@ -90,8 +84,8 @@
<file leaf-file-name="Controller.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/Controller.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="80" column="38" selection-start-line="80" selection-start-column="38" selection-end-line="80" selection-end-column="38" />
<state relative-caret-position="425">
<caret line="79" column="22" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="22" />
</state>
</provider>
</entry>
... ... @@ -491,14 +485,7 @@
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="17475000" />
<workItem from="1573605070739" duration="26731000" />
</task>
<task id="LOCAL-00615" summary=" 商户申请">
<created>1573607415032</created>
<option name="number" value="00615" />
<option name="presentableId" value="LOCAL-00615" />
<option name="project" value="LOCAL" />
<updated>1573607415033</updated>
<workItem from="1573605070739" duration="26868000" />
</task>
<task id="LOCAL-00616" summary=" 商户申请">
<created>1573607436524</created>
... ... @@ -836,11 +823,18 @@
<option name="project" value="LOCAL" />
<updated>1573636823634</updated>
</task>
<option name="localTasksCounter" value="664" />
<task id="LOCAL-00664" summary="后台bug">
<created>1573648085758</created>
<option name="number" value="00664" />
<option name="presentableId" value="LOCAL-00664" />
<option name="project" value="LOCAL" />
<updated>1573648085758</updated>
</task>
<option name="localTasksCounter" value="665" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="450513000" />
<option name="totallyTimeSpent" value="450650000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -855,7 +849,7 @@
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" />
<window_info anchor="bottom" id="运行" order="7" />
<window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15085287" />
<window_info content_ui="combo" id="Project" order="0" weight="0.15085287" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" weight="0.32995737" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
... ... @@ -877,25 +871,26 @@
<window_info anchor="bottom" id="运行" order="7" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
<window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" />
<window_info anchor="right" id="Ant Build" order="2" weight="0.25" />
<window_info anchor="right" id="Remote Host" order="4" weight="0.15778251" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.15085287" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="3" weight="0.25" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="消息" order="15" weight="0.32997763" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Database" order="4" weight="0.32995737" />
<window_info anchor="right" id="Database" order="5" weight="0.32995737" />
<window_info anchor="bottom" id="Terminal" order="11" weight="0.32997763" />
<window_info anchor="bottom" id="Event Log" order="12" side_tool="true" weight="0.32997763" />
<window_info anchor="bottom" id="Database Changes" order="10" show_stripe_button="false" />
<window_info anchor="bottom" id="消息" order="15" weight="0.32997763" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="调试" order="13" />
<window_info anchor="bottom" id="Message" order="0" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info anchor="bottom" id="调试" order="13" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="1" type="SLIDING" weight="0.4" />
<window_info anchor="right" id="层次结构" order="0" weight="0.32995737" />
<window_info id="Favorites" order="2" side_tool="true" />
</layout-to-restore>
</component>
... ... @@ -1236,7 +1231,7 @@
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/users.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="436">
<caret line="40" column="57" lean-forward="true" selection-start-line="40" selection-start-column="57" selection-end-line="40" selection-end-column="57" />
<caret line="40" column="57" selection-start-line="40" selection-start-column="57" selection-end-line="40" selection-end-column="57" />
</state>
</provider>
</entry>
... ... @@ -1256,8 +1251,8 @@
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/Controller.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="80" column="38" selection-start-line="80" selection-start-column="38" selection-end-line="80" selection-end-column="38" />
<state relative-caret-position="425">
<caret line="79" column="22" selection-start-line="79" selection-start-column="22" selection-end-line="79" selection-end-column="22" />
</state>
</provider>
</entry>
... ...
... ... @@ -74,14 +74,7 @@ class Controller
*/
protected function _initialize()
{
$user_id = get_current_user_id();
if(!empty($user_id)){
$data = Db::name('user')->where(['id'=>$user_id])->find();
dump($data);
if($data['status'] == 'hidden'){
$this->error('您已被拉黑');
}
}
exit();
}
/**
... ...