王晓刚 / advertising · 提交

转到一个项目

作者 王晓刚
提交 31255dc35d93cc1e7cee05c0da7ae7a7d5f51625 1 个父辈 cc46e278
1 个管道 的构建 通过 耗费 1 秒

调试授权

内嵌 并排对比
正在显示 3 个修改的文件 包含 62 行增加 和 68 行删除
... ... @@ -2,16 +2,9 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/application/admin/controller/Pay.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/admin/controller/PayView.php" afterDir="false" />
<change afterPath="$PROJECT_DIR$/application/admin/view/pay_view/index.html" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/extra/addons.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/extra/addons.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/extra/upload.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/extra/upload.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Index.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/home/controller/Question.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/home/controller/Question.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/public/assets/js/addons.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/addons.js" 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" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -25,11 +18,11 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="PayView.php" pinned="false" current-in-tab="true">
<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="436">
<caret line="37" column="31" selection-start-line="37" selection-start-column="31" selection-end-line="37" selection-end-column="31" />
<state relative-caret-position="572">
<caret line="44" column="23" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="23" />
<folding>
<element signature="e#129#163#0#PHP" expanded="true" />
</folding>
... ... @@ -40,7 +33,7 @@
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<state relative-caret-position="-833">
<caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
<folding>
<element signature="e#42#79#0#PHP" expanded="true" />
... ... @@ -52,8 +45,8 @@
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-57">
<caret line="25" column="49" selection-start-line="25" selection-start-column="49" selection-end-line="25" selection-end-column="49" />
<state relative-caret-position="623">
<caret line="62" column="50" lean-forward="true" selection-start-line="62" selection-start-column="50" selection-end-line="62" selection-end-column="50" />
<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" />
... ... @@ -67,20 +60,6 @@
</provider>
</entry>
</file>
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/addons/epay/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1941" />
</provider>
</entry>
</file>
<file leaf-file-name="default.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/addons/epay/view/layout/default.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1213" />
</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">
<provider selected="true" editor-type-id="text-editor">
... ... @@ -90,11 +69,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="pay_view.js" pinned="false" current-in-tab="false">
<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">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="44" column="99" selection-start-line="44" selection-start-column="99" selection-end-line="44" selection-end-column="99" />
<caret line="44" column="62" selection-start-line="44" selection-start-column="62" selection-end-line="44" selection-end-column="62" />
</state>
</provider>
</entry>
... ... @@ -135,7 +114,6 @@
<component name="IdeDocumentHistory">
<option name="CHANGED_PATHS">
<list>
<option value="$PROJECT_DIR$/application/config.php" />
<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" />
... ... @@ -183,9 +161,10 @@
<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$/public/assets/js/backend/pay_view.js" />
<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" />
</list>
</option>
</component>
... ... @@ -364,7 +343,7 @@
<workItem from="1572050747518" duration="29776000" />
<workItem from="1572087949120" duration="1641000" />
<workItem from="1572223206994" duration="28857000" />
<workItem from="1572309778506" duration="14796000" />
<workItem from="1572309778506" duration="15341000" />
</task>
<task id="LOCAL-00001" summary="数据库配置">
<created>1571972429395</created>
... ... @@ -436,21 +415,29 @@
<option name="project" value="LOCAL" />
<updated>1571979769963</updated>
</task>
<option name="localTasksCounter" value="11" />
<task id="LOCAL-00011" summary="调试授权">
<created>1572329583925</created>
<option name="number" value="00011" />
<option name="presentableId" value="LOCAL-00011" />
<option name="project" value="LOCAL" />
<updated>1572329583925</updated>
</task>
<option name="localTasksCounter" value="12" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="173904000" />
<option name="totallyTimeSpent" value="174449000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
<editor active="true" />
<layout>
<window_info anchor="bottom" id="TODO" order="6" />
<window_info anchor="bottom" id="调试" order="7" />
<window_info anchor="bottom" id="Event Log" order="7" side_tool="true" weight="0.32997763" />
<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 active="true" anchor="bottom" id="Terminal" order="7" visible="true" weight="0.32997763" />
<window_info anchor="bottom" id="Terminal" order="7" weight="0.32997763" />
<window_info anchor="bottom" id="运行" order="7" />
<window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.13539445" />
<window_info anchor="bottom" id="Docker" order="7" show_stripe_button="false" />
... ... @@ -778,11 +765,6 @@
<state relative-caret-position="-329" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/addons/epay/view/layout/default.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1213" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/addons/epay/library/Service.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="442">
... ... @@ -811,51 +793,56 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-57">
<caret line="25" column="49" selection-start-line="25" selection-start-column="49" selection-end-line="25" selection-end-column="49" />
<state relative-caret-position="572">
<caret line="44" column="23" selection-start-line="44" selection-start-column="20" selection-end-line="44" selection-end-column="23" />
<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="e#129#163#0#PHP" expanded="true" />
</folding>
</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="-833">
<caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
<folding>
<element signature="e#42#79#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/addons/epay/view/index/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="-1941" />
<state relative-caret-position="-1839" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
<entry file="file://$PROJECT_DIR$/addons/epay/view/layout/default.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="544">
<caret line="44" column="99" selection-start-line="44" selection-start-column="99" selection-end-line="44" selection-end-column="99" />
</state>
<state relative-caret-position="-1213" />
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
<entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="238">
<caret line="14" column="6" selection-start-line="14" selection-start-column="6" selection-end-line="14" selection-end-column="6" />
<state relative-caret-position="623">
<caret line="62" column="50" lean-forward="true" selection-start-line="62" selection-start-column="50" selection-end-line="62" selection-end-column="50" />
<folding>
<element signature="e#42#79#0#PHP" 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#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" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="436">
<caret line="37" column="31" selection-start-line="37" selection-start-column="31" selection-end-line="37" selection-end-column="31" />
<folding>
<element signature="e#129#163#0#PHP" expanded="true" />
</folding>
<state relative-caret-position="544">
<caret line="44" column="62" selection-start-line="44" selection-start-column="62" selection-end-line="44" selection-end-column="62" />
</state>
</provider>
</entry>
... ...
... ... @@ -57,9 +57,16 @@
</b>
</td>
</tr>
<tr>
<td></td>
<td class="qrcode">
<img src=""/>
</td>
</tr>
</tbody>
</table>
<button class="btn btn-info pay" type="button">立即充值</button>
</div>
</div>
</div>
... ...
... ... @@ -42,7 +42,7 @@ define(['jquery', 'bootstrap', 'backend', 'table', 'form'], function ($, undefin
data:{'admin_id':admin_id,'total':total},
success:function(res){
if(res.code == 1){
console.log(window.location.protocol+"//"+window.location.host+"/admin/pay_view/pay/order_id/"+res.data.order_id);
$('.qrcode').find('img').attr('src',window.location.protocol+"//"+window.location.host+"/admin/pay_view/pay/order_id/"+res.data.order_id);
}else{
top.window.Layer.open({
title:'温馨提示',
... ...