王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 e6be8df49056d3df4b070d2311a3e03ec51a0a1a 1 个父辈 783dd021
1 个管道 的构建 通过 耗费 11 秒

提现

内嵌 并排对比
正在显示 4 个修改的文件 包含 455 行增加 和 199 行删除
... ... @@ -3,6 +3,8 @@
<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/PayView.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/PayView.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/view/pay_view/index.html" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/view/pay_view/index.html" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
... ... @@ -16,12 +18,12 @@
<pharConfigPath>$PROJECT_DIR$/composer.json</pharConfigPath>
</component>
<component name="FileEditorManager">
<leaf>
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file leaf-file-name="PayView.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="810">
<caret line="64" column="25" selection-start-line="64" selection-start-column="25" selection-end-line="64" selection-end-column="25" />
<state relative-caret-position="544">
<caret line="52" column="55" selection-start-line="52" selection-start-column="24" selection-end-line="52" selection-end-column="55" />
<folding>
<element signature="e#129#163#0#PHP" expanded="true" />
</folding>
... ... @@ -29,69 +31,86 @@
</provider>
</entry>
</file>
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
<file leaf-file-name="merchant_goods.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/merchant_goods.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="765">
<caret line="90" column="38" selection-start-line="90" selection-start-column="38" selection-end-line="90" selection-end-column="38" />
<folding>
<element signature="e#42#79#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="2805">
<caret line="183" column="13" selection-start-line="183" selection-start-column="13" selection-end-line="183" selection-end-column="13" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
<file leaf-file-name="pay_view.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="759">
<caret line="62" column="50" selection-start-line="62" selection-start-column="50" selection-end-line="62" selection-end-column="50" />
<state relative-caret-position="1490">
<caret line="130" column="47" selection-start-line="130" selection-start-column="47" selection-end-line="130" selection-end-column="47" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="UserMoneyLogAudit.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="589">
<caret line="128" column="27" selection-start-line="128" selection-start-column="27" selection-end-line="128" selection-end-column="27" />
<folding>
<element signature="n#style#0;n#td#0;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
<element signature="e#2136#2142#0" expanded="true" />
<element signature="e#2151#2157#0" expanded="true" />
<element signature="e#2157#2163#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#tr#5;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
<element signature="e#40#74#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
</file>
<file leaf-file-name="common.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/addons/epay/js/common.js">
<file leaf-file-name="wechat.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="15" selection-start-column="15" selection-end-column="15" />
<state relative-caret-position="595">
<caret line="50" column="18" selection-start-line="50" selection-start-column="9" selection-end-line="50" selection-end-column="18" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="pay_view.js" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
<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="527">
<caret line="79" column="51" selection-start-line="79" selection-start-column="51" selection-end-line="79" selection-end-column="51" />
<state relative-caret-position="504">
<caret line="74" column="43" selection-start-line="74" selection-start-column="37" selection-end-line="74" selection-end-column="43" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/example/customform/index.html">
<entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="203">
<caret line="95" column="36" selection-start-line="91" selection-start-column="8" selection-end-line="95" selection-end-column="36" />
<state relative-caret-position="340">
<caret line="20" column="33" selection-start-line="14" selection-start-column="24" selection-end-line="20" selection-end-column="33" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="multitable.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/example/multitable.js">
<file leaf-file-name="user_money_log_audit.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="27" column="22" selection-start-line="27" selection-start-column="16" selection-end-line="27" selection-end-column="22" />
<state relative-caret-position="646">
<caret line="38" column="71" selection-start-line="38" selection-start-column="71" selection-end-line="38" selection-end-column="71" />
</state>
</provider>
</entry>
</file>
<file leaf-file-name="user_money_log.js" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_money_log.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="32" column="165" selection-start-line="32" selection-start-column="69" selection-end-line="32" selection-end-column="165" />
</state>
</provider>
</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">
<state relative-caret-position="402">
<caret line="24" column="33" selection-start-line="24" selection-start-column="33" selection-end-line="24" selection-end-column="33" />
</state>
</provider>
</entry>
... ... @@ -106,6 +125,7 @@
<find>required</find>
<find>row</find>
<find>statusList</find>
<find>money</find>
</findStrings>
</component>
<component name="Git.Settings">
... ... @@ -114,13 +134,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/home/model/Slide.php" />
<option value="$PROJECT_DIR$/application/home/model/Question.php" />
<option value="$PROJECT_DIR$/application/common.php" />
<option value="$PROJECT_DIR$/application/home/model/User_question_answer.php" />
<option value="$PROJECT_DIR$/application/home/model/UserQuestionAnswer.php" />
<option value="$PROJECT_DIR$/application/home/controller/Goods.php" />
<option value="$PROJECT_DIR$/application/home/controller/Collect.php" />
<option value="$PROJECT_DIR$/application/home/controller/Upload.php" />
<option value="$PROJECT_DIR$/application/home/controller/Share.php" />
<option value="$PROJECT_DIR$/application/home/controller/Member.php" />
... ... @@ -161,10 +174,17 @@
<option value="$PROJECT_DIR$/public/assets/js/backend/wechat/pay.js" />
<option value="$PROJECT_DIR$/application/admin/view/pay/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pay.js" />
<option value="$PROJECT_DIR$/application/admin/view/pay_view/index.html" />
<option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
<option value="$PROJECT_DIR$/application/admin/view/pay_view/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" />
<option value="$PROJECT_DIR$/application/admin/view/user_money_log/index.html" />
<option value="$PROJECT_DIR$/application/admin/controller/UserMoneyLog.php" />
<option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log.js" />
<option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html" />
<option value="$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js" />
<option value="$PROJECT_DIR$/application/admin/view/user_money_log_audit/edit.html" />
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
<option value="$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php" />
</list>
</option>
</component>
... ... @@ -269,13 +289,65 @@
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="admin" type="462c0819:PsiDirectoryNode" />
<item name="library" 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="library" type="462c0819:PsiDirectoryNode" />
<item name="traits" 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" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="application" type="462c0819:PsiDirectoryNode" />
<item name="common" 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="user_money_log" 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="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="extra" 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>
<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" />
... ... @@ -293,7 +365,15 @@
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
<item name="img" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
<item name="advertising" type="462c0819:PsiDirectoryNode" />
<item name="public" type="462c0819:PsiDirectoryNode" />
<item name="assets" type="462c0819:PsiDirectoryNode" />
<item name="js" type="462c0819:PsiDirectoryNode" />
<item name="backend" type="462c0819:PsiDirectoryNode" />
</path>
<path>
<item name="advertising" type="b2602c69:ProjectViewProjectNode" />
... ... @@ -369,7 +449,8 @@
<workItem from="1572050747518" duration="29776000" />
<workItem from="1572087949120" duration="1641000" />
<workItem from="1572223206994" duration="28857000" />
<workItem from="1572309778506" duration="22840000" />
<workItem from="1572309778506" duration="26117000" />
<workItem from="1572395935540" duration="9055000" />
</task>
<task id="LOCAL-00001" summary="数据库配置">
<created>1571972429395</created>
... ... @@ -518,29 +599,36 @@
<option name="project" value="LOCAL" />
<updated>1572337801981</updated>
</task>
<option name="localTasksCounter" value="22" />
<task id="LOCAL-00022" summary="支付">
<created>1572337980656</created>
<option name="number" value="00022" />
<option name="presentableId" value="LOCAL-00022" />
<option name="project" value="LOCAL" />
<updated>1572337980656</updated>
</task>
<option name="localTasksCounter" value="23" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="181948000" />
<option name="totallyTimeSpent" value="194280000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13646056" />
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="调试" order="7" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32997763" />
<window_info anchor="right" id="Database" order="3" />
<window_info anchor="bottom" id="Database Changes" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Version Control" order="7" show_stripe_button="false" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" />
<window_info anchor="bottom" id="运行" order="7" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13539445" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
<window_info anchor="right" id="Database" order="3" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" />
<window_info anchor="bottom" id="运行" order="7" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="找到" weight="0.32997763" />
<window_info anchor="bottom" id="找到" order="8" weight="0.32997763" />
<window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
... ... @@ -555,24 +643,24 @@
<window_info anchor="bottom" id="运行" order="7" />
<window_info anchor="bottom" id="Docker" order="8" show_stripe_button="false" />
<window_info anchor="bottom" id="Run" order="2" />
<window_info id="Favorites" order="2" side_tool="true" />
<window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.13113007" />
<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="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
<window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
<window_info anchor="bottom" id="Find" order="1" />
<window_info anchor="right" id="Database" order="3" />
<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="Cvs" order="4" weight="0.25" />
<window_info anchor="bottom" id="Version Control" order="9" show_stripe_button="false" />
<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="Inspection" order="5" weight="0.4" />
<window_info id="Favorites" order="2" side_tool="true" />
</layout-to-restore>
</component>
<component name="TypeScriptGeneratedFilesManager">
... ... @@ -590,84 +678,6 @@
<option name="LAST_COMMIT_MESSAGE" value="支付" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/public/assets/js/addons.js">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Users.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="323">
<caret line="20" column="4" selection-start-line="20" selection-start-column="4" selection-end-line="20" selection-end-column="58" />
<folding>
<element signature="e#40#74#0#PHP" expanded="true" />
</folding>
</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="952">
<caret line="56" column="56" selection-start-line="56" selection-start-column="56" selection-end-line="56" selection-end-column="56" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/addons/ueditor/third-party/highcharts/highcharts.src.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1275">
<caret line="3599" column="34" lean-forward="true" selection-start-line="3599" selection-start-column="34" selection-end-line="3599" selection-end-column="34" />
<folding>
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#span#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/auth/rule/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/model/AuthRule.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Ajax.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-2295" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/auth/rule.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1723">
<caret line="30" column="61" lean-forward="true" selection-start-line="30" selection-start-column="61" selection-end-line="30" selection-end-column="61" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/auth/Rule.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-612" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/common/controller/Backend.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="289">
<caret line="249" column="23" selection-start-line="249" selection-start-column="23" selection-end-line="249" selection-end-column="23" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/require-table.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="15" column="22" selection-start-line="15" selection-start-column="12" selection-end-line="15" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/model/MerchantGoods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="493">
<caret line="29" column="26" selection-start-line="29" selection-start-column="26" selection-end-line="29" selection-end-column="26" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/model/Question.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="510">
... ... @@ -744,20 +754,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="385">
<caret line="195" column="5" selection-start-line="145" selection-start-column="4" selection-end-line="195" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/merchant_goods.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="714">
<caret line="183" column="13" selection-start-line="183" selection-start-column="13" selection-end-line="183" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/question/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="136">
... ... @@ -787,13 +783,6 @@
<entry file="file://$PROJECT_DIR$/application/home/controller/Index.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="623">
<caret line="68" column="58" selection-start-line="68" selection-start-column="51" selection-end-line="68" selection-end-column="58" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/index/index.html">
<provider selected="true" editor-type-id="text-editor" />
</entry>
... ... @@ -801,10 +790,6 @@
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="17">
<caret line="1" selection-start-line="1" selection-end-line="2" />
<folding>
<element signature="n#style#0;n#div#2;n#form#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#3;n#form#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ... @@ -829,13 +814,6 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/example/multitable.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="459">
<caret line="27" column="22" selection-start-line="27" selection-start-column="16" selection-end-line="27" selection-end-column="22" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/addons/epay/controller/Api.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-459" />
... ... @@ -873,10 +851,34 @@
<entry file="file://$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/addons/epay/js/common.js">
<entry file="file://$PROJECT_DIR$/public/assets/img/qrcode.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/fast.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="562">
<caret line="341" column="24" selection-start-line="341" selection-start-column="19" selection-end-line="341" selection-end-column="24" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1530">
<caret line="93" column="100" selection-start-line="93" selection-start-column="77" selection-end-line="93" selection-end-column="100" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log/edit.html">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="15" selection-start-column="15" selection-end-column="15" />
<caret column="102" lean-forward="true" selection-start-column="102" selection-end-column="102" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/example/multitable.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-306">
<caret line="27" column="22" selection-start-line="27" selection-start-column="16" selection-end-line="27" selection-end-column="22" />
</state>
</provider>
</entry>
... ... @@ -887,57 +889,144 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/img/qrcode.png">
<provider selected="true" editor-type-id="images" />
<entry file="file://$PROJECT_DIR$/public/assets/addons/epay/js/common.js">
<provider selected="true" editor-type-id="text-editor">
<state>
<caret column="15" selection-start-column="15" selection-end-column="15" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="759">
<caret line="62" column="50" selection-start-line="62" selection-start-column="50" selection-end-line="62" selection-end-column="50" />
<state relative-caret-position="504">
<caret line="117" column="92" selection-start-line="117" selection-start-column="67" selection-end-line="117" selection-end-column="92" />
<folding>
<element signature="n#style#0;n#td#0;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#div#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
<element signature="e#2136#2142#0" expanded="true" />
<element signature="e#2151#2157#0" expanded="true" />
<element signature="e#2157#2163#0" expanded="true" />
<element signature="n#style#0;n#span#0;n#div#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#1;n#tr#5;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#0;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#td#0;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
<element signature="n#style#0;n#input#0;n#b#0;n#td#1;n#tr#3;n#tbody#0;n#table#0;n#div#0;n#div#0;n#div#1;n#div#0;n#div#1;n#div#0;n#!!top" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/merchant_goods.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="765">
<caret line="90" column="38" selection-start-line="90" selection-start-column="38" selection-end-line="90" selection-end-column="38" />
<folding>
<element signature="e#42#79#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="2805">
<caret line="183" column="13" selection-start-line="183" selection-start-column="13" selection-end-line="183" selection-end-column="13" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/fast.js">
<entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="562">
<caret line="341" column="24" selection-start-line="341" selection-start-column="19" selection-end-line="341" selection-end-column="24" />
<state relative-caret-position="238">
<caret line="14" column="28" selection-start-line="14" selection-start-column="24" selection-end-line="20" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1490">
<caret line="130" column="47" selection-start-line="130" selection-start-column="47" selection-end-line="130" selection-end-column="47" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLog.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="782">
<caret line="46" column="29" selection-start-line="46" selection-start-column="29" selection-end-line="46" selection-end-column="29" />
</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="323">
<caret line="19" column="4" selection-start-line="19" selection-start-column="4" selection-end-line="19" selection-end-column="100" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/user_money_log_audit/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="340">
<caret line="20" column="33" selection-start-line="14" selection-start-column="24" selection-end-line="20" selection-end-column="33" />
</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="623">
<caret line="72" column="13" lean-forward="true" selection-start-line="1" selection-start-column="4" selection-end-line="72" selection-end-column="13" />
</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">
<state relative-caret-position="402">
<caret line="24" column="33" selection-start-line="24" selection-start-column="33" selection-end-line="24" selection-end-column="33" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/library/traits/Backend.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="1082">
<caret line="195" column="5" lean-forward="true" selection-start-line="145" selection-start-column="4" selection-end-line="195" selection-end-column="5" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/home/controller/Goods.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="221">
<caret line="21" column="21" lean-forward="true" selection-start-line="21" selection-start-column="21" selection-end-line="21" selection-end-column="21" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="810">
<caret line="64" column="25" selection-start-line="64" selection-start-column="25" selection-end-line="64" selection-end-column="25" />
<state relative-caret-position="544">
<caret line="52" column="55" selection-start-line="52" selection-start-column="24" selection-end-line="52" selection-end-column="55" />
<folding>
<element signature="e#129#163#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
<entry file="file://$PROJECT_DIR$/application/extra/wechat.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="79" column="51" selection-start-line="79" selection-start-column="51" selection-end-line="79" selection-end-column="51" />
<state relative-caret-position="595">
<caret line="50" column="18" selection-start-line="50" selection-start-column="9" selection-end-line="50" selection-end-column="18" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_money_log.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="32" column="165" selection-start-line="32" selection-start-column="69" selection-end-line="32" selection-end-column="165" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/user_money_log_audit.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="646">
<caret line="38" column="71" selection-start-line="38" selection-start-column="71" selection-end-line="38" selection-end-column="71" />
</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="504">
<caret line="74" column="43" selection-start-line="74" selection-start-column="37" selection-end-line="74" selection-end-column="43" />
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/UserMoneyLogAudit.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="589">
<caret line="128" column="27" selection-start-line="128" selection-start-column="27" selection-end-line="128" selection-end-column="27" />
<folding>
<element signature="e#40#74#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ...
... ... @@ -14,10 +14,13 @@ use think\Db;
class PayView extends Backend
{
public function test(){
dump(cache('nnn'));
dump(cache('successful'));
}
/**
* 页面
* @return mixed|\think\response\Json
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function index(){
//商户信息
$admin = Db::name('admin')->where(['id'=>$this->auth->id])->find();
... ... @@ -27,6 +30,13 @@ class PayView extends Backend
$this->assign('admin',$admin);
return $this->fetch();
}
/**
* 创建订单
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function create_order(){
$admin_id = $this->request->param('admin_id',0,'intval');
$total = $this->request->param('total',0,'intval');
... ... @@ -46,6 +56,13 @@ class PayView extends Backend
$order_id = Db::name('order')->insertGetId($arr);
$this->success('','',['order_id'=>$order_id]);
}
/**
* 唤起支付
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function pay(){
$order_id = $this->request->param('order_id',0,'intval');
$data = Db::name('order')->where(['id'=>$order_id])->find();
... ... @@ -56,6 +73,13 @@ class PayView extends Backend
}
\PHPQRCode\QRcode::png($code_url);
}
/**
* 订单是否支付
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function order_pay(){
$order_id = $this->request->param('order_id',0,'intval');
$data = Db::name('order')->where(['id'=>$order_id])->find();
... ... @@ -64,4 +88,47 @@ class PayView extends Backend
}
$this->success();
}
/**
* 创建提现记录
* @throws \think\Exception
* @throws \think\db\exception\DataNotFoundException
* @throws \think\db\exception\ModelNotFoundException
* @throws \think\exception\DbException
*/
public function create_withdraw(){
$admin_id = $this->request->param('admin_id',0,'intval');
$money = $this->request->param('money',0,'intval');
if(empty($admin_id) || empty($money)){
$this->error('缺少必要参数');
}
//商户信息
$admin = Db::name('admin')->where(['id'=>$admin_id])->find();
//红包券充值比例
$exp_ratio = Db::name('exp_ratio')->where(['id'=>1])->find();
if($exp_ratio['ratio']*$admin['money']*0.01<$money){
$this->error('余额不足');
}
Db::startTrans();
//储存记录
$arr1['admin_id'] = $admin_id;
$arr1['before_money'] = $admin['money'];
$arr1['money'] = $exp_ratio['ratio']/0.01*$money;
$arr1['after_money'] = $admin['money'] - $arr1['money'];
$arr1['type'] = 1;
$arr1['createtime'] = time();
$result1 = Db::name('user_money_log')->insert($arr1);
if(empty($result1)){
Db::rollback();
$this->error('sql执行失败');
}
//扣除商户余额
$result2 = Db::name('admin')->where(['id'=>$admin_id])->setDec('money',$arr1['money']);
if(empty($result2)){
Db::rollback();
$this->error('sql执行失败');
}
Db::commit();
$this->success();
}
}
\ No newline at end of file
... ...
... ... @@ -72,8 +72,59 @@
</div>
</div>
<div class="tab-pane fade" id="second">
<table id="table2" class="table table-striped table-bordered table-hover" width="100%">
<div class="box box-success">
<!--<b>
<div class="panel-heading">
账号 ： {$admin.username}
</div>
<div class="panel-heading">
余额 ： {$admin.money}元
</div>
</b>-->
<div class="panel-body">
<table class="table table-striped">
<tbody>
<tr>
<td width="100"><b>账号 ： </b></td>
<td><b>{$admin.username}</b></td>
</tr>
<tr>
<td><b>剩余红包券 ： </b></td>
<td><b>{$admin.money}&nbsp;&nbsp;<span>约为<span class="text-danger">{$exp_ratio.ratio*$admin.money*0.01}</span>元</span></b></td>
</tr>
<tr>
<td><b>提现方式 ： </b></td>
<td><b>微信余额</b></td>
</tr>
<tr>
<td style="vertical-align: middle;"><b>提现金额 ： </b></td>
<td>
<b>
<input class="form-control pull-left money" style="width: 140px" type="number" value="" placeholder="请输入提现金额"/>
<input type="hidden" class="ratio" value="{$exp_ratio.ratio}"/>
<input type="hidden" class="admin_id" value="{$admin.id}"/>
<!--<div class="pull-left" style="line-height: 31px;">
&nbsp;元&nbsp;&nbsp;
<span class="ticket" style="display: none">约为<span class="text-danger">0</span>红包券</span>
</div>-->
</b>
</td>
</tr>
<tr>
<td></td>
<td>
<b>
<p class="text-warning">提现金额不得小于50元，且必须为整数。</p>
<p class="text-warning">1元={$exp_ratio.ratio/0.01*1}红包券</p>
</b>
</td>
</tr>
</tbody>
</table>
<button class="btn btn-success withdraw" type="button">立即提现</button>
</div>
</div>
</div>
</div>
</div>
... ...
... ... @@ -91,6 +91,55 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
})
}
}
//点击立即提现
$('.withdraw').click(function(){
var admin_id = $('.admin_id').val();
var money = $('.money').val();
if(money == ''){
top.window.Layer.open({
title:'温馨提示',
content:'请输入提现金额'
});
return false;
}else if(money<50){
top.window.Layer.open({
title:'温馨提示',
content:'提现金额不得小于50元'
});
return false;
}else if(!(/(^[1-9]\d*$)/.test(money))){
top.window.Layer.open({
title:'温馨提示',
content:'必须为整数'
});
return false;
}
$.ajax({
url:"pay_view/create_withdraw",
type:"POST",
data:{'admin_id':admin_id,'money':money},
success:function(res){
if(res.code == 1){
top.window.Layer.open({
title:'温馨提示',
content:'提现申请已发送请等待审核',
});
window.location.href='';
}else{
top.window.Layer.open({
title:'温馨提示',
content:res.msg
});
}
},
error:function(){
top.window.Layer.open({
title:'温馨提示',
content:'与服务器连接失败'
});
}
})
});
Controller.api.bindevent();
},
... ...