王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 dc16fe3c45f88b4a3a1d32d652f68f5bedbe72a1 1 个父辈 697898ed
1 个管道 的构建 通过 耗费 12 秒

商户申请

内嵌 并排对比
正在显示 2 个修改的文件 包含 116 行增加 和 139 行删除
... ... @@ -6,7 +6,7 @@
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -37,35 +37,26 @@
<file leaf-file-name="Goods.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226">
<state relative-caret-position="164">
<caret line="105" column="56" selection-start-line="105" selection-start-column="56" selection-end-line="105" selection-end-column="56" />
</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">
<file leaf-file-name="MerchantAudit.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1682">
<caret line="184" column="9" lean-forward="true" selection-start-line="184" selection-start-column="9" selection-end-line="184" selection-end-column="9" />
<state relative-caret-position="629">
<caret line="147" column="62" selection-start-line="147" selection-start-column="62" selection-end-line="147" selection-end-column="62" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="Question.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/controller/Question.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="578">
<caret line="50" column="9" lean-forward="true" selection-start-line="50" selection-start-column="9" selection-end-line="50" selection-end-column="9" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="my_information.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_information.html">
<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="459">
<caret line="213" column="33" selection-start-line="213" selection-start-column="33" selection-end-line="213" selection-end-column="33" />
<state relative-caret-position="1932">
<caret line="184" column="9" selection-start-line="184" selection-start-column="9" selection-end-line="184" selection-end-column="9" />
</state>
</provider>
</entry>
... ... @@ -73,8 +64,8 @@
<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="402">
<caret line="96" column="57" lean-forward="true" selection-start-line="96" selection-start-column="57" selection-end-line="96" selection-end-column="57" />
<state relative-caret-position="17">
<caret line="96" column="57" selection-start-line="96" selection-start-column="57" selection-end-line="96" selection-end-column="57" />
<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>
... ... @@ -82,20 +73,30 @@
</provider>
</entry>
</file>
<file leaf-file-name="UserExpLogAudit.php" pinned="false" current-in-tab="true">
<file leaf-file-name="UserExpLogAudit.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572">
<caret line="157" column="18" selection-start-line="157" selection-start-column="18" selection-end-line="157" selection-end-column="18" />
<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>
</file>
<file leaf-file-name="UserMoneyLogAudit.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
</file>
<file leaf-file-name="edit.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
<state relative-caret-position="527">
<caret line="31" column="17" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
</state>
</provider>
</entry>
... ... @@ -103,7 +104,7 @@
<file leaf-file-name="UserExpLogAudit.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/model/UserExpLogAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="102">
<state relative-caret-position="255">
<caret line="15" column="35" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="35" />
</state>
</provider>
... ... @@ -112,7 +113,7 @@
<file leaf-file-name="video_detail.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1087">
<state relative-caret-position="4182">
<caret line="246" column="21" selection-start-line="246" selection-start-column="21" selection-end-line="246" selection-end-column="21" />
<folding>
<element signature="n#style#0;n#div#0;n#div#2;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
... ... @@ -121,15 +122,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="content_detail.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/content_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="324">
<caret line="119" column="22" lean-forward="true" selection-start-line="119" selection-start-column="22" selection-end-line="119" selection-end-column="22" />
</state>
</provider>
</entry>
</file>
</leaf>
</component>
<component name="FileTemplateManagerImpl">
... ... @@ -182,7 +174,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/extra/wechat.php" />
<option value="$PROJECT_DIR$/application/common/controller/Backend.php" />
<option value="$PROJECT_DIR$/extend/fast/Auth.php" />
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
... ... @@ -211,7 +202,6 @@
<option value="$PROJECT_DIR$/application/home/controller/Server.php" />
<option value="$PROJECT_DIR$/application/home/view/merchant/audit_status.html" />
<option value="$PROJECT_DIR$/application/home/controller/Merchant.php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.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" />
... ... @@ -231,8 +221,10 @@
<option value="$PROJECT_DIR$/application/home/view/goods/content_detail.html" />
<option value="$PROJECT_DIR$/application/home/controller/Index.php" />
<option value="$PROJECT_DIR$/application/home/view/goods/audio_detail.html" />
<option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php" />
<option value="$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html" />
<option value="D:/我的文档/Documents/NetSarang Computer/6/Xftp/Temporary/Doc [2].php" />
<option value="$PROJECT_DIR$/application/admin/controller/MerchantAudit.php" />
</list>
</option>
</component>
... ... @@ -307,7 +299,6 @@
<foldersAlwaysOnTop value="true" />
</navigator>
<panes>
<pane id="Scope" />
<pane id="ProjectPane">
<subPane>
<expand>
... ... @@ -352,6 +343,14 @@
<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="user_money_log_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="home" type="462c0819:PsiDirectoryNode" />
</path>
<path>
... ... @@ -446,6 +445,7 @@
<select />
</subPane>
</pane>
<pane id="Scope" />
</panes>
</component>
<component name="PropertiesComponent">
... ... @@ -456,7 +456,7 @@
<property name="WebServerToolWindowPanel.toolwindow.show.date" value="false" />
<property name="WebServerToolWindowPanel.toolwindow.show.permissions" value="false" />
<property name="WebServerToolWindowPanel.toolwindow.show.size" value="false" />
<property name="last_opened_file_path" value="$PROJECT_DIR$/../imitatechat" />
<property name="last_opened_file_path" value="D:/phpStudy/WWW/marriage" />
<property name="nodejs_interpreter_path.stuck_in_default_project" value="undefined stuck path" />
<property name="nodejs_npm_path_reset_for_default_project" value="true" />
<property name="settings.editor.selected.configurable" value="terminal" />
... ... @@ -518,14 +518,9 @@
<workItem from="1573000530976" duration="6061000" />
<workItem from="1573087576825" duration="5555000" />
<workItem from="1573174620844" duration="32581000" />
<workItem from="1573259331081" duration="30308000" />
</task>
<task id="LOCAL-00496" summary="商户申请">
<created>1573283230711</created>
<option name="number" value="00496" />
<option name="presentableId" value="LOCAL-00496" />
<option name="project" value="LOCAL" />
<updated>1573283230711</updated>
<workItem from="1573259331081" duration="30435000" />
<workItem from="1573432217070" duration="2199000" />
<workItem from="1573519427130" duration="1226000" />
</task>
<task id="LOCAL-00497" summary="商户申请">
<created>1573283250525</created>
... ... @@ -863,11 +858,18 @@
<option name="project" value="LOCAL" />
<updated>1573294162462</updated>
</task>
<option name="localTasksCounter" value="545" />
<task id="LOCAL-00545" summary=" 商户申请">
<created>1573294224448</created>
<option name="number" value="00545" />
<option name="presentableId" value="LOCAL-00545" />
<option name="project" value="LOCAL" />
<updated>1573294224448</updated>
</task>
<option name="localTasksCounter" value="546" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="403981000" />
<option name="totallyTimeSpent" value="407533000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -881,7 +883,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.15245202" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.14925373" />
<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" />
... ... @@ -899,30 +901,30 @@
<window_info anchor="bottom" id="Find" order="1" />
</layout>
<layout-to-restore>
<window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
<window_info anchor="bottom" id="找到" order="14" weight="0.32997763" />
<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="bottom" id="Run" order="2" />
<window_info anchor="right" id="Remote Host" order="3" weight="0.15778251" />
<window_info id="Favorites" order="2" side_tool="true" />
<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" content_ui="combo" id="Hierarchy" order="2" 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="bottom" id="Database Changes" order="10" show_stripe_button="false" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info anchor="bottom" id="消息" order="15" weight="0.32997763" />
<window_info anchor="bottom" id="Find" order="1" />
<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="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="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="消息" order="15" weight="0.32997763" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<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="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
<window_info id="Favorites" order="2" side_tool="true" />
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
... ... @@ -954,48 +956,6 @@
<option name="LAST_COMMIT_MESSAGE" value=" 商户申请" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/home/controller/Upload.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="38" column="50" selection-start-line="38" selection-start-column="40" selection-end-line="38" selection-end-column="50" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/advertising/css/record.css">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="2261">
<caret line="133" column="22" selection-start-line="133" selection-start-column="22" selection-end-line="133" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$USER_HOME$/Desktop/userShopping/audioDetail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="473">
<caret line="211" column="8" selection-start-line="211" selection-start-column="8" selection-end-line="216" selection-end-column="10" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_withdraw.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="408">
<caret line="57" column="4" selection-start-line="57" selection-start-column="4" selection-end-line="57" selection-end-column="32" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/member/withdraw_log.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="60" column="51" selection-start-line="60" selection-start-column="51" selection-end-line="60" selection-end-column="51" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/member/earnings_log.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="561">
<caret line="57" column="52" selection-start-line="57" selection-start-column="52" selection-end-line="57" selection-end-column="52" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/member/my_wallet.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="51">
... ... @@ -1082,16 +1042,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="674">
<caret line="128" column="36" selection-start-line="128" selection-start-column="22" selection-end-line="128" selection-end-column="36" />
<folding>
<element signature="e#129#166#0#PHP" expanded="true" />
</folding>
</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="629">
<caret line="147" column="48" selection-start-line="147" selection-start-column="33" selection-end-line="147" selection-end-column="48" />
</state>
</provider>
</entry>
... ... @@ -1225,58 +1175,85 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="226">
<caret line="105" column="56" selection-start-line="105" selection-start-column="56" selection-end-line="105" selection-end-column="56" />
<state relative-caret-position="4182">
<caret line="246" column="21" selection-start-line="246" selection-start-column="21" selection-end-line="246" selection-end-column="21" />
<folding>
<element signature="n#style#0;n#div#0;n#div#2;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<entry file="file://$PROJECT_DIR$/application/admin/model/UserExpLogAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1682">
<caret line="184" column="9" lean-forward="true" selection-start-line="184" selection-start-column="9" selection-end-line="184" selection-end-column="9" />
<state relative-caret-position="255">
<caret line="15" column="35" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="35" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/view/goods/video_detail.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$USER_HOME$/Desktop/apiclient_cert.php" />
<entry file="file://D:/我的文档/Documents/NetSarang Computer/6/Xftp/Temporary/Doc [2].php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1087">
<caret line="246" column="21" selection-start-line="246" selection-start-column="21" selection-end-line="246" selection-end-column="21" />
<folding>
<element signature="n#style#0;n#div#0;n#div#2;n#div#2;n#body#0;n#html#0;n#!!top" expanded="true" />
</folding>
<state relative-caret-position="238">
<caret line="14" column="31" selection-start-line="14" selection-start-column="31" selection-end-line="14" selection-end-column="31" />
</state>
</provider>
</entry>
<entry file="file://D:/我的文档/Documents/NetSarang Computer/6/Xftp/Temporary/Doc [3].php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="31" column="17" selection-start-line="31" selection-start-column="17" selection-end-line="31" selection-end-column="17" />
</state>
</provider>
</entry>
<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/home/view/goods/audio_detail.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="402">
<caret line="96" column="57" lean-forward="true" selection-start-line="96" selection-start-column="57" selection-end-line="96" selection-end-column="57" />
<state relative-caret-position="17">
<caret line="96" column="57" selection-start-line="96" selection-start-column="57" selection-end-line="96" selection-end-column="57" />
<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/model/UserExpLogAudit.php">
<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="15" column="35" selection-start-line="15" selection-start-column="23" selection-end-line="15" selection-end-column="35" />
<state relative-caret-position="1932">
<caret line="184" column="9" selection-start-line="184" selection-start-column="9" selection-end-line="184" selection-end-column="9" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/user_exp_log_audit/edit.html">
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="374">
<caret line="22" column="25" selection-start-line="22" selection-start-column="25" selection-end-line="22" selection-end-column="25" />
<state relative-caret-position="164">
<caret line="105" column="56" selection-start-line="105" selection-start-column="56" selection-end-line="105" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserExpLogAudit.php">
<entry file="file://$PROJECT_DIR$/application/admin/controller/MerchantAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572">
<caret line="157" column="18" selection-start-line="157" selection-start-column="18" selection-end-line="157" selection-end-column="18" />
<state relative-caret-position="629">
<caret line="147" column="62" selection-start-line="147" selection-start-column="62" selection-end-line="147" selection-end-column="62" />
</state>
</provider>
</entry>
... ...
... ... @@ -145,7 +145,7 @@ class MerchantAudit extends Backend
//修改用户类型
Db::name('user')->where(['id'=>$row['user_id']])->update(['type'=>2,'admin_id'=>$admin_id]);
}else if($params['status'] == 3){
$params['expiration_time'] = time()+3600;
$params['expiration_time'] = time()+30;
}
$result = $row->allowField(true)->save($params);
Db::commit();
... ...