王晓刚 / advertising · 提交

转到一个项目

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

证书

内嵌 并排对比
正在显示 2 个修改的文件 包含 57 行增加 和 43 行删除
... ... @@ -3,7 +3,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$/public/assets/js/backend/pay_view.js" beforeDir="false" afterPath="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" afterDir="false" />
<change beforePath="$PROJECT_DIR$/application/admin/controller/PayView.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/PayView.php" afterDir="false" />
</list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
<option name="TRACKING_ENABLED" value="true" />
... ... @@ -17,11 +17,11 @@
</component>
<component name="FileEditorManager">
<leaf>
<file leaf-file-name="PayView.php" pinned="false" current-in-tab="false">
<file leaf-file-name="PayView.php" pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
<provider selected="true" editor-type-id="text-editor">
<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" />
<state relative-caret-position="470">
<caret line="38" column="43" selection-start-line="38" selection-start-column="43" selection-end-line="38" selection-end-column="43" />
<folding>
<element signature="e#129#163#0#PHP" expanded="true" />
</folding>
... ... @@ -44,7 +44,7 @@
<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="606">
<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" />
<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" />
... ... @@ -69,11 +69,11 @@
</provider>
</entry>
</file>
<file leaf-file-name="pay_view.js" pinned="false" current-in-tab="true">
<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="527">
<caret line="43" column="42" selection-start-line="43" selection-start-column="42" selection-end-line="43" selection-end-column="42" />
<state relative-caret-position="187">
<caret line="11" column="49" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="49" />
</state>
</provider>
</entry>
... ... @@ -162,9 +162,9 @@
<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/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/controller/PayView.php" />
</list>
</option>
</component>
... ... @@ -369,7 +369,7 @@
<workItem from="1572050747518" duration="29776000" />
<workItem from="1572087949120" duration="1641000" />
<workItem from="1572223206994" duration="28857000" />
<workItem from="1572309778506" duration="17871000" />
<workItem from="1572309778506" duration="18068000" />
</task>
<task id="LOCAL-00001" summary="数据库配置">
<created>1571972429395</created>
... ... @@ -469,11 +469,25 @@
<option name="project" value="LOCAL" />
<updated>1572332267490</updated>
</task>
<option name="localTasksCounter" value="15" />
<task id="LOCAL-00015" summary="证书">
<created>1572332412366</created>
<option name="number" value="00015" />
<option name="presentableId" value="LOCAL-00015" />
<option name="project" value="LOCAL" />
<updated>1572332412366</updated>
</task>
<task id="LOCAL-00016" summary="证书">
<created>1572332493952</created>
<option name="number" value="00016" />
<option name="presentableId" value="LOCAL-00016" />
<option name="project" value="LOCAL" />
<updated>1572332493952</updated>
</task>
<option name="localTasksCounter" value="17" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="176979000" />
<option name="totallyTimeSpent" value="177176000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -817,26 +831,6 @@
</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="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>
</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="-1839" />
... ... @@ -857,9 +851,26 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/example/customform/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>
</provider>
</entry>
<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/backend/pay_view.js">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="187">
<caret line="11" column="49" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="49" />
</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="606">
<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" />
<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" />
... ... @@ -874,20 +885,23 @@
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/application/admin/view/example/customform/index.html">
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
<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="-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$/public/assets/img/qrcode.png">
<provider selected="true" editor-type-id="images" />
</entry>
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="527">
<caret line="43" column="42" selection-start-line="43" selection-start-column="42" selection-end-line="43" selection-end-column="42" />
<state relative-caret-position="470">
<caret line="38" column="43" selection-start-line="38" selection-start-column="43" selection-end-line="38" selection-end-column="43" />
<folding>
<element signature="e#129#163#0#PHP" expanded="true" />
</folding>
</state>
</provider>
</entry>
... ...
... ... @@ -36,7 +36,7 @@ class PayView extends Backend
$arr['admin_id'] = $admin_id;
$arr['user_id'] = $admin['user_id'];
$arr['total'] = $total;
$arr['money'] = $total*$exp_ratio['ratio']*0.01;
$arr['money'] = $exp_ratio['ratio']/0.01*$total;//$total*$exp_ratio['ratio']*0.01;
$arr['create_time'] = time();
$arr['status'] = 1;
$order_id = Db::name('order')->insertGetId($arr);
... ...