王晓刚 / advertising · 提交

转到一个项目

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

证书

内嵌 并排对比
正在显示 2 个修改的文件 包含 46 行增加 和 37 行删除
... ... @@ -2,13 +2,7 @@
<project version="4">
<component name="ChangeListManager">
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
<change afterPath="$PROJECT_DIR$/public/assets/img/wechat_pay.png" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/wechat/cert/apiclient_cert.p12" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/wechat/cert/apiclient_cert.pem" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/wechat/cert/apiclient_key.pem" afterDir="false" />
<change afterPath="$PROJECT_DIR$/public/wechat/cert/证书使用说明.txt" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" 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" />
... ... @@ -50,8 +44,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="589">
<caret line="61" column="76" selection-start-line="61" selection-start-column="76" selection-end-line="61" selection-end-column="76" />
<state relative-caret-position="606">
<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" />
<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" />
... ... @@ -78,8 +72,8 @@
<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="47" selection-start-line="44" selection-start-column="47" selection-end-line="44" selection-end-column="47" />
<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>
</provider>
</entry>
... ... @@ -87,7 +81,7 @@
<file leaf-file-name="index.html" pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/application/admin/view/example/customform/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<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>
... ... @@ -375,7 +369,7 @@
<workItem from="1572050747518" duration="29776000" />
<workItem from="1572087949120" duration="1641000" />
<workItem from="1572223206994" duration="28857000" />
<workItem from="1572309778506" duration="17281000" />
<workItem from="1572309778506" duration="17871000" />
</task>
<task id="LOCAL-00001" summary="数据库配置">
<created>1571972429395</created>
... ... @@ -461,11 +455,25 @@
<option name="project" value="LOCAL" />
<updated>1572329761584</updated>
</task>
<option name="localTasksCounter" value="13" />
<task id="LOCAL-00013" summary="证书">
<created>1572331840264</created>
<option name="number" value="00013" />
<option name="presentableId" value="LOCAL-00013" />
<option name="project" value="LOCAL" />
<updated>1572331840264</updated>
</task>
<task id="LOCAL-00014" summary="证书">
<created>1572332267490</created>
<option name="number" value="00014" />
<option name="presentableId" value="LOCAL-00014" />
<option name="project" value="LOCAL" />
<updated>1572332267490</updated>
</task>
<option name="localTasksCounter" value="15" />
<servers />
</component>
<component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="176389000" />
<option name="totallyTimeSpent" value="176979000" />
</component>
<component name="ToolWindowManager">
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
... ... @@ -528,12 +536,10 @@
<MESSAGE value="数据库配置" />
<MESSAGE value="微信公众平台配置" />
<MESSAGE value="调试授权" />
<option name="LAST_COMMIT_MESSAGE" value="调试授权" />
<MESSAGE value="证书" />
<option name="LAST_COMMIT_MESSAGE" value="证书" />
</component>
<component name="editorHistoryManager">
<entry file="file://$PROJECT_DIR$/application/extra/site.php">
<provider selected="true" editor-type-id="text-editor" />
</entry>
<entry file="file://$PROJECT_DIR$/application/extra/upload.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="391">
... ... @@ -811,20 +817,6 @@
</state>
</provider>
</entry>
<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/example/customform/index.html">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="152">
<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$/application/admin/controller/PayView.php">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="572">
... ... @@ -858,10 +850,17 @@
<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">
<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="589">
<caret line="61" column="76" selection-start-line="61" selection-start-column="76" selection-end-line="61" selection-end-column="76" />
<state relative-caret-position="606">
<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" />
<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" />
... ... @@ -875,10 +874,20 @@
</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="544">
<caret line="44" column="47" selection-start-line="44" selection-start-column="47" selection-end-line="44" selection-end-column="47" />
<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>
</provider>
</entry>
... ...
... ... @@ -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){
$('.qrcode').show().find('img')[0].attr('src',window.location.protocol+"//"+window.location.host+"/admin/pay_view/pay/order_id/"+res.data.order_id);
$('.qrcode').show().chilren('img')[0].attr('src',window.location.protocol+"//"+window.location.host+"/admin/pay_view/pay/order_id/"+res.data.order_id);
}else{
top.window.Layer.open({
title:'温馨提示',
... ...