|
@@ -3,7 +3,7 @@ |
|
@@ -3,7 +3,7 @@ |
3
|
<component name="ChangeListManager">
|
3
|
<component name="ChangeListManager">
|
4
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
4
|
<list default="true" id="309ad746-5b2a-4c29-af46-e7925a35765c" name="默认的" comment="">
|
5
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
5
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
6
|
- <change beforePath="$PROJECT_DIR$/application/admin/controller/PayView.php" beforeDir="false" afterPath="$PROJECT_DIR$/application/admin/controller/PayView.php" afterDir="false" />
|
6
|
+ <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" />
|
7
|
</list>
|
7
|
</list>
|
8
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
8
|
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
|
9
|
<option name="TRACKING_ENABLED" value="true" />
|
9
|
<option name="TRACKING_ENABLED" value="true" />
|
|
@@ -17,11 +17,11 @@ |
|
@@ -17,11 +17,11 @@ |
17
|
</component>
|
17
|
</component>
|
18
|
<component name="FileEditorManager">
|
18
|
<component name="FileEditorManager">
|
19
|
<leaf>
|
19
|
<leaf>
|
20
|
- <file leaf-file-name="PayView.php" pinned="false" current-in-tab="true">
|
20
|
+ <file leaf-file-name="PayView.php" pinned="false" current-in-tab="false">
|
21
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
|
21
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
|
22
|
<provider selected="true" editor-type-id="text-editor">
|
22
|
<provider selected="true" editor-type-id="text-editor">
|
23
|
- <state relative-caret-position="130">
|
|
|
24
|
- <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
|
23
|
+ <state relative-caret-position="810">
|
|
|
24
|
+ <caret line="64" column="25" selection-start-line="64" selection-start-column="25" selection-end-line="64" selection-end-column="25" />
|
25
|
<folding>
|
25
|
<folding>
|
26
|
<element signature="e#129#163#0#PHP" expanded="true" />
|
26
|
<element signature="e#129#163#0#PHP" expanded="true" />
|
27
|
</folding>
|
27
|
</folding>
|
|
@@ -32,8 +32,8 @@ |
|
@@ -32,8 +32,8 @@ |
32
|
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
|
32
|
<file leaf-file-name="Pay.php" pinned="false" current-in-tab="false">
|
33
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
|
33
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
|
34
|
<provider selected="true" editor-type-id="text-editor">
|
34
|
<provider selected="true" editor-type-id="text-editor">
|
35
|
- <state relative-caret-position="459">
|
|
|
36
|
- <caret line="72" column="29" selection-start-line="72" selection-start-column="19" selection-end-line="72" selection-end-column="29" />
|
35
|
+ <state relative-caret-position="765">
|
|
|
36
|
+ <caret line="90" column="38" selection-start-line="90" selection-start-column="38" selection-end-line="90" selection-end-column="38" />
|
37
|
<folding>
|
37
|
<folding>
|
38
|
<element signature="e#42#79#0#PHP" expanded="true" />
|
38
|
<element signature="e#42#79#0#PHP" expanded="true" />
|
39
|
</folding>
|
39
|
</folding>
|
|
@@ -69,11 +69,11 @@ |
|
@@ -69,11 +69,11 @@ |
69
|
</provider>
|
69
|
</provider>
|
70
|
</entry>
|
70
|
</entry>
|
71
|
</file>
|
71
|
</file>
|
72
|
- <file leaf-file-name="pay_view.js" pinned="false" current-in-tab="false">
|
72
|
+ <file leaf-file-name="pay_view.js" pinned="false" current-in-tab="true">
|
73
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
|
73
|
<entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
|
74
|
<provider selected="true" editor-type-id="text-editor">
|
74
|
<provider selected="true" editor-type-id="text-editor">
|
75
|
- <state relative-caret-position="187">
|
|
|
76
|
- <caret line="11" column="49" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="49" />
|
75
|
+ <state relative-caret-position="527">
|
|
|
76
|
+ <caret line="79" column="51" selection-start-line="79" selection-start-column="51" selection-end-line="79" selection-end-column="51" />
|
77
|
</state>
|
77
|
</state>
|
78
|
</provider>
|
78
|
</provider>
|
79
|
</entry>
|
79
|
</entry>
|
|
@@ -162,9 +162,9 @@ |
|
@@ -162,9 +162,9 @@ |
162
|
<option value="$PROJECT_DIR$/application/admin/view/pay/index.html" />
|
162
|
<option value="$PROJECT_DIR$/application/admin/view/pay/index.html" />
|
163
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pay.js" />
|
163
|
<option value="$PROJECT_DIR$/public/assets/js/backend/pay.js" />
|
164
|
<option value="$PROJECT_DIR$/application/admin/view/pay_view/index.html" />
|
164
|
<option value="$PROJECT_DIR$/application/admin/view/pay_view/index.html" />
|
165
|
- <option value="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" />
|
|
|
166
|
<option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />
|
165
|
<option value="$PROJECT_DIR$/application/admin/controller/Pay.php" />
|
167
|
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
|
166
|
<option value="$PROJECT_DIR$/application/admin/controller/PayView.php" />
|
|
|
167
|
+ <option value="$PROJECT_DIR$/public/assets/js/backend/pay_view.js" />
|
168
|
</list>
|
168
|
</list>
|
169
|
</option>
|
169
|
</option>
|
170
|
</component>
|
170
|
</component>
|
|
@@ -369,7 +369,7 @@ |
|
@@ -369,7 +369,7 @@ |
369
|
<workItem from="1572050747518" duration="29776000" />
|
369
|
<workItem from="1572050747518" duration="29776000" />
|
370
|
<workItem from="1572087949120" duration="1641000" />
|
370
|
<workItem from="1572087949120" duration="1641000" />
|
371
|
<workItem from="1572223206994" duration="28857000" />
|
371
|
<workItem from="1572223206994" duration="28857000" />
|
372
|
- <workItem from="1572309778506" duration="18550000" />
|
372
|
+ <workItem from="1572309778506" duration="22840000" />
|
373
|
</task>
|
373
|
</task>
|
374
|
<task id="LOCAL-00001" summary="数据库配置">
|
374
|
<task id="LOCAL-00001" summary="数据库配置">
|
375
|
<created>1571972429395</created>
|
375
|
<created>1571972429395</created>
|
|
@@ -497,11 +497,32 @@ |
|
@@ -497,11 +497,32 @@ |
497
|
<option name="project" value="LOCAL" />
|
497
|
<option name="project" value="LOCAL" />
|
498
|
<updated>1572332735985</updated>
|
498
|
<updated>1572332735985</updated>
|
499
|
</task>
|
499
|
</task>
|
500
|
- <option name="localTasksCounter" value="19" />
|
500
|
+ <task id="LOCAL-00019" summary="证书">
|
|
|
501
|
+ <created>1572333088901</created>
|
|
|
502
|
+ <option name="number" value="00019" />
|
|
|
503
|
+ <option name="presentableId" value="LOCAL-00019" />
|
|
|
504
|
+ <option name="project" value="LOCAL" />
|
|
|
505
|
+ <updated>1572333088901</updated>
|
|
|
506
|
+ </task>
|
|
|
507
|
+ <task id="LOCAL-00020" summary="证书">
|
|
|
508
|
+ <created>1572333312716</created>
|
|
|
509
|
+ <option name="number" value="00020" />
|
|
|
510
|
+ <option name="presentableId" value="LOCAL-00020" />
|
|
|
511
|
+ <option name="project" value="LOCAL" />
|
|
|
512
|
+ <updated>1572333312716</updated>
|
|
|
513
|
+ </task>
|
|
|
514
|
+ <task id="LOCAL-00021" summary="支付">
|
|
|
515
|
+ <created>1572337801981</created>
|
|
|
516
|
+ <option name="number" value="00021" />
|
|
|
517
|
+ <option name="presentableId" value="LOCAL-00021" />
|
|
|
518
|
+ <option name="project" value="LOCAL" />
|
|
|
519
|
+ <updated>1572337801981</updated>
|
|
|
520
|
+ </task>
|
|
|
521
|
+ <option name="localTasksCounter" value="22" />
|
501
|
<servers />
|
522
|
<servers />
|
502
|
</component>
|
523
|
</component>
|
503
|
<component name="TimeTrackingManager">
|
524
|
<component name="TimeTrackingManager">
|
504
|
- <option name="totallyTimeSpent" value="177658000" />
|
525
|
+ <option name="totallyTimeSpent" value="181948000" />
|
505
|
</component>
|
526
|
</component>
|
506
|
<component name="ToolWindowManager">
|
527
|
<component name="ToolWindowManager">
|
507
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
528
|
<frame x="-8" y="-8" width="1936" height="1056" extended-state="6" />
|
|
@@ -565,16 +586,10 @@ |
|
@@ -565,16 +586,10 @@ |
565
|
<MESSAGE value="微信公众平台配置" />
|
586
|
<MESSAGE value="微信公众平台配置" />
|
566
|
<MESSAGE value="调试授权" />
|
587
|
<MESSAGE value="调试授权" />
|
567
|
<MESSAGE value="证书" />
|
588
|
<MESSAGE value="证书" />
|
568
|
- <option name="LAST_COMMIT_MESSAGE" value="证书" />
|
589
|
+ <MESSAGE value="支付" />
|
|
|
590
|
+ <option name="LAST_COMMIT_MESSAGE" value="支付" />
|
569
|
</component>
|
591
|
</component>
|
570
|
<component name="editorHistoryManager">
|
592
|
<component name="editorHistoryManager">
|
571
|
- <entry file="file://$PROJECT_DIR$/application/extra/upload.php">
|
|
|
572
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
573
|
- <state relative-caret-position="391">
|
|
|
574
|
- <caret line="23" column="77" selection-start-line="23" selection-start-column="77" selection-end-line="23" selection-end-column="77" />
|
|
|
575
|
- </state>
|
|
|
576
|
- </provider>
|
|
|
577
|
- </entry>
|
|
|
578
|
<entry file="file://$PROJECT_DIR$/public/assets/js/addons.js">
|
593
|
<entry file="file://$PROJECT_DIR$/public/assets/js/addons.js">
|
579
|
<provider selected="true" editor-type-id="text-editor" />
|
594
|
<provider selected="true" editor-type-id="text-editor" />
|
580
|
</entry>
|
595
|
</entry>
|
|
@@ -875,13 +890,6 @@ |
|
@@ -875,13 +890,6 @@ |
875
|
<entry file="file://$PROJECT_DIR$/public/assets/img/qrcode.png">
|
890
|
<entry file="file://$PROJECT_DIR$/public/assets/img/qrcode.png">
|
876
|
<provider selected="true" editor-type-id="images" />
|
891
|
<provider selected="true" editor-type-id="images" />
|
877
|
</entry>
|
892
|
</entry>
|
878
|
- <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
|
|
|
879
|
- <provider selected="true" editor-type-id="text-editor">
|
|
|
880
|
- <state relative-caret-position="187">
|
|
|
881
|
- <caret line="11" column="49" selection-start-line="11" selection-start-column="33" selection-end-line="11" selection-end-column="49" />
|
|
|
882
|
- </state>
|
|
|
883
|
- </provider>
|
|
|
884
|
- </entry>
|
|
|
885
|
<entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
|
893
|
<entry file="file://$PROJECT_DIR$/application/admin/view/pay_view/index.html">
|
886
|
<provider selected="true" editor-type-id="text-editor">
|
894
|
<provider selected="true" editor-type-id="text-editor">
|
887
|
<state relative-caret-position="759">
|
895
|
<state relative-caret-position="759">
|
|
@@ -901,24 +909,38 @@ |
|
@@ -901,24 +909,38 @@ |
901
|
</entry>
|
909
|
</entry>
|
902
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
|
910
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/Pay.php">
|
903
|
<provider selected="true" editor-type-id="text-editor">
|
911
|
<provider selected="true" editor-type-id="text-editor">
|
904
|
- <state relative-caret-position="459">
|
|
|
905
|
- <caret line="72" column="29" selection-start-line="72" selection-start-column="19" selection-end-line="72" selection-end-column="29" />
|
912
|
+ <state relative-caret-position="765">
|
|
|
913
|
+ <caret line="90" column="38" selection-start-line="90" selection-start-column="38" selection-end-line="90" selection-end-column="38" />
|
906
|
<folding>
|
914
|
<folding>
|
907
|
<element signature="e#42#79#0#PHP" expanded="true" />
|
915
|
<element signature="e#42#79#0#PHP" expanded="true" />
|
908
|
</folding>
|
916
|
</folding>
|
909
|
</state>
|
917
|
</state>
|
910
|
</provider>
|
918
|
</provider>
|
911
|
</entry>
|
919
|
</entry>
|
|
|
920
|
+ <entry file="file://$PROJECT_DIR$/public/assets/js/fast.js">
|
|
|
921
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
922
|
+ <state relative-caret-position="562">
|
|
|
923
|
+ <caret line="341" column="24" selection-start-line="341" selection-start-column="19" selection-end-line="341" selection-end-column="24" />
|
|
|
924
|
+ </state>
|
|
|
925
|
+ </provider>
|
|
|
926
|
+ </entry>
|
912
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
|
927
|
<entry file="file://$PROJECT_DIR$/application/admin/controller/PayView.php">
|
913
|
<provider selected="true" editor-type-id="text-editor">
|
928
|
<provider selected="true" editor-type-id="text-editor">
|
914
|
- <state relative-caret-position="130">
|
|
|
915
|
- <caret line="18" column="30" selection-start-line="18" selection-start-column="30" selection-end-line="18" selection-end-column="30" />
|
929
|
+ <state relative-caret-position="810">
|
|
|
930
|
+ <caret line="64" column="25" selection-start-line="64" selection-start-column="25" selection-end-line="64" selection-end-column="25" />
|
916
|
<folding>
|
931
|
<folding>
|
917
|
<element signature="e#129#163#0#PHP" expanded="true" />
|
932
|
<element signature="e#129#163#0#PHP" expanded="true" />
|
918
|
</folding>
|
933
|
</folding>
|
919
|
</state>
|
934
|
</state>
|
920
|
</provider>
|
935
|
</provider>
|
921
|
</entry>
|
936
|
</entry>
|
|
|
937
|
+ <entry file="file://$PROJECT_DIR$/public/assets/js/backend/pay_view.js">
|
|
|
938
|
+ <provider selected="true" editor-type-id="text-editor">
|
|
|
939
|
+ <state relative-caret-position="527">
|
|
|
940
|
+ <caret line="79" column="51" selection-start-line="79" selection-start-column="51" selection-end-line="79" selection-end-column="51" />
|
|
|
941
|
+ </state>
|
|
|
942
|
+ </provider>
|
|
|
943
|
+ </entry>
|
922
|
</component>
|
944
|
</component>
|
923
|
<component name="masterDetails">
|
945
|
<component name="masterDetails">
|
924
|
<states>
|
946
|
<states>
|