王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 d37a33b0f02c65c6620df6d9f9da7789731d0531 1 个父辈 d0d70dce
1 个管道 的构建 通过 耗费 13 秒

后台bug

内嵌 并排对比
正在显示 7 个修改的文件 包含 364 行增加 和 129 行删除
... ... @@ -5,8 +5,13 @@
</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/home/view/goods/audio_detail.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" 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" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -34,11 +39,11 @@
</component>
<component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="true">
<file leaf-file-name="audio_detail.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="172" column="8" selection-start-line="172" selection-start-column="8" selection-end-line="172" selection-end-column="8" />
<state relative-caret-position="391">
<caret line="185" column="42" selection-start-line="185" selection-start-column="42" selection-end-line="185" selection-end-column="42" />
<folding>
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
... ... @@ -49,8 +54,80 @@
<file leaf-file-name="users.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/users.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="42" column="60" selection-start-line="42" selection-start-column="60" selection-end-line="42" selection-end-column="60" />
<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" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/users/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="646">
<caret line="62" column="41" selection-start-line="62" selection-start-column="41" selection-end-line="62" selection-end-column="41" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Index.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="WechatBase.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="15" column="30" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" />
</state>
</provider>
</entry>
</file>
<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>
</provider>
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/merchant/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="95" column="12" selection-start-line="95" selection-start-column="12" selection-end-line="95" selection-end-column="108" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="User.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="25" column="40" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="money.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/users/money.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="23" column="20" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="114" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Users.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="640">
<caret line="137" column="27" selection-start-line="137" selection-start-column="27" selection-end-line="137" selection-end-column="27" />
</state>
</provider>
</entry>
... ... @@ -107,12 +184,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/home/view/member/earnings_log.html" />
<option value="$PROJECT_DIR$/application/home/view/member/withdraw_log.html" />
<option value="$PROJECT_DIR$/application/home/view/merchant/enter.html" />
<option value="$PROJECT_DIR$/application/home/view/merchant/index.html" />
<option value="$PROJECT_DIR$/application/home/controller/Server.php" />
<option value="$PROJECT_DIR$/application/home/controller/Collect.php" />
<option value="$PROJECT_DIR$/application/home/view/collect/index.html" />
<option value="$PROJECT_DIR$/application/home/view/public/js.html" />
<option value="$PROJECT_DIR$/application/home/view/share/index.html" />
... ... @@ -158,6 +229,12 @@
<option value="$PROJECT_DIR$/application/home/view/index/index.html" />
<option value="$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Users.php" />
<option value="$PROJECT_DIR$/application/admin/view/users/money.html" />
<option value="$PROJECT_DIR$/application/admin/view/merchant/edit.html" />
<option value="$PROJECT_DIR$/application/admin/view/users/edit.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/users.js" />
<option value="$PROJECT_DIR$/thinkphp/library/think/Controller.php" />
</list>
</option>
</component>
... ... @@ -269,6 +346,30 @@
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="goods" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="merchant" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="merchant_audit" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="view" type="462c0819:PsiDirectoryNode" />
<item name="users" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -280,6 +381,13 @@
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="home" type="462c0819:PsiDirectoryNode" />
<item name="controller" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -325,11 +433,11 @@
</component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
<recent name="D:\wamp\www\advertising\application\admin\view\users" />
<recent name="D:\wamp\www\advertising\public\assets\advertising\img" />
<recent name="D:\wamp\www\advertising\application\admin\view\goods_audit" />
<recent name="D:\wamp\www\advertising\application\home\view\merchant" />
<recent name="D:\wamp\www\advertising\public" />
<recent name="D:\wamp\www\advertising\application\home\view\share" />
</key>
<key name="MoveFile.RECENT_KEYS">
<recent name="D:\wamp\www\advertising\public\assets\js\backend" />
... ... @@ -383,14 +491,7 @@
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="17475000" />
<workItem from="1573605070739" duration="20564000" />
</task>
<task id="LOCAL-00614" summary=" 商户申请">
<created>1573607379043</created>
<option name="number" value="00614" />
<option name="presentableId" value="LOCAL-00614" />
<option name="project" value="LOCAL" />
<updated>1573607379043</updated>
<workItem from="1573605070739" duration="26731000" />
</task>
<task id="LOCAL-00615" summary=" 商户申请">
<created>1573607415032</created>
... ... @@ -728,11 +829,18 @@
<option name="project" value="LOCAL" />
<updated>1573636755227</updated>
</task>
<option name="localTasksCounter" value="663" />
<task id="LOCAL-00663" summary="后台bug">
<created>1573636823634</created>
<option name="number" value="00663" />
<option name="presentableId" value="LOCAL-00663" />
<option name="project" value="LOCAL" />
<updated>1573636823634</updated>
</task>
<option name="localTasksCounter" value="664" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="444346000" />
<option name="totallyTimeSpent" value="450513000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -821,71 +929,6 @@
<option name="LAST_COMMIT_MESSAGE" value="后台bug" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="810">
<caret line="155" column="9" selection-start-line="155" selection-start-column="9" selection-end-line="155" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="538">
<caret line="70" column="52" selection-start-line="70" selection-start-column="41" selection-end-line="70" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="409">
<caret line="167" column="8" selection-start-line="167" selection-start-column="8" selection-end-line="171" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/user/authorization_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="43" selection-start-line="43" selection-end-line="44" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1921">
<caret line="25" column="40" lean-forward="true" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="53" column="13" lean-forward="true" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/enter_view.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1836">
<caret line="161" column="62" lean-forward="true" selection-start-line="161" selection-start-column="62" selection-end-line="161" selection-end-column="62" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/merchant/audit_status.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="629">
<caret line="37" column="27" selection-start-line="37" selection-start-column="27" selection-end-line="37" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/index.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="357">
... ... @@ -921,13 +964,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/goods/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="241" column="73" selection-start-line="241" selection-start-column="67" selection-end-line="241" selection-end-column="73" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/goods_audit/add.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2587" />
... ... @@ -1013,13 +1049,6 @@
<entry file="file://$PROJECT_DIR$/application/admin/controller/Slide.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="41" column="40" lean-forward="true" selection-start-line="41" selection-start-column="40" selection-end-line="41" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="570">
... ... @@ -1034,20 +1063,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="256">
<caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantGoods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="57" column="12" lean-forward="true" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/common/header.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="170">
... ... @@ -1120,30 +1135,129 @@
<entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="185" column="42" selection-start-line="185" selection-start-column="42" selection-end-line="185" selection-end-column="42" />
<folding>
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Merchant.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-601" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="307">
<caret line="47" column="9" lean-forward="true" selection-start-line="47" selection-start-column="9" selection-end-line="47" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantGoods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
<caret line="57" column="12" lean-forward="true" selection-start-line="57" selection-start-column="12" selection-end-line="57" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Member.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="494">
<caret line="238" column="8" selection-start-line="238" selection-start-column="8" selection-end-line="252" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/goods/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="629">
<caret line="214" column="12" selection-start-line="214" selection-start-column="12" selection-end-line="218" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/thinkphp/library/think/db/Query.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="653" column="40" selection-start-line="653" selection-start-column="35" selection-end-line="653" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="640">
<caret line="137" column="27" selection-start-line="137" selection-start-column="27" selection-end-line="137" selection-end-column="27" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/merchant_audit/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="541">
<caret line="46" column="17" selection-start-line="46" selection-start-column="17" selection-end-line="46" selection-end-column="17" />
<state relative-caret-position="528">
<caret line="56" column="50" lean-forward="true" selection-start-line="56" selection-start-column="50" selection-end-line="56" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/users/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/users/add.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/User.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="25" column="40" selection-start-line="25" selection-start-column="40" selection-end-line="25" selection-end-column="40" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/users/money.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
<caret line="23" column="20" selection-start-line="23" selection-start-column="20" selection-end-line="23" selection-end-column="114" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/merchant/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="95" column="12" selection-start-line="95" selection-start-column="12" selection-end-line="95" selection-end-column="108" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/users/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="646">
<caret line="62" column="41" selection-start-line="62" selection-start-column="41" selection-end-line="62" selection-end-column="41" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/users.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="42" column="60" selection-start-line="42" selection-start-column="60" selection-end-line="42" selection-end-column="60" />
<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" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/audio_detail.html">
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="172" column="8" selection-start-line="172" selection-start-column="8" selection-end-line="172" selection-end-column="8" />
<folding>
<element signature="n#style#0;n#div#0;n#div#1;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="102">
<caret line="14" column="25" selection-start-line="14" selection-start-column="25" selection-end-line="14" selection-end-column="25" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/controller/WechatBase.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="153">
<caret line="15" column="30" selection-start-line="15" selection-start-column="30" selection-end-line="15" selection-end-column="30" />
</state>
</provider>
</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>
</provider>
</entry>
... ...
... ... @@ -76,4 +76,69 @@ class Users extends Backend
}
return $this->view->fetch();
}
/**
* 赠送、扣除余额
*/
public function money(){
$admin_id = $this->auth->id;
$admin = Db::name('admin')->where(['id'=>$admin_id])->find();
if($this->request->isPost()){
$param = $this->request->param();
$validate = new \think\Validate([
'admin_id' => 'require',
'money' => 'require',
'type' => 'require',
]);
$validate->message([
'admin_id' => '商户id不能为空',
'money' => '变动金额不能为空',
'type' => '类型不能为空',
]);
if (!$validate->check($param)) {
$this->error($validate->getError());
}
$admin = Db::name('admin')->where(['id'=>$admin_id])->find();
if($param['type'] == 7){
$after_money = $param['money'] + $admin['money'];
}else if($param['type'] == 8){
if($admin['money'] < $param['money']){
$this->error('用户余额不足');
}
$after_money = $admin['money'] - $param['money'];
}else{
$this->error('未知类型');
$after_money = 0;
}
$arr['admin_id'] = $admin_id;
$arr['before_money'] = $admin['money'];
$arr['money'] = $param['money'];
$arr['after_money'] = $after_money;
$arr['type'] = $param['type'];
$arr['createtime'] = time();
Db::startTrans();
$result1 = Db::name('user_money_log')->insert($arr);
if(empty($result1)){
Db::rollback();
$this->error('sql执行失败');
}
if($param['type'] == 7){
$result2 = Db::name('admin')->where(['id'=>$admin_id])->setInc('money',$param['money']);
}else if($param['type'] == 8){
$result2 = Db::name('admin')->where(['id'=>$admin_id])->setDec('money',$param['money']);
}else{
Db::rollback();
$this->error('未知类型');
$result2 = 0;
}
if(empty($result2)){
Db::rollback();
$this->error('sql执行失败');
}
Db::commit();
$this->success();
}else{
$this->assign('admin',$admin);
return $this->fetch();
}
}
}
... ...
... ... @@ -80,7 +80,7 @@
<label class="control-label col-xs-12 col-sm-2">{:__('其他图片')}:</label>
<div class="col-xs-12 col-sm-8">
<div class="input-group">
<input id="c-other_images" data-rule="required" class="form-control" size="50" name="row[other_images]" type="text" value="{$row.other_images|htmlentities}">
<input id="c-other_images" class="form-control" size="50" name="row[other_images]" type="text" value="{$row.other_images|htmlentities}">
<div class="input-group-addon no-border no-padding">
<span><button type="button" id="plupload-other_images" class="btn btn-danger plupload" data-input-id="c-other_images" data-mimetype="image/gif,image/jpeg,image/png,image/jpg,image/bmp" data-multiple="true" data-preview-id="p-other_images"><i class="fa fa-upload"></i> {:__('Upload')}</button></span>
<span><button type="button" id="fachoose-other_images" class="btn btn-primary fachoose" data-input-id="c-other_images" data-mimetype="image/*" data-multiple="true"><i class="fa fa-list"></i> {:__('Choose')}</button></span>
... ...
... ... @@ -74,6 +74,12 @@
<input id="c-birthday" class="form-control datetimepicker" data-date-format="YYYY-MM-DD" data-use-current="true" name="row[birthday]" type="text" value="{$row.birthday}">
</div>
</div>
<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Status')}:</label>
<div class="col-xs-12 col-sm-8">
{:build_radios('row[status]', ['normal'=>__('Normal'), 'hidden'=>__('Hidden')], $row['status'])}
</div>
</div>
<!--<div class="form-group">
<label class="control-label col-xs-12 col-sm-2">{:__('Bio')}:</label>
<div class="col-xs-12 col-sm-8">
... ...
<form id="edit-form" class="form-horizontal" role="form" data-toggle="validator" method="POST" action="">
<table class="table table-striped">
<!--<thead>
<tr>
<th>{:__('Title')}</th>
<th>{:__('Content')}</th>
</tr>
</thead>-->
<tbody>
<tr>
<td>{:__('余额')}:</td>
<td>{$admin.money}</td>
</tr>
<tr>
<td>{:__('变动金额')}:</td>
<td>
<input id="c-money" data-rule="required" class="form-control" name="money" type="text" value="">
</td>
</tr>
<tr>
<td>{:__('类型')}:</td>
<td>
<div class="radio">
<label for="row-7"><input id="row-7" name="type" type="radio" value="7" checked />平台充值</label>
<label for="row-8"><input id="row-8" name="type" type="radio" value="8" />平台扣除</label>
</div>
</td>
</tr>
</tbody>
</table>
<div class="form-group layer-footer">
<label class="control-label col-xs-12 col-sm-2"></label>
<div class="col-xs-12 col-sm-8">
<input type="hidden" name="admin_id" value="{$admin.id}"/>
<button type="submit" class="btn btn-success btn-embossed disabled">{:__('OK')}</button>
<button type="reset" class="btn btn-default btn-embossed">{:__('Reset')}</button>
</div>
</div>
</form>
... ...
... ... @@ -37,7 +37,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
{field: 'prevtime', title: __('Prevtime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'logintime', title: __('Logintime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
{field: 'jointime', title: __('Jointime'), operate:false, addclass:'datetimerange', formatter: Table.api.formatter.datetime},
// {field: 'status', title: __('Status'), formatter: Table.api.formatter.status},
{field: 'status', title: __('Status'), operate:false, formatter: Table.api.formatter.status},
{field: 'name', title: __('姓名')},
{field: 'card', title: __('身份证号')},
{field: 'mobile', title: __('手机号')},
... ... @@ -55,7 +55,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
title: __('充值'),
classname: 'btn btn-xs btn-primary btn-dialog',
icon: 'fa fa-money',
url: 'room_user/index/room_id/{id}',
url: 'users/money/id/{id}',
hidden: function(row){
if(row.type == 1){
return true;
... ... @@ -84,6 +84,10 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
edit: function () {
Controller.api.bindevent();
},
money: function () {
Controller.api.bindevent();
},
api: {
bindevent: function () {
Form.api.bindevent($("form[role=form]"));
... ...
... ... @@ -74,6 +74,13 @@ class Controller
*/
protected function _initialize()
{
$user_id = get_current_user_id();
if(!empty($user_id)){
$data = Db::name('user')->where(['id'=>$user_id])->find();
if($data['status'] == 'hidden'){
$this->error('您已被拉黑');
}
}
}
/**
... ...